X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=7b68791a667fe5097b61989915008b8f1840ff89;hb=8cb607466069d4f1c0d792367028249c3a6bda2c;hp=46f51d30c57f898db2ee048f05fe5448ac2babdb;hpb=90daab9402123e434d9b96dfbc537052124a7500;p=chise%2Fxemacs-chise.git-

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 46f51d3..7b68791 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -88,11 +88,14 @@ typedef short Charset_ID;
 /* ISO/IEC 10646 for Big5 */
 #define LEADING_BYTE_UCS_BIG5		(MIN_LEADING_BYTE + 9)
 
+/* Japanese JIS X0208 Common	2/4 2/{(8),9,10,11} 4/2 (B) */
+#define LEADING_BYTE_JIS_X0208 		(MIN_LEADING_BYTE + 10)
+
 /* Japanese JIS X0208-1990	2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 10)
+#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 11)
 
 /* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345	(MIN_LEADING_BYTE + 11)
+#define LEADING_BYTE_CHINESE_GB12345	(MIN_LEADING_BYTE + 12)
 
 #define LEADING_BYTE_CHINESE_BIG5	(MIN_LEADING_BYTE + 20)
 
@@ -363,8 +366,17 @@ 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_94x60	3
+#define CONVERSION_94x94	4
+#define CONVERSION_96x96	5
+#define CONVERSION_94x94x60	6
+#define CONVERSION_94x94x94	7
+#define CONVERSION_96x96x96	8
+#define CONVERSION_94x94x94x60	9
+#define CONVERSION_94x94x94x94	10
+#define CONVERSION_96x96x96x96	11
 
 #define XCHARSET_ID(cs)		  CHARSET_ID           (XCHARSET (cs))
 #define XCHARSET_NAME(cs)	  CHARSET_NAME         (XCHARSET (cs))
@@ -692,7 +704,7 @@ MAKE_CHAR (Lisp_Object charset, int c1, int c2)
 extern Lisp_Object Vcharacter_attribute_table;
 
 int encode_builtin_char_1 (Emchar c, Lisp_Object* charset);
-int charset_code_point (Lisp_Object charset, Emchar ch);
+int charset_code_point (Lisp_Object charset, Emchar ch, int defined_only);
 int range_charset_code_point (Lisp_Object charset, Emchar ch);
 
 extern Lisp_Object Vdefault_coded_charset_priority_list;
@@ -709,7 +721,7 @@ encode_char_1 (Emchar ch, Lisp_Object* charset)
       *charset = Ffind_charset (Fcar (charsets));
       if (!NILP (*charset))
 	{
-	  int code_point = charset_code_point (*charset, ch);
+	  int code_point = charset_code_point (*charset, ch, 0);
 
 	  if (code_point >= 0)
 	    return code_point;