This commit was manufactured by cvs2svn to create branch 'utf-2000'.

[chise/xemacs-chise.git-] / src / char-ucs.h

diff --git a/src/char-ucs.h b/src/char-ucs.h
index b516033..b4699e9 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -365,8 +365,19 @@ CHARSET_ENCODING_TABLE (Lisp_Charset* cs)
 }
 
 #define CONVERSION_IDENTICAL   0
-#define CONVERSION_94x60       1
-#define CONVERSION_94x94x60    2
+#define CONVERSION_94          1
+#define CONVERSION_96          2
+#define CONVERSION_94x94       3
+#define CONVERSION_96x96       4
+#define CONVERSION_94x94x94    5
+#define CONVERSION_96x96x96    6
+#define CONVERSION_94x94x94x94 7
+#define CONVERSION_96x96x96x96 8
+#define CONVERSION_94x60       9
+#define CONVERSION_94x94x60    10
+#define CONVERSION_94x94x94x60 11
+#define CONVERSION_BIG5_1      12
+#define CONVERSION_BIG5_2      13
 
 #define XCHARSET_ID(cs)                  CHARSET_ID           (XCHARSET (cs))
 #define XCHARSET_NAME(cs)        CHARSET_NAME         (XCHARSET (cs))
@@ -683,33 +694,8 @@ DECODE_CHAR (Lisp_Object charset, int code_point)
 
   if (char_id >= 0)
     return char_id;
-  else if (XCHARSET_DIMENSION (charset) == 1)
+  else
     return decode_builtin_char (charset, code_point);
-  else if (EQ (charset, Vcharset_chinese_big5_1))
-    {
-      unsigned int I
-       = ((code_point >> 8) - 33) * (0xFF - 0xA1)
-       + ((code_point & 0xFF) - 33);
-      unsigned char b1 = I / (0xFF - 0xA1 + 0x7F - 0x40) + 0xA1;
-      unsigned char b2 = I % (0xFF - 0xA1 + 0x7F - 0x40);
-
-      b2 += b2 < 0x3F ? 0x40 : 0x62;
-      return DECODE_CHAR (Vcharset_chinese_big5, (b1 << 8) | b2);
-    }
-  else if (EQ (charset, Vcharset_chinese_big5_2))
-    {
-      unsigned int I
-       = ((code_point >> 8) - 33) * (0xFF - 0xA1)
-       + ((code_point & 0xFF) - 33);
-      unsigned char b1, b2;
-
-      I += (0xFF - 0xA1 + 0x7F - 0x40) * (0xC9 - 0xA1);
-      b1 = I / (0xFF - 0xA1 + 0x7F - 0x40) + 0xA1;
-      b2 = I % (0xFF - 0xA1 + 0x7F - 0x40);
-      b2 += b2 < 0x3F ? 0x40 : 0x62;
-      return DECODE_CHAR (Vcharset_chinese_big5, (b1 << 8) | b2);
-    }
-  return decode_builtin_char (charset, code_point);
 }
 
 /* Return a character whose charset is CHARSET and position-codes