#include "chartab.h"
#include "elhash.h"
-EXFUN (Fmake_directory_internal, 1);
-
extern Lisp_Object Vchar_attribute_hash_table;
#define valid_char_p(ch) 1
typedef short Charset_ID;
/* ISO/IEC 10646 */
-#define LEADING_BYTE_UCS 1
+#define LEADING_BYTE_UCS -177
/* represent normal 80-9F */
-#define LEADING_BYTE_CONTROL_1 2
+#define LEADING_BYTE_CONTROL_1 -77
/* ISO/IEC 10646 BMP */
-#define LEADING_BYTE_UCS_BMP 3
+#define LEADING_BYTE_UCS_BMP -176
/* ISO/IEC 10646 SMP */
-#define LEADING_BYTE_UCS_SMP 4
+#define LEADING_BYTE_UCS_SMP 1
/* ISO/IEC 10646 SIP */
-#define LEADING_BYTE_UCS_SIP 5
+#define LEADING_BYTE_UCS_SIP 2
/* Japanese JIS X0208 Common 2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JIS_X0208 11
-
-/* Japanese JIS X0208-1990 2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 12
+#define LEADING_BYTE_JIS_X0208 3
/* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345 13
+#define LEADING_BYTE_CHINESE_GB12345 4
-#define LEADING_BYTE_CHINESE_BIG5 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 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 22
+#define LEADING_BYTE_CHINESE_BIG5_2 7
/* VISCII 1.1 */
-#define LEADING_BYTE_LATIN_VISCII 24
+#define LEADING_BYTE_LATIN_VISCII 8
/* MULE VISCII-LOWER (CHARSET_ID_OFFSET_96 + '1') */
-#define LEADING_BYTE_LATIN_VISCII_LOWER 25
+#define LEADING_BYTE_LATIN_VISCII_LOWER 9
/* MULE VISCII-UPPER (CHARSET_ID_OFFSET_96 + '2') */
-#define LEADING_BYTE_LATIN_VISCII_UPPER 26
+#define LEADING_BYTE_LATIN_VISCII_UPPER 10
-#define LEADING_BYTE_ETHIOPIC_UCS 27
+#define LEADING_BYTE_ETHIOPIC_UCS 11
-#define MIN_LEADING_BYTE_PRIVATE 28
+#define MIN_LEADING_BYTE_PRIVATE 12
#define MAX_LEADING_BYTE_PRIVATE 512
#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_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
/* Japanese JIS X0208-1983 2/4 2/{(8),9,10,11} 4/2 (B) */
#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
/* DPRK Hangul KPS 9566-1997 2/4 2/{8,9,10,11} 4/14 (N) */
#define LEADING_BYTE_KOREAN_KPS9566 -202
+
#define MIN_LEADING_BYTE (- 80 * 3)
#define NUM_LEADING_BYTES (MAX_LEADING_BYTE_PRIVATE - MIN_LEADING_BYTE)
#define CONVERSION_IDENTICAL 0
#define CONVERSION_94 1
#define CONVERSION_96 2
-#define CONVERSION_94x94 3
-#define CONVERSION_96x96 4
-#define CONVERSION_94x94x94 5
-#define CONVERSION_96x96x96 6
-#define CONVERSION_94x94x94x94 7
-#define CONVERSION_96x96x96x96 8
-#define CONVERSION_94x60 9
-#define CONVERSION_94x94x60 10
-#define CONVERSION_94x94x94x60 11
-#define CONVERSION_BIG5_1 12
-#define CONVERSION_BIG5_2 13
+#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))
decoding_table_put_char (Lisp_Object ccs,
int code_point, Lisp_Object character)
{
-#if 1
Lisp_Object table1 = XCHARSET_DECODING_TABLE (ccs);
int dim = XCHARSET_DIMENSION (ccs);
= put_ccs_octet_table (table1, ccs,
(unsigned char)(code_point >> 24), table2);
}
-#else
- Lisp_Object v = XCHARSET_DECODING_TABLE (ccs);
- int dim = XCHARSET_DIMENSION (ccs);
- int byte_offset = XCHARSET_BYTE_OFFSET (ccs);
- int i = -1;
- Lisp_Object nv;
- int ccs_len = XVECTOR_LENGTH (v);
-
- while (dim > 0)
- {
- dim--;
- i = ((code_point >> (8 * dim)) & 255) - byte_offset;
- nv = XVECTOR_DATA(v)[i];
- if (dim > 0)
- {
- if (!VECTORP (nv))
- {
- if (EQ (nv, character))
- return;
- else
- nv = (XVECTOR_DATA(v)[i] = make_vector (ccs_len, Qnil));
- }
- v = nv;
- }
- else
- break;
- }
- XVECTOR_DATA(v)[i] = character;
-#endif
}
INLINE_HEADER void
decoding_table_put_char (ccs, code_point, Qunbound);
}
-#ifdef HAVE_CHISE_CLIENT
-Emchar load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point);
-#endif
-
Emchar decode_defined_char (Lisp_Object charset, int code_point);
INLINE_HEADER Emchar DECODE_CHAR (Lisp_Object charset, int code_point);
if (char_id >= 0)
return char_id;
- else
+ else if (XCHARSET_DIMENSION (charset) == 1)
return decode_builtin_char (charset, code_point);
+ else if (EQ (charset, Vcharset_chinese_big5_1))
+ {
+ unsigned int I
+ = ((code_point >> 8) - 33) * (0xFF - 0xA1)
+ + ((code_point & 0xFF) - 33);
+ unsigned char b1 = I / (0xFF - 0xA1 + 0x7F - 0x40) + 0xA1;
+ unsigned char b2 = I % (0xFF - 0xA1 + 0x7F - 0x40);
+
+ b2 += b2 < 0x3F ? 0x40 : 0x62;
+ return DECODE_CHAR (Vcharset_chinese_big5, (b1 << 8) | b2);
+ }
+ else if (EQ (charset, Vcharset_chinese_big5_2))
+ {
+ unsigned int I
+ = ((code_point >> 8) - 33) * (0xFF - 0xA1)
+ + ((code_point & 0xFF) - 33);
+ unsigned char b1, b2;
+
+ I += (0xFF - 0xA1 + 0x7F - 0x40) * (0xC9 - 0xA1);
+ b1 = I / (0xFF - 0xA1 + 0x7F - 0x40) + 0xA1;
+ b2 = I % (0xFF - 0xA1 + 0x7F - 0x40);
+ b2 += b2 < 0x3F ? 0x40 : 0x62;
+ return DECODE_CHAR (Vcharset_chinese_big5, (b1 << 8) | b2);
+ }
+ return decode_builtin_char (charset, code_point);
}
/* Return a character whose charset is CHARSET and position-codes
projects / chise / xemacs-chise.git / blobdiff