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;
+
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_decomposition_table);
+ if (!NILP (ret))
+ alist = Fcons (Fcons (Q_decomposition, ret), alist);
+
+ 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, 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, 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))
{
#define XCHARSET_BYTE_SIZE(ccs) CHARSET_BYTE_SIZE (XCHARSET (ccs))
+int decoding_table_check_elements (Lisp_Object v, int dim, int ccs_len);
+int
+decoding_table_check_elements (Lisp_Object v, int dim, int ccs_len)
+{
+ int i;
+
+ if (XVECTOR_LENGTH (v) > ccs_len)
+ return -1;
+
+ for (i = 0; i < XVECTOR_LENGTH (v); i++)
+ {
+ Lisp_Object c = XVECTOR_DATA(v)[i];
+
+ if (!NILP (c) && !CHARP (c))
+ {
+ if (VECTORP (c))
+ {
+ int ret = decoding_table_check_elements (c, dim - 1, ccs_len);
+ if (ret)
+ return ret;
+ }
+ else
+ return -2;
+ }
+ }
+ return 0;
+}
+
INLINE_HEADER void
decoding_table_remove_char (Lisp_Object v, int dim, int byte_offset,
int code_point);
(charset, table))
{
struct Lisp_Charset *cs;
- Lisp_Object old_table;
size_t i;
+ int byte_offset;
charset = Fget_charset (charset);
cs = XCHARSET (charset);
- if (EQ (table, Qnil))
+ if (NILP (table))
{
- CHARSET_DECODING_TABLE(cs) = table;
+ CHARSET_DECODING_TABLE(cs) = Qnil;
return table;
}
else if (VECTORP (table))
{
int ccs_len = CHARSET_BYTE_SIZE (cs);
-
- if (XVECTOR_LENGTH (table) > ccs_len)
- args_out_of_range (table, make_int (CHARSET_CHARS (cs)));
- old_table = CHARSET_DECODING_TABLE(cs);
- CHARSET_DECODING_TABLE(cs) = table;
+ int ret = decoding_table_check_elements (table,
+ CHARSET_DIMENSION (cs),
+ ccs_len);
+ if (ret)
+ {
+ if (ret == -1)
+ signal_simple_error ("Too big table", table);
+ else if (ret == -2)
+ signal_simple_error ("Invalid element is found", table);
+ else
+ signal_simple_error ("Something wrong", table);
+ }
+ CHARSET_DECODING_TABLE(cs) = Qnil;
}
else
signal_error (Qwrong_type_argument,
list2 (build_translated_string ("vector-or-nil-p"),
table));
- /* signal_simple_error ("Wrong type argument: vector-or-nil-p", table); */
+ byte_offset = CHARSET_BYTE_OFFSET (cs);
switch (CHARSET_DIMENSION (cs))
{
case 1:
Lisp_Object c = XVECTOR_DATA(table)[i];
if (CHARP (c))
- put_char_attribute
- (c, charset,
- make_int (i + CHARSET_BYTE_OFFSET (cs)));
+ put_char_ccs_code_point (c, charset,
+ make_int (i + byte_offset));
}
break;
case 2:
{
size_t j;
- if (XVECTOR_LENGTH (v) > CHARSET_CHARS (cs))
- {
- CHARSET_DECODING_TABLE(cs) = old_table;
- args_out_of_range (v, make_int (CHARSET_CHARS (cs)));
- }
for (j = 0; j < XVECTOR_LENGTH (v); j++)
{
Lisp_Object c = XVECTOR_DATA(v)[j];
if (CHARP (c))
- put_char_attribute
+ put_char_ccs_code_point
(c, charset,
- make_int ( ((i + CHARSET_BYTE_OFFSET (cs)) << 8)
- | (j + CHARSET_BYTE_OFFSET (cs)) ));
+ make_int ( ( (i + byte_offset) << 8 )
+ | (j + byte_offset)
+ ) );
}
}
else if (CHARP (v))
- put_char_attribute (v, charset,
- make_int (i + CHARSET_BYTE_OFFSET (cs)));
+ put_char_ccs_code_point (v, charset,
+ make_int (i + byte_offset));
}
break;
}
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);
+
/* staticpro (&Vcharacter_composition_table); */
Vcharacter_composition_table = make_char_id_table (Qnil, -1);
projects / chise / xemacs-chise.git- / blobdiff