projects / chise / xemacs-chise.git- / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 49696d4)
(CHARSET_ID_OFFSET): Deleted.
authortomo <tomo>
Mon, 8 Apr 2002 17:24:31 +0000 (17:24 +0000)
committertomo <tomo>
Mon, 8 Apr 2002 17:24:31 +0000 (17:24 +0000)
(LEADING_BYTE_*): Use `MIN_LEADING_BYTE + n' instead of
`CHARSET_ID_OFFSET - n' for private CCS.
(LEADING_BYTE_CHINESE_BIG5_CDP): Deleted.
(MIN_LEADING_BYTE_PRIVATE): Use `(MIN_LEADING_BYTE + 97)' instead of
`MIN_LEADING_BYTE'.
(MAX_LEADING_BYTE_PRIVATE): Use `-1' instead of `(CHARSET_ID_OFFSET -
97)'.
(MIN_CHAR_BIG5_CDP): Deleted.
(MAX_CHAR_BIG5_CDP): Deleted.

src/char-ucs.h patch | blob | history

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 199e4b7..dad64cd 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 MORIOKA Tomohiko
+   Copyright (C) 1999,2000,2001,2002 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -40,102 +40,96 @@ extern Lisp_Object Vcharset_latin_jisx0201;
 typedef short Charset_ID;
 
 #define MIN_LEADING_BYTE               -0x200
-#define CHARSET_ID_OFFSET              0x00
 
 /* ISO/IEC 10646 */
-#define LEADING_BYTE_UCS               (CHARSET_ID_OFFSET - 1)
+#define LEADING_BYTE_UCS               (MIN_LEADING_BYTE + 1)
 
 /* represent normal 80-9F */
-#define LEADING_BYTE_CONTROL_1         (CHARSET_ID_OFFSET - 2)
+#define LEADING_BYTE_CONTROL_1         (MIN_LEADING_BYTE + 2)
 
 /* ISO/IEC 10646 BMP */
-#define LEADING_BYTE_UCS_BMP           (CHARSET_ID_OFFSET - 3)
+#define LEADING_BYTE_UCS_BMP           (MIN_LEADING_BYTE + 3)
 
 /* ISO/IEC 10646 SMP */
-#define LEADING_BYTE_UCS_SMP           (CHARSET_ID_OFFSET - 4)
+#define LEADING_BYTE_UCS_SMP           (MIN_LEADING_BYTE + 4)
 
 /* ISO/IEC 10646 SIP */
-#define LEADING_BYTE_UCS_SIP           (CHARSET_ID_OFFSET - 5)
+#define LEADING_BYTE_UCS_SIP           (MIN_LEADING_BYTE + 5)
 
 /* ISO/IEC 10646 for CNS */
-#define LEADING_BYTE_UCS_CNS           (CHARSET_ID_OFFSET - 6)
+#define LEADING_BYTE_UCS_CNS           (MIN_LEADING_BYTE + 6)
 
 /* ISO/IEC 10646 for JIS */
-#define LEADING_BYTE_UCS_JIS           (CHARSET_ID_OFFSET - 7)
+#define LEADING_BYTE_UCS_JIS           (MIN_LEADING_BYTE + 7)
 
 /* ISO/IEC 10646 for KS */
-#define LEADING_BYTE_UCS_KS            (CHARSET_ID_OFFSET - 8)
+#define LEADING_BYTE_UCS_KS            (MIN_LEADING_BYTE + 8)
 
 /* ISO/IEC 10646 for Big5 */
-#define LEADING_BYTE_UCS_BIG5          (CHARSET_ID_OFFSET - 9)
+#define LEADING_BYTE_UCS_BIG5          (MIN_LEADING_BYTE + 9)
 
 /* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 (CHARSET_ID_OFFSET - 10)
+#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 10)
 
 /* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345   (CHARSET_ID_OFFSET - 11)
+#define LEADING_BYTE_CHINESE_GB12345   (MIN_LEADING_BYTE + 11)
 
-#define LEADING_BYTE_CHINESE_BIG5      (CHARSET_ID_OFFSET - 20)
+#define LEADING_BYTE_CHINESE_BIG5      (MIN_LEADING_BYTE + 20)
 
 /* Big5 Level 1                        2/4 2/{(8),9,10,11} 4/0 '0' */
