X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=ef96fbf14f2cf6fbe334d10ecb0f218ac0cfd938;hb=080c0efe6b66807a86870eed7c13b8c4c1d563cc;hp=459fc690d858d07ab825d47af96affd00b5e6c6a;hpb=1e5f30df0b98eeb1d4dc7fbc83974765a73ce5f8;p=chise%2Fxemacs-chise.git

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 459fc69..ef96fbf 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -64,15 +64,26 @@ extern Lisp_Object Vcharset_latin_viscii_upper;
 
 typedef int Charset_ID;
 
-#define MIN_LEADING_BYTE		0x80
+#define MIN_LEADING_BYTE		-0x40
+#define CHARSET_ID_OFFSET		0x00
 
-#define LEADING_BYTE_UCS_BMP		0x80
-#define LEADING_BYTE_CONTROL_1		0x81 /* represent normal 80-9F */
-#define LEADING_BYTE_HIRAGANA_JISX0208	0x82
-#define LEADING_BYTE_KATAKANA_JISX0208	0x83
-#define LEADING_BYTE_LATIN_VISCII	0x84
+/* represent normal 80-9F */
+#define LEADING_BYTE_CONTROL_1		(CHARSET_ID_OFFSET - 1)
 
-#define CHARSET_ID_OFFSET_94		0x55
+/* ISO/IEC 10646 BMP */
+#define LEADING_BYTE_UCS_BMP		(CHARSET_ID_OFFSET - 2)
+
+/* VISCII 1.1 */
+#define LEADING_BYTE_LATIN_VISCII	(CHARSET_ID_OFFSET - 3)
+
+#define LEADING_BYTE_HIRAGANA_JISX0208	(CHARSET_ID_OFFSET - 4)
+#define LEADING_BYTE_KATAKANA_JISX0208	(CHARSET_ID_OFFSET - 5)
+
+#define MIN_LEADING_BYTE_PRIVATE	MIN_LEADING_BYTE
+#define MAX_LEADING_BYTE_PRIVATE	(CHARSET_ID_OFFSET - 6)
+
+
+#define CHARSET_ID_OFFSET_94		(CHARSET_ID_OFFSET - '0')
 
 #define MIN_CHARSET_ID_PRIVATE_94	(CHARSET_ID_OFFSET_94 + '0')
 #define MAX_CHARSET_ID_PRIVATE_94	(CHARSET_ID_OFFSET_94 + '?')
@@ -87,7 +98,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		(CHARSET_ID_OFFSET_94 + 80)
 
 #define LEADING_BYTE_LATIN_VISCII_LOWER	(CHARSET_ID_OFFSET_96 + '1')
 #define LEADING_BYTE_LATIN_VISCII_UPPER	(CHARSET_ID_OFFSET_96 + '2')
@@ -123,11 +134,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		(CHARSET_ID_OFFSET_96 + 80)
 
 /* Big5 Level 1 */
 #define LEADING_BYTE_CHINESE_BIG5_1	('0' + CHARSET_ID_OFFSET_94x94)
@@ -181,10 +188,8 @@ 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
+#define NUM_LEADING_BYTES	(80 * 3 - MIN_LEADING_BYTE)
 
 
 /************************************************************************/
@@ -263,7 +268,7 @@ DECLARE_LRECORD (charset, struct Lisp_Charset);
 
 /* Leading byte and id have been regrouped. -- OG */
 #define CHARSET_ID(cs)		 ((cs)->id)
-#define CHARSET_LEADING_BYTE(cs) ((Bufbyte)(CHARSET_ID(cs)))
+#define CHARSET_LEADING_BYTE(cs) (CHARSET_ID(cs))
 #define CHARSET_NAME(cs)	 ((cs)->name)
 #define CHARSET_SHORT_NAME(cs)	 ((cs)->short_name)
 #define CHARSET_LONG_NAME(cs)	 ((cs)->long_name)
@@ -464,7 +469,6 @@ unsigned char charset_get_byte1 (Lisp_Object charset, Emchar ch);
 unsigned char charset_get_byte2 (Lisp_Object charset, Emchar ch);
 
 extern Lisp_Object Vdefault_coded_charset_priority_list;
-extern Lisp_Object Vdefault_coded_charset_priority_list_for_font;
 EXFUN (Ffind_charset, 1);
 
 INLINE void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2);
@@ -608,8 +612,7 @@ CHAR_CHARSET (Emchar ch)
   return charset;
 }
 
-#define CHAR_LEADING_BYTE(c) (XCHARSET_LEADING_BYTE(CHAR_CHARSET(c)))
-
+#define CHAR_CHARSET_ID(c)  (XCHARSET_ID(CHAR_CHARSET(c)))
 #define CHAR_COLUMNS(c)     (CHARSET_COLUMNS(XCHARSET(CHAR_CHARSET(c))))