(LEADING_BYTE_DAIKANWA_0): New macro.

(LEADING_BYTE_DAIKANWA_1): New macro.
(LEADING_BYTE_DAIKANWA_2): New macro.
(LEADING_BYTE_DAIKANWA_3): Renamed from `LEADING_BYTE_DAIKANWA'.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 5087c10..e41db05 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -96,67 +96,69 @@ typedef short Charset_ID;
 
 #define LEADING_BYTE_ETHIOPIC_UCS      (CHARSET_ID_OFFSET - 27)
 
-#define LEADING_BYTE_DAIKANWA          (CHARSET_ID_OFFSET - 28)
-#define LEADING_BYTE_DAIKANWA_EKANJI   (CHARSET_ID_OFFSET - 29)
-
-#define LEADING_BYTE_GT                        (CHARSET_ID_OFFSET - 30)
-#define LEADING_BYTE_GT_PJ_1           (CHARSET_ID_OFFSET - 31)
-#define LEADING_BYTE_GT_PJ_2           (CHARSET_ID_OFFSET - 32)
-#define LEADING_BYTE_GT_PJ_3           (CHARSET_ID_OFFSET - 33)
-#define LEADING_BYTE_GT_PJ_4           (CHARSET_ID_OFFSET - 34)
-#define LEADING_BYTE_GT_PJ_5           (CHARSET_ID_OFFSET - 35)
-#define LEADING_BYTE_GT_PJ_6           (CHARSET_ID_OFFSET - 36)
-#define LEADING_BYTE_GT_PJ_7           (CHARSET_ID_OFFSET - 37)
-#define LEADING_BYTE_GT_PJ_8           (CHARSET_ID_OFFSET - 38)
-#define LEADING_BYTE_GT_PJ_9           (CHARSET_ID_OFFSET - 39)
-#define LEADING_BYTE_GT_PJ_10          (CHARSET_ID_OFFSET - 40)
-#define LEADING_BYTE_GT_PJ_11          (CHARSET_ID_OFFSET - 41)
-
-#define LEADING_BYTE_MOJIKYO           (CHARSET_ID_OFFSET - 48)
-#define LEADING_BYTE_MOJIKYO_2022_1    (CHARSET_ID_OFFSET - 49)
-#define LEADING_BYTE_MOJIKYO_2022_2    (CHARSET_ID_OFFSET - 50)
+#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_MOJIKYO           (CHARSET_ID_OFFSET - 58)
+#define LEADING_BYTE_MOJIKYO_2022_1    (CHARSET_ID_OFFSET - 59)
+#define LEADING_BYTE_MOJIKYO_2022_2    (CHARSET_ID_OFFSET - 60)
 
 /* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */
-#define LEADING_BYTE_MOJIKYO_PJ_1      (CHARSET_ID_OFFSET - 51)
-#define LEADING_BYTE_MOJIKYO_PJ_2      (CHARSET_ID_OFFSET - 52)
-#define LEADING_BYTE_MOJIKYO_PJ_3      (CHARSET_ID_OFFSET - 53)
-#define LEADING_BYTE_MOJIKYO_PJ_4      (CHARSET_ID_OFFSET - 54)
-#define LEADING_BYTE_MOJIKYO_PJ_5      (CHARSET_ID_OFFSET - 55)
-#define LEADING_BYTE_MOJIKYO_PJ_6      (CHARSET_ID_OFFSET - 56)
-#define LEADING_BYTE_MOJIKYO_PJ_7      (CHARSET_ID_OFFSET - 57)
-#define LEADING_BYTE_MOJIKYO_PJ_8      (CHARSET_ID_OFFSET - 58)
-#define LEADING_BYTE_MOJIKYO_PJ_9      (CHARSET_ID_OFFSET - 59)
-#define LEADING_BYTE_MOJIKYO_PJ_10     (CHARSET_ID_OFFSET - 60)
-#define LEADING_BYTE_MOJIKYO_PJ_11     (CHARSET_ID_OFFSET - 61)
-#define LEADING_BYTE_MOJIKYO_PJ_12     (CHARSET_ID_OFFSET - 62)
-#define LEADING_BYTE_MOJIKYO_PJ_13     (CHARSET_ID_OFFSET - 63)
-#define LEADING_BYTE_MOJIKYO_PJ_14     (CHARSET_ID_OFFSET - 64)
-#define LEADING_BYTE_MOJIKYO_PJ_15     (CHARSET_ID_OFFSET - 65)
-#define LEADING_BYTE_MOJIKYO_PJ_16     (CHARSET_ID_OFFSET - 66)
-#define LEADING_BYTE_MOJIKYO_PJ_17     (CHARSET_ID_OFFSET - 67)
-#define LEADING_BYTE_MOJIKYO_PJ_18     (CHARSET_ID_OFFSET - 68)
-#define LEADING_BYTE_MOJIKYO_PJ_19     (CHARSET_ID_OFFSET - 69)
-#define LEADING_BYTE_MOJIKYO_PJ_20     (CHARSET_ID_OFFSET - 70)
-#define LEADING_BYTE_MOJIKYO_PJ_21     (CHARSET_ID_OFFSET - 71)
-
-#define LEADING_BYTE_CHINA3_JEF                (CHARSET_ID_OFFSET - 72)
-#define LEADING_BYTE_CBETA             (CHARSET_ID_OFFSET - 73)
-#define LEADING_BYTE_CHINESE_BIG5_CDP  (CHARSET_ID_OFFSET - 74)
-#define LEADING_BYTE_HANZIKU_1         (CHARSET_ID_OFFSET - 75)
-#define LEADING_BYTE_HANZIKU_2         (CHARSET_ID_OFFSET - 76)
-#define LEADING_BYTE_HANZIKU_3         (CHARSET_ID_OFFSET - 77)
-#define LEADING_BYTE_HANZIKU_4         (CHARSET_ID_OFFSET - 78)
-#define LEADING_BYTE_HANZIKU_5         (CHARSET_ID_OFFSET - 79)
-#define LEADING_BYTE_HANZIKU_6         (CHARSET_ID_OFFSET - 80)
-#define LEADING_BYTE_HANZIKU_7         (CHARSET_ID_OFFSET - 81)
-#define LEADING_BYTE_HANZIKU_8         (CHARSET_ID_OFFSET - 82)
-#define LEADING_BYTE_HANZIKU_9         (CHARSET_ID_OFFSET - 83)
-#define LEADING_BYTE_HANZIKU_10                (CHARSET_ID_OFFSET - 84)
-#define LEADING_BYTE_HANZIKU_11                (CHARSET_ID_OFFSET - 85)
-#define LEADING_BYTE_HANZIKU_12                (CHARSET_ID_OFFSET - 86)
+#define LEADING_BYTE_MOJIKYO_PJ_1      (CHARSET_ID_OFFSET - 61)
+#define LEADING_BYTE_MOJIKYO_PJ_2      (CHARSET_ID_OFFSET - 62)
+#define LEADING_BYTE_MOJIKYO_PJ_3      (CHARSET_ID_OFFSET - 63)
+#define LEADING_BYTE_MOJIKYO_PJ_4      (CHARSET_ID_OFFSET - 64)
+#define LEADING_BYTE_MOJIKYO_PJ_5      (CHARSET_ID_OFFSET - 65)
+#define LEADING_BYTE_MOJIKYO_PJ_6      (CHARSET_ID_OFFSET - 66)
+#define LEADING_BYTE_MOJIKYO_PJ_7      (CHARSET_ID_OFFSET - 67)
+#define LEADING_BYTE_MOJIKYO_PJ_8      (CHARSET_ID_OFFSET - 68)
+#define LEADING_BYTE_MOJIKYO_PJ_9      (CHARSET_ID_OFFSET - 69)
+#define LEADING_BYTE_MOJIKYO_PJ_10     (CHARSET_ID_OFFSET - 70)
+#define LEADING_BYTE_MOJIKYO_PJ_11     (CHARSET_ID_OFFSET - 71)
+#define LEADING_BYTE_MOJIKYO_PJ_12     (CHARSET_ID_OFFSET - 72)
+#define LEADING_BYTE_MOJIKYO_PJ_13     (CHARSET_ID_OFFSET - 73)
+#define LEADING_BYTE_MOJIKYO_PJ_14     (CHARSET_ID_OFFSET - 74)
+#define LEADING_BYTE_MOJIKYO_PJ_15     (CHARSET_ID_OFFSET - 75)
+#define LEADING_BYTE_MOJIKYO_PJ_16     (CHARSET_ID_OFFSET - 76)
+#define LEADING_BYTE_MOJIKYO_PJ_17     (CHARSET_ID_OFFSET - 77)
+#define LEADING_BYTE_MOJIKYO_PJ_18     (CHARSET_ID_OFFSET - 78)
+#define LEADING_BYTE_MOJIKYO_PJ_19     (CHARSET_ID_OFFSET - 79)
+#define LEADING_BYTE_MOJIKYO_PJ_20     (CHARSET_ID_OFFSET - 80)
+#define LEADING_BYTE_MOJIKYO_PJ_21     (CHARSET_ID_OFFSET - 81)
+
+#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 - 87)
+#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 97)
 
 
 /* #define CHARSET_ID_OFFSET_94                (CHARSET_ID_OFFSET - '0') */