X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=09b6aa5e29e1effa816a3f97c45f0114295d0242;hb=f17de6fca511ac824ce47a64a740e3b7a3d0c75e;hp=607fb8bce3a027b1b3aa5258e08498a899f33dfa;hpb=d7c781995a27246996a2e835f1180fd3b315c7ae;p=chise%2Fxemacs-chise.git-

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 607fb8b..09b6aa5 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -134,45 +134,47 @@ typedef short Charset_ID;
 /* MULE VISCII-UPPER			(CHARSET_ID_OFFSET_96 + '2') */
 #define LEADING_BYTE_LATIN_VISCII_UPPER	(CHARSET_ID_OFFSET - 7)
 
+#define LEADING_BYTE_CHINESE_BIG5	(CHARSET_ID_OFFSET - 8)
+
 /* Big5 Level 1			2/4 2/{(8),9,10,11} 4/0 '0' */
-#define LEADING_BYTE_CHINESE_BIG5_1	(CHARSET_ID_OFFSET - 8)
+#define LEADING_BYTE_CHINESE_BIG5_1	(CHARSET_ID_OFFSET - 9)
 
 /* Big5 Level 2			2/4 2/{(8),9,10,11} 4/0 '1' */
-#define LEADING_BYTE_CHINESE_BIG5_2	(CHARSET_ID_OFFSET - 9)
+#define LEADING_BYTE_CHINESE_BIG5_2	(CHARSET_ID_OFFSET - 10)
 
-#define LEADING_BYTE_ETHIOPIC_UCS	(CHARSET_ID_OFFSET - 10)
+#define LEADING_BYTE_ETHIOPIC_UCS	(CHARSET_ID_OFFSET - 11)
 
-#define LEADING_BYTE_DAIKANWA		(CHARSET_ID_OFFSET - 11)
-#define LEADING_BYTE_DAIKANWA_EKANJI	(CHARSET_ID_OFFSET - 12)
-#define LEADING_BYTE_MOJIKYO		(CHARSET_ID_OFFSET - 13)
-#define LEADING_BYTE_MOJIKYO_2022_1	(CHARSET_ID_OFFSET - 14)
-#define LEADING_BYTE_MOJIKYO_2022_2	(CHARSET_ID_OFFSET - 15)
+#define LEADING_BYTE_DAIKANWA		(CHARSET_ID_OFFSET - 12)
+#define LEADING_BYTE_DAIKANWA_EKANJI	(CHARSET_ID_OFFSET - 13)
+#define LEADING_BYTE_MOJIKYO		(CHARSET_ID_OFFSET - 14)
+#define LEADING_BYTE_MOJIKYO_2022_1	(CHARSET_ID_OFFSET - 15)
+#define LEADING_BYTE_MOJIKYO_2022_2	(CHARSET_ID_OFFSET - 16)
 
 /* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */
