#ifdef UTF2000
Lisp_Object Vcharset_ucs;
Lisp_Object Vcharset_ucs_bmp;
+Lisp_Object Vcharset_ucs_cns;
Lisp_Object Vcharset_latin_viscii;
Lisp_Object Vcharset_latin_tcvn5712;
Lisp_Object Vcharset_latin_viscii_lower;
Lisp_Object rest = attributes;
Lisp_Object code = Fcdr (Fassq (Qucs, attributes));
Lisp_Object character;
-#if 0
- Lisp_Object daikanwa = Qnil;
-#endif
if (NILP (code))
{
while (CONSP (rest))
{
Lisp_Object cell = Fcar (rest);
-#if 0
- Lisp_Object key = Fcar (cell);
- Lisp_Object value = Fcdr (cell);
-#endif
if (!LISTP (cell))
signal_simple_error ("Invalid argument", attributes);
-#if 0
- if (EQ (key, Qmorohashi_daikanwa))
- {
- size_t len;
- GET_EXTERNAL_LIST_LENGTH (value, len);
-
- if (len == 1)
- {
- if (NILP (daikanwa))
- daikanwa = Fcdr (Fassq (Qideograph_daikanwa, rest));
- if (EQ (Fcar (value), daikanwa))
- goto ignored;
- }
- }
- else if (EQ (key, Qideograph_daikanwa))
- daikanwa = value;
-#endif
-
Fput_char_attribute (character, Fcar (cell), Fcdr (cell));
-#if 0
- ignored:
-#endif
rest = Fcdr (rest);
}
return character;
Qchinese_cns11643_2,
#ifdef UTF2000
Qucs_bmp,
+ Qucs_cns,
Qlatin_viscii,
Qlatin_tcvn5712,
Qlatin_viscii_lower,
*charset = Vcharset_ucs;
return c;
}
- /*
else if (c <= MAX_CHAR_DAIKANWA)
{
*charset = Vcharset_ideograph_daikanwa;
return c - MIN_CHAR_DAIKANWA;
}
- */
- else if (c <= MAX_CHAR_MOJIKYO)
+ else if (c <= MAX_CHAR_MOJIKYO_0)
{
*charset = Vcharset_mojikyo;
- return c - MIN_CHAR_MOJIKYO;
+ return c - MIN_CHAR_MOJIKYO_0;
}
else if (c < MIN_CHAR_94)
{
return c;
}
}
+ else if (c < MIN_CHAR_MOJIKYO)
+ {
+ *charset = Vcharset_ucs;
+ return c;
+ }
+ else if (c <= MAX_CHAR_MOJIKYO)
+ {
+ *charset = Vcharset_mojikyo;
+ return c - MIN_CHAR_MOJIKYO;
+ }
else
{
*charset = Vcharset_ucs;
defsymbol (&Qfont, "font");
defsymbol (&Qucs, "ucs");
defsymbol (&Qucs_bmp, "ucs-bmp");
+ defsymbol (&Qucs_cns, "ucs-cns");
defsymbol (&Qlatin_viscii, "latin-viscii");
defsymbol (&Qlatin_tcvn5712, "latin-tcvn5712");
defsymbol (&Qlatin_viscii_lower, "latin-viscii-lower");
build_string ("ISO/IEC 10646 Group 0 Plane 0 (BMP)"),
build_string ("\\(ISO10646.*-1\\|UNICODE[23]?-0\\)"),
Qnil, 0, 0xFFFF, 0, 0);
+ staticpro (&Vcharset_ucs_cns);
+ Vcharset_ucs_cns =
+ make_charset (LEADING_BYTE_UCS_CNS, Qucs_cns, 256, 4,
+ 1, 2, 0, CHARSET_LEFT_TO_RIGHT,
+ build_string ("UCS for CNS"),
+ build_string ("UCS for CNS 11643"),
+ build_string ("ISO/IEC 10646 for CNS 11643"),
+ build_string (""),
+ Qnil, 0, 0xFFFFFFF, 0, 0);
#else
# define MIN_CHAR_THAI 0
# define MAX_CHAR_THAI 0