X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmule-charset.c;h=29c60069811604de8a75120ec2f99caa540348dc;hb=313d1c4d8bd1f94564e5edda76ee6aac3ecb70fd;hp=046f0b8b6e4660b18ebf412502d43f29aaf5f4e3;hpb=e75803a7d6a0a6178097a1891872b0cefb839f2b;p=chise%2Fxemacs-chise.git-

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 046f0b8..29c6006 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -62,9 +62,8 @@ Lisp_Object Vcharset_ucs_bmp;
 Lisp_Object Vcharset_latin_viscii;
 Lisp_Object Vcharset_latin_viscii_lower;
 Lisp_Object Vcharset_latin_viscii_upper;
+Lisp_Object Vcharset_ideograph_daikanwa;
 Lisp_Object Vcharset_ethiopic_ucs;
-Lisp_Object Vcharset_hiragana_jisx0208;
-Lisp_Object Vcharset_katakana_jisx0208;
 #endif
 Lisp_Object Vcharset_chinese_big5_1;
 Lisp_Object Vcharset_chinese_big5_2;
@@ -391,6 +390,7 @@ Lisp_Object Qfraction;
 Lisp_Object Qsuper;
 Lisp_Object Qsub;
 Lisp_Object Qcircle;
+Lisp_Object Qsquare;
 Lisp_Object Qwide;
 Lisp_Object Qnarrow;
 Lisp_Object Qfont;
@@ -414,12 +414,14 @@ to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
     return -5;
   else if (EQ (v, Qcircle))
     return -6;
-  else if (EQ (v, Qwide))
+  else if (EQ (v, Qsquare))
     return -7;
-  else if (EQ (v, Qnarrow))
+  else if (EQ (v, Qwide))
     return -8;
-  else if (EQ (v, Qfont))
+  else if (EQ (v, Qnarrow))
     return -9;
+  else if (EQ (v, Qfont))
+    return -10;
   else 
     signal_simple_error (err_msg, err_arg);
 }
@@ -526,6 +528,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 {
   Lisp_Object ccs;
 
+  CHECK_CHAR (character);
   ccs = Ffind_charset (attribute);
   if (!NILP (ccs))
     {
@@ -812,9 +815,8 @@ Lisp_Object Qascii,
   Qlatin_viscii_upper,
   Qvietnamese_viscii_lower,
   Qvietnamese_viscii_upper,
+  Qideograph_daikanwa,
   Qethiopic_ucs,
-  Qhiragana_jisx0208,
-  Qkatakana_jisx0208,
 #endif
   Qchinese_big5_1,
   Qchinese_big5_2,
@@ -1542,6 +1544,12 @@ split_builtin_char (Emchar c)
 		    make_int ((((c - MIN_CHAR_OBS_94x94) / 94) % 94) + 33),
 		    make_int (((c - MIN_CHAR_OBS_94x94) % 94) + 33));
     }
+  else if (c <= MAX_CHAR_DAIKANWA)
+    {
+      return list3 (Vcharset_ideograph_daikanwa,
+		    make_int ((c - MIN_CHAR_DAIKANWA) >> 8),
+		    make_int ((c - MIN_CHAR_DAIKANWA) & 255));
+    }
   else if (c <= MAX_CHAR_94)
     {
       return list2 (CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_94,
@@ -2330,6 +2338,18 @@ Return list of charset and one or two position-codes of CHAR.
 */
        (character))
 {
+#ifdef UTF2000
+  Lisp_Object ret;
+  Lisp_Object charset;
+
+  CHECK_CHAR_COERCE_INT (character);
+  ret = SPLIT_CHAR (XCHAR (character));
+  charset = Fcar (ret);
+  if (CHARSETP (charset))
+    return Fcons (XCHARSET_NAME (charset), Fcopy_list (Fcdr (ret)));
+  else
+    return ret;
+#else
   /* This function can GC */
   struct gcpro gcpro1, gcpro2;
   Lisp_Object charset = Qnil;
@@ -2350,8 +2370,8 @@ Return list of charset and one or two position-codes of CHAR.
       rc = list2 (XCHARSET_NAME (charset), make_int (c1));
     }
   UNGCPRO;
-
   return rc;
+#endif
 }
 
 
