(MIN_LEADING_BYTE): Changed to -0x60.

(LEADING_BYTE_DAIKANWA): New macro.
(LEADING_BYTE_JAPANESE_JISX0208_1990): New macro.
(LEADING_BYTE_MOJIKYO_PJ_[1 .. 21]): New macro.
(MAX_LEADING_BYTE_PRIVATE): Changed to (CHARSET_ID_OFFSET - 32).
(MIN_CHAR_DAIKANWA): New macro.
(MAX_CHAR_DAIKANWA): New macro.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index ec54d4e..b020740 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -81,7 +81,7 @@ extern Lisp_Object Vcharset_latin_viscii_upper;
 
 typedef int Charset_ID;
 
-#define MIN_LEADING_BYTE               -0x40
+#define MIN_LEADING_BYTE               -0x60
 #define CHARSET_ID_OFFSET              0x00
 
 /* represent normal 80-9F */
@@ -107,8 +107,36 @@ typedef int Charset_ID;
 
 #define LEADING_BYTE_ETHIOPIC_UCS      (CHARSET_ID_OFFSET - 8)
 
+#define LEADING_BYTE_DAIKANWA          (CHARSET_ID_OFFSET - 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)
+
+/* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */
+#define LEADING_BYTE_MOJIKYO_PJ_1      (CHARSET_ID_OFFSET - 11)
+#define LEADING_BYTE_MOJIKYO_PJ_2      (CHARSET_ID_OFFSET - 12)
+#define LEADING_BYTE_MOJIKYO_PJ_3      (CHARSET_ID_OFFSET - 13)
+#define LEADING_BYTE_MOJIKYO_PJ_4      (CHARSET_ID_OFFSET - 14)
+#define LEADING_BYTE_MOJIKYO_PJ_5      (CHARSET_ID_OFFSET - 15)
+#define LEADING_BYTE_MOJIKYO_PJ_6      (CHARSET_ID_OFFSET - 16)
+#define LEADING_BYTE_MOJIKYO_PJ_7      (CHARSET_ID_OFFSET - 17)
+#define LEADING_BYTE_MOJIKYO_PJ_8      (CHARSET_ID_OFFSET - 18)
+#define LEADING_BYTE_MOJIKYO_PJ_9      (CHARSET_ID_OFFSET - 19)
+#define LEADING_BYTE_MOJIKYO_PJ_10     (CHARSET_ID_OFFSET - 20)
+#define LEADING_BYTE_MOJIKYO_PJ_11     (CHARSET_ID_OFFSET - 21)
+#define LEADING_BYTE_MOJIKYO_PJ_12     (CHARSET_ID_OFFSET - 22)
+#define LEADING_BYTE_MOJIKYO_PJ_13     (CHARSET_ID_OFFSET - 23)
+#define LEADING_BYTE_MOJIKYO_PJ_14     (CHARSET_ID_OFFSET - 24)
+#define LEADING_BYTE_MOJIKYO_PJ_15     (CHARSET_ID_OFFSET - 25)
+#define LEADING_BYTE_MOJIKYO_PJ_16     (CHARSET_ID_OFFSET - 26)
+#define LEADING_BYTE_MOJIKYO_PJ_17     (CHARSET_ID_OFFSET - 27)
+#define LEADING_BYTE_MOJIKYO_PJ_18     (CHARSET_ID_OFFSET - 28)
+#define LEADING_BYTE_MOJIKYO_PJ_19     (CHARSET_ID_OFFSET - 29)
+#define LEADING_BYTE_MOJIKYO_PJ_20     (CHARSET_ID_OFFSET - 30)
+#define LEADING_BYTE_MOJIKYO_PJ_21     (CHARSET_ID_OFFSET - 31)
+
 #define MIN_LEADING_BYTE_PRIVATE       MIN_LEADING_BYTE
-#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 11)
+#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 32)
 
 
 /* #define CHARSET_ID_OFFSET_94                (CHARSET_ID_OFFSET - '0') */
@@ -393,6 +421,9 @@ CHARSET_BY_LEADING_BYTE (Charset_ID lb)
 
 #define MAX_CHAR_BMP           0x00FFFF
 
+#define MIN_CHAR_DAIKANWA      0xE00000
+#define MAX_CHAR_DAIKANWA      0xE0FFFF
+
 #define MIN_CHAR_94            0xE90940
 #define MAX_CHAR_94            (MIN_CHAR_94 + 94 * 80 - 1)
 #define MIN_CHAR_96            (MIN_CHAR_94 + 94 * 80)