Lisp_Object Vfile_name_coding_system;
/* Table of symbols identifying each coding category. */
-Lisp_Object coding_category_symbol[CODING_CATEGORY_LAST + 1];
+Lisp_Object coding_category_symbol[CODING_CATEGORY_LAST];
struct file_coding_dump {
/* Coding system currently associated with each coding category. */
- Lisp_Object coding_category_system[CODING_CATEGORY_LAST + 1];
+ Lisp_Object coding_category_system[CODING_CATEGORY_LAST];
/* Table of all coding categories in decreasing order of priority.
This describes a permutation of the possible coding categories. */
- int coding_category_by_priority[CODING_CATEGORY_LAST + 1];
+ int coding_category_by_priority[CODING_CATEGORY_LAST];
#if defined(MULE) && !defined(UTF2000)
Lisp_Object ucs_to_mule_table[65536];
}
}
break;
+#ifdef UTF2000
+
+ case CODESYS_BIG5:
+ mark_object (CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 0));
+ mark_object (CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 1));
+ break;
+#endif
case CODESYS_CCL:
mark_object (CODING_SYSTEM_CCL_DECODE (codesys));
for (i = 0; i < 4; i++)
CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, i) = Qnil;
}
+#ifdef UTF2000
+ if (type == CODESYS_BIG5)
+ {
+ CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 0)
+ = Vcharset_ascii;
+ CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 1)
+ = Vcharset_chinese_big5;
+ CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 2)
+ = Qnil;
+ CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 3)
+ = Qnil;
+ }
+#endif
else if (type == CODESYS_CCL)
{
CODING_SYSTEM_CCL_DECODE (codesys) = Qnil;
else
signal_simple_error ("Unrecognized property", key);
}
+#ifdef UTF2000
+ else if (ty == CODESYS_BIG5)
+ {
+ if (EQ (key, Qcharset_g0)) FROB_INITIAL_CHARSET (0);
+ else if (EQ (key, Qcharset_g1)) FROB_INITIAL_CHARSET (1);
+ else
+ signal_simple_error ("Unrecognized property", key);
+ }
+#endif
else if (EQ (type, Qccl))
{
Lisp_Object sym;
int i;
CHECK_SYMBOL (symbol);
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
if (EQ (coding_category_symbol[i], symbol))
return i;
int i;
Lisp_Object list = Qnil;
- for (i = CODING_CATEGORY_LAST; i >= 0; i--)
+ for (i = CODING_CATEGORY_LAST - 1; i >= 0; i--)
list = Fcons (coding_category_symbol[i], list);
return list;
}
*/
(list))
{
- int category_to_priority[CODING_CATEGORY_LAST + 1];
+ int category_to_priority[CODING_CATEGORY_LAST];
int i, j;
Lisp_Object rest;
/* First generate a list that maps coding categories to priorities. */
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
category_to_priority[i] = -1;
/* Highest priority comes from the specified list. */
/* Now go through the existing categories by priority to retrieve
the categories not yet specified and preserve their priority
order. */
- for (j = 0; j <= CODING_CATEGORY_LAST; j++)
+ for (j = 0; j < CODING_CATEGORY_LAST; j++)
{
int cat = fcd->coding_category_by_priority[j];
if (category_to_priority[cat] < 0)
/* Now we need to construct the inverse of the mapping we just
constructed. */
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
fcd->coding_category_by_priority[category_to_priority[i]] = i;
/* Phew! That was confusing. */
int i;
Lisp_Object list = Qnil;
- for (i = CODING_CATEGORY_LAST; i >= 0; i--)
+ for (i = CODING_CATEGORY_LAST - 1; i >= 0; i--)
list = Fcons (coding_category_symbol[fcd->coding_category_by_priority[i]],
list);
return list;
#endif
/* Look through the coding categories by priority and find
the first one that is allowed. */
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
{
cat = fcd->coding_category_by_priority[i];
if ((mask & (1 << cat)) &&
#ifdef MULE
decst.mask = postprocess_iso2022_mask (decst.mask);
#endif
- for (i = CODING_CATEGORY_LAST; i >= 0; i--)
+ for (i = CODING_CATEGORY_LAST - 1; i >= 0; i--)
{
int sys = fcd->coding_category_by_priority[i];
if (decst.mask & (1 << sys))
{
if (CODING_SYSTEM_DISABLE_COMPOSITION (str->codesys))
DECODE_ADD_UCS_CHAR (character, dst);
- else if (!CHAR_ID_TABLE_P (str->combining_table))
+ else if (!CHAR_TABLEP (str->combining_table))
{
Lisp_Object ret
- = get_char_id_table (character, Vcharacter_composition_table);
+ = get_char_id_table (XCHAR_TABLE(Vcharacter_composition_table),
+ character);
if (NILP (ret))
DECODE_ADD_UCS_CHAR (character, dst);
else
{
Lisp_Object ret
- = get_char_id_table (character, str->combining_table);
+ = get_char_id_table (XCHAR_TABLE(str->combining_table),
+ character);
if (CHARP (ret))
{
Emchar char2 = XCHARVAL (ret);
- ret = get_char_id_table (char2, Vcharacter_composition_table);
+ ret =
+ get_char_id_table (XCHAR_TABLE(Vcharacter_composition_table),
+ char2);
if (NILP (ret))
{
DECODE_ADD_UCS_CHAR (char2, dst);
str->combining_table = ret;
}
}
- else if (CHAR_ID_TABLE_P (ret))
+ else if (CHAR_TABLEP (ret))
{
str->combined_chars[str->combined_char_count++] = character;
str->combining_table = ret;
unsigned int flags = str->flags;
unsigned int cpos = str->cpos;
eol_type_t eol_type = str->eol_type;
+#ifdef UTF2000
+ Lisp_Object ccs
+ = CODING_SYSTEM_ISO2022_INITIAL_CHARSET (DECODING_STREAM_DATA
+ (decoding)->codesys, 1);
+#endif
while (n--)
{
if (BYTE_BIG5_TWO_BYTE_2_P (c))
{
#ifdef UTF2000
- DECODE_ADD_UCS_CHAR
- (DECODE_CHAR (Vcharset_chinese_big5, (cpos << 8) | c),
- dst);
+ int code_point = (cpos << 8) | c;
+ Emchar char_id = DECODE_DEFINED_CHAR (ccs, code_point);
+
+ if (char_id < 0)
+ char_id = DECODE_CHAR (Vcharset_chinese_big5, code_point);
+ DECODE_ADD_UCS_CHAR (char_id, dst);
#else
unsigned char b1, b2, b3;
DECODE_BIG5 (cpos, c, b1, b2, b3);
int i;
fcd = xnew (struct file_coding_dump);
- dumpstruct (&fcd, &fcd_description);
+ dump_add_root_struct_ptr (&fcd, &fcd_description);
/* Initialize to something reasonable ... */
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
{
fcd->coding_category_system[i] = Qnil;
fcd->coding_category_by_priority[i] = i;
make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
the_codesys_prop_dynarr = Dynarr_new (codesys_prop);
- dumpstruct (&the_codesys_prop_dynarr, &codesys_prop_dynarr_description);
+ dump_add_root_struct_ptr (&the_codesys_prop_dynarr, &codesys_prop_dynarr_description);
#define DEFINE_CODESYS_PROP(Prop_Type, Sym) do \
{ \
#if defined(MULE) && !defined(UTF2000)
{
- unsigned int i;
+ size_t i;
for (i = 0; i < countof (fcd->ucs_to_mule_table); i++)
fcd->ucs_to_mule_table[i] = Qnil;