Compact non-ISO-IR charset-ids.

(LEADING_BYTE_UCS): Changed to -177.
(LEADING_BYTE_CONTROL_1): Changed to -77.
(LEADING_BYTE_UCS_BMP): Changed to -176.
(LEADING_BYTE_JAPANESE_JISX0208_1990): Changed to -168.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 0bad540..9d59f21 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -62,49 +62,46 @@ Lisp_Object remove_char_ccs (Lisp_Object character, Lisp_Object ccs);
 typedef short Charset_ID;
 
 /* ISO/IEC 10646 */
-#define LEADING_BYTE_UCS               1
+#define LEADING_BYTE_UCS               -177
 
 /* represent normal 80-9F */
-#define LEADING_BYTE_CONTROL_1         2
+#define LEADING_BYTE_CONTROL_1         -77
 
 /* ISO/IEC 10646 BMP */
-#define LEADING_BYTE_UCS_BMP           3
+#define LEADING_BYTE_UCS_BMP           -176
 
 /* ISO/IEC 10646 SMP */
-#define LEADING_BYTE_UCS_SMP           4
+#define LEADING_BYTE_UCS_SMP           1
 
 /* ISO/IEC 10646 SIP */
-#define LEADING_BYTE_UCS_SIP           5
+#define LEADING_BYTE_UCS_SIP           2
 
 /* Japanese JIS X0208 Common   2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JIS_X0208                 11
-
-/* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 12
+#define LEADING_BYTE_JIS_X0208                 3
 
 /* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345   13
+#define LEADING_BYTE_CHINESE_GB12345   4
 
-#define LEADING_BYTE_CHINESE_BIG5      20
+#define LEADING_BYTE_CHINESE_BIG5      5
 
 /* Big5 Level 1                        2/4 2/{(8),9,10,11} 4/0 '0' */
-#define LEADING_BYTE_CHINESE_BIG5_1    21
+#define LEADING_BYTE_CHINESE_BIG5_1    6
 
 /* Big5 Level 2                        2/4 2/{(8),9,10,11} 4/0 '1' */
-#define LEADING_BYTE_CHINESE_BIG5_2    22
+#define LEADING_BYTE_CHINESE_BIG5_2    7
 
 /* VISCII 1.1 */
-#define LEADING_BYTE_LATIN_VISCII      24
+#define LEADING_BYTE_LATIN_VISCII      8
 
 /* MULE VISCII-LOWER                   (CHARSET_ID_OFFSET_96 + '1') */
-#define LEADING_BYTE_LATIN_VISCII_LOWER        25
+#define LEADING_BYTE_LATIN_VISCII_LOWER        9
 
 /* MULE VISCII-UPPER                   (CHARSET_ID_OFFSET_96 + '2') */
-#define LEADING_BYTE_LATIN_VISCII_UPPER        26
+#define LEADING_BYTE_LATIN_VISCII_UPPER        10
 
-#define LEADING_BYTE_ETHIOPIC_UCS      27
+#define LEADING_BYTE_ETHIOPIC_UCS      11
 
-#define MIN_LEADING_BYTE_PRIVATE       28
+#define MIN_LEADING_BYTE_PRIVATE       12
 #define MAX_LEADING_BYTE_PRIVATE       512
 
 
@@ -118,8 +115,6 @@ typedef short Charset_ID;
 #define LEADING_BYTE_LATIN_JISX0201     -14 /* (CHARSET_ID_OFFSET_94 + 'J') */
 
 
-/* #define CHARSET_ID_OFFSET_96                (CHARSET_ID_OFFSET_94 + 80) */
-
 /* Right half of ISO 8859-1 */
 #define LEADING_BYTE_LATIN_ISO8859_1   -100 /* (CHARSET_ID_OFFSET_96 + 'A') */
 
@@ -154,11 +149,6 @@ typedef short Charset_ID;
 #define LEADING_BYTE_LATIN_TCVN5712    -180 /* F = 5/10 0x5A `Z' */
 
 
-/* #define CHARSET_ID_OFFSET_94x94             (CHARSET_ID_OFFSET_96 + 80) */
-
-/* #define MIN_LEADING_BYTE_PRIVATE_2  ('0' + CHARSET_ID_OFFSET_94x94) */
-/* #define MAX_LEADING_BYTE_PRIVATE_2  ('?' + CHARSET_ID_OFFSET_94x94) */
-
 /* Japanese JIS X0208-1978     2/4 2/{(8),9,10,11} 4/0 (@) */
 #define LEADING_BYTE_JAPANESE_JISX0208_1978     -42
 
@@ -168,6 +158,9 @@ typedef short Charset_ID;
 /* Japanese JIS X0208-1983     2/4 2/{(8),9,10,11} 4/2 (B) */
 #define LEADING_BYTE_JAPANESE_JISX0208          -87
 
+/* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
+#define LEADING_BYTE_JAPANESE_JISX0208_1990    -168
+
 /* Hangul KS C5601-1987                2/4 2/{8,9,10,11} 4/3 (C) */
 #define LEADING_BYTE_KOREAN_KSC5601            -149
 
@@ -201,6 +194,7 @@ typedef short Charset_ID;
 /* DPRK Hangul KPS 9566-1997   2/4 2/{8,9,10,11} 4/14 (N) */
 #define LEADING_BYTE_KOREAN_KPS9566            -202
 
+
 #define MIN_LEADING_BYTE       (- 80 * 3)
 
 #define NUM_LEADING_BYTES      (MAX_LEADING_BYTE_PRIVATE - MIN_LEADING_BYTE)