Sync with r21-4-9-utf-2000-0_19-jc3lisp.

diff --git a/src/ChangeLog b/src/ChangeLog
index ddac356..a98cf23 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2002-11-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mule-charset.c (Vcharset_china3_jef): Deleted.
+       (Qchina3_jef): Deleted.
+       (syms_of_mule_charset): Don't define `china3-jef'.
+       (complex_vars_of_mule_charset): Likewise.
+
+       * char-ucs.h (LEADING_BYTE_CHINA3_JEF): Deleted.
+       (MIN_CHAR_CHINA3_JEF): Comment out.
+       (MAX_CHAR_CHINA3_JEF): Comment out.
+
+2002-11-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mule-charset.c (Vcharset_ucs_gb): New variable.
+       (Qucs_gb): New variable.
+       (syms_of_mule_charset): Add new symbol `ucs-gb'.
+       (complex_vars_of_mule_charset): Add new coded-charset `ucs-gb'.
+
+       * char-ucs.h (LEADING_BYTE_UCS_GB): New macro.
+
 2002-11-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * mule-charset.c (charset_code_point): if a coded-charset has a

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 7b68791..cd7101f 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -76,26 +76,29 @@ typedef short Charset_ID;
 /* ISO/IEC 10646 SIP */
 #define LEADING_BYTE_UCS_SIP           (MIN_LEADING_BYTE + 5)
 
+/* ISO/IEC 10646 for GB */
+#define LEADING_BYTE_UCS_GB            (MIN_LEADING_BYTE + 6)
+
 /* ISO/IEC 10646 for CNS */
-#define LEADING_BYTE_UCS_CNS           (MIN_LEADING_BYTE + 6)
+#define LEADING_BYTE_UCS_CNS           (MIN_LEADING_BYTE + 7)
 
 /* ISO/IEC 10646 for JIS */
-#define LEADING_BYTE_UCS_JIS           (MIN_LEADING_BYTE + 7)
+#define LEADING_BYTE_UCS_JIS           (MIN_LEADING_BYTE + 8)
 
 /* ISO/IEC 10646 for KS */
-#define LEADING_BYTE_UCS_KS            (MIN_LEADING_BYTE + 8)
+#define LEADING_BYTE_UCS_KS            (MIN_LEADING_BYTE + 9)
 
 /* ISO/IEC 10646 for Big5 */
-#define LEADING_BYTE_UCS_BIG5          (MIN_LEADING_BYTE + 9)
+#define LEADING_BYTE_UCS_BIG5          (MIN_LEADING_BYTE + 10)
 
 /* Japanese JIS X0208 Common   2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JIS_X0208                 (MIN_LEADING_BYTE + 10)
+#define LEADING_BYTE_JIS_X0208                 (MIN_LEADING_BYTE + 11)
 
 /* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 11)
+#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 12)
 
 /* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345   (MIN_LEADING_BYTE + 12)
+#define LEADING_BYTE_CHINESE_GB12345   (MIN_LEADING_BYTE + 13)
 
 #define LEADING_BYTE_CHINESE_BIG5      (MIN_LEADING_BYTE + 20)
 
@@ -134,7 +137,6 @@ typedef short Charset_ID;
 #define LEADING_BYTE_GT_PJ_10          (MIN_LEADING_BYTE + 50)
 #define LEADING_BYTE_GT_PJ_11          (MIN_LEADING_BYTE + 51)
 
-#define LEADING_BYTE_CHINA3_JEF                (MIN_LEADING_BYTE + 82)
 #define LEADING_BYTE_CBETA             (MIN_LEADING_BYTE + 83)
 /* #define LEADING_BYTE_CHINESE_BIG5_CDP       (MIN_LEADING_BYTE + 84) */
 #define LEADING_BYTE_HANZIKU_1         (MIN_LEADING_BYTE + 85)
@@ -490,8 +492,10 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
 #define MAX_CHAR_DAIKANWA      (MIN_CHAR_DAIKANWA + 50100) /* 0xE0FFFF */
 #define MIN_CHAR_CBETA         0x00E20000
 #define MAX_CHAR_CBETA         0x00E2FFFF
+/*
 #define MIN_CHAR_CHINA3_JEF    0x00E80000
 #define MAX_CHAR_CHINA3_JEF    0x00E8FFFF
+*/
 
 #define MIN_CHAR_94            0x00E90940
 #define MAX_CHAR_94            (MIN_CHAR_94 + 94 * 80 - 1)

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 0df3c14..75002b7 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -68,6 +68,7 @@ Lisp_Object Vcharset_ucs;
 Lisp_Object Vcharset_ucs_bmp;
 Lisp_Object Vcharset_ucs_smp;
 Lisp_Object Vcharset_ucs_sip;
+Lisp_Object Vcharset_ucs_gb;
 Lisp_Object Vcharset_ucs_cns;
 Lisp_Object Vcharset_ucs_jis;
 Lisp_Object Vcharset_ucs_ks;