-#define LEADING_BYTE_MOJIKYO_PJ_1	(CHARSET_ID_OFFSET - 16)
-#define LEADING_BYTE_MOJIKYO_PJ_2	(CHARSET_ID_OFFSET - 17)
-#define LEADING_BYTE_MOJIKYO_PJ_3	(CHARSET_ID_OFFSET - 18)
-#define LEADING_BYTE_MOJIKYO_PJ_4	(CHARSET_ID_OFFSET - 19)
-#define LEADING_BYTE_MOJIKYO_PJ_5	(CHARSET_ID_OFFSET - 20)
-#define LEADING_BYTE_MOJIKYO_PJ_6	(CHARSET_ID_OFFSET - 21)
-#define LEADING_BYTE_MOJIKYO_PJ_7	(CHARSET_ID_OFFSET - 22)
-#define LEADING_BYTE_MOJIKYO_PJ_8	(CHARSET_ID_OFFSET - 23)
-#define LEADING_BYTE_MOJIKYO_PJ_9	(CHARSET_ID_OFFSET - 24)
-#define LEADING_BYTE_MOJIKYO_PJ_10	(CHARSET_ID_OFFSET - 25)
-#define LEADING_BYTE_MOJIKYO_PJ_11	(CHARSET_ID_OFFSET - 26)
-#define LEADING_BYTE_MOJIKYO_PJ_12	(CHARSET_ID_OFFSET - 27)
-#define LEADING_BYTE_MOJIKYO_PJ_13	(CHARSET_ID_OFFSET - 28)
-#define LEADING_BYTE_MOJIKYO_PJ_14	(CHARSET_ID_OFFSET - 29)
-#define LEADING_BYTE_MOJIKYO_PJ_15	(CHARSET_ID_OFFSET - 30)
-#define LEADING_BYTE_MOJIKYO_PJ_16	(CHARSET_ID_OFFSET - 31)
-#define LEADING_BYTE_MOJIKYO_PJ_17	(CHARSET_ID_OFFSET - 32)
-#define LEADING_BYTE_MOJIKYO_PJ_18	(CHARSET_ID_OFFSET - 33)
-#define LEADING_BYTE_MOJIKYO_PJ_19	(CHARSET_ID_OFFSET - 34)
-#define LEADING_BYTE_MOJIKYO_PJ_20	(CHARSET_ID_OFFSET - 35)
-#define LEADING_BYTE_MOJIKYO_PJ_21	(CHARSET_ID_OFFSET - 36)
+#define LEADING_BYTE_MOJIKYO_PJ_1	(CHARSET_ID_OFFSET - 17)
+#define LEADING_BYTE_MOJIKYO_PJ_2	(CHARSET_ID_OFFSET - 18)
+#define LEADING_BYTE_MOJIKYO_PJ_3	(CHARSET_ID_OFFSET - 19)
+#define LEADING_BYTE_MOJIKYO_PJ_4	(CHARSET_ID_OFFSET - 20)
+#define LEADING_BYTE_MOJIKYO_PJ_5	(CHARSET_ID_OFFSET - 21)
+#define LEADING_BYTE_MOJIKYO_PJ_6	(CHARSET_ID_OFFSET - 22)
+#define LEADING_BYTE_MOJIKYO_PJ_7	(CHARSET_ID_OFFSET - 23)
+#define LEADING_BYTE_MOJIKYO_PJ_8	(CHARSET_ID_OFFSET - 24)
+#define LEADING_BYTE_MOJIKYO_PJ_9	(CHARSET_ID_OFFSET - 25)
+#define LEADING_BYTE_MOJIKYO_PJ_10	(CHARSET_ID_OFFSET - 26)
+#define LEADING_BYTE_MOJIKYO_PJ_11	(CHARSET_ID_OFFSET - 27)
+#define LEADING_BYTE_MOJIKYO_PJ_12	(CHARSET_ID_OFFSET - 28)
+#define LEADING_BYTE_MOJIKYO_PJ_13	(CHARSET_ID_OFFSET - 29)
+#define LEADING_BYTE_MOJIKYO_PJ_14	(CHARSET_ID_OFFSET - 30)
+#define LEADING_BYTE_MOJIKYO_PJ_15	(CHARSET_ID_OFFSET - 31)
+#define LEADING_BYTE_MOJIKYO_PJ_16	(CHARSET_ID_OFFSET - 32)
+#define LEADING_BYTE_MOJIKYO_PJ_17	(CHARSET_ID_OFFSET - 33)
+#define LEADING_BYTE_MOJIKYO_PJ_18	(CHARSET_ID_OFFSET - 34)
+#define LEADING_BYTE_MOJIKYO_PJ_19	(CHARSET_ID_OFFSET - 35)
+#define LEADING_BYTE_MOJIKYO_PJ_20	(CHARSET_ID_OFFSET - 36)
+#define LEADING_BYTE_MOJIKYO_PJ_21	(CHARSET_ID_OFFSET - 37)
 
 #define MIN_LEADING_BYTE_PRIVATE	MIN_LEADING_BYTE
-#define MAX_LEADING_BYTE_PRIVATE	(CHARSET_ID_OFFSET - 37)
+#define MAX_LEADING_BYTE_PRIVATE	(CHARSET_ID_OFFSET - 38)
 
 
 /* #define CHARSET_ID_OFFSET_94		(CHARSET_ID_OFFSET - '0') */
@@ -730,9 +732,11 @@ CHAR_TO_CHARC (Emchar ch)
 
 EXFUN (Fget_charset, 1);
 
+extern Lisp_Object Vcharset_chinese_big5;
 extern Lisp_Object Vcharset_chinese_big5_1;
 extern Lisp_Object Vcharset_chinese_big5_2;
 extern Lisp_Object Vcharset_japanese_jisx0208;
+extern Lisp_Object Vcharset_japanese_jisx0208_1990;
 extern Lisp_Object Vcharset_japanese_jisx0212;
 
 #endif /* INCLUDED_char_ucs_h_ */