-/* Japanese JIS X0208-1990 2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 (CHARSET_ID_OFFSET - 11)
-
-/* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */
-#define LEADING_BYTE_MOJIKYO_PJ_1 (CHARSET_ID_OFFSET - 12)
-#define LEADING_BYTE_MOJIKYO_PJ_2 (CHARSET_ID_OFFSET - 13)
-#define LEADING_BYTE_MOJIKYO_PJ_3 (CHARSET_ID_OFFSET - 14)
-#define LEADING_BYTE_MOJIKYO_PJ_4 (CHARSET_ID_OFFSET - 15)
-#define LEADING_BYTE_MOJIKYO_PJ_5 (CHARSET_ID_OFFSET - 16)
-#define LEADING_BYTE_MOJIKYO_PJ_6 (CHARSET_ID_OFFSET - 17)
-#define LEADING_BYTE_MOJIKYO_PJ_7 (CHARSET_ID_OFFSET - 18)
-#define LEADING_BYTE_MOJIKYO_PJ_8 (CHARSET_ID_OFFSET - 19)
-#define LEADING_BYTE_MOJIKYO_PJ_9 (CHARSET_ID_OFFSET - 20)
-#define LEADING_BYTE_MOJIKYO_PJ_10 (CHARSET_ID_OFFSET - 21)
-#define LEADING_BYTE_MOJIKYO_PJ_11 (CHARSET_ID_OFFSET - 22)
-#define LEADING_BYTE_MOJIKYO_PJ_12 (CHARSET_ID_OFFSET - 23)
-#define LEADING_BYTE_MOJIKYO_PJ_13 (CHARSET_ID_OFFSET - 24)
-#define LEADING_BYTE_MOJIKYO_PJ_14 (CHARSET_ID_OFFSET - 25)
-#define LEADING_BYTE_MOJIKYO_PJ_15 (CHARSET_ID_OFFSET - 26)
-#define LEADING_BYTE_MOJIKYO_PJ_16 (CHARSET_ID_OFFSET - 27)
-#define LEADING_BYTE_MOJIKYO_PJ_17 (CHARSET_ID_OFFSET - 28)
-#define LEADING_BYTE_MOJIKYO_PJ_18 (CHARSET_ID_OFFSET - 29)
-#define LEADING_BYTE_MOJIKYO_PJ_19 (CHARSET_ID_OFFSET - 30)
-#define LEADING_BYTE_MOJIKYO_PJ_20 (CHARSET_ID_OFFSET - 31)
-#define LEADING_BYTE_MOJIKYO_PJ_21 (CHARSET_ID_OFFSET - 32)
+/* MULE VISCII-UPPER (CHARSET_ID_OFFSET_96 + '2') */
+#define LEADING_BYTE_LATIN_VISCII_UPPER (CHARSET_ID_OFFSET - 26)
+
+#define LEADING_BYTE_ETHIOPIC_UCS (CHARSET_ID_OFFSET - 27)
+
+#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_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)