/* ISO/IEC 10646 SIP */
#define LEADING_BYTE_UCS_SIP (MIN_LEADING_BYTE + 5)
+/* ISO/IEC 10646 for GB */
+#define LEADING_BYTE_UCS_GB (MIN_LEADING_BYTE + 6)
+
/* ISO/IEC 10646 for CNS */
-#define LEADING_BYTE_UCS_CNS (MIN_LEADING_BYTE + 6)
+#define LEADING_BYTE_UCS_CNS (MIN_LEADING_BYTE + 7)
/* ISO/IEC 10646 for JIS */
-#define LEADING_BYTE_UCS_JIS (MIN_LEADING_BYTE + 7)
+#define LEADING_BYTE_UCS_JIS (MIN_LEADING_BYTE + 8)
/* ISO/IEC 10646 for KS */
-#define LEADING_BYTE_UCS_KS (MIN_LEADING_BYTE + 8)
+#define LEADING_BYTE_UCS_KS (MIN_LEADING_BYTE + 9)
/* ISO/IEC 10646 for Big5 */
-#define LEADING_BYTE_UCS_BIG5 (MIN_LEADING_BYTE + 9)
+#define LEADING_BYTE_UCS_BIG5 (MIN_LEADING_BYTE + 10)
+
+/* Japanese JIS X0208 Common 2/4 2/{(8),9,10,11} 4/2 (B) */
+#define LEADING_BYTE_JIS_X0208 (MIN_LEADING_BYTE + 11)
/* Japanese JIS X0208-1990 2/4 2/{(8),9,10,11} 4/2 (B) */
-#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 10)
+#define LEADING_BYTE_JAPANESE_JISX0208_1990 (MIN_LEADING_BYTE + 12)
/* Chinese GB 12345-1990 */
-#define LEADING_BYTE_CHINESE_GB12345 (MIN_LEADING_BYTE + 11)
+#define LEADING_BYTE_CHINESE_GB12345 (MIN_LEADING_BYTE + 13)
#define LEADING_BYTE_CHINESE_BIG5 (MIN_LEADING_BYTE + 20)
#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 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 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
+*/
#define MIN_CHAR_94 0x00E90940
#define MAX_CHAR_94 (MIN_CHAR_94 + 94 * 80 - 1)
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;