X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-charset.c;h=d3c9fd423b0586816f4e41f089858f023009e7ca;hb=72321376c53ccddd182d9e94fafd1ae1e6f98921;hp=6494259e1ba12f59ec2c733d3d23bb3e6bce2f31;hpb=ba7145fab6cd42b144547faa9aa18b311c73da19;p=chise%2Fxemacs-chise.git diff --git a/src/mule-charset.c b/src/mule-charset.c index 6494259..d3c9fd4 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -59,6 +59,7 @@ 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_hiragana_jisx0208; @@ -124,77 +125,498 @@ 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; } -#define destroy_byte_from_character_table(table) xfree(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; +} -void -put_byte_from_character_table (Emchar ch, unsigned char val, - Emchar_to_byte_table* table) +static unsigned long +char_byte_table_hash (Lisp_Object obj, int depth) +{ + 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) { - if (table->base == NULL) + 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) +{ + struct Lisp_Char_Byte_Table* cpt + = XCHAR_BYTE_TABLE (XCHAR_CODE_TABLE (table)->table); + Lisp_Object ret = cpt->property [ch >> 24]; + + if (CHAR_BYTE_TABLE_P (ret)) + cpt = XCHAR_BYTE_TABLE (ret); else - { - int i = ch - table->offset; + return ret; + + ret = cpt->property [(unsigned char) (ch >> 16)]; + if (CHAR_BYTE_TABLE_P (ret)) + cpt = XCHAR_BYTE_TABLE (ret); + else + return ret; + + ret = cpt->property [(unsigned char) (ch >> 8)]; + if (CHAR_BYTE_TABLE_P (ret)) + cpt = XCHAR_BYTE_TABLE (ret); + else + return ret; + + return cpt->property [(unsigned char) ch]; +} + +void +put_char_code_table (Emchar ch, Lisp_Object value, Lisp_Object table) +{ + struct Lisp_Char_Byte_Table* cpt1 + = XCHAR_BYTE_TABLE (XCHAR_CODE_TABLE (table)->table); + Lisp_Object ret = cpt1->property[ch >> 24]; - if (i < 0) + if (CHAR_BYTE_TABLE_P (ret)) + { + struct Lisp_Char_Byte_Table* cpt2 = XCHAR_BYTE_TABLE (ret); + + ret = cpt2->property[(unsigned char)(ch >> 16)]; + if (CHAR_BYTE_TABLE_P (ret)) + { + struct Lisp_Char_Byte_Table* cpt3 = XCHAR_BYTE_TABLE (ret); + + ret = cpt3->property[(unsigned char)(ch >> 8)]; + if (CHAR_BYTE_TABLE_P (ret)) + { + struct Lisp_Char_Byte_Table* cpt4 + = XCHAR_BYTE_TABLE (ret); + + cpt4->property[(unsigned char)ch] = value; + } + else if (!EQ (ret, value)) + { + Lisp_Object cpt4 = make_char_byte_table (ret); + + XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)ch] = value; + cpt3->property[(unsigned char)(ch >> 8)] = cpt4; + } + } + else if (!EQ (ret, value)) { - 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; + Lisp_Object cpt3 = make_char_byte_table (ret); + Lisp_Object cpt4 = make_char_byte_table (ret); + + XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)ch] = value; + XCHAR_BYTE_TABLE(cpt3)->property[(unsigned char)(ch >> 8)] + = cpt4; + cpt2->property[(unsigned char)(ch >> 16)] = cpt3; } - else if (i >= table->size) + } + else if (!EQ (ret, value)) + { + 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)ch] = value; + XCHAR_BYTE_TABLE(cpt3)->property[(unsigned char)(ch >> 8)] = cpt4; + XCHAR_BYTE_TABLE(cpt2)->property[(unsigned char)(ch >> 16)] = cpt3; + cpt1->property[(unsigned char)(ch >> 24)] = cpt2; + } +} + + +Lisp_Object Vcharacter_attribute_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) - 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; } + 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)); + setup_attributes: + rest = attributes; + while (CONSP (rest)) + { + Lisp_Object cell = Fcar (rest); + + 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 @@ -235,8 +657,11 @@ Lisp_Object Qascii, Qchinese_cns11643_2, #ifdef UTF2000 Qucs_bmp, + Qlatin_viscii, Qlatin_viscii_lower, Qlatin_viscii_upper, + Qvietnamese_viscii_lower, + Qvietnamese_viscii_upper, Qhiragana_jisx0208, Qkatakana_jisx0208, #endif @@ -248,8 +673,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. @@ -611,7 +1040,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; } @@ -651,6 +1082,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 } }; @@ -658,6 +1092,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 @@ -689,91 +1124,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 } @@ -824,6 +1215,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) @@ -838,6 +1235,7 @@ get_unallocated_leading_byte (int dimension) else lb = next_allocated_2_byte_leading_byte++; } +#endif if (!lb) signal_simple_error @@ -848,30 +1246,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) @@ -881,17 +1296,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) { @@ -901,7 +1316,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) { @@ -909,50 +1325,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; @@ -1104,6 +1593,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)) @@ -1155,7 +1645,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); } @@ -1210,45 +1704,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 (""); @@ -1264,10 +1720,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; @@ -1322,7 +1789,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 ); @@ -1332,6 +1799,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, @@ -1538,114 +2015,77 @@ Set mapping-table of CHARSET to TABLE. (charset, table)) { struct Lisp_Charset *cs; - Emchar_to_byte_table* old_byte1_table; - Emchar_to_byte_table* old_byte2_table; + Lisp_Object old_table; + size_t i; charset = Fget_charset (charset); - CHECK_VECTOR (table); - cs = XCHARSET (charset); - CHARSET_DECODING_TABLE(cs) = table; - old_byte1_table = CHARSET_TO_BYTE1_TABLE(cs); - old_byte2_table = CHARSET_TO_BYTE2_TABLE(cs); - switch (CHARSET_TYPE (cs)) + + if (EQ (table, Qnil)) { - case CHARSET_TYPE_94: - if (!EQ (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(table)[i]; + CHARSET_DECODING_TABLE(cs) = table; + return table; + } + else if (VECTORP (table)) + { + if (XVECTOR_LENGTH (table) > CHARSET_CHARS (cs)) + 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); */ - 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; - break; - case CHARSET_TYPE_96: - if (!EQ (table, Qnil)) + switch (CHARSET_DIMENSION (cs)) + { + case 1: + for (i = 0; i < XVECTOR_LENGTH (table); i++) { - size_t i; - CHARSET_TO_BYTE1_TABLE(cs) = make_byte_from_character_table(); - for (i = 0; i < 96; i++) - { - Lisp_Object c = XVECTOR_DATA(table)[i]; + Lisp_Object c = XVECTOR_DATA(table)[i]; - if (!EQ (c, Qnil)) - put_byte_from_character_table (XCHAR (c), i + 32, - CHARSET_TO_BYTE1_TABLE(cs)); - } + if (CHARP (c)) + put_char_attribute + (c, charset, + list1 (make_int (i + CHARSET_BYTE_OFFSET (cs)))); } - else - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; break; - case CHARSET_TYPE_94X94: - if (!EQ (table, Qnil)) + case 2: + for (i = 0; i < XVECTOR_LENGTH (table); i++) { - size_t i; + Lisp_Object v = XVECTOR_DATA(table)[i]; - CHARSET_TO_BYTE1_TABLE(cs) = make_byte_from_character_table(); - CHARSET_TO_BYTE2_TABLE(cs) = make_byte_from_character_table(); - for (i = 0; i < XVECTOR_LENGTH (table); i++) + if (VECTORP (v)) { - Lisp_Object v = XVECTOR_DATA(table)[i]; + size_t j; - if (VECTORP (v)) + if (XVECTOR_LENGTH (v) > CHARSET_CHARS (cs)) { - size_t j; - - for (j = 0; j < XVECTOR_LENGTH (v); j++) - { - Lisp_Object c = XVECTOR_DATA(v)[j]; - - if (!EQ (c, Qnil)) - { - put_byte_from_character_table - (XCHAR (c), i + 33, CHARSET_TO_BYTE1_TABLE(cs)); - put_byte_from_character_table - (XCHAR (c), j + 33, CHARSET_TO_BYTE2_TABLE(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_byte_from_character_table - (XCHAR (v), i + 33, CHARSET_TO_BYTE1_TABLE(cs)); } + else if (CHARP (v)) + put_char_attribute (v, charset, + list1 + (make_int (i + CHARSET_BYTE_OFFSET (cs)))); } - else - { - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; - } - break; - case CHARSET_TYPE_96X96: - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; - break; - case CHARSET_TYPE_128X128: - CHARSET_DIMENSION (cs) = 2; - CHARSET_CHARS (cs) = 128; - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; - break; - case CHARSET_TYPE_256X256: - CHARSET_DIMENSION (cs) = 2; - CHARSET_CHARS (cs) = 256; - CHARSET_TO_BYTE1_TABLE(cs) = NULL; - CHARSET_TO_BYTE2_TABLE(cs) = NULL; break; } - if (old_byte1_table != NULL) - destroy_byte_from_character_table (old_byte1_table); - if (old_byte2_table != NULL) - destroy_byte_from_character_table (old_byte2_table); return table; } #endif @@ -1844,6 +2284,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); @@ -1854,6 +2295,10 @@ 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 (Fcharset_mapping_table); DEFSUBR (Fset_charset_mapping_table); #endif @@ -1903,9 +2348,13 @@ syms_of_mule_charset (void) defsymbol (&Qchinese_cns11643_1, "chinese-cns11643-1"); defsymbol (&Qchinese_cns11643_2, "chinese-cns11643-2"); #ifdef UTF2000 + 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 (&Qhiragana_jisx0208, "hiragana-jisx0208"); defsymbol (&Qkatakana_jisx0208, "katakana-jisx0208"); #endif @@ -1940,10 +2389,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 @@ -1956,15 +2405,18 @@ 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); + 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 } @@ -1982,12 +2434,12 @@ complex_vars_of_mule_charset (void) #ifdef UTF2000 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 MIN_CHAR_THAI 0 @@ -2205,7 +2657,7 @@ complex_vars_of_mule_charset (void) build_string ("VISCII lower"), build_string ("VISCII lower (Vietnamese)"), build_string ("VISCII lower (Vietnamese)"), - build_string ("VISCII1\\.1"), + build_string ("MULEVISCII-LOWER"), Qnil, 0, 0, 0, 32); Vcharset_latin_viscii_upper = make_charset (LEADING_BYTE_LATIN_VISCII_UPPER, Qlatin_viscii_upper, @@ -2214,8 +2666,17 @@ complex_vars_of_mule_charset (void) build_string ("VISCII upper"), build_string ("VISCII upper (Vietnamese)"), build_string ("VISCII upper (Vietnamese)"), - build_string ("VISCII1\\.1"), + 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"), + Qnil, 0, 0, 0, 0); Vcharset_hiragana_jisx0208 = make_charset (LEADING_BYTE_HIRAGANA_JISX0208, Qhiragana_jisx0208, CHARSET_TYPE_94X94, 2, 0, 'B',