X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-charset.c;h=3fb4030bee0a3b932bfef5d18e1e2df08a40812b;hb=7c20beeb0e0dae144d6cb5785761366d9b5c369a;hp=aa5c427d09a5998ee4ecc7462e1e02efe5aabc51;hpb=83d047efafbb8a5c0ff0f4814bd8cedbe32fb6a2;p=chise%2Fxemacs-chise.git- diff --git a/src/mule-charset.c b/src/mule-charset.c index aa5c427..3fb4030 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -1,7 +1,7 @@ /* Functions to handle multilingual characters. Copyright (C) 1992, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 1999,2000 MORIOKA Tomohiko + Copyright (C) 1999,2000,2001 MORIOKA Tomohiko This file is part of XEmacs. @@ -20,10 +20,10 @@ along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Synched up with: FSF 20.3. Not in FSF. */ - /* Rewritten by Ben Wing . */ +/* Rewritten by MORIOKA Tomohiko for XEmacs UTF-2000. */ + #include #ifdef UTF2000 #include @@ -56,6 +56,7 @@ Lisp_Object Vcharset_cyrillic_iso8859_5; Lisp_Object Vcharset_latin_iso8859_9; Lisp_Object Vcharset_japanese_jisx0208_1978; Lisp_Object Vcharset_chinese_gb2312; +Lisp_Object Vcharset_chinese_gb12345; Lisp_Object Vcharset_japanese_jisx0208; Lisp_Object Vcharset_japanese_jisx0208_1990; Lisp_Object Vcharset_korean_ksc5601; @@ -65,11 +66,28 @@ Lisp_Object Vcharset_chinese_cns11643_2; #ifdef UTF2000 Lisp_Object Vcharset_ucs; Lisp_Object Vcharset_ucs_bmp; +Lisp_Object Vcharset_ucs_cns; +Lisp_Object Vcharset_ucs_jis; +Lisp_Object Vcharset_ucs_big5; Lisp_Object Vcharset_latin_viscii; Lisp_Object Vcharset_latin_tcvn5712; Lisp_Object Vcharset_latin_viscii_lower; Lisp_Object Vcharset_latin_viscii_upper; Lisp_Object Vcharset_chinese_big5; +Lisp_Object Vcharset_chinese_big5_cdp; +Lisp_Object Vcharset_japanese_jef_china3; +Lisp_Object Vcharset_ideograph_gt; +Lisp_Object Vcharset_ideograph_gt_pj_1; +Lisp_Object Vcharset_ideograph_gt_pj_2; +Lisp_Object Vcharset_ideograph_gt_pj_3; +Lisp_Object Vcharset_ideograph_gt_pj_4; +Lisp_Object Vcharset_ideograph_gt_pj_5; +Lisp_Object Vcharset_ideograph_gt_pj_6; +Lisp_Object Vcharset_ideograph_gt_pj_7; +Lisp_Object Vcharset_ideograph_gt_pj_8; +Lisp_Object Vcharset_ideograph_gt_pj_9; +Lisp_Object Vcharset_ideograph_gt_pj_10; +Lisp_Object Vcharset_ideograph_gt_pj_11; Lisp_Object Vcharset_ideograph_daikanwa; Lisp_Object Vcharset_mojikyo; Lisp_Object Vcharset_mojikyo_2022_1; @@ -119,1161 +137,50 @@ static const struct lrecord_description charset_lookup_description_1[] = { { XD_LISP_OBJECT_ARRAY, offsetof (struct charset_lookup, charset_by_leading_byte), #ifdef UTF2000 128+4*128 -#else - 128+4*128*2 -#endif - }, { XD_END } -}; - -static const struct struct_description charset_lookup_description = { - sizeof (struct charset_lookup), - charset_lookup_description_1 -}; - -#ifndef UTF2000 -/* Table of number of bytes in the string representation of a character - indexed by the first byte of that representation. - - rep_bytes_by_first_byte(c) is more efficient than the equivalent - canonical computation: - - XCHARSET_REP_BYTES (CHARSET_BY_LEADING_BYTE (c)) */ - -const Bytecount rep_bytes_by_first_byte[0xA0] = -{ /* 0x00 - 0x7f are for straight ASCII */ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - /* 0x80 - 0x8f are for Dimension-1 official charsets */ -#ifdef CHAR_IS_UCS4 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, -#else - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -#endif - /* 0x90 - 0x9d are for Dimension-2 official charsets */ - /* 0x9e is for Dimension-1 private charsets */ - /* 0x9f is for Dimension-2 private charsets */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4 -}; -#endif - -#ifdef UTF2000 - -#define BT_UINT8_MIN 0 -#define BT_UINT8_MAX (UCHAR_MAX - 3) -#define BT_UINT8_t (UCHAR_MAX - 2) -#define BT_UINT8_nil (UCHAR_MAX - 1) -#define BT_UINT8_unbound UCHAR_MAX - -INLINE_HEADER int INT_UINT8_P (Lisp_Object obj); -INLINE_HEADER int UINT8_VALUE_P (Lisp_Object obj); -INLINE_HEADER unsigned char UINT8_ENCODE (Lisp_Object obj); -INLINE_HEADER Lisp_Object UINT8_DECODE (unsigned char n); -INLINE_HEADER unsigned short UINT8_TO_UINT16 (unsigned char n); - -INLINE_HEADER int -INT_UINT8_P (Lisp_Object obj) -{ - if (INTP (obj)) - { - int num = XINT (obj); - - return (BT_UINT8_MIN <= num) && (num <= BT_UINT8_MAX); - } - else - return 0; -} - -INLINE_HEADER int -UINT8_VALUE_P (Lisp_Object obj) -{ - return EQ (obj, Qunbound) - || EQ (obj, Qnil) || EQ (obj, Qt) || INT_UINT8_P (obj); -} - -INLINE_HEADER unsigned char -UINT8_ENCODE (Lisp_Object obj) -{ - if (EQ (obj, Qunbound)) - return BT_UINT8_unbound; - else if (EQ (obj, Qnil)) - return BT_UINT8_nil; - else if (EQ (obj, Qt)) - return BT_UINT8_t; - else - return XINT (obj); -} - -INLINE_HEADER Lisp_Object -UINT8_DECODE (unsigned char n) -{ - if (n == BT_UINT8_unbound) - return Qunbound; - else if (n == BT_UINT8_nil) - return Qnil; - else if (n == BT_UINT8_t) - return Qt; - else - return make_int (n); -} - -static Lisp_Object -mark_uint8_byte_table (Lisp_Object obj) -{ - return Qnil; -} - -static void -print_uint8_byte_table (Lisp_Object obj, - Lisp_Object printcharfun, int escapeflag) -{ - Lisp_Uint8_Byte_Table *bte = XUINT8_BYTE_TABLE (obj); - int i; - struct gcpro gcpro1, gcpro2; - GCPRO2 (obj, printcharfun); - - write_c_string ("\n#property[i]; - if ( (i & 15) == 0 ) - write_c_string ("\n ", printcharfun); - write_c_string (" ", printcharfun); - if (n == BT_UINT8_unbound) - write_c_string ("void", printcharfun); - else if (n == BT_UINT8_nil) - write_c_string ("nil", printcharfun); - else if (n == BT_UINT8_t) - write_c_string ("t", printcharfun); - else - { - char buf[4]; - - sprintf (buf, "%hd", n); - write_c_string (buf, printcharfun); - } - } - UNGCPRO; - write_c_string (">", printcharfun); -} - -static int -uint8_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) -{ - Lisp_Uint8_Byte_Table *te1 = XUINT8_BYTE_TABLE (obj1); - Lisp_Uint8_Byte_Table *te2 = XUINT8_BYTE_TABLE (obj2); - int i; - - for (i = 0; i < 256; i++) - if (te1->property[i] != te2->property[i]) - return 0; - return 1; -} - -static unsigned long -uint8_byte_table_hash (Lisp_Object obj, int depth) -{ - Lisp_Uint8_Byte_Table *te = XUINT8_BYTE_TABLE (obj); - int i; - hashcode_t hash = 0; - - for (i = 0; i < 256; i++) - hash = HASH2 (hash, te->property[i]); - return hash; -} - -DEFINE_LRECORD_IMPLEMENTATION ("uint8-byte-table", uint8_byte_table, - mark_uint8_byte_table, - print_uint8_byte_table, - 0, uint8_byte_table_equal, - uint8_byte_table_hash, - 0 /* uint8_byte_table_description */, - Lisp_Uint8_Byte_Table); - -static Lisp_Object -make_uint8_byte_table (unsigned char initval) -{ - Lisp_Object obj; - int i; - Lisp_Uint8_Byte_Table *cte; - - cte = alloc_lcrecord_type (Lisp_Uint8_Byte_Table, - &lrecord_uint8_byte_table); - - for (i = 0; i < 256; i++) - cte->property[i] = initval; - - XSETUINT8_BYTE_TABLE (obj, cte); - return obj; -} - -static int -uint8_byte_table_same_value_p (Lisp_Object obj) -{ - Lisp_Uint8_Byte_Table *bte = XUINT8_BYTE_TABLE (obj); - unsigned char v0 = bte->property[0]; - int i; - - for (i = 1; i < 256; i++) - { - if (bte->property[i] != v0) - return 0; - } - return -1; -} - - -#define BT_UINT16_MIN 0 -#define BT_UINT16_MAX (USHRT_MAX - 3) -#define BT_UINT16_t (USHRT_MAX - 2) -#define BT_UINT16_nil (USHRT_MAX - 1) -#define BT_UINT16_unbound USHRT_MAX - -INLINE_HEADER int INT_UINT16_P (Lisp_Object obj); -INLINE_HEADER int UINT16_VALUE_P (Lisp_Object obj); -INLINE_HEADER unsigned short UINT16_ENCODE (Lisp_Object obj); -INLINE_HEADER Lisp_Object UINT16_DECODE (unsigned short us); - -INLINE_HEADER int -INT_UINT16_P (Lisp_Object obj) -{ - if (INTP (obj)) - { - int num = XINT (obj); - - return (BT_UINT16_MIN <= num) && (num <= BT_UINT16_MAX); - } - else - return 0; -} - -INLINE_HEADER int -UINT16_VALUE_P (Lisp_Object obj) -{ - return EQ (obj, Qunbound) - || EQ (obj, Qnil) || EQ (obj, Qt) || INT_UINT16_P (obj); -} - -INLINE_HEADER unsigned short -UINT16_ENCODE (Lisp_Object obj) -{ - if (EQ (obj, Qunbound)) - return BT_UINT16_unbound; - else if (EQ (obj, Qnil)) - return BT_UINT16_nil; - else if (EQ (obj, Qt)) - return BT_UINT16_t; - else - return XINT (obj); -} - -INLINE_HEADER Lisp_Object -UINT16_DECODE (unsigned short n) -{ - if (n == BT_UINT16_unbound) - return Qunbound; - else if (n == BT_UINT16_nil) - return Qnil; - else if (n == BT_UINT16_t) - return Qt; - else - return make_int (n); -} - -INLINE_HEADER unsigned short -UINT8_TO_UINT16 (unsigned char n) -{ - if (n == BT_UINT8_unbound) - return BT_UINT16_unbound; - else if (n == BT_UINT8_nil) - return BT_UINT16_nil; - else if (n == BT_UINT8_t) - return BT_UINT16_t; - else - return n; -} - -static Lisp_Object -mark_uint16_byte_table (Lisp_Object obj) -{ - return Qnil; -} - -static void -print_uint16_byte_table (Lisp_Object obj, - Lisp_Object printcharfun, int escapeflag) -{ - Lisp_Uint16_Byte_Table *bte = XUINT16_BYTE_TABLE (obj); - int i; - struct gcpro gcpro1, gcpro2; - GCPRO2 (obj, printcharfun); - - write_c_string ("\n#property[i]; - if ( (i & 15) == 0 ) - write_c_string ("\n ", printcharfun); - write_c_string (" ", printcharfun); - if (n == BT_UINT16_unbound) - write_c_string ("void", printcharfun); - else if (n == BT_UINT16_nil) - write_c_string ("nil", printcharfun); - else if (n == BT_UINT16_t) - write_c_string ("t", printcharfun); - else - { - char buf[7]; - - sprintf (buf, "%hd", n); - write_c_string (buf, printcharfun); - } - } - UNGCPRO; - write_c_string (">", printcharfun); -} - -static int -uint16_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) -{ - Lisp_Uint16_Byte_Table *te1 = XUINT16_BYTE_TABLE (obj1); - Lisp_Uint16_Byte_Table *te2 = XUINT16_BYTE_TABLE (obj2); - int i; - - for (i = 0; i < 256; i++) - if (te1->property[i] != te2->property[i]) - return 0; - return 1; -} - -static unsigned long -uint16_byte_table_hash (Lisp_Object obj, int depth) -{ - Lisp_Uint16_Byte_Table *te = XUINT16_BYTE_TABLE (obj); - int i; - hashcode_t hash = 0; - - for (i = 0; i < 256; i++) - hash = HASH2 (hash, te->property[i]); - return hash; -} - -DEFINE_LRECORD_IMPLEMENTATION ("uint16-byte-table", uint16_byte_table, - mark_uint16_byte_table, - print_uint16_byte_table, - 0, uint16_byte_table_equal, - uint16_byte_table_hash, - 0 /* uint16_byte_table_description */, - Lisp_Uint16_Byte_Table); - -static Lisp_Object -make_uint16_byte_table (unsigned short initval) -{ - Lisp_Object obj; - int i; - Lisp_Uint16_Byte_Table *cte; - - cte = alloc_lcrecord_type (Lisp_Uint16_Byte_Table, - &lrecord_uint16_byte_table); - - for (i = 0; i < 256; i++) - cte->property[i] = initval; - - XSETUINT16_BYTE_TABLE (obj, cte); - return obj; -} - -static Lisp_Object -expand_uint8_byte_table_to_uint16 (Lisp_Object table) -{ - Lisp_Object obj; - int i; - Lisp_Uint8_Byte_Table* bte = XUINT8_BYTE_TABLE(table); - Lisp_Uint16_Byte_Table* cte; - - cte = alloc_lcrecord_type (Lisp_Uint16_Byte_Table, - &lrecord_uint16_byte_table); - for (i = 0; i < 256; i++) - { - cte->property[i] = UINT8_TO_UINT16 (bte->property[i]); - } - XSETUINT16_BYTE_TABLE (obj, cte); - return obj; -} - -static int -uint16_byte_table_same_value_p (Lisp_Object obj) -{ - Lisp_Uint16_Byte_Table *bte = XUINT16_BYTE_TABLE (obj); - unsigned short v0 = bte->property[0]; - int i; - - for (i = 1; i < 256; i++) - { - if (bte->property[i] != v0) - return 0; - } - return -1; -} - - -static Lisp_Object -mark_byte_table (Lisp_Object obj) -{ - Lisp_Byte_Table *cte = XBYTE_TABLE (obj); - int i; - - for (i = 0; i < 256; i++) - { - mark_object (cte->property[i]); - } - return Qnil; -} - -static void -print_byte_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) -{ - Lisp_Byte_Table *bte = XBYTE_TABLE (obj); - int i; - struct gcpro gcpro1, gcpro2; - GCPRO2 (obj, printcharfun); - - write_c_string ("\n#property[i]; - if ( (i & 15) == 0 ) - write_c_string ("\n ", printcharfun); - write_c_string (" ", printcharfun); - if (EQ (elt, Qunbound)) - write_c_string ("void", printcharfun); - else - print_internal (elt, printcharfun, escapeflag); - } - UNGCPRO; - write_c_string (">", printcharfun); -} - -static int -byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) -{ - Lisp_Byte_Table *cte1 = XBYTE_TABLE (obj1); - Lisp_Byte_Table *cte2 = XBYTE_TABLE (obj2); - int i; - - for (i = 0; i < 256; i++) - if (BYTE_TABLE_P (cte1->property[i])) - { - if (BYTE_TABLE_P (cte2->property[i])) - { - if (!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 -byte_table_hash (Lisp_Object obj, int depth) -{ - Lisp_Byte_Table *cte = XBYTE_TABLE (obj); - - return internal_array_hash (cte->property, 256, depth); -} - -static const struct lrecord_description byte_table_description[] = { - { XD_LISP_OBJECT_ARRAY, offsetof(Lisp_Byte_Table, property), 256 }, - { XD_END } -}; - -DEFINE_LRECORD_IMPLEMENTATION ("byte-table", byte_table, - mark_byte_table, - print_byte_table, - 0, byte_table_equal, - byte_table_hash, - byte_table_description, - Lisp_Byte_Table); - -static Lisp_Object -make_byte_table (Lisp_Object initval) -{ - Lisp_Object obj; - int i; - Lisp_Byte_Table *cte; - - cte = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table); - - for (i = 0; i < 256; i++) - cte->property[i] = initval; - - XSETBYTE_TABLE (obj, cte); - return obj; -} - -static int -byte_table_same_value_p (Lisp_Object obj) -{ - Lisp_Byte_Table *bte = XBYTE_TABLE (obj); - Lisp_Object v0 = bte->property[0]; - int i; - - for (i = 1; i < 256; i++) - { - if (!internal_equal (bte->property[i], v0, 0)) - return 0; - } - return -1; -} - - -Lisp_Object get_byte_table (Lisp_Object table, unsigned char idx); -Lisp_Object put_byte_table (Lisp_Object table, unsigned char idx, - Lisp_Object value); - -Lisp_Object -get_byte_table (Lisp_Object table, unsigned char idx) -{ - if (UINT8_BYTE_TABLE_P (table)) - return UINT8_DECODE (XUINT8_BYTE_TABLE(table)->property[idx]); - else if (UINT16_BYTE_TABLE_P (table)) - return UINT16_DECODE (XUINT16_BYTE_TABLE(table)->property[idx]); - else if (BYTE_TABLE_P (table)) - return XBYTE_TABLE(table)->property[idx]; - else - return table; -} - -Lisp_Object -put_byte_table (Lisp_Object table, unsigned char idx, Lisp_Object value) -{ - if (UINT8_BYTE_TABLE_P (table)) - { - if (UINT8_VALUE_P (value)) - { - XUINT8_BYTE_TABLE(table)->property[idx] = UINT8_ENCODE (value); - if (!UINT8_BYTE_TABLE_P (value) && - !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value) - && uint8_byte_table_same_value_p (table)) - { - return value; - } - } - else if (UINT16_VALUE_P (value)) - { - Lisp_Object new = expand_uint8_byte_table_to_uint16 (table); - - XUINT16_BYTE_TABLE(new)->property[idx] = UINT16_ENCODE (value); - return new; - } - else - { - Lisp_Object new = make_byte_table (Qnil); - int i; - - for (i = 0; i < 256; i++) - { - XBYTE_TABLE(new)->property[i] - = UINT8_DECODE (XUINT8_BYTE_TABLE(table)->property[i]); - } - XBYTE_TABLE(new)->property[idx] = value; - return new; - } - } - else if (UINT16_BYTE_TABLE_P (table)) - { - if (UINT16_VALUE_P (value)) - { - XUINT16_BYTE_TABLE(table)->property[idx] = UINT16_ENCODE (value); - if (!UINT8_BYTE_TABLE_P (value) && - !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value) - && uint16_byte_table_same_value_p (table)) - { - return value; - } - } - else - { - Lisp_Object new = make_byte_table (Qnil); - int i; - - for (i = 0; i < 256; i++) - { - XBYTE_TABLE(new)->property[i] - = UINT16_DECODE (XUINT16_BYTE_TABLE(table)->property[i]); - } - XBYTE_TABLE(new)->property[idx] = value; - return new; - } - } - else if (BYTE_TABLE_P (table)) - { - XBYTE_TABLE(table)->property[idx] = value; - if (!UINT8_BYTE_TABLE_P (value) && - !UINT16_BYTE_TABLE_P (value) && !BYTE_TABLE_P (value) - && byte_table_same_value_p (table)) - { - return value; - } - } - else if (!internal_equal (table, value, 0)) - { - if (UINT8_VALUE_P (table) && UINT8_VALUE_P (value)) - { - table = make_uint8_byte_table (UINT8_ENCODE (table)); - XUINT8_BYTE_TABLE(table)->property[idx] = UINT8_ENCODE (value); - } - else if (UINT16_VALUE_P (table) && UINT16_VALUE_P (value)) - { - table = make_uint16_byte_table (UINT16_ENCODE (table)); - XUINT16_BYTE_TABLE(table)->property[idx] = UINT16_ENCODE (value); - } - else - { - table = make_byte_table (table); - XBYTE_TABLE(table)->property[idx] = value; - } - } - return table; -} - -static Lisp_Object -mark_char_id_table (Lisp_Object obj) -{ - Lisp_Char_ID_Table *cte = XCHAR_ID_TABLE (obj); - - return cte->table; -} - -static void -print_char_id_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) -{ - Lisp_Object table = XCHAR_ID_TABLE (obj)->table; - int i; - struct gcpro gcpro1, gcpro2; - GCPRO2 (obj, printcharfun); - - write_c_string ("#", printcharfun); -} - -static int -char_id_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) -{ - Lisp_Object table1 = XCHAR_ID_TABLE (obj1)->table; - Lisp_Object table2 = XCHAR_ID_TABLE (obj2)->table; - int i; - - for (i = 0; i < 256; i++) - { - if (!internal_equal (get_byte_table (table1, i), - get_byte_table (table2, i), 0)) - return 0; - } - return -1; -} - -static unsigned long -char_id_table_hash (Lisp_Object obj, int depth) -{ - Lisp_Char_ID_Table *cte = XCHAR_ID_TABLE (obj); - - return char_id_table_hash (cte->table, depth + 1); -} - -static const struct lrecord_description char_id_table_description[] = { - { XD_LISP_OBJECT, offsetof(Lisp_Char_ID_Table, table) }, - { XD_END } -}; - -DEFINE_LRECORD_IMPLEMENTATION ("char-id-table", char_id_table, - mark_char_id_table, - print_char_id_table, - 0, char_id_table_equal, - char_id_table_hash, - char_id_table_description, - Lisp_Char_ID_Table); - -static Lisp_Object -make_char_id_table (Lisp_Object initval) -{ - Lisp_Object obj; - Lisp_Char_ID_Table *cte; - - cte = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table); - - cte->table = make_byte_table (initval); - - XSETCHAR_ID_TABLE (obj, cte); - return obj; -} - - -Lisp_Object -get_char_id_table (Emchar ch, Lisp_Object table) -{ - unsigned int code = ch; - - return - get_byte_table - (get_byte_table - (get_byte_table - (get_byte_table - (XCHAR_ID_TABLE (table)->table, - (unsigned char)(code >> 24)), - (unsigned char) (code >> 16)), - (unsigned char) (code >> 8)), - (unsigned char) code); -} - -void put_char_id_table (Emchar ch, Lisp_Object value, Lisp_Object table); -void -put_char_id_table (Emchar ch, Lisp_Object value, Lisp_Object table) -{ - unsigned int code = ch; - Lisp_Object table1, table2, table3, table4; - - table1 = XCHAR_ID_TABLE (table)->table; - table2 = get_byte_table (table1, (unsigned char)(code >> 24)); - table3 = get_byte_table (table2, (unsigned char)(code >> 16)); - table4 = get_byte_table (table3, (unsigned char)(code >> 8)); - - table4 = put_byte_table (table4, (unsigned char)code, value); - table3 = put_byte_table (table3, (unsigned char)(code >> 8), table4); - table2 = put_byte_table (table2, (unsigned char)(code >> 16), table3); - XCHAR_ID_TABLE (table)->table - = put_byte_table (table1, (unsigned char)(code >> 24), table2); -} - - -Lisp_Object Vchar_attribute_hash_table; -Lisp_Object Vcharacter_composition_table; -Lisp_Object Vcharacter_variant_table; - -Lisp_Object Qideograph_daikanwa; -Lisp_Object Q_decomposition; -Lisp_Object Qucs; -Lisp_Object Q_ucs; -Lisp_Object Qcompat; -Lisp_Object Qisolated; -Lisp_Object Qinitial; -Lisp_Object Qmedial; -Lisp_Object Qfinal; -Lisp_Object Qvertical; -Lisp_Object QnoBreak; -Lisp_Object Qfraction; -Lisp_Object Qsuper; -Lisp_Object Qsub; -Lisp_Object Qcircle; -Lisp_Object Qsquare; -Lisp_Object Qwide; -Lisp_Object Qnarrow; -Lisp_Object Qsmall; -Lisp_Object Qfont; - -Emchar to_char_id (Lisp_Object v, char* err_msg, Lisp_Object err_arg); - -Lisp_Object put_char_ccs_code_point (Lisp_Object character, - Lisp_Object ccs, Lisp_Object value); -Lisp_Object remove_char_ccs (Lisp_Object character, Lisp_Object ccs); - -Emchar -to_char_id (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, Qcompat)) - return -1; - else if (EQ (v, Qisolated)) - return -2; - else if (EQ (v, Qinitial)) - return -3; - else if (EQ (v, Qmedial)) - return -4; - else if (EQ (v, Qfinal)) - return -5; - else if (EQ (v, Qvertical)) - return -6; - else if (EQ (v, QnoBreak)) - return -7; - else if (EQ (v, Qfraction)) - return -8; - else if (EQ (v, Qsuper)) - return -9; - else if (EQ (v, Qsub)) - return -10; - else if (EQ (v, Qcircle)) - return -11; - else if (EQ (v, Qsquare)) - return -12; - else if (EQ (v, Qwide)) - return -13; - else if (EQ (v, Qnarrow)) - return -14; - else if (EQ (v, Qsmall)) - return -15; - else if (EQ (v, Qfont)) - return -16; - 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_id (v, "Invalid value for composition", list); - - ret = get_char_id_table (c, table); - - rest = Fcdr (rest); - if (NILP (rest)) - { - if (!CHAR_ID_TABLE_P (ret)) - return ret; - else - return Qt; - } - else if (!CONSP (rest)) - break; - else if (CHAR_ID_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_id_table (XCHAR (character), - Vcharacter_variant_table)); -} - - -/* We store the char-attributes in hash tables with the names as the - key and the actual char-id-table object as the value. Occasionally - we need to use them in a list format. These routines provide us - with that. */ -struct char_attribute_list_closure -{ - Lisp_Object *char_attribute_list; -}; - -static int -add_char_attribute_to_list_mapper (Lisp_Object key, Lisp_Object value, - void *char_attribute_list_closure) -{ - /* This function can GC */ - struct char_attribute_list_closure *calcl - = (struct char_attribute_list_closure*) char_attribute_list_closure; - Lisp_Object *char_attribute_list = calcl->char_attribute_list; - - *char_attribute_list = Fcons (key, *char_attribute_list); - return 0; -} - -DEFUN ("char-attribute-list", Fchar_attribute_list, 0, 0, 0, /* -Return the list of all existing character attributes except coded-charsets. -*/ - ()) -{ - Lisp_Object char_attribute_list = Qnil; - struct gcpro gcpro1; - struct char_attribute_list_closure char_attribute_list_closure; - - GCPRO1 (char_attribute_list); - char_attribute_list_closure.char_attribute_list = &char_attribute_list; - elisp_maphash (add_char_attribute_to_list_mapper, - Vchar_attribute_hash_table, - &char_attribute_list_closure); - UNGCPRO; - return char_attribute_list; -} - -DEFUN ("find-char-attribute-table", Ffind_char_attribute_table, 1, 1, 0, /* -Return char-id-table corresponding to ATTRIBUTE. -*/ - (attribute)) -{ - return Fgethash (attribute, Vchar_attribute_hash_table, Qnil); -} - - -/* We store the char-id-tables in hash tables with the attributes as - the key and the actual char-id-table object as the value. Each - char-id-table stores values of an attribute corresponding with - characters. Occasionally we need to get attributes of a character - in a association-list format. These routines provide us with - that. */ -struct char_attribute_alist_closure -{ - Emchar char_id; - Lisp_Object *char_attribute_alist; -}; - -static int -add_char_attribute_alist_mapper (Lisp_Object key, Lisp_Object value, - void *char_attribute_alist_closure) -{ - /* This function can GC */ - struct char_attribute_alist_closure *caacl = - (struct char_attribute_alist_closure*) char_attribute_alist_closure; - Lisp_Object ret = get_char_id_table (caacl->char_id, value); - if (!UNBOUNDP (ret)) - { - Lisp_Object *char_attribute_alist = caacl->char_attribute_alist; - *char_attribute_alist - = Fcons (Fcons (key, ret), *char_attribute_alist); - } - return 0; -} - -DEFUN ("char-attribute-alist", Fchar_attribute_alist, 1, 1, 0, /* -Return the alist of attributes of CHARACTER. -*/ - (character)) -{ - Lisp_Object alist = Qnil; - int i; - - CHECK_CHAR (character); - { - struct gcpro gcpro1; - struct char_attribute_alist_closure char_attribute_alist_closure; - - GCPRO1 (alist); - char_attribute_alist_closure.char_id = XCHAR (character); - char_attribute_alist_closure.char_attribute_alist = &alist; - elisp_maphash (add_char_attribute_alist_mapper, - Vchar_attribute_hash_table, - &char_attribute_alist_closure); - UNGCPRO; - } - - for (i = 0; i < countof (chlook->charset_by_leading_byte); i++) - { - Lisp_Object ccs = chlook->charset_by_leading_byte[i]; - - if (!NILP (ccs)) - { - Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (ccs); - Lisp_Object cpos; - - if ( CHAR_ID_TABLE_P (encoding_table) - && INTP (cpos = get_char_id_table (XCHAR (character), - encoding_table)) ) - { - alist = Fcons (Fcons (ccs, cpos), alist); - } - } - } - return alist; -} - -DEFUN ("get-char-attribute", Fget_char_attribute, 2, 3, 0, /* -Return the value of CHARACTER's ATTRIBUTE. -Return DEFAULT-VALUE if the value is not exist. -*/ - (character, attribute, default_value)) -{ - Lisp_Object ccs; - - CHECK_CHAR (character); - if (!NILP (ccs = Ffind_charset (attribute))) - { - Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (ccs); - - if (CHAR_ID_TABLE_P (encoding_table)) - return get_char_id_table (XCHAR (character), encoding_table); - } - else - { - Lisp_Object table = Fgethash (attribute, - Vchar_attribute_hash_table, - Qunbound); - if (!UNBOUNDP (table)) - { - Lisp_Object ret = get_char_id_table (XCHAR (character), table); - if (!UNBOUNDP (ret)) - return ret; - } - } - return default_value; -} - -DEFUN ("put-char-attribute", Fput_char_attribute, 3, 3, 0, /* -Store CHARACTER's ATTRIBUTE with VALUE. -*/ - (character, attribute, value)) -{ - Lisp_Object ccs; - - CHECK_CHAR (character); - ccs = Ffind_charset (attribute); - if (!NILP (ccs)) - { - return put_char_ccs_code_point (character, ccs, value); - } - else if (EQ (attribute, Q_decomposition)) - { - Lisp_Object seq; - - if (!CONSP (value)) - signal_simple_error ("Invalid value for ->decomposition", - value); - - if (CONSP (Fcdr (value))) - { - Lisp_Object rest = value; - Lisp_Object table = Vcharacter_composition_table; - size_t len; - int i = 0; - - GET_EXTERNAL_LIST_LENGTH (rest, len); - seq = make_vector (len, Qnil); - - while (CONSP (rest)) - { - Lisp_Object v = Fcar (rest); - Lisp_Object ntable; - Emchar c - = to_char_id (v, "Invalid value for ->decomposition", value); - - if (c < 0) - XVECTOR_DATA(seq)[i++] = v; - else - XVECTOR_DATA(seq)[i++] = make_char (c); - rest = Fcdr (rest); - if (!CONSP (rest)) - { - put_char_id_table (c, character, table); - break; - } - else - { - ntable = get_char_id_table (c, table); - if (!CHAR_ID_TABLE_P (ntable)) - { - ntable = make_char_id_table (Qnil); - put_char_id_table (c, ntable, table); - } - table = ntable; - } - } - } - else - { - Lisp_Object v = Fcar (value); - - if (INTP (v)) - { - Emchar c = XINT (v); - Lisp_Object ret - = get_char_id_table (c, Vcharacter_variant_table); +#else + 128+4*128*2 +#endif + }, { XD_END } +}; - if (NILP (Fmemq (v, ret))) - { - put_char_id_table (c, Fcons (character, ret), - Vcharacter_variant_table); - } - } - seq = make_vector (1, v); - } - value = seq; - } - else if (EQ (attribute, Q_ucs)) - { - Lisp_Object ret; - Emchar c; +static const struct struct_description charset_lookup_description = { + sizeof (struct charset_lookup), + charset_lookup_description_1 +}; - if (!INTP (value)) - signal_simple_error ("Invalid value for ->ucs", value); +#ifndef UTF2000 +/* Table of number of bytes in the string representation of a character + indexed by the first byte of that representation. - c = XINT (value); + rep_bytes_by_first_byte(c) is more efficient than the equivalent + canonical computation: - ret = get_char_id_table (c, Vcharacter_variant_table); - if (NILP (Fmemq (character, ret))) - { - put_char_id_table (c, Fcons (character, ret), - Vcharacter_variant_table); - } - } - { - Lisp_Object table = Fgethash (attribute, - Vchar_attribute_hash_table, - Qnil); + XCHARSET_REP_BYTES (CHARSET_BY_LEADING_BYTE (c)) */ - if (NILP (table)) - { - table = make_char_id_table (Qunbound); - Fputhash (attribute, table, Vchar_attribute_hash_table); - } - put_char_id_table (XCHAR (character), value, table); - return value; - } -} - -DEFUN ("remove-char-attribute", Fremove_char_attribute, 2, 2, 0, /* -Remove CHARACTER's ATTRIBUTE. -*/ - (character, attribute)) -{ - Lisp_Object ccs; +const Bytecount rep_bytes_by_first_byte[0xA0] = +{ /* 0x00 - 0x7f are for straight ASCII */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + /* 0x80 - 0x8f are for Dimension-1 official charsets */ +#ifdef CHAR_IS_UCS4 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, +#else + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +#endif + /* 0x90 - 0x9d are for Dimension-2 official charsets */ + /* 0x9e is for Dimension-1 private charsets */ + /* 0x9f is for Dimension-2 private charsets */ + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4 +}; +#endif - CHECK_CHAR (character); - ccs = Ffind_charset (attribute); - if (!NILP (ccs)) - { - return remove_char_ccs (character, ccs); - } - else - { - Lisp_Object table = Fgethash (attribute, - Vchar_attribute_hash_table, - Qunbound); - if (!UNBOUNDP (table)) - { - put_char_id_table (XCHAR (character), Qunbound, table); - return Qt; - } - } - return Qnil; -} +#ifdef UTF2000 INLINE_HEADER int CHARSET_BYTE_SIZE (Lisp_Charset* cs); INLINE_HEADER int @@ -1447,7 +354,7 @@ put_char_ccs_code_point (Lisp_Object character, XCHARSET_ENCODING_TABLE (ccs) = encoding_table = make_char_id_table (Qnil); } - put_char_id_table (XCHAR (character), value, encoding_table); + put_char_id_table (XCHAR_TABLE(encoding_table), character, value); return Qt; } @@ -1469,106 +376,13 @@ remove_char_ccs (Lisp_Object character, Lisp_Object ccs) XINT (cpos)); } } - if (CHAR_ID_TABLE_P (encoding_table)) + if (CHAR_TABLEP (encoding_table)) { - put_char_id_table (XCHAR (character), Qnil, encoding_table); + put_char_id_table (XCHAR_TABLE(encoding_table), character, Qnil); } return Qt; } -EXFUN (Fmake_char, 3); -EXFUN (Fdecode_char, 2); - -DEFUN ("define-char", Fdefine_char, 1, 1, 0, /* -Store character's ATTRIBUTES. -*/ - (attributes)) -{ - Lisp_Object rest = attributes; - Lisp_Object code = Fcdr (Fassq (Qucs, attributes)); - Lisp_Object character; -#if 0 - Lisp_Object daikanwa = Qnil; -#endif - - 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) != 0) || - (XCHARSET_UCS_MAX (ccs) > 0)) ) - { - cell = Fcdr (cell); - if (CONSP (cell)) - character = Fmake_char (ccs, Fcar (cell), Fcar (Fcdr (cell))); - else - character = Fdecode_char (ccs, cell); - goto setup_attributes; - } - rest = Fcdr (rest); - } - if (!NILP (code = Fcdr (Fassq (Q_ucs, attributes)))) - { - if (!INTP (code)) - signal_simple_error ("Invalid argument", attributes); - else - character = make_char (XINT (code) + 0x100000); - goto setup_attributes; - } - return Qnil; - } - else if (!INTP (code)) - signal_simple_error ("Invalid argument", attributes); - else - character = make_char (XINT (code)); - - setup_attributes: - rest = attributes; - while (CONSP (rest)) - { - Lisp_Object cell = Fcar (rest); -#if 0 - Lisp_Object key = Fcar (cell); - Lisp_Object value = Fcdr (cell); -#endif - - if (!LISTP (cell)) - signal_simple_error ("Invalid argument", attributes); - -#if 0 - if (EQ (key, Qmorohashi_daikanwa)) - { - size_t len; - GET_EXTERNAL_LIST_LENGTH (value, len); - - if (len == 1) - { - if (NILP (daikanwa)) - daikanwa = Fcdr (Fassq (Qideograph_daikanwa, rest)); - if (EQ (Fcar (value), daikanwa)) - goto ignored; - } - } - else if (EQ (key, Qideograph_daikanwa)) - daikanwa = value; -#endif - - Fput_char_attribute (character, Fcar (cell), Fcdr (cell)); -#if 0 - ignored: -#endif - rest = Fcdr (rest); - } - return character; -} - -Lisp_Object Vutf_2000_version; #endif #ifndef UTF2000 @@ -1600,6 +414,7 @@ Lisp_Object Qascii, Qlatin_iso8859_9, Qjapanese_jisx0208_1978, Qchinese_gb2312, + Qchinese_gb12345, Qjapanese_jisx0208, Qjapanese_jisx0208_1990, Qkorean_ksc5601, @@ -1607,7 +422,11 @@ Lisp_Object Qascii, Qchinese_cns11643_1, Qchinese_cns11643_2, #ifdef UTF2000 + Qucs, Qucs_bmp, + Qucs_cns, + Qucs_jis, + Qucs_big5, Qlatin_viscii, Qlatin_tcvn5712, Qlatin_viscii_lower, @@ -1615,6 +434,21 @@ Lisp_Object Qascii, Qvietnamese_viscii_lower, Qvietnamese_viscii_upper, Qchinese_big5, + Qchinese_big5_cdp, + Qjapanese_jef_china3, + Qideograph_daikanwa, + Qideograph_gt, + Qideograph_gt_pj_1, + Qideograph_gt_pj_2, + Qideograph_gt_pj_3, + Qideograph_gt_pj_4, + Qideograph_gt_pj_5, + Qideograph_gt_pj_6, + Qideograph_gt_pj_7, + Qideograph_gt_pj_8, + Qideograph_gt_pj_9, + Qideograph_gt_pj_10, + Qideograph_gt_pj_11, Qmojikyo, Qmojikyo_2022_1, Qmojikyo_pj_1, @@ -1909,30 +743,18 @@ non_ascii_valid_char_p (Emchar ch) /* Basic string functions */ /************************************************************************/ -/* Copy the character pointed to by PTR into STR, assuming it's - non-ASCII. Do not call this directly. Use the macro - charptr_copy_char() instead. */ +/* Copy the character pointed to by SRC into DST. Do not call this + directly. Use the macro charptr_copy_char() instead. + Return the number of bytes copied. */ Bytecount -non_ascii_charptr_copy_char (const Bufbyte *ptr, Bufbyte *str) +non_ascii_charptr_copy_char (const Bufbyte *src, Bufbyte *dst) { - Bufbyte *strptr = str; - *strptr = *ptr++; - switch (REP_BYTES_BY_FIRST_BYTE (*strptr)) - { - /* Notice fallthrough. */ -#ifdef UTF2000 - case 6: *++strptr = *ptr++; - case 5: *++strptr = *ptr++; -#endif - case 4: *++strptr = *ptr++; - case 3: *++strptr = *ptr++; - case 2: *++strptr = *ptr; - break; - default: - abort (); - } - return strptr + 1 - str; + unsigned int bytes = REP_BYTES_BY_FIRST_BYTE (*src); + unsigned int i; + for (i = bytes; i; i--, dst++, src++) + *dst = *src; + return bytes; } @@ -1949,36 +771,15 @@ Lstream_get_emchar_1 (Lstream *stream, int ch) { Bufbyte str[MAX_EMCHAR_LEN]; Bufbyte *strptr = str; + unsigned int bytes; str[0] = (Bufbyte) ch; - switch (REP_BYTES_BY_FIRST_BYTE (ch)) + + for (bytes = REP_BYTES_BY_FIRST_BYTE (ch) - 1; bytes; bytes--) { - /* Notice fallthrough. */ -#ifdef UTF2000 - case 6: - ch = Lstream_getc (stream); - assert (ch >= 0); - *++strptr = (Bufbyte) ch; - case 5: - ch = Lstream_getc (stream); - assert (ch >= 0); - *++strptr = (Bufbyte) ch; -#endif - case 4: - ch = Lstream_getc (stream); - assert (ch >= 0); - *++strptr = (Bufbyte) ch; - case 3: - ch = Lstream_getc (stream); - assert (ch >= 0); - *++strptr = (Bufbyte) ch; - case 2: - ch = Lstream_getc (stream); - assert (ch >= 0); - *++strptr = (Bufbyte) ch; - break; - default: - abort (); + int c = Lstream_getc (stream); + bufpos_checking_assert (c >= 0); + *++strptr = (Bufbyte) c; } return charptr_emchar (str); } @@ -2072,8 +873,9 @@ DEFINE_LRECORD_IMPLEMENTATION ("charset", charset, mark_charset, print_charset, 0, 0, 0, charset_description, Lisp_Charset); -/* Make a new charset. */ +/* Make a new charset. */ +/* #### SJT Should generic properties be allowed? */ static Lisp_Object make_charset (Charset_ID id, Lisp_Object name, unsigned short chars, unsigned char dimension, @@ -2195,48 +997,25 @@ get_unallocated_leading_byte (int dimension) #define BIG5_SAME_ROW (0xFF - 0xA1 + 0x7F - 0x40) Emchar -make_builtin_char (Lisp_Object charset, int c1, int c2) +decode_builtin_char (Lisp_Object charset, int code_point) { - if (XCHARSET_UCS_MAX (charset)) - { - Emchar code - = (XCHARSET_DIMENSION (charset) == 1 - ? - c1 - XCHARSET_BYTE_OFFSET (charset) - : - (c1 - XCHARSET_BYTE_OFFSET (charset)) * XCHARSET_CHARS (charset) - + c2 - XCHARSET_BYTE_OFFSET (charset)) - - XCHARSET_CODE_OFFSET (charset) + XCHARSET_UCS_MIN (charset); - if ((code < XCHARSET_UCS_MIN (charset)) - || (XCHARSET_UCS_MAX (charset) < code)) - signal_simple_error ("Arguments makes invalid character", - make_char (code)); - return code; - } - else if (XCHARSET_DIMENSION (charset) == 1) - { - switch (XCHARSET_CHARS (charset)) - { - case 94: - return MIN_CHAR_94 - + (XCHARSET_FINAL (charset) - '0') * 94 + (c1 - 33); - case 96: - return MIN_CHAR_96 - + (XCHARSET_FINAL (charset) - '0') * 96 + (c1 - 32); - default: - abort (); - } - } - else + int final; + + if (EQ (charset, Vcharset_chinese_big5)) { - if (EQ (charset, Vcharset_chinese_big5)) + int c1 = code_point >> 8; + int c2 = code_point & 0xFF; + unsigned int I; + + if ( ( (0xA1 <= c1) && (c1 <= 0xFE) ) + && + ( ((0x40 <= c2) && (c2 <= 0x7E)) || + ((0xA1 <= c2) && (c2 <= 0xFE)) ) ) { - int B1 = c1, B2 = c2; - unsigned int I - = (B1 - 0xA1) * BIG5_SAME_ROW - + B2 - (B2 < 0x7F ? 0x40 : 0x62); + I = (c1 - 0xA1) * BIG5_SAME_ROW + + c2 - (c2 < 0x7F ? 0x40 : 0x62); - if (B1 < 0xC9) + if (c1 < 0xC9) { charset = Vcharset_chinese_big5_1; } @@ -2245,23 +1024,64 @@ make_builtin_char (Lisp_Object charset, int c1, int c2) charset = Vcharset_chinese_big5_2; I -= (BIG5_SAME_ROW) * (0xC9 - 0xA1); } - c1 = I / 94 + 33; - c2 = I % 94 + 33; + code_point = ((I / 94 + 33) << 8) | (I % 94 + 33); + } + } + if ((final = XCHARSET_FINAL (charset)) >= '0') + { + if (XCHARSET_DIMENSION (charset) == 1) + { + switch (XCHARSET_CHARS (charset)) + { + case 94: + return MIN_CHAR_94 + + (final - '0') * 94 + ((code_point & 0x7F) - 33); + case 96: + return MIN_CHAR_96 + + (final - '0') * 96 + ((code_point & 0x7F) - 32); + default: + abort (); + return -1; + } } - switch (XCHARSET_CHARS (charset)) + else { - case 94: - return MIN_CHAR_94x94 - + (XCHARSET_FINAL (charset) - '0') * 94 * 94 - + (c1 - 33) * 94 + (c2 - 33); - case 96: - return MIN_CHAR_96x96 - + (XCHARSET_FINAL (charset) - '0') * 96 * 96 - + (c1 - 32) * 96 + (c2 - 32); - default: - abort (); + switch (XCHARSET_CHARS (charset)) + { + case 94: + return MIN_CHAR_94x94 + + (final - '0') * 94 * 94 + + (((code_point >> 8) & 0x7F) - 33) * 94 + + ((code_point & 0x7F) - 33); + case 96: + return MIN_CHAR_96x96 + + (final - '0') * 96 * 96 + + (((code_point >> 8) & 0x7F) - 32) * 96 + + ((code_point & 0x7F) - 32); + default: + abort (); + return -1; + } } } + else if (XCHARSET_UCS_MAX (charset)) + { + Emchar cid + = (XCHARSET_DIMENSION (charset) == 1 + ? + code_point - XCHARSET_BYTE_OFFSET (charset) + : + ((code_point >> 8) - XCHARSET_BYTE_OFFSET (charset)) + * XCHARSET_CHARS (charset) + + (code_point & 0xFF) - XCHARSET_BYTE_OFFSET (charset)) + - XCHARSET_CODE_OFFSET (charset) + XCHARSET_UCS_MIN (charset); + if ((cid < XCHARSET_UCS_MIN (charset)) + || (XCHARSET_UCS_MAX (charset) < cid)) + return -1; + return cid; + } + else + return -1; } int @@ -2382,22 +1202,12 @@ encode_builtin_char_1 (Emchar c, Lisp_Object* charset) return c & 0x7F; } /* - else if ((MIN_CHAR_GREEK <= c) && (c <= MAX_CHAR_GREEK)) - { - *charset = Vcharset_greek_iso8859_7; - return c - MIN_CHAR_GREEK + 0x20; - } - else if ((MIN_CHAR_CYRILLIC <= c) && (c <= MAX_CHAR_CYRILLIC)) - { - *charset = Vcharset_cyrillic_iso8859_5; - return c - MIN_CHAR_CYRILLIC + 0x20; - } - */ else if ((MIN_CHAR_HEBREW <= c) && (c <= MAX_CHAR_HEBREW)) { *charset = Vcharset_hebrew_iso8859_8; return c - MIN_CHAR_HEBREW + 0x20; } + */ else if ((MIN_CHAR_THAI <= c) && (c <= MAX_CHAR_THAI)) { *charset = Vcharset_thai_tis620; @@ -2421,17 +1231,15 @@ encode_builtin_char_1 (Emchar c, Lisp_Object* charset) *charset = Vcharset_ucs; return c; } - /* else if (c <= MAX_CHAR_DAIKANWA) { *charset = Vcharset_ideograph_daikanwa; return c - MIN_CHAR_DAIKANWA; } - */ - else if (c <= MAX_CHAR_MOJIKYO) + else if (c <= MAX_CHAR_MOJIKYO_0) { *charset = Vcharset_mojikyo; - return c - MIN_CHAR_MOJIKYO; + return c - MIN_CHAR_MOJIKYO_0; } else if (c < MIN_CHAR_94) { @@ -2494,6 +1302,26 @@ encode_builtin_char_1 (Emchar c, Lisp_Object* charset) return c; } } + else if (c < MIN_CHAR_MOJIKYO) + { + *charset = Vcharset_ucs; + return c; + } + else if (c <= MAX_CHAR_MOJIKYO) + { + *charset = Vcharset_mojikyo; + return c - MIN_CHAR_MOJIKYO; + } + else if (c < MIN_CHAR_JEF_CHINA3) + { + *charset = Vcharset_ucs; + return c; + } + else if (c <= MAX_CHAR_JEF_CHINA3) + { + *charset = Vcharset_japanese_jef_china3; + return c - MAX_CHAR_JEF_CHINA3; + } else { *charset = Vcharset_ucs; @@ -2586,13 +1414,14 @@ Return a list of the names of all defined charsets. } DEFUN ("charset-name", Fcharset_name, 1, 1, 0, /* -Return the name of the given charset. +Return the name of charset CHARSET. */ (charset)) { return XCHARSET_NAME (Fget_charset (charset)); } +/* #### SJT Should generic properties be allowed? */ DEFUN ("make-charset", Fmake_charset, 3, 3, 0, /* Define a new character set. This function is for use with Mule support. @@ -2735,7 +1564,10 @@ character set. Recognized properties are: else if (EQ (keyword, Qccl_program)) { - CHECK_VECTOR (value); + struct ccl_program test_ccl; + + if (setup_ccl_program (&test_ccl, value) < 0) + signal_simple_error ("Invalid value for 'ccl-program", value); ccl_program = value; } @@ -2962,7 +1794,7 @@ Return dimension of CHARSET. } DEFUN ("charset-property", Fcharset_property, 2, 2, 0, /* -Return property PROP of CHARSET. +Return property PROP of CHARSET, a charset object or symbol naming a charset. Recognized properties are those listed in `make-charset', as well as 'name and 'doc-string. */ @@ -2990,10 +1822,8 @@ Recognized properties are those listed in `make-charset', as well as if (EQ (prop, Qreverse_direction_charset)) { Lisp_Object obj = CHARSET_REVERSE_DIRECTION_CHARSET (cs); - if (NILP (obj)) - return Qnil; - else - return XCHARSET_NAME (obj); + /* #### Is this translation OK? If so, error checking sufficient? */ + return CHARSETP (obj) ? XCHARSET_NAME (obj) : obj; } signal_simple_error ("Unrecognized charset property name", prop); return Qnil; /* not reached */ @@ -3015,8 +1845,11 @@ Set the 'ccl-program property of CHARSET to CCL-PROGRAM. */ (charset, ccl_program)) { + struct ccl_program test_ccl; + charset = Fget_charset (charset); - CHECK_VECTOR (ccl_program); + if (setup_ccl_program (&test_ccl, ccl_program) < 0) + signal_simple_error ("Invalid ccl-program", ccl_program); XCHARSET_CCL_PROGRAM (charset) = ccl_program; return Qnil; } @@ -3160,7 +1993,8 @@ Make a character from CHARSET and code-point CODE. c = XINT (code); if (XCHARSET_GRAPHIC (charset) == 1) c &= 0x7F7F7F7F; - return make_char (DECODE_CHAR (charset, c)); + c = DECODE_CHAR (charset, c); + return c >= 0 ? make_char (c) : Qnil; } DEFUN ("decode-builtin-char", Fdecode_builtin_char, 2, 2, 0, /* @@ -3169,69 +2003,41 @@ Make a builtin character from CHARSET and code-point CODE. (charset, code)) { int c; - int final; charset = Fget_charset (charset); CHECK_INT (code); - c = XINT (code); - - if ((final = XCHARSET_FINAL (charset)) >= '0') + if (EQ (charset, Vcharset_latin_viscii)) { - if (XCHARSET_DIMENSION (charset) == 1) + Lisp_Object chr = Fdecode_char (charset, code); + Lisp_Object ret; + + if (!NILP (chr)) { - switch (XCHARSET_CHARS (charset)) + if (!NILP + (ret = Fget_char_attribute (chr, + Vcharset_latin_viscii_lower, + Qnil))) { - case 94: - return - make_char (MIN_CHAR_94 + (final - '0') * 94 - + ((c & 0x7F) - 33)); - case 96: - return - make_char (MIN_CHAR_96 + (final - '0') * 96 - + ((c & 0x7F) - 32)); - default: - return Fdecode_char (charset, code); + charset = Vcharset_latin_viscii_lower; + code = ret; } - } - else - { - switch (XCHARSET_CHARS (charset)) + else if (!NILP + (ret = Fget_char_attribute (chr, + Vcharset_latin_viscii_upper, + Qnil))) { - case 94: - return - make_char (MIN_CHAR_94x94 - + (final - '0') * 94 * 94 - + (((c >> 8) & 0x7F) - 33) * 94 - + ((c & 0x7F) - 33)); - case 96: - return - make_char (MIN_CHAR_96x96 - + (final - '0') * 96 * 96 - + (((c >> 8) & 0x7F) - 32) * 96 - + ((c & 0x7F) - 32)); - default: - return Fdecode_char (charset, code); + charset = Vcharset_latin_viscii_upper; + code = ret; } } } - else if (XCHARSET_UCS_MAX (charset)) - { - Emchar cid - = (XCHARSET_DIMENSION (charset) == 1 - ? - c - XCHARSET_BYTE_OFFSET (charset) - : - ((c >> 8) - XCHARSET_BYTE_OFFSET (charset)) - * XCHARSET_CHARS (charset) - + (c & 0xFF) - XCHARSET_BYTE_OFFSET (charset)) - - XCHARSET_CODE_OFFSET (charset) + XCHARSET_UCS_MIN (charset); - if ((cid < XCHARSET_UCS_MIN (charset)) - || (XCHARSET_UCS_MAX (charset) < cid)) - return Fdecode_char (charset, code); - return make_char (cid); - } - else - return Fdecode_char (charset, code); + c = XINT (code); +#if 0 + if (XCHARSET_GRAPHIC (charset) == 1) + c &= 0x7F7F7F7F; +#endif + c = decode_builtin_char (charset, c); + return c >= 0 ? make_char (c) : Fdecode_char (charset, code); } #endif @@ -3296,27 +2102,27 @@ character s with caron. } DEFUN ("char-charset", Fchar_charset, 1, 1, 0, /* -Return the character set of char CH. +Return the character set of CHARACTER. */ - (ch)) + (character)) { - CHECK_CHAR_COERCE_INT (ch); + CHECK_CHAR_COERCE_INT (character); - return XCHARSET_NAME (CHAR_CHARSET (XCHAR (ch))); + return XCHARSET_NAME (CHAR_CHARSET (XCHAR (character))); } DEFUN ("char-octet", Fchar_octet, 1, 2, 0, /* -Return the octet numbered N (should be 0 or 1) of char CH. +Return the octet numbered N (should be 0 or 1) of CHARACTER. N defaults to 0 if omitted. */ - (ch, n)) + (character, n)) { Lisp_Object charset; int octet0, octet1; - CHECK_CHAR_COERCE_INT (ch); + CHECK_CHAR_COERCE_INT (character); - BREAKUP_CHAR (XCHAR (ch), charset, octet0, octet1); + BREAKUP_CHAR (XCHAR (character), charset, octet0, octet1); if (NILP (n) || EQ (n, Qzero)) return make_int (octet0); @@ -3327,7 +2133,7 @@ N defaults to 0 if omitted. } DEFUN ("split-char", Fsplit_char, 1, 1, 0, /* -Return list of charset and one or two position-codes of CHAR. +Return list of charset and one or two position-codes of CHARACTER. */ (character)) { @@ -3454,12 +2260,6 @@ Return a string of the characters comprising a composite character. void syms_of_mule_charset (void) { -#ifdef UTF2000 - INIT_LRECORD_IMPLEMENTATION (uint8_byte_table); - INIT_LRECORD_IMPLEMENTATION (uint16_byte_table); - INIT_LRECORD_IMPLEMENTATION (byte_table); - INIT_LRECORD_IMPLEMENTATION (char_id_table); -#endif INIT_LRECORD_IMPLEMENTATION (charset); DEFSUBR (Fcharsetp); @@ -3481,15 +2281,6 @@ syms_of_mule_charset (void) DEFSUBR (Fset_charset_ccl_program); DEFSUBR (Fset_charset_registry); #ifdef UTF2000 - DEFSUBR (Fchar_attribute_list); - DEFSUBR (Ffind_char_attribute_table); - DEFSUBR (Fchar_attribute_alist); - DEFSUBR (Fget_char_attribute); - DEFSUBR (Fput_char_attribute); - DEFSUBR (Fremove_char_attribute); - DEFSUBR (Fdefine_char); - DEFSUBR (Fchar_variants); - DEFSUBR (Fget_composite_char); DEFSUBR (Fcharset_mapping_table); DEFSUBR (Fset_charset_mapping_table); #endif @@ -3538,6 +2329,7 @@ syms_of_mule_charset (void) defsymbol (&Qlatin_iso8859_9, "latin-iso8859-9"); defsymbol (&Qjapanese_jisx0208_1978, "japanese-jisx0208-1978"); defsymbol (&Qchinese_gb2312, "chinese-gb2312"); + defsymbol (&Qchinese_gb12345, "chinese-gb12345"); defsymbol (&Qjapanese_jisx0208, "japanese-jisx0208"); defsymbol (&Qjapanese_jisx0208_1990, "japanese-jisx0208-1990"); defsymbol (&Qkorean_ksc5601, "korean-ksc5601"); @@ -3545,34 +2337,33 @@ 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 (&Qcompat, "compat"); - defsymbol (&Qisolated, "isolated"); - defsymbol (&Qinitial, "initial"); - defsymbol (&Qmedial, "medial"); - defsymbol (&Qfinal, "final"); - defsymbol (&Qvertical, "vertical"); - defsymbol (&QnoBreak, "noBreak"); - defsymbol (&Qfraction, "fraction"); - defsymbol (&Qsuper, "super"); - defsymbol (&Qsub, "sub"); - defsymbol (&Qcircle, "circle"); - defsymbol (&Qsquare, "square"); - defsymbol (&Qwide, "wide"); - defsymbol (&Qnarrow, "narrow"); - defsymbol (&Qsmall, "small"); - defsymbol (&Qfont, "font"); defsymbol (&Qucs, "ucs"); defsymbol (&Qucs_bmp, "ucs-bmp"); + defsymbol (&Qucs_cns, "ucs-cns"); + defsymbol (&Qucs_jis, "ucs-jis"); + defsymbol (&Qucs_big5, "ucs-big5"); defsymbol (&Qlatin_viscii, "latin-viscii"); defsymbol (&Qlatin_tcvn5712, "latin-tcvn5712"); 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 (&Qideograph_gt, "ideograph-gt"); + defsymbol (&Qideograph_gt_pj_1, "ideograph-gt-pj-1"); + defsymbol (&Qideograph_gt_pj_2, "ideograph-gt-pj-2"); + defsymbol (&Qideograph_gt_pj_3, "ideograph-gt-pj-3"); + defsymbol (&Qideograph_gt_pj_4, "ideograph-gt-pj-4"); + defsymbol (&Qideograph_gt_pj_5, "ideograph-gt-pj-5"); + defsymbol (&Qideograph_gt_pj_6, "ideograph-gt-pj-6"); + defsymbol (&Qideograph_gt_pj_7, "ideograph-gt-pj-7"); + defsymbol (&Qideograph_gt_pj_8, "ideograph-gt-pj-8"); + defsymbol (&Qideograph_gt_pj_9, "ideograph-gt-pj-9"); + defsymbol (&Qideograph_gt_pj_10, "ideograph-gt-pj-10"); + defsymbol (&Qideograph_gt_pj_11, "ideograph-gt-pj-11"); defsymbol (&Qideograph_daikanwa, "ideograph-daikanwa"); defsymbol (&Qchinese_big5, "chinese-big5"); + defsymbol (&Qchinese_big5_cdp, "chinese-big5-cdp"); + defsymbol (&Qjapanese_jef_china3, "japanese-jef-china3"); defsymbol (&Qmojikyo, "mojikyo"); defsymbol (&Qmojikyo_2022_1, "mojikyo-2022-1"); defsymbol (&Qmojikyo_pj_1, "mojikyo-pj-1"); @@ -3612,8 +2403,8 @@ vars_of_mule_charset (void) int k; #endif - chlook = xnew (struct charset_lookup); - dumpstruct (&chlook, &charset_lookup_description); + chlook = xnew_and_zero (struct charset_lookup); /* zero for Purify. */ + dump_add_root_struct_ptr (&chlook, &charset_lookup_description); /* Table of charsets indexed by leading byte. */ for (i = 0; i < countof (chlook->charset_by_leading_byte); i++) @@ -3648,17 +2439,6 @@ Leading-code of private TYPE9N charset of column-width 1. #endif #ifdef UTF2000 - Vutf_2000_version = build_string("0.17 (Hōryūji)"); - DEFVAR_LISP ("utf-2000-version", &Vutf_2000_version /* -Version number of UTF-2000. -*/ ); - - staticpro (&Vcharacter_composition_table); - Vcharacter_composition_table = make_char_id_table (Qnil); - - staticpro (&Vcharacter_variant_table); - Vcharacter_variant_table = make_char_id_table (Qnil); - Vdefault_coded_charset_priority_list = Qnil; DEFVAR_LISP ("default-coded-charset-priority-list", &Vdefault_coded_charset_priority_list /* @@ -3678,10 +2458,6 @@ complex_vars_of_mule_charset (void) ease of access. */ #ifdef UTF2000 - staticpro (&Vchar_attribute_hash_table); - Vchar_attribute_hash_table - = make_lisp_hash_table (16, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); - staticpro (&Vcharset_ucs); Vcharset_ucs = make_charset (LEADING_BYTE_UCS, Qucs, 256, 4, @@ -3700,11 +2476,38 @@ complex_vars_of_mule_charset (void) build_string ("ISO/IEC 10646 Group 0 Plane 0 (BMP)"), build_string ("\\(ISO10646.*-1\\|UNICODE[23]?-0\\)"), Qnil, 0, 0xFFFF, 0, 0); + staticpro (&Vcharset_ucs_cns); + Vcharset_ucs_cns = + make_charset (LEADING_BYTE_UCS_CNS, Qucs_cns, 256, 3, + 1, 2, 0, CHARSET_LEFT_TO_RIGHT, + build_string ("UCS for CNS"), + build_string ("UCS for CNS 11643"), + build_string ("ISO/IEC 10646 for CNS 11643"), + build_string (""), + Qnil, 0, 0, 0, 0); + staticpro (&Vcharset_ucs_jis); + Vcharset_ucs_jis = + make_charset (LEADING_BYTE_UCS_JIS, Qucs_jis, 256, 3, + 1, 2, 0, CHARSET_LEFT_TO_RIGHT, + build_string ("UCS for JIS"), + build_string ("UCS for JIS X 0208, 0212 and 0213"), + build_string ("ISO/IEC 10646 for JIS X 0208, 0212 and 0213"), + build_string (""), + Qnil, 0, 0, 0, 0); + staticpro (&Vcharset_ucs_big5); + Vcharset_ucs_big5 = + make_charset (LEADING_BYTE_UCS_BIG5, Qucs_big5, 256, 3, + 1, 2, 0, CHARSET_LEFT_TO_RIGHT, + build_string ("UCS for Big5"), + build_string ("UCS for Big5"), + build_string ("ISO/IEC 10646 for Big5"), + build_string (""), + Qnil, 0, 0, 0, 0); #else # define MIN_CHAR_THAI 0 # define MAX_CHAR_THAI 0 -# define MIN_CHAR_HEBREW 0 -# define MAX_CHAR_HEBREW 0 + /* # define MIN_CHAR_HEBREW 0 */ + /* # define MAX_CHAR_HEBREW 0 */ # define MIN_CHAR_HALFWIDTH_KATAKANA 0 # define MAX_CHAR_HALFWIDTH_KATAKANA 0 #endif @@ -3779,9 +2582,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-7 (Greek)"), build_string ("ISO8859-7 (Greek)"), build_string ("iso8859-7"), - Qnil, - 0 /* MIN_CHAR_GREEK */, - 0 /* MAX_CHAR_GREEK */, 0, 32); + Qnil, 0, 0, 0, 32); staticpro (&Vcharset_arabic_iso8859_6); Vcharset_arabic_iso8859_6 = make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 96, 1, @@ -3799,7 +2600,9 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-8 (Hebrew)"), build_string ("ISO8859-8 (Hebrew)"), build_string ("iso8859-8"), - Qnil, MIN_CHAR_HEBREW, MAX_CHAR_HEBREW, 0, 32); + Qnil, + 0 /* MIN_CHAR_HEBREW */, + 0 /* MAX_CHAR_HEBREW */, 0, 32); staticpro (&Vcharset_katakana_jisx0201); Vcharset_katakana_jisx0201 = make_charset (LEADING_BYTE_KATAKANA_JISX0201, Qkatakana_jisx0201, 94, 1, @@ -3826,9 +2629,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-5 (Cyrillic)"), build_string ("ISO8859-5 (Cyrillic)"), build_string ("iso8859-5"), - Qnil, - 0 /* MIN_CHAR_CYRILLIC */, - 0 /* MAX_CHAR_CYRILLIC */, 0, 32); + Qnil, 0, 0, 0, 32); staticpro (&Vcharset_latin_iso8859_9); Vcharset_latin_iso8859_9 = make_charset (LEADING_BYTE_LATIN_ISO8859_9, Qlatin_iso8859_9, 96, 1, @@ -3858,6 +2659,15 @@ complex_vars_of_mule_charset (void) build_string ("GB2312 Chinese simplified"), build_string ("gb2312"), Qnil, 0, 0, 0, 33); + staticpro (&Vcharset_chinese_gb12345); + Vcharset_chinese_gb12345 = + make_charset (LEADING_BYTE_CHINESE_GB12345, Qchinese_gb12345, 94, 2, + 2, 0, 0, CHARSET_LEFT_TO_RIGHT, + build_string ("G1"), + build_string ("GB 12345)"), + build_string ("GB 12345-1990"), + build_string ("GB12345\\(\\.1990\\)?-0"), + Qnil, 0, 0, 0, 33); staticpro (&Vcharset_japanese_jisx0208); Vcharset_japanese_jisx0208 = make_charset (LEADING_BYTE_JAPANESE_JISX0208, Qjapanese_jisx0208, 94, 2, @@ -3929,7 +2739,7 @@ complex_vars_of_mule_charset (void) build_string ("TCVN 5712"), build_string ("TCVN 5712 (VSCII-2)"), build_string ("Vietnamese TCVN 5712:1983 (VSCII-2)"), - build_string ("tcvn5712-1"), + build_string ("tcvn5712\\(\\.1993\\)?-1"), Qnil, 0, 0, 0, 32); staticpro (&Vcharset_latin_viscii_lower); Vcharset_latin_viscii_lower = @@ -3967,6 +2777,56 @@ complex_vars_of_mule_charset (void) build_string ("Big5 Chinese traditional"), build_string ("big5"), Qnil, 0, 0, 0, 0); + staticpro (&Vcharset_chinese_big5_cdp); + Vcharset_chinese_big5_cdp = + make_charset (LEADING_BYTE_CHINESE_BIG5_CDP, Qchinese_big5_cdp, 256, 2, + 2, 2, 0, CHARSET_LEFT_TO_RIGHT, + build_string ("Big5-CDP"), + build_string ("Big5 + CDP extension"), + build_string ("Big5 with CDP extension"), + build_string ("big5\\.cdp-0"), + Qnil, 0, 0, 0, 0); + staticpro (&Vcharset_japanese_jef_china3); + Vcharset_japanese_jef_china3 = + make_charset (LEADING_BYTE_JEF_CHINA3, Qjapanese_jef_china3, 256, 2, + 2, 2, 0, CHARSET_LEFT_TO_RIGHT, + build_string ("JC3"), + build_string ("JEF + CHINA3"), + build_string ("JEF + CHINA3 private characters"), + build_string ("china3jef-0"), + Qnil, MIN_CHAR_JEF_CHINA3, MAX_CHAR_JEF_CHINA3, 0, 0); + staticpro (&Vcharset_ideograph_gt); + Vcharset_ideograph_gt = + make_charset (LEADING_BYTE_GT, Qideograph_gt, 256, 3, + 2, 2, 0, CHARSET_LEFT_TO_RIGHT, + build_string ("GT"), + build_string ("GT"), + build_string ("GT"), + build_string (""), + Qnil, MIN_CHAR_GT, MAX_CHAR_GT, 0, 0); +#define DEF_GT_PJ(n) \ + staticpro (&Vcharset_ideograph_gt_pj_##n); \ + Vcharset_ideograph_gt_pj_##n = \ + make_charset (LEADING_BYTE_GT_PJ_##n, Qideograph_gt_pj_##n, 94, 2, \ + 2, 0, 0, CHARSET_LEFT_TO_RIGHT, \ + build_string ("GT-PJ-"#n), \ + build_string ("GT (pseudo JIS encoding) part "#n), \ + build_string ("GT 2000 (pseudo JIS encoding) part "#n), \ + build_string \ + ("\\(GTpj-"#n "\\|jisx0208\\.GT-"#n "\\)$"), \ + Qnil, 0, 0, 0, 33); + DEF_GT_PJ (1); + DEF_GT_PJ (2); + DEF_GT_PJ (3); + DEF_GT_PJ (4); + DEF_GT_PJ (5); + DEF_GT_PJ (6); + DEF_GT_PJ (7); + DEF_GT_PJ (8); + DEF_GT_PJ (9); + DEF_GT_PJ (10); + DEF_GT_PJ (11); + staticpro (&Vcharset_ideograph_daikanwa); Vcharset_ideograph_daikanwa = make_charset (LEADING_BYTE_DAIKANWA, Qideograph_daikanwa, 256, 2,