Lisp_Object Vcharacter_attribute_table;
Lisp_Object Vcharacter_name_table;
+Lisp_Object Vcharacter_ideographic_radical_table;
+Lisp_Object Vcharacter_ideographic_strokes_table;
+Lisp_Object Vcharacter_total_strokes_table;
Lisp_Object Vcharacter_decomposition_table;
Lisp_Object Vcharacter_composition_table;
Lisp_Object Vcharacter_variant_table;
Lisp_Object Qname;
+Lisp_Object Qideographic_radical, Qideographic_strokes;
+Lisp_Object Qtotal_strokes;
Lisp_Object Q_decomposition;
Lisp_Object Qucs;
Lisp_Object Q_ucs;
(character))
{
Lisp_Object alist, ret;
+ int i;
CHECK_CHAR (character);
alist = Fcopy_alist (get_char_id_table (XCHAR (character),
alist = Fcons (Fcons (Qname, ret), alist);
ret = get_char_id_table (XCHAR (character),
+ Vcharacter_ideographic_radical_table);
+ if (!NILP (ret))
+ alist = Fcons (Fcons (Qideographic_radical, ret), alist);
+
+ ret = get_char_id_table (XCHAR (character),
+ Vcharacter_ideographic_strokes_table);
+ if (!NILP (ret))
+ alist = Fcons (Fcons (Qideographic_strokes, ret), alist);
+
+ ret = get_char_id_table (XCHAR (character), Vcharacter_total_strokes_table);
+ if (!NILP (ret))
+ alist = Fcons (Fcons (Qtotal_strokes, ret), alist);
+
+ ret = get_char_id_table (XCHAR (character),
Vcharacter_decomposition_table);
if (!NILP (ret))
alist = Fcons (Fcons (Q_decomposition, ret), alist);
+ for (i = 0; i < countof (chlook->charset_by_leading_byte); i++)
+ {
+ Lisp_Object ccs = chlook->charset_by_leading_byte[i];
+
+ if (!NILP (ccs))
+ {
+#if 0
+ int code_point = charset_code_point (ccs, XCHAR (character));
+
+ if (code_point >= 0)
+ {
+ alist = Fcons (Fcons (ccs, make_int (code_point)), alist);
+ }
+#else
+ Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (ccs);
+ Lisp_Object cpos;
+
+ if ( CHAR_ID_TABLE_P (encoding_table)
+ && INTP (cpos = get_char_id_table (XCHAR (character),
+ encoding_table)) )
+ {
+ alist = Fcons (Fcons (ccs, cpos), alist);
+ }
+#endif
+ }
+ }
return alist;
}
{
return get_char_id_table (XCHAR (character), Vcharacter_name_table);
}
+ else if (EQ (attribute, Qideographic_radical))
+ {
+ return get_char_id_table (XCHAR (character),
+ Vcharacter_ideographic_radical_table);
+ }
+ else if (EQ (attribute, Qideographic_strokes))
+ {
+ return get_char_id_table (XCHAR (character),
+ Vcharacter_ideographic_strokes_table);
+ }
+ else if (EQ (attribute, Qtotal_strokes))
+ {
+ return get_char_id_table (XCHAR (character),
+ Vcharacter_total_strokes_table);
+ }
else if (EQ (attribute, Q_decomposition))
{
return get_char_id_table (XCHAR (character),
put_char_id_table (XCHAR (character), value, Vcharacter_name_table);
return value;
}
+ else if (EQ (attribute, Qideographic_radical))
+ {
+ CHECK_INT (value);
+ put_char_id_table (XCHAR (character), value,
+ Vcharacter_ideographic_radical_table);
+ return value;
+ }
+ else if (EQ (attribute, Qideographic_strokes))
+ {
+ CHECK_INT (value);
+ put_char_id_table (XCHAR (character), value,
+ Vcharacter_ideographic_strokes_table);
+ return value;
+ }
+ else if (EQ (attribute, Qtotal_strokes))
+ {
+ CHECK_INT (value);
+ put_char_id_table (XCHAR (character), value,
+ Vcharacter_total_strokes_table);
+ return value;
+ }
else if (EQ (attribute, Q_decomposition))
{
Lisp_Object seq;
(struct charset_list_closure*) charset_list_closure;
Lisp_Object *charset_list = chcl->charset_list;
- *charset_list = Fcons (XCHARSET_NAME (value), *charset_list);
+ *charset_list = Fcons (key /* XCHARSET_NAME (value) */, *charset_list);
return 0;
}
defsymbol (&Qchinese_cns11643_2, "chinese-cns11643-2");
#ifdef UTF2000
defsymbol (&Qname, "name");
+ defsymbol (&Qideographic_radical, "ideographic-radical");
+ defsymbol (&Qideographic_strokes, "ideographic-strokes");
+ defsymbol (&Qtotal_strokes, "total-strokes");
defsymbol (&Q_ucs, "->ucs");
defsymbol (&Q_decomposition, "->decomposition");
defsymbol (&Qcompat, "compat");
staticpro (&Vcharacter_name_table);
Vcharacter_name_table = make_char_id_table (Qnil, 0);
+ /* staticpro (&Vcharacter_ideographic_radical_table); */
+ Vcharacter_ideographic_radical_table = make_char_id_table (Qnil, -1);
+
+ /* staticpro (&Vcharacter_ideographic_strokes_table); */
+ Vcharacter_ideographic_strokes_table = make_char_id_table (Qnil, -1);
+
+ /* staticpro (&Vcharacter_total_strokes_table); */
+ Vcharacter_total_strokes_table = make_char_id_table (Qnil, -1);
+
/* staticpro (&Vcharacter_decomposition_table); */
Vcharacter_decomposition_table = make_char_id_table (Qnil, -1);