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_cbeta;
Lisp_Object Vcharset_ideograph_gt;
Lisp_Object Vcharset_ideograph_gt_pj_1;
Lisp_Object Vcharset_ideograph_gt_pj_2;
XCHARSET_ENCODING_TABLE (ccs)
= encoding_table = make_char_id_table (Qnil);
}
- put_char_id_table (XCHAR_ID_TABLE(encoding_table), character, value);
+ put_char_id_table (XCHAR_TABLE(encoding_table), character, value);
return Qt;
}
XINT (cpos));
}
}
- if (CHAR_ID_TABLE_P (encoding_table))
+ if (CHAR_TABLEP (encoding_table))
{
- put_char_id_table (XCHAR_ID_TABLE(encoding_table), character, Qnil);
+ put_char_id_table (XCHAR_TABLE(encoding_table), character, Qnil);
}
return Qt;
}
Qvietnamese_viscii_upper,
Qchinese_big5,
Qchinese_big5_cdp,
+ Qjapanese_jef_china3,
+ Qideograph_cbeta,
Qideograph_daikanwa,
Qideograph_gt,
Qideograph_gt_pj_1,
*charset = Vcharset_ideograph_daikanwa;
return c - MIN_CHAR_DAIKANWA;
}
+ /*
else if (c <= MAX_CHAR_MOJIKYO_0)
{
*charset = Vcharset_mojikyo;
return c - MIN_CHAR_MOJIKYO_0;
}
+ */
else if (c < MIN_CHAR_94)
{
*charset = Vcharset_ucs;
return c;
}
}
+ /*
else if (c < MIN_CHAR_MOJIKYO)
{
*charset = Vcharset_ucs;
*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 - MIN_CHAR_JEF_CHINA3;
+ }
+ else if (c <= MAX_CHAR_CBETA)
+ {
+ *charset = Vcharset_ideograph_cbeta;
+ return c - MIN_CHAR_CBETA;
+ }
+ */
else
{
*charset = Vcharset_ucs;
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 (&Qideograph_cbeta, "ideograph-cbeta");
defsymbol (&Qmojikyo, "mojikyo");
defsymbol (&Qmojikyo_2022_1, "mojikyo-2022-1");
defsymbol (&Qmojikyo_pj_1, "mojikyo-pj-1");
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_cbeta);
+ Vcharset_ideograph_cbeta =
+ make_charset (LEADING_BYTE_CBETA, Qideograph_cbeta, 256, 2,
+ 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
+ build_string ("CB"),
+ build_string ("CBETA"),
+ build_string ("CBETA private characters"),
+ build_string ("cbeta-0"),
+ Qnil, MIN_CHAR_CBETA, MAX_CHAR_CBETA, 0, 0);
staticpro (&Vcharset_ideograph_gt);
Vcharset_ideograph_gt =
make_charset (LEADING_BYTE_GT, Qideograph_gt, 256, 3,