Sync up with r21-4-11-chise-0_20-=ucs-big5.

[chise/xemacs-chise.git-] / src / mule-charset.c

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 7c6aa60..9399ee4 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -68,8 +68,6 @@ 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_latin_viscii;
 Lisp_Object Vcharset_latin_tcvn5712;
 Lisp_Object Vcharset_latin_viscii_lower;
@@ -178,7 +176,7 @@ Lisp_Object
 put_char_ccs_code_point (Lisp_Object character,
                         Lisp_Object ccs, Lisp_Object value)
 {
-  if (!EQ (XCHARSET_NAME (ccs), Qucs)
+  if (!EQ (XCHARSET_NAME (ccs), Qmap_ucs)
       || !INTP (value)
       || (XCHAR (character) != XINT (value)))
     {
@@ -299,25 +297,23 @@ Lisp_Object Qascii,
   Qchinese_gb2312,
   Qchinese_gb12345,
   Qjapanese_jisx0208,
-  Qjapanese_jisx0208_1990,
   Qkorean_ksc5601,
   Qjapanese_jisx0212,
   Qchinese_cns11643_1,
   Qchinese_cns11643_2,
 #ifdef UTF2000
-  Qucs,
+  Qmap_ucs, Qucs,
   Qucs_bmp,
   Qucs_smp,
   Qucs_sip,
-  Qucs_gb,
-  Qucs_cns,
   Qlatin_viscii,
   Qlatin_tcvn5712,
   Qlatin_viscii_lower,
   Qlatin_viscii_upper,
   Qvietnamese_viscii_lower,
   Qvietnamese_viscii_upper,
-  Qjis_x0208,
+  Qmap_jis_x0208,
+  Qmap_jis_x0208_1990,
   Qchinese_big5,
   Qethiopic_ucs,
 #endif
@@ -1902,7 +1898,7 @@ Set mapping-table of CHARSET to TABLE.
        (charset, table))
 {
   struct Lisp_Charset *cs;
-  size_t i;
+  int i;
   int byte_offset;
 
   charset = Fget_charset (charset);
@@ -1955,7 +1951,7 @@ Set mapping-table of CHARSET to TABLE.
 
          if (VECTORP (v))
            {
-             size_t j;
+             int j;
 
              for (j = 0; j < XVECTOR_LENGTH (v); j++)
                {
@@ -2369,25 +2365,24 @@ syms_of_mule_charset (void)
   defsymbol (&Qchinese_gb2312,         "chinese-gb2312");
   defsymbol (&Qchinese_gb12345,                "chinese-gb12345");
   defsymbol (&Qjapanese_jisx0208,      "japanese-jisx0208");
-  defsymbol (&Qjapanese_jisx0208_1990,         "japanese-jisx0208-1990");
   defsymbol (&Qkorean_ksc5601,         "korean-ksc5601");
   defsymbol (&Qjapanese_jisx0212,      "japanese-jisx0212");
   defsymbol (&Qchinese_cns11643_1,     "chinese-cns11643-1");
   defsymbol (&Qchinese_cns11643_2,     "chinese-cns11643-2");
 #ifdef UTF2000
+  defsymbol (&Qmap_ucs,                        "=ucs");
   defsymbol (&Qucs,                    "ucs");
   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 (&Qlatin_viscii,           "latin-viscii");
   defsymbol (&Qlatin_tcvn5712,         "latin-tcvn5712");
   defsymbol (&Qlatin_viscii_lower,     "latin-viscii-lower");
   defsymbol (&Qlatin_viscii_upper,     "latin-viscii-upper");
   defsymbol (&Qvietnamese_viscii_lower,        "vietnamese-viscii-lower");
   defsymbol (&Qvietnamese_viscii_upper,        "vietnamese-viscii-upper");
-  defsymbol (&Qjis_x0208,              "=jis-x0208");
+  defsymbol (&Qmap_jis_x0208,          "=jis-x0208");
+  defsymbol (&Qmap_jis_x0208_1990,     "=jis-x0208-1990");
   defsymbol (&Qchinese_big5,           "chinese-big5");
   defsymbol (&Qethiopic_ucs,           "ethiopic-ucs");
 #endif
@@ -2462,7 +2457,7 @@ complex_vars_of_mule_charset (void)
 #ifdef UTF2000
   staticpro (&Vcharset_ucs);
   Vcharset_ucs =
-    make_charset (LEADING_BYTE_UCS, Qucs, 256, 4,
+    make_charset (LEADING_BYTE_UCS, Qmap_ucs, 256, 4,
                  1, 2, 0, CHARSET_LEFT_TO_RIGHT,
                  build_string ("UCS"),
                  build_string ("UCS"),
@@ -2499,24 +2494,6 @@ 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,
-                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
-                 build_string ("UCS for CNS"),
-                 build_string ("UCS for CNS 11643"),
-                 build_string ("ISO/IEC 10646 for CNS 11643"),
-                 build_string (""),
-                 Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL);
 #else
 # define MIN_CHAR_THAI 0
 # define MAX_CHAR_THAI 0
@@ -2658,7 +2635,7 @@ complex_vars_of_mule_charset (void)
   staticpro (&Vcharset_jis_x0208);
   Vcharset_jis_x0208 =
     make_charset (LEADING_BYTE_JIS_X0208,
-                 Qjis_x0208, 94, 2,
+                 Qmap_jis_x0208, 94, 2,
                  2, 0, 'B', CHARSET_LEFT_TO_RIGHT,
                  build_string ("JIS X0208"),
                  build_string ("JIS X0208 Common"),
@@ -2723,7 +2700,7 @@ complex_vars_of_mule_charset (void)
   staticpro (&Vcharset_japanese_jisx0208_1990);
   Vcharset_japanese_jisx0208_1990 =
     make_charset (LEADING_BYTE_JAPANESE_JISX0208_1990,
-                 Qjapanese_jisx0208_1990, 94, 2,
+                 Qmap_jis_x0208_1990, 94, 2,
                  2, 0, 0, CHARSET_LEFT_TO_RIGHT,
                  build_string ("JISX0208-1990"),
                  build_string ("JIS X0208:1990 (Japanese)"),