X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=d8768c679332024efd77fdf2de58693db5155612;hb=ab1dd06e0177737fcb5880921865f2c541dfca5f;hp=adb7b9b185c5a7d4495c9cd3a23a0723bfb96ccc;hpb=ec55cec1c76f5271984542cfc67a5591b41d93cd;p=chise%2Fxemacs-chise.git- diff --git a/src/char-ucs.h b/src/char-ucs.h index adb7b9b..d8768c6 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -22,6 +22,9 @@ Boston, MA 02111-1307, USA. */ #define INCLUDED_char_ucs_h_ #include "chartab.h" +#include "elhash.h" + +extern Lisp_Object Vchar_attribute_hash_table; #define valid_char_p(ch) 1 @@ -38,7 +41,7 @@ extern Lisp_Object Vcharset_latin_jisx0201; typedef short Charset_ID; -#define MIN_LEADING_BYTE -0x100 +#define MIN_LEADING_BYTE -0x200 #define CHARSET_ID_OFFSET 0x00 /* ISO/IEC 10646 */ @@ -56,6 +59,9 @@ typedef short Charset_ID; /* ISO/IEC 10646 for JIS */ #define LEADING_BYTE_UCS_JIS (CHARSET_ID_OFFSET - 6) +/* ISO/IEC 10646 for KS */ +#define LEADING_BYTE_UCS_KS (CHARSET_ID_OFFSET - 7) + /* ISO/IEC 10646 for Big5 */ #define LEADING_BYTE_UCS_BIG5 (CHARSET_ID_OFFSET - 9) @@ -73,8 +79,6 @@ typedef short Charset_ID; /* Big5 Level 2 2/4 2/{(8),9,10,11} 4/0 '1' */ #define LEADING_BYTE_CHINESE_BIG5_2 (CHARSET_ID_OFFSET - 22) -#define LEADING_BYTE_CHINESE_BIG5_CDP (CHARSET_ID_OFFSET - 23) - /* VISCII 1.1 */ #define LEADING_BYTE_LATIN_VISCII (CHARSET_ID_OFFSET - 24) @@ -129,11 +133,24 @@ typedef short Charset_ID; #define LEADING_BYTE_MOJIKYO_PJ_20 (CHARSET_ID_OFFSET - 70) #define LEADING_BYTE_MOJIKYO_PJ_21 (CHARSET_ID_OFFSET - 71) -#define LEADING_BYTE_JEF_CHINA3 (CHARSET_ID_OFFSET - 72) +#define LEADING_BYTE_CHINA3_JEF (CHARSET_ID_OFFSET - 72) #define LEADING_BYTE_CBETA (CHARSET_ID_OFFSET - 73) +#define LEADING_BYTE_CHINESE_BIG5_CDP (CHARSET_ID_OFFSET - 74) +#define LEADING_BYTE_HANZIKU_1 (CHARSET_ID_OFFSET - 75) +#define LEADING_BYTE_HANZIKU_2 (CHARSET_ID_OFFSET - 76) +#define LEADING_BYTE_HANZIKU_3 (CHARSET_ID_OFFSET - 77) +#define LEADING_BYTE_HANZIKU_4 (CHARSET_ID_OFFSET - 78) +#define LEADING_BYTE_HANZIKU_5 (CHARSET_ID_OFFSET - 79) +#define LEADING_BYTE_HANZIKU_6 (CHARSET_ID_OFFSET - 80) +#define LEADING_BYTE_HANZIKU_7 (CHARSET_ID_OFFSET - 81) +#define LEADING_BYTE_HANZIKU_8 (CHARSET_ID_OFFSET - 82) +#define LEADING_BYTE_HANZIKU_9 (CHARSET_ID_OFFSET - 83) +#define LEADING_BYTE_HANZIKU_10 (CHARSET_ID_OFFSET - 84) +#define LEADING_BYTE_HANZIKU_11 (CHARSET_ID_OFFSET - 85) +#define LEADING_BYTE_HANZIKU_12 (CHARSET_ID_OFFSET - 86) #define MIN_LEADING_BYTE_PRIVATE MIN_LEADING_BYTE -#define MAX_LEADING_BYTE_PRIVATE (CHARSET_ID_OFFSET - 74) +#define MAX_LEADING_BYTE_PRIVATE (CHARSET_ID_OFFSET - 87) /* #define CHARSET_ID_OFFSET_94 (CHARSET_ID_OFFSET - '0') */ @@ -279,9 +296,6 @@ struct Lisp_Charset /* Code-point->character mapping table */ Lisp_Object decoding_table; - /* Character->code-point mapping table */ - Lisp_Object encoding_table; - /* Range of character code */ Emchar ucs_min, ucs_max; @@ -321,12 +335,19 @@ DECLARE_LRECORD (charset, Lisp_Charset); #define CHARSET_CHARS(cs) ((cs)->chars) #define CHARSET_REVERSE_DIRECTION_CHARSET(cs) ((cs)->reverse_direction_charset) #define CHARSET_DECODING_TABLE(cs) ((cs)->decoding_table) -#define CHARSET_ENCODING_TABLE(cs) ((cs)->encoding_table) #define CHARSET_UCS_MIN(cs) ((cs)->ucs_min) #define CHARSET_UCS_MAX(cs) ((cs)->ucs_max) #define CHARSET_CODE_OFFSET(cs) ((cs)->code_offset) #define CHARSET_BYTE_OFFSET(cs) ((cs)->byte_offset) +INLINE_HEADER Lisp_Object CHARSET_ENCODING_TABLE (Lisp_Charset* cs); +INLINE_HEADER Lisp_Object +CHARSET_ENCODING_TABLE (Lisp_Charset* cs) +{ + return Fgethash (CHARSET_NAME(cs), + Vchar_attribute_hash_table, + Qnil); +} #define XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs)) #define XCHARSET_NAME(cs) CHARSET_NAME (XCHARSET (cs)) @@ -435,8 +456,8 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) */ #define MIN_CHAR_CBETA 0x00E20000 #define MAX_CHAR_CBETA 0x00E2FFFF -#define MIN_CHAR_JEF_CHINA3 0x00E80000 -#define MAX_CHAR_JEF_CHINA3 0x00E8FFFF +#define MIN_CHAR_CHINA3_JEF 0x00E80000 +#define MAX_CHAR_CHINA3_JEF 0x00E8FFFF #define MIN_CHAR_94 0x00E90940 #define MAX_CHAR_94 (MIN_CHAR_94 + 94 * 80 - 1) @@ -454,6 +475,32 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) #define MAX_CHAR_MOJIKYO (MIN_CHAR_MOJIKYO + 94 * 60 * 22) #define MIN_CHAR_GT 0x61000000 #define MAX_CHAR_GT (MIN_CHAR_GT + 66773) +#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) +#define MAX_CHAR_HANZIKU_2 (0x62000000 + 65536 * 2 + 65535) +#define MIN_CHAR_HANZIKU_3 (0x62000000 + 65536 * 3) +#define MAX_CHAR_HANZIKU_3 (0x62000000 + 65536 * 3 + 65535) +#define MIN_CHAR_HANZIKU_4 (0x62000000 + 65536 * 4) +#define MAX_CHAR_HANZIKU_4 (0x62000000 + 65536 * 4 + 65535) +#define MIN_CHAR_HANZIKU_5 (0x62000000 + 65536 * 5) +#define MAX_CHAR_HANZIKU_5 (0x62000000 + 65536 * 5 + 65535) +#define MIN_CHAR_HANZIKU_6 (0x62000000 + 65536 * 6) +#define MAX_CHAR_HANZIKU_6 (0x62000000 + 65536 * 6 + 65535) +#define MIN_CHAR_HANZIKU_7 (0x62000000 + 65536 * 7) +#define MAX_CHAR_HANZIKU_7 (0x62000000 + 65536 * 7 + 65535) +#define MIN_CHAR_HANZIKU_8 (0x62000000 + 65536 * 8) +#define MAX_CHAR_HANZIKU_8 (0x62000000 + 65536 * 8 + 65535) +#define MIN_CHAR_HANZIKU_9 (0x62000000 + 65536 * 9) +#define MAX_CHAR_HANZIKU_9 (0x62000000 + 65536 * 9 + 65535) +#define MIN_CHAR_HANZIKU_10 (0x62000000 + 65536 * 10) +#define MAX_CHAR_HANZIKU_10 (0x62000000 + 65536 * 10 + 65535) +#define MIN_CHAR_HANZIKU_11 (0x62000000 + 65536 * 11) +#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); @@ -486,9 +533,10 @@ extern Lisp_Object Vcharset_chinese_big5; extern Lisp_Object Vcharset_chinese_big5_1; extern Lisp_Object Vcharset_chinese_big5_2; -INLINE_HEADER Emchar DECODE_CHAR (Lisp_Object charset, int code_point); INLINE_HEADER Emchar -DECODE_CHAR (Lisp_Object charset, int code_point) +DECODE_DEFINED_CHAR (Lisp_Object charset, int code_point); +INLINE_HEADER Emchar +DECODE_DEFINED_CHAR (Lisp_Object charset, int code_point) { int dim = XCHARSET_DIMENSION (charset); Lisp_Object decoding_table = XCHARSET_DECODING_TABLE (charset); @@ -512,7 +560,18 @@ DECODE_CHAR (Lisp_Object charset, int code_point) else break; } - if (XCHARSET_DIMENSION (charset) == 1) + return -1; +} + +INLINE_HEADER Emchar DECODE_CHAR (Lisp_Object charset, int code_point); +INLINE_HEADER Emchar +DECODE_CHAR (Lisp_Object charset, int code_point) +{ + Emchar char_id = DECODE_DEFINED_CHAR (charset, code_point); + + if (char_id >= 0) + return char_id; + else if (XCHARSET_DIMENSION (charset) == 1) return decode_builtin_char (charset, code_point); else if (EQ (charset, Vcharset_chinese_big5_1)) {