/* Header for UCS-4 character representation.
- Copyright (C) 1999,2000,2001,2002 MORIOKA Tomohiko
+ Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko
This file is part of XEmacs.
#define CHAR_ASCII_P(ch) ((ch) <= 0x7F)
+\f
+/************************************************************************/
+/* Exported functions */
+/************************************************************************/
+
+extern Lisp_Object Vcharset_ucs;
extern Lisp_Object Vcharset_latin_jisx0201;
+extern Lisp_Object Vcharset_chinese_big5;
+extern Lisp_Object Vcharset_chinese_big5_1;
+extern Lisp_Object Vcharset_chinese_big5_2;
+extern Lisp_Object Vcharset_japanese_jisx0208;
+extern Lisp_Object Vcharset_japanese_jisx0208_1990;
+extern Lisp_Object Vcharset_japanese_jisx0212;
+
+EXFUN (Fget_charset, 1);
+
+extern Lisp_Object Qmap_ucs, Qucs;
+
+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);
\f
/************************************************************************/
typedef short Charset_ID;
-#define MIN_LEADING_BYTE -0x200
-
/* ISO/IEC 10646 */
-#define LEADING_BYTE_UCS (MIN_LEADING_BYTE + 1)
+#define LEADING_BYTE_UCS -177
/* represent normal 80-9F */
-#define LEADING_BYTE_CONTROL_1 (MIN_LEADING_BYTE + 2)
+#define LEADING_BYTE_CONTROL_1 -77
/* ISO/IEC 10646 BMP */
-#define LEADING_BYTE_UCS_BMP (MIN_LEADING_BYTE + 3)
+#define LEADING_BYTE_UCS_BMP -176
/* ISO/IEC 10646 SMP */
-#define LEADING_BYTE_UCS_SMP (MIN_LEADING_BYTE + 4)
+#define LEADING_BYTE_UCS_SMP 1
/* ISO/IEC 10646 SIP */
-#define LEADING_BYTE_UCS_SIP (MIN_LEADING_BYTE + 5)
-
-/* ISO/IEC 10646 for CNS */
-#define LEADING_BYTE_UCS_CNS (MIN_LEADING_BYTE + 6)
+#define LEADING_BYTE_UCS_SIP 2
-/* ISO/IEC 10646 for JIS */
-#define LEADING_BYTE_UCS_JIS (MIN_LEADING_BYTE + 7)
-
-/* ISO/IEC 10646 for KS */
-#define LEADING_BYTE_UCS_KS (MIN_LEADING_BYTE + 8)
-
-/* ISO/IEC 10646 for Big5 */
-#define LEADING_BYTE_UCS_BIG5 (MIN_LEADING_BYTE + 9)
-
-/* Japanese JIS X0208-1990 2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 10)
+/* Japanese JIS X0208 Common 2/4 2/{(8),9,10,11} 4/2 (B) */
+#define LEADING_BYTE_JIS_X0208 3
/* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345 (MIN_LEADING_BYTE + 11)
+#define LEADING_BYTE_CHINESE_GB12345 4
-#define LEADING_BYTE_CHINESE_BIG5 (MIN_LEADING_BYTE + 20)
+#define LEADING_BYTE_CHINESE_BIG5 5
/* Big5 Level 1 2/4 2/{(8),9,10,11} 4/0 '0' */
-#define LEADING_BYTE_CHINESE_BIG5_1 (MIN_LEADING_BYTE + 21)
+#define LEADING_BYTE_CHINESE_BIG5_1 6
/* Big5 Level 2 2/4 2/{(8),9,10,11} 4/0 '1' */
-#define LEADING_BYTE_CHINESE_BIG5_2 (MIN_LEADING_BYTE + 22)
+#define LEADING_BYTE_CHINESE_BIG5_2 7
/* VISCII 1.1 */
-#define LEADING_BYTE_LATIN_VISCII (MIN_LEADING_BYTE + 24)
+#define LEADING_BYTE_LATIN_VISCII 8
/* MULE VISCII-LOWER (CHARSET_ID_OFFSET_96 + '1') */
-#define LEADING_BYTE_LATIN_VISCII_LOWER (MIN_LEADING_BYTE + 25)
+#define LEADING_BYTE_LATIN_VISCII_LOWER 9
/* MULE VISCII-UPPER (CHARSET_ID_OFFSET_96 + '2') */
-#define LEADING_BYTE_LATIN_VISCII_UPPER (MIN_LEADING_BYTE + 26)
-
-#define LEADING_BYTE_ETHIOPIC_UCS (MIN_LEADING_BYTE + 27)
-
-#define LEADING_BYTE_DAIKANWA_0 (MIN_LEADING_BYTE + 28)
-#define LEADING_BYTE_DAIKANWA_1 (MIN_LEADING_BYTE + 29)
-#define LEADING_BYTE_DAIKANWA_2 (MIN_LEADING_BYTE + 30)
-#define LEADING_BYTE_DAIKANWA_3 (MIN_LEADING_BYTE + 31)
-
-#define LEADING_BYTE_GT (MIN_LEADING_BYTE + 40)
-#define LEADING_BYTE_GT_PJ_1 (MIN_LEADING_BYTE + 41)
-#define LEADING_BYTE_GT_PJ_2 (MIN_LEADING_BYTE + 42)
-#define LEADING_BYTE_GT_PJ_3 (MIN_LEADING_BYTE + 43)
-#define LEADING_BYTE_GT_PJ_4 (MIN_LEADING_BYTE + 44)
-#define LEADING_BYTE_GT_PJ_5 (MIN_LEADING_BYTE + 45)
-#define LEADING_BYTE_GT_PJ_6 (MIN_LEADING_BYTE + 46)
-#define LEADING_BYTE_GT_PJ_7 (MIN_LEADING_BYTE + 47)
-#define LEADING_BYTE_GT_PJ_8 (MIN_LEADING_BYTE + 48)
-#define LEADING_BYTE_GT_PJ_9 (MIN_LEADING_BYTE + 49)
-#define LEADING_BYTE_GT_PJ_10 (MIN_LEADING_BYTE + 50)
-#define LEADING_BYTE_GT_PJ_11 (MIN_LEADING_BYTE + 51)
-
-#define LEADING_BYTE_CHINA3_JEF (MIN_LEADING_BYTE + 82)
-#define LEADING_BYTE_CBETA (MIN_LEADING_BYTE + 83)
-/* #define LEADING_BYTE_CHINESE_BIG5_CDP (MIN_LEADING_BYTE + 84) */
-#define LEADING_BYTE_HANZIKU_1 (MIN_LEADING_BYTE + 85)
-#define LEADING_BYTE_HANZIKU_2 (MIN_LEADING_BYTE + 86)
-#define LEADING_BYTE_HANZIKU_3 (MIN_LEADING_BYTE + 87)
-#define LEADING_BYTE_HANZIKU_4 (MIN_LEADING_BYTE + 88)
-#define LEADING_BYTE_HANZIKU_5 (MIN_LEADING_BYTE + 89)
-#define LEADING_BYTE_HANZIKU_6 (MIN_LEADING_BYTE + 90)
-#define LEADING_BYTE_HANZIKU_7 (MIN_LEADING_BYTE + 91)
-#define LEADING_BYTE_HANZIKU_8 (MIN_LEADING_BYTE + 92)
-#define LEADING_BYTE_HANZIKU_9 (MIN_LEADING_BYTE + 93)
-#define LEADING_BYTE_HANZIKU_10 (MIN_LEADING_BYTE + 94)
-#define LEADING_BYTE_HANZIKU_11 (MIN_LEADING_BYTE + 95)
-#define LEADING_BYTE_HANZIKU_12 (MIN_LEADING_BYTE + 96)
-
-#define MIN_LEADING_BYTE_PRIVATE (MIN_LEADING_BYTE + 97)
-#define MAX_LEADING_BYTE_PRIVATE -1
+#define LEADING_BYTE_LATIN_VISCII_UPPER 10
+
+#define LEADING_BYTE_ETHIOPIC_UCS 11
+
+#define MIN_LEADING_BYTE_PRIVATE 12
+#define MAX_LEADING_BYTE_PRIVATE 512
/* ISO 646 IRV */
-#define LEADING_BYTE_ASCII 6 /* (CHARSET_ID_OFFSET_94 + 'B') */
+#define LEADING_BYTE_ASCII -6 /* (CHARSET_ID_OFFSET_94 + 'B') */
/* Right half of JIS X0201-1976 */
-#define LEADING_BYTE_KATAKANA_JISX0201 13 /* (CHARSET_ID_OFFSET_94 + 'I') */
+#define LEADING_BYTE_KATAKANA_JISX0201 -13 /* (CHARSET_ID_OFFSET_94 + 'I') */
/* Left half of JIS X0201-1976 */
-#define LEADING_BYTE_LATIN_JISX0201 14 /* (CHARSET_ID_OFFSET_94 + 'J') */
+#define LEADING_BYTE_LATIN_JISX0201 -14 /* (CHARSET_ID_OFFSET_94 + 'J') */
-/* #define CHARSET_ID_OFFSET_96 (CHARSET_ID_OFFSET_94 + 80) */
-
/* Right half of ISO 8859-1 */
-#define LEADING_BYTE_LATIN_ISO8859_1 100 /* (CHARSET_ID_OFFSET_96 + 'A') */
+#define LEADING_BYTE_LATIN_ISO8859_1 -100 /* (CHARSET_ID_OFFSET_96 + 'A') */
/* Right half of ISO 8859-2 */
-#define LEADING_BYTE_LATIN_ISO8859_2 101 /* (CHARSET_ID_OFFSET_96 + 'B') */
+#define LEADING_BYTE_LATIN_ISO8859_2 -101 /* (CHARSET_ID_OFFSET_96 + 'B') */
/* Right half of ISO 8859-3 */
-#define LEADING_BYTE_LATIN_ISO8859_3 109 /* (CHARSET_ID_OFFSET_96 + 'C') */
+#define LEADING_BYTE_LATIN_ISO8859_3 -109 /* (CHARSET_ID_OFFSET_96 + 'C') */
/* Right half of ISO 8859-4 */
-#define LEADING_BYTE_LATIN_ISO8859_4 110 /* (CHARSET_ID_OFFSET_96 + 'D') */
+#define LEADING_BYTE_LATIN_ISO8859_4 -110 /* (CHARSET_ID_OFFSET_96 + 'D') */
/* Right half of ISO 8859-7 */
-#define LEADING_BYTE_GREEK_ISO8859_7 126 /* (CHARSET_ID_OFFSET_96 + 'F') */
+#define LEADING_BYTE_GREEK_ISO8859_7 -126 /* (CHARSET_ID_OFFSET_96 + 'F') */
/* Right half of ISO 8859-6 */
-#define LEADING_BYTE_ARABIC_ISO8859_6 127 /* (CHARSET_ID_OFFSET_96 + 'G') */
+#define LEADING_BYTE_ARABIC_ISO8859_6 -127 /* (CHARSET_ID_OFFSET_96 + 'G') */
/* Right half of ISO 8859-8 */
-#define LEADING_BYTE_HEBREW_ISO8859_8 138 /* (CHARSET_ID_OFFSET_96 + 'H') */
+#define LEADING_BYTE_HEBREW_ISO8859_8 -138 /* (CHARSET_ID_OFFSET_96 + 'H') */
/* Right half of ISO 8859-5 */
-#define LEADING_BYTE_CYRILLIC_ISO8859_5 144 /* (CHARSET_ID_OFFSET_96 + 'L') */
+#define LEADING_BYTE_CYRILLIC_ISO8859_5 -144 /* (CHARSET_ID_OFFSET_96 + 'L') */
/* Right half of ISO 8859-9 */
-#define LEADING_BYTE_LATIN_ISO8859_9 148 /* (CHARSET_ID_OFFSET_96 + 'M') */
+#define LEADING_BYTE_LATIN_ISO8859_9 -148 /* (CHARSET_ID_OFFSET_96 + 'M') */
/* TIS620-2533 */
-#define LEADING_BYTE_THAI_TIS620 166 /* (CHARSET_ID_OFFSET_96 + 'T') */
+#define LEADING_BYTE_THAI_TIS620 -166 /* (CHARSET_ID_OFFSET_96 + 'T') */
/* Right-hand Part of the VSCII-2 (TCVN 5712:1983) */
-#define LEADING_BYTE_LATIN_TCVN5712 180 /* F = 5/10 0x5A `Z' */
-
+#define LEADING_BYTE_LATIN_TCVN5712 -180 /* F = 5/10 0x5A `Z' */
-/* #define CHARSET_ID_OFFSET_94x94 (CHARSET_ID_OFFSET_96 + 80) */
-
-/* #define MIN_LEADING_BYTE_PRIVATE_2 ('0' + CHARSET_ID_OFFSET_94x94) */
-/* #define MAX_LEADING_BYTE_PRIVATE_2 ('?' + CHARSET_ID_OFFSET_94x94) */
/* Japanese JIS X0208-1978 2/4 2/{(8),9,10,11} 4/0 (@) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1978 42
+#define LEADING_BYTE_JAPANESE_JISX0208_1978 -42
/* Chinese Hanzi GB2312-1980 2/4 2/{(8),9,10,11} 4/1 (A) */
-#define LEADING_BYTE_CHINESE_GB2312 58
+#define LEADING_BYTE_CHINESE_GB2312 -58
/* Japanese JIS X0208-1983 2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208 87
+#define LEADING_BYTE_JAPANESE_JISX0208 -87
+
+/* Japanese JIS X0208-1990 2/4 2/{(8),9,10,11} 4/2 (B) */
+#define LEADING_BYTE_JAPANESE_JISX0208_1990 -168
/* Hangul KS C5601-1987 2/4 2/{8,9,10,11} 4/3 (C) */
-#define LEADING_BYTE_KOREAN_KSC5601 149
+#define LEADING_BYTE_KOREAN_KSC5601 -149
/* Japanese JIS X0212-1990 2/4 2/{8,9,10,11} 4/4 (D) */
-#define LEADING_BYTE_JAPANESE_JISX0212 159
+#define LEADING_BYTE_JAPANESE_JISX0212 -159
/* CCITT Extended GB 2/4 2/{8,9,10,11} 4/5 (E) */
-#define LEADING_BYTE_CHINESE_CCITT_GB 165
+#define LEADING_BYTE_CHINESE_CCITT_GB -165
/* Chinese CNS11643 Set 1 2/4 2/{8,9,10,11} 4/7 (G) */
-#define LEADING_BYTE_CHINESE_CNS11643_1 171
+#define LEADING_BYTE_CHINESE_CNS11643_1 -171
/* Chinese CNS11643 Set 2 2/4 2/{8,9,10,11} 4/8 (H) */
-#define LEADING_BYTE_CHINESE_CNS11643_2 172
+#define LEADING_BYTE_CHINESE_CNS11643_2 -172
/* Chinese CNS11643 Set 3 2/4 2/{8,9,10,11} 4/9 (I) */
-#define LEADING_BYTE_CHINESE_CNS11643_3 183
+#define LEADING_BYTE_CHINESE_CNS11643_3 -183
/* Chinese CNS11643 Set 4 2/4 2/{8,9,10,11} 4/10 (J) */
-#define LEADING_BYTE_CHINESE_CNS11643_4 184
+#define LEADING_BYTE_CHINESE_CNS11643_4 -184
/* Chinese CNS11643 Set 5 2/4 2/{8,9,10,11} 4/11 (K) */
-#define LEADING_BYTE_CHINESE_CNS11643_5 185
+#define LEADING_BYTE_CHINESE_CNS11643_5 -185
/* Chinese CNS11643 Set 6 2/4 2/{8,9,10,11} 4/12 (L) */
-#define LEADING_BYTE_CHINESE_CNS11643_6 186
+#define LEADING_BYTE_CHINESE_CNS11643_6 -186
/* Chinese CNS11643 Set 7 2/4 2/{8,9,10,11} 4/13 (M) */
-#define LEADING_BYTE_CHINESE_CNS11643_7 187
+#define LEADING_BYTE_CHINESE_CNS11643_7 -187
/* DPRK Hangul KPS 9566-1997 2/4 2/{8,9,10,11} 4/14 (N) */
-#define LEADING_BYTE_KOREAN_KPS9566 202
+#define LEADING_BYTE_KOREAN_KPS9566 -202
+
+#define MIN_LEADING_BYTE (- 80 * 3)
-#define NUM_LEADING_BYTES (80 * 3 - MIN_LEADING_BYTE)
+#define NUM_LEADING_BYTES (MAX_LEADING_BYTE_PRIVATE - MIN_LEADING_BYTE)
\f
/************************************************************************/
#define XCHARSET(x) XRECORD (x, charset, Lisp_Charset)
#define XSETCHARSET(x, p) XSETRECORD (x, p, charset)
#define CHARSETP(x) RECORDP (x, charset)
-#define GC_CHARSETP(x) GC_RECORDP (x, charset)
#define CHECK_CHARSET(x) CHECK_RECORD (x, charset)
#define CONCHECK_CHARSET(x) CONCHECK_RECORD (x, charset)
#define CHARSET_MOTHER(cs) ((cs)->mother)
#define CHARSET_CONVERSION(cs) ((cs)->conversion)
+INLINE_HEADER int CHARSET_BYTE_SIZE (Lisp_Charset* cs);
+INLINE_HEADER int
+CHARSET_BYTE_SIZE (Lisp_Charset* cs)
+{
+ /* ad-hoc method for `ascii' */
+ if ((CHARSET_CHARS (cs) == 94) &&
+ (CHARSET_BYTE_OFFSET (cs) != 33))
+ return 128 - CHARSET_BYTE_OFFSET (cs);
+ else
+ return CHARSET_CHARS (cs);
+}
+
INLINE_HEADER Lisp_Object CHARSET_ENCODING_TABLE (Lisp_Charset* cs);
INLINE_HEADER Lisp_Object
CHARSET_ENCODING_TABLE (Lisp_Charset* cs)
}
#define CONVERSION_IDENTICAL 0
-#define CONVERSION_94x60 1
-#define CONVERSION_94x94x60 2
+#define CONVERSION_94 1
+#define CONVERSION_96 2
+#define CONVERSION_94x60 3
+#define CONVERSION_94x94 4
+#define CONVERSION_96x96 5
+#define CONVERSION_94x94x60 6
+#define CONVERSION_94x94x94 7
+#define CONVERSION_96x96x96 8
+#define CONVERSION_94x94x94x60 9
+#define CONVERSION_94x94x94x94 10
+#define CONVERSION_96x96x96x96 11
#define XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs))
#define XCHARSET_NAME(cs) CHARSET_NAME (XCHARSET (cs))
#define XCHARSET_CCL_PROGRAM(cs) CHARSET_CCL_PROGRAM (XCHARSET (cs))
#define XCHARSET_DIMENSION(cs) CHARSET_DIMENSION (XCHARSET (cs))
#define XCHARSET_CHARS(cs) CHARSET_CHARS (XCHARSET (cs))
+#define XCHARSET_BYTE_SIZE(cs) CHARSET_BYTE_SIZE (XCHARSET (cs))
#define XCHARSET_REVERSE_DIRECTION_CHARSET(cs) \
CHARSET_REVERSE_DIRECTION_CHARSET (XCHARSET (cs))
#define XCHARSET_DECODING_TABLE(cs) CHARSET_DECODING_TABLE(XCHARSET(cs))
#define MIN_CHAR_SIP 0x020000
#define MAX_CHAR_SIP 0x02FFFF
+#if 0
#define MIN_CHAR_DAIKANWA 0x00E00000
#define MAX_CHAR_DAIKANWA (MIN_CHAR_DAIKANWA + 50100) /* 0xE0FFFF */
+
#define MIN_CHAR_CBETA 0x00E20000
#define MAX_CHAR_CBETA 0x00E2FFFF
+
#define MIN_CHAR_CHINA3_JEF 0x00E80000
#define MAX_CHAR_CHINA3_JEF 0x00E8FFFF
+#endif
#define MIN_CHAR_94 0x00E90940
#define MAX_CHAR_94 (MIN_CHAR_94 + 94 * 80 - 1)
#define MIN_CHAR_96x96 0xF4C000
#define MAX_CHAR_96x96 (MIN_CHAR_96x96 + 96 * 96 * 80 - 1)
+/*
#define MIN_CHAR_GT 0x61000000
-#define MAX_CHAR_GT (MIN_CHAR_GT + 66773)
+#define MAX_CHAR_GT (MIN_CHAR_GT + 67547)
+*/
#define MIN_CHAR_BIG5_CDP 0x62000000
#define MAX_CHAR_BIG5_CDP 0x6200FFFF
+/*
#define MIN_CHAR_HANZIKU_1 (0x62000000 + 65536 * 1)
#define MAX_CHAR_HANZIKU_1 (0x62000000 + 65536 * 1 + 65535)
#define MIN_CHAR_HANZIKU_2 (0x62000000 + 65536 * 2)
#define MAX_CHAR_HANZIKU_11 (0x62000000 + 65536 * 11 + 65535)
#define MIN_CHAR_HANZIKU_12 (0x62000000 + 65536 * 12)
#define MAX_CHAR_HANZIKU_12 (0x62000000 + 65536 * 12 + 65535)
+*/
Emchar decode_builtin_char (Lisp_Object charset, int code_point);
-extern Lisp_Object Vcharset_chinese_big5;
-extern Lisp_Object Vcharset_chinese_big5_1;
-extern Lisp_Object Vcharset_chinese_big5_2;
-
-INLINE_HEADER Emchar
-DECODE_DEFINED_CHAR (Lisp_Object charset, int code_point);
-INLINE_HEADER Emchar
-DECODE_DEFINED_CHAR (Lisp_Object charset, int code_point)
+INLINE_HEADER Lisp_Object
+get_ccs_octet_table (Lisp_Object table, Lisp_Object ccs, int code);
+INLINE_HEADER Lisp_Object
+get_ccs_octet_table (Lisp_Object table, Lisp_Object ccs, int code)
{
- int dim = XCHARSET_DIMENSION (charset);
- Lisp_Object decoding_table = XCHARSET_DECODING_TABLE (charset);
- int idx;
- Lisp_Object ch;
+ int byte_offset = XCHARSET_BYTE_OFFSET (ccs);
- while (dim > 0)
+ if (VECTORP (table))
{
- dim--;
- if ( VECTORP (decoding_table)
- && ( 0 <= (idx = ((code_point >> (dim * 8))
- & 255) - XCHARSET_BYTE_OFFSET (charset)) )
- && ( idx < XVECTOR_LENGTH (decoding_table) )
- && !NILP (ch = XVECTOR_DATA(decoding_table)[idx]) )
- {
- if (CHARP (ch))
- return XCHAR (ch);
- else
- decoding_table = ch;
- }
+ int idx = code - byte_offset;
+
+ if (idx < XVECTOR_LENGTH(table))
+ return XVECTOR_DATA(table)[idx];
else
- break;
+ return Qunbound;
+ }
+ else
+ return table;
+}
+
+INLINE_HEADER Lisp_Object
+put_ccs_octet_table (Lisp_Object table, Lisp_Object ccs, int code,
+ Lisp_Object value);
+INLINE_HEADER Lisp_Object
+put_ccs_octet_table (Lisp_Object table, Lisp_Object ccs, int code,
+ Lisp_Object value)
+{
+ int byte_offset = XCHARSET_BYTE_OFFSET (ccs);
+ int ccs_len = XCHARSET_BYTE_SIZE (ccs);
+
+ if (VECTORP (table))
+ {
+ XVECTOR_DATA(table)[code - byte_offset] = value;
+ return table;
+ }
+ else if (EQ (table, value))
+ return table;
+ else
+ {
+ table = make_vector (ccs_len, table);
+ XVECTOR_DATA(table)[code - byte_offset] = value;
+ return table;
+ }
+}
+
+INLINE_HEADER void
+decoding_table_put_char (Lisp_Object ccs,
+ int code_point, Lisp_Object character);
+INLINE_HEADER void
+decoding_table_put_char (Lisp_Object ccs,
+ int code_point, Lisp_Object character)
+{
+ Lisp_Object table1 = XCHARSET_DECODING_TABLE (ccs);
+ int dim = XCHARSET_DIMENSION (ccs);
+
+ if (dim == 1)
+ XCHARSET_DECODING_TABLE (ccs)
+ = put_ccs_octet_table (table1, ccs, code_point, character);
+ else if (dim == 2)
+ {
+ Lisp_Object table2
+ = get_ccs_octet_table (table1, ccs, (unsigned char)(code_point >> 8));
+
+ table2 = put_ccs_octet_table (table2, ccs,
+ (unsigned char)code_point, character);
+ XCHARSET_DECODING_TABLE (ccs)
+ = put_ccs_octet_table (table1, ccs,
+ (unsigned char)(code_point >> 8), table2);
+ }
+ else if (dim == 3)
+ {
+ Lisp_Object table2
+ = get_ccs_octet_table (table1, ccs, (unsigned char)(code_point >> 16));
+ Lisp_Object table3
+ = get_ccs_octet_table (table2, ccs, (unsigned char)(code_point >> 8));
+
+ table3 = put_ccs_octet_table (table3, ccs,
+ (unsigned char)code_point, character);
+ table2 = put_ccs_octet_table (table2, ccs,
+ (unsigned char)(code_point >> 8), table3);
+ XCHARSET_DECODING_TABLE (ccs)
+ = put_ccs_octet_table (table1, ccs,
+ (unsigned char)(code_point >> 16), table2);
+ }
+ else /* if (dim == 4) */
+ {
+ Lisp_Object table2
+ = get_ccs_octet_table (table1, ccs, (unsigned char)(code_point >> 24));
+ Lisp_Object table3
+ = get_ccs_octet_table (table2, ccs, (unsigned char)(code_point >> 16));
+ Lisp_Object table4
+ = get_ccs_octet_table (table3, ccs, (unsigned char)(code_point >> 8));
+
+ table4 = put_ccs_octet_table (table4, ccs,
+ (unsigned char)code_point, character);
+ table3 = put_ccs_octet_table (table3, ccs,
+ (unsigned char)(code_point >> 8), table4);
+ table2 = put_ccs_octet_table (table2, ccs,
+ (unsigned char)(code_point >> 16), table3);
+ XCHARSET_DECODING_TABLE (ccs)
+ = put_ccs_octet_table (table1, ccs,
+ (unsigned char)(code_point >> 24), table2);
}
- return -1;
}
+INLINE_HEADER void
+decoding_table_remove_char (Lisp_Object ccs, int code_point);
+INLINE_HEADER void
+decoding_table_remove_char (Lisp_Object ccs, int code_point)
+{
+ decoding_table_put_char (ccs, code_point, Qunbound);
+}
+
+Emchar decode_defined_char (Lisp_Object charset, int code_point);
+
INLINE_HEADER Emchar DECODE_CHAR (Lisp_Object charset, int code_point);
INLINE_HEADER Emchar
DECODE_CHAR (Lisp_Object charset, int code_point)
{
- Emchar char_id = DECODE_DEFINED_CHAR (charset, code_point);
+ Emchar char_id = decode_defined_char (charset, code_point);
if (char_id >= 0)
return char_id;
extern Lisp_Object Vcharacter_attribute_table;
int encode_builtin_char_1 (Emchar c, Lisp_Object* charset);
-int charset_code_point (Lisp_Object charset, Emchar ch);
+int charset_code_point (Lisp_Object charset, Emchar ch, int defined_only);
int range_charset_code_point (Lisp_Object charset, Emchar ch);
extern Lisp_Object Vdefault_coded_charset_priority_list;
*charset = Ffind_charset (Fcar (charsets));
if (!NILP (*charset))
{
- int code_point = charset_code_point (*charset, ch);
+ int code_point = charset_code_point (*charset, ch, 0);
if (code_point >= 0)
return code_point;
return cc;
}
-\f
-/************************************************************************/
-/* Exported functions */
-/************************************************************************/
-
-EXFUN (Fget_charset, 1);
-
-extern Lisp_Object Qucs;
-
-extern Lisp_Object Vcharset_japanese_jisx0208;
-extern Lisp_Object Vcharset_japanese_jisx0208_1990;
-extern Lisp_Object Vcharset_japanese_jisx0212;
-
-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);
-
#endif /* INCLUDED_char_ucs_h_ */
projects / chise / xemacs-chise.git / blobdiff