(insert-char-attributes): Regard `->wrong-ideograph' and

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

diff --git a/src/mule-charset.c b/src/mule-charset.c
index c254ffe..f8bb68b 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -73,6 +73,7 @@ Lisp_Object Vcharset_latin_tcvn5712;
 Lisp_Object Vcharset_latin_viscii_lower;
 Lisp_Object Vcharset_latin_viscii_upper;
 Lisp_Object Vcharset_chinese_big5;
+Lisp_Object Vcharset_chinese_big5_cdp;
 Lisp_Object Vcharset_ideograph_gt;
 Lisp_Object Vcharset_ideograph_gt_pj_1;
 Lisp_Object Vcharset_ideograph_gt_pj_2;
@@ -1613,6 +1614,7 @@ Lisp_Object Qascii,
   Qvietnamese_viscii_lower,
   Qvietnamese_viscii_upper,
   Qchinese_big5,
+  Qchinese_big5_cdp,
   Qideograph_gt,
   Qideograph_gt_pj_1,
   Qideograph_gt_pj_2,
@@ -2378,22 +2380,12 @@ encode_builtin_char_1 (Emchar c, Lisp_Object* charset)
       return c & 0x7F;
     }
   /*
-  else if ((MIN_CHAR_GREEK <= c) && (c <= MAX_CHAR_GREEK))
-    {
-      *charset = Vcharset_greek_iso8859_7;
-      return c - MIN_CHAR_GREEK + 0x20;
-    }
-  else if ((MIN_CHAR_CYRILLIC <= c) && (c <= MAX_CHAR_CYRILLIC))
-    {
-      *charset = Vcharset_cyrillic_iso8859_5;
-      return c - MIN_CHAR_CYRILLIC + 0x20;
-    }
-  */
   else if ((MIN_CHAR_HEBREW <= c) && (c <= MAX_CHAR_HEBREW))
     {
       *charset = Vcharset_hebrew_iso8859_8;
       return c - MIN_CHAR_HEBREW + 0x20;
     }
+  */
   else if ((MIN_CHAR_THAI <= c) && (c <= MAX_CHAR_THAI))
     {
       *charset = Vcharset_thai_tis620;
@@ -3571,6 +3563,7 @@ syms_of_mule_charset (void)
   defsymbol (&Qideograph_gt_pj_11,     "ideograph-gt-pj-11");
   defsymbol (&Qideograph_daikanwa,     "ideograph-daikanwa");
   defsymbol (&Qchinese_big5,           "chinese-big5");
+  defsymbol (&Qchinese_big5_cdp,       "chinese-big5-cdp");
   defsymbol (&Qmojikyo,                        "mojikyo");
   defsymbol (&Qmojikyo_2022_1,         "mojikyo-2022-1");
   defsymbol (&Qmojikyo_pj_1,           "mojikyo-pj-1");
@@ -3719,8 +3712,8 @@ complex_vars_of_mule_charset (void)
 #else
 # define MIN_CHAR_THAI 0
 # define MAX_CHAR_THAI 0
-# define MIN_CHAR_HEBREW 0
-# define MAX_CHAR_HEBREW 0
+  /* # define MIN_CHAR_HEBREW 0 */
+  /* # define MAX_CHAR_HEBREW 0 */
 # define MIN_CHAR_HALFWIDTH_KATAKANA 0
 # define MAX_CHAR_HALFWIDTH_KATAKANA 0
 #endif
@@ -3795,9 +3788,7 @@ complex_vars_of_mule_charset (void)
                  build_string ("ISO8859-7 (Greek)"),
                  build_string ("ISO8859-7 (Greek)"),
                  build_string ("iso8859-7"),
-                 Qnil,
-                 0 /* MIN_CHAR_GREEK */,
-                 0 /* MAX_CHAR_GREEK */, 0, 32);
+                 Qnil, 0, 0, 0, 32);
   staticpro (&Vcharset_arabic_iso8859_6);
   Vcharset_arabic_iso8859_6 =
     make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 96, 1,
@@ -3815,7 +3806,9 @@ complex_vars_of_mule_charset (void)
                  build_string ("ISO8859-8 (Hebrew)"),
                  build_string ("ISO8859-8 (Hebrew)"),
                  build_string ("iso8859-8"),
-                 Qnil, MIN_CHAR_HEBREW, MAX_CHAR_HEBREW, 0, 32);
+                 Qnil,
+                 0 /* MIN_CHAR_HEBREW */,
+                 0 /* MAX_CHAR_HEBREW */, 0, 32);
   staticpro (&Vcharset_katakana_jisx0201);
   Vcharset_katakana_jisx0201 =
     make_charset (LEADING_BYTE_KATAKANA_JISX0201, Qkatakana_jisx0201, 94, 1,
@@ -3842,9 +3835,7 @@ complex_vars_of_mule_charset (void)
                  build_string ("ISO8859-5 (Cyrillic)"),
                  build_string ("ISO8859-5 (Cyrillic)"),
                  build_string ("iso8859-5"),
-                 Qnil,
-                 0 /* MIN_CHAR_CYRILLIC */,
-                 0 /* MAX_CHAR_CYRILLIC */, 0, 32);
+                 Qnil, 0, 0, 0, 32);
   staticpro (&Vcharset_latin_iso8859_9);
   Vcharset_latin_iso8859_9 =
     make_charset (LEADING_BYTE_LATIN_ISO8859_9, Qlatin_iso8859_9, 96, 1,
@@ -3992,6 +3983,15 @@ complex_vars_of_mule_charset (void)
                  build_string ("Big5 Chinese traditional"),
                  build_string ("big5"),
                  Qnil, 0, 0, 0, 0);
+  staticpro (&Vcharset_chinese_big5_cdp);
+  Vcharset_chinese_big5_cdp =
+    make_charset (LEADING_BYTE_CHINESE_BIG5_CDP, Qchinese_big5_cdp, 256, 2,
+                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Big5-CDP"),
+                 build_string ("Big5 + CDP extension"),
+                 build_string ("Big5 with CDP extension"),
+                 build_string ("big5\\.cdp-0"),
+                 Qnil, 0, 0, 0, 0);
   staticpro (&Vcharset_ideograph_gt);
   Vcharset_ideograph_gt =
     make_charset (LEADING_BYTE_GT, Qideograph_gt, 256, 3,
@@ -4010,7 +4010,7 @@ complex_vars_of_mule_charset (void)
                  build_string ("GT (pseudo JIS encoding) part "#n),    \
                  build_string ("GT 2000 (pseudo JIS encoding) part "#n), \
                  build_string                                          \
-                 ("\\(GT2000PJ-"#n "\\|jisx0208\\.GT2000-"#n "\\)$"),  \
+                 ("\\(GTpj-"#n "\\|jisx0208\\.GT-"#n "\\)$"),  \
                  Qnil, 0, 0, 0, 33);
   DEF_GT_PJ (1);
   DEF_GT_PJ (2);