Lisp_Object Vcharset_latin_viscii_upper;
Lisp_Object Vcharset_ideograph_daikanwa;
Lisp_Object Vcharset_mojikyo;
+Lisp_Object Vcharset_mojikyo_2022_1;
Lisp_Object Vcharset_mojikyo_pj_1;
Lisp_Object Vcharset_mojikyo_pj_2;
Lisp_Object Vcharset_mojikyo_pj_3;
static void
print_uint8_byte_table (Lisp_Object obj,
- Lisp_Object printcharfun, int escapeflag)
+ Lisp_Object printcharfun, int escapeflag)
{
Lisp_Uint8_Byte_Table *bte = XUINT8_BYTE_TABLE (obj);
int i;
return obj;
}
+static Lisp_Object
+expand_uint8_byte_table_to_uint16 (Lisp_Object table)
+{
+ Lisp_Object obj;
+ int i;
+ Lisp_Uint8_Byte_Table* bte = XUINT8_BYTE_TABLE(table);
+ Lisp_Uint16_Byte_Table* cte;
+
+ cte = alloc_lcrecord_type (Lisp_Uint16_Byte_Table,
+ &lrecord_uint16_byte_table);
+ for (i = 0; i < 256; i++)
+ {
+ cte->property[i] = UINT8_TO_UINT16 (bte->property[i]);
+ }
+ XSETUINT16_BYTE_TABLE (obj, cte);
+ return obj;
+}
+
static int
uint16_byte_table_same_value_p (Lisp_Object obj)
{
for (i = 1; i < 256; i++)
{
- if (!EQ (bte->property[i], v0))
+ if (!internal_equal (bte->property[i], v0, 0))
return 0;
}
return -1;
}
else if (UINT16_VALUE_P (value))
{
- Lisp_Object new = make_uint16_byte_table (Qnil);
- int i;
+ Lisp_Object new = expand_uint8_byte_table_to_uint16 (table);
- for (i = 0; i < 256; i++)
- {
- XUINT16_BYTE_TABLE(new)->property[i]
- = UINT8_TO_UINT16 (XUINT8_BYTE_TABLE(table)->property[i]);
- }
XUINT16_BYTE_TABLE(new)->property[idx] = UINT16_ENCODE (value);
return new;
}
return value;
}
}
- else if (!EQ (table, value))
+ else if (!internal_equal (table, value, 0))
{
if (UINT8_VALUE_P (table) && UINT8_VALUE_P (value))
{
static int
char_id_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- Lisp_Char_ID_Table *cte1 = XCHAR_ID_TABLE (obj1);
- Lisp_Char_ID_Table *cte2 = XCHAR_ID_TABLE (obj2);
+ Lisp_Object table1 = XCHAR_ID_TABLE (obj1)->table;
+ Lisp_Object table2 = XCHAR_ID_TABLE (obj2)->table;
+ int i;
- return byte_table_equal (cte1->table, cte2->table, depth + 1);
+ for (i = 0; i < 256; i++)
+ {
+ if (!internal_equal (get_byte_table (table1, i),
+ get_byte_table (table2, i), 0))
+ return 0;
+ }
+ return -1;
}
static unsigned long
Qvietnamese_viscii_lower,
Qvietnamese_viscii_upper,
Qmojikyo,
+ Qmojikyo_2022_1,
Qmojikyo_pj_1,
Qmojikyo_pj_2,
Qmojikyo_pj_3,
Emchar ucs_min, Emchar ucs_max,
Emchar code_offset, unsigned char byte_offset)
{
- unsigned char type = 0;
Lisp_Object obj;
Lisp_Charset *cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
CHARSET_BYTE_OFFSET(cs) = byte_offset;
#endif
- switch (CHARSET_CHARS (cs))
- {
- case 94:
- switch (CHARSET_DIMENSION (cs))
- {
- case 1:
- type = CHARSET_TYPE_94;
- break;
- case 2:
- type = CHARSET_TYPE_94X94;
- break;
- }
- break;
- case 96:
- switch (CHARSET_DIMENSION (cs))
- {
- case 1:
- type = CHARSET_TYPE_96;
- break;
- case 2:
- type = CHARSET_TYPE_96X96;
- break;
- }
- break;
-#ifdef UTF2000
- case 128:
- switch (CHARSET_DIMENSION (cs))
- {
- case 1:
- type = CHARSET_TYPE_128;
- break;
- case 2:
- type = CHARSET_TYPE_128X128;
- break;
- }
- break;
- case 256:
- switch (CHARSET_DIMENSION (cs))
- {
- case 1:
- type = CHARSET_TYPE_256;
- break;
- case 2:
- type = CHARSET_TYPE_256X256;
- break;
- }
- break;
-#endif
- }
-#ifndef UTF2000
- CHARSET_TYPE (cs) = type;
-#endif
-
#ifndef UTF2000
if (id == LEADING_BYTE_ASCII)
CHARSET_REP_BYTES (cs) = 1;
/* some charsets do not have final characters. This includes
ASCII, Control-1, Composite, and the two faux private
charsets. */
+ unsigned char iso2022_type
+ = (dimension == 1 ? 0 : 2) + (chars == 94 ? 0 : 1);
#if UTF2000
if (code_offset == 0)
{
- assert (NILP (chlook->charset_by_attributes[type][final]));
- chlook->charset_by_attributes[type][final] = obj;
+ assert (NILP (chlook->charset_by_attributes[iso2022_type][final]));
+ chlook->charset_by_attributes[iso2022_type][final] = obj;
}
#else
- assert (NILP (chlook->charset_by_attributes[type][final][direction]));
- chlook->charset_by_attributes[type][final][direction] = obj;
+ assert (NILP
+ (chlook->charset_by_attributes[iso2022_type][final][direction]));
+ chlook->charset_by_attributes[iso2022_type][final][direction] = obj;
#endif
}
return -1;
}
}
+ if (EQ (charset, Vcharset_mojikyo_2022_1)
+ && (MIN_CHAR_MOJIKYO < ch) && (ch < MIN_CHAR_MOJIKYO + 94 * 60 * 94))
+ {
+ int m = ch - MIN_CHAR_MOJIKYO - 1;
+ int byte1 = m / (94 * 60) + 33;
+ int byte2 = (m % (94 * 60)) / 94;
+ int byte3 = m % 94 + 33;
+
+ if (byte2 < 30)
+ byte2 += 16 + 32;
+ else
+ byte2 += 18 + 32;
+ return (byte1 << 16) | (byte2 << 8) | byte3;
+ }
return -1;
}
}
else if (c <= MAX_CHAR_94)
{
- *charset = CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_94,
+ *charset = CHARSET_BY_ATTRIBUTES (94, 1,
((c - MIN_CHAR_94) / 94) + '0',
CHARSET_LEFT_TO_RIGHT);
if (!NILP (*charset))
}
else if (c <= MAX_CHAR_96)
{
- *charset = CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_96,
+ *charset = CHARSET_BY_ATTRIBUTES (96, 1,
((c - MIN_CHAR_96) / 96) + '0',
CHARSET_LEFT_TO_RIGHT);
if (!NILP (*charset))
else if (c <= MAX_CHAR_94x94)
{
*charset
- = CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_94X94,
+ = CHARSET_BY_ATTRIBUTES (94, 2,
((c - MIN_CHAR_94x94) / (94 * 94)) + '0',
CHARSET_LEFT_TO_RIGHT);
if (!NILP (*charset))
else if (c <= MAX_CHAR_96x96)
{
*charset
- = CHARSET_BY_ATTRIBUTES (CHARSET_TYPE_96X96,
+ = CHARSET_BY_ATTRIBUTES (96, 2,
((c - MIN_CHAR_96x96) / (96 * 96)) + '0',
CHARSET_LEFT_TO_RIGHT);
if (!NILP (*charset))
{
int id, dimension = 1, chars = 94, graphic = 0, final = 0, columns = -1;
int direction = CHARSET_LEFT_TO_RIGHT;
- int type;
Lisp_Object registry = Qnil;
Lisp_Object charset;
Lisp_Object rest, keyword, value;
("Final must be in the range 0x30 - 0x5F for dimension == 2",
make_char (final));
- if (dimension == 1)
- type = (chars == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96;
- else
- type = (chars == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96;
-
- if (!NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_LEFT_TO_RIGHT)) ||
- !NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_RIGHT_TO_LEFT)))
+ if (!NILP (CHARSET_BY_ATTRIBUTES (chars, dimension, final,
+ CHARSET_LEFT_TO_RIGHT)) ||
+ !NILP (CHARSET_BY_ATTRIBUTES (chars, dimension, final,
+ CHARSET_RIGHT_TO_LEFT)))
error
("Character set already defined for this DIMENSION/CHARS/FINAL combo");
(dimension, chars, final, direction))
{
int dm, ch, fi, di = -1;
- int type;
Lisp_Object obj = Qnil;
CHECK_INT (dimension);
signal_simple_error
("Final must be in the range 0x30 - 0x5F for dimension == 2", final);
- if (dm == 1)
- type = (ch == 94) ? CHARSET_TYPE_94 : CHARSET_TYPE_96;
- else
- type = (ch == 94) ? CHARSET_TYPE_94X94 : CHARSET_TYPE_96X96;
-
- if (di == -1)
+ if (di == -1)
{
- obj = CHARSET_BY_ATTRIBUTES (type, fi, CHARSET_LEFT_TO_RIGHT);
+ obj = CHARSET_BY_ATTRIBUTES (ch, dm, fi, CHARSET_LEFT_TO_RIGHT);
if (NILP (obj))
- obj = CHARSET_BY_ATTRIBUTES (type, fi, CHARSET_RIGHT_TO_LEFT);
+ obj = CHARSET_BY_ATTRIBUTES (ch, dm, fi, CHARSET_RIGHT_TO_LEFT);
}
else
- obj = CHARSET_BY_ATTRIBUTES (type, fi, di);
+ obj = CHARSET_BY_ATTRIBUTES (ch, dm, fi, di);
if (CHARSETP (obj))
return XCHARSET_NAME (obj);
defsymbol (&Qvietnamese_viscii_upper, "vietnamese-viscii-upper");
defsymbol (&Qideograph_daikanwa, "ideograph-daikanwa");
defsymbol (&Qmojikyo, "mojikyo");
+ defsymbol (&Qmojikyo_2022_1, "mojikyo-2022-1");
defsymbol (&Qmojikyo_pj_1, "mojikyo-pj-1");
defsymbol (&Qmojikyo_pj_2, "mojikyo-pj-2");
defsymbol (&Qmojikyo_pj_3, "mojikyo-pj-3");
#endif
#ifdef UTF2000
- Vutf_2000_version = build_string("0.16 (Ōji)");
+ Vutf_2000_version = build_string("0.17 (Hōryūji)");
DEFVAR_LISP ("utf-2000-version", &Vutf_2000_version /*
Version number of UTF-2000.
*/ );
build_string ("Konjaku-Mojikyo"),
build_string (""),
Qnil, MIN_CHAR_MOJIKYO, MAX_CHAR_MOJIKYO, 0, 0);
- staticpro (&Vcharset_mojikyo_pj_1);
- Vcharset_mojikyo_pj_1 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_1, Qmojikyo_pj_1, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-1"),
- build_string ("Mojikyo (pseudo JIS encoding) part 1"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 1"),
- build_string ("jisx0208\\.Mojikyo-1$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_2);
- Vcharset_mojikyo_pj_2 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_2, Qmojikyo_pj_2, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-2"),
- build_string ("Mojikyo (pseudo JIS encoding) part 2"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 2"),
- build_string ("jisx0208\\.Mojikyo-2$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_3);
- Vcharset_mojikyo_pj_3 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_3, Qmojikyo_pj_3, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-3"),
- build_string ("Mojikyo (pseudo JIS encoding) part 3"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 3"),
- build_string ("jisx0208\\.Mojikyo-3$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_4);
- Vcharset_mojikyo_pj_4 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_4, Qmojikyo_pj_4, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-4"),
- build_string ("Mojikyo (pseudo JIS encoding) part 4"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 4"),
- build_string ("jisx0208\\.Mojikyo-4$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_5);
- Vcharset_mojikyo_pj_5 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_5, Qmojikyo_pj_5, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-5"),
- build_string ("Mojikyo (pseudo JIS encoding) part 5"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 5"),
- build_string ("jisx0208\\.Mojikyo-5$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_6);
- Vcharset_mojikyo_pj_6 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_6, Qmojikyo_pj_6, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-6"),
- build_string ("Mojikyo (pseudo JIS encoding) part 6"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 6"),
- build_string ("jisx0208\\.Mojikyo-6$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_7);
- Vcharset_mojikyo_pj_7 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_7, Qmojikyo_pj_7, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-7"),
- build_string ("Mojikyo (pseudo JIS encoding) part 7"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 7"),
- build_string ("jisx0208\\.Mojikyo-7$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_8);
- Vcharset_mojikyo_pj_8 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_8, Qmojikyo_pj_8, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-8"),
- build_string ("Mojikyo (pseudo JIS encoding) part 8"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 8"),
- build_string ("jisx0208\\.Mojikyo-8$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_9);
- Vcharset_mojikyo_pj_9 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_9, Qmojikyo_pj_9, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-9"),
- build_string ("Mojikyo (pseudo JIS encoding) part 9"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 9"),
- build_string ("jisx0208\\.Mojikyo-9$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_10);
- Vcharset_mojikyo_pj_10 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_10, Qmojikyo_pj_10, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-10"),
- build_string ("Mojikyo (pseudo JIS encoding) part 10"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 10"),
- build_string ("jisx0208\\.Mojikyo-10$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_11);
- Vcharset_mojikyo_pj_11 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_11, Qmojikyo_pj_11, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-11"),
- build_string ("Mojikyo (pseudo JIS encoding) part 11"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 11"),
- build_string ("jisx0208\\.Mojikyo-11$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_12);
- Vcharset_mojikyo_pj_12 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_12, Qmojikyo_pj_12, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-12"),
- build_string ("Mojikyo (pseudo JIS encoding) part 12"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 12"),
- build_string ("jisx0208\\.Mojikyo-12$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_13);
- Vcharset_mojikyo_pj_13 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_13, Qmojikyo_pj_13, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-13"),
- build_string ("Mojikyo (pseudo JIS encoding) part 13"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 13"),
- build_string ("jisx0208\\.Mojikyo-13$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_14);
- Vcharset_mojikyo_pj_14 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_14, Qmojikyo_pj_14, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-14"),
- build_string ("Mojikyo (pseudo JIS encoding) part 14"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 14"),
- build_string ("jisx0208\\.Mojikyo-14$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_15);
- Vcharset_mojikyo_pj_15 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_15, Qmojikyo_pj_15, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-15"),
- build_string ("Mojikyo (pseudo JIS encoding) part 15"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 15"),
- build_string ("jisx0208\\.Mojikyo-15$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_16);
- Vcharset_mojikyo_pj_16 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_16, Qmojikyo_pj_16, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-16"),
- build_string ("Mojikyo (pseudo JIS encoding) part 16"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 16"),
- build_string ("jisx0208\\.Mojikyo-16$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_17);
- Vcharset_mojikyo_pj_17 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_17, Qmojikyo_pj_17, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-17"),
- build_string ("Mojikyo (pseudo JIS encoding) part 17"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 17"),
- build_string ("jisx0208\\.Mojikyo-17$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_18);
- Vcharset_mojikyo_pj_18 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_18, Qmojikyo_pj_18, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-18"),
- build_string ("Mojikyo (pseudo JIS encoding) part 18"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 18"),
- build_string ("jisx0208\\.Mojikyo-18$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_19);
- Vcharset_mojikyo_pj_19 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_19, Qmojikyo_pj_19, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-19"),
- build_string ("Mojikyo (pseudo JIS encoding) part 19"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 19"),
- build_string ("jisx0208\\.Mojikyo-19$"),
- Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_20);
- Vcharset_mojikyo_pj_20 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_20, Qmojikyo_pj_20, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-20"),
- build_string ("Mojikyo (pseudo JIS encoding) part 20"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 20"),
- build_string ("jisx0208\\.Mojikyo-20$"),
+ staticpro (&Vcharset_mojikyo_2022_1);
+ Vcharset_mojikyo_2022_1 =
+ make_charset (LEADING_BYTE_MOJIKYO_2022_1, Qmojikyo_2022_1, 94, 3,
+ 2, 2, ':', CHARSET_LEFT_TO_RIGHT,
+ build_string ("Mojikyo-2022-1"),
+ build_string ("Mojikyo ISO-2022 Part 1"),
+ build_string ("Konjaku-Mojikyo for ISO/IEC 2022 Part 1"),
+ build_string (""),
Qnil, 0, 0, 0, 33);
- staticpro (&Vcharset_mojikyo_pj_21);
- Vcharset_mojikyo_pj_21 =
- make_charset (LEADING_BYTE_MOJIKYO_PJ_21, Qmojikyo_pj_21, 94, 2,
- 2, 0, 0, CHARSET_LEFT_TO_RIGHT,
- build_string ("Mojikyo-PJ-21"),
- build_string ("Mojikyo (pseudo JIS encoding) part 21"),
- build_string
- ("Konjaku-Mojikyo (pseudo JIS encoding) part 21"),
- build_string ("jisx0208\\.Mojikyo-21$"),
+
+#define DEF_MOJIKYO_PJ(n) \
+ staticpro (&Vcharset_mojikyo_pj_##n); \
+ Vcharset_mojikyo_pj_##n = \
+ make_charset (LEADING_BYTE_MOJIKYO_PJ_##n, Qmojikyo_pj_##n, 94, 2, \
+ 2, 0, 0, CHARSET_LEFT_TO_RIGHT, \
+ build_string ("Mojikyo-PJ-"#n), \
+ build_string ("Mojikyo (pseudo JIS encoding) part "#n), \
+ build_string \
+ ("Konjaku-Mojikyo (pseudo JIS encoding) part "#n), \
+ build_string \
+ ("\\(MojikyoPJ-"#n "\\|jisx0208\\.Mojikyo-"#n "\\)$"), \
Qnil, 0, 0, 0, 33);
+
+ DEF_MOJIKYO_PJ (1);
+ DEF_MOJIKYO_PJ (2);
+ DEF_MOJIKYO_PJ (3);
+ DEF_MOJIKYO_PJ (4);
+ DEF_MOJIKYO_PJ (5);
+ DEF_MOJIKYO_PJ (6);
+ DEF_MOJIKYO_PJ (7);
+ DEF_MOJIKYO_PJ (8);
+ DEF_MOJIKYO_PJ (9);
+ DEF_MOJIKYO_PJ (10);
+ DEF_MOJIKYO_PJ (11);
+ DEF_MOJIKYO_PJ (12);
+ DEF_MOJIKYO_PJ (13);
+ DEF_MOJIKYO_PJ (14);
+ DEF_MOJIKYO_PJ (15);
+ DEF_MOJIKYO_PJ (16);
+ DEF_MOJIKYO_PJ (17);
+ DEF_MOJIKYO_PJ (18);
+ DEF_MOJIKYO_PJ (19);
+ DEF_MOJIKYO_PJ (20);
+ DEF_MOJIKYO_PJ (21);
+
staticpro (&Vcharset_ethiopic_ucs);
Vcharset_ethiopic_ucs =
make_charset (LEADING_BYTE_ETHIOPIC_UCS, Qethiopic_ucs, 256, 2,