X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-charset.c;h=4acd7fab1ca58e58e20e99f21f28b4824fbd0b3b;hb=7c00b553ec1c85f4eff517d08a87be98e6158119;hp=d839db69212272050f654006393317eeba43d85b;hpb=39ae40e041f5cb8685caa4616a98404a8040856d;p=chise%2Fxemacs-chise.git diff --git a/src/mule-charset.c b/src/mule-charset.c index d839db6..4acd7fa 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -996,399 +996,6 @@ Emchar latin_tcvn5712_to_ucs[96] = 0x1ED0 /* 0xFF LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */ }; -Charset_ID latin_a_char_to_charset[128] = { - /* U+0100 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0101 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0102 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0103 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0104 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0105 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0106 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0107 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0108 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0109 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+010A */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+010B */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+010C */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+010D */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+010E */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+010F */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0110 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0111 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0112 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0113 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0114 */ LEADING_BYTE_UCS_BMP, - /* U+0115 */ LEADING_BYTE_UCS_BMP, - /* U+0116 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0117 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0118 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0119 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+011A */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+011B */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+011C */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+011D */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+011E */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+011F */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0120 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0121 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0122 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0123 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0124 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0125 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0126 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0127 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0128 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0129 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+012A */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+012B */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+012C */ LEADING_BYTE_UCS_BMP, - /* U+012D */ LEADING_BYTE_UCS_BMP, - /* U+012E */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+012F */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0130 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0131 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0132 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0133 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0134 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0135 */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+0136 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0137 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0138 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0139 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+013A */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+013B */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+013C */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+013D */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+013E */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+013F */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0140 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0141 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0142 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0143 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0144 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0145 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0146 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0147 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0148 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0149 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+014A */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+014B */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+014C */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+014D */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+014E */ LEADING_BYTE_UCS_BMP, - /* U+014F */ LEADING_BYTE_UCS_BMP, - /* U+0150 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0151 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0152 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0153 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0154 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0155 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0156 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0157 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0158 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0159 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+015A */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+015B */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+015C */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+015D */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+015E */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+015F */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0160 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0161 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0162 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0163 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0164 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0165 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0166 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0167 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0168 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0169 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+016A */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+016B */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+016C */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+016D */ LEADING_BYTE_LATIN_ISO8859_3, - /* U+016E */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+016F */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0170 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0171 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+0172 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0173 */ LEADING_BYTE_LATIN_ISO8859_4, - /* U+0174 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0175 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0176 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0177 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0178 */ LEADING_BYTE_JAPANESE_JISX0212, - /* U+0179 */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+017A */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+017B */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+017C */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+017D */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+017E */ LEADING_BYTE_LATIN_ISO8859_2, - /* U+017F */ LEADING_BYTE_UCS_BMP -}; - -unsigned char latin_a_char_to_byte1[128] = { - /* U+0100 */ 0xC0 - 0x80, - /* U+0101 */ 0xE0 - 0x80, - /* U+0102 */ 0xC3 - 0x80, - /* U+0103 */ 0xE3 - 0x80, - /* U+0104 */ 0xA1 - 0x80, - /* U+0105 */ 0xB1 - 0x80, - /* U+0106 */ 0xC6 - 0x80, - /* U+0107 */ 0xE6 - 0x80, - /* U+0108 */ 0xC6 - 0x80, - /* U+0109 */ 0xE6 - 0x80, - /* U+010A */ 0xC5 - 0x80, - /* U+010B */ 0xE5 - 0x80, - /* U+010C */ 0xC8 - 0x80, - /* U+010D */ 0xE8 - 0x80, - /* U+010E */ 0xCF - 0x80, - /* U+010F */ 0xEF - 0x80, - /* U+0110 */ 0xD0 - 0x80, - /* U+0111 */ 0xF0 - 0x80, - /* U+0112 */ 0xAA - 0x80, - /* U+0113 */ 0xBA - 0x80, - /* U+0114 */ 0x01, - /* U+0115 */ 0x01, - /* U+0116 */ 0xCC - 0x80, - /* U+0117 */ 0xEC - 0x80, - /* U+0118 */ 0xCA - 0x80, - /* U+0119 */ 0xEA - 0x80, - /* U+011A */ 0xCC - 0x80, - /* U+011B */ 0xEC - 0x80, - /* U+011C */ 0xD8 - 0x80, - /* U+011D */ 0xF8 - 0x80, - /* U+011E */ 0xAB - 0x80, - /* U+011F */ 0xBB - 0x80, - /* U+0120 */ 0xD5 - 0x80, - /* U+0121 */ 0xF5 - 0x80, - /* U+0122 */ 0xAB - 0x80, - /* U+0123 */ 0xBB - 0x80, - /* U+0124 */ 0xA6 - 0x80, - /* U+0125 */ 0xB6 - 0x80, - /* U+0126 */ 0xA1 - 0x80, - /* U+0127 */ 0xB1 - 0x80, - /* U+0128 */ 0xA5 - 0x80, - /* U+0129 */ 0xB5 - 0x80, - /* U+012A */ 0xCF - 0x80, - /* U+012B */ 0xEF - 0x80, - /* U+012C */ 0x01, - /* U+012D */ 0x01, - /* U+012E */ 0xC7 - 0x80, - /* U+012F */ 0xE7 - 0x80, - /* U+0130 */ 0xA9 - 0x80, - /* U+0131 */ 0xB9 - 0x80, - /* U+0132 */ 0x29, - /* U+0133 */ 0x29, - /* U+0134 */ 0xAC - 0x80, - /* U+0135 */ 0xBC - 0x80, - /* U+0136 */ 0xD3 - 0x80, - /* U+0137 */ 0xF3 - 0x80, - /* U+0138 */ 0xA2 - 0x80, - /* U+0139 */ 0xC5 - 0x80, - /* U+013A */ 0xE5 - 0x80, - /* U+013B */ 0xA6 - 0x80, - /* U+013C */ 0xB6 - 0x80, - /* U+013D */ 0xA5 - 0x80, - /* U+013E */ 0xB5 - 0x80, - /* U+013F */ 0x29, - /* U+0140 */ 0x29, - /* U+0141 */ 0xA3 - 0x80, - /* U+0142 */ 0xB3 - 0x80, - /* U+0143 */ 0xD1 - 0x80, - /* U+0144 */ 0xF1 - 0x80, - /* U+0145 */ 0xD1 - 0x80, - /* U+0146 */ 0xF1 - 0x80, - /* U+0147 */ 0xD2 - 0x80, - /* U+0148 */ 0xF2 - 0x80, - /* U+0149 */ 0x29, - /* U+014A */ 0xBD - 0x80, - /* U+014B */ 0xBF - 0x80, - /* U+014C */ 0xD2 - 0x80, - /* U+014D */ 0xF2 - 0x80, - /* U+014E */ 0x01, - /* U+014F */ 0x01, - /* U+0150 */ 0xD5 - 0x80, - /* U+0151 */ 0xF5 - 0x80, - /* U+0152 */ 0x29, - /* U+0153 */ 0x29, - /* U+0154 */ 0xC0 - 0x80, - /* U+0155 */ 0xE0 - 0x80, - /* U+0156 */ 0xA3 - 0x80, - /* U+0157 */ 0xB3 - 0x80, - /* U+0158 */ 0xD8 - 0x80, - /* U+0159 */ 0xF8 - 0x80, - /* U+015A */ 0xA6 - 0x80, - /* U+015B */ 0xB6 - 0x80, - /* U+015C */ 0xDE - 0x80, - /* U+015D */ 0xFE - 0x80, - /* U+015E */ 0xAA - 0x80, - /* U+015F */ 0xBA - 0x80, - /* U+0160 */ 0xA9 - 0x80, - /* U+0161 */ 0xB9 - 0x80, - /* U+0162 */ 0xDE - 0x80, - /* U+0163 */ 0xFE - 0x80, - /* U+0164 */ 0xAB - 0x80, - /* U+0165 */ 0xBB - 0x80, - /* U+0166 */ 0xAC - 0x80, - /* U+0167 */ 0xBC - 0x80, - /* U+0168 */ 0xDD - 0x80, - /* U+0169 */ 0xFD - 0x80, - /* U+016A */ 0xDE - 0x80, - /* U+016B */ 0xFE - 0x80, - /* U+016C */ 0xDD - 0x80, - /* U+016D */ 0xFD - 0x80, - /* U+016E */ 0xD9 - 0x80, - /* U+016F */ 0xF9 - 0x80, - /* U+0170 */ 0xDB - 0x80, - /* U+0171 */ 0xFB - 0x80, - /* U+0172 */ 0xD9 - 0x80, - /* U+0173 */ 0xF9 - 0x80, - /* U+0174 */ 0x2A, - /* U+0175 */ 0x2B, - /* U+0176 */ 0x2A, - /* U+0177 */ 0x2B, - /* U+0178 */ 0x2A, - /* U+0179 */ 0xAC - 0x80, - /* U+017A */ 0xBC - 0x80, - /* U+017B */ 0xAF - 0x80, - /* U+017C */ 0xBF - 0x80, - /* U+017D */ 0xAE - 0x80, - /* U+017E */ 0xBE - 0x80, - /* U+017F */ 0x01 -}; - -unsigned char latin_a_char_to_byte2[128] = { - /* U+0100 */ 0x00, - /* U+0101 */ 0x00, - /* U+0102 */ 0x00, - /* U+0103 */ 0x00, - /* U+0104 */ 0x00, - /* U+0105 */ 0x00, - /* U+0106 */ 0x00, - /* U+0107 */ 0x00, - /* U+0108 */ 0x00, - /* U+0109 */ 0x00, - /* U+010A */ 0x00, - /* U+010B */ 0x00, - /* U+010C */ 0x00, - /* U+010D */ 0x00, - /* U+010E */ 0x00, - /* U+010F */ 0x00, - /* U+0110 */ 0x00, - /* U+0111 */ 0x00, - /* U+0112 */ 0x00, - /* U+0113 */ 0x00, - /* U+0114 */ 0x14, - /* U+0115 */ 0x15, - /* U+0116 */ 0x00, - /* U+0117 */ 0x00, - /* U+0118 */ 0x00, - /* U+0119 */ 0x00, - /* U+011A */ 0x00, - /* U+011B */ 0x00, - /* U+011C */ 0x00, - /* U+011D */ 0x00, - /* U+011E */ 0x00, - /* U+011F */ 0x00, - /* U+0120 */ 0x00, - /* U+0121 */ 0x00, - /* U+0122 */ 0x00, - /* U+0123 */ 0x00, - /* U+0124 */ 0x00, - /* U+0125 */ 0x00, - /* U+0126 */ 0x00, - /* U+0127 */ 0x00, - /* U+0128 */ 0x00, - /* U+0129 */ 0x00, - /* U+012A */ 0x00, - /* U+012B */ 0x00, - /* U+012C */ 0x2C, - /* U+012D */ 0x2D, - /* U+012E */ 0x00, - /* U+012F */ 0x00, - /* U+0130 */ 0x00, - /* U+0131 */ 0x00, - /* U+0132 */ 0x26, - /* U+0133 */ 0x46, - /* U+0134 */ 0x00, - /* U+0135 */ 0x00, - /* U+0136 */ 0x00, - /* U+0137 */ 0x00, - /* U+0138 */ 0x00, - /* U+0139 */ 0x00, - /* U+013A */ 0x00, - /* U+013B */ 0x00, - /* U+013C */ 0x00, - /* U+013D */ 0x00, - /* U+013E */ 0x00, - /* U+013F */ 0x29, - /* U+0140 */ 0x49, - /* U+0141 */ 0x00, - /* U+0142 */ 0x00, - /* U+0143 */ 0x00, - /* U+0144 */ 0x00, - /* U+0145 */ 0x00, - /* U+0146 */ 0x00, - /* U+0147 */ 0x00, - /* U+0148 */ 0x00, - /* U+0149 */ 0x4A, - /* U+014A */ 0x00, - /* U+014B */ 0x00, - /* U+014C */ 0x00, - /* U+014D */ 0x00, - /* U+014E */ 0x4E, - /* U+014F */ 0x4F, - /* U+0150 */ 0x00, - /* U+0151 */ 0x00, - /* U+0152 */ 0x2D, - /* U+0153 */ 0x4D, - /* U+0154 */ 0x00, - /* U+0155 */ 0x00, - /* U+0156 */ 0x00, - /* U+0157 */ 0x00, - /* U+0158 */ 0x00, - /* U+0159 */ 0x00, - /* U+015A */ 0x00, - /* U+015B */ 0x00, - /* U+015C */ 0x00, - /* U+015D */ 0x00, - /* U+015E */ 0x00, - /* U+015F */ 0x00, - /* U+0160 */ 0x00, - /* U+0161 */ 0x00, - /* U+0162 */ 0x00, - /* U+0163 */ 0x00, - /* U+0164 */ 0x00, - /* U+0165 */ 0x00, - /* U+0166 */ 0x00, - /* U+0167 */ 0x00, - /* U+0168 */ 0x00, - /* U+0169 */ 0x00, - /* U+016A */ 0x00, - /* U+016B */ 0x00, - /* U+016C */ 0x00, - /* U+016D */ 0x00, - /* U+016E */ 0x00, - /* U+016F */ 0x00, - /* U+0170 */ 0x00, - /* U+0171 */ 0x00, - /* U+0172 */ 0x00, - /* U+0173 */ 0x00, - /* U+0174 */ 0x71, - /* U+0175 */ 0x71, - /* U+0176 */ 0x74, - /* U+0177 */ 0x74, - /* U+0178 */ 0x73, - /* U+0179 */ 0x00, - /* U+017A */ 0x00, - /* U+017B */ 0x00, - /* U+017C */ 0x00, - /* U+017D */ 0x00, - /* U+017E */ 0x00, - /* U+017F */ 0x7F -}; - Lisp_Object Vutf_2000_version; #endif @@ -1861,7 +1468,8 @@ make_charset (Charset_ID id, Lisp_Object name, Bufbyte final, unsigned char direction, Lisp_Object short_name, Lisp_Object long_name, Lisp_Object doc, Lisp_Object reg, - Emchar* decoding_table) + Emchar* decoding_table, + Emchar ucs_min, Emchar ucs_max, Emchar code_offset) { Lisp_Object obj; struct Lisp_Charset *cs = @@ -1883,8 +1491,11 @@ make_charset (Charset_ID id, Lisp_Object name, CHARSET_REVERSE_DIRECTION_CHARSET (cs) = Qnil; #ifdef UTF2000 CHARSET_DECODING_TABLE(cs) = decoding_table; + CHARSET_UCS_MIN(cs) = ucs_min; + CHARSET_UCS_MAX(cs) = ucs_max; + CHARSET_CODE_OFFSET(cs) = code_offset; #endif - + switch ( CHARSET_TYPE (cs) ) { case CHARSET_TYPE_94: @@ -2038,59 +1649,51 @@ unsigned char charset_get_byte1 (Lisp_Object charset, Emchar ch) { Emchar_to_byte_table* table; + int d; if ((table = XCHARSET_TO_BYTE1_TABLE (charset)) != NULL) return get_byte_from_character_table (ch, table); - else if (EQ (charset, Vcharset_ascii)) - return ch <= 0x7f ? ch : 0; - else if (EQ (charset, Vcharset_control_1)) - return (0x80 <= ch) && (ch < 0xA0) ? ch & 0x7f : 0; - else if (EQ (charset, Vcharset_latin_iso8859_1)) - return (0xA0 <= ch) && (ch <= 0xff) ? ch & 0x7f : 0; - else if (EQ (charset, Vcharset_cyrillic_iso8859_5)) - return (MIN_CHAR_GREEK <= ch) && (ch <= MAX_CHAR_CYRILLIC) ? - ch - MIN_CHAR_CYRILLIC + 0x20 : 0; - else if (EQ (charset, Vcharset_greek_iso8859_7)) - return (MIN_CHAR_GREEK <= ch) && (ch <= MAX_CHAR_GREEK) ? - ch - MIN_CHAR_GREEK + 0x20 : 0; - else if (EQ (charset, Vcharset_hebrew_iso8859_8)) - return (MIN_CHAR_HEBREW <= ch) && (ch <= MAX_CHAR_HEBREW) ? - ch - MIN_CHAR_HEBREW + 0x20 : 0; - else if (EQ (charset, Vcharset_thai_tis620)) - return (MIN_CHAR_THAI <= ch) && (ch <= MAX_CHAR_THAI) ? - ch - MIN_CHAR_THAI + 0x20 : 0; - else if (EQ (charset, Vcharset_katakana_jisx0201)) - return (MIN_CHAR_HALFWIDTH_KATAKANA <= ch) - && (ch <= MAX_CHAR_HALFWIDTH_KATAKANA) ? - ch - MIN_CHAR_HALFWIDTH_KATAKANA + 0x20 : 0; - else if (EQ (charset, Vcharset_ucs_bmp)) - return ch & 0xff; + else if ((CHARSET_UCS_MIN (XCHARSET (charset)) <= ch) + && (ch <= CHARSET_UCS_MAX (XCHARSET (charset)))) + return ch - CHARSET_UCS_MIN (XCHARSET (charset)) + + CHARSET_CODE_OFFSET (XCHARSET (charset)); else if (XCHARSET_DIMENSION (charset) == 1) { if (XCHARSET_CHARS (charset) == 94) - return (MIN_CHAR_94 + (XCHARSET_FINAL (charset) - '0') * 94 <= ch) - && (ch < MIN_CHAR_94 + (XCHARSET_FINAL (charset) - '0' + 1) * 94) ? - ((ch - MIN_CHAR_94) % 94) + 33 : 0; - else /* if (XCHARSET_CHARS (charset) == 96) */ - return (MIN_CHAR_96 + (XCHARSET_FINAL (charset) - '0') * 96 <= ch) - && (ch < MIN_CHAR_96 + (XCHARSET_FINAL (charset) - '0' + 1) * 96) ? - ((ch - MIN_CHAR_94) % 96) + 32 : 0; + { + if (((d = ch - (MIN_CHAR_94 + + (XCHARSET_FINAL (charset) - '0') * 94)) >= 0) + && (d < 94)) + return d + 32; + } + else if (XCHARSET_CHARS (charset) == 96) + { + if (((d = ch - (MIN_CHAR_96 + + (XCHARSET_FINAL (charset) - '0') * 96)) >= 0) + && (d < 96)) + return d + 33; + } + else + return 0; } - else /* if (XCHARSET_DIMENSION (charset) == 2) */ + else if (XCHARSET_DIMENSION (charset) == 2) { if (XCHARSET_CHARS (charset) == 94) - return (MIN_CHAR_94x94 - + (XCHARSET_FINAL (charset) - '0') * 94 * 94 <= ch) - && (ch < MIN_CHAR_94x94 - + (XCHARSET_FINAL (charset) - '0' + 1) * 94 * 94) ? - (((ch - MIN_CHAR_94x94) / 94) % 94) + 33 : 0; - else /* if (XCHARSET_CHARS (charset) == 96) */ - return (MIN_CHAR_96x96 - + (XCHARSET_FINAL (charset) - '0') * 96 * 96 <= ch) - && (ch < MIN_CHAR_96x96 - + (XCHARSET_FINAL (charset) - '0' + 1) * 96 * 96) ? - (((ch - MIN_CHAR_96x96) / 96) % 96) + 32 : 0; + { + if (((d = ch - (MIN_CHAR_94x94 + + (XCHARSET_FINAL (charset) - '0') * 94 * 94)) >= 0) + && (d < 94 * 94)) + return (d / 94) + 33; + } + else if (XCHARSET_CHARS (charset) == 96) + { + if (((d = ch - (MIN_CHAR_96x96 + + (XCHARSET_FINAL (charset) - '0') * 96 * 96)) >= 0) + && (d < 96 * 96)) + return (d / 96) + 32; + } } + return 0; } unsigned char @@ -2433,7 +2036,8 @@ character set. Recognized properties are: charset = make_charset (id, name, type, columns, graphic, final, direction, short_name, long_name, doc_string, registry, - NULL); + NULL, + 0, 0, 0); if (!NILP (ccl_program)) XCHARSET_CCL_PROGRAM (charset) = ccl_program; return charset; @@ -2481,7 +2085,8 @@ NEW-NAME is the name of the new charset. Return the new charset. new_charset = make_charset (id, new_name, type, columns, graphic, final, direction, short_name, long_name, doc_string, registry, - NULL); + NULL, + 0, 0, 0); CHARSET_REVERSE_DIRECTION_CHARSET (cs) = new_charset; XCHARSET_REVERSE_DIRECTION_CHARSET (new_charset) = charset; @@ -3018,7 +2623,23 @@ complex_vars_of_mule_charset (void) build_string ("BMP"), build_string ("BMP"), build_string (""), - NULL); + NULL, 0, 0xFFFF, 0); +#else +# define latin_iso8859_2_to_ucs NULL +# define latin_iso8859_3_to_ucs NULL +# define latin_iso8859_4_to_ucs NULL +# define latin_iso8859_9_to_ucs NULL +# define latin_jisx0201_to_ucs NULL +# define MIN_CHAR_THAI 0 +# define MAX_CHAR_THAI 0 +# define MIN_CHAR_GREEK 0 +# define MAX_CHAR_GREEK 0 +# define MIN_CHAR_HEBREW 0 +# define MAX_CHAR_HEBREW 0 +# define MIN_CHAR_HALFWIDTH_KATAKANA 0 +# define MAX_CHAR_HALFWIDTH_KATAKANA 0 +# define MIN_CHAR_CYRILLIC 0 +# define MAX_CHAR_CYRILLIC 0 #endif Vcharset_ascii = make_charset (LEADING_BYTE_ASCII, Qascii, @@ -3028,7 +2649,7 @@ complex_vars_of_mule_charset (void) build_string ("ASCII)"), build_string ("ASCII (ISO646 IRV)"), build_string ("\\(iso8859-[0-9]*\\|-ascii\\)"), - NULL); + NULL, 0, 0x7F, 0); Vcharset_control_1 = make_charset (LEADING_BYTE_CONTROL_1, Qcontrol_1, CHARSET_TYPE_94, 1, 1, 0, @@ -3037,7 +2658,7 @@ complex_vars_of_mule_charset (void) build_string ("Control characters"), build_string ("Control characters 128-191"), build_string (""), - NULL); + NULL, 0x80, 0x9F, 0); Vcharset_latin_iso8859_1 = make_charset (LEADING_BYTE_LATIN_ISO8859_1, Qlatin_iso8859_1, CHARSET_TYPE_96, 1, 1, 'A', @@ -3046,7 +2667,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-1 (Latin-1)"), build_string ("ISO8859-1 (Latin-1)"), build_string ("iso8859-1"), - NULL); + NULL, 0xA0, 0xFF, 32); Vcharset_latin_iso8859_2 = make_charset (LEADING_BYTE_LATIN_ISO8859_2, Qlatin_iso8859_2, CHARSET_TYPE_96, 1, 1, 'B', @@ -3055,7 +2676,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-2 (Latin-2)"), build_string ("ISO8859-2 (Latin-2)"), build_string ("iso8859-2"), - latin_iso8859_2_to_ucs); + latin_iso8859_2_to_ucs, 0, 0, 32); Vcharset_latin_iso8859_3 = make_charset (LEADING_BYTE_LATIN_ISO8859_3, Qlatin_iso8859_3, CHARSET_TYPE_96, 1, 1, 'C', @@ -3064,7 +2685,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-3 (Latin-3)"), build_string ("ISO8859-3 (Latin-3)"), build_string ("iso8859-3"), - latin_iso8859_3_to_ucs); + latin_iso8859_3_to_ucs, 0, 0, 32); Vcharset_latin_iso8859_4 = make_charset (LEADING_BYTE_LATIN_ISO8859_4, Qlatin_iso8859_4, CHARSET_TYPE_96, 1, 1, 'D', @@ -3073,7 +2694,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-4 (Latin-4)"), build_string ("ISO8859-4 (Latin-4)"), build_string ("iso8859-4"), - latin_iso8859_4_to_ucs); + latin_iso8859_4_to_ucs, 0, 0, 32); Vcharset_thai_tis620 = make_charset (LEADING_BYTE_THAI_TIS620, Qthai_tis620, CHARSET_TYPE_96, 1, 1, 'T', @@ -3082,7 +2703,7 @@ complex_vars_of_mule_charset (void) build_string ("TIS620 (Thai)"), build_string ("TIS620.2529 (Thai)"), build_string ("tis620"), - NULL); + NULL, MIN_CHAR_THAI, MAX_CHAR_THAI, 32); Vcharset_greek_iso8859_7 = make_charset (LEADING_BYTE_GREEK_ISO8859_7, Qgreek_iso8859_7, CHARSET_TYPE_96, 1, 1, 'F', @@ -3091,7 +2712,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-7 (Greek)"), build_string ("ISO8859-7 (Greek)"), build_string ("iso8859-7"), - NULL); + NULL, MIN_CHAR_GREEK, MAX_CHAR_GREEK, 32); Vcharset_arabic_iso8859_6 = make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, CHARSET_TYPE_96, 1, 1, 'G', @@ -3100,7 +2721,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-6 (Arabic)"), build_string ("ISO8859-6 (Arabic)"), build_string ("iso8859-6"), - NULL); + NULL, 0, 0, 32); Vcharset_hebrew_iso8859_8 = make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, CHARSET_TYPE_96, 1, 1, 'H', @@ -3109,7 +2730,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-8 (Hebrew)"), build_string ("ISO8859-8 (Hebrew)"), build_string ("iso8859-8"), - NULL); + NULL, MIN_CHAR_HEBREW, MAX_CHAR_HEBREW, 32); Vcharset_katakana_jisx0201 = make_charset (LEADING_BYTE_KATAKANA_JISX0201, Qkatakana_jisx0201, CHARSET_TYPE_94, 1, 1, 'I', @@ -3118,7 +2739,9 @@ complex_vars_of_mule_charset (void) build_string ("JISX0201.1976 (Japanese Kana)"), build_string ("JISX0201.1976 Japanese Kana"), build_string ("jisx0201.1976"), - NULL); + NULL, + MIN_CHAR_HALFWIDTH_KATAKANA, + MAX_CHAR_HALFWIDTH_KATAKANA, 33); Vcharset_latin_jisx0201 = make_charset (LEADING_BYTE_LATIN_JISX0201, Qlatin_jisx0201, CHARSET_TYPE_94, 1, 0, 'J', @@ -3127,7 +2750,7 @@ complex_vars_of_mule_charset (void) build_string ("JISX0201.1976 (Japanese Roman)"), build_string ("JISX0201.1976 Japanese Roman"), build_string ("jisx0201.1976"), - latin_jisx0201_to_ucs); + latin_jisx0201_to_ucs, 0, 0, 33); Vcharset_cyrillic_iso8859_5 = make_charset (LEADING_BYTE_CYRILLIC_ISO8859_5, Qcyrillic_iso8859_5, CHARSET_TYPE_96, 1, 1, 'L', @@ -3136,7 +2759,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-5 (Cyrillic)"), build_string ("ISO8859-5 (Cyrillic)"), build_string ("iso8859-5"), - NULL); + NULL, MIN_CHAR_CYRILLIC, MAX_CHAR_CYRILLIC, 32); Vcharset_latin_iso8859_9 = make_charset (LEADING_BYTE_LATIN_ISO8859_9, Qlatin_iso8859_9, CHARSET_TYPE_96, 1, 1, 'M', @@ -3145,7 +2768,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-9 (Latin-5)"), build_string ("ISO8859-9 (Latin-5)"), build_string ("iso8859-9"), - latin_iso8859_9_to_ucs); + latin_iso8859_9_to_ucs, 0, 0, 32); Vcharset_japanese_jisx0208_1978 = make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, Qjapanese_jisx0208_1978, CHARSET_TYPE_94X94, 2, 0, '@', @@ -3155,7 +2778,7 @@ complex_vars_of_mule_charset (void) build_string ("JISX0208.1978 Japanese Kanji (so called \"old JIS\")"), build_string ("\\(jisx0208\\|jisc6226\\)\\.1978"), - NULL); + NULL, 0, 0, 33); Vcharset_chinese_gb2312 = make_charset (LEADING_BYTE_CHINESE_GB2312, Qchinese_gb2312, CHARSET_TYPE_94X94, 2, 0, 'A', @@ -3164,7 +2787,7 @@ complex_vars_of_mule_charset (void) build_string ("GB2312)"), build_string ("GB2312 Chinese simplified"), build_string ("gb2312"), - NULL); + NULL, 0, 0, 33); Vcharset_japanese_jisx0208 = make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qjapanese_jisx0208, CHARSET_TYPE_94X94, 2, 0, 'B', @@ -3173,7 +2796,7 @@ complex_vars_of_mule_charset (void) build_string ("JISX0208.1983/1990 (Japanese)"), build_string ("JISX0208.1983/1990 Japanese Kanji"), build_string ("jisx0208.19\\(83\\|90\\)"), - NULL); + NULL, 0, 0, 33); Vcharset_korean_ksc5601 = make_charset (LEADING_BYTE_KOREAN_KSC5601, Qkorean_ksc5601, CHARSET_TYPE_94X94, 2, 0, 'C', @@ -3182,7 +2805,7 @@ complex_vars_of_mule_charset (void) build_string ("KSC5601 (Korean"), build_string ("KSC5601 Korean Hangul and Hanja"), build_string ("ksc5601"), - NULL); + NULL, 0, 0, 33); Vcharset_japanese_jisx0212 = make_charset (LEADING_BYTE_JAPANESE_JISX0212, Qjapanese_jisx0212, CHARSET_TYPE_94X94, 2, 0, 'D', @@ -3191,7 +2814,7 @@ complex_vars_of_mule_charset (void) build_string ("JISX0212 (Japanese)"), build_string ("JISX0212 Japanese Supplement"), build_string ("jisx0212"), - NULL); + NULL, 0, 0, 33); #define CHINESE_CNS_PLANE_RE(n) "cns11643[.-]\\(.*[.-]\\)?" n "$" Vcharset_chinese_cns11643_1 = @@ -3203,7 +2826,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 1 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("1")), - NULL); + NULL, 0, 0, 33); Vcharset_chinese_cns11643_2 = make_charset (LEADING_BYTE_CHINESE_CNS11643_2, Qchinese_cns11643_2, CHARSET_TYPE_94X94, 2, 0, 'H', @@ -3213,7 +2836,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 2 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("2")), - NULL); + NULL, 0, 0, 33); #ifdef UTF2000 Vcharset_chinese_cns11643_3 = make_charset (LEADING_BYTE_CHINESE_CNS11643_3, Qchinese_cns11643_3, @@ -3224,7 +2847,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 3 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("3")), - NULL); + NULL, 0, 0, 33); Vcharset_chinese_cns11643_4 = make_charset (LEADING_BYTE_CHINESE_CNS11643_4, Qchinese_cns11643_4, CHARSET_TYPE_94X94, 2, 0, 'J', @@ -3234,7 +2857,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 4 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("4")), - NULL); + NULL, 0, 0, 33); Vcharset_chinese_cns11643_5 = make_charset (LEADING_BYTE_CHINESE_CNS11643_5, Qchinese_cns11643_5, CHARSET_TYPE_94X94, 2, 0, 'K', @@ -3244,7 +2867,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 5 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("5")), - NULL); + NULL, 0, 0, 33); Vcharset_chinese_cns11643_6 = make_charset (LEADING_BYTE_CHINESE_CNS11643_6, Qchinese_cns11643_6, CHARSET_TYPE_94X94, 2, 0, 'L', @@ -3254,7 +2877,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 6 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("6")), - NULL); + NULL, 0, 0, 33); Vcharset_chinese_cns11643_7 = make_charset (LEADING_BYTE_CHINESE_CNS11643_7, Qchinese_cns11643_7, CHARSET_TYPE_94X94, 2, 0, 'M', @@ -3264,7 +2887,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 7 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("7")), - NULL); + NULL, 0, 0, 33); Vcharset_latin_viscii_lower = make_charset (LEADING_BYTE_LATIN_VISCII_LOWER, Qlatin_viscii_lower, CHARSET_TYPE_96, 1, 1, '1', @@ -3273,7 +2896,7 @@ complex_vars_of_mule_charset (void) build_string ("VISCII lower (Vietnamese)"), build_string ("VISCII lower (Vietnamese)"), build_string ("VISCII1.1"), - latin_viscii_lower_to_ucs); + latin_viscii_lower_to_ucs, 0, 0, 32); Vcharset_latin_viscii_upper = make_charset (LEADING_BYTE_LATIN_VISCII_UPPER, Qlatin_viscii_upper, CHARSET_TYPE_96, 1, 1, '2', @@ -3282,7 +2905,7 @@ complex_vars_of_mule_charset (void) build_string ("VISCII upper (Vietnamese)"), build_string ("VISCII upper (Vietnamese)"), build_string ("VISCII1.1"), - latin_viscii_upper_to_ucs); + latin_viscii_upper_to_ucs, 0, 0, 32); #endif Vcharset_chinese_big5_1 = make_charset (LEADING_BYTE_CHINESE_BIG5_1, Qchinese_big5_1, @@ -3293,7 +2916,7 @@ complex_vars_of_mule_charset (void) build_string ("Big5 Level-1 Chinese traditional"), build_string ("big5"), - NULL); + NULL, 0, 0, 33); Vcharset_chinese_big5_2 = make_charset (LEADING_BYTE_CHINESE_BIG5_2, Qchinese_big5_2, CHARSET_TYPE_94X94, 2, 0, '1', @@ -3303,7 +2926,7 @@ complex_vars_of_mule_charset (void) build_string ("Big5 Level-2 Chinese traditional"), build_string ("big5"), - NULL); + NULL, 0, 0, 33); #ifdef ENABLE_COMPOSITE_CHARS /* #### For simplicity, we put composite chars into a 96x96 charset.