-#define LEADING_BYTE_CHINESE_BIG5_2 (CHARSET_ID_OFFSET - 12)
-
-#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_GT (CHARSET_ID_OFFSET - 18)
-#define LEADING_BYTE_GT_PJ_1 (CHARSET_ID_OFFSET - 21)
-#define LEADING_BYTE_GT_PJ_2 (CHARSET_ID_OFFSET - 22)
-#define LEADING_BYTE_GT_PJ_3 (CHARSET_ID_OFFSET - 23)
-#define LEADING_BYTE_GT_PJ_4 (CHARSET_ID_OFFSET - 24)
-#define LEADING_BYTE_GT_PJ_5 (CHARSET_ID_OFFSET - 25)
-#define LEADING_BYTE_GT_PJ_6 (CHARSET_ID_OFFSET - 26)
-#define LEADING_BYTE_GT_PJ_7 (CHARSET_ID_OFFSET - 27)
-#define LEADING_BYTE_GT_PJ_8 (CHARSET_ID_OFFSET - 28)
-#define LEADING_BYTE_GT_PJ_9 (CHARSET_ID_OFFSET - 29)
-#define LEADING_BYTE_GT_PJ_10 (CHARSET_ID_OFFSET - 30)
-#define LEADING_BYTE_GT_PJ_11 (CHARSET_ID_OFFSET - 31)
-
-#define LEADING_BYTE_MOJIKYO (CHARSET_ID_OFFSET - 38)
-#define LEADING_BYTE_MOJIKYO_2022_1 (CHARSET_ID_OFFSET - 39)
-#define LEADING_BYTE_MOJIKYO_2022_2 (CHARSET_ID_OFFSET - 40)
+#define LEADING_BYTE_CHINESE_BIG5_2 (CHARSET_ID_OFFSET - 22)
+
+/* VISCII 1.1 */
+#define LEADING_BYTE_LATIN_VISCII (CHARSET_ID_OFFSET - 23)
+
+/* MULE VISCII-LOWER (CHARSET_ID_OFFSET_96 + '1') */
+#define LEADING_BYTE_LATIN_VISCII_LOWER (CHARSET_ID_OFFSET - 24)
+
+/* MULE VISCII-UPPER (CHARSET_ID_OFFSET_96 + '2') */
+#define LEADING_BYTE_LATIN_VISCII_UPPER (CHARSET_ID_OFFSET - 25)
+
+#define LEADING_BYTE_ETHIOPIC_UCS (CHARSET_ID_OFFSET - 26)
+
+#define LEADING_BYTE_DAIKANWA (CHARSET_ID_OFFSET - 27)
+#define LEADING_BYTE_DAIKANWA_EKANJI (CHARSET_ID_OFFSET - 28)
+
+#define LEADING_BYTE_GT (CHARSET_ID_OFFSET - 29)
+#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)