X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=56b72bfda66a1182d46e37ef5acc326366e970f6;hb=7c00b553ec1c85f4eff517d08a87be98e6158119;hp=68552193d39503bbfe4e5c84ab4555dc16b4fc3d;hpb=2da37f54fd796d4607db9f555c255ea750be7712;p=chise%2Fxemacs-chise.git diff --git a/src/char-ucs.h b/src/char-ucs.h index 6855219..56b72bf 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -41,34 +41,13 @@ get_byte_from_character_table (Emchar ch, Emchar_to_byte_table* table); extern Lisp_Object Vcharset_ucs_bmp; - extern Lisp_Object Vcharset_latin_jisx0201; -extern Emchar latin_jisx0201_to_ucs[94]; -extern Emchar_to_byte_table* ucs_to_latin_jisx0201; - extern Lisp_Object Vcharset_latin_iso8859_2; -extern Emchar latin_iso8859_2_to_ucs[96]; -extern Emchar_to_byte_table* ucs_to_latin_iso8859_2; - extern Lisp_Object Vcharset_latin_iso8859_3; -extern Emchar latin_iso8859_3_to_ucs[96]; -extern Emchar_to_byte_table* ucs_to_latin_iso8859_3; - extern Lisp_Object Vcharset_latin_iso8859_4; -extern Emchar latin_iso8859_4_to_ucs[96]; -extern Emchar_to_byte_table* ucs_to_latin_iso8859_4; - extern Lisp_Object Vcharset_latin_iso8859_9; -extern Emchar latin_iso8859_9_to_ucs[96]; -extern Emchar_to_byte_table* ucs_to_latin_iso8859_9; - extern Lisp_Object Vcharset_latin_viscii_lower; -extern Emchar latin_viscii_lower_to_ucs[96]; -extern Emchar_to_byte_table* ucs_to_latin_viscii_lower; - extern Lisp_Object Vcharset_latin_viscii_upper; -extern Emchar latin_viscii_upper_to_ucs[96]; -extern Emchar_to_byte_table* ucs_to_latin_viscii_upper; /************************************************************************/ @@ -217,11 +196,6 @@ struct Lisp_Charset /* Final byte of this character set in ISO2022 designating escape sequence */ Bufbyte final; - /* Number of bytes (1 - 4) required in the internal representation - for characters in this character set. This is *not* the - same as the dimension of the character set). */ - unsigned int rep_bytes; - /* Number of columns a character in this charset takes up, on TTY devices. Not used for X devices. */ unsigned int columns; @@ -240,6 +214,19 @@ struct Lisp_Charset /* Which half of font to be used to display this character set */ unsigned int graphic; + + /* Byte->character mapping table */ + Emchar* decoding_table; + + /* Character->byte mapping table */ + Emchar_to_byte_table* to_byte1_table; + Emchar_to_byte_table* to_byte2_table; + + /* Range of character code */ + Emchar ucs_min, ucs_max; + + /* Offset for external representation */ + Emchar code_offset; }; DECLARE_LRECORD (charset, struct Lisp_Charset); @@ -266,7 +253,6 @@ DECLARE_LRECORD (charset, struct Lisp_Charset); #define CHARSET_NAME(cs) ((cs)->name) #define CHARSET_SHORT_NAME(cs) ((cs)->short_name) #define CHARSET_LONG_NAME(cs) ((cs)->long_name) -#define CHARSET_REP_BYTES(cs) ((cs)->rep_bytes) #define CHARSET_COLUMNS(cs) ((cs)->columns) #define CHARSET_GRAPHIC(cs) ((cs)->graphic) #define CHARSET_TYPE(cs) ((cs)->type) @@ -278,14 +264,18 @@ DECLARE_LRECORD (charset, struct Lisp_Charset); #define CHARSET_DIMENSION(cs) ((cs)->dimension) #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_TO_BYTE1_TABLE(cs) ((cs)->to_byte1_table) +#define CHARSET_TO_BYTE2_TABLE(cs) ((cs)->to_byte2_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 XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs)) #define XCHARSET_NAME(cs) CHARSET_NAME (XCHARSET (cs)) #define XCHARSET_SHORT_NAME(cs) CHARSET_SHORT_NAME (XCHARSET (cs)) #define XCHARSET_LONG_NAME(cs) CHARSET_LONG_NAME (XCHARSET (cs)) -#define XCHARSET_REP_BYTES(cs) CHARSET_REP_BYTES (XCHARSET (cs)) -#define XCHARSET_COLUMNS(cs) CHARSET_COLUMNS (XCHARSET (cs)) #define XCHARSET_GRAPHIC(cs) CHARSET_GRAPHIC (XCHARSET (cs)) #define XCHARSET_TYPE(cs) CHARSET_TYPE (XCHARSET (cs)) #define XCHARSET_DIRECTION(cs) CHARSET_DIRECTION (XCHARSET (cs)) @@ -298,6 +288,9 @@ DECLARE_LRECORD (charset, struct Lisp_Charset); #define XCHARSET_CHARS(cs) CHARSET_CHARS (XCHARSET (cs)) #define XCHARSET_REVERSE_DIRECTION_CHARSET(cs) \ CHARSET_REVERSE_DIRECTION_CHARSET (XCHARSET (cs)) +#define XCHARSET_DECODING_TABLE(cs) CHARSET_DECODING_TABLE(XCHARSET(cs)) +#define XCHARSET_TO_BYTE1_TABLE(cs) CHARSET_TO_BYTE1_TABLE(XCHARSET(cs)) +#define XCHARSET_TO_BYTE2_TABLE(cs) CHARSET_TO_BYTE2_TABLE(XCHARSET(cs)) /* Table of charsets indexed by (leading byte - 128). */ extern Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES]; @@ -368,41 +361,19 @@ INLINE Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2); INLINE Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2) { - if (EQ (charset, Vcharset_ascii)) - return c1; - else if (EQ (charset, Vcharset_control_1)) - return c1 | 0x80; - else if (EQ (charset, Vcharset_ucs_bmp)) - return (c1 << 8) | c2; - else if (EQ (charset, Vcharset_latin_iso8859_1)) - return c1 | 0x80; - else if (EQ (charset, Vcharset_latin_iso8859_2)) - return latin_iso8859_2_to_ucs[c1 - 32]; - else if (EQ (charset, Vcharset_latin_iso8859_3)) - return latin_iso8859_3_to_ucs[c1 - 32]; - else if (EQ (charset, Vcharset_latin_iso8859_4)) - return latin_iso8859_4_to_ucs[c1 - 32]; - else if (EQ (charset, Vcharset_cyrillic_iso8859_5)) - return c1 + MIN_CHAR_CYRILLIC - 0x20; - else if (EQ (charset, Vcharset_greek_iso8859_7)) - return c1 + MIN_CHAR_GREEK - 0x20; - else if (EQ (charset, Vcharset_hebrew_iso8859_8)) - return c1 + MIN_CHAR_HEBREW - 0x20; - else if (EQ (charset, Vcharset_latin_iso8859_9)) - return latin_iso8859_9_to_ucs[c1 - 32]; - else if (EQ (charset, Vcharset_thai_tis620)) - return c1 + MIN_CHAR_THAI - 0x20; + Emchar* decoding_table; + + if ((decoding_table = XCHARSET_DECODING_TABLE (charset)) != NULL) + return decoding_table[c1 - (XCHARSET_CHARS (charset) == 94 ? 33 : 32)]; else if (EQ (charset, Vcharset_katakana_jisx0201)) if (c1 < 0x60) return c1 + MIN_CHAR_HALFWIDTH_KATAKANA - 0x20; else - return 32; - else if (EQ (charset, Vcharset_latin_jisx0201)) - return latin_jisx0201_to_ucs[c1 - 33]; - else if (EQ (charset, Vcharset_latin_viscii_lower)) - return latin_viscii_lower_to_ucs[c1 - 32]; - else if (EQ (charset, Vcharset_latin_viscii_upper)) - return latin_viscii_upper_to_ucs[c1 - 32]; + /* return MIN_CHAR_94 + ('I' - '0') * 94 + (c1 - 33); */ + return ' '; + else if (CHARSET_UCS_MAX (XCHARSET (charset))) + return c1 - CHARSET_CODE_OFFSET (XCHARSET (charset)) + + CHARSET_UCS_MIN (XCHARSET (charset)); else if (XCHARSET_DIMENSION (charset) == 1) { switch (XCHARSET_CHARS (charset)) @@ -435,100 +406,78 @@ MAKE_CHAR (Lisp_Object charset, int c1, int c2) } } -extern Charset_ID latin_a_char_to_charset[128]; -extern unsigned char latin_a_char_to_byte1[128]; -extern unsigned char latin_a_char_to_byte2[128]; +unsigned char charset_get_byte1 (Lisp_Object charset, Emchar ch); +unsigned char charset_get_byte2 (Lisp_Object charset, Emchar ch); + +extern Lisp_Object Vdefault_coded_charset_priority_list; +EXFUN (Ffind_charset, 1); INLINE void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2); INLINE void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) { - if (c <= MAX_CHAR_BASIC_LATIN) - { - *charset = Vcharset_ascii; - *c1 = c; - *c2 = 0; - } - else if (c < 0xA0) - { - *charset = Vcharset_control_1; - *c1 = c & 0x7f; - *c2 = 0; - } - else if (c <= 0xff) + if (c < MIN_CHAR_94) { - *charset = Vcharset_latin_iso8859_1; - *c1 = c & 0x7f; - *c2 = 0; - } - else if (c <= 0x17f) - { - *charset - = CHARSET_BY_LEADING_BYTE (latin_a_char_to_charset[c - 0x100]); - - if (EQ (*charset, Vcharset_latin_iso8859_2)) - { - *c1 = get_byte_from_character_table (c, ucs_to_latin_iso8859_2); - *c2 = 0; - } - else if (EQ (*charset, Vcharset_latin_iso8859_3)) - { - *c1 = get_byte_from_character_table (c, ucs_to_latin_iso8859_3); - *c2 = 0; - } - else if (EQ (*charset, Vcharset_latin_iso8859_4)) + Lisp_Object charsets = Vdefault_coded_charset_priority_list; + while (!EQ (charsets, Qnil)) { - *c1 = get_byte_from_character_table (c, ucs_to_latin_iso8859_4); - *c2 = 0; + *charset = Ffind_charset (Fcar (charsets)); + if (!EQ (*charset, Qnil) + && (*c1 = charset_get_byte1 (*charset, c)) ) + { + *c2 = charset_get_byte2 (*charset, c); + return; + } + charsets = Fcdr (charsets); } - else if (EQ (*charset, Vcharset_latin_iso8859_9)) + /* otherwise --- maybe for bootstrap */ + if (c <= MAX_CHAR_BASIC_LATIN) { - *c1 = get_byte_from_character_table (c, ucs_to_latin_iso8859_9); - *c2 = 0; + *charset = Vcharset_ascii; + *c1 = charset_get_byte1 (*charset, c); + *c2 = charset_get_byte2 (*charset, c); } - else + else if (c < 0xA0) { - *c1 = latin_a_char_to_byte1[c - 0x100]; - *c2 = latin_a_char_to_byte2[c - 0x100]; + *charset = Vcharset_control_1; + *c1 = charset_get_byte1 (*charset, c); + *c2 = charset_get_byte2 (*charset, c); } - } - else if (c < MIN_CHAR_GREEK) - { - if ( (*c1 = get_byte_from_character_table (c, ucs_to_latin_iso8859_2)) ) + else if (c <= 0xff) { - *charset = Vcharset_latin_iso8859_2; - *c2 = 0; + *charset = Vcharset_latin_iso8859_1; + *c1 = charset_get_byte1 (*charset, c); + *c2 = charset_get_byte2 (*charset, c); } - else if ( (*c1 = - get_byte_from_character_table (c, ucs_to_latin_iso8859_3)) ) + else if ((MIN_CHAR_GREEK <= c) && (c <= MAX_CHAR_GREEK)) { - *charset = Vcharset_latin_iso8859_3; + *charset = Vcharset_greek_iso8859_7; + *c1 = c - MIN_CHAR_GREEK + 0x20; *c2 = 0; } - else if ( (*c1 = - get_byte_from_character_table (c, ucs_to_latin_iso8859_4)) ) + else if ((MIN_CHAR_CYRILLIC <= c) && (c <= MAX_CHAR_CYRILLIC)) { - *charset = Vcharset_latin_iso8859_4; + *charset = Vcharset_cyrillic_iso8859_5; + *c1 = c - MIN_CHAR_CYRILLIC + 0x20; *c2 = 0; } - else if ( (*c1 = - get_byte_from_character_table (c, ucs_to_latin_iso8859_9)) ) + else if ((MIN_CHAR_HEBREW <= c) && (c <= MAX_CHAR_HEBREW)) { - *charset = Vcharset_latin_iso8859_9; + *charset = Vcharset_hebrew_iso8859_8; + *c1 = c - MIN_CHAR_HEBREW + 0x20; *c2 = 0; } - else if ( (*c1 = - get_byte_from_character_table (c, - ucs_to_latin_viscii_lower)) ) + else if ((MIN_CHAR_THAI <= c) && (c <= MAX_CHAR_THAI)) { - *charset = Vcharset_latin_viscii_lower; + *charset = Vcharset_thai_tis620; + *c1 = c - MIN_CHAR_THAI + 0x20; *c2 = 0; } - else if ( (*c1 = - get_byte_from_character_table (c, - ucs_to_latin_viscii_upper)) ) + else if ((MIN_CHAR_HALFWIDTH_KATAKANA <= c) + && (c <= MAX_CHAR_HALFWIDTH_KATAKANA)) { - *charset = Vcharset_latin_viscii_upper; + *charset = Vcharset_katakana_jisx0201; + *c1 = c - MIN_CHAR_HALFWIDTH_KATAKANA + 0x20; *c2 = 0; } else @@ -538,80 +487,6 @@ breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) *c2 = c & 0xff; } } - else if (c <= MAX_CHAR_GREEK) - { - *charset = Vcharset_greek_iso8859_7; - *c1 = c - MIN_CHAR_GREEK + 0x20; - *c2 = 0; - } - else if (c < MIN_CHAR_CYRILLIC) - { - *charset = Vcharset_ucs_bmp; - *c1 = c >> 8; - *c2 = c & 0xff; - } - else if (c <= MAX_CHAR_CYRILLIC) - { - *charset = Vcharset_cyrillic_iso8859_5; - *c1 = c - MIN_CHAR_CYRILLIC + 0x20; - *c2 = 0; - } - else if (c < MIN_CHAR_HEBREW) - { - *charset = Vcharset_ucs_bmp; - *c1 = c >> 8; - *c2 = c & 0xff; - } - else if (c <= MAX_CHAR_HEBREW) - { - *charset = Vcharset_hebrew_iso8859_8; - *c1 = c - MIN_CHAR_HEBREW + 0x20; - *c2 = 0; - } - else if (c < MIN_CHAR_THAI) - { - *charset = Vcharset_ucs_bmp; - *c1 = c >> 8; - *c2 = c & 0xff; - } - else if (c <= MAX_CHAR_THAI) - { - *charset = Vcharset_thai_tis620; - *c1 = c - MIN_CHAR_THAI + 0x20; - *c2 = 0; - } - else if (c < MIN_CHAR_HALFWIDTH_KATAKANA) - { - if ( (*c1 = get_byte_from_character_table (c, ucs_to_latin_jisx0201)) ) - { - *charset = Vcharset_latin_jisx0201; - *c2 = 0; - } - else if ( (*c1 = get_byte_from_character_table - (c, ucs_to_latin_viscii_lower)) ) - { - *charset = Vcharset_latin_viscii_lower; - *c2 = 0; - } - else if ( (*c1 = get_byte_from_character_table - (c, ucs_to_latin_viscii_upper)) ) - { - *charset = Vcharset_latin_viscii_upper; - *c2 = 0; - } - else - { - *charset = Vcharset_ucs_bmp; - *c1 = c >> 8; - *c2 = c & 0xff; - } - } - else if (c <= MAX_CHAR_HALFWIDTH_KATAKANA) - { - *charset = Vcharset_katakana_jisx0201; - *c1 = c - MIN_CHAR_HALFWIDTH_KATAKANA + 0x20; - *c2 = 0; - } else if (c <= MAX_CHAR_94) { *charset @@ -671,22 +546,13 @@ CHAR_CHARSET (Emchar ch) #define CHAR_LEADING_BYTE(c) (XCHARSET_LEADING_BYTE(CHAR_CHARSET(c))) - -#ifdef ENABLE_COMPOSITE_CHARS -/************************************************************************/ -/* Composite characters */ -/************************************************************************/ - -Emchar lookup_composite_char (Bufbyte *str, int len); -Lisp_Object composite_char_string (Emchar ch); -#endif /* ENABLE_COMPOSITE_CHARS */ +#define CHAR_COLUMNS(c) (CHARSET_COLUMNS(XCHARSET(CHAR_CHARSET(c)))) /************************************************************************/ /* Exported functions */ /************************************************************************/ -EXFUN (Ffind_charset, 1); EXFUN (Fget_charset, 1); extern Lisp_Object Vcharset_chinese_big5_1;