-#define LEADING_BYTE_CHINESE_BIG5_1    (CHARSET_ID_OFFSET - 21)
+#define LEADING_BYTE_CHINESE_BIG5_1    (MIN_LEADING_BYTE + 21)
 
 /* Big5 Level 2                        2/4 2/{(8),9,10,11} 4/0 '1' */
-#define LEADING_BYTE_CHINESE_BIG5_2    (CHARSET_ID_OFFSET - 22)
+#define LEADING_BYTE_CHINESE_BIG5_2    (MIN_LEADING_BYTE + 22)
 
 /* VISCII 1.1 */
-#define LEADING_BYTE_LATIN_VISCII      (CHARSET_ID_OFFSET - 24)
+#define LEADING_BYTE_LATIN_VISCII      (MIN_LEADING_BYTE + 24)
 
 /* MULE VISCII-LOWER                   (CHARSET_ID_OFFSET_96 + '1') */
-#define LEADING_BYTE_LATIN_VISCII_LOWER        (CHARSET_ID_OFFSET - 25)
+#define LEADING_BYTE_LATIN_VISCII_LOWER        (MIN_LEADING_BYTE + 25)
 
 /* MULE VISCII-UPPER                   (CHARSET_ID_OFFSET_96 + '2') */
-#define LEADING_BYTE_LATIN_VISCII_UPPER        (CHARSET_ID_OFFSET - 26)
-
-#define LEADING_BYTE_ETHIOPIC_UCS      (CHARSET_ID_OFFSET - 27)
-
-#define LEADING_BYTE_DAIKANWA_0                (CHARSET_ID_OFFSET - 28)
-#define LEADING_BYTE_DAIKANWA_1                (CHARSET_ID_OFFSET - 29)
-#define LEADING_BYTE_DAIKANWA_2                (CHARSET_ID_OFFSET - 30)
-#define LEADING_BYTE_DAIKANWA_3                (CHARSET_ID_OFFSET - 31)
-
-#define LEADING_BYTE_GT                        (CHARSET_ID_OFFSET - 40)
-#define LEADING_BYTE_GT_PJ_1           (CHARSET_ID_OFFSET - 41)
-#define LEADING_BYTE_GT_PJ_2           (CHARSET_ID_OFFSET - 42)
-#define LEADING_BYTE_GT_PJ_3           (CHARSET_ID_OFFSET - 43)
-#define LEADING_BYTE_GT_PJ_4           (CHARSET_ID_OFFSET - 44)
-#define LEADING_BYTE_GT_PJ_5           (CHARSET_ID_OFFSET - 45)
-#define LEADING_BYTE_GT_PJ_6           (CHARSET_ID_OFFSET - 46)
-#define LEADING_BYTE_GT_PJ_7           (CHARSET_ID_OFFSET - 47)
-#define LEADING_BYTE_GT_PJ_8           (CHARSET_ID_OFFSET - 48)
-#define LEADING_BYTE_GT_PJ_9           (CHARSET_ID_OFFSET - 49)
-#define LEADING_BYTE_GT_PJ_10          (CHARSET_ID_OFFSET - 50)
-#define LEADING_BYTE_GT_PJ_11          (CHARSET_ID_OFFSET - 51)
-
-#define LEADING_BYTE_CHINA3_JEF                (CHARSET_ID_OFFSET - 82)
-#define LEADING_BYTE_CBETA             (CHARSET_ID_OFFSET - 83)
-#define LEADING_BYTE_CHINESE_BIG5_CDP  (CHARSET_ID_OFFSET - 84)
-#define LEADING_BYTE_HANZIKU_1         (CHARSET_ID_OFFSET - 85)
-#define LEADING_BYTE_HANZIKU_2         (CHARSET_ID_OFFSET - 86)
-#define LEADING_BYTE_HANZIKU_3         (CHARSET_ID_OFFSET - 87)
-#define LEADING_BYTE_HANZIKU_4         (CHARSET_ID_OFFSET - 88)
-#define LEADING_BYTE_HANZIKU_5         (CHARSET_ID_OFFSET - 89)
-#define LEADING_BYTE_HANZIKU_6         (CHARSET_ID_OFFSET - 90)
-#define LEADING_BYTE_HANZIKU_7         (CHARSET_ID_OFFSET - 91)
-#define LEADING_BYTE_HANZIKU_8         (CHARSET_ID_OFFSET - 92)
-#define LEADING_BYTE_HANZIKU_9         (CHARSET_ID_OFFSET - 93)
-#define LEADING_BYTE_HANZIKU_10                (CHARSET_ID_OFFSET - 94)
-#define LEADING_BYTE_HANZIKU_11                (CHARSET_ID_OFFSET - 95)
-#define LEADING_BYTE_HANZIKU_12                (CHARSET_ID_OFFSET - 96)
-
-#define MIN_LEADING_BYTE_PRIVATE       MIN_LEADING_BYTE
-#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 97)
-
-
-/* #define CHARSET_ID_OFFSET_94                (CHARSET_ID_OFFSET - '0') */
-
-/* #define MIN_CHARSET_ID_PRIVATE_94   (CHARSET_ID_OFFSET_94 + '0') */
-/* #define MAX_CHARSET_ID_PRIVATE_94   (CHARSET_ID_OFFSET_94 + '?') */
+#define LEADING_BYTE_LATIN_VISCII_UPPER        (MIN_LEADING_BYTE + 26)
+
+#define LEADING_BYTE_ETHIOPIC_UCS      (MIN_LEADING_BYTE + 27)
+
+#define LEADING_BYTE_DAIKANWA_0                (MIN_LEADING_BYTE + 28)
+#define LEADING_BYTE_DAIKANWA_1                (MIN_LEADING_BYTE + 29)
+#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)
+#define LEADING_BYTE_GT_PJ_4           (MIN_LEADING_BYTE + 44)
+#define LEADING_BYTE_GT_PJ_5           (MIN_LEADING_BYTE + 45)
+#define LEADING_BYTE_GT_PJ_6           (MIN_LEADING_BYTE + 46)
+#define LEADING_BYTE_GT_PJ_7           (MIN_LEADING_BYTE + 47)
+#define LEADING_BYTE_GT_PJ_8           (MIN_LEADING_BYTE + 48)
+#define LEADING_BYTE_GT_PJ_9           (MIN_LEADING_BYTE + 49)
+#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)
+#define LEADING_BYTE_HANZIKU_3         (MIN_LEADING_BYTE + 87)
+#define LEADING_BYTE_HANZIKU_4         (MIN_LEADING_BYTE + 88)
+#define LEADING_BYTE_HANZIKU_5         (MIN_LEADING_BYTE + 89)
+#define LEADING_BYTE_HANZIKU_6         (MIN_LEADING_BYTE + 90)
+#define LEADING_BYTE_HANZIKU_7         (MIN_LEADING_BYTE + 91)
+#define LEADING_BYTE_HANZIKU_8         (MIN_LEADING_BYTE + 92)
+#define LEADING_BYTE_HANZIKU_9         (MIN_LEADING_BYTE + 93)
+#define LEADING_BYTE_HANZIKU_10                (MIN_LEADING_BYTE + 94)
+#define LEADING_BYTE_HANZIKU_11                (MIN_LEADING_BYTE + 95)
+#define LEADING_BYTE_HANZIKU_12                (MIN_LEADING_BYTE + 96)
+
+#define MIN_LEADING_BYTE_PRIVATE       (MIN_LEADING_BYTE + 97)
+#define MAX_LEADING_BYTE_PRIVATE       -1
+
 
 /* ISO 646 IRV */
 #define LEADING_BYTE_ASCII               6 /* (CHARSET_ID_OFFSET_94 + 'B') */
@@ -468,8 +462,8 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
 
 #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_BIG5_CDP   0x62000000 */
+/* #define MAX_CHAR_BIG5_CDP   0x6200FFFF */
 #define MIN_CHAR_HANZIKU_1     (0x62000000 + 65536 * 1)
 #define MAX_CHAR_HANZIKU_1     (0x62000000 + 65536 * 1 + 65535)
 #define MIN_CHAR_HANZIKU_2     (0x62000000 + 65536 * 2)