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_morohashi_daikanwa_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 Qmorohashi_daikanwa;
+Lisp_Object Qideograph_daikanwa;
Lisp_Object Q_decomposition;
Lisp_Object Qucs;
Lisp_Object Q_ucs;
*/
(character))
{
+ Lisp_Object alist, ret;
+ int i;
+
CHECK_CHAR (character);
- return Fcopy_alist (get_char_id_table (XCHAR (character),
- Vcharacter_attribute_table));
+ alist = Fcopy_alist (get_char_id_table (XCHAR (character),
+ Vcharacter_attribute_table));
+
+ ret = get_char_id_table (XCHAR (character), Vcharacter_name_table);
+ if (!NILP (ret))
+ 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_morohashi_daikanwa_table);
+ if (!NILP (ret))
+ alist = Fcons (Fcons (Qmorohashi_daikanwa, 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;
}
DEFUN ("get-char-attribute", Fget_char_attribute, 2, 2, 0, /*
{
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, Qmorohashi_daikanwa))
+ {
+ return get_char_id_table (XCHAR (character),
+ Vcharacter_morohashi_daikanwa_table);
+ }
+ else if (EQ (attribute, Q_decomposition))
+ {
+ return get_char_id_table (XCHAR (character),
+ Vcharacter_decomposition_table);
+ }
else
{
Lisp_Object ret
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, Qmorohashi_daikanwa))
+ {
+ CHECK_LIST (value);
+ put_char_id_table (XCHAR (character), value,
+ Vcharacter_morohashi_daikanwa_table);
+ return value;
+ }
else if (EQ (attribute, Q_decomposition))
{
+ Lisp_Object seq;
+
if (!CONSP (value))
signal_simple_error ("Invalid value for ->decomposition",
value);
{
Lisp_Object rest = value;
Lisp_Object table = Vcharacter_composition_table;
+ size_t len;
+ int i = 0;
+
+ GET_EXTERNAL_LIST_LENGTH (rest, len);
+ seq = make_older_vector (len, Qnil);
while (CONSP (rest))
{
Emchar c
= to_char_id (v, "Invalid value for ->decomposition", value);
+ if (c < 0)
+ XVECTOR_DATA(seq)[i++] = v;
+ else
+ XVECTOR_DATA(seq)[i++] = make_char (c);
rest = Fcdr (rest);
if (!CONSP (rest))
{
Vcharacter_variant_table);
}
}
+ seq = make_older_vector (1, v);
}
+ put_char_id_table (XCHAR (character), seq,
+ Vcharacter_decomposition_table);
+ return value;
}
else if (EQ (attribute, Q_ucs))
{
Lisp_Object rest = attributes;
Lisp_Object code = Fcdr (Fassq (Qucs, attributes));
Lisp_Object character;
+ Lisp_Object daikanwa = Qnil;
if (NILP (code))
{
while (CONSP (rest))
{
Lisp_Object cell = Fcar (rest);
+ Lisp_Object key = Fcar (cell);
+ Lisp_Object value = Fcdr (cell);
if (!LISTP (cell))
signal_simple_error ("Invalid argument", attributes);
+
+ 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;
+
Fput_char_attribute (character, Fcar (cell), Fcdr (cell));
+ ignored:
rest = Fcdr (rest);
}
return
Qlatin_viscii_upper,
Qvietnamese_viscii_lower,
Qvietnamese_viscii_upper,
- Qideograph_daikanwa,
Qmojikyo,
Qmojikyo_pj_1,
Qmojikyo_pj_2,
(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 (&Qmorohashi_daikanwa, "morohashi-daikanwa");
defsymbol (&Q_ucs, "->ucs");
defsymbol (&Q_decomposition, "->decomposition");
defsymbol (&Qcompat, "compat");
#endif
#ifdef UTF2000
- Vutf_2000_version = build_string("0.15 (Sangō)");
+ Vutf_2000_version = build_string("0.16 (Ōji)");
DEFVAR_LISP ("utf-2000-version", &Vutf_2000_version /*
Version number of UTF-2000.
*/ );
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_morohashi_daikanwa_table);
+ Vcharacter_morohashi_daikanwa_table = make_char_id_table (Qnil, 0);
+
+ /* staticpro (&Vcharacter_decomposition_table); */
+ Vcharacter_decomposition_table = make_char_id_table (Qnil, -1);
+
/* staticpro (&Vcharacter_composition_table); */
Vcharacter_composition_table = make_char_id_table (Qnil, -1);
projects / chise / xemacs-chise.git- / blobdiff