Sync up with r21-4-10-utf-2000-0_20-8.

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

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 7b68791..3698e70 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -1,5 +1,5 @@
 /* Header for UCS-4 character representation.
-   Copyright (C) 1999,2000,2001,2002 MORIOKA Tomohiko
+   Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -76,26 +76,26 @@ typedef short Charset_ID;
 /* ISO/IEC 10646 SIP */
 #define LEADING_BYTE_UCS_SIP           (MIN_LEADING_BYTE + 5)
 
+/* ISO/IEC 10646 for GB */
+#define LEADING_BYTE_UCS_GB            (MIN_LEADING_BYTE + 6)
+
 /* ISO/IEC 10646 for CNS */
-#define LEADING_BYTE_UCS_CNS           (MIN_LEADING_BYTE + 6)
+#define LEADING_BYTE_UCS_CNS           (MIN_LEADING_BYTE + 7)
 
 /* ISO/IEC 10646 for JIS */
-#define LEADING_BYTE_UCS_JIS           (MIN_LEADING_BYTE + 7)
+#define LEADING_BYTE_UCS_JIS           (MIN_LEADING_BYTE + 8)
 
 /* ISO/IEC 10646 for KS */
-#define LEADING_BYTE_UCS_KS            (MIN_LEADING_BYTE + 8)
-
-/* ISO/IEC 10646 for Big5 */
-#define LEADING_BYTE_UCS_BIG5          (MIN_LEADING_BYTE + 9)
+#define LEADING_BYTE_UCS_KS            (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)
+#define LEADING_BYTE_JIS_X0208                 (MIN_LEADING_BYTE + 11)
 
 /* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 11)
+#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 12)
 
 /* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345   (MIN_LEADING_BYTE + 12)
+#define LEADING_BYTE_CHINESE_GB12345   (MIN_LEADING_BYTE + 13)
 
 #define LEADING_BYTE_CHINESE_BIG5      (MIN_LEADING_BYTE + 20)
 
@@ -121,7 +121,6 @@ typedef short Charset_ID;
 #define LEADING_BYTE_DAIKANWA_2                (MIN_LEADING_BYTE + 30)
 #define LEADING_BYTE_DAIKANWA_3                (MIN_LEADING_BYTE + 31)
 
-#define LEADING_BYTE_GT                        (MIN_LEADING_BYTE + 40)
 #define LEADING_BYTE_GT_PJ_1           (MIN_LEADING_BYTE + 41)
 #define LEADING_BYTE_GT_PJ_2           (MIN_LEADING_BYTE + 42)
 #define LEADING_BYTE_GT_PJ_3           (MIN_LEADING_BYTE + 43)
@@ -134,8 +133,6 @@ typedef short Charset_ID;
 #define LEADING_BYTE_GT_PJ_10          (MIN_LEADING_BYTE + 50)
 #define LEADING_BYTE_GT_PJ_11          (MIN_LEADING_BYTE + 51)
 
-#define LEADING_BYTE_CHINA3_JEF                (MIN_LEADING_BYTE + 82)
-#define LEADING_BYTE_CBETA             (MIN_LEADING_BYTE + 83)
 /* #define LEADING_BYTE_CHINESE_BIG5_CDP       (MIN_LEADING_BYTE + 84) */
 #define LEADING_BYTE_HANZIKU_1         (MIN_LEADING_BYTE + 85)
 #define LEADING_BYTE_HANZIKU_2         (MIN_LEADING_BYTE + 86)
@@ -313,7 +310,6 @@ DECLARE_LRECORD (charset, Lisp_Charset);
 #define XCHARSET(x) XRECORD (x, charset, Lisp_Charset)
 #define XSETCHARSET(x, p) XSETRECORD (x, p, charset)
 #define CHARSETP(x) RECORDP (x, charset)
-#define GC_CHARSETP(x) GC_RECORDP (x, charset)
 #define CHECK_CHARSET(x) CHECK_RECORD (x, charset)
 #define CONCHECK_CHARSET(x) CONCHECK_RECORD (x, charset)
 
@@ -488,10 +484,13 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
 
 #define MIN_CHAR_DAIKANWA      0x00E00000
 #define MAX_CHAR_DAIKANWA      (MIN_CHAR_DAIKANWA + 50100) /* 0xE0FFFF */
+/*
 #define MIN_CHAR_CBETA         0x00E20000
 #define MAX_CHAR_CBETA         0x00E2FFFF
+
 #define MIN_CHAR_CHINA3_JEF    0x00E80000
 #define MAX_CHAR_CHINA3_JEF    0x00E8FFFF
+*/
 
 #define MIN_CHAR_94            0x00E90940
 #define MAX_CHAR_94            (MIN_CHAR_94 + 94 * 80 - 1)
@@ -505,8 +504,10 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
 #define MIN_CHAR_96x96         0xF4C000
 #define MAX_CHAR_96x96         (MIN_CHAR_96x96 + 96 * 96 * 80 - 1)
 
+/*
 #define MIN_CHAR_GT            0x61000000
 #define MAX_CHAR_GT            (MIN_CHAR_GT + 66773)
+*/
 #define MIN_CHAR_BIG5_CDP      0x62000000
 #define MAX_CHAR_BIG5_CDP      0x6200FFFF
 #define MIN_CHAR_HANZIKU_1     (0x62000000 + 65536 * 1)