From 892bf1ee89cb04fb3091f9b3cfe0d86fbb4ba20b Mon Sep 17 00:00:00 2001 From: tomo Date: Mon, 11 Oct 1999 20:17:08 +0000 Subject: [PATCH] (MIN_LEADING_BYTE): Changed to 0x00. (CHARSET_ID_OFFSET): New macro. (LEADING_BYTE_CONTROL_1): Changed to (CHARSET_ID_OFFSET - 1). (LEADING_BYTE_UCS_BMP): Changed to (CHARSET_ID_OFFSET - 2). (LEADING_BYTE_LATIN_VISCII): Changed to (CHARSET_ID_OFFSET - 3). (LEADING_BYTE_HIRAGANA_JISX0208): Changed to (CHARSET_ID_OFFSET - 4). (LEADING_BYTE_KATAKANA_JISX0208): Changed to (CHARSET_ID_OFFSET - 5). (MIN_LEADING_BYTE_PRIVATE): Changed to `MIN_LEADING_BYTE'. (MAX_LEADING_BYTE_PRIVATE): Changed to (CHARSET_ID_OFFSET - 6). (CHARSET_ID_OFFSET_94): Changed to (CHARSET_ID_OFFSET - '0'). (CHARSET_ID_OFFSET_96): Changed to (CHARSET_ID_OFFSET_94 + 80). (CHARSET_ID_OFFSET_94x94): Changed to (CHARSET_ID_OFFSET_96 + 80). --- src/char-ucs.h | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/char-ucs.h b/src/char-ucs.h index 4c7697b..ba1e919 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -64,19 +64,26 @@ extern Lisp_Object Vcharset_latin_viscii_upper; typedef int Charset_ID; -#define MIN_LEADING_BYTE 0x80 +#define MIN_LEADING_BYTE 0x00 +#define CHARSET_ID_OFFSET 0x40 -#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 MIN_LEADING_BYTE_PRIVATE 0x85 -#define MAX_LEADING_BYTE_PRIVATE 0x94 +/* 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 CHARSET_ID_OFFSET_94 (0x95 - '0') +#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 + '?') @@ -91,7 +98,7 @@ typedef int Charset_ID; #define LEADING_BYTE_LATIN_JISX0201 (CHARSET_ID_OFFSET_94 + 'J') -#define CHARSET_ID_OFFSET_96 (0xB0 - '0') +#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') @@ -127,7 +134,7 @@ typedef int Charset_ID; #define LEADING_BYTE_THAI_TIS620 (CHARSET_ID_OFFSET_96 + 'T') -#define CHARSET_ID_OFFSET_94x94 (0xE0 - '0') +#define CHARSET_ID_OFFSET_94x94 (CHARSET_ID_OFFSET_96 + 80) /* Big5 Level 1 */ #define LEADING_BYTE_CHINESE_BIG5_1 ('0' + CHARSET_ID_OFFSET_94x94) -- 1.7.10.4