(MAX_LEADING_BYTE_PRIVATE): Fixed.

(MAX_CHAR_GT): Changed to `(MIN_CHAR_GT + 66773)'.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 5da3c93..7c7655b 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 MORIOKA Tomohiko
+   Copyright (C) 1999,2000,2001 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -147,50 +147,51 @@ typedef short Charset_ID;
 
 #define LEADING_BYTE_ETHIOPIC_UCS      (CHARSET_ID_OFFSET - 13)
 
-#define LEADING_BYTE_GT                        (CHARSET_ID_OFFSET - 14)
-#define LEADING_BYTE_GT_PJ_1           (CHARSET_ID_OFFSET - 15)
-#define LEADING_BYTE_GT_PJ_2           (CHARSET_ID_OFFSET - 16)
-#define LEADING_BYTE_GT_PJ_3           (CHARSET_ID_OFFSET - 17)
-#define LEADING_BYTE_GT_PJ_4           (CHARSET_ID_OFFSET - 18)
-#define LEADING_BYTE_GT_PJ_5           (CHARSET_ID_OFFSET - 19)
-#define LEADING_BYTE_GT_PJ_6           (CHARSET_ID_OFFSET - 20)
-#define LEADING_BYTE_GT_PJ_7           (CHARSET_ID_OFFSET - 21)
-#define LEADING_BYTE_GT_PJ_8           (CHARSET_ID_OFFSET - 22)
-#define LEADING_BYTE_GT_PJ_9           (CHARSET_ID_OFFSET - 23)
-#define LEADING_BYTE_GT_PJ_10          (CHARSET_ID_OFFSET - 24)
-#define LEADING_BYTE_GT_PJ_11          (CHARSET_ID_OFFSET - 25)
-
-#define LEADING_BYTE_DAIKANWA          (CHARSET_ID_OFFSET - 26)
-#define LEADING_BYTE_DAIKANWA_EKANJI   (CHARSET_ID_OFFSET - 27)
-#define LEADING_BYTE_MOJIKYO           (CHARSET_ID_OFFSET - 28)
-#define LEADING_BYTE_MOJIKYO_2022_1    (CHARSET_ID_OFFSET - 29)
-#define LEADING_BYTE_MOJIKYO_2022_2    (CHARSET_ID_OFFSET - 30)
+#define LEADING_BYTE_DAIKANWA          (CHARSET_ID_OFFSET - 14)
+#define LEADING_BYTE_DAIKANWA_EKANJI   (CHARSET_ID_OFFSET - 15)
+
+#define LEADING_BYTE_GT                        (CHARSET_ID_OFFSET - 18)
+#define LEADING_BYTE_GT_PJ_1           (CHARSET_ID_OFFSET - 21)
+#define LEADING_BYTE_GT_PJ_2           (CHARSET_ID_OFFSET - 22)
+#define LEADING_BYTE_GT_PJ_3           (CHARSET_ID_OFFSET - 23)
+#define LEADING_BYTE_GT_PJ_4           (CHARSET_ID_OFFSET - 24)
+#define LEADING_BYTE_GT_PJ_5           (CHARSET_ID_OFFSET - 25)
+#define LEADING_BYTE_GT_PJ_6           (CHARSET_ID_OFFSET - 26)
+#define LEADING_BYTE_GT_PJ_7           (CHARSET_ID_OFFSET - 27)
+#define LEADING_BYTE_GT_PJ_8           (CHARSET_ID_OFFSET - 28)
+#define LEADING_BYTE_GT_PJ_9           (CHARSET_ID_OFFSET - 29)
+#define LEADING_BYTE_GT_PJ_10          (CHARSET_ID_OFFSET - 30)
+#define LEADING_BYTE_GT_PJ_11          (CHARSET_ID_OFFSET - 31)
+
+#define LEADING_BYTE_MOJIKYO           (CHARSET_ID_OFFSET - 38)
+#define LEADING_BYTE_MOJIKYO_2022_1    (CHARSET_ID_OFFSET - 39)
+#define LEADING_BYTE_MOJIKYO_2022_2    (CHARSET_ID_OFFSET - 40)
 
 /* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */
-#define LEADING_BYTE_MOJIKYO_PJ_1      (CHARSET_ID_OFFSET - 31)
-#define LEADING_BYTE_MOJIKYO_PJ_2      (CHARSET_ID_OFFSET - 32)
-#define LEADING_BYTE_MOJIKYO_PJ_3      (CHARSET_ID_OFFSET - 33)
-#define LEADING_BYTE_MOJIKYO_PJ_4      (CHARSET_ID_OFFSET - 34)
-#define LEADING_BYTE_MOJIKYO_PJ_5      (CHARSET_ID_OFFSET - 35)
-#define LEADING_BYTE_MOJIKYO_PJ_6      (CHARSET_ID_OFFSET - 36)
-#define LEADING_BYTE_MOJIKYO_PJ_7      (CHARSET_ID_OFFSET - 37)
-#define LEADING_BYTE_MOJIKYO_PJ_8      (CHARSET_ID_OFFSET - 38)
-#define LEADING_BYTE_MOJIKYO_PJ_9      (CHARSET_ID_OFFSET - 39)
-#define LEADING_BYTE_MOJIKYO_PJ_10     (CHARSET_ID_OFFSET - 40)
-#define LEADING_BYTE_MOJIKYO_PJ_11     (CHARSET_ID_OFFSET - 41)
-#define LEADING_BYTE_MOJIKYO_PJ_12     (CHARSET_ID_OFFSET - 42)
-#define LEADING_BYTE_MOJIKYO_PJ_13     (CHARSET_ID_OFFSET - 43)
-#define LEADING_BYTE_MOJIKYO_PJ_14     (CHARSET_ID_OFFSET - 44)
-#define LEADING_BYTE_MOJIKYO_PJ_15     (CHARSET_ID_OFFSET - 45)
-#define LEADING_BYTE_MOJIKYO_PJ_16     (CHARSET_ID_OFFSET - 46)
-#define LEADING_BYTE_MOJIKYO_PJ_17     (CHARSET_ID_OFFSET - 47)
-#define LEADING_BYTE_MOJIKYO_PJ_18     (CHARSET_ID_OFFSET - 48)
-#define LEADING_BYTE_MOJIKYO_PJ_19     (CHARSET_ID_OFFSET - 49)
-#define LEADING_BYTE_MOJIKYO_PJ_20     (CHARSET_ID_OFFSET - 50)
-#define LEADING_BYTE_MOJIKYO_PJ_21     (CHARSET_ID_OFFSET - 51)
+#define LEADING_BYTE_MOJIKYO_PJ_1      (CHARSET_ID_OFFSET - 41)
+#define LEADING_BYTE_MOJIKYO_PJ_2      (CHARSET_ID_OFFSET - 42)
+#define LEADING_BYTE_MOJIKYO_PJ_3      (CHARSET_ID_OFFSET - 43)
+#define LEADING_BYTE_MOJIKYO_PJ_4      (CHARSET_ID_OFFSET - 44)
+#define LEADING_BYTE_MOJIKYO_PJ_5      (CHARSET_ID_OFFSET - 45)
+#define LEADING_BYTE_MOJIKYO_PJ_6      (CHARSET_ID_OFFSET - 46)
+#define LEADING_BYTE_MOJIKYO_PJ_7      (CHARSET_ID_OFFSET - 47)
+#define LEADING_BYTE_MOJIKYO_PJ_8      (CHARSET_ID_OFFSET - 48)
+#define LEADING_BYTE_MOJIKYO_PJ_9      (CHARSET_ID_OFFSET - 49)
+#define LEADING_BYTE_MOJIKYO_PJ_10     (CHARSET_ID_OFFSET - 50)
+#define LEADING_BYTE_MOJIKYO_PJ_11     (CHARSET_ID_OFFSET - 51)
+#define LEADING_BYTE_MOJIKYO_PJ_12     (CHARSET_ID_OFFSET - 52)
+#define LEADING_BYTE_MOJIKYO_PJ_13     (CHARSET_ID_OFFSET - 53)
+#define LEADING_BYTE_MOJIKYO_PJ_14     (CHARSET_ID_OFFSET - 54)
+#define LEADING_BYTE_MOJIKYO_PJ_15     (CHARSET_ID_OFFSET - 55)
+#define LEADING_BYTE_MOJIKYO_PJ_16     (CHARSET_ID_OFFSET - 56)
+#define LEADING_BYTE_MOJIKYO_PJ_17     (CHARSET_ID_OFFSET - 57)
+#define LEADING_BYTE_MOJIKYO_PJ_18     (CHARSET_ID_OFFSET - 58)
+#define LEADING_BYTE_MOJIKYO_PJ_19     (CHARSET_ID_OFFSET - 59)
+#define LEADING_BYTE_MOJIKYO_PJ_20     (CHARSET_ID_OFFSET - 60)
+#define LEADING_BYTE_MOJIKYO_PJ_21     (CHARSET_ID_OFFSET - 61)
 
 #define MIN_LEADING_BYTE_PRIVATE       MIN_LEADING_BYTE
-#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 40)
+#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 62)
 
 
 /* #define CHARSET_ID_OFFSET_94                (CHARSET_ID_OFFSET - '0') */
@@ -494,11 +495,6 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
 #define MAX_CHAR_DAIKANWA      (MIN_CHAR_DAIKANWA + 50100) /* 0xE0FFFF */
 #define MIN_CHAR_MOJIKYO_0     MIN_CHAR_DAIKANWA
 #define MAX_CHAR_MOJIKYO_0     (MIN_CHAR_MOJIKYO_0 + 94 * 60 * 22)
-#define MIN_CHAR_MOJIKYO       0x60000000
-/* #define MAX_CHAR_MOJIKYO    0xE9093F */
-#define MAX_CHAR_MOJIKYO       (MIN_CHAR_MOJIKYO + 94 * 60 * 22)
-#define MIN_CHAR_GT            0x61000000
-#define MAX_CHAR_GT            (MIN_CHAR_GT + 94 * 60 * 11)
 
 #define MIN_CHAR_94            0xE90940
 #define MAX_CHAR_94            (MIN_CHAR_94 + 94 * 80 - 1)
@@ -512,6 +508,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_MOJIKYO       0x60000000
+#define MAX_CHAR_MOJIKYO       (MIN_CHAR_MOJIKYO + 94 * 60 * 22)
+#define MIN_CHAR_GT            0x61000000
+#define MAX_CHAR_GT            (MIN_CHAR_GT + 66773)
 
 Emchar make_builtin_char (Lisp_Object charset, int c1, int c2);