(LEADING_BYTE_DAIKANWA): New macro.

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

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 6daf6af..0d6237b 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -385,12 +385,16 @@ Lisp_Object Vcharacter_variant_table;
 
 Lisp_Object Q_decomposition;
 Lisp_Object Q_ucs;
-Lisp_Object Qwide;
-Lisp_Object Qnarrow;
 Lisp_Object Qcompat;
 Lisp_Object QnoBreak;
-Lisp_Object Qsuper;
 Lisp_Object Qfraction;
+Lisp_Object Qsuper;
+Lisp_Object Qsub;
+Lisp_Object Qcircle;
+Lisp_Object Qsquare;
+Lisp_Object Qwide;
+Lisp_Object Qnarrow;
+Lisp_Object Qfont;
 
 Emchar
 to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
@@ -399,18 +403,26 @@ to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
     return XINT (v);
   if (CHARP (v))
     return XCHAR (v);
-  else if (EQ (v, Qwide))
+  else if (EQ (v, Qcompat))
     return -1;
-  else if (EQ (v, Qnarrow))
+  else if (EQ (v, QnoBreak))
     return -2;
-  else if (EQ (v, Qcompat))
+  else if (EQ (v, Qfraction))
     return -3;
-  else if (EQ (v, QnoBreak))
-    return -4;
   else if (EQ (v, Qsuper))
+    return -4;
+  else if (EQ (v, Qsub))
     return -5;
-  else if (EQ (v, Qfraction))
+  else if (EQ (v, Qcircle))
     return -6;
+  else if (EQ (v, Qsquare))
+    return -7;
+  else if (EQ (v, Qwide))
+    return -8;
+  else if (EQ (v, Qnarrow))
+    return -9;
+  else if (EQ (v, Qfont))
+    return -10;
   else 
     signal_simple_error (err_msg, err_arg);
 }
@@ -517,6 +529,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 {
   Lisp_Object ccs;
 
+  CHECK_CHAR (character);
   ccs = Ffind_charset (attribute);
   if (!NILP (ccs))
     {
@@ -564,6 +577,8 @@ Store CHARACTER's ATTRIBUTE with VALUE.
          XCHARSET_DECODING_TABLE (ccs) = v = make_vector (ccs_len, Qnil);
        }
 
+      if (XCHARSET_GRAPHIC (ccs) == 1)
+       value = Fcopy_list (value);
       rest = value;
       i = -1;
       while (CONSP (rest))
@@ -571,9 +586,16 @@ Store CHARACTER's ATTRIBUTE with VALUE.
          Lisp_Object ei = Fcar (rest);
          
          if (!INTP (ei))
-           signal_simple_error ("Invalid value for coded-charset",
-                                value);
-         i = XINT (ei) - XCHARSET_BYTE_OFFSET (ccs);
+           signal_simple_error ("Invalid value for coded-charset", value);
+         i = XINT (ei);
+         if ((i < 0) || (255 < i))
+           signal_simple_error ("Invalid value for coded-charset", value);
+         if (XCHARSET_GRAPHIC (ccs) == 1)
+           {
+             i &= 0x7F;
+             Fsetcar (rest, make_int (i));
+           }
+         i -= XCHARSET_BYTE_OFFSET (ccs);
          nv = XVECTOR_DATA(v)[i];
          rest = Fcdr (rest);
          if (CONSP (rest))
@@ -2494,12 +2516,16 @@ syms_of_mule_charset (void)
 #ifdef UTF2000
   defsymbol (&Q_ucs,                   "->ucs");
   defsymbol (&Q_decomposition,         "->decomposition");
-  defsymbol (&Qwide,                   "wide");
-  defsymbol (&Qnarrow,                 "narrow");
   defsymbol (&Qcompat,                 "compat");
   defsymbol (&QnoBreak,                        "noBreak");
-  defsymbol (&Qsuper,                  "super");
   defsymbol (&Qfraction,               "fraction");
+  defsymbol (&Qsuper,                  "super");
+  defsymbol (&Qsub,                    "sub");
+  defsymbol (&Qcircle,                 "circle");
+  defsymbol (&Qsquare,                 "square");
+  defsymbol (&Qwide,                   "wide");
+  defsymbol (&Qnarrow,                 "narrow");
+  defsymbol (&Qfont,                   "font");
   defsymbol (&Qucs,                    "ucs");
   defsymbol (&Qucs_bmp,                        "ucs-bmp");
   defsymbol (&Qlatin_viscii,           "latin-viscii");