@@ -2518,6 +2538,7 @@ syms_of_mule_charset (void)
   defsymbol (&Qsuper,			"super");
   defsymbol (&Qsub,			"sub");
   defsymbol (&Qcircle,			"circle");
+  defsymbol (&Qsquare,			"square");
   defsymbol (&Qwide,			"wide");
   defsymbol (&Qnarrow,			"narrow");
   defsymbol (&Qfont,			"font");
@@ -2528,9 +2549,8 @@ syms_of_mule_charset (void)
   defsymbol (&Qlatin_viscii_upper,	"latin-viscii-upper");
   defsymbol (&Qvietnamese_viscii_lower,	"vietnamese-viscii-lower");
   defsymbol (&Qvietnamese_viscii_upper,	"vietnamese-viscii-upper");
+  defsymbol (&Qideograph_daikanwa,	"ideograph-daikanwa");
   defsymbol (&Qethiopic_ucs,		"ethiopic-ucs");
-  defsymbol (&Qhiragana_jisx0208, 	"hiragana-jisx0208");
-  defsymbol (&Qkatakana_jisx0208, 	"katakana-jisx0208");
 #endif
   defsymbol (&Qchinese_big5_1,		"chinese-big5-1");
   defsymbol (&Qchinese_big5_2,		"chinese-big5-2");
@@ -2857,6 +2877,15 @@ complex_vars_of_mule_charset (void)
 		  build_string ("VISCII 1.1 (Vietnamese)"),
 		  build_string ("VISCII1\\.1"),
 		  Qnil, 0, 0, 0, 0);
+  Vcharset_ideograph_daikanwa =
+    make_charset (LEADING_BYTE_DAIKANWA, Qideograph_daikanwa,
+		  CHARSET_TYPE_256X256, 2, 2, 0,
+		  CHARSET_LEFT_TO_RIGHT,
+		  build_string ("Daikanwa"),
+		  build_string ("Morohashi's Daikanwa"),
+		  build_string ("Daikanwa dictionary by MOROHASHI Tetsuji"),
+		  build_string ("Daikanwa"),
+		  Qnil, MIN_CHAR_DAIKANWA, MAX_CHAR_DAIKANWA, 0, 0);
   Vcharset_ethiopic_ucs =
     make_charset (LEADING_BYTE_ETHIOPIC_UCS, Qethiopic_ucs,
 		  CHARSET_TYPE_256X256, 2, 2, 0,
@@ -2866,26 +2895,6 @@ complex_vars_of_mule_charset (void)
 		  build_string ("Ethiopic of UCS"),
 		  build_string ("Ethiopic-Unicode"),
 		  Qnil, 0x1200, 0x137F, 0x1200, 0);
-  Vcharset_hiragana_jisx0208 =
-    make_charset (LEADING_BYTE_HIRAGANA_JISX0208, Qhiragana_jisx0208,
-		  CHARSET_TYPE_94X94, 2, 0, 'B',
-		  CHARSET_LEFT_TO_RIGHT,
-		  build_string ("Hiragana"),
-		  build_string ("Hiragana of JIS X0208"),
-		  build_string ("Japanese Hiragana of JIS X0208"),
-		  build_string ("jisx0208\\.19\\(78\\|83\\|90\\)"),
-		  Qnil, MIN_CHAR_HIRAGANA, MAX_CHAR_HIRAGANA,
-		  (0x24 - 33) * 94 + (0x21 - 33), 33);
-  Vcharset_katakana_jisx0208 =
-    make_charset (LEADING_BYTE_KATAKANA_JISX0208, Qkatakana_jisx0208,
-		  CHARSET_TYPE_94X94, 2, 0, 'B',
-		  CHARSET_LEFT_TO_RIGHT,
-		  build_string ("Katakana"),
-		  build_string ("Katakana of JIS X0208"),
-		  build_string ("Japanese Katakana of JIS X0208"),
-		  build_string ("jisx0208\\.19\\(78\\|83\\|90\\)"),
-		  Qnil, MIN_CHAR_KATAKANA, MAX_CHAR_KATAKANA,
-		  (0x25 - 33) * 94 + (0x21 - 33), 33);
 #endif
   Vcharset_chinese_big5_1 =
     make_charset (LEADING_BYTE_CHINESE_BIG5_1, Qchinese_big5_1,