From: tomo Date: Mon, 16 Jul 2001 05:20:39 +0000 (+0000) Subject: (MIN_LEADING_BYTE): Changed to -0x70. X-Git-Tag: r21-2-38-utf-2000-0_17-1~325 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=0a1184e5a0dbfd4f5e8f4e41e4fa40084b07519f;p=chise%2Fxemacs-chise.git.1 (MIN_LEADING_BYTE): Changed to -0x70. (LEADING_BYTE_CHINESE_GB12345): New macro. --- diff --git a/src/char-ucs.h b/src/char-ucs.h index 621d4d6..d62a36c 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -110,7 +110,7 @@ extern Lisp_Object Vcharset_latin_jisx0201; typedef short Charset_ID; -#define MIN_LEADING_BYTE -0x60 +#define MIN_LEADING_BYTE -0x70 #define CHARSET_ID_OFFSET 0x00 /* ISO/IEC 10646 */ @@ -126,72 +126,75 @@ typedef short Charset_ID; #define LEADING_BYTE_UCS_CNS (CHARSET_ID_OFFSET - 5) /* Japanese JIS X0208-1990 2/4 2/{(8),9,10,11} 4/2 (B) */ -#define LEADING_BYTE_JAPANESE_JISX0208_1990 (CHARSET_ID_OFFSET - 6) +#define LEADING_BYTE_JAPANESE_JISX0208_1990 (CHARSET_ID_OFFSET - 10) -/* VISCII 1.1 */ -#define LEADING_BYTE_LATIN_VISCII (CHARSET_ID_OFFSET - 7) - -/* MULE VISCII-LOWER (CHARSET_ID_OFFSET_96 + '1') */ -#define LEADING_BYTE_LATIN_VISCII_LOWER (CHARSET_ID_OFFSET - 8) +/* Chinese GB 12345-1990 */ +#define LEADING_BYTE_CHINESE_GB12345 (CHARSET_ID_OFFSET - 11) -/* MULE VISCII-UPPER (CHARSET_ID_OFFSET_96 + '2') */ -#define LEADING_BYTE_LATIN_VISCII_UPPER (CHARSET_ID_OFFSET - 9) - -#define LEADING_BYTE_CHINESE_BIG5 (CHARSET_ID_OFFSET - 10) +#define LEADING_BYTE_CHINESE_BIG5 (CHARSET_ID_OFFSET - 20) /* Big5 Level 1 2/4 2/{(8),9,10,11} 4/0 '0' */ -#define LEADING_BYTE_CHINESE_BIG5_1 (CHARSET_ID_OFFSET - 11) +#define LEADING_BYTE_CHINESE_BIG5_1 (CHARSET_ID_OFFSET - 21) /* Big5 Level 2 2/4 2/{(8),9,10,11} 4/0 '1' */ -#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) /* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */ -#define LEADING_BYTE_MOJIKYO_PJ_1 (CHARSET_ID_OFFSET - 41) -#define LEADING_BYTE_MOJIKYO_PJ_2 (CHARSET_ID_OFFSET - 42) -#define LEADING_BYTE_MOJIKYO_PJ_3 (CHARSET_ID_OFFSET - 43) -#define LEADING_BYTE_MOJIKYO_PJ_4 (CHARSET_ID_OFFSET - 44) -#define LEADING_BYTE_MOJIKYO_PJ_5 (CHARSET_ID_OFFSET - 45) -#define LEADING_BYTE_MOJIKYO_PJ_6 (CHARSET_ID_OFFSET - 46) -#define LEADING_BYTE_MOJIKYO_PJ_7 (CHARSET_ID_OFFSET - 47) -#define LEADING_BYTE_MOJIKYO_PJ_8 (CHARSET_ID_OFFSET - 48) -#define LEADING_BYTE_MOJIKYO_PJ_9 (CHARSET_ID_OFFSET - 49) -#define LEADING_BYTE_MOJIKYO_PJ_10 (CHARSET_ID_OFFSET - 50) -#define LEADING_BYTE_MOJIKYO_PJ_11 (CHARSET_ID_OFFSET - 51) -#define LEADING_BYTE_MOJIKYO_PJ_12 (CHARSET_ID_OFFSET - 52) -#define LEADING_BYTE_MOJIKYO_PJ_13 (CHARSET_ID_OFFSET - 53) -#define LEADING_BYTE_MOJIKYO_PJ_14 (CHARSET_ID_OFFSET - 54) -#define LEADING_BYTE_MOJIKYO_PJ_15 (CHARSET_ID_OFFSET - 55) -#define LEADING_BYTE_MOJIKYO_PJ_16 (CHARSET_ID_OFFSET - 56) -#define LEADING_BYTE_MOJIKYO_PJ_17 (CHARSET_ID_OFFSET - 57) -#define LEADING_BYTE_MOJIKYO_PJ_18 (CHARSET_ID_OFFSET - 58) -#define LEADING_BYTE_MOJIKYO_PJ_19 (CHARSET_ID_OFFSET - 59) -#define LEADING_BYTE_MOJIKYO_PJ_20 (CHARSET_ID_OFFSET - 60) -#define LEADING_BYTE_MOJIKYO_PJ_21 (CHARSET_ID_OFFSET - 61) +#define LEADING_BYTE_MOJIKYO_PJ_1 (CHARSET_ID_OFFSET - 51) +#define LEADING_BYTE_MOJIKYO_PJ_2 (CHARSET_ID_OFFSET - 52) +#define LEADING_BYTE_MOJIKYO_PJ_3 (CHARSET_ID_OFFSET - 53) +#define LEADING_BYTE_MOJIKYO_PJ_4 (CHARSET_ID_OFFSET - 54) +#define LEADING_BYTE_MOJIKYO_PJ_5 (CHARSET_ID_OFFSET - 55) +#define LEADING_BYTE_MOJIKYO_PJ_6 (CHARSET_ID_OFFSET - 56) +#define LEADING_BYTE_MOJIKYO_PJ_7 (CHARSET_ID_OFFSET - 57) +#define LEADING_BYTE_MOJIKYO_PJ_8 (CHARSET_ID_OFFSET - 58) +#define LEADING_BYTE_MOJIKYO_PJ_9 (CHARSET_ID_OFFSET - 59) +#define LEADING_BYTE_MOJIKYO_PJ_10 (CHARSET_ID_OFFSET - 60) +#define LEADING_BYTE_MOJIKYO_PJ_11 (CHARSET_ID_OFFSET - 61) +#define LEADING_BYTE_MOJIKYO_PJ_12 (CHARSET_ID_OFFSET - 62) +#define LEADING_BYTE_MOJIKYO_PJ_13 (CHARSET_ID_OFFSET - 63) +#define LEADING_BYTE_MOJIKYO_PJ_14 (CHARSET_ID_OFFSET - 64) +#define LEADING_BYTE_MOJIKYO_PJ_15 (CHARSET_ID_OFFSET - 65) +#define LEADING_BYTE_MOJIKYO_PJ_16 (CHARSET_ID_OFFSET - 66) +#define LEADING_BYTE_MOJIKYO_PJ_17 (CHARSET_ID_OFFSET - 67) +#define LEADING_BYTE_MOJIKYO_PJ_18 (CHARSET_ID_OFFSET - 68) +#define LEADING_BYTE_MOJIKYO_PJ_19 (CHARSET_ID_OFFSET - 69) +#define LEADING_BYTE_MOJIKYO_PJ_20 (CHARSET_ID_OFFSET - 70) +#define LEADING_BYTE_MOJIKYO_PJ_21 (CHARSET_ID_OFFSET - 71) #define MIN_LEADING_BYTE_PRIVATE MIN_LEADING_BYTE -#define MAX_LEADING_BYTE_PRIVATE (CHARSET_ID_OFFSET - 62) +#define MAX_LEADING_BYTE_PRIVATE (CHARSET_ID_OFFSET - 72) /* #define CHARSET_ID_OFFSET_94 (CHARSET_ID_OFFSET - '0') */