From f340e4d649a85f7e888ea72e45511f5072efb150 Mon Sep 17 00:00:00 2001
From: slava <slava@slava-laptop.(none)>
Date: Tue, 3 Feb 2009 00:33:22 -0600
Subject: [PATCH] Re-add 8dfc63eb99fa2cc186fb99c16d75a273365d2b60

---
 basis/io/encodings/iana/iana.factor                  | 6 +++++-
 basis/io/encodings/japanese/{CP932.txt => CP932.TXT} | 0
 basis/io/encodings/japanese/japanese-docs.factor     | 2 +-
 basis/io/encodings/japanese/japanese.factor          | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
 rename basis/io/encodings/japanese/{CP932.txt => CP932.TXT} (100%)

diff --git a/basis/io/encodings/iana/iana.factor b/basis/io/encodings/iana/iana.factor
index 19b887cd75..5e192025fc 100644
--- a/basis/io/encodings/iana/iana.factor
+++ b/basis/io/encodings/iana/iana.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel strings values io.files assocs
 splitting sequences io namespaces sets io.encodings.8-bit
-io.encodings.ascii io.encodings.utf8 io.encodings.utf16  ;
+io.encodings.ascii io.encodings.utf8 io.encodings.utf16 
+io.encodings.chinese io.encodings.japanese ;
 IN: io.encodings.iana
 
 <PRIVATE
@@ -24,6 +25,9 @@ VALUE: n>e-table
     { latin/hebrew "ISO-8859-8" }
     { latin5 "ISO-8859-9" }
     { latin6 "ISO-8859-10" }
+    { shift-jis "Shift_JIS" }
+    { windows-31j "Windows-31J" }
+    { gb18030 "GB18030" }
 } ;
 PRIVATE>
 
diff --git a/basis/io/encodings/japanese/CP932.txt b/basis/io/encodings/japanese/CP932.TXT
similarity index 100%
rename from basis/io/encodings/japanese/CP932.txt
rename to basis/io/encodings/japanese/CP932.TXT
diff --git a/basis/io/encodings/japanese/japanese-docs.factor b/basis/io/encodings/japanese/japanese-docs.factor
index 48f94af7b4..e34f5736f2 100644
--- a/basis/io/encodings/japanese/japanese-docs.factor
+++ b/basis/io/encodings/japanese/japanese-docs.factor
@@ -4,7 +4,7 @@ USING: help.markup help.syntax ;
 IN: io.encodings.japanese
 
 ARTICLE: "io.encodings.japanese" "Japanese text encodings"
-"Several encodings are used for Japanese text besides the standard UTF encodings for Unicode strings. These are mostly based on the character set defined in the JIS X 208 standard. Current coverage of encodings is incomplete."
+"The " { $vocab-link "io.encodings.japanese" } " vocabulary implements Japanese-specific text encodings. Several encodings are used for Japanese text besides the standard UTF encodings for Unicode strings. These are mostly based on the character set defined in the JIS X 208 standard. Current coverage of encodings is incomplete."
 { $subsection shift-jis }
 { $subsection windows-31j } ;
 
diff --git a/basis/io/encodings/japanese/japanese.factor b/basis/io/encodings/japanese/japanese.factor
index d9c6627854..3a66181db1 100644
--- a/basis/io/encodings/japanese/japanese.factor
+++ b/basis/io/encodings/japanese/japanese.factor
@@ -15,7 +15,7 @@ VALUE: windows-31j
 TUPLE: jis assoc ;
 
 : <jis> ( assoc -- jis )
-    [ nip ] assoc-filter H{ } assoc-like
+    [ nip ] assoc-filter
     >biassoc jis boa ;
 
 : ch>jis ( ch tuple -- jis ) assoc>> value-at [ encode-error ] unless* ;