(LEADING_BYTE_DAIKANWA): New macro.

(LEADING_BYTE_HIRAGANA_JISX0208): Deleted.
(LEADING_BYTE_KATAKANA_JISX0208): Deleted.
(MIN_CHAR_DAIKANWA): New macro.
(MAX_CHAR_DAIKANWA): New macro.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 1b10e5e..f1c04eb 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -107,11 +107,10 @@ typedef int Charset_ID;
 
 #define LEADING_BYTE_ETHIOPIC_UCS      (CHARSET_ID_OFFSET - 8)
 
-#define LEADING_BYTE_HIRAGANA_JISX0208 (CHARSET_ID_OFFSET - 9)
-#define LEADING_BYTE_KATAKANA_JISX0208 (CHARSET_ID_OFFSET - 10)
+#define LEADING_BYTE_DAIKANWA          (CHARSET_ID_OFFSET - 9)
 
 #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 - 10)
 
 
 /* #define CHARSET_ID_OFFSET_94                (CHARSET_ID_OFFSET - '0') */
@@ -391,6 +390,9 @@ CHARSET_BY_LEADING_BYTE (Charset_ID lb)
 #define MIN_CHAR_OBS_94x94     0xE00000
 #define MAX_CHAR_OBS_94x94     (0xE00000 + 94 * 94 * 14 - 1)
 
+#define MIN_CHAR_DAIKANWA      0xE50000
+#define MAX_CHAR_DAIKANWA      0xE5FFFF
+
 #define MIN_CHAR_94            0xE90940
 #define MAX_CHAR_94            (MIN_CHAR_94 + 94 * 80 - 1)
 #define MIN_CHAR_96            (MIN_CHAR_94 + 94 * 80)