#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 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
/************************************************************************/
}
#define CONVERSION_IDENTICAL 0
-#define CONVERSION_94x60 1
-#define CONVERSION_94x94x60 2
+#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 XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs))
#define XCHARSET_NAME(cs) CHARSET_NAME (XCHARSET (cs))
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 Lisp_Object
get_ccs_octet_table (Lisp_Object table, Lisp_Object ccs, int code);
INLINE_HEADER Lisp_Object
Emchar load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point);
#endif
-INLINE_HEADER Emchar
-DECODE_DEFINED_CHAR (Lisp_Object charset, int code_point);
-INLINE_HEADER Emchar
-DECODE_DEFINED_CHAR (Lisp_Object ccs, int code_point)
-{
- int dim = XCHARSET_DIMENSION (ccs);
- Lisp_Object decoding_table = XCHARSET_DECODING_TABLE (ccs);
-
- while (dim > 0)
- {
- dim--;
- decoding_table
- = get_ccs_octet_table (decoding_table, ccs,
- (code_point >> (dim * 8)) & 255);
- }
- if (CHARP (decoding_table))
- return XCHAR (decoding_table);
-#ifdef HAVE_DATABASE
- if (EQ (decoding_table, Qunloaded) ||
- EQ (decoding_table, Qunbound) ||
- NILP (decoding_table) )
- {
- return load_char_decoding_entry_maybe (ccs, code_point);
- }
-#endif
- else
- return -1;
-}
+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;
- else if (XCHARSET_DIMENSION (charset) == 1)
+ else
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
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_ */