#define LEADING_BYTE_ETHIOPIC_UCS (CHARSET_ID_OFFSET - 13)
-#define LEADING_BYTE_DAIKANWA (CHARSET_ID_OFFSET - 14)
-#define LEADING_BYTE_DAIKANWA_EKANJI (CHARSET_ID_OFFSET - 15)
-#define LEADING_BYTE_MOJIKYO (CHARSET_ID_OFFSET - 16)
-#define LEADING_BYTE_MOJIKYO_2022_1 (CHARSET_ID_OFFSET - 17)
-#define LEADING_BYTE_MOJIKYO_2022_2 (CHARSET_ID_OFFSET - 18)
+#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)
/* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */
-#define LEADING_BYTE_MOJIKYO_PJ_1 (CHARSET_ID_OFFSET - 19)
-#define LEADING_BYTE_MOJIKYO_PJ_2 (CHARSET_ID_OFFSET - 20)
-#define LEADING_BYTE_MOJIKYO_PJ_3 (CHARSET_ID_OFFSET - 21)
-#define LEADING_BYTE_MOJIKYO_PJ_4 (CHARSET_ID_OFFSET - 22)
-#define LEADING_BYTE_MOJIKYO_PJ_5 (CHARSET_ID_OFFSET - 23)
-#define LEADING_BYTE_MOJIKYO_PJ_6 (CHARSET_ID_OFFSET - 24)
-#define LEADING_BYTE_MOJIKYO_PJ_7 (CHARSET_ID_OFFSET - 25)
-#define LEADING_BYTE_MOJIKYO_PJ_8 (CHARSET_ID_OFFSET - 26)
-#define LEADING_BYTE_MOJIKYO_PJ_9 (CHARSET_ID_OFFSET - 27)
-#define LEADING_BYTE_MOJIKYO_PJ_10 (CHARSET_ID_OFFSET - 28)
-#define LEADING_BYTE_MOJIKYO_PJ_11 (CHARSET_ID_OFFSET - 29)
-#define LEADING_BYTE_MOJIKYO_PJ_12 (CHARSET_ID_OFFSET - 30)
-#define LEADING_BYTE_MOJIKYO_PJ_13 (CHARSET_ID_OFFSET - 31)
-#define LEADING_BYTE_MOJIKYO_PJ_14 (CHARSET_ID_OFFSET - 32)
-#define LEADING_BYTE_MOJIKYO_PJ_15 (CHARSET_ID_OFFSET - 33)
-#define LEADING_BYTE_MOJIKYO_PJ_16 (CHARSET_ID_OFFSET - 34)
-#define LEADING_BYTE_MOJIKYO_PJ_17 (CHARSET_ID_OFFSET - 35)
-#define LEADING_BYTE_MOJIKYO_PJ_18 (CHARSET_ID_OFFSET - 36)
-#define LEADING_BYTE_MOJIKYO_PJ_19 (CHARSET_ID_OFFSET - 37)
-#define LEADING_BYTE_MOJIKYO_PJ_20 (CHARSET_ID_OFFSET - 38)
-#define LEADING_BYTE_MOJIKYO_PJ_21 (CHARSET_ID_OFFSET - 39)
+#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 MIN_LEADING_BYTE_PRIVATE MIN_LEADING_BYTE
#define MAX_LEADING_BYTE_PRIVATE (CHARSET_ID_OFFSET - 40)
#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)