X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-charset.c;h=d093f54e7b6678893cd27c3a965fa98fd7636a97;hb=4ea9e31c43039a0d4b76dd0cd5d84a5ed7874e08;hp=6177211c23e98ec35d5388fae63db717519711e7;hpb=b150fee929ac6d9737f38b53768d0708d667d037;p=chise%2Fxemacs-chise.git diff --git a/src/mule-charset.c b/src/mule-charset.c index 6177211..d093f54 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -59,8 +59,10 @@ Lisp_Object Vcharset_chinese_cns11643_1; Lisp_Object Vcharset_chinese_cns11643_2; #ifdef UTF2000 Lisp_Object Vcharset_ucs_bmp; +Lisp_Object Vcharset_latin_viscii; Lisp_Object Vcharset_latin_viscii_lower; Lisp_Object Vcharset_latin_viscii_upper; +Lisp_Object Vcharset_ethiopic_ucs; Lisp_Object Vcharset_hiragana_jisx0208; Lisp_Object Vcharset_katakana_jisx0208; #endif @@ -124,184 +126,631 @@ Bytecount rep_bytes_by_first_byte[0xA0] = #endif #ifdef UTF2000 -Emchar_to_byte_table* -make_byte_from_character_table () + +static Lisp_Object +mark_char_byte_table (Lisp_Object obj, void (*markobj) (Lisp_Object)) { - Emchar_to_byte_table* table - = (Emchar_to_byte_table*) xmalloc (sizeof (Emchar_to_byte_table)); + struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (obj); + int i; - table->base = NULL; - return table; + for (i = 0; i < 256; i++) + { + markobj (cte->property[i]); + } + return Qnil; } -void -put_byte_from_character_table (Emchar ch, unsigned char val, - Emchar_to_byte_table* table) +static int +char_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +{ + struct Lisp_Char_Byte_Table *cte1 = XCHAR_BYTE_TABLE (obj1); + struct Lisp_Char_Byte_Table *cte2 = XCHAR_BYTE_TABLE (obj2); + int i; + + for (i = 0; i < 256; i++) + if (CHAR_BYTE_TABLE_P (cte1->property[i])) + { + if (CHAR_BYTE_TABLE_P (cte2->property[i])) + { + if (!char_byte_table_equal (cte1->property[i], + cte2->property[i], depth + 1)) + return 0; + } + else + return 0; + } + else + if (!internal_equal (cte1->property[i], cte2->property[i], depth + 1)) + return 0; + return 1; +} + +static unsigned long +char_byte_table_hash (Lisp_Object obj, int depth) { - if (table->base == NULL) + struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (obj); + + return internal_array_hash (cte->property, 256, depth); +} + +static const struct lrecord_description char_byte_table_description[] = { + { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Byte_Table, property), 256 }, + { XD_END } +}; + +DEFINE_LRECORD_IMPLEMENTATION ("char-byte-table", char_byte_table, + mark_char_byte_table, + internal_object_printer, + 0, char_byte_table_equal, + char_byte_table_hash, + char_byte_table_description, + struct Lisp_Char_Byte_Table); + +static Lisp_Object +make_char_byte_table (Lisp_Object initval) +{ + Lisp_Object obj; + int i; + struct Lisp_Char_Byte_Table *cte = + alloc_lcrecord_type (struct Lisp_Char_Byte_Table, + &lrecord_char_byte_table); + + for (i = 0; i < 256; i++) + cte->property[i] = initval; + + XSETCHAR_BYTE_TABLE (obj, cte); + return obj; +} + +static Lisp_Object +copy_char_byte_table (Lisp_Object entry) +{ + struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (entry); + Lisp_Object obj; + int i; + struct Lisp_Char_Byte_Table *ctenew = + alloc_lcrecord_type (struct Lisp_Char_Byte_Table, + &lrecord_char_byte_table); + + for (i = 0; i < 256; i++) { - table->base = xmalloc (128); - table->offset = ch - (ch % 128); - table->size = 128; - table->base[ch - table->offset] = val; + Lisp_Object new = cte->property[i]; + if (CHAR_BYTE_TABLE_P (new)) + ctenew->property[i] = copy_char_byte_table (new); + else + ctenew->property[i] = new; } + + XSETCHAR_BYTE_TABLE (obj, ctenew); + return obj; +} + + +static Lisp_Object +mark_char_code_table (Lisp_Object obj, void (*markobj) (Lisp_Object)) +{ + struct Lisp_Char_Code_Table *cte = XCHAR_CODE_TABLE (obj); + + return cte->table; +} + +static int +char_code_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +{ + struct Lisp_Char_Code_Table *cte1 = XCHAR_CODE_TABLE (obj1); + struct Lisp_Char_Code_Table *cte2 = XCHAR_CODE_TABLE (obj2); + + return char_byte_table_equal (cte1->table, cte2->table, depth + 1); +} + +static unsigned long +char_code_table_hash (Lisp_Object obj, int depth) +{ + struct Lisp_Char_Code_Table *cte = XCHAR_CODE_TABLE (obj); + + return char_code_table_hash (cte->table, depth + 1); +} + +static const struct lrecord_description char_code_table_description[] = { + { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Code_Table, table), 1 }, + { XD_END } +}; + +DEFINE_LRECORD_IMPLEMENTATION ("char-code-table", char_code_table, + mark_char_code_table, + internal_object_printer, + 0, char_code_table_equal, + char_code_table_hash, + char_code_table_description, + struct Lisp_Char_Code_Table); + +static Lisp_Object +make_char_code_table (Lisp_Object initval) +{ + Lisp_Object obj; + struct Lisp_Char_Code_Table *cte = + alloc_lcrecord_type (struct Lisp_Char_Code_Table, + &lrecord_char_code_table); + + cte->table = make_char_byte_table (initval); + + XSETCHAR_CODE_TABLE (obj, cte); + return obj; +} + +static Lisp_Object +copy_char_code_table (Lisp_Object entry) +{ + struct Lisp_Char_Code_Table *cte = XCHAR_CODE_TABLE (entry); + Lisp_Object obj; + struct Lisp_Char_Code_Table *ctenew = + alloc_lcrecord_type (struct Lisp_Char_Code_Table, + &lrecord_char_code_table); + + ctenew->table = copy_char_byte_table (cte->table); + XSETCHAR_CODE_TABLE (obj, ctenew); + return obj; +} + + +Lisp_Object +get_char_code_table (Emchar ch, Lisp_Object table) +{ + unsigned int code = ch; + struct Lisp_Char_Byte_Table* cpt + = XCHAR_BYTE_TABLE (XCHAR_CODE_TABLE (table)->table); + Lisp_Object ret = cpt->property [(unsigned char)(code >> 24)]; + + if (CHAR_BYTE_TABLE_P (ret)) + cpt = XCHAR_BYTE_TABLE (ret); + else + return ret; + + ret = cpt->property [(unsigned char) (code >> 16)]; + if (CHAR_BYTE_TABLE_P (ret)) + cpt = XCHAR_BYTE_TABLE (ret); else + return ret; + + ret = cpt->property [(unsigned char) (code >> 8)]; + if (CHAR_BYTE_TABLE_P (ret)) + cpt = XCHAR_BYTE_TABLE (ret); + else + return ret; + + return cpt->property [(unsigned char) code]; +} + +void +put_char_code_table (Emchar ch, Lisp_Object value, Lisp_Object table) +{ + unsigned int code = ch; + struct Lisp_Char_Byte_Table* cpt1 + = XCHAR_BYTE_TABLE (XCHAR_CODE_TABLE (table)->table); + Lisp_Object ret = cpt1->property[(unsigned char)(code >> 24)]; + + if (CHAR_BYTE_TABLE_P (ret)) + { + struct Lisp_Char_Byte_Table* cpt2 = XCHAR_BYTE_TABLE (ret); + + ret = cpt2->property[(unsigned char)(code >> 16)]; + if (CHAR_BYTE_TABLE_P (ret)) + { + struct Lisp_Char_Byte_Table* cpt3 = XCHAR_BYTE_TABLE (ret); + + ret = cpt3->property[(unsigned char)(code >> 8)]; + if (CHAR_BYTE_TABLE_P (ret)) + { + struct Lisp_Char_Byte_Table* cpt4 + = XCHAR_BYTE_TABLE (ret); + + cpt4->property[(unsigned char)code] = value; + } + else if (!EQ (ret, value)) + { + Lisp_Object cpt4 = make_char_byte_table (ret); + + XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value; + cpt3->property[(unsigned char)(code >> 8)] = cpt4; + } + } + else if (!EQ (ret, value)) + { + Lisp_Object cpt3 = make_char_byte_table (ret); + Lisp_Object cpt4 = make_char_byte_table (ret); + + XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value; + XCHAR_BYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)] + = cpt4; + cpt2->property[(unsigned char)(code >> 16)] = cpt3; + } + } + else if (!EQ (ret, value)) { - int i = ch - table->offset; + Lisp_Object cpt2 = make_char_byte_table (ret); + Lisp_Object cpt3 = make_char_byte_table (ret); + Lisp_Object cpt4 = make_char_byte_table (ret); + + XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value; + XCHAR_BYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)] = cpt4; + XCHAR_BYTE_TABLE(cpt2)->property[(unsigned char)(code >> 16)] = cpt3; + cpt1->property[(unsigned char)(code >> 24)] = cpt2; + } +} + - if (i < 0) +Lisp_Object Vcharacter_attribute_table; +Lisp_Object Vcharacter_composition_table; +Lisp_Object Vcharacter_variant_table; + +Lisp_Object Q_decomposition; +Lisp_Object Q_ucs; +Lisp_Object Qwide; +Lisp_Object Qnarrow; +Lisp_Object Qcompat; +Lisp_Object QnoBreak; +Lisp_Object Qsuper; +Lisp_Object Qfraction; + +Emchar +to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg) +{ + if (INTP (v)) + return XINT (v); + if (CHARP (v)) + return XCHAR (v); + else if (EQ (v, Qwide)) + return -1; + else if (EQ (v, Qnarrow)) + return -2; + else if (EQ (v, Qcompat)) + return -3; + else if (EQ (v, QnoBreak)) + return -4; + else if (EQ (v, Qsuper)) + return -5; + else if (EQ (v, Qfraction)) + return -6; + else + signal_simple_error (err_msg, err_arg); +} + +DEFUN ("get-composite-char", Fget_composite_char, 1, 1, 0, /* +Return character corresponding with list. +*/ + (list)) +{ + Lisp_Object table = Vcharacter_composition_table; + Lisp_Object rest = list; + + while (CONSP (rest)) + { + Lisp_Object v = Fcar (rest); + Lisp_Object ret; + Emchar c = to_char_code (v, "Invalid value for composition", list); + + ret = get_char_code_table (c, table); + + rest = Fcdr (rest); + if (NILP (rest)) { - size_t new_size = table->size - i; - size_t j; - - new_size += 128 - (new_size % 128); - table->base = xrealloc (table->base, new_size); - memmove (table->base + (new_size - table->size), table->base, - table->size); - for (j = 0; j < (new_size - table->size); j++) - table->base[j] = 0; - table->offset -= (new_size - table->size); - table->base[ch - table->offset] = val; - table->size = new_size; + if (!CHAR_CODE_TABLE_P (ret)) + return ret; + else + return Qt; } - else if (i >= table->size) + else if (!CONSP (rest)) + break; + else if (CHAR_CODE_TABLE_P (ret)) + table = ret; + else + signal_simple_error ("Invalid table is found with", list); + } + signal_simple_error ("Invalid value for composition", list); +} + +DEFUN ("char-variants", Fchar_variants, 1, 1, 0, /* +Return variants of CHARACTER. +*/ + (character)) +{ + CHECK_CHAR (character); + return Fcopy_list (get_char_code_table (XCHAR (character), + Vcharacter_variant_table)); +} + +DEFUN ("char-attribute-alist", Fchar_attribute_alist, 1, 1, 0, /* +Return the alist of attributes of CHARACTER. +*/ + (character)) +{ + CHECK_CHAR (character); + return Fcopy_alist (get_char_code_table (XCHAR (character), + Vcharacter_attribute_table)); +} + +DEFUN ("get-char-attribute", Fget_char_attribute, 2, 2, 0, /* +Return the value of CHARACTER's ATTRIBUTE. +*/ + (character, attribute)) +{ + Lisp_Object ret + = get_char_code_table (XCHAR (character), Vcharacter_attribute_table); + Lisp_Object ccs; + + if (EQ (ret, Qnil)) + return Qnil; + + if (!NILP (ccs = Ffind_charset (attribute))) + attribute = ccs; + + return Fcdr (Fassq (attribute, ret)); +} + +Lisp_Object +put_char_attribute (Lisp_Object character, Lisp_Object attribute, + Lisp_Object value) +{ + Emchar char_code = XCHAR (character); + Lisp_Object ret + = get_char_code_table (char_code, Vcharacter_attribute_table); + Lisp_Object cell; + + cell = Fassq (attribute, ret); + + if (NILP (cell)) + { + ret = Fcons (Fcons (attribute, value), ret); + } + else if (!EQ (Fcdr (cell), value)) + { + Fsetcdr (cell, value); + } + put_char_code_table (char_code, ret, Vcharacter_attribute_table); + return ret; +} + +DEFUN ("put-char-attribute", Fput_char_attribute, 3, 3, 0, /* +Store CHARACTER's ATTRIBUTE with VALUE. +*/ + (character, attribute, value)) +{ + Lisp_Object ccs; + + ccs = Ffind_charset (attribute); + if (!NILP (ccs)) + { + Lisp_Object rest; + Lisp_Object v = XCHARSET_DECODING_TABLE (ccs); + Lisp_Object nv; + int i = -1; + int ccs_len; + + /* ad-hoc method for `ascii' */ + if ((XCHARSET_CHARS (ccs) == 94) && + (XCHARSET_BYTE_OFFSET (ccs) != 33)) + ccs_len = 128 - XCHARSET_BYTE_OFFSET (ccs); + else + ccs_len = XCHARSET_CHARS (ccs); + + if (!CONSP (value)) + signal_simple_error ("Invalid value for coded-charset", + value); + + attribute = ccs; + rest = Fget_char_attribute (character, attribute); + if (VECTORP (v)) { - size_t new_size = i + 1; - size_t j; - - new_size += 128 - (new_size % 128); - table->base = xrealloc (table->base, new_size); - for (j = table->size; j < new_size; j++) - table->base[j] = 0; - table->base[i] = val; - table->size = new_size; + if (!NILP (rest)) + { + while (!NILP (rest)) + { + Lisp_Object ei = Fcar (rest); + + i = XINT (ei) - XCHARSET_BYTE_OFFSET (ccs); + nv = XVECTOR_DATA(v)[i]; + if (!VECTORP (nv)) + break; + v = nv; + rest = Fcdr (rest); + } + if (i >= 0) + XVECTOR_DATA(v)[i] = Qnil; + v = XCHARSET_DECODING_TABLE (ccs); + } } else { - table->base[i] = val; + XCHARSET_DECODING_TABLE (ccs) = v = make_vector (ccs_len, Qnil); + } + + rest = value; + i = -1; + while (CONSP (rest)) + { + Lisp_Object ei = Fcar (rest); + + if (!INTP (ei)) + signal_simple_error ("Invalid value for coded-charset", value); + i = XINT (ei); + if ((i < 0) || (255 < i)) + signal_simple_error ("Invalid value for coded-charset", value); + i -= XCHARSET_BYTE_OFFSET (ccs); + nv = XVECTOR_DATA(v)[i]; + rest = Fcdr (rest); + if (CONSP (rest)) + { + if (!VECTORP (nv)) + { + nv = (XVECTOR_DATA(v)[i] = make_vector (ccs_len, Qnil)); + } + v = nv; + } + else + break; + } + XVECTOR_DATA(v)[i] = character; + } + else if (EQ (attribute, Q_decomposition)) + { + Lisp_Object rest = value; + Lisp_Object table = Vcharacter_composition_table; + + if (!CONSP (value)) + signal_simple_error ("Invalid value for ->decomposition", + value); + + while (CONSP (rest)) + { + Lisp_Object v = Fcar (rest); + Lisp_Object ntable; + Emchar c + = to_char_code (v, "Invalid value for ->decomposition", value); + + rest = Fcdr (rest); + if (!CONSP (rest)) + { + put_char_code_table (c, character, table); + break; + } + else + { + ntable = get_char_code_table (c, table); + if (!CHAR_CODE_TABLE_P (ntable)) + { + ntable = make_char_code_table (Qnil); + put_char_code_table (c, ntable, table); + } + table = ntable; + } + } + } + else if (EQ (attribute, Q_ucs)) + { + Lisp_Object ret; + Emchar c; + + if (!INTP (value)) + signal_simple_error ("Invalid value for ->ucs", value); + + c = XINT (value); + + ret = get_char_code_table (c, Vcharacter_variant_table); + if (NILP (Fmemq (character, ret))) + { + put_char_code_table (c, Fcons (character, ret), + Vcharacter_variant_table); } } + return put_char_attribute (character, attribute, value); } -unsigned char -get_byte_from_character_table (Emchar ch, Emchar_to_byte_table* table) +Lisp_Object Qucs; + +DEFUN ("define-char", Fdefine_char, 1, 1, 0, /* +Store character's ATTRIBUTES. +*/ + (attributes)) { - size_t i = ch - table->offset; - if (i < table->size) - return table->base[i]; + Lisp_Object rest = attributes; + Lisp_Object code = Fcdr (Fassq (Qucs, attributes)); + Lisp_Object character; + + if (NILP (code)) + { + while (CONSP (rest)) + { + Lisp_Object cell = Fcar (rest); + Lisp_Object ccs; + + if (!LISTP (cell)) + signal_simple_error ("Invalid argument", attributes); + if (!NILP (ccs = Ffind_charset (Fcar (cell))) + && XCHARSET_FINAL (ccs)) + { + Emchar code; + + if (XCHARSET_DIMENSION (ccs) == 1) + { + Lisp_Object eb1 = Fcar (Fcdr (cell)); + int b1; + + if (!INTP (eb1)) + signal_simple_error ("Invalid argument", attributes); + b1 = XINT (eb1); + switch (XCHARSET_CHARS (ccs)) + { + case 94: + code = MIN_CHAR_94 + + (XCHARSET_FINAL (ccs) - '0') * 94 + (b1 - 33); + break; + case 96: + code = MIN_CHAR_96 + + (XCHARSET_FINAL (ccs) - '0') * 96 + (b1 - 32); + break; + default: + abort (); + } + } + else if (XCHARSET_DIMENSION (ccs) == 2) + { + Lisp_Object eb1 = Fcar (Fcdr (cell)); + Lisp_Object eb2 = Fcar (Fcdr (Fcdr (cell))); + int b1, b2; + + if (!INTP (eb1)) + signal_simple_error ("Invalid argument", attributes); + b1 = XINT (eb1); + if (!INTP (eb2)) + signal_simple_error ("Invalid argument", attributes); + b2 = XINT (eb2); + switch (XCHARSET_CHARS (ccs)) + { + case 94: + code = MIN_CHAR_94x94 + + (XCHARSET_FINAL (ccs) - '0') * 94 * 94 + + (b1 - 33) * 94 + (b2 - 33); + break; + case 96: + code = MIN_CHAR_96x96 + + (XCHARSET_FINAL (ccs) - '0') * 96 * 96 + + (b1 - 32) * 96 + (b2 - 32); + break; + default: + abort (); + } + } + else + { + rest = Fcdr (rest); + continue; + } + character = make_char (code); + goto setup_attributes; + } + rest = Fcdr (rest); + } + return Qnil; + } + else if (!INTP (code)) + signal_simple_error ("Invalid argument", attributes); else - return 0; -} + character = make_char (XINT (code)); -Lisp_Object latin_jisx0201_to_ucs; -Lisp_Object latin_iso8859_2_to_ucs; -Lisp_Object latin_iso8859_3_to_ucs; -Lisp_Object latin_iso8859_4_to_ucs; -Lisp_Object latin_iso8859_9_to_ucs; -Lisp_Object latin_viscii_lower_to_ucs; -Lisp_Object latin_viscii_upper_to_ucs; + setup_attributes: + rest = attributes; + while (CONSP (rest)) + { + Lisp_Object cell = Fcar (rest); -#if 0 -Emchar latin_tcvn5712_to_ucs[96] = -{ - 0x00A0 /* 0xA0 NO-BREAK SPACE */, - 0x0102 /* 0xA1 LATIN CAPITAL LETTER A WITH BREVE */, - 0x00C2 /* 0xA2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX */, - 0x00CA /* 0xA3 LATIN CAPITAL LETTER E WITH CIRCUMFLEX */, - 0x00D4 /* 0xA4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX */, - 0x01A0 /* 0xA5 LATIN CAPITAL LETTER O WITH HORN */, - 0x01AF /* 0xA6 LATIN CAPITAL LETTER U WITH HORN */, - 0x0110 /* 0xA7 LATIN CAPITAL LETTER D WITH STROKE */, - 0x0103 /* 0xA8 LATIN SMALL LETTER A WITH BREVE */, - 0x00E2 /* 0xA9 LATIN SMALL LETTER A WITH CIRCUMFLEX */, - 0x00EA /* 0xAA LATIN SMALL LETTER E WITH CIRCUMFLEX */, - 0x00F4 /* 0xAB LATIN SMALL LETTER O WITH CIRCUMFLEX */, - 0x01A1 /* 0xAC LATIN SMALL LETTER O WITH HORN */, - 0x01B0 /* 0xAD LATIN SMALL LETTER U WITH HORN */, - 0x0111 /* 0xAE LATIN SMALL LETTER D WITH STROKE */, - 0x1EB0 /* 0xAF LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */, - 0x0300 /* 0xB0 COMBINING GRAVE ACCENT */, - 0x0309 /* 0xB1 COMBINING HOOK ABOVE */, - 0x0303 /* 0xB2 COMBINING TILDE */, - 0x0301 /* 0xB3 COMBINING ACUTE ACCENT */, - 0x0323 /* 0xB4 COMBINING DOT BELOW */, - 0x00E0 /* 0xB5 LATIN SMALL LETTER A WITH GRAVE */, - 0x1EA3 /* 0xB6 LATIN SMALL LETTER A WITH HOOK ABOVE */, - 0x00E3 /* 0xB7 LATIN SMALL LETTER A WITH TILDE */, - 0x00E1 /* 0xB8 LATIN SMALL LETTER A WITH ACUTE */, - 0x1EA1 /* 0xB9 LATIN SMALL LETTER A WITH DOT BELOW */, - 0x1EB2 /* 0xBA LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */, - 0x1EB1 /* 0xBB LATIN SMALL LETTER A WITH BREVE AND GRAVE */, - 0x1EB3 /* 0xBC LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */, - 0x1EB5 /* 0xBD LATIN SMALL LETTER A WITH BREVE AND TILDE */, - 0x1EAF /* 0xBE LATIN SMALL LETTER A WITH BREVE AND ACUTE */, - 0x1EB4 /* 0xBF LATIN CAPITAL LETTER A WITH BREVE AND TILDE */, - 0x1EAE /* 0xC0 LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */, - 0x1EA6 /* 0xC1 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */, - 0x1EA8 /* 0xC2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */, - 0x1EAA /* 0xC3 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */, - 0x1EA4 /* 0xC4 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */, - 0x1EC0 /* 0xC5 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */, - 0x1EB7 /* 0xC6 LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */, - 0x1EA7 /* 0xC7 LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */, - 0x1EA9 /* 0xC8 LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */, - 0x1EAB /* 0xC9 LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */, - 0x1EA5 /* 0xCA LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */, - 0x1EAD /* 0xCB LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */, - 0x00E8 /* 0xCC LATIN SMALL LETTER E WITH GRAVE */, - 0x1EC2 /* 0xCD LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */, - 0x1EBB /* 0xCE LATIN SMALL LETTER E WITH HOOK ABOVE */, - 0x1EBD /* 0xCF LATIN SMALL LETTER E WITH TILDE */, - 0x00E9 /* 0xD0 LATIN SMALL LETTER E WITH ACUTE */, - 0x1EB9 /* 0xD1 LATIN SMALL LETTER E WITH DOT BELOW */, - 0x1EC1 /* 0xD2 LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */, - 0x1EC3 /* 0xD3 LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */, - 0x1EC5 /* 0xD4 LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */, - 0x1EBF /* 0xD5 LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */, - 0x1EC7 /* 0xD6 LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */, - 0x00EC /* 0xD7 LATIN SMALL LETTER I WITH GRAVE */, - 0x1EC9 /* 0xD8 LATIN SMALL LETTER I WITH HOOK ABOVE */, - 0x1EC4 /* 0xD9 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */, - 0x1EBE /* 0xDA LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */, - 0x1ED2 /* 0xDB LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */, - 0x0129 /* 0xDC LATIN SMALL LETTER I WITH TILDE */, - 0x00ED /* 0xDD LATIN SMALL LETTER I WITH ACUTE */, - 0x1ECB /* 0xDE LATIN SMALL LETTER I WITH DOT BELOW */, - 0x00F2 /* 0xDF LATIN SMALL LETTER O WITH GRAVE */, - 0x1ED4 /* 0xE0 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */, - 0x1ECF /* 0xE1 LATIN SMALL LETTER O WITH HOOK ABOVE */, - 0x00F5 /* 0xE2 LATIN SMALL LETTER O WITH TILDE */, - 0x00F3 /* 0xE3 LATIN SMALL LETTER O WITH ACUTE */, - 0x1ECD /* 0xE4 LATIN SMALL LETTER O WITH DOT BELOW */, - 0x1ED3 /* 0xE5 LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */, - 0x1ED5 /* 0xE6 LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */, - 0x1ED7 /* 0xE7 LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */, - 0x1ED1 /* 0xE8 LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */, - 0x1ED9 /* 0xE9 LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */, - 0x1EDD /* 0xEA LATIN SMALL LETTER O WITH HORN AND GRAVE */, - 0x1EDF /* 0xEB LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */, - 0x1EE1 /* 0xEC LATIN SMALL LETTER O WITH HORN AND TILDE */, - 0x1EDB /* 0xED LATIN SMALL LETTER O WITH HORN AND ACUTE */, - 0x1EE3 /* 0xEE LATIN SMALL LETTER O WITH HORN AND DOT BELOW */, - 0x00F9 /* 0xEF LATIN SMALL LETTER U WITH GRAVE */, - 0x1ED6 /* 0xF0 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */, - 0x1EE7 /* 0xF1 LATIN SMALL LETTER U WITH HOOK ABOVE */, - 0x0169 /* 0xF2 LATIN SMALL LETTER U WITH TILDE */, - 0x00FA /* 0xF3 LATIN SMALL LETTER U WITH ACUTE */, - 0x1EE5 /* 0xF4 LATIN SMALL LETTER U WITH DOT BELOW */, - 0x1EEB /* 0xF5 LATIN SMALL LETTER U WITH HORN AND GRAVE */, - 0x1EED /* 0xF6 LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */, - 0x1EEF /* 0xF7 LATIN SMALL LETTER U WITH HORN AND TILDE */, - 0x1EE9 /* 0xF8 LATIN SMALL LETTER U WITH HORN AND ACUTE */, - 0x1EF1 /* 0xF9 LATIN SMALL LETTER U WITH HORN AND DOT BELOW */, - 0x1EF3 /* 0xFA LATIN SMALL LETTER Y WITH GRAVE */, - 0x1EF7 /* 0xFB LATIN SMALL LETTER Y WITH HOOK ABOVE */, - 0x1EF9 /* 0xFC LATIN SMALL LETTER Y WITH TILDE */, - 0x00FD /* 0xFD LATIN SMALL LETTER Y WITH ACUTE */, - 0x1EF5 /* 0xFE LATIN SMALL LETTER Y WITH DOT BELOW */, - 0x1ED0 /* 0xFF LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */ -}; -#endif + if (!LISTP (cell)) + signal_simple_error ("Invalid argument", attributes); + Fput_char_attribute (character, Fcar (cell), Fcdr (cell)); + rest = Fcdr (rest); + } + return + get_char_code_table (XCHAR (character), Vcharacter_attribute_table); +} Lisp_Object Vutf_2000_version; #endif @@ -342,8 +791,12 @@ Lisp_Object Qascii, Qchinese_cns11643_2, #ifdef UTF2000 Qucs_bmp, + Qlatin_viscii, Qlatin_viscii_lower, Qlatin_viscii_upper, + Qvietnamese_viscii_lower, + Qvietnamese_viscii_upper, + Qethiopic_ucs, Qhiragana_jisx0208, Qkatakana_jisx0208, #endif @@ -355,8 +808,12 @@ Lisp_Object Ql2r, Qr2l; Lisp_Object Vcharset_hash_table; +#ifdef UTF2000 +static Charset_ID next_allocated_leading_byte; +#else static Charset_ID next_allocated_1_byte_leading_byte; static Charset_ID next_allocated_2_byte_leading_byte; +#endif /* Composite characters are characters constructed by overstriking two or more regular characters. @@ -718,6 +1175,9 @@ mark_charset (Lisp_Object obj, void (*markobj) (Lisp_Object)) markobj (cs->doc_string); markobj (cs->registry); markobj (cs->ccl_program); +#ifdef UTF2000 + markobj (cs->decoding_table); +#endif return cs->name; } @@ -757,6 +1217,9 @@ print_charset (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) static const struct lrecord_description charset_description[] = { { XD_LISP_OBJECT, offsetof(struct Lisp_Charset, name), 7 }, +#ifdef UTF2000 + { XD_LISP_OBJECT, offsetof(struct Lisp_Charset, decoding_table), 2 }, +#endif { XD_END } }; @@ -764,6 +1227,7 @@ DEFINE_LRECORD_IMPLEMENTATION ("charset", charset, mark_charset, print_charset, 0, 0, 0, charset_description, struct Lisp_Charset); + /* Make a new charset. */ static Lisp_Object @@ -795,91 +1259,47 @@ make_charset (Charset_ID id, Lisp_Object name, CHARSET_CCL_PROGRAM (cs) = Qnil; CHARSET_REVERSE_DIRECTION_CHARSET (cs) = Qnil; #ifdef UTF2000 - CHARSET_DECODING_TABLE(cs) = decoding_table; + CHARSET_DECODING_TABLE(cs) = Qnil; CHARSET_UCS_MIN(cs) = ucs_min; CHARSET_UCS_MAX(cs) = ucs_max; CHARSET_CODE_OFFSET(cs) = code_offset; CHARSET_BYTE_OFFSET(cs) = byte_offset; #endif - - switch ( CHARSET_TYPE (cs) ) + + switch (CHARSET_TYPE (cs)) { case CHARSET_TYPE_94: CHARSET_DIMENSION (cs) = 1; CHARSET_CHARS (cs) = 94; -#ifdef UTF2000 - if (!EQ (decoding_table, Qnil)) - { - size_t i; - CHARSET_TO_BYTE1_TABLE(cs) = make_byte_from_character_table(); - for (i = 0; i < 94; i++) - { - Lisp_Object c = XVECTOR_DATA(decoding_table)[i]; - - if (!EQ (c, Qnil)) - put_byte_from_character_table (XCHAR (c), i + 33, - CHARSET_TO_BYTE1_TABLE(cs)); - } - } - else - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; -#endif break; case CHARSET_TYPE_96: CHARSET_DIMENSION (cs) = 1; CHARSET_CHARS (cs) = 96; -#ifdef UTF2000 - if (!EQ (decoding_table, Qnil)) - { - size_t i; - CHARSET_TO_BYTE1_TABLE(cs) = make_byte_from_character_table(); - for (i = 0; i < 96; i++) - { - Lisp_Object c = XVECTOR_DATA(decoding_table)[i]; - - if (!EQ (c, Qnil)) - put_byte_from_character_table (XCHAR (c), i + 32, - CHARSET_TO_BYTE1_TABLE(cs)); - } - } - else - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; -#endif break; case CHARSET_TYPE_94X94: CHARSET_DIMENSION (cs) = 2; CHARSET_CHARS (cs) = 94; -#ifdef UTF2000 - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; -#endif break; case CHARSET_TYPE_96X96: CHARSET_DIMENSION (cs) = 2; CHARSET_CHARS (cs) = 96; -#ifdef UTF2000 - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; -#endif break; #ifdef UTF2000 + case CHARSET_TYPE_128: + CHARSET_DIMENSION (cs) = 1; + CHARSET_CHARS (cs) = 128; + break; case CHARSET_TYPE_128X128: CHARSET_DIMENSION (cs) = 2; CHARSET_CHARS (cs) = 128; -#ifdef UTF2000 - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; -#endif + break; + case CHARSET_TYPE_256: + CHARSET_DIMENSION (cs) = 1; + CHARSET_CHARS (cs) = 256; break; case CHARSET_TYPE_256X256: CHARSET_DIMENSION (cs) = 2; CHARSET_CHARS (cs) = 256; -#ifdef UTF2000 - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; -#endif break; #endif } @@ -930,6 +1350,12 @@ get_unallocated_leading_byte (int dimension) { Charset_ID lb; +#ifdef UTF2000 + if (next_allocated_leading_byte > MAX_LEADING_BYTE_PRIVATE) + lb = 0; + else + lb = next_allocated_leading_byte++; +#else if (dimension == 1) { if (next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1) @@ -944,6 +1370,7 @@ get_unallocated_leading_byte (int dimension) else lb = next_allocated_2_byte_leading_byte++; } +#endif if (!lb) signal_simple_error @@ -954,30 +1381,47 @@ get_unallocated_leading_byte (int dimension) } #ifdef UTF2000 -unsigned char -charset_get_byte1 (Lisp_Object charset, Emchar ch) +Lisp_Object +range_charset_code_point (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 ((XCHARSET_UCS_MIN (charset) <= ch) - && (ch <= XCHARSET_UCS_MAX (charset))) - return (ch - XCHARSET_UCS_MIN (charset) - + XCHARSET_CODE_OFFSET (charset)) - / (XCHARSET_DIMENSION (charset) == 1 ? - 1 - : - XCHARSET_DIMENSION (charset) == 2 ? - XCHARSET_CHARS (charset) - : - XCHARSET_DIMENSION (charset) == 3 ? - XCHARSET_CHARS (charset) * XCHARSET_CHARS (charset) - : - XCHARSET_CHARS (charset) - * XCHARSET_CHARS (charset) * XCHARSET_CHARS (charset)) - + XCHARSET_BYTE_OFFSET (charset); + if ((XCHARSET_UCS_MIN (charset) <= ch) + && (ch <= XCHARSET_UCS_MAX (charset))) + { + d = ch - XCHARSET_UCS_MIN (charset) + XCHARSET_CODE_OFFSET (charset); + + if (XCHARSET_DIMENSION (charset) == 1) + return list1 (make_int (d + XCHARSET_BYTE_OFFSET (charset))); + else if (XCHARSET_DIMENSION (charset) == 2) + return list2 (make_int (d / XCHARSET_CHARS (charset) + + XCHARSET_BYTE_OFFSET (charset)), + make_int (d % XCHARSET_CHARS (charset) + + XCHARSET_BYTE_OFFSET (charset))); + else if (XCHARSET_DIMENSION (charset) == 3) + return list3 (make_int (d / (XCHARSET_CHARS (charset) + * XCHARSET_CHARS (charset)) + + XCHARSET_BYTE_OFFSET (charset)), + make_int (d / XCHARSET_CHARS (charset) + % XCHARSET_CHARS (charset) + + XCHARSET_BYTE_OFFSET (charset)), + make_int (d % XCHARSET_CHARS (charset) + + XCHARSET_BYTE_OFFSET (charset))); + else /* if (XCHARSET_DIMENSION (charset) == 4) */ + return list4 (make_int (d / (XCHARSET_CHARS (charset) + * XCHARSET_CHARS (charset) + * XCHARSET_CHARS (charset)) + + XCHARSET_BYTE_OFFSET (charset)), + make_int (d / (XCHARSET_CHARS (charset) + * XCHARSET_CHARS (charset)) + % XCHARSET_CHARS (charset) + + XCHARSET_BYTE_OFFSET (charset)), + make_int (d / XCHARSET_CHARS (charset) + % XCHARSET_CHARS (charset) + + XCHARSET_BYTE_OFFSET (charset)), + make_int (d % XCHARSET_CHARS (charset) + + XCHARSET_BYTE_OFFSET (charset))); + } else if (XCHARSET_CODE_OFFSET (charset) == 0) { if (XCHARSET_DIMENSION (charset) == 1) @@ -987,17 +1431,17 @@ charset_get_byte1 (Lisp_Object charset, Emchar ch) if (((d = ch - (MIN_CHAR_94 + (XCHARSET_FINAL (charset) - '0') * 94)) >= 0) && (d < 94)) - return d + 33; + return list1 (make_int (d + 33)); } else if (XCHARSET_CHARS (charset) == 96) { if (((d = ch - (MIN_CHAR_96 + (XCHARSET_FINAL (charset) - '0') * 96)) >= 0) && (d < 96)) - return d + 32; + return list1 (make_int (d + 32)); } else - return 0; + return Qnil; } else if (XCHARSET_DIMENSION (charset) == 2) { @@ -1007,7 +1451,8 @@ charset_get_byte1 (Lisp_Object charset, Emchar ch) + (XCHARSET_FINAL (charset) - '0') * 94 * 94)) >= 0) && (d < 94 * 94)) - return (d / 94) + 33; + return list2 (make_int ((d / 94) + 33), + make_int (d % 94 + 33)); } else if (XCHARSET_CHARS (charset) == 96) { @@ -1015,50 +1460,123 @@ charset_get_byte1 (Lisp_Object charset, Emchar ch) + (XCHARSET_FINAL (charset) - '0') * 96 * 96)) >= 0) && (d < 96 * 96)) - return (d / 96) + 32; + return list2 (make_int ((d / 96) + 32), + make_int (d % 96 + 32)); } } } - return 0; + return Qnil; } -unsigned char -charset_get_byte2 (Lisp_Object charset, Emchar ch) +Lisp_Object +split_builtin_char (Emchar c) { - if (XCHARSET_DIMENSION (charset) == 1) - return 0; + if (c < MIN_CHAR_OBS_94x94) + { + if (c <= MAX_CHAR_BASIC_LATIN) + { + return list2 (Vcharset_ascii, make_int (c)); + } + else if (c < 0xA0) + { + return list2 (Vcharset_control_1, make_int (c & 0x7F)); + } + else if (c <= 0xff) + { + return list2 (Vcharset_latin_iso8859_1, make_int (c & 0x7F)); + } + else if ((MIN_CHAR_GREEK <= c) && (c <= MAX_CHAR_GREEK)) + { + return list2 (Vcharset_greek_iso8859_7, + make_int (c - MIN_CHAR_GREEK + 0x20)); + } + else if ((MIN_CHAR_CYRILLIC <= c) && (c <= MAX_CHAR_CYRILLIC)) + { + return list2 (Vcharset_cyrillic_iso8859_5, + make_int (c - MIN_CHAR_CYRILLIC + 0x20)); + } + else if ((MIN_CHAR_HEBREW <= c) && (c <= MAX_CHAR_HEBREW)) + { + return list2 (Vcharset_hebrew_iso8859_8, + make_int (c - MIN_CHAR_HEBREW + 0x20)); + } + else if ((MIN_CHAR_THAI <= c) && (c <= MAX_CHAR_THAI)) + { + return list2 (Vcharset_thai_tis620, + make_int (c - MIN_CHAR_THAI + 0x20)); + } + else if ((MIN_CHAR_HALFWIDTH_KATAKANA <= c) + && (c <= MAX_CHAR_HALFWIDTH_KATAKANA)) + { + return list2 (Vcharset_katakana_jisx0201, + make_int (c - MIN_CHAR_HALFWIDTH_KATAKANA + 33)); + } + else + { + return list3 (Vcharset_ucs_bmp, + make_int (c >> 8), make_int (c & 0xff)); + } + } + else if (c <= MAX_CHAR_OBS_94x94) + { + return list3 (CHARSET_BY_ATTRIBUTES + (CHARSET_TYPE_94X94, + ((c - MIN_CHAR_OBS_94x94) / (94 * 94)) + '@', + CHARSET_LEFT_TO_RIGHT), + make_int ((((c - MIN_CHAR_OBS_94x94) / 94) % 94) + 33), + make_int (((c - MIN_CHAR_OBS_94x94) % 94) + 33)); + } + else if (c <= MAX_CHAR_94) + { + return list2 (CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_94, + ((c - MIN_CHAR_94) / 94) + '0', + CHARSET_LEFT_TO_RIGHT), + make_int (((c - MIN_CHAR_94) % 94) + 33)); + } + else if (c <= MAX_CHAR_96) + { + return list2 (CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_96, + ((c - MIN_CHAR_96) / 96) + '0', + CHARSET_LEFT_TO_RIGHT), + make_int (((c - MIN_CHAR_96) % 96) + 32)); + } + else if (c <= MAX_CHAR_94x94) + { + return list3 (CHARSET_BY_ATTRIBUTES + (CHARSET_TYPE_94X94, + ((c - MIN_CHAR_94x94) / (94 * 94)) + '0', + CHARSET_LEFT_TO_RIGHT), + make_int ((((c - MIN_CHAR_94x94) / 94) % 94) + 33), + make_int (((c - MIN_CHAR_94x94) % 94) + 33)); + } + else if (c <= MAX_CHAR_96x96) + { + return list3 (CHARSET_BY_ATTRIBUTES + (CHARSET_TYPE_96X96, + ((c - MIN_CHAR_96x96) / (96 * 96)) + '0', + CHARSET_LEFT_TO_RIGHT), + make_int ((((c - MIN_CHAR_96x96) / 96) % 96) + 32), + make_int (((c - MIN_CHAR_96x96) % 96) + 32)); + } else { - Emchar_to_byte_table* table; - - if ((table = XCHARSET_TO_BYTE2_TABLE (charset)) != NULL) - return get_byte_from_character_table (ch, table); - else if ((XCHARSET_UCS_MIN (charset) <= ch) - && (ch <= XCHARSET_UCS_MAX (charset))) - return ((ch - XCHARSET_UCS_MIN (charset) - + XCHARSET_CODE_OFFSET (charset)) - / (XCHARSET_DIMENSION (charset) == 2 ? - 1 - : - XCHARSET_DIMENSION (charset) == 3 ? - XCHARSET_CHARS (charset) - : - XCHARSET_CHARS (charset) * XCHARSET_CHARS (charset))) - % XCHARSET_CHARS (charset) - + XCHARSET_BYTE_OFFSET (charset); - else 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) + 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) + 32 : 0; + return Qnil; + } +} + +Lisp_Object +charset_code_point (Lisp_Object charset, Emchar ch) +{ + Lisp_Object cdef = get_char_code_table (ch, Vcharacter_attribute_table); + + if (!EQ (cdef, Qnil)) + { + Lisp_Object field = Fassq (charset, cdef); + + if (!EQ (field, Qnil)) + return Fcdr (field); } + return range_charset_code_point (charset, ch); } Lisp_Object Vdefault_coded_charset_priority_list; @@ -1210,6 +1728,7 @@ character set. Recognized properties are: Lisp_Object rest, keyword, value; Lisp_Object ccl_program = Qnil; Lisp_Object short_name = Qnil, long_name = Qnil; + int byte_offset = -1; CHECK_SYMBOL (name); if (!NILP (doc_string)) @@ -1261,7 +1780,11 @@ character set. Recognized properties are: { CHECK_INT (value); graphic = XINT (value); +#ifdef UTF2000 + if (graphic < 0 || graphic > 2) +#else if (graphic < 0 || graphic > 1) +#endif signal_simple_error ("Invalid value for 'graphic", value); } @@ -1316,45 +1839,7 @@ character set. Recognized properties are: error ("Character set already defined for this DIMENSION/CHARS/FINAL combo"); -#ifdef UTF2000 - if (dimension == 1) - { - if (chars == 94) - { - /* id = CHARSET_ID_OFFSET_94 + final; */ - id = get_unallocated_leading_byte (dimension); - } - else if (chars == 96) - { - id = get_unallocated_leading_byte (dimension); - } - else - { - abort (); - } - } - else if (dimension == 2) - { - if (chars == 94) - { - id = get_unallocated_leading_byte (dimension); - } - else if (chars == 96) - { - id = get_unallocated_leading_byte (dimension); - } - else - { - abort (); - } - } - else - { - abort (); - } -#else id = get_unallocated_leading_byte (dimension); -#endif if (NILP (doc_string)) doc_string = build_string (""); @@ -1370,10 +1855,21 @@ character set. Recognized properties are: if (columns == -1) columns = dimension; + + if (byte_offset < 0) + { + if (chars == 94) + byte_offset = 33; + else if (chars == 96) + byte_offset = 32; + else + byte_offset = 0; + } + charset = make_charset (id, name, type, columns, graphic, final, direction, short_name, long_name, doc_string, registry, - Qnil, 0, 0, 0, 0); + Qnil, 0, 0, 0, byte_offset); if (!NILP (ccl_program)) XCHARSET_CCL_PROGRAM (charset) = ccl_program; return charset; @@ -1428,7 +1924,7 @@ NEW-NAME is the name of the new charset. Return the new charset. CHARSET_CODE_OFFSET(cs), CHARSET_BYTE_OFFSET(cs) #else - Qnil, 0, 0, 0 + Qnil, 0, 0, 0, 0 #endif ); @@ -1438,6 +1934,16 @@ NEW-NAME is the name of the new charset. Return the new charset. return new_charset; } +DEFUN ("define-charset-alias", Fdefine_charset_alias, 2, 2, 0, /* +Define symbol ALIAS as an alias for CHARSET. +*/ + (alias, charset)) +{ + CHECK_SYMBOL (alias); + charset = Fget_charset (charset); + return Fputhash (alias, charset, Vcharset_hash_table); +} + /* #### Reverse direction charsets not yet implemented. */ #if 0 DEFUN ("charset-reverse-direction-charset", Fcharset_reverse_direction_charset, @@ -1631,12 +2137,101 @@ Set the 'registry property of CHARSET to REGISTRY. #ifdef UTF2000 DEFUN ("charset-mapping-table", Fcharset_mapping_table, 1, 1, 0, /* -Set the 'registry property of CHARSET to REGISTRY. +Return mapping-table of CHARSET. */ (charset)) { return XCHARSET_DECODING_TABLE (Fget_charset (charset)); } + +DEFUN ("set-charset-mapping-table", Fset_charset_mapping_table, 2, 2, 0, /* +Set mapping-table of CHARSET to TABLE. +*/ + (charset, table)) +{ + struct Lisp_Charset *cs; + Lisp_Object old_table; + size_t i; + + charset = Fget_charset (charset); + cs = XCHARSET (charset); + + if (EQ (table, Qnil)) + { + CHARSET_DECODING_TABLE(cs) = table; + return table; + } + else if (VECTORP (table)) + { + int ccs_len; + + /* ad-hoc method for `ascii' */ + if ((CHARSET_CHARS (cs) == 94) && + (CHARSET_BYTE_OFFSET (cs) != 33)) + ccs_len = 128 - CHARSET_BYTE_OFFSET (cs); + else + ccs_len = CHARSET_CHARS (cs); + + if (XVECTOR_LENGTH (table) > ccs_len) + args_out_of_range (table, make_int (CHARSET_CHARS (cs))); + old_table = CHARSET_DECODING_TABLE(cs); + CHARSET_DECODING_TABLE(cs) = table; + } + else + signal_error (Qwrong_type_argument, + list2 (build_translated_string ("vector-or-nil-p"), + table)); + /* signal_simple_error ("Wrong type argument: vector-or-nil-p", table); */ + + switch (CHARSET_DIMENSION (cs)) + { + case 1: + for (i = 0; i < XVECTOR_LENGTH (table); i++) + { + Lisp_Object c = XVECTOR_DATA(table)[i]; + + if (CHARP (c)) + put_char_attribute + (c, charset, + list1 (make_int (i + CHARSET_BYTE_OFFSET (cs)))); + } + break; + case 2: + for (i = 0; i < XVECTOR_LENGTH (table); i++) + { + Lisp_Object v = XVECTOR_DATA(table)[i]; + + if (VECTORP (v)) + { + size_t j; + + if (XVECTOR_LENGTH (v) > CHARSET_CHARS (cs)) + { + CHARSET_DECODING_TABLE(cs) = old_table; + args_out_of_range (v, make_int (CHARSET_CHARS (cs))); + } + for (j = 0; j < XVECTOR_LENGTH (v); j++) + { + Lisp_Object c = XVECTOR_DATA(v)[j]; + + if (CHARP (c)) + put_char_attribute (c, charset, + list2 + (make_int + (i + CHARSET_BYTE_OFFSET (cs)), + make_int + (j + CHARSET_BYTE_OFFSET (cs)))); + } + } + else if (CHARP (v)) + put_char_attribute (v, charset, + list1 + (make_int (i + CHARSET_BYTE_OFFSET (cs)))); + } + break; + } + return table; +} #endif @@ -1833,6 +2428,7 @@ syms_of_mule_charset (void) DEFSUBR (Fmake_charset); DEFSUBR (Fmake_reverse_direction_charset); /* DEFSUBR (Freverse_direction_charset); */ + DEFSUBR (Fdefine_charset_alias); DEFSUBR (Fcharset_from_attributes); DEFSUBR (Fcharset_short_name); DEFSUBR (Fcharset_long_name); @@ -1843,7 +2439,14 @@ syms_of_mule_charset (void) DEFSUBR (Fset_charset_ccl_program); DEFSUBR (Fset_charset_registry); #ifdef UTF2000 + DEFSUBR (Fchar_attribute_alist); + DEFSUBR (Fget_char_attribute); + DEFSUBR (Fput_char_attribute); + DEFSUBR (Fdefine_char); + DEFSUBR (Fchar_variants); + DEFSUBR (Fget_composite_char); DEFSUBR (Fcharset_mapping_table); + DEFSUBR (Fset_charset_mapping_table); #endif DEFSUBR (Fmake_char); @@ -1891,9 +2494,22 @@ syms_of_mule_charset (void) defsymbol (&Qchinese_cns11643_1, "chinese-cns11643-1"); defsymbol (&Qchinese_cns11643_2, "chinese-cns11643-2"); #ifdef UTF2000 + defsymbol (&Q_ucs, "->ucs"); + defsymbol (&Q_decomposition, "->decomposition"); + defsymbol (&Qwide, "wide"); + defsymbol (&Qnarrow, "narrow"); + defsymbol (&Qcompat, "compat"); + defsymbol (&QnoBreak, "noBreak"); + defsymbol (&Qsuper, "super"); + defsymbol (&Qfraction, "fraction"); + defsymbol (&Qucs, "ucs"); defsymbol (&Qucs_bmp, "ucs-bmp"); - defsymbol (&Qlatin_viscii_lower, "vietnamese-viscii-lower"); - defsymbol (&Qlatin_viscii_upper, "vietnamese-viscii-upper"); + defsymbol (&Qlatin_viscii, "latin-viscii"); + defsymbol (&Qlatin_viscii_lower, "latin-viscii-lower"); + defsymbol (&Qlatin_viscii_upper, "latin-viscii-upper"); + defsymbol (&Qvietnamese_viscii_lower, "vietnamese-viscii-lower"); + defsymbol (&Qvietnamese_viscii_upper, "vietnamese-viscii-upper"); + defsymbol (&Qethiopic_ucs, "ethiopic-ucs"); defsymbol (&Qhiragana_jisx0208, "hiragana-jisx0208"); defsymbol (&Qkatakana_jisx0208, "katakana-jisx0208"); #endif @@ -1928,10 +2544,10 @@ vars_of_mule_charset (void) charset_by_attributes[i][j][k] = Qnil; #endif - next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1; #ifdef UTF2000 - next_allocated_2_byte_leading_byte = LEADING_BYTE_CHINESE_BIG5_2 + 1; + next_allocated_leading_byte = MIN_LEADING_BYTE_PRIVATE; #else + next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1; next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2; #endif @@ -1944,15 +2560,24 @@ Leading-code of private TYPE9N charset of column-width 1. #endif #ifdef UTF2000 - Vutf_2000_version = build_string("0.8 (Kami)"); + Vutf_2000_version = build_string("0.12 (Kashiwara)"); DEFVAR_LISP ("utf-2000-version", &Vutf_2000_version /* Version number of UTF-2000. */ ); + staticpro (&Vcharacter_attribute_table); + Vcharacter_attribute_table = make_char_code_table (Qnil); + + staticpro (&Vcharacter_composition_table); + Vcharacter_composition_table = make_char_code_table (Qnil); + + staticpro (&Vcharacter_variant_table); + Vcharacter_variant_table = make_char_code_table (Qnil); + Vdefault_coded_charset_priority_list = Qnil; DEFVAR_LISP ("default-coded-charset-priority-list", &Vdefault_coded_charset_priority_list /* -Default order of preferred coded-character-set. +Default order of preferred coded-character-sets. */ ); #endif } @@ -1968,1248 +2593,16 @@ complex_vars_of_mule_charset (void) ease of access. */ #ifdef UTF2000 - staticpro (&latin_jisx0201_to_ucs); - latin_jisx0201_to_ucs = make_vector (94, Qnil); - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x21 - 33] - = make_char (0x0021) /* EXCLAMATION MARK */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x22 - 33] - = make_char (0x0022) /* QUOTATION MARK */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x23 - 33] - = make_char (0x0023) /* NUMBER SIGN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x24 - 33] - = make_char (0x0024) /* DOLLAR SIGN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x25 - 33] - = make_char (0x0025) /* PERCENT SIGN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x26 - 33] - = make_char (0x0026) /* AMPERSAND */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x27 - 33] - = make_char (0x0027) /* APOSTROPHE */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x28 - 33] - = make_char (0x0028) /* LEFT PARENTHESIS */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x29 - 33] - = make_char (0x0029) /* RIGHT PARENTHESIS */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x2A - 33] - = make_char (0x002A) /* ASTERISK */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x2B - 33] - = make_char (0x002B) /* PLUS SIGN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x2C - 33] - = make_char (0x002C) /* COMMA */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x2D - 33] - = make_char (0x002D) /* HYPHEN-MINUS */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x2E - 33] - = make_char (0x002E) /* FULL STOP */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x2F - 33] - = make_char (0x002F) /* SOLIDUS */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x30 - 33] - = make_char (0x0030) /* DIGIT ZERO */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x31 - 33] - = make_char (0x0031) /* DIGIT ONE */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x32 - 33] - = make_char (0x0032) /* DIGIT TWO */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x33 - 33] - = make_char (0x0033) /* DIGIT THREE */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x34 - 33] - = make_char (0x0034) /* DIGIT FOUR */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x35 - 33] - = make_char (0x0035) /* DIGIT FIVE */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x36 - 33] - = make_char (0x0036) /* DIGIT SIX */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x37 - 33] - = make_char (0x0037) /* DIGIT SEVEN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x38 - 33] - = make_char (0x0038) /* DIGIT EIGHT */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x39 - 33] - = make_char (0x0039) /* DIGIT NINE */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x3A - 33] - = make_char (0x003A) /* COLON */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x3B - 33] - = make_char (0x003B) /* SEMICOLON */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x3C - 33] - = make_char (0x003C) /* LESS-THAN SIGN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x3D - 33] - = make_char (0x003D) /* EQUALS SIGN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x3E - 33] - = make_char (0x003E) /* GREATER-THAN SIGN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x3F - 33] - = make_char (0x003F) /* QUESTION MARK */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x40 - 33] - = make_char (0x0040) /* COMMERCIAL AT */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x41 - 33] - = make_char (0x0041) /* LATIN CAPITAL LETTER A */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x42 - 33] - = make_char (0x0042) /* LATIN CAPITAL LETTER B */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x43 - 33] - = make_char (0x0043) /* LATIN CAPITAL LETTER C */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x44 - 33] - = make_char (0x0044) /* LATIN CAPITAL LETTER D */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x45 - 33] - = make_char (0x0045) /* LATIN CAPITAL LETTER E */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x46 - 33] - = make_char (0x0046) /* LATIN CAPITAL LETTER F */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x47 - 33] - = make_char (0x0047) /* LATIN CAPITAL LETTER G */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x48 - 33] - = make_char (0x0048) /* LATIN CAPITAL LETTER H */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x49 - 33] - = make_char (0x0049) /* LATIN CAPITAL LETTER I */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x4A - 33] - = make_char (0x004A) /* LATIN CAPITAL LETTER J */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x4B - 33] - = make_char (0x004B) /* LATIN CAPITAL LETTER K */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x4C - 33] - = make_char (0x004C) /* LATIN CAPITAL LETTER L */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x4D - 33] - = make_char (0x004D) /* LATIN CAPITAL LETTER M */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x4E - 33] - = make_char (0x004E) /* LATIN CAPITAL LETTER N */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x4F - 33] - = make_char (0x004F) /* LATIN CAPITAL LETTER O */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x50 - 33] - = make_char (0x0050) /* LATIN CAPITAL LETTER P */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x51 - 33] - = make_char (0x0051) /* LATIN CAPITAL LETTER Q */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x52 - 33] - = make_char (0x0052) /* LATIN CAPITAL LETTER R */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x53 - 33] - = make_char (0x0053) /* LATIN CAPITAL LETTER S */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x54 - 33] - = make_char (0x0054) /* LATIN CAPITAL LETTER T */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x55 - 33] - = make_char (0x0055) /* LATIN CAPITAL LETTER U */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x56 - 33] - = make_char (0x0056) /* LATIN CAPITAL LETTER V */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x57 - 33] - = make_char (0x0057) /* LATIN CAPITAL LETTER W */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x58 - 33] - = make_char (0x0058) /* LATIN CAPITAL LETTER X */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x59 - 33] - = make_char (0x0059) /* LATIN CAPITAL LETTER Y */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x5A - 33] - = make_char (0x005A) /* LATIN CAPITAL LETTER Z */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x5B - 33] - = make_char (0x005B) /* LEFT SQUARE BRACKET */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x5C - 33] - = make_char (0x00A5) /* YEN SIGN */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x5D - 33] - = make_char (0x005D) /* RIGHT SQUARE BRACKET */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x5E - 33] - = make_char (0x005E) /* CIRCUMFLEX ACCENT */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x5F - 33] - = make_char (0x005F) /* LOW LINE */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x60 - 33] - = make_char (0x0060) /* GRAVE ACCENT */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x61 - 33] - = make_char (0x0061) /* LATIN SMALL LETTER A */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x62 - 33] - = make_char (0x0062) /* LATIN SMALL LETTER B */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x63 - 33] - = make_char (0x0063) /* LATIN SMALL LETTER C */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x64 - 33] - = make_char (0x0064) /* LATIN SMALL LETTER D */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x65 - 33] - = make_char (0x0065) /* LATIN SMALL LETTER E */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x66 - 33] - = make_char (0x0066) /* LATIN SMALL LETTER F */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x67 - 33] - = make_char (0x0067) /* LATIN SMALL LETTER G */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x68 - 33] - = make_char (0x0068) /* LATIN SMALL LETTER H */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x69 - 33] - = make_char (0x0069) /* LATIN SMALL LETTER I */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x6A - 33] - = make_char (0x006A) /* LATIN SMALL LETTER J */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x6B - 33] - = make_char (0x006B) /* LATIN SMALL LETTER K */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x6C - 33] - = make_char (0x006C) /* LATIN SMALL LETTER L */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x6D - 33] - = make_char (0x006D) /* LATIN SMALL LETTER M */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x6E - 33] - = make_char (0x006E) /* LATIN SMALL LETTER N */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x6F - 33] - = make_char (0x006F) /* LATIN SMALL LETTER O */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x70 - 33] - = make_char (0x0070) /* LATIN SMALL LETTER P */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x71 - 33] - = make_char (0x0071) /* LATIN SMALL LETTER Q */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x72 - 33] - = make_char (0x0072) /* LATIN SMALL LETTER R */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x73 - 33] - = make_char (0x0073) /* LATIN SMALL LETTER S */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x74 - 33] - = make_char (0x0074) /* LATIN SMALL LETTER T */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x75 - 33] - = make_char (0x0075) /* LATIN SMALL LETTER U */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x76 - 33] - = make_char (0x0076) /* LATIN SMALL LETTER V */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x77 - 33] - = make_char (0x0077) /* LATIN SMALL LETTER W */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x78 - 33] - = make_char (0x0078) /* LATIN SMALL LETTER X */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x79 - 33] - = make_char (0x0079) /* LATIN SMALL LETTER Y */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x7A - 33] - = make_char (0x007A) /* LATIN SMALL LETTER Z */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x7B - 33] - = make_char (0x007B) /* LEFT CURLY BRACKET */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x7C - 33] - = make_char (0x007C) /* VERTICAL LINE */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x7D - 33] - = make_char (0x007D) /* RIGHT CURLY BRACKET */; - XVECTOR_DATA(latin_jisx0201_to_ucs)[0x7E - 33] - = make_char (0x203E) /* OVERLINE */; - - staticpro (&latin_iso8859_2_to_ucs); - latin_iso8859_2_to_ucs = make_vector (96, Qnil); - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA0 - 0xA0] - = make_char (0x00A0) /* NO-BREAK SPACE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA1 - 0xA0] - = make_char (0x0104) /* LATIN CAPITAL LETTER A WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA2 - 0xA0] - = make_char (0x02D8) /* BREVE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA3 - 0xA0] - = make_char (0x0141) /* LATIN CAPITAL LETTER L WITH STROKE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA4 - 0xA0] - = make_char (0x00A4) /* CURRENCY SIGN */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA5 - 0xA0] - = make_char (0x013D) /* LATIN CAPITAL LETTER L WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA6 - 0xA0] - = make_char (0x015A) /* LATIN CAPITAL LETTER S WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA7 - 0xA0] - = make_char (0x00A7) /* SECTION SIGN */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA8 - 0xA0] - = make_char (0x00A8) /* DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xA9 - 0xA0] - = make_char (0x0160) /* LATIN CAPITAL LETTER S WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xAA - 0xA0] - = make_char (0x015E) /* LATIN CAPITAL LETTER S WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xAB - 0xA0] - = make_char (0x0164) /* LATIN CAPITAL LETTER T WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xAC - 0xA0] - = make_char (0x0179) /* LATIN CAPITAL LETTER Z WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xAD - 0xA0] - = make_char (0x00AD) /* SOFT HYPHEN */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xAE - 0xA0] - = make_char (0x017D) /* LATIN CAPITAL LETTER Z WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xAF - 0xA0] - = make_char (0x017B) /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB0 - 0xA0] - = make_char (0x00B0) /* DEGREE SIGN */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB1 - 0xA0] - = make_char (0x0105) /* LATIN SMALL LETTER A WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB2 - 0xA0] - = make_char (0x02DB) /* OGONEK */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB3 - 0xA0] - = make_char (0x0142) /* LATIN SMALL LETTER L WITH STROKE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB4 - 0xA0] - = make_char (0x00B4) /* ACUTE ACCENT */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB5 - 0xA0] - = make_char (0x013E) /* LATIN SMALL LETTER L WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB6 - 0xA0] - = make_char (0x015B) /* LATIN SMALL LETTER S WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB7 - 0xA0] - = make_char (0x02C7) /* CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB8 - 0xA0] - = make_char (0x00B8) /* CEDILLA */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xB9 - 0xA0] - = make_char (0x0161) /* LATIN SMALL LETTER S WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xBA - 0xA0] - = make_char (0x015F) /* LATIN SMALL LETTER S WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xBB - 0xA0] - = make_char (0x0165) /* LATIN SMALL LETTER T WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xBC - 0xA0] - = make_char (0x017A) /* LATIN SMALL LETTER Z WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xBD - 0xA0] - = make_char (0x02DD) /* DOUBLE ACUTE ACCENT */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xBE - 0xA0] - = make_char (0x017E) /* LATIN SMALL LETTER Z WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xBF - 0xA0] - = make_char (0x017C) /* LATIN SMALL LETTER Z WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC0 - 0xA0] - = make_char (0x0154) /* LATIN CAPITAL LETTER R WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC1 - 0xA0] - = make_char (0x00C1) /* LATIN CAPITAL LETTER A WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC2 - 0xA0] - = make_char (0x00C2) /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC3 - 0xA0] - = make_char (0x0102) /* LATIN CAPITAL LETTER A WITH BREVE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC4 - 0xA0] - = make_char (0x00C4) /* LATIN CAPITAL LETTER A WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC5 - 0xA0] - = make_char (0x0139) /* LATIN CAPITAL LETTER L WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC6 - 0xA0] - = make_char (0x0106) /* LATIN CAPITAL LETTER C WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC7 - 0xA0] - = make_char (0x00C7) /* LATIN CAPITAL LETTER C WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC8 - 0xA0] - = make_char (0x010C) /* LATIN CAPITAL LETTER C WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xC9 - 0xA0] - = make_char (0x00C9) /* LATIN CAPITAL LETTER E WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xCA - 0xA0] - = make_char (0x0118) /* LATIN CAPITAL LETTER E WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xCB - 0xA0] - = make_char (0x00CB) /* LATIN CAPITAL LETTER E WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xCC - 0xA0] - = make_char (0x011A) /* LATIN CAPITAL LETTER E WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xCD - 0xA0] - = make_char (0x00CD) /* LATIN CAPITAL LETTER I WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xCE - 0xA0] - = make_char (0x00CE) /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xCF - 0xA0] - = make_char (0x010E) /* LATIN CAPITAL LETTER D WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD0 - 0xA0] - = make_char (0x0110) /* LATIN CAPITAL LETTER D WITH STROKE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD1 - 0xA0] - = make_char (0x0143) /* LATIN CAPITAL LETTER N WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD2 - 0xA0] - = make_char (0x0147) /* LATIN CAPITAL LETTER N WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD3 - 0xA0] - = make_char (0x00D3) /* LATIN CAPITAL LETTER O WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD4 - 0xA0] - = make_char (0x00D4) /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD5 - 0xA0] - = make_char (0x0150) /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD6 - 0xA0] - = make_char (0x00D6) /* LATIN CAPITAL LETTER O WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD7 - 0xA0] - = make_char (0x00D7) /* MULTIPLICATION SIGN */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD8 - 0xA0] - = make_char (0x0158) /* LATIN CAPITAL LETTER R WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xD9 - 0xA0] - = make_char (0x016E) /* LATIN CAPITAL LETTER U WITH RING ABOVE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xDA - 0xA0] - = make_char (0x00DA) /* LATIN CAPITAL LETTER U WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xDB - 0xA0] - = make_char (0x0170) /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xDC - 0xA0] - = make_char (0x00DC) /* LATIN CAPITAL LETTER U WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xDD - 0xA0] - = make_char (0x00DD) /* LATIN CAPITAL LETTER Y WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xDE - 0xA0] - = make_char (0x0162) /* LATIN CAPITAL LETTER T WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xDF - 0xA0] - = make_char (0x00DF) /* LATIN SMALL LETTER SHARP S */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE0 - 0xA0] - = make_char (0x0155) /* LATIN SMALL LETTER R WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE1 - 0xA0] - = make_char (0x00E1) /* LATIN SMALL LETTER A WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE2 - 0xA0] - = make_char (0x00E2) /* LATIN SMALL LETTER A WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE3 - 0xA0] - = make_char (0x0103) /* LATIN SMALL LETTER A WITH BREVE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE4 - 0xA0] - = make_char (0x00E4) /* LATIN SMALL LETTER A WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE5 - 0xA0] - = make_char (0x013A) /* LATIN SMALL LETTER L WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE6 - 0xA0] - = make_char (0x0107) /* LATIN SMALL LETTER C WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE7 - 0xA0] - = make_char (0x00E7) /* LATIN SMALL LETTER C WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE8 - 0xA0] - = make_char (0x010D) /* LATIN SMALL LETTER C WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xE9 - 0xA0] - = make_char (0x00E9) /* LATIN SMALL LETTER E WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xEA - 0xA0] - = make_char (0x0119) /* LATIN SMALL LETTER E WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xEB - 0xA0] - = make_char (0x00EB) /* LATIN SMALL LETTER E WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xEC - 0xA0] - = make_char (0x011B) /* LATIN SMALL LETTER E WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xED - 0xA0] - = make_char (0x00ED) /* LATIN SMALL LETTER I WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xEE - 0xA0] - = make_char (0x00EE) /* LATIN SMALL LETTER I WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xEF - 0xA0] - = make_char (0x010F) /* LATIN SMALL LETTER D WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF0 - 0xA0] - = make_char (0x0111) /* LATIN SMALL LETTER D WITH STROKE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF1 - 0xA0] - = make_char (0x0144) /* LATIN SMALL LETTER N WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF2 - 0xA0] - = make_char (0x0148) /* LATIN SMALL LETTER N WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF3 - 0xA0] - = make_char (0x00F3) /* LATIN SMALL LETTER O WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF4 - 0xA0] - = make_char (0x00F4) /* LATIN SMALL LETTER O WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF5 - 0xA0] - = make_char (0x0151) /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF6 - 0xA0] - = make_char (0x00F6) /* LATIN SMALL LETTER O WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF7 - 0xA0] - = make_char (0x00F7) /* DIVISION SIGN */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF8 - 0xA0] - = make_char (0x0159) /* LATIN SMALL LETTER R WITH CARON */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xF9 - 0xA0] - = make_char (0x016F) /* LATIN SMALL LETTER U WITH RING ABOVE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xFA - 0xA0] - = make_char (0x00FA) /* LATIN SMALL LETTER U WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xFB - 0xA0] - = make_char (0x0171) /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xFC - 0xA0] - = make_char (0x00FC) /* LATIN SMALL LETTER U WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xFD - 0xA0] - = make_char (0x00FD) /* LATIN SMALL LETTER Y WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xFE - 0xA0] - = make_char (0x0163) /* LATIN SMALL LETTER T WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_2_to_ucs)[0xFF - 0xA0] - = make_char (0x02D9) /* DOT ABOVE */; - - staticpro (&latin_iso8859_3_to_ucs); - latin_iso8859_3_to_ucs = make_vector (96, Qnil); - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA0 - 0xA0] - = make_char (0x00A0) /* NO-BREAK SPACE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA1 - 0xA0] - = make_char (0x0126) /* LATIN CAPITAL LETTER H WITH STROKE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA2 - 0xA0] - = make_char (0x02D8) /* BREVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA3 - 0xA0] - = make_char (0x00A3) /* POUND SIGN */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA4 - 0xA0] - = make_char (0x00A4) /* CURRENCY SIGN */; - /* XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA5 - 0xA0] - = make_char (CHAR96('C', 0xA5)); */ - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA6 - 0xA0] - = make_char (0x0124) /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA7 - 0xA0] - = make_char (0x00A7) /* SECTION SIGN */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA8 - 0xA0] - = make_char (0x00A8) /* DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xA9 - 0xA0] - = make_char (0x0130) /* LATIN CAPITAL LETTER I WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xAA - 0xA0] - = make_char (0x015E) /* LATIN CAPITAL LETTER S WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xAB - 0xA0] - = make_char (0x011E) /* LATIN CAPITAL LETTER G WITH BREVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xAC - 0xA0] - = make_char (0x0134) /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xAD - 0xA0] - = make_char (0x00AD) /* SOFT HYPHEN */; - /* XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xAE - 0xA0] - = make_char (CHAR96('C', 0xAE)); */ - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xAF - 0xA0] - = make_char (0x017B) /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB0 - 0xA0] - = make_char (0x00B0) /* DEGREE SIGN */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB1 - 0xA0] - = make_char (0x0127) /* LATIN SMALL LETTER H WITH STROKE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB2 - 0xA0] - = make_char (0x00B2) /* SUPERSCRIPT TWO */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB3 - 0xA0] - = make_char (0x00B3) /* SUPERSCRIPT THREE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB4 - 0xA0] - = make_char (0x00B4) /* ACUTE ACCENT */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB5 - 0xA0] - = make_char (0x00B5) /* MICRO SIGN */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB6 - 0xA0] - = make_char (0x0125) /* LATIN SMALL LETTER H WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB7 - 0xA0] - = make_char (0x00B7) /* MIDDLE DOT */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB8 - 0xA0] - = make_char (0x00B8) /* CEDILLA */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xB9 - 0xA0] - = make_char (0x0131) /* LATIN SMALL LETTER DOTLESS I */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xBA - 0xA0] - = make_char (0x015F) /* LATIN SMALL LETTER S WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xBB - 0xA0] - = make_char (0x011F) /* LATIN SMALL LETTER G WITH BREVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xBC - 0xA0] - = make_char (0x0135) /* LATIN SMALL LETTER J WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xBD - 0xA0] - = make_char (0x00BD) /* VULGAR FRACTION ONE HALF */; - /* XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xBE - 0xA0] - = make_char (CHAR96('C', 0xBE)); */ - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xBF - 0xA0] - = make_char (0x017C) /* LATIN SMALL LETTER Z WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC0 - 0xA0] - = make_char (0x00C0) /* LATIN CAPITAL LETTER A WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC1 - 0xA0] - = make_char (0x00C1) /* LATIN CAPITAL LETTER A WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC2 - 0xA0] - = make_char (0x00C2) /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */; - /* XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC3 - 0xA0] - = make_char (CHAR96('C', 0xC3)); */ - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC4 - 0xA0] - = make_char (0x00C4) /* LATIN CAPITAL LETTER A WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC5 - 0xA0] - = make_char (0x010A) /* LATIN CAPITAL LETTER C WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC6 - 0xA0] - = make_char (0x0108) /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC7 - 0xA0] - = make_char (0x00C7) /* LATIN CAPITAL LETTER C WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC8 - 0xA0] - = make_char (0x00C8) /* LATIN CAPITAL LETTER E WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xC9 - 0xA0] - = make_char (0x00C9) /* LATIN CAPITAL LETTER E WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xCA - 0xA0] - = make_char (0x00CA) /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xCB - 0xA0] - = make_char (0x00CB) /* LATIN CAPITAL LETTER E WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xCC - 0xA0] - = make_char (0x00CC) /* LATIN CAPITAL LETTER I WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xCD - 0xA0] - = make_char (0x00CD) /* LATIN CAPITAL LETTER I WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xCE - 0xA0] - = make_char (0x00CE) /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xCF - 0xA0] - = make_char (0x00CF) /* LATIN CAPITAL LETTER I WITH DIAERESIS */; - /* XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD0 - 0xA0] - = make_char (CHAR96('C', 0xD0)); */ - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD1 - 0xA0] - = make_char (0x00D1) /* LATIN CAPITAL LETTER N WITH TILDE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD2 - 0xA0] - = make_char (0x00D2) /* LATIN CAPITAL LETTER O WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD3 - 0xA0] - = make_char (0x00D3) /* LATIN CAPITAL LETTER O WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD4 - 0xA0] - = make_char (0x00D4) /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD5 - 0xA0] - = make_char (0x0120) /* LATIN CAPITAL LETTER G WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD6 - 0xA0] - = make_char (0x00D6) /* LATIN CAPITAL LETTER O WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD7 - 0xA0] - = make_char (0x00D7) /* MULTIPLICATION SIGN */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD8 - 0xA0] - = make_char (0x011C) /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xD9 - 0xA0] - = make_char (0x00D9) /* LATIN CAPITAL LETTER U WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xDA - 0xA0] - = make_char (0x00DA) /* LATIN CAPITAL LETTER U WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xDB - 0xA0] - = make_char (0x00DB) /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xDC - 0xA0] - = make_char (0x00DC) /* LATIN CAPITAL LETTER U WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xDD - 0xA0] - = make_char (0x016C) /* LATIN CAPITAL LETTER U WITH BREVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xDE - 0xA0] - = make_char (0x015C) /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xDF - 0xA0] - = make_char (0x00DF) /* LATIN SMALL LETTER SHARP S */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE0 - 0xA0] - = make_char (0x00E0) /* LATIN SMALL LETTER A WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE1 - 0xA0] - = make_char (0x00E1) /* LATIN SMALL LETTER A WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE2 - 0xA0] - = make_char (0x00E2) /* LATIN SMALL LETTER A WITH CIRCUMFLEX */; - /* XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE3 - 0xA0] - = make_char (CHAR96('C', 0xE3)); */ - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE4 - 0xA0] - = make_char (0x00E4) /* LATIN SMALL LETTER A WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE5 - 0xA0] - = make_char (0x010B) /* LATIN SMALL LETTER C WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE6 - 0xA0] - = make_char (0x0109) /* LATIN SMALL LETTER C WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE7 - 0xA0] - = make_char (0x00E7) /* LATIN SMALL LETTER C WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE8 - 0xA0] - = make_char (0x00E8) /* LATIN SMALL LETTER E WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xE9 - 0xA0] - = make_char (0x00E9) /* LATIN SMALL LETTER E WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xEA - 0xA0] - = make_char (0x00EA) /* LATIN SMALL LETTER E WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xEB - 0xA0] - = make_char (0x00EB) /* LATIN SMALL LETTER E WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xEC - 0xA0] - = make_char (0x00EC) /* LATIN SMALL LETTER I WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xED - 0xA0] - = make_char (0x00ED) /* LATIN SMALL LETTER I WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xEE - 0xA0] - = make_char (0x00EE) /* LATIN SMALL LETTER I WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xEF - 0xA0] - = make_char (0x00EF) /* LATIN SMALL LETTER I WITH DIAERESIS */; - /* XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF0 - 0xA0] - = make_char (CHAR96('C', 0xF0)); */ - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF1 - 0xA0] - = make_char (0x00F1) /* LATIN SMALL LETTER N WITH TILDE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF2 - 0xA0] - = make_char (0x00F2) /* LATIN SMALL LETTER O WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF3 - 0xA0] - = make_char (0x00F3) /* LATIN SMALL LETTER O WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF4 - 0xA0] - = make_char (0x00F4) /* LATIN SMALL LETTER O WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF5 - 0xA0] - = make_char (0x0121) /* LATIN SMALL LETTER G WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF6 - 0xA0] - = make_char (0x00F6) /* LATIN SMALL LETTER O WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF7 - 0xA0] - = make_char (0x00F7) /* DIVISION SIGN */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF8 - 0xA0] - = make_char (0x011D) /* LATIN SMALL LETTER G WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xF9 - 0xA0] - = make_char (0x00F9) /* LATIN SMALL LETTER U WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xFA - 0xA0] - = make_char (0x00FA) /* LATIN SMALL LETTER U WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xFB - 0xA0] - = make_char (0x00FB) /* LATIN SMALL LETTER U WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xFC - 0xA0] - = make_char (0x00FC) /* LATIN SMALL LETTER U WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xFD - 0xA0] - = make_char (0x016D) /* LATIN SMALL LETTER U WITH BREVE */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xFE - 0xA0] - = make_char (0x015D) /* LATIN SMALL LETTER S WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_3_to_ucs)[0xFF - 0xA0] - = make_char (0x02D9) /* DOT ABOVE */; - - staticpro (&latin_iso8859_4_to_ucs); - latin_iso8859_4_to_ucs = make_vector (96, Qnil); - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA0 - 0xA0] - = make_char (0x00A0) /* NO-BREAK SPACE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA1 - 0xA0] - = make_char (0x0104) /* LATIN CAPITAL LETTER A WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA2 - 0xA0] - = make_char (0x0138) /* LATIN SMALL LETTER KRA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA3 - 0xA0] - = make_char (0x0156) /* LATIN CAPITAL LETTER R WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA4 - 0xA0] - = make_char (0x00A4) /* CURRENCY SIGN */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA5 - 0xA0] - = make_char (0x0128) /* LATIN CAPITAL LETTER I WITH TILDE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA6 - 0xA0] - = make_char (0x013B) /* LATIN CAPITAL LETTER L WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA7 - 0xA0] - = make_char (0x00A7) /* SECTION SIGN */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA8 - 0xA0] - = make_char (0x00A8) /* DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xA9 - 0xA0] - = make_char (0x0160) /* LATIN CAPITAL LETTER S WITH CARON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xAA - 0xA0] - = make_char (0x0112) /* LATIN CAPITAL LETTER E WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xAB - 0xA0] - = make_char (0x0122) /* LATIN CAPITAL LETTER G WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xAC - 0xA0] - = make_char (0x0166) /* LATIN CAPITAL LETTER T WITH STROKE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xAD - 0xA0] - = make_char (0x00AD) /* SOFT HYPHEN */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xAE - 0xA0] - = make_char (0x017D) /* LATIN CAPITAL LETTER Z WITH CARON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xAF - 0xA0] - = make_char (0x00AF) /* MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB0 - 0xA0] - = make_char (0x00B0) /* DEGREE SIGN */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB1 - 0xA0] - = make_char (0x0105) /* LATIN SMALL LETTER A WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB2 - 0xA0] - = make_char (0x02DB) /* OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB3 - 0xA0] - = make_char (0x0157) /* LATIN SMALL LETTER R WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB4 - 0xA0] - = make_char (0x00B4) /* ACUTE ACCENT */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB5 - 0xA0] - = make_char (0x0129) /* LATIN SMALL LETTER I WITH TILDE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB6 - 0xA0] - = make_char (0x013C) /* LATIN SMALL LETTER L WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB7 - 0xA0] - = make_char (0x02C7) /* CARON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB8 - 0xA0] - = make_char (0x00B8) /* CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xB9 - 0xA0] - = make_char (0x0161) /* LATIN SMALL LETTER S WITH CARON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xBA - 0xA0] - = make_char (0x0113) /* LATIN SMALL LETTER E WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xBB - 0xA0] - = make_char (0x0123) /* LATIN SMALL LETTER G WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xBC - 0xA0] - = make_char (0x0167) /* LATIN SMALL LETTER T WITH STROKE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xBD - 0xA0] - = make_char (0x014A) /* LATIN CAPITAL LETTER ENG */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xBE - 0xA0] - = make_char (0x017E) /* LATIN SMALL LETTER Z WITH CARON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xBF - 0xA0] - = make_char (0x014B) /* LATIN SMALL LETTER ENG */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC0 - 0xA0] - = make_char (0x0100) /* LATIN CAPITAL LETTER A WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC1 - 0xA0] - = make_char (0x00C1) /* LATIN CAPITAL LETTER A WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC2 - 0xA0] - = make_char (0x00C2) /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC3 - 0xA0] - = make_char (0x00C3) /* LATIN CAPITAL LETTER A WITH TILDE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC4 - 0xA0] - = make_char (0x00C4) /* LATIN CAPITAL LETTER A WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC5 - 0xA0] - = make_char (0x00C5) /* LATIN CAPITAL LETTER A WITH RING ABOVE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC6 - 0xA0] - = make_char (0x00C6) /* LATIN CAPITAL LETTER AE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC7 - 0xA0] - = make_char (0x012E) /* LATIN CAPITAL LETTER I WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC8 - 0xA0] - = make_char (0x010C) /* LATIN CAPITAL LETTER C WITH CARON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xC9 - 0xA0] - = make_char (0x00C9) /* LATIN CAPITAL LETTER E WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xCA - 0xA0] - = make_char (0x0118) /* LATIN CAPITAL LETTER E WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xCB - 0xA0] - = make_char (0x00CB) /* LATIN CAPITAL LETTER E WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xCC - 0xA0] - = make_char (0x0116) /* LATIN CAPITAL LETTER E WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xCD - 0xA0] - = make_char (0x00CD) /* LATIN CAPITAL LETTER I WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xCE - 0xA0] - = make_char (0x00CE) /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xCF - 0xA0] - = make_char (0x012A) /* LATIN CAPITAL LETTER I WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD0 - 0xA0] - = make_char (0x0110) /* LATIN CAPITAL LETTER D WITH STROKE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD1 - 0xA0] - = make_char (0x0145) /* LATIN CAPITAL LETTER N WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD2 - 0xA0] - = make_char (0x014C) /* LATIN CAPITAL LETTER O WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD3 - 0xA0] - = make_char (0x0136) /* LATIN CAPITAL LETTER K WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD4 - 0xA0] - = make_char (0x00D4) /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD5 - 0xA0] - = make_char (0x00D5) /* LATIN CAPITAL LETTER O WITH TILDE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD6 - 0xA0] - = make_char (0x00D6) /* LATIN CAPITAL LETTER O WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD7 - 0xA0] - = make_char (0x00D7) /* MULTIPLICATION SIGN */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD8 - 0xA0] - = make_char (0x00D8) /* LATIN CAPITAL LETTER O WITH STROKE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xD9 - 0xA0] - = make_char (0x0172) /* LATIN CAPITAL LETTER U WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xDA - 0xA0] - = make_char (0x00DA) /* LATIN CAPITAL LETTER U WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xDB - 0xA0] - = make_char (0x00DB) /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xDC - 0xA0] - = make_char (0x00DC) /* LATIN CAPITAL LETTER U WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xDD - 0xA0] - = make_char (0x0168) /* LATIN CAPITAL LETTER U WITH TILDE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xDE - 0xA0] - = make_char (0x016A) /* LATIN CAPITAL LETTER U WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xDF - 0xA0] - = make_char (0x00DF) /* LATIN SMALL LETTER SHARP S */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE0 - 0xA0] - = make_char (0x0101) /* LATIN SMALL LETTER A WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE1 - 0xA0] - = make_char (0x00E1) /* LATIN SMALL LETTER A WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE2 - 0xA0] - = make_char (0x00E2) /* LATIN SMALL LETTER A WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE3 - 0xA0] - = make_char (0x00E3) /* LATIN SMALL LETTER A WITH TILDE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE4 - 0xA0] - = make_char (0x00E4) /* LATIN SMALL LETTER A WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE5 - 0xA0] - = make_char (0x00E5) /* LATIN SMALL LETTER A WITH RING ABOVE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE6 - 0xA0] - = make_char (0x00E6) /* LATIN SMALL LETTER AE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE7 - 0xA0] - = make_char (0x012F) /* LATIN SMALL LETTER I WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE8 - 0xA0] - = make_char (0x010D) /* LATIN SMALL LETTER C WITH CARON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xE9 - 0xA0] - = make_char (0x00E9) /* LATIN SMALL LETTER E WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xEA - 0xA0] - = make_char (0x0119) /* LATIN SMALL LETTER E WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xEB - 0xA0] - = make_char (0x00EB) /* LATIN SMALL LETTER E WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xEC - 0xA0] - = make_char (0x0117) /* LATIN SMALL LETTER E WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xED - 0xA0] - = make_char (0x00ED) /* LATIN SMALL LETTER I WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xEE - 0xA0] - = make_char (0x00EE) /* LATIN SMALL LETTER I WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xEF - 0xA0] - = make_char (0x012B) /* LATIN SMALL LETTER I WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF0 - 0xA0] - = make_char (0x0111) /* LATIN SMALL LETTER D WITH STROKE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF1 - 0xA0] - = make_char (0x0146) /* LATIN SMALL LETTER N WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF2 - 0xA0] - = make_char (0x014D) /* LATIN SMALL LETTER O WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF3 - 0xA0] - = make_char (0x0137) /* LATIN SMALL LETTER K WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF4 - 0xA0] - = make_char (0x00F4) /* LATIN SMALL LETTER O WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF5 - 0xA0] - = make_char (0x00F5) /* LATIN SMALL LETTER O WITH TILDE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF6 - 0xA0] - = make_char (0x00F6) /* LATIN SMALL LETTER O WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF7 - 0xA0] - = make_char (0x00F7) /* DIVISION SIGN */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF8 - 0xA0] - = make_char (0x00F8) /* LATIN SMALL LETTER O WITH STROKE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xF9 - 0xA0] - = make_char (0x0173) /* LATIN SMALL LETTER U WITH OGONEK */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xFA - 0xA0] - = make_char (0x00FA) /* LATIN SMALL LETTER U WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xFB - 0xA0] - = make_char (0x00FB) /* LATIN SMALL LETTER U WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xFC - 0xA0] - = make_char (0x00FC) /* LATIN SMALL LETTER U WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xFD - 0xA0] - = make_char (0x0169) /* LATIN SMALL LETTER U WITH TILDE */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xFE - 0xA0] - = make_char (0x016B) /* LATIN SMALL LETTER U WITH MACRON */; - XVECTOR_DATA(latin_iso8859_4_to_ucs)[0xFF - 0xA0] - = make_char (0x02D9) /* DOT ABOVE */; - - staticpro (&latin_iso8859_9_to_ucs); - latin_iso8859_9_to_ucs = make_vector (96, Qnil); - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA0 - 0xA0] - = make_char (0x00A0) /* NO-BREAK SPACE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA1 - 0xA0] - = make_char (0x00A1) /* INVERTED EXCLAMATION MARK */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA2 - 0xA0] - = make_char (0x00A2) /* CENT SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA3 - 0xA0] - = make_char (0x00A3) /* POUND SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA4 - 0xA0] - = make_char (0x00A4) /* CURRENCY SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA5 - 0xA0] - = make_char (0x00A5) /* YEN SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA6 - 0xA0] - = make_char (0x00A6) /* BROKEN BAR */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA7 - 0xA0] - = make_char (0x00A7) /* SECTION SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA8 - 0xA0] - = make_char (0x00A8) /* DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xA9 - 0xA0] - = make_char (0x00A9) /* COPYRIGHT SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xAA - 0xA0] - = make_char (0x00AA) /* FEMININE ORDINAL INDICATOR */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xAB - 0xA0] - = make_char (0x00AB) /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xAC - 0xA0] - = make_char (0x00AC) /* NOT SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xAD - 0xA0] - = make_char (0x00AD) /* SOFT HYPHEN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xAE - 0xA0] - = make_char (0x00AE) /* REGISTERED SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xAF - 0xA0] - = make_char (0x00AF) /* MACRON */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB0 - 0xA0] - = make_char (0x00B0) /* DEGREE SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB1 - 0xA0] - = make_char (0x00B1) /* PLUS-MINUS SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB2 - 0xA0] - = make_char (0x00B2) /* SUPERSCRIPT TWO */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB3 - 0xA0] - = make_char (0x00B3) /* SUPERSCRIPT THREE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB4 - 0xA0] - = make_char (0x00B4) /* ACUTE ACCENT */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB5 - 0xA0] - = make_char (0x00B5) /* MICRO SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB6 - 0xA0] - = make_char (0x00B6) /* PILCROW SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB7 - 0xA0] - = make_char (0x00B7) /* MIDDLE DOT */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB8 - 0xA0] - = make_char (0x00B8) /* CEDILLA */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xB9 - 0xA0] - = make_char (0x00B9) /* SUPERSCRIPT ONE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xBA - 0xA0] - = make_char (0x00BA) /* MASCULINE ORDINAL INDICATOR */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xBB - 0xA0] - = make_char (0x00BB) /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xBC - 0xA0] - = make_char (0x00BC) /* VULGAR FRACTION ONE QUARTER */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xBD - 0xA0] - = make_char (0x00BD) /* VULGAR FRACTION ONE HALF */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xBE - 0xA0] - = make_char (0x00BE) /* VULGAR FRACTION THREE QUARTERS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xBF - 0xA0] - = make_char (0x00BF) /* INVERTED QUESTION MARK */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC0 - 0xA0] - = make_char (0x00C0) /* LATIN CAPITAL LETTER A WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC1 - 0xA0] - = make_char (0x00C1) /* LATIN CAPITAL LETTER A WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC2 - 0xA0] - = make_char (0x00C2) /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC3 - 0xA0] - = make_char (0x00C3) /* LATIN CAPITAL LETTER A WITH TILDE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC4 - 0xA0] - = make_char (0x00C4) /* LATIN CAPITAL LETTER A WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC5 - 0xA0] - = make_char (0x00C5) /* LATIN CAPITAL LETTER A WITH RING ABOVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC6 - 0xA0] - = make_char (0x00C6) /* LATIN CAPITAL LETTER AE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC7 - 0xA0] - = make_char (0x00C7) /* LATIN CAPITAL LETTER C WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC8 - 0xA0] - = make_char (0x00C8) /* LATIN CAPITAL LETTER E WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xC9 - 0xA0] - = make_char (0x00C9) /* LATIN CAPITAL LETTER E WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xCA - 0xA0] - = make_char (0x00CA) /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xCB - 0xA0] - = make_char (0x00CB) /* LATIN CAPITAL LETTER E WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xCC - 0xA0] - = make_char (0x00CC) /* LATIN CAPITAL LETTER I WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xCD - 0xA0] - = make_char (0x00CD) /* LATIN CAPITAL LETTER I WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xCE - 0xA0] - = make_char (0x00CE) /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xCF - 0xA0] - = make_char (0x00CF) /* LATIN CAPITAL LETTER I WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD0 - 0xA0] - = make_char (0x011E) /* LATIN CAPITAL LETTER G WITH BREVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD1 - 0xA0] - = make_char (0x00D1) /* LATIN CAPITAL LETTER N WITH TILDE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD2 - 0xA0] - = make_char (0x00D2) /* LATIN CAPITAL LETTER O WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD3 - 0xA0] - = make_char (0x00D3) /* LATIN CAPITAL LETTER O WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD4 - 0xA0] - = make_char (0x00D4) /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD5 - 0xA0] - = make_char (0x00D5) /* LATIN CAPITAL LETTER O WITH TILDE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD6 - 0xA0] - = make_char (0x00D6) /* LATIN CAPITAL LETTER O WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD7 - 0xA0] - = make_char (0x00D7) /* MULTIPLICATION SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD8 - 0xA0] - = make_char (0x00D8) /* LATIN CAPITAL LETTER O WITH STROKE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xD9 - 0xA0] - = make_char (0x00D9) /* LATIN CAPITAL LETTER U WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xDA - 0xA0] - = make_char (0x00DA) /* LATIN CAPITAL LETTER U WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xDB - 0xA0] - = make_char (0x00DB) /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xDC - 0xA0] - = make_char (0x00DC) /* LATIN CAPITAL LETTER U WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xDD - 0xA0] - = make_char (0x0130) /* LATIN CAPITAL LETTER I WITH DOT ABOVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xDE - 0xA0] - = make_char (0x015E) /* LATIN CAPITAL LETTER S WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xDF - 0xA0] - = make_char (0x00DF) /* LATIN SMALL LETTER SHARP S */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE0 - 0xA0] - = make_char (0x00E0) /* LATIN SMALL LETTER A WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE1 - 0xA0] - = make_char (0x00E1) /* LATIN SMALL LETTER A WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE2 - 0xA0] - = make_char (0x00E2) /* LATIN SMALL LETTER A WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE3 - 0xA0] - = make_char (0x00E3) /* LATIN SMALL LETTER A WITH TILDE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE4 - 0xA0] - = make_char (0x00E4) /* LATIN SMALL LETTER A WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE5 - 0xA0] - = make_char (0x00E5) /* LATIN SMALL LETTER A WITH RING ABOVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE6 - 0xA0] - = make_char (0x00E6) /* LATIN SMALL LETTER AE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE7 - 0xA0] - = make_char (0x00E7) /* LATIN SMALL LETTER C WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE8 - 0xA0] - = make_char (0x00E8) /* LATIN SMALL LETTER E WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xE9 - 0xA0] - = make_char (0x00E9) /* LATIN SMALL LETTER E WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xEA - 0xA0] - = make_char (0x00EA) /* LATIN SMALL LETTER E WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xEB - 0xA0] - = make_char (0x00EB) /* LATIN SMALL LETTER E WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xEC - 0xA0] - = make_char (0x00EC) /* LATIN SMALL LETTER I WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xED - 0xA0] - = make_char (0x00ED) /* LATIN SMALL LETTER I WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xEE - 0xA0] - = make_char (0x00EE) /* LATIN SMALL LETTER I WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xEF - 0xA0] - = make_char (0x00EF) /* LATIN SMALL LETTER I WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF0 - 0xA0] - = make_char (0x011F) /* LATIN SMALL LETTER G WITH BREVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF1 - 0xA0] - = make_char (0x00F1) /* LATIN SMALL LETTER N WITH TILDE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF2 - 0xA0] - = make_char (0x00F2) /* LATIN SMALL LETTER O WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF3 - 0xA0] - = make_char (0x00F3) /* LATIN SMALL LETTER O WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF4 - 0xA0] - = make_char (0x00F4) /* LATIN SMALL LETTER O WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF5 - 0xA0] - = make_char (0x00F5) /* LATIN SMALL LETTER O WITH TILDE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF6 - 0xA0] - = make_char (0x00F6) /* LATIN SMALL LETTER O WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF7 - 0xA0] - = make_char (0x00F7) /* DIVISION SIGN */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF8 - 0xA0] - = make_char (0x00F8) /* LATIN SMALL LETTER O WITH STROKE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xF9 - 0xA0] - = make_char (0x00F9) /* LATIN SMALL LETTER U WITH GRAVE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xFA - 0xA0] - = make_char (0x00FA) /* LATIN SMALL LETTER U WITH ACUTE */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xFB - 0xA0] - = make_char (0x00FB) /* LATIN SMALL LETTER U WITH CIRCUMFLEX */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xFC - 0xA0] - = make_char (0x00FC) /* LATIN SMALL LETTER U WITH DIAERESIS */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xFD - 0xA0] - = make_char (0x0131) /* LATIN SMALL LETTER DOTLESS I */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xFE - 0xA0] - = make_char (0x015F) /* LATIN SMALL LETTER S WITH CEDILLA */; - XVECTOR_DATA(latin_iso8859_9_to_ucs)[0xFF - 0xA0] - = make_char (0x00FF) /* LATIN SMALL LETTER Y WITH DIAERESIS */; - - staticpro (&latin_viscii_lower_to_ucs); - latin_viscii_lower_to_ucs = make_vector (96, Qnil); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x20 - 32] - = make_char (CHAR96('1', 0x20)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x21 - 32] = make_char (0x1eaf); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x22 - 32] = make_char (0x1eb1); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x23 - 32] = make_char (0x1eb7); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x24 - 32] = make_char (0x1ea5); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x25 - 32] = make_char (0x1ea7); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x26 - 32] = make_char (0x1ea9); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x27 - 32] = make_char (0x1ead); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x28 - 32] = make_char (0x1ebd); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x29 - 32] = make_char (0x1eb9); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x2a - 32] = make_char (0x1ebf); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x2b - 32] = make_char (0x1ec1); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x2c - 32] = make_char (0x1ec3); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x2d - 32] = make_char (0x1ec5); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x2e - 32] = make_char (0x1ec7); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x2f - 32] = make_char (0x1ed1); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x30 - 32] = make_char (0x1ed3); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x31 - 32] = make_char (0x1ed5); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x32 - 32] = make_char (0x1ed7); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x33 - 32] - = make_char (CHAR96('1', 0x33)); */ - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x34 - 32] - = make_char (CHAR96('1', 0x34)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x35 - 32] = make_char (0x1ed9); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x36 - 32] = make_char (0x1edd); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x37 - 32] = make_char (0x1edf); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x38 - 32] = make_char (0x1ecb); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x39 - 32] - = make_char (CHAR96('1', 0x39)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x3A - 32] - = make_char (CHAR96('1', 0x3A)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x3B - 32] - = make_char (CHAR96('1', 0x3B)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x3C - 32] - = make_char (CHAR96('1', 0x3C)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x3d - 32] = make_char (0x01a1); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x3e - 32] = make_char (0x1edb); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x3F - 32] - = make_char (CHAR96('1', 0x3F)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x40 - 32] - = make_char (CHAR96('1', 0x40)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x41 - 32] - = make_char (CHAR96('1', 0x41)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x42 - 32] - = make_char (CHAR96('1', 0x42)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x43 - 32] - = make_char (CHAR96('1', 0x43)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x44 - 32] - = make_char (CHAR96('1', 0x44)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x45 - 32] - = make_char (CHAR96('1', 0x45)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x46 - 32] = make_char (0x1eb3); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x47 - 32] = make_char (0x1eb5); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x48 - 32] - = make_char (CHAR96('1', 0x48)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x49 - 32] - = make_char (CHAR96('1', 0x49)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x4A - 32] - = make_char (CHAR96('1', 0x4A)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x4B - 32] - = make_char (CHAR96('1', 0x4B)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x4C - 32] - = make_char (CHAR96('1', 0x4C)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x4D - 32] - = make_char (CHAR96('1', 0x4D)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x4E - 32] - = make_char (CHAR96('1', 0x4E)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x4f - 32] = make_char (0x1ef3); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x50 - 32] - = make_char (CHAR96('1', 0x50)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x51 - 32] = make_char (0x1ee9); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x52 - 32] - = make_char (CHAR96('1', 0x52)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x53 - 32] - = make_char (CHAR96('1', 0x53)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x54 - 32] - = make_char (CHAR96('1', 0x54)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x55 - 32] = make_char (0x1ea1); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x56 - 32] = make_char (0x1ef7); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x57 - 32] = make_char (0x1eeb); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x58 - 32] = make_char (0x1eed); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x59 - 32] - = make_char (CHAR96('1', 0x59)); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x5A - 32] - = make_char (CHAR96('1', 0x5A)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x5b - 32] = make_char (0x1ef9); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x5c - 32] = make_char (0x1ef5); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x5D - 32] - = make_char (CHAR96('1', 0x5D)); */ - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x5e - 32] = make_char (0x1ee1); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x5f - 32] = make_char (0x01b0); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x60 - 32] = make_char (0x00e0); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x61 - 32] = make_char (0x00e1); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x62 - 32] = make_char (0x00e2); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x63 - 32] = make_char (0x00e3); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x64 - 32] = make_char (0x1ea3); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x65 - 32] = make_char (0x0103); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x66 - 32] = make_char (0x1eef); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x67 - 32] = make_char (0x1eab); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x68 - 32] = make_char (0x00e8); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x69 - 32] = make_char (0x00e9); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x6a - 32] = make_char (0x00ea); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x6b - 32] = make_char (0x1ebb); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x6c - 32] = make_char (0x00ec); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x6d - 32] = make_char (0x00ed); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x6e - 32] = make_char (0x0129); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x6f - 32] = make_char (0x1ec9); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x70 - 32] = make_char (0x0111); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x71 - 32] = make_char (0x1ef1); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x72 - 32] = make_char (0x00f2); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x73 - 32] = make_char (0x00f3); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x74 - 32] = make_char (0x00f4); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x75 - 32] = make_char (0x00f5); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x76 - 32] = make_char (0x1ecf); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x77 - 32] = make_char (0x1ecd); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x78 - 32] = make_char (0x1ee5); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x79 - 32] = make_char (0x00f9); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x7a - 32] = make_char (0x00fa); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x7b - 32] = make_char (0x0169); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x7c - 32] = make_char (0x1ee7); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x7d - 32] = make_char (0x00fd); - XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x7e - 32] = make_char (0x1ee3); - /* XVECTOR_DATA(latin_viscii_lower_to_ucs)[0x7F - 32] - = make_char (CHAR96('1', 0x7F)); */ - - staticpro (&latin_viscii_upper_to_ucs); - latin_viscii_upper_to_ucs = make_vector (96, Qnil); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x20 - 32] - = make_char (CHAR96('2', 0x20)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x21 - 32] = make_char (0x1eae); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x22 - 32] = make_char (0x1eb0); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x23 - 32] = make_char (0x1eb6); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x24 - 32] = make_char (0x1ea4); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x25 - 32] = make_char (0x1ea6); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x26 - 32] = make_char (0x1ea8); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x27 - 32] = make_char (0x1eac); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x28 - 32] = make_char (0x1ebc); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x29 - 32] = make_char (0x1eb8); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x2a - 32] = make_char (0x1ebe); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x2b - 32] = make_char (0x1ec0); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x2c - 32] = make_char (0x1ec2); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x2d - 32] = make_char (0x1ec4); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x2e - 32] = make_char (0x1ec6); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x2f - 32] = make_char (0x1ed0); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x30 - 32] = make_char (0x1ed2); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x31 - 32] = make_char (0x1ed4); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x32 - 32] = make_char (0x1ed6); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x33 - 32] - = make_char (CHAR96('2', 0x33)); */ - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x34 - 32] - = make_char (CHAR96('2', 0x34)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x35 - 32] = make_char (0x1ed8); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x36 - 32] = make_char (0x1edc); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x37 - 32] = make_char (0x1ede); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x38 - 32] = make_char (0x1eca); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x39 - 32] - = make_char (CHAR96('2', 0x39)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x3a - 32] - = make_char (CHAR96('2', 0x3a)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x3b - 32] - = make_char (CHAR96('2', 0x3b)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x3c - 32] - = make_char (CHAR96('2', 0x3c)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x3d - 32] = make_char (0x01a0); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x3e - 32] = make_char (0x1eda); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x3f - 32] - = make_char (CHAR96('2', 0x3f)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x40 - 32] - = make_char (CHAR96('2', 0x40)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x41 - 32] - = make_char (CHAR96('2', 0x41)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x42 - 32] - = make_char (CHAR96('2', 0x42)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x43 - 32] - = make_char (CHAR96('2', 0x43)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x44 - 32] - = make_char (CHAR96('2', 0x44)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x45 - 32] - = make_char (CHAR96('2', 0x45)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x46 - 32] = make_char (0x1eb2); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x47 - 32] = make_char (0x1eb4); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x48 - 32] - = make_char (CHAR96('2', 0x48)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x49 - 32] - = make_char (CHAR96('2', 0x49)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x4a - 32] - = make_char (CHAR96('2', 0x4a)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x4b - 32] - = make_char (CHAR96('2', 0x4b)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x4c - 32] - = make_char (CHAR96('2', 0x4c)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x4d - 32] - = make_char (CHAR96('2', 0x4d)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x4e - 32] - = make_char (CHAR96('2', 0x4e)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x4f - 32] = make_char (0x1ef2); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x50 - 32] - = make_char (CHAR96('2', 0x50)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x51 - 32] = make_char (0x1ee8); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x52 - 32] - = make_char (CHAR96('2', 0x52)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x53 - 32] - = make_char (CHAR96('2', 0x53)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x54 - 32] - = make_char (CHAR96('2', 0x54)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x55 - 32] = make_char (0x1ea0); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x56 - 32] = make_char (0x1ef6); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x57 - 32] = make_char (0x1eea); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x58 - 32] = make_char (0x1eec); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x59 - 32] - = make_char (CHAR96('2', 0x59)); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x5a - 32] - = make_char (CHAR96('2', 0x5a)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x5b - 32] = make_char (0x1ef8); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x5c - 32] = make_char (0x1ef4); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x5d - 32] - = make_char (CHAR96('2', 0x5d)); */ - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x5e - 32] = make_char (0x1ee0); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x5f - 32] = make_char (0x01af); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x60 - 32] = make_char (0x00c0); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x61 - 32] = make_char (0x00c1); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x62 - 32] = make_char (0x00c2); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x63 - 32] = make_char (0x00c3); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x64 - 32] = make_char (0x1ea2); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x65 - 32] = make_char (0x0102); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x66 - 32] = make_char (0x1eee); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x67 - 32] = make_char (0x1eaa); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x68 - 32] = make_char (0x00c8); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x69 - 32] = make_char (0x00c9); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x6a - 32] = make_char (0x00ca); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x6b - 32] = make_char (0x1eba); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x6c - 32] = make_char (0x00cc); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x6d - 32] = make_char (0x00cd); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x6e - 32] = make_char (0x0128); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x6f - 32] = make_char (0x1ec8); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x70 - 32] = make_char (0x0110); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x71 - 32] = make_char (0x1ef0); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x72 - 32] = make_char (0x00d2); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x73 - 32] = make_char (0x00d3); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x74 - 32] = make_char (0x00d4); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x75 - 32] = make_char (0x00d5); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x76 - 32] = make_char (0x1ece); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x77 - 32] = make_char (0x1ecc); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x78 - 32] = make_char (0x1ee4); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x79 - 32] = make_char (0x00d9); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x7a - 32] = make_char (0x00da); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x7b - 32] = make_char (0x0168); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x7c - 32] = make_char (0x1ee6); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x7d - 32] = make_char (0x00dd); - XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x7e - 32] = make_char (0x1ee2); - /* XVECTOR_DATA(latin_viscii_upper_to_ucs)[0x7f - 32] - = make_char (CHAR96('2', 0x7f)); */ - Vcharset_ucs_bmp = make_charset (LEADING_BYTE_UCS_BMP, Qucs_bmp, - CHARSET_TYPE_256X256, 1, 0, 0, + CHARSET_TYPE_256X256, 1, 2, 0, CHARSET_LEFT_TO_RIGHT, build_string ("BMP"), build_string ("BMP"), - build_string ("BMP"), - build_string (""), + build_string ("ISO/IEC 10646 Group 0 Plane 0 (BMP)"), + build_string ("\\(ISO10646.*-1\\|UNICODE[23]?-0\\)"), Qnil, 0, 0xFFFF, 0, 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 @@ -3256,7 +2649,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, 0, 0, 0, 32); + Qnil, 0, 0, 0, 32); Vcharset_latin_iso8859_3 = make_charset (LEADING_BYTE_LATIN_ISO8859_3, Qlatin_iso8859_3, CHARSET_TYPE_96, 1, 1, 'C', @@ -3265,7 +2658,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, 0, 0, 0, 32); + Qnil, 0, 0, 0, 32); Vcharset_latin_iso8859_4 = make_charset (LEADING_BYTE_LATIN_ISO8859_4, Qlatin_iso8859_4, CHARSET_TYPE_96, 1, 1, 'D', @@ -3274,7 +2667,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, 0, 0, 0, 32); + Qnil, 0, 0, 0, 32); Vcharset_thai_tis620 = make_charset (LEADING_BYTE_THAI_TIS620, Qthai_tis620, CHARSET_TYPE_96, 1, 1, 'T', @@ -3330,7 +2723,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, 0, 0, 0, 33); + Qnil, 0, 0, 0, 33); Vcharset_cyrillic_iso8859_5 = make_charset (LEADING_BYTE_CYRILLIC_ISO8859_5, Qcyrillic_iso8859_5, CHARSET_TYPE_96, 1, 1, 'L', @@ -3348,7 +2741,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, 0, 0, 0, 32); + Qnil, 0, 0, 0, 32); Vcharset_japanese_jisx0208_1978 = make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, Qjapanese_jisx0208_1978, CHARSET_TYPE_94X94, 2, 0, '@', @@ -3425,8 +2818,8 @@ complex_vars_of_mule_charset (void) build_string ("VISCII lower"), build_string ("VISCII lower (Vietnamese)"), build_string ("VISCII lower (Vietnamese)"), - build_string ("VISCII1\\.1"), - latin_viscii_lower_to_ucs, 0, 0, 0, 32); + build_string ("MULEVISCII-LOWER"), + Qnil, 0, 0, 0, 32); Vcharset_latin_viscii_upper = make_charset (LEADING_BYTE_LATIN_VISCII_UPPER, Qlatin_viscii_upper, CHARSET_TYPE_96, 1, 1, '2', @@ -3434,8 +2827,26 @@ complex_vars_of_mule_charset (void) build_string ("VISCII upper"), build_string ("VISCII upper (Vietnamese)"), build_string ("VISCII upper (Vietnamese)"), + build_string ("MULEVISCII-UPPER"), + Qnil, 0, 0, 0, 32); + Vcharset_latin_viscii = + make_charset (LEADING_BYTE_LATIN_VISCII, Qlatin_viscii, + CHARSET_TYPE_256, 1, 2, 0, + CHARSET_LEFT_TO_RIGHT, + build_string ("VISCII"), + build_string ("VISCII 1.1 (Vietnamese)"), + build_string ("VISCII 1.1 (Vietnamese)"), build_string ("VISCII1\\.1"), - latin_viscii_upper_to_ucs, 0, 0, 0, 32); + Qnil, 0, 0, 0, 0); + Vcharset_ethiopic_ucs = + make_charset (LEADING_BYTE_ETHIOPIC_UCS, Qethiopic_ucs, + CHARSET_TYPE_256X256, 2, 2, 0, + CHARSET_LEFT_TO_RIGHT, + build_string ("Ethiopic (UCS)"), + build_string ("Ethiopic (UCS)"), + build_string ("Ethiopic of UCS"), + build_string ("Ethiopic-Unicode"), + Qnil, 0x1200, 0x137F, 0x1200, 0); Vcharset_hiragana_jisx0208 = make_charset (LEADING_BYTE_HIRAGANA_JISX0208, Qhiragana_jisx0208, CHARSET_TYPE_94X94, 2, 0, 'B',