{
Lisp_Object charset;
unsigned int c1, c2, s1, s2;
-
#ifdef UTF2000
- if ( (c1 =
- get_byte_from_character_table
- (ch, XCHARSET_TO_BYTE1_TABLE (Vcharset_latin_jisx0201))) )
+ Lisp_Object value = charset_code_point (Vcharset_latin_jisx0201, ch);
+ Lisp_Object ret = Fcar (value);
+
+ if (INTP (ret))
{
charset = Vcharset_latin_jisx0201;
+ c1 = XINT (ret);
c2 = 0;
}
else
reg = -1;
for (i = 0; i < 4; i++)
{
+ Lisp_Object code_point;
+
if ((CHARSETP (charset = str->iso2022.charset[i])
- && (byte1 = charset_get_byte1 (charset, ch))) ||
+ && !EQ (code_point = charset_code_point (charset, ch), Qnil))
+ ||
(CHARSETP
(charset
= CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, i))
- && (byte1 = charset_get_byte1 (charset, ch))))
+ && !EQ (code_point = charset_code_point (charset, ch), Qnil)))
{
+ Lisp_Object ret = Fcar (code_point);
+
+ if (INTP (ret))
+ {
+ byte1 = XINT (ret);
+ ret = Fcar (Fcdr (code_point));
+ if (INTP (ret))
+ byte2 = XINT (ret);
+ else
+ byte2 = 0;
+ }
+ else
+ {
+ byte1 = 0;
+ byte2 = 0;
+ }
reg = i;
- byte2 = charset_get_byte2 (charset, ch);
break;
}
}
if (reg == -1)
- BREAKUP_CHAR (ch, charset, byte1, byte2);
+ {
+ Lisp_Object original_default_coded_charset_priority_list
+ = Vdefault_coded_charset_priority_list;
+
+ while (!EQ (Vdefault_coded_charset_priority_list, Qnil))
+ {
+ BREAKUP_CHAR (ch, charset, byte1, byte2);
+ if (XCHARSET_FINAL (charset))
+ goto found;
+ Vdefault_coded_charset_priority_list
+ = Fcdr (Fmemq (XCHARSET_NAME (charset),
+ Vdefault_coded_charset_priority_list));
+ }
+ BREAKUP_CHAR (ch, charset, byte1, byte2);
+ found:
+ Vdefault_coded_charset_priority_list
+ = original_default_coded_charset_priority_list;
+ }
ensure_correct_direction (XCHARSET_DIRECTION (charset),
codesys, dst, flags, 0);