4 files changed, 40 insertions, 0 deletions

diff --git a/admin/ChangeLog.22 b/admin/ChangeLog.22
index ee129d9c119..1a1a7067169 100644
--- a/admin/ChangeLog.22
+++ b/admin/ChangeLog.22
@@ -1,3 +1,10 @@
+2004-01-25  Kenichi Handa  <handa@m17n.org>
+
+        * charsets/mapconv: Handle UNICODE2.
+
+        * charsets/Makefile (CJK): Include CP932-2BYTE.map
+        (CP932-2BYTE.map): New target.
+
 2003-08-16  Kenichi Handa  <handa@m17n.org>
 
         * charsets: New directory for scripts to generate charset map
diff --git a/etc/ChangeLog.22 b/etc/ChangeLog.22
index 067cb672b51..c6d6919345e 100644
--- a/etc/ChangeLog.22
+++ b/etc/ChangeLog.22
@@ -1,3 +1,7 @@
+2004-01-25  Kenichi Handa  <handa@m17n.org>
+
+        * CP932-2BYTE.map: New file.
+
 2003-09-26  Kenichi Handa  <handa@m17n.org>
 
         * ps-prin1.ps (HeaderOrFooterTextLines): Handle multiple strings
diff --git a/lisp/ChangeLog.22 b/lisp/ChangeLog.22
index 92630d134c6..dc1f7e58c79 100644
--- a/lisp/ChangeLog.22
+++ b/lisp/ChangeLog.22
@@ -1,3 +1,14 @@
+2004-01-25  Kenichi Handa  <handa@m17n.org>
+
+        * language/japanese.el (japanese-cp932): New coding system.
+        (cp932): New alias of it.
+
+        * international/mule-conf.el (katakana-sjis, cp932-2-byte)
+        (cp932): New charsets.
+
+        * international/mule.el (define-charset): If :code-space is not
+        given, generate it from :dimension.
+
 2004-01-23  Kenichi Handa  <handa@m17n.org>
 
         * composite.el (reference-point-alist): Doc fixed.
diff --git a/src/ChangeLog.22 b/src/ChangeLog.22
index 92d19454e42..422ddf8f739 100644
--- a/src/ChangeLog.22
+++ b/src/ChangeLog.22
@@ -1,3 +1,21 @@
+2004-01-25  Kenichi Handa  <handa@m17n.org>
+
+        * coding.h (enum coding_attr_index): New member
+        coding_attr_trans_tbl.
+        (CODING_ATTR_TRANS_TBL): New macro.
+
+        * coding.c (get_translation_table): New function.
+        (translate_chars): Fix the bug of skipping annotation data.
+        (decode_coding): Utilze get_translation_table.
+        (encode_coding): Likewise.
+        (char_encodable_p): Translate char if necessary.
+        (Funencodable_char_position): Likewise.
+        (Ffind_coding_systems_region_internal): Setup translation table
+        for encode in a coding system attribute vector in advance.
+        (Fcheck_coding_systems_region): Likewise.
+        (Fdefine_coding_system_internal): Allow a symbol as translation
+        table.  For shift-jis type coding system, allow 4th charset.
+
 2004-01-24  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (decode_coding_sjis): Check the first byte rigidly.