struct charset_lookup *chlook;
static const struct lrecord_description charset_lookup_description_1[] = {
- { XD_LISP_OBJECT, offsetof(struct charset_lookup, charset_by_leading_byte),
+ { XD_LISP_OBJECT_ARRAY, offsetof (struct charset_lookup, charset_by_leading_byte),
#ifdef UTF2000
128+4*128
#else
};
static const struct struct_description charset_lookup_description = {
- sizeof(struct charset_lookup),
+ sizeof (struct charset_lookup),
charset_lookup_description_1
};
#ifdef UTF2000
static Lisp_Object
-mark_char_byte_table (Lisp_Object obj)
+mark_byte_table (Lisp_Object obj)
{
- struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (obj);
+ Lisp_Byte_Table *cte = XBYTE_TABLE (obj);
int i;
for (i = 0; i < 256; i++)
}
static int
-char_byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
+byte_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Char_Byte_Table *cte1 = XCHAR_BYTE_TABLE (obj1);
- struct Lisp_Char_Byte_Table *cte2 = XCHAR_BYTE_TABLE (obj2);
+ Lisp_Byte_Table *cte1 = XBYTE_TABLE (obj1);
+ Lisp_Byte_Table *cte2 = XBYTE_TABLE (obj2);
int i;
for (i = 0; i < 256; i++)
- if (CHAR_BYTE_TABLE_P (cte1->property[i]))
+ if (BYTE_TABLE_P (cte1->property[i]))
{
- if (CHAR_BYTE_TABLE_P (cte2->property[i]))
+ if (BYTE_TABLE_P (cte2->property[i]))
{
- if (!char_byte_table_equal (cte1->property[i],
- cte2->property[i], depth + 1))
+ if (!byte_table_equal (cte1->property[i],
+ cte2->property[i], depth + 1))
return 0;
}
else
}
static unsigned long
-char_byte_table_hash (Lisp_Object obj, int depth)
+byte_table_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (obj);
+ Lisp_Byte_Table *cte = XBYTE_TABLE (obj);
return internal_array_hash (cte->property, 256, depth);
}
-static const struct lrecord_description char_byte_table_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Byte_Table, property), 256 },
+static const struct lrecord_description byte_table_description[] = {
+ { XD_LISP_OBJECT_ARRAY, offsetof(Lisp_Byte_Table, property), 256 },
{ XD_END }
};
-DEFINE_LRECORD_IMPLEMENTATION ("char-byte-table", char_byte_table,
- mark_char_byte_table,
+DEFINE_LRECORD_IMPLEMENTATION ("byte-table", byte_table,
+ mark_byte_table,
internal_object_printer,
- 0, char_byte_table_equal,
- char_byte_table_hash,
- char_byte_table_description,
- struct Lisp_Char_Byte_Table);
+ 0, byte_table_equal,
+ byte_table_hash,
+ byte_table_description,
+ Lisp_Byte_Table);
static Lisp_Object
-make_char_byte_table (Lisp_Object initval)
+make_byte_table (Lisp_Object initval)
{
Lisp_Object obj;
int i;
- struct Lisp_Char_Byte_Table *cte =
- alloc_lcrecord_type (struct Lisp_Char_Byte_Table,
- &lrecord_char_byte_table);
+ Lisp_Byte_Table *cte
+ = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
for (i = 0; i < 256; i++)
cte->property[i] = initval;
- XSETCHAR_BYTE_TABLE (obj, cte);
+ XSETBYTE_TABLE (obj, cte);
return obj;
}
static Lisp_Object
-copy_char_byte_table (Lisp_Object entry)
+copy_byte_table (Lisp_Object entry)
{
- struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (entry);
+ Lisp_Byte_Table *cte = XBYTE_TABLE (entry);
Lisp_Object obj;
int i;
- struct Lisp_Char_Byte_Table *ctenew =
- alloc_lcrecord_type (struct Lisp_Char_Byte_Table,
- &lrecord_char_byte_table);
+ Lisp_Byte_Table *ctenew
+ = alloc_lcrecord_type (Lisp_Byte_Table, &lrecord_byte_table);
for (i = 0; i < 256; i++)
{
Lisp_Object new = cte->property[i];
- if (CHAR_BYTE_TABLE_P (new))
- ctenew->property[i] = copy_char_byte_table (new);
+ if (BYTE_TABLE_P (new))
+ ctenew->property[i] = copy_byte_table (new);
else
ctenew->property[i] = new;
}
- XSETCHAR_BYTE_TABLE (obj, ctenew);
+ XSETBYTE_TABLE (obj, ctenew);
return obj;
}
static Lisp_Object
-mark_char_code_table (Lisp_Object obj)
+mark_char_id_table (Lisp_Object obj)
{
- struct Lisp_Char_Code_Table *cte = XCHAR_CODE_TABLE (obj);
+ Lisp_Char_ID_Table *cte = XCHAR_ID_TABLE (obj);
return cte->table;
}
static int
-char_code_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
+char_id_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Char_Code_Table *cte1 = XCHAR_CODE_TABLE (obj1);
- struct Lisp_Char_Code_Table *cte2 = XCHAR_CODE_TABLE (obj2);
+ Lisp_Char_ID_Table *cte1 = XCHAR_ID_TABLE (obj1);
+ Lisp_Char_ID_Table *cte2 = XCHAR_ID_TABLE (obj2);
- return char_byte_table_equal (cte1->table, cte2->table, depth + 1);
+ return byte_table_equal (cte1->table, cte2->table, depth + 1);
}
static unsigned long
-char_code_table_hash (Lisp_Object obj, int depth)
+char_id_table_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Char_Code_Table *cte = XCHAR_CODE_TABLE (obj);
+ Lisp_Char_ID_Table *cte = XCHAR_ID_TABLE (obj);
- return char_code_table_hash (cte->table, depth + 1);
+ return char_id_table_hash (cte->table, depth + 1);
}
-static const struct lrecord_description char_code_table_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Char_Code_Table, table), 1 },
+static const struct lrecord_description char_id_table_description[] = {
+ { XD_LISP_OBJECT, offsetof(Lisp_Char_ID_Table, table) },
{ XD_END }
};
-DEFINE_LRECORD_IMPLEMENTATION ("char-code-table", char_code_table,
- mark_char_code_table,
+DEFINE_LRECORD_IMPLEMENTATION ("char-id-table", char_id_table,
+ mark_char_id_table,
internal_object_printer,
- 0, char_code_table_equal,
- char_code_table_hash,
- char_code_table_description,
- struct Lisp_Char_Code_Table);
+ 0, char_id_table_equal,
+ char_id_table_hash,
+ char_id_table_description,
+ Lisp_Char_ID_Table);
static Lisp_Object
-make_char_code_table (Lisp_Object initval)
+make_char_id_table (Lisp_Object initval)
{
Lisp_Object obj;
- struct Lisp_Char_Code_Table *cte =
- alloc_lcrecord_type (struct Lisp_Char_Code_Table,
- &lrecord_char_code_table);
+ Lisp_Char_ID_Table *cte
+ = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table);
- cte->table = make_char_byte_table (initval);
+ cte->table = make_byte_table (initval);
- XSETCHAR_CODE_TABLE (obj, cte);
+ XSETCHAR_ID_TABLE (obj, cte);
return obj;
}
static Lisp_Object
-copy_char_code_table (Lisp_Object entry)
+copy_char_id_table (Lisp_Object entry)
{
- struct Lisp_Char_Code_Table *cte = XCHAR_CODE_TABLE (entry);
+ Lisp_Char_ID_Table *cte = XCHAR_ID_TABLE (entry);
Lisp_Object obj;
- struct Lisp_Char_Code_Table *ctenew =
- alloc_lcrecord_type (struct Lisp_Char_Code_Table,
- &lrecord_char_code_table);
+ Lisp_Char_ID_Table *ctenew
+ = alloc_lcrecord_type (Lisp_Char_ID_Table, &lrecord_char_id_table);
- ctenew->table = copy_char_byte_table (cte->table);
- XSETCHAR_CODE_TABLE (obj, ctenew);
+ ctenew->table = copy_byte_table (cte->table);
+ XSETCHAR_ID_TABLE (obj, ctenew);
return obj;
}
Lisp_Object
-get_char_code_table (Emchar ch, Lisp_Object table)
+get_char_id_table (Emchar ch, Lisp_Object table)
{
unsigned int code = ch;
- struct Lisp_Char_Byte_Table* cpt
- = XCHAR_BYTE_TABLE (XCHAR_CODE_TABLE (table)->table);
+ Lisp_Byte_Table* cpt
+ = XBYTE_TABLE (XCHAR_ID_TABLE (table)->table);
Lisp_Object ret = cpt->property [(unsigned char)(code >> 24)];
- if (CHAR_BYTE_TABLE_P (ret))
- cpt = XCHAR_BYTE_TABLE (ret);
+ if (BYTE_TABLE_P (ret))
+ cpt = XBYTE_TABLE (ret);
else
return ret;
ret = cpt->property [(unsigned char) (code >> 16)];
- if (CHAR_BYTE_TABLE_P (ret))
- cpt = XCHAR_BYTE_TABLE (ret);
+ if (BYTE_TABLE_P (ret))
+ cpt = XBYTE_TABLE (ret);
else
return ret;
ret = cpt->property [(unsigned char) (code >> 8)];
- if (CHAR_BYTE_TABLE_P (ret))
- cpt = XCHAR_BYTE_TABLE (ret);
+ if (BYTE_TABLE_P (ret))
+ cpt = XBYTE_TABLE (ret);
else
return ret;
return cpt->property [(unsigned char) code];
}
+void put_char_id_table (Emchar ch, Lisp_Object value, Lisp_Object table);
void
-put_char_code_table (Emchar ch, Lisp_Object value, Lisp_Object table)
+put_char_id_table (Emchar ch, Lisp_Object value, Lisp_Object table)
{
unsigned int code = ch;
- struct Lisp_Char_Byte_Table* cpt1
- = XCHAR_BYTE_TABLE (XCHAR_CODE_TABLE (table)->table);
+ Lisp_Byte_Table* cpt1 = XBYTE_TABLE (XCHAR_ID_TABLE (table)->table);
Lisp_Object ret = cpt1->property[(unsigned char)(code >> 24)];
- if (CHAR_BYTE_TABLE_P (ret))
+ if (BYTE_TABLE_P (ret))
{
- struct Lisp_Char_Byte_Table* cpt2 = XCHAR_BYTE_TABLE (ret);
+ Lisp_Byte_Table* cpt2 = XBYTE_TABLE (ret);
ret = cpt2->property[(unsigned char)(code >> 16)];
- if (CHAR_BYTE_TABLE_P (ret))
+ if (BYTE_TABLE_P (ret))
{
- struct Lisp_Char_Byte_Table* cpt3 = XCHAR_BYTE_TABLE (ret);
+ Lisp_Byte_Table* cpt3 = XBYTE_TABLE (ret);
ret = cpt3->property[(unsigned char)(code >> 8)];
- if (CHAR_BYTE_TABLE_P (ret))
+ if (BYTE_TABLE_P (ret))
{
- struct Lisp_Char_Byte_Table* cpt4
- = XCHAR_BYTE_TABLE (ret);
+ Lisp_Byte_Table* cpt4 = XBYTE_TABLE (ret);
cpt4->property[(unsigned char)code] = value;
}
else if (!EQ (ret, value))
{
- Lisp_Object cpt4 = make_char_byte_table (ret);
+ Lisp_Object cpt4 = make_byte_table (ret);
- XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
+ XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
cpt3->property[(unsigned char)(code >> 8)] = cpt4;
}
}
else if (!EQ (ret, value))
{
- Lisp_Object cpt3 = make_char_byte_table (ret);
- Lisp_Object cpt4 = make_char_byte_table (ret);
+ Lisp_Object cpt3 = make_byte_table (ret);
+ Lisp_Object cpt4 = make_byte_table (ret);
- XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
- XCHAR_BYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)]
+ XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
+ XBYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)]
= cpt4;
cpt2->property[(unsigned char)(code >> 16)] = cpt3;
}
}
else if (!EQ (ret, value))
{
- Lisp_Object cpt2 = make_char_byte_table (ret);
- Lisp_Object cpt3 = make_char_byte_table (ret);
- Lisp_Object cpt4 = make_char_byte_table (ret);
+ Lisp_Object cpt2 = make_byte_table (ret);
+ Lisp_Object cpt3 = make_byte_table (ret);
+ Lisp_Object cpt4 = make_byte_table (ret);
- XCHAR_BYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
- XCHAR_BYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)] = cpt4;
- XCHAR_BYTE_TABLE(cpt2)->property[(unsigned char)(code >> 16)] = cpt3;
+ XBYTE_TABLE(cpt4)->property[(unsigned char)code] = value;
+ XBYTE_TABLE(cpt3)->property[(unsigned char)(code >> 8)] = cpt4;
+ XBYTE_TABLE(cpt2)->property[(unsigned char)(code >> 16)] = cpt3;
cpt1->property[(unsigned char)(code >> 24)] = cpt2;
}
}
Lisp_Object Qsmall;
Lisp_Object Qfont;
+Emchar to_char_id (Lisp_Object v, char* err_msg, Lisp_Object err_arg);
Emchar
-to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
+to_char_id (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
{
if (INTP (v))
return XINT (v);
{
Lisp_Object v = Fcar (rest);
Lisp_Object ret;
- Emchar c = to_char_code (v, "Invalid value for composition", list);
+ Emchar c = to_char_id (v, "Invalid value for composition", list);
- ret = get_char_code_table (c, table);
+ ret = get_char_id_table (c, table);
rest = Fcdr (rest);
if (NILP (rest))
{
- if (!CHAR_CODE_TABLE_P (ret))
+ if (!CHAR_ID_TABLE_P (ret))
return ret;
else
return Qt;
}
else if (!CONSP (rest))
break;
- else if (CHAR_CODE_TABLE_P (ret))
+ else if (CHAR_ID_TABLE_P (ret))
table = ret;
else
signal_simple_error ("Invalid table is found with", list);
(character))
{
CHECK_CHAR (character);
- return Fcopy_list (get_char_code_table (XCHAR (character),
- Vcharacter_variant_table));
+ return Fcopy_list (get_char_id_table (XCHAR (character),
+ Vcharacter_variant_table));
}
DEFUN ("char-attribute-alist", Fchar_attribute_alist, 1, 1, 0, /*
(character))
{
CHECK_CHAR (character);
- return Fcopy_alist (get_char_code_table (XCHAR (character),
- Vcharacter_attribute_table));
+ return Fcopy_alist (get_char_id_table (XCHAR (character),
+ Vcharacter_attribute_table));
}
DEFUN ("get-char-attribute", Fget_char_attribute, 2, 2, 0, /*
*/
(character, attribute))
{
- Lisp_Object ret;
Lisp_Object ccs;
CHECK_CHAR (character);
- ret = get_char_code_table (XCHAR (character),
- Vcharacter_attribute_table);
- if (EQ (ret, Qnil))
- return Qnil;
-
if (!NILP (ccs = Ffind_charset (attribute)))
- attribute = ccs;
+ {
+ Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (ccs);
+
+ if (CHAR_ID_TABLE_P (encoding_table))
+ return get_char_id_table (XCHAR (character), encoding_table);
+ else
+ return Qnil;
+ }
+ else
+ {
+ Lisp_Object ret
+ = get_char_id_table (XCHAR (character), Vcharacter_attribute_table);
- return Fcdr (Fassq (attribute, ret));
+ if (EQ (ret, Qnil))
+ return Qnil;
+ else
+ return Fcdr (Fassq (attribute, ret));
+ }
}
+Lisp_Object put_char_attribute (Lisp_Object character,
+ Lisp_Object attribute, Lisp_Object value);
Lisp_Object
put_char_attribute (Lisp_Object character, Lisp_Object attribute,
Lisp_Object value)
{
- Emchar char_code = XCHAR (character);
- Lisp_Object ret
- = get_char_code_table (char_code, Vcharacter_attribute_table);
+ Emchar char_id = XCHAR (character);
+ Lisp_Object ret = get_char_id_table (char_id, Vcharacter_attribute_table);
Lisp_Object cell;
cell = Fassq (attribute, ret);
{
Fsetcdr (cell, value);
}
- put_char_code_table (char_code, ret, Vcharacter_attribute_table);
+ put_char_id_table (char_id, ret, Vcharacter_attribute_table);
return ret;
}
+Lisp_Object remove_char_attribute (Lisp_Object character,
+ Lisp_Object attribute);
Lisp_Object
remove_char_attribute (Lisp_Object character, Lisp_Object attribute)
{
- Emchar char_code = XCHAR (character);
- Lisp_Object alist
- = get_char_code_table (char_code, Vcharacter_attribute_table);
+ Emchar char_id = XCHAR (character);
+ Lisp_Object alist = get_char_id_table (char_id, Vcharacter_attribute_table);
if (EQ (attribute, Fcar (Fcar (alist))))
{
r = Fcdr (r);
}
}
- put_char_code_table (char_code, alist, Vcharacter_attribute_table);
+ put_char_id_table (char_id, alist, Vcharacter_attribute_table);
return alist;
}
ccs = Ffind_charset (attribute);
if (!NILP (ccs))
{
+ Lisp_Object encoding_table;
+
if (!EQ (XCHARSET_NAME (ccs), Qucs)
|| (XCHAR (character) != XINT (value)))
{
rest = Fcdr (value);
while (!NILP (rest))
{
- int i;
+ int j;
if (!CONSP (rest))
signal_simple_error ("Invalid value for coded-charset",
if (!INTP (ret))
signal_simple_error ("Invalid value for coded-charset",
value);
- i = XINT (ret);
+ j = XINT (ret);
if (XCHARSET_GRAPHIC (ccs) == 1)
- i &= 0x7F;
- code_point = (code_point << 8) | i;
+ j &= 0x7F;
+ code_point = (code_point << 8) | j;
rest = Fcdr (rest);
}
value = make_int (code_point);
}
else
{
- XCHARSET_DECODING_TABLE (ccs) = v = make_vector (ccs_len, Qnil);
+ XCHARSET_DECODING_TABLE (ccs) = v
+ = make_older_vector (ccs_len, Qnil);
}
dim = XCHARSET_DIMENSION (ccs);
if (dim > 0)
{
if (!VECTORP (nv))
- nv = (XVECTOR_DATA(v)[i] = make_vector (ccs_len, Qnil));
+ nv = (XVECTOR_DATA(v)[i]
+ = make_older_vector (ccs_len, Qnil));
v = nv;
}
else
}
else
attribute = ccs;
+ if (NILP (encoding_table = XCHARSET_ENCODING_TABLE (ccs)))
+ {
+ XCHARSET_ENCODING_TABLE (ccs) = encoding_table
+ = make_char_id_table (Qnil);
+ }
+ put_char_id_table (XCHAR (character), value, encoding_table);
+ return Qt;
}
else if (EQ (attribute, Q_decomposition))
{
Lisp_Object v = Fcar (rest);
Lisp_Object ntable;
Emchar c
- = to_char_code (v,
- "Invalid value for ->decomposition", value);
+ = to_char_id (v, "Invalid value for ->decomposition", value);
rest = Fcdr (rest);
if (!CONSP (rest))
{
- put_char_code_table (c, character, table);
+ put_char_id_table (c, character, table);
break;
}
else
{
- ntable = get_char_code_table (c, table);
- if (!CHAR_CODE_TABLE_P (ntable))
+ ntable = get_char_id_table (c, table);
+ if (!CHAR_ID_TABLE_P (ntable))
{
- ntable = make_char_code_table (Qnil);
- put_char_code_table (c, ntable, table);
+ ntable = make_char_id_table (Qnil);
+ put_char_id_table (c, ntable, table);
}
table = ntable;
}
{
Emchar c = XINT (v);
Lisp_Object ret
- = get_char_code_table (c, Vcharacter_variant_table);
+ = get_char_id_table (c, Vcharacter_variant_table);
if (NILP (Fmemq (v, ret)))
{
- put_char_code_table (c, Fcons (character, ret),
- Vcharacter_variant_table);
+ put_char_id_table (c, Fcons (character, ret),
+ Vcharacter_variant_table);
}
}
}
c = XINT (value);
- ret = get_char_code_table (c, Vcharacter_variant_table);
+ ret = get_char_id_table (c, Vcharacter_variant_table);
if (NILP (Fmemq (character, ret)))
{
- put_char_code_table (c, Fcons (character, ret),
- Vcharacter_variant_table);
+ put_char_id_table (c, Fcons (character, ret),
+ Vcharacter_variant_table);
}
}
return put_char_attribute (character, attribute, value);
int ccs_len;
int dim;
int code_point;
-
+ Lisp_Object encoding_table;
+
/* ad-hoc method for `ascii' */
if ((XCHARSET_CHARS (ccs) == 94) &&
(XCHARSET_BYTE_OFFSET (ccs) != 33))
v = XCHARSET_DECODING_TABLE (ccs);
}
}
+ if (!NILP (encoding_table = XCHARSET_ENCODING_TABLE (ccs)))
+ {
+ put_char_id_table (XCHAR (character), Qnil, encoding_table);
+ }
+ return Qt;
}
return remove_char_attribute (character, attribute);
}
rest = Fcdr (rest);
}
return
- get_char_code_table (XCHAR (character), Vcharacter_attribute_table);
+ get_char_id_table (XCHAR (character), Vcharacter_attribute_table);
}
Lisp_Object Vutf_2000_version;
Lisp_Object Vcharset_hash_table;
-#ifdef UTF2000
-static Charset_ID next_allocated_leading_byte;
-#else
-static Charset_ID next_allocated_1_byte_leading_byte;
-static Charset_ID next_allocated_2_byte_leading_byte;
-#endif
-
/* Composite characters are characters constructed by overstriking two
or more regular characters.
Use the macro charptr_emchar() instead. */
Emchar
-non_ascii_charptr_emchar (CONST Bufbyte *str)
+non_ascii_charptr_emchar (const Bufbyte *str)
{
#ifdef UTF2000
Bufbyte b;
charptr_copy_char() instead. */
Bytecount
-non_ascii_charptr_copy_char (CONST Bufbyte *ptr, Bufbyte *str)
+non_ascii_charptr_copy_char (const Bufbyte *ptr, Bufbyte *str)
{
Bufbyte *strptr = str;
*strptr = *ptr++;
static Lisp_Object
mark_charset (Lisp_Object obj)
{
- struct Lisp_Charset *cs = XCHARSET (obj);
+ Lisp_Charset *cs = XCHARSET (obj);
mark_object (cs->short_name);
mark_object (cs->long_name);
mark_object (cs->registry);
mark_object (cs->ccl_program);
#ifdef UTF2000
- mark_object (cs->decoding_table);
+ mark_object (cs->encoding_table);
+ /* mark_object (cs->decoding_table); */
#endif
return cs->name;
}
static void
print_charset (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
- struct Lisp_Charset *cs = XCHARSET (obj);
+ Lisp_Charset *cs = XCHARSET (obj);
char buf[200];
if (print_readably)
}
static const struct lrecord_description charset_description[] = {
- { XD_LISP_OBJECT, offsetof(struct Lisp_Charset, name), 7 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, doc_string) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, registry) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, short_name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, long_name) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, reverse_direction_charset) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, ccl_program) },
#ifdef UTF2000
- { XD_LISP_OBJECT, offsetof(struct Lisp_Charset, decoding_table), 2 },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, decoding_table) },
+ { XD_LISP_OBJECT, offsetof (Lisp_Charset, encoding_table) },
#endif
{ XD_END }
};
DEFINE_LRECORD_IMPLEMENTATION ("charset", charset,
mark_charset, print_charset, 0, 0, 0,
charset_description,
- struct Lisp_Charset);
+ Lisp_Charset);
/* Make a new charset. */
static Lisp_Object
{
unsigned char type = 0;
Lisp_Object obj;
- struct Lisp_Charset *cs =
- alloc_lcrecord_type (struct Lisp_Charset, &lrecord_charset);
+ Lisp_Charset *cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
+
+ zero_lcrecord (cs);
+
XSETCHARSET (obj, cs);
CHARSET_ID (cs) = id;
CHARSET_REVERSE_DIRECTION_CHARSET (cs) = Qnil;
#ifdef UTF2000
CHARSET_DECODING_TABLE(cs) = Qnil;
+ CHARSET_ENCODING_TABLE(cs) = Qnil;
CHARSET_UCS_MIN(cs) = ucs_min;
CHARSET_UCS_MAX(cs) = ucs_max;
CHARSET_CODE_OFFSET(cs) = code_offset;
Charset_ID lb;
#ifdef UTF2000
- if (next_allocated_leading_byte > MAX_LEADING_BYTE_PRIVATE)
+ if (chlook->next_allocated_leading_byte > MAX_LEADING_BYTE_PRIVATE)
lb = 0;
else
- lb = next_allocated_leading_byte++;
+ lb = chlook->next_allocated_leading_byte++;
#else
if (dimension == 1)
{
- if (next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1)
+ if (chlook->next_allocated_1_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_1)
lb = 0;
else
- lb = next_allocated_1_byte_leading_byte++;
+ lb = chlook->next_allocated_1_byte_leading_byte++;
}
else
{
- if (next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2)
+ if (chlook->next_allocated_2_byte_leading_byte > MAX_LEADING_BYTE_PRIVATE_2)
lb = 0;
else
- lb = next_allocated_2_byte_leading_byte++;
+ lb = chlook->next_allocated_2_byte_leading_byte++;
}
#endif
int id, chars, dimension, columns, graphic, final;
int direction;
Lisp_Object registry, doc_string, short_name, long_name;
- struct Lisp_Charset *cs;
+ Lisp_Charset *cs;
charset = Fget_charset (charset);
if (!NILP (XCHARSET_REVERSE_DIRECTION_CHARSET (charset)))
*/
(charset, prop))
{
- struct Lisp_Charset *cs;
+ Lisp_Charset *cs;
charset = Fget_charset (charset);
cs = XCHARSET (charset);
*/
(charset, arg1, arg2))
{
- struct Lisp_Charset *cs;
+ Lisp_Charset *cs;
int a1, a2;
int lowlim, highlim;
void
syms_of_mule_charset (void)
{
+#ifdef UTF2000
+ INIT_LRECORD_IMPLEMENTATION (byte_table);
+ INIT_LRECORD_IMPLEMENTATION (char_id_table);
+#endif
+ INIT_LRECORD_IMPLEMENTATION (charset);
+
DEFSUBR (Fcharsetp);
DEFSUBR (Ffind_charset);
DEFSUBR (Fget_charset);
#endif
#ifdef UTF2000
- next_allocated_leading_byte = MIN_LEADING_BYTE_PRIVATE;
+ chlook->next_allocated_leading_byte = MIN_LEADING_BYTE_PRIVATE;
#else
- next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1;
- next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2;
+ chlook->next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1;
+ chlook->next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2;
#endif
#ifndef UTF2000
*/ );
staticpro (&Vcharacter_attribute_table);
- Vcharacter_attribute_table = make_char_code_table (Qnil);
+ Vcharacter_attribute_table = make_char_id_table (Qnil);
staticpro (&Vcharacter_composition_table);
- Vcharacter_composition_table = make_char_code_table (Qnil);
+ Vcharacter_composition_table = make_char_id_table (Qnil);
staticpro (&Vcharacter_variant_table);
- Vcharacter_variant_table = make_char_code_table (Qnil);
+ Vcharacter_variant_table = make_char_id_table (Qnil);
Vdefault_coded_charset_priority_list = Qnil;
DEFVAR_LISP ("default-coded-charset-priority-list",
projects / chise / xemacs-chise.git- / blobdiff