X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-charset.c;h=1d148f4e30c7d2080c4437aa091f352d1311d521;hb=3f908d85d7244388b2cea1f93b05f5ebb907a6af;hp=29c60069811604de8a75120ec2f99caa540348dc;hpb=313d1c4d8bd1f94564e5edda76ee6aac3ecb70fd;p=chise%2Fxemacs-chise.git

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 29c6006..1d148f4 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -53,6 +53,7 @@ Lisp_Object Vcharset_latin_iso8859_9;
 Lisp_Object Vcharset_japanese_jisx0208_1978;
 Lisp_Object Vcharset_chinese_gb2312;
 Lisp_Object Vcharset_japanese_jisx0208;
+Lisp_Object Vcharset_japanese_jisx0208_1990;
 Lisp_Object Vcharset_korean_ksc5601;
 Lisp_Object Vcharset_japanese_jisx0212;
 Lisp_Object Vcharset_chinese_cns11643_1;
@@ -485,10 +486,12 @@ Return the value of CHARACTER's ATTRIBUTE.
 */
        (character, attribute))
 {
-  Lisp_Object ret
-    = get_char_code_table (XCHAR (character), Vcharacter_attribute_table);
+  Lisp_Object ret;
   Lisp_Object ccs;
 
+  CHECK_CHAR (character);
+  ret = get_char_code_table (XCHAR (character),
+			     Vcharacter_attribute_table);
   if (EQ (ret, Qnil))
     return Qnil;
 
@@ -666,6 +669,8 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 
 Lisp_Object Qucs;
 
+EXFUN (Fmake_char, 3);
+
 DEFUN ("define-char", Fdefine_char, 1, 1, 0, /*
 Store character's ATTRIBUTES.
 */
@@ -684,71 +689,23 @@ Store character's ATTRIBUTES.
 
 	  if (!LISTP (cell))
 	    signal_simple_error ("Invalid argument", attributes);
-	  if (!NILP (ccs = Ffind_charset (Fcar (cell)))
-	      && XCHARSET_FINAL (ccs))
+	  if (!NILP (ccs = Ffind_charset (Fcar (cell))))
 	    {
-	      Emchar code;
-
-	      if (XCHARSET_DIMENSION (ccs) == 1)
-		{
-		  Lisp_Object eb1 = Fcar (Fcdr (cell));
-		  int b1;
-
-		  if (!INTP (eb1))
-		    signal_simple_error ("Invalid argument", attributes);
-		  b1 = XINT (eb1);
-		  switch (XCHARSET_CHARS (ccs))
-		    {
-		    case 94:
-		      code = MIN_CHAR_94
-			+ (XCHARSET_FINAL (ccs) - '0') * 94 + (b1 - 33);
-		      break;
-		    case 96:
-		      code = MIN_CHAR_96
-			+ (XCHARSET_FINAL (ccs) - '0') * 96 + (b1 - 32);
-		      break;
-		    default:
-		      abort ();
-		    }
-		}
-	      else if (XCHARSET_DIMENSION (ccs) == 2)
-		{
-		  Lisp_Object eb1 = Fcar (Fcdr (cell));
-		  Lisp_Object eb2 = Fcar (Fcdr (Fcdr (cell)));
-		  int b1, b2;
-
-		  if (!INTP (eb1))
-		    signal_simple_error ("Invalid argument", attributes);
-		  b1 = XINT (eb1);
-		  if (!INTP (eb2))
-		    signal_simple_error ("Invalid argument", attributes);
-		  b2 = XINT (eb2);
-		  switch (XCHARSET_CHARS (ccs))
-		    {
-		    case 94:
-		      code = MIN_CHAR_94x94
-			+ (XCHARSET_FINAL (ccs) - '0') * 94 * 94
-			+ (b1 - 33) * 94 + (b2 - 33);
-		      break;
-		    case 96:
-		      code = MIN_CHAR_96x96
-			+ (XCHARSET_FINAL (ccs) - '0') * 96 * 96
-			+ (b1 - 32) * 96 + (b2 - 32);
-		      break;
-		    default:
-		      abort ();
-		    }
-		}
-	      else
-		{
-		  rest = Fcdr (rest);
-		  continue;
-		}
-	      character = make_char (code);
+	      cell = Fcdr (cell);
+	      character = Fmake_char (ccs, Fcar (cell),
+				      Fcar (Fcdr (cell)));
 	      goto setup_attributes;
 	    }
 	  rest = Fcdr (rest);
 	}
+      if (!NILP (code = Fcdr (Fassq (Q_ucs, attributes))))
+	{
+	  if (!INTP (code))
+	    signal_simple_error ("Invalid argument", attributes);
+	  else
+	    character = make_char (XINT (code) + 0x100000);
+	  goto setup_attributes;
+	}
       return Qnil;
     }
   else if (!INTP (code))
@@ -804,6 +761,7 @@ Lisp_Object Qascii,
   Qjapanese_jisx0208_1978,
   Qchinese_gb2312,
   Qjapanese_jisx0208,
+  Qjapanese_jisx0208_1990,
   Qkorean_ksc5601,
   Qjapanese_jisx0212,
   Qchinese_cns11643_1,
@@ -2525,6 +2483,7 @@ syms_of_mule_charset (void)
   defsymbol (&Qjapanese_jisx0208_1978,	"japanese-jisx0208-1978");
   defsymbol (&Qchinese_gb2312,		"chinese-gb2312");
   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");
@@ -2809,6 +2768,18 @@ complex_vars_of_mule_charset (void)
 		  build_string ("JIS X0208:1983 Japanese Kanji"),
 		  build_string ("jisx0208\\.1983"),
 		  Qnil, 0, 0, 0, 33);
+  Vcharset_japanese_jisx0208_1990 =
+    make_charset (LEADING_BYTE_JAPANESE_JISX0208_1990,
+		  Qjapanese_jisx0208_1990,
+		  CHARSET_TYPE_94X94, 2, 0, 0,
+		  CHARSET_LEFT_TO_RIGHT,
+		  build_string ("JISX0208-1990"),
+		  build_string ("JIS X0208:1990 (Japanese)"),
+		  build_string ("JIS X0208:1990 Japanese Kanji"),
+		  build_string ("jisx0208\\.1990"),
+		  Qnil,
+		  MIN_CHAR_JIS_X0208_1990,
+		  MAX_CHAR_JIS_X0208_1990, 0, 33);
   Vcharset_korean_ksc5601 =
     make_charset (LEADING_BYTE_KOREAN_KSC5601, Qkorean_ksc5601,
 		  CHARSET_TYPE_94X94, 2, 0, 'C',