X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=4c7697bb3d3fb414e3f3ba327928acf3f847117d;hb=63e55d9007ffeb3803b57bb6b7d82b7e8ab96335;hp=a47ea808fc503afca1d736808b851c6e393fe0a5;hpb=eb66f6577d27dc72022d40857f322fc707681351;p=chise%2Fxemacs-chise.git

diff --git a/src/char-ucs.h b/src/char-ucs.h
index a47ea80..4c7697b 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -72,7 +72,11 @@ typedef int Charset_ID;
 #define LEADING_BYTE_KATAKANA_JISX0208	0x83
 #define LEADING_BYTE_LATIN_VISCII	0x84
 
-#define CHARSET_ID_OFFSET_94		0x55
+#define MIN_LEADING_BYTE_PRIVATE	0x85
+#define MAX_LEADING_BYTE_PRIVATE	0x94
+
+
+#define CHARSET_ID_OFFSET_94		(0x95 - '0')
 
 #define MIN_CHARSET_ID_PRIVATE_94	(CHARSET_ID_OFFSET_94 + '0')
 #define MAX_CHARSET_ID_PRIVATE_94	(CHARSET_ID_OFFSET_94 + '?')
@@ -87,7 +91,7 @@ typedef int Charset_ID;
 #define LEADING_BYTE_LATIN_JISX0201	(CHARSET_ID_OFFSET_94 + 'J')
 
 
-#define CHARSET_ID_OFFSET_96		0x70
+#define CHARSET_ID_OFFSET_96		(0xB0 - '0')
 
 #define LEADING_BYTE_LATIN_VISCII_LOWER	(CHARSET_ID_OFFSET_96 + '1')
 #define LEADING_BYTE_LATIN_VISCII_UPPER	(CHARSET_ID_OFFSET_96 + '2')
@@ -123,11 +127,7 @@ typedef int Charset_ID;
 #define LEADING_BYTE_THAI_TIS620	(CHARSET_ID_OFFSET_96 + 'T')
 
 
-#define MIN_LEADING_BYTE_PRIVATE_1	0xD0
-#define MAX_LEADING_BYTE_PRIVATE_1	0xDF
-
-
-#define CHARSET_ID_OFFSET_94x94		0xB0
+#define CHARSET_ID_OFFSET_94x94		(0xE0 - '0')
 
 /* Big5 Level 1 */
 #define LEADING_BYTE_CHINESE_BIG5_1	('0' + CHARSET_ID_OFFSET_94x94)
@@ -181,8 +181,6 @@ typedef int Charset_ID;
 /* DPRK Hangul KPS 9566-1997 */
 #define LEADING_BYTE_KOREAN_KPS9566	('N' + CHARSET_ID_OFFSET_94x94)
 
-#define MIN_LEADING_BYTE_OFFICIAL_2	LEADING_BYTE_JAPANESE_JISX0208_1978
-#define MAX_LEADING_BYTE_OFFICIAL_2	LEADING_BYTE_KOREAN_KPS9566
 
 #define NUM_LEADING_BYTES 256