@@ -78,7 +79,6 @@ Lisp_Object Vcharset_latin_viscii_lower;
 Lisp_Object Vcharset_latin_viscii_upper;
 Lisp_Object Vcharset_jis_x0208;
 Lisp_Object Vcharset_chinese_big5;
-/* Lisp_Object Vcharset_chinese_big5_cdp; */
 Lisp_Object Vcharset_ideograph_hanziku_1;
 Lisp_Object Vcharset_ideograph_hanziku_2;
 Lisp_Object Vcharset_ideograph_hanziku_3;
@@ -91,7 +91,6 @@ Lisp_Object Vcharset_ideograph_hanziku_9;
 Lisp_Object Vcharset_ideograph_hanziku_10;
 Lisp_Object Vcharset_ideograph_hanziku_11;
 Lisp_Object Vcharset_ideograph_hanziku_12;
-Lisp_Object Vcharset_china3_jef;
 Lisp_Object Vcharset_ideograph_cbeta;
 Lisp_Object Vcharset_ideograph_gt;
 Lisp_Object Vcharset_ideograph_gt_pj_1;
@@ -340,6 +339,7 @@ Lisp_Object Qascii,
   Qucs_bmp,
   Qucs_smp,
   Qucs_sip,
+  Qucs_gb,
   Qucs_cns,
   Qucs_jis,
   Qucs_ks,
@@ -365,7 +365,6 @@ Lisp_Object Qascii,
   Qideograph_hanziku_10,
   Qideograph_hanziku_11,
   Qideograph_hanziku_12,
-  Qchina3_jef,
   Qideograph_cbeta,
   Qideograph_daikanwa_2,
   Qideograph_daikanwa,
@@ -2451,6 +2450,7 @@ syms_of_mule_charset (void)
   defsymbol (&Qucs_bmp,                        "ucs-bmp");
   defsymbol (&Qucs_smp,                        "ucs-smp");
   defsymbol (&Qucs_sip,                        "ucs-sip");
+  defsymbol (&Qucs_gb,                 "ucs-gb");
   defsymbol (&Qucs_cns,                        "ucs-cns");
   defsymbol (&Qucs_jis,                        "ucs-jis");
   defsymbol (&Qucs_ks,                 "ucs-ks");
@@ -2490,7 +2490,6 @@ syms_of_mule_charset (void)
   defsymbol (&Qideograph_hanziku_10,   "ideograph-hanziku-10");
   defsymbol (&Qideograph_hanziku_11,   "ideograph-hanziku-11");
   defsymbol (&Qideograph_hanziku_12,   "ideograph-hanziku-12");
-  defsymbol (&Qchina3_jef,             "china3-jef");
   defsymbol (&Qideograph_cbeta,                "ideograph-cbeta");
   defsymbol (&Qethiopic_ucs,           "ethiopic-ucs");
 #endif
@@ -2602,6 +2601,15 @@ complex_vars_of_mule_charset (void)
                  build_string ("\\(ISO10646.*-2\\|UCS00-2\\)"),
                  Qnil, MIN_CHAR_SIP, MAX_CHAR_SIP,
                  MIN_CHAR_SIP, 0, Qnil, CONVERSION_IDENTICAL);
+  staticpro (&Vcharset_ucs_gb);
+  Vcharset_ucs_gb =
+    make_charset (LEADING_BYTE_UCS_GB, Qucs_gb, 256, 3,
+                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
+                 build_string ("UCS for GB"),
+                 build_string ("UCS for GB"),
+                 build_string ("ISO/IEC 10646 for GB"),
+                 build_string (""),
+                 Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL);
   staticpro (&Vcharset_ucs_cns);
   Vcharset_ucs_cns =
     make_charset (LEADING_BYTE_UCS_CNS, Qucs_cns, 256, 3,
@@ -2982,16 +2990,6 @@ complex_vars_of_mule_charset (void)
   DEF_HANZIKU (10);
   DEF_HANZIKU (11);
   DEF_HANZIKU (12);
-  staticpro (&Vcharset_china3_jef);
-  Vcharset_china3_jef =
-    make_charset (LEADING_BYTE_CHINA3_JEF, Qchina3_jef, 256, 2,
-                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
-                 build_string ("JC3"),
-                 build_string ("JEF + CHINA3"),
-                 build_string ("JEF + CHINA3 private characters"),
-                 build_string ("china3jef-0"),
-                 Qnil, MIN_CHAR_CHINA3_JEF, MAX_CHAR_CHINA3_JEF,
-                 MIN_CHAR_CHINA3_JEF, 0, Qnil, CONVERSION_IDENTICAL);
   staticpro (&Vcharset_ideograph_cbeta);
   Vcharset_ideograph_cbeta =
     make_charset (LEADING_BYTE_CBETA, Qideograph_cbeta, 256, 2,