X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=98696dac4664c5e2dad8d7fc55fa2f95566e7f15;hb=815039d81df43a36ac85ecfa1629c11bef8a0cfa;hp=35038adbe1785b35dd45d998ff9e95f6208f611d;hpb=537dfe8c0d01cb651a9dd679c98a95b160f9274e;p=chise%2Fxemacs-chise.git diff --git a/src/char-ucs.h b/src/char-ucs.h index 35038ad..98696da 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -21,88 +21,12 @@ Boston, MA 02111-1307, USA. */ #ifndef INCLUDED_char_ucs_h_ #define INCLUDED_char_ucs_h_ +#include "chartab.h" + #define valid_char_p(ch) 1 #define CHAR_ASCII_P(ch) ((ch) <= 0x7F) - -/************************************************************************/ -/* Char-ID Tables */ -/************************************************************************/ - -struct Lisp_Uint8_Byte_Table -{ - struct lcrecord_header header; - - unsigned char property[256]; -}; -typedef struct Lisp_Uint8_Byte_Table Lisp_Uint8_Byte_Table; - -DECLARE_LRECORD (uint8_byte_table, Lisp_Uint8_Byte_Table); -#define XUINT8_BYTE_TABLE(x) \ - XRECORD (x, uint8_byte_table, Lisp_Uint8_Byte_Table) -#define XSETUINT8_BYTE_TABLE(x, p) XSETRECORD (x, p, uint8_byte_table) -#define UINT8_BYTE_TABLE_P(x) RECORDP (x, uint8_byte_table) -#define GC_UINT8_BYTE_TABLE_P(x) GC_RECORDP (x, uint8_byte_table) -/* #define CHECK_UINT8_BYTE_TABLE(x) CHECK_RECORD (x, uint8_byte_table) - char table entries should never escape to Lisp */ - - -struct Lisp_Uint16_Byte_Table -{ - struct lcrecord_header header; - - unsigned short property[256]; -}; -typedef struct Lisp_Uint16_Byte_Table Lisp_Uint16_Byte_Table; - -DECLARE_LRECORD (uint16_byte_table, Lisp_Uint16_Byte_Table); -#define XUINT16_BYTE_TABLE(x) \ - XRECORD (x, uint16_byte_table, Lisp_Uint16_Byte_Table) -#define XSETUINT16_BYTE_TABLE(x, p) XSETRECORD (x, p, uint16_byte_table) -#define UINT16_BYTE_TABLE_P(x) RECORDP (x, uint16_byte_table) -#define GC_UINT16_BYTE_TABLE_P(x) GC_RECORDP (x, uint16_byte_table) -/* #define CHECK_UINT16_BYTE_TABLE(x) CHECK_RECORD (x, uint16_byte_table) - char table entries should never escape to Lisp */ - - -struct Lisp_Byte_Table -{ - struct lcrecord_header header; - - Lisp_Object property[256]; -}; -typedef struct Lisp_Byte_Table Lisp_Byte_Table; - -DECLARE_LRECORD (byte_table, Lisp_Byte_Table); -#define XBYTE_TABLE(x) XRECORD (x, byte_table, Lisp_Byte_Table) -#define XSETBYTE_TABLE(x, p) XSETRECORD (x, p, byte_table) -#define BYTE_TABLE_P(x) RECORDP (x, byte_table) -#define GC_BYTE_TABLE_P(x) GC_RECORDP (x, byte_table) -/* #define CHECK_BYTE_TABLE(x) CHECK_RECORD (x, byte_table) - char table entries should never escape to Lisp */ - - -struct Lisp_Char_ID_Table -{ - struct lcrecord_header header; - - Lisp_Object table; -}; -typedef struct Lisp_Char_ID_Table Lisp_Char_ID_Table; - -DECLARE_LRECORD (char_id_table, Lisp_Char_ID_Table); -#define XCHAR_ID_TABLE(x) XRECORD (x, char_id_table, Lisp_Char_ID_Table) -#define XSETCHAR_ID_TABLE(x, p) XSETRECORD (x, p, char_id_table) -#define CHAR_ID_TABLE_P(x) RECORDP (x, char_id_table) -#define GC_CHAR_ID_TABLE_P(x) GC_RECORDP (x, char_id_table) -/* #define CHECK_CHAR_ID_TABLE(x) CHECK_RECORD (x, char_id_table) - char table entries should never escape to Lisp */ - - -Lisp_Object get_char_id_table (Lisp_Char_ID_Table* cit, Emchar ch); - - extern Lisp_Object Vcharset_mojikyo; extern Lisp_Object Vcharset_mojikyo_2022_1; extern Lisp_Object Vcharset_latin_jisx0201; @@ -114,7 +38,7 @@ extern Lisp_Object Vcharset_latin_jisx0201; typedef short Charset_ID; -#define MIN_LEADING_BYTE -0x70 +#define MIN_LEADING_BYTE -0x200 #define CHARSET_ID_OFFSET 0x00 /* ISO/IEC 10646 */ @@ -132,6 +56,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) @@ -149,8 +76,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) @@ -205,8 +130,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_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 - 72) +#define MAX_LEADING_BYTE_PRIVATE (CHARSET_ID_OFFSET - 87) /* #define CHARSET_ID_OFFSET_94 (CHARSET_ID_OFFSET - '0') */ @@ -502,10 +443,16 @@ CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir) #define MIN_CHAR_DAIKANWA 0x00E00000 #define MAX_CHAR_DAIKANWA (MIN_CHAR_DAIKANWA + 50100) /* 0xE0FFFF */ +/* #define MIN_CHAR_MOJIKYO_0 MIN_CHAR_DAIKANWA #define MAX_CHAR_MOJIKYO_0 (MIN_CHAR_MOJIKYO_0 + 94 * 60 * 22) +*/ +#define MIN_CHAR_CBETA 0x00E20000 +#define MAX_CHAR_CBETA 0x00E2FFFF +#define MIN_CHAR_CHINA3_JEF 0x00E80000 +#define MAX_CHAR_CHINA3_JEF 0x00E8FFFF -#define MIN_CHAR_94 0xE90940 +#define MIN_CHAR_94 0x00E90940 #define MAX_CHAR_94 (MIN_CHAR_94 + 94 * 80 - 1) #define MIN_CHAR_96 (MIN_CHAR_94 + 94 * 80) #define MAX_CHAR_96 (MIN_CHAR_96 + 96 * 80 - 1) @@ -521,6 +468,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); @@ -553,9 +526,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); @@ -579,7 +553,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)) { @@ -622,7 +607,7 @@ DECODE_CHAR (Lisp_Object charset, int code_point) { int plane = LEADING_BYTE_MOJIKYO_PJ_1 - XCHARSET_ID (charset); - if ( (0 <= plane) && (plane <= 21) ) + if ( (0 <= plane) && (plane < 21) ) { int m = DECODE_MOJIKYO_2022 (plane + 33, code_point >> 8, @@ -662,8 +647,8 @@ charset_code_point (Lisp_Object charset, Emchar ch) Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (charset); Lisp_Object ret; - if ( CHAR_ID_TABLE_P (encoding_table) - && INTP (ret = get_char_id_table (XCHAR_ID_TABLE(encoding_table), + if ( CHAR_TABLEP (encoding_table) + && INTP (ret = get_char_id_table (XCHAR_TABLE(encoding_table), ch)) ) return XINT (ret); else @@ -687,9 +672,9 @@ encode_char_1 (Emchar ch, Lisp_Object* charset) Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (*charset); Lisp_Object ret; - if ( CHAR_ID_TABLE_P (encoding_table) + if ( CHAR_TABLEP (encoding_table) && INTP (ret - = get_char_id_table (XCHAR_ID_TABLE(encoding_table), + = get_char_id_table (XCHAR_TABLE(encoding_table), ch)) ) return XINT (ret); else