X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fchar-ucs.h;h=7ea200d4bc050910f87ab4ed6a5f9c0a30aeaaaf;hb=25e5d28d57dbe61cb1a5366d8e4a48c0196b3b74;hp=3698e70fb996605a0a39a559dd2c4b3d5f4b563a;hpb=03017fac7ff2ca0c7116f566552e08a359923a52;p=chise%2Fxemacs-chise.git diff --git a/src/char-ucs.h b/src/char-ucs.h index 3698e70..7ea200d 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -79,15 +79,6 @@ typedef short Charset_ID; /* ISO/IEC 10646 for GB */ #define LEADING_BYTE_UCS_GB (MIN_LEADING_BYTE + 6) -/* ISO/IEC 10646 for CNS */ -#define LEADING_BYTE_UCS_CNS (MIN_LEADING_BYTE + 7) - -/* ISO/IEC 10646 for JIS */ -#define LEADING_BYTE_UCS_JIS (MIN_LEADING_BYTE + 8) - -/* ISO/IEC 10646 for KS */ -#define LEADING_BYTE_UCS_KS (MIN_LEADING_BYTE + 9) - /* Japanese JIS X0208 Common 2/4 2/{(8),9,10,11} 4/2 (B) */ #define LEADING_BYTE_JIS_X0208 (MIN_LEADING_BYTE + 11) @@ -116,37 +107,6 @@ typedef short Charset_ID; #define LEADING_BYTE_ETHIOPIC_UCS (MIN_LEADING_BYTE + 27) -#define LEADING_BYTE_DAIKANWA_0 (MIN_LEADING_BYTE + 28) -#define LEADING_BYTE_DAIKANWA_1 (MIN_LEADING_BYTE + 29) -#define LEADING_BYTE_DAIKANWA_2 (MIN_LEADING_BYTE + 30) -#define LEADING_BYTE_DAIKANWA_3 (MIN_LEADING_BYTE + 31) - -#define LEADING_BYTE_GT_PJ_1 (MIN_LEADING_BYTE + 41) -#define LEADING_BYTE_GT_PJ_2 (MIN_LEADING_BYTE + 42) -#define LEADING_BYTE_GT_PJ_3 (MIN_LEADING_BYTE + 43) -#define LEADING_BYTE_GT_PJ_4 (MIN_LEADING_BYTE + 44) -#define LEADING_BYTE_GT_PJ_5 (MIN_LEADING_BYTE + 45) -#define LEADING_BYTE_GT_PJ_6 (MIN_LEADING_BYTE + 46) -#define LEADING_BYTE_GT_PJ_7 (MIN_LEADING_BYTE + 47) -#define LEADING_BYTE_GT_PJ_8 (MIN_LEADING_BYTE + 48) -#define LEADING_BYTE_GT_PJ_9 (MIN_LEADING_BYTE + 49) -#define LEADING_BYTE_GT_PJ_10 (MIN_LEADING_BYTE + 50) -#define LEADING_BYTE_GT_PJ_11 (MIN_LEADING_BYTE + 51) - -/* #define LEADING_BYTE_CHINESE_BIG5_CDP (MIN_LEADING_BYTE + 84) */ -#define LEADING_BYTE_HANZIKU_1 (MIN_LEADING_BYTE + 85) -#define LEADING_BYTE_HANZIKU_2 (MIN_LEADING_BYTE + 86) -#define LEADING_BYTE_HANZIKU_3 (MIN_LEADING_BYTE + 87) -#define LEADING_BYTE_HANZIKU_4 (MIN_LEADING_BYTE + 88) -#define LEADING_BYTE_HANZIKU_5 (MIN_LEADING_BYTE + 89) -#define LEADING_BYTE_HANZIKU_6 (MIN_LEADING_BYTE + 90) -#define LEADING_BYTE_HANZIKU_7 (MIN_LEADING_BYTE + 91) -#define LEADING_BYTE_HANZIKU_8 (MIN_LEADING_BYTE + 92) -#define LEADING_BYTE_HANZIKU_9 (MIN_LEADING_BYTE + 93) -#define LEADING_BYTE_HANZIKU_10 (MIN_LEADING_BYTE + 94) -#define LEADING_BYTE_HANZIKU_11 (MIN_LEADING_BYTE + 95) -#define LEADING_BYTE_HANZIKU_12 (MIN_LEADING_BYTE + 96) - #define MIN_LEADING_BYTE_PRIVATE (MIN_LEADING_BYTE + 97) #define MAX_LEADING_BYTE_PRIVATE -1 @@ -482,15 +442,16 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) #define MIN_CHAR_SIP 0x020000 #define MAX_CHAR_SIP 0x02FFFF +#if 0 #define MIN_CHAR_DAIKANWA 0x00E00000 #define MAX_CHAR_DAIKANWA (MIN_CHAR_DAIKANWA + 50100) /* 0xE0FFFF */ -/* + #define MIN_CHAR_CBETA 0x00E20000 #define MAX_CHAR_CBETA 0x00E2FFFF #define MIN_CHAR_CHINA3_JEF 0x00E80000 #define MAX_CHAR_CHINA3_JEF 0x00E8FFFF -*/ +#endif #define MIN_CHAR_94 0x00E90940 #define MAX_CHAR_94 (MIN_CHAR_94 + 94 * 80 - 1) @@ -506,10 +467,11 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) /* #define MIN_CHAR_GT 0x61000000 -#define MAX_CHAR_GT (MIN_CHAR_GT + 66773) +#define MAX_CHAR_GT (MIN_CHAR_GT + 67547) */ #define MIN_CHAR_BIG5_CDP 0x62000000 #define MAX_CHAR_BIG5_CDP 0x6200FFFF +/* #define MIN_CHAR_HANZIKU_1 (0x62000000 + 65536 * 1) #define MAX_CHAR_HANZIKU_1 (0x62000000 + 65536 * 1 + 65535) #define MIN_CHAR_HANZIKU_2 (0x62000000 + 65536 * 2) @@ -534,6 +496,7 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) #define MAX_CHAR_HANZIKU_11 (0x62000000 + 65536 * 11 + 65535) #define MIN_CHAR_HANZIKU_12 (0x62000000 + 65536 * 12) #define MAX_CHAR_HANZIKU_12 (0x62000000 + 65536 * 12 + 65535) +*/ Emchar decode_builtin_char (Lisp_Object charset, int code_point);