summaryrefslogtreecommitdiff
path: root/iconvdata/iso-2022-jp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-06-06 12:55:46 +0000
committerUlrich Drepper <drepper@redhat.com>2001-06-06 12:55:46 +0000
commit601d294296e1de9fc423700db00bccc04a2bf50d (patch)
tree1d274eb4e512431b042e07bf8f8ff4a980407257 /iconvdata/iso-2022-jp.c
parent9a1f675436c5622b7846faa25274a2ef2d743285 (diff)
Update.
2001-06-04 Bruno Haible <haible@clisp.cons.org> * iconv/loop.c (UNICODE_TAG_HANDLER): New macro. * iconv/gconv_simple.c (__gconv_transform_internal_ascii): Invoke UNICODE_TAG_HANDLER. (__gconv_transform_internal_ucs2): Likewise. (__gconv_transform_internal_ucs2reverse): Likewise. * iconvdata/8bit-gap.c (BODY for TO_LOOP): Invoke UNICODE_TAG_HANDLER. * iconvdata/8bit-generic.c (BODY for TO_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for TO_LOOP): Likewise. * iconvdata/big5.c (BODY for TO_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for TO_LOOP): Likewise. * iconvdata/cp1255.c (BODY for TO_LOOP): Likewise. * iconvdata/cp1258.c (BODY for TO_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for TO_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for TO_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for TO_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for TO_LOOP): Likewise. * iconvdata/gbk.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm932.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm933.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm935.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm937.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm939.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm943.c (BODY for TO_LOOP): Likewise. * iconvdata/iso646.c (BODY for TO_LOOP): Likewise. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for TO_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for TO_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for TO_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for TO_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for TO_LOOP): Likewise. * iconvdata/johab.c (BODY for TO_LOOP): Likewise. * iconvdata/sjis.c (BODY for TO_LOOP): Likewise. * iconvdata/t.61.c (BODY for TO_LOOP): Likewise. * iconvdata/uhc.c (BODY for TO_LOOP): Likewise. * iconvdata/unicode.c (BODY for TO_LOOP): Likewise. * iconvdata/iso-2022-jp.c (TAG_none, TAG_language, TAG_language_j, TAG_language_ja, TAG_language_k, TAG_language_ko, TAG_language_z, TAG_language_zh, CURRENT_TAG_MASK): New enum values. (EMIT_SHIFT_TO_INIT): Don't emit an escape sequence if ASCII_set is already selected but set2 or tag are set. (conversion): New enum type. (cvlist_t): New type. (CVLIST, CVLIST_FIRST, CVLIST_REST): New macros. (conversion_lists): New array. (BODY for TO_LOOP): Keep track of Unicode 3.1 language tag. If "ja", prefer conversion to Japanese character sets. If "zh", prefer conversion to GB2312. If "ko", prefer conversion to KSC5601. Small optimizations. (INIT_PARAMS): Add tag. (UPDATE_PARAMS): Add tag. 2001-06-04 Bruno Haible <haible@clisp.cons.org> * locale/programs/locfile.c (write_locale_data): Before creat(), unlink the file, to avoid crashing the processes that mmap it. Change a double slash to a single slash. Free fname in case of error return. 2001-06-02 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/fpu/s_frexpl.S (__frexpl): Mostly revert 2000-12-03 changes, do the special handling for denormal numbers, not for normalized numbers (patch by <trevin@xmission.com>). * math/test-misc.c (main): Test frexpl with denormal arguments. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * math/libm-test.inc (llround_test): Add two new llround tests. * sysdeps/ieee754/ldbl-96/s_llroundl.c (__llroundl): Don't allow overflow when rounding away from zero. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * math/Makefile (libm-calls): Add e_log2, w_log2, remove s_log2. * math/math_private.h (__ieee754_log2, __ieee754_log2f, __ieee754_log2l): New prototypes. * sysdeps/generic/w_log2.c: New file. * sysdeps/generic/w_log2f.c: New file. * sysdeps/generic/w_log2l.c: New file. * sysdeps/generic/s_log2l.c: Move... * sysdeps/generic/e_log2l.c: ...to here. Rename to __ieee754_log2l. * sysdeps/ieee754/k_standard.c (__kernel_standard): Handle log2(0) and log2(x < 0). * sysdeps/i386/fpu/s_log2.S: Move... * sysdeps/i386/fpu/e_log2.S: ...to here. Rename to __ieee754_log2. * sysdeps/i386/fpu/s_log2f.S: Move... * sysdeps/i386/fpu/e_log2f.S: ...to here. Rename to __ieee754_log2f. * sysdeps/i386/fpu/s_log2l.S: Move... * sysdeps/i386/fpu/e_log2l.S: ...to here. Rename to __ieee754_log2l. * sysdeps/m68k/fpu/s_log2.S: Move... * sysdeps/m68k/fpu/e_log2.S: ...to here. Rename to __ieee754_log2. * sysdeps/m68k/fpu/s_log2f.S: Move... * sysdeps/m68k/fpu/e_log2f.S: ...to here. Rename to __ieee754_log2f. * sysdeps/m68k/fpu/s_log2l.S: Move... * sysdeps/m68k/fpu/e_log2l.S: ...to here. Rename to __ieee754_log2l. * sysdeps/ieee754/dbl-64/s_log2.c: Move... * sysdeps/ieee754/dbl-64/e_log2.c: ...to here. Rename to __ieee754_log2. * sysdeps/ieee754/flt-32/s_log2f.c: Move... * sysdeps/ieee754/flt-32/e_log2f.c: ...to here. Rename to __ieee754_log2f. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * sysdeps/generic/w_exp2.c (u_threshold): Lower threshold so that even arguments which result in denormalized exp2 are accepted. (__exp2): Arguments equal to u_threshold already result into underflow. * sysdeps/generic/w_exp2f.c (u_threshold, __exp2f): Likewise. * sysdeps/generic/w_exp2l.c (u_threshold, __exp2l): Likewise. * sysdeps/ieee754/dbl-64/e_exp2.c (__ieee754_exp2): Lomark was too low, with corrected lowmark use greaterequal, not greater. * sysdeps/ieee754/flt-32/e_exp2f.c (__ieee754_exp2f): Likewise. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * math/libm-test.inc (ilogb_test): Test that ilogb(+-Inf) == INT_MAX. * sysdeps/i386/fpu/s_ilogb.S (__ilogb): Return INT_MAX for +-Inf. * sysdeps/i386/fpu/s_ilogbf.S (__ilogbf): Likewise. * sysdeps/i386/fpu/s_ilogbl.S (__ilogbl): Likewise. * sysdeps/ieee754/dbl-64/s_ilogb.c (__ilogb): Likewise. * sysdeps/ieee754/flt-32/s_ilogbf.c (__ilogbf): Likewise. * sysdeps/ieee754/ldbl-128/s_ilogbl.c (__ilogbl): Likewise. * sysdeps/ieee754/ldbl-96/s_ilogbl.c (__ilogbl): Likewise. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * sysdeps/generic/w_coshl.c (__coshl): Test if finite argument gave non-finite result instead of using constant in generic version. * sysdeps/generic/w_coshf.c (__coshf): Likewise. * sysdeps/generic/w_cosh.c (__cosh): Likewise. * sysdeps/generic/w_exp10.c (o_threshold, u_threshold): Remove. (__exp10): Test if finite argument gave non-finite result. * sysdeps/generic/w_exp10f.c (o_threshold, u_threshold, __exp10f): Likewise. * sysdeps/generic/w_exp10l.c (o_threshold, u_threshold, __exp10l): Likewise. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * sysdeps/ieee754/ldbl-96/e_coshl.c (__ieee754_coshl): Fix overflow threshold constant (log(LDBL_MAX)+M_LN2l). 2001-05-29 Bruno Haible <haible@clisp.cons.org> * locale/programs/ld-ctype.c (idx_table): New struct type. (idx_table_init, idx_table_get, idx_table_add): New functions. (MAX_CHARNAMES_IDX): Remove macro. (locale_ctype_t): Change type of charnames_idx field. (ctype_startup): Change initialization of charnames_idx field. (find_idx): Use idx_table_get and idx_table_add for speed. * locale/programs/charmap.c (charmap_new_char): Fix ucs4 value computation of characters in a range. 2001-05-29 Bruno Haible <haible@clisp.cons.org> * iconvdata/gb18030.c (__fourbyte_to_ucs1): Add mappings for <U03F4>, <U03F5>. (__ucs_to_gb18030_tab1): Likewise. (BODY for FROM_LOOP): Add mapping for <U00010000>..<U0010FFFF>. (BODY for TO_LOOP): Likewise. * iconvdata/tst-table-charmap.sh: Update for charmaps containing <U00xxxxxx> syntax. * iconvdata/tst-table-from.c (bmp_only): New variable. (utf8_decode): If bmp_only, don't return characters outside Unicode plane 0. (main): When testing UTF-8 or GB18030, set bmp_only to 1. Don't print a conversion line if utf8_decode returns NULL. * iconvdata/tst-table-to.c (main): When testing encodings other than UTF-8 and GB18030, loop upto U+30000 instead of U+10000. Use UTF-8 instead of UCS-2 as input. * iconvdata/tst-table.sh: For GB18030, use only the part < 0x10000 of the charmap. 2001-05-29 Bruno Haible <haible@clisp.cons.org> * iconvdata/cns11643l1.c: Update to Unicode 3.1. (__cns11643l1_to_ucs4_tab): Regenerated. (__cns11643l1_from_ucs4_tab12): Regenerated. * iconvdata/cns11643.c: Update to Unicode 3.1. (__cns11643l14_to_ucs4_tab): Remove array. (__cns11643l3_to_ucs4_tab, __cns11643l4_to_ucs4_tab, __cns11643l5_to_ucs4_tab, __cns11643l6_to_ucs4_tab, __cns11643l7_to_ucs4_tab, __cns11643l15_to_ucs4_tab): New arrays. (__cns11643_from_ucs4p0_tab): Renamed from __cns11643_from_ucs4_tab. (__cns11643_from_ucs4p2_tab): New array. * iconvdata/cns11643.h (__cns11643l14_to_ucs4_tab): Remove declaration. (__cns11643l3_to_ucs4_tab, __cns11643l4_to_ucs4_tab, __cns11643l5_to_ucs4_tab, __cns11643l6_to_ucs4_tab, __cns11643l7_to_ucs4_tab, __cns11643l15_to_ucs4_tab): New declarations. (cns11643_to_ucs4): Treat planes 3, 4, 5, 6, 7, 15 instead of 14. (__cns11643_from_ucs4_tab): Remove declaration. (__cns11643_from_ucs4p0_tab, __cns11643_from_ucs4p2_tab): New declarations. (ucs4_to_cns11643): Update for new arrays. Treat U+3400..U+4DFF and U+20000..U+2A6D6. * iconvdata/cns11643l2.h (__cns11643_from_ucs4_tab): Remove declaration. (__cns11643_from_ucs4p0_tab): New declaration. (ucs4_to_cns11643l2): Update for new arrays. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Handle planes 3 to 7. (BODY for TO_LOOP): Handle planes 3 to 7, instead of plane 14. * iconvdata/EUC-TW.irreversible: New file. * iconvdata/tst-table.sh: Use it. * iconvdata/Makefile (distribute): Add CP1255.irreversible, CP1258.irreversible, EUC-TW.irreversible. 2001-05-29 Bruno Haible <haible@clisp.cons.org> * locale/C-translit.h.in: Add transliterations for new Unicode 3.1 mathematical symbols.
Diffstat (limited to 'iconvdata/iso-2022-jp.c')
-rw-r--r--iconvdata/iso-2022-jp.c697
1 files changed, 427 insertions, 270 deletions
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index 8825dcc0fd..4fba9d993f 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -1,5 +1,5 @@
-/* Conversion module for ISO-2022-JP.
- Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Conversion module for ISO-2022-JP and ISO-2022-JP-2.
+ Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -90,14 +90,14 @@ struct iso2022jp_data
enum
{
ASCII_set = 0,
- JISX0208_1978_set = 8,
- JISX0208_1983_set = 16,
- JISX0201_Roman_set = 24,
- JISX0201_Kana_set = 32,
- GB2312_set = 40,
- KSC5601_set = 48,
- JISX0212_set = 56,
- CURRENT_SEL_MASK = 56
+ JISX0208_1978_set = 1 << 3,
+ JISX0208_1983_set = 2 << 3,
+ JISX0201_Roman_set = 3 << 3,
+ JISX0201_Kana_set = 4 << 3,
+ GB2312_set = 5 << 3,
+ KSC5601_set = 6 << 3,
+ JISX0212_set = 7 << 3,
+ CURRENT_SEL_MASK = 7 << 3
};
/* The second value stored is the designation of the G2 set. The following
@@ -105,9 +105,25 @@ enum
enum
{
UNSPECIFIED_set = 0,
- ISO88591_set = 64,
- ISO88597_set = 128,
- CURRENT_ASSIGN_MASK = 192
+ ISO88591_set = 1 << 6,
+ ISO88597_set = 2 << 6,
+ CURRENT_ASSIGN_MASK = 3 << 6
+};
+
+/* The third value, only used during conversion from Unicode to ISO-2022-JP-2,
+ describes the language tag parsing status. The possible values are as
+ follows. Values >= TAG_language are temporary tag parsing states. */
+enum
+{
+ TAG_none = 0,
+ TAG_language = 4 << 8,
+ TAG_language_j = 5 << 8,
+ TAG_language_ja = 1 << 8,
+ TAG_language_k = 6 << 8,
+ TAG_language_ko = 2 << 8,
+ TAG_language_z = 7 << 8,
+ TAG_language_zh = 3 << 8,
+ CURRENT_TAG_MASK = 7 << 8
};
@@ -198,7 +214,8 @@ gconv_end (struct __gconv_step *data)
\
if ((data->__statep->__count & ~7) != ASCII_set) \
{ \
- if (dir == from_iso2022jp) \
+ if (dir == from_iso2022jp \
+ || (data->__statep->__count & CURRENT_SEL_MASK) == ASCII_set) \
{ \
/* It's easy, we don't have to emit anything, we just reset the \
state for the input. Note that this also clears the G2 \
@@ -503,6 +520,23 @@ gconv_end (struct __gconv_step *data)
/* Next, define the other direction. */
+
+enum conversion { none = 0, european, japanese, chinese, korean, other };
+
+/* A datatype for conversion lists. */
+typedef unsigned int cvlist_t;
+#define CVLIST(cv1, cv2, cv3, cv4, cv5) \
+ ((cv1) + ((cv2) << 3) + ((cv3) << 6) + ((cv4) << 9) + ((cv5) << 12))
+#define CVLIST_FIRST(cvl) ((cvl) & ((1 << 3) - 1))
+#define CVLIST_REST(cvl) ((cvl) >> 3)
+static const cvlist_t conversion_lists[4] =
+ {
+ /* TAG_none */ CVLIST (japanese, european, chinese, korean, other),
+ /* TAG_language_ja */ CVLIST (japanese, european, chinese, korean, other),
+ /* TAG_language_ko */ CVLIST (korean, european, japanese, chinese, other),
+ /* TAG_language_zh */ CVLIST (chinese, european, japanese, korean, other)
+ };
+
#define MIN_NEEDED_INPUT MIN_NEEDED_TO
#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
#define MAX_NEEDED_OUTPUT (MAX_NEEDED_FROM + 2)
@@ -510,12 +544,56 @@ gconv_end (struct __gconv_step *data)
#define BODY \
{ \
uint32_t ch; \
- size_t written = 0; \
+ size_t written; \
\
ch = get32 (inptr); \
\
+ if (var == iso2022jp2) \
+ { \
+ /* Handle Unicode tag characters (range U+E0000..U+E007F). */ \
+ if (__builtin_expect ((ch >> 7) == (0xe0000 >> 7), 0)) \
+ { \
+ ch &= 0x7f; \
+ if (ch >= 'A' && ch <= 'Z') \
+ ch += 'a' - 'A'; \
+ if (ch == 0x01) \
+ tag = TAG_language; \
+ else if (ch == 'j' && tag == TAG_language) \
+ tag = TAG_language_j; \
+ else if (ch == 'a' && tag == TAG_language_j) \
+ tag = TAG_language_ja; \
+ else if (ch == 'k' && tag == TAG_language) \
+ tag = TAG_language_k; \
+ else if (ch == 'o' && tag == TAG_language_k) \
+ tag = TAG_language_ko; \
+ else if (ch == 'z' && tag == TAG_language) \
+ tag = TAG_language_z; \
+ else if (ch == 'h' && tag == TAG_language_z) \
+ tag = TAG_language_zh; \
+ else if (ch == 0x7f) \
+ tag = TAG_none; \
+ else \
+ { \
+ /* Other tag characters reset the tag parsing state (if the \
+ current state is a temporary state) or are ignored (if \
+ the current state is a stable one). */ \
+ if (tag >= TAG_language) \
+ tag = TAG_none; \
+ } \
+ \
+ inptr += 4; \
+ continue; \
+ } \
+ \
+ /* Non-tag characters reset the tag parsing state, if the current \
+ state is a temporary state. */ \
+ if (__builtin_expect (tag >= TAG_language, 0)) \
+ tag = TAG_none; \
+ } \
+ \
/* First see whether we can write the character using the currently \
- selected character set. */ \
+ selected character set. But ignore the selected character set if \
+ the current language tag shows different preferences. */ \
if (set == ASCII_set) \
{ \
/* Please note that the NUL byte is *not* matched if we are not \
@@ -525,58 +603,75 @@ gconv_end (struct __gconv_step *data)
{ \
*outptr++ = ch; \
written = 1; \
+ \
+ /* At the beginning of a line, G2 designation is cleared. */ \
+ if (var == iso2022jp2 && ch == 0x0a) \
+ set2 = UNSPECIFIED_set; \
} \
- /* At the beginning of a line, G2 designation is cleared. */ \
- if (var == iso2022jp2 && ch == 0x0a) \
- set2 = UNSPECIFIED_set; \
+ else \
+ written = __UNKNOWN_10646_CHAR; \
} \
/* ISO-2022-JP recommends to encode the newline character always in \
ASCII since this allows a context-free interpretation of the \
characters at the beginning of the next line. Otherwise it would \
have to be known whether the last line ended using ASCII or \
JIS X 0201. */ \
- else if (set == JISX0201_Roman_set) \
+ else if (set == JISX0201_Roman_set \
+ && (__builtin_expect (tag == TAG_none, 1) \
+ || tag == TAG_language_ja)) \
{ \
- unsigned char buf[2]; \
+ unsigned char buf[1]; \
written = ucs4_to_jisx0201 (ch, buf); \
- if (written != __UNKNOWN_10646_CHAR && buf[0] > 0x20 \
- && buf[0] < 0x80) \
+ if (written != __UNKNOWN_10646_CHAR) \
{ \
- *outptr++ = buf[0]; \
- written = 1; \
+ if (buf[0] > 0x20 && buf[0] < 0x80) \
+ { \
+ *outptr++ = buf[0]; \
+ written = 1; \
+ } \
+ else \
+ written = __UNKNOWN_10646_CHAR; \
} \
- else \
- written = __UNKNOWN_10646_CHAR; \
} \
- else if (set == JISX0201_Kana_set) \
+ else if (set == JISX0201_Kana_set \
+ && (__builtin_expect (tag == TAG_none, 1) \
+ || tag == TAG_language_ja)) \
{ \
- unsigned char buf[2]; \
+ unsigned char buf[1]; \
written = ucs4_to_jisx0201 (ch, buf); \
- if (written != __UNKNOWN_10646_CHAR && buf[0] > 0xa0 \
- && buf[0] < 0xe0) \
+ if (written != __UNKNOWN_10646_CHAR) \
{ \
- *outptr++ = buf[0] - 0x80; \
- written = 1; \
+ if (buf[0] > 0xa0 && buf[0] < 0xe0) \
+ { \
+ *outptr++ = buf[0] - 0x80; \
+ written = 1; \
+ } \
+ else \
+ written = __UNKNOWN_10646_CHAR; \
} \
- else \
- written = __UNKNOWN_10646_CHAR; \
} \
else \
{ \
- if (set == JISX0208_1978_set || set == JISX0208_1983_set) \
+ if ((set == JISX0208_1978_set || set == JISX0208_1983_set) \
+ && (__builtin_expect (tag == TAG_none, 1) \
+ || tag == TAG_language_ja)) \
written = ucs4_to_jisx0208 (ch, outptr, outend - outptr); \
- else if (set == JISX0212_set) \
+ else if (set == JISX0212_set \
+ && (__builtin_expect (tag == TAG_none, 1) \
+ || tag == TAG_language_ja)) \
written = ucs4_to_jisx0212 (ch, outptr, outend - outptr); \
- else if (set == GB2312_set) \
+ else if (set == GB2312_set \
+ && (__builtin_expect (tag == TAG_none, 1) \
+ || tag == TAG_language_zh)) \
written = ucs4_to_gb2312 (ch, outptr, outend - outptr); \
+ else if (set == KSC5601_set \
+ && (__builtin_expect (tag == TAG_none, 1) \
+ || tag == TAG_language_ko)) \
+ written = ucs4_to_ksc5601 (ch, outptr, outend - outptr); \
else \
- { \
- assert (set == KSC5601_set); \
- \
- written = ucs4_to_ksc5601 (ch, outptr, outend - outptr); \
- } \
+ written = __UNKNOWN_10646_CHAR; \
\
- if (__builtin_expect (written, 1) == 0) \
+ if (__builtin_expect (written == 0, 0)) \
{ \
result = __GCONV_FULL_OUTPUT; \
break; \
@@ -585,18 +680,19 @@ gconv_end (struct __gconv_step *data)
outptr += written; \
} \
\
- if (written == __UNKNOWN_10646_CHAR || written == 0) \
+ if (written == __UNKNOWN_10646_CHAR \
+ && __builtin_expect (tag == TAG_none, 1)) \
{ \
if (set2 == ISO88591_set) \
{ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
+ if (ch >= 0x80 && ch <= 0xff) \
{ \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
+ if (__builtin_expect (outptr + 3 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
\
- if (ch >= 0x80 && ch <= 0xff) \
- { \
*outptr++ = ESC; \
*outptr++ = 'N'; \
*outptr++ = ch & 0x7f; \
@@ -629,18 +725,15 @@ gconv_end (struct __gconv_step *data)
} \
} \
\
- if (written == __UNKNOWN_10646_CHAR || written == 0) \
+ if (written == __UNKNOWN_10646_CHAR) \
{ \
- /* Either this is an unknown character or we have to switch \
- the currently selected character set. The character sets \
- do not code entirely separate parts of ISO 10646 and \
- therefore there is no single correct result. If we choose \
- the character set to use wrong we might be end up with \
- using yet another character set for the next character \
- though the current and the next could be encoded with one \
- character set. We leave this kind of optimization for \
- later and now simply use a fixed order in which we test for \
- availability */ \
+ /* The attempts to use the currently selected character set \
+ failed, either because the language tag changed, or because \
+ the character requires a different character set, or because \
+ the character is unknown. \
+ The CJK character sets partially overlap when seen as subsets \
+ of ISO 10646; therefore there is no single correct result. \
+ We use a preferrence order which depends on the language tag. */ \
\
if (ch <= 0x7f) \
{ \
@@ -671,235 +764,298 @@ gconv_end (struct __gconv_step *data)
else \
{ \
/* Now it becomes difficult. We must search the other \
- character sets one by one and we cannot use simple \
- arithmetic to determine whether the character can be \
- encoded using this set. */ \
- size_t written; \
+ character sets one by one. Use an ordered conversion \
+ list that depends on the current language tag. */ \
+ cvlist_t conversion_list; \
unsigned char buf[2]; \
\
- written = ucs4_to_jisx0201 (ch, buf); \
- if (written != __UNKNOWN_10646_CHAR && buf[0] < 0x80) \
- { \
- /* We use JIS X 0201. */ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- \
- *outptr++ = ESC; \
- *outptr++ = '('; \
- *outptr++ = 'J'; \
- set = JISX0201_Roman_set; \
+ result = __GCONV_ILLEGAL_INPUT; \
\
- if (__builtin_expect (outptr + 1 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = buf[0]; \
- } \
+ if (var == iso2022jp2) \
+ conversion_list = conversion_lists[tag >> 8]; \
else \
- { \
- written = ucs4_to_jisx0208 (ch, buf, 2); \
- if (written != __UNKNOWN_10646_CHAR) \
- { \
- /* We use JIS X 0208. */ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
+ conversion_list = CVLIST (japanese, 0, 0, 0, 0); \
\
- *outptr++ = ESC; \
- *outptr++ = '$'; \
- *outptr++ = 'B'; \
- set = JISX0208_1983_set; \
+ do \
+ switch (CVLIST_FIRST (conversion_list)) \
+ { \
+ case european: \
\
- if (__builtin_expect (outptr + 2 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = buf[0]; \
- *outptr++ = buf[1]; \
- } \
- else if (__builtin_expect (var, iso2022jp2) == iso2022jp) \
- { \
- /* We have no other choice. */ \
- STANDARD_ERR_HANDLER (4); \
- } \
- else \
- { \
- written = ucs4_to_jisx0212 (ch, buf, 2); \
- if (written != __UNKNOWN_10646_CHAR) \
- { \
- /* We use JIS X 0212. */ \
- if (__builtin_expect (outptr + 4 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = ESC; \
- *outptr++ = '$'; \
- *outptr++ = '('; \
- *outptr++ = 'D'; \
- set = JISX0212_set; \
- \
- if (__builtin_expect (outptr + 2 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = buf[0]; \
- *outptr++ = buf[1]; \
- } \
- else \
- { \
- written = ucs4_to_jisx0201 (ch, buf); \
- if (written != __UNKNOWN_10646_CHAR \
- && buf[0] >= 0x80) \
- { \
- /* We use JIS X 0201. */ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
+ /* Try ISO 8859-1 upper half. */ \
+ if (ch >= 0x80 && ch <= 0xff) \
+ { \
+ if (set2 != ISO88591_set) \
+ { \
+ if (__builtin_expect (outptr + 3 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = ESC; \
+ *outptr++ = '.'; \
+ *outptr++ = 'A'; \
+ set2 = ISO88591_set; \
+ } \
\
- *outptr++ = ESC; \
- *outptr++ = '('; \
- *outptr++ = 'I'; \
- set = JISX0201_Kana_set; \
+ if (__builtin_expect (outptr + 3 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = ESC; \
+ *outptr++ = 'N'; \
+ *outptr++ = ch - 0x80; \
+ result = __GCONV_OK; \
+ break; \
+ } \
\
- if (__builtin_expect (outptr + 1 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = buf[0] - 0x80; \
- } \
- else if (ch != 0xa5 && ch >= 0x80 && ch <= 0xff) \
- { \
- /* ISO 8859-1 upper half. */ \
- if (__builtin_expect (outptr + 3 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- \
- *outptr++ = ESC; \
- *outptr++ = '.'; \
- *outptr++ = 'A'; \
- set2 = ISO88591_set; \
+ /* Try ISO 8859-7 upper half. */ \
+ { \
+ const struct gap *rp = from_idx; \
\
- if (__builtin_expect (outptr + 3 > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = ESC; \
- *outptr++ = 'N'; \
- *outptr++ = ch - 0x80; \
- } \
- else \
+ while (ch > rp->end) \
+ ++rp; \
+ if (ch >= rp->start) \
+ { \
+ unsigned char res = \
+ iso88597_from_ucs4[ch - 0xa0 + rp->idx]; \
+ if (res != '\0') \
{ \
- written = ucs4_to_gb2312 (ch, buf, 2); \
- if (written != __UNKNOWN_10646_CHAR) \
+ if (set2 != ISO88597_set) \
{ \
- /* We use GB 2312. */ \
if (__builtin_expect (outptr + 3 > outend, 0))\
{ \
result = __GCONV_FULL_OUTPUT; \
break; \
} \
- \
*outptr++ = ESC; \
- *outptr++ = '$'; \
- *outptr++ = 'A'; \
- set = GB2312_set; \
- \
- if (__builtin_expect (outptr + 2 > outend, 0))\
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = buf[0]; \
- *outptr++ = buf[1]; \
+ *outptr++ = '.'; \
+ *outptr++ = 'F'; \
+ set2 = ISO88597_set; \
} \
- else \
+ \
+ if (__builtin_expect (outptr + 3 > outend, 0)) \
{ \
- written = ucs4_to_ksc5601 (ch, buf, 2); \
- if (written != __UNKNOWN_10646_CHAR) \
- { \
- /* We use KSC 5601. */ \
- if (__builtin_expect (outptr + 4 > outend,\
- 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = ESC; \
- *outptr++ = '$'; \
- *outptr++ = '('; \
- *outptr++ = 'C'; \
- set = KSC5601_set; \
- \
- if (__builtin_expect (outptr + 2 > outend,\
- 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = buf[0]; \
- *outptr++ = buf[1]; \
- } \
- else \
- { \
- const struct gap *rp = from_idx; \
- unsigned char gch = 0; \
- \
- while (ch > rp->end) \
- ++rp; \
- if (ch >= rp->start) \
- { \
- ch = ch - 0xa0 + rp->idx; \
- gch = iso88597_from_ucs4[ch]; \
- } \
- \
- if (__builtin_expect (gch, 1) != 0) \
- { \
- /* We use ISO 8859-7 greek. */ \
- if (__builtin_expect (outptr + 3 \
- > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = ESC; \
- *outptr++ = '.'; \
- *outptr++ = 'F'; \
- set2 = ISO88597_set; \
- \
- if (__builtin_expect (outptr + 3 \
- > outend, 0)) \
- { \
- result = __GCONV_FULL_OUTPUT; \
- break; \
- } \
- *outptr++ = ESC; \
- *outptr++ = 'N'; \
- *outptr++ = gch; \
- } \
- else \
- { \
- STANDARD_ERR_HANDLER (4); \
- } \
- } \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
} \
+ *outptr++ = ESC; \
+ *outptr++ = 'N'; \
+ *outptr++ = res; \
+ result = __GCONV_OK; \
+ break; \
} \
} \
} \
+ \
+ break; \
+ \
+ case japanese: \
+ \
+ /* Try JIS X 0201 Roman. */ \
+ written = ucs4_to_jisx0201 (ch, buf); \
+ if (written != __UNKNOWN_10646_CHAR \
+ && buf[0] > 0x20 && buf[0] < 0x80) \
+ { \
+ if (set != JISX0201_Roman_set) \
+ { \
+ if (__builtin_expect (outptr + 3 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = ESC; \
+ *outptr++ = '('; \
+ *outptr++ = 'J'; \
+ set = JISX0201_Roman_set; \
+ } \
+ \
+ if (__builtin_expect (outptr + 1 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = buf[0]; \
+ result = __GCONV_OK; \
+ break; \
+ } \
+ \
+ /* Try JIS X 0208. */ \
+ written = ucs4_to_jisx0208 (ch, buf, 2); \
+ if (written != __UNKNOWN_10646_CHAR) \
+ { \
+ if (set != JISX0208_1983_set) \
+ { \
+ if (__builtin_expect (outptr + 3 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = ESC; \
+ *outptr++ = '$'; \
+ *outptr++ = 'B'; \
+ set = JISX0208_1983_set; \
+ } \
+ \
+ if (__builtin_expect (outptr + 2 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = buf[0]; \
+ *outptr++ = buf[1]; \
+ result = __GCONV_OK; \
+ break; \
+ } \
+ \
+ if (__builtin_expect (var == iso2022jp, 0)) \
+ /* Don't use the other Japanese character sets. */ \
+ break; \
+ \
+ /* Try JIS X 0212. */ \
+ written = ucs4_to_jisx0212 (ch, buf, 2); \
+ if (written != __UNKNOWN_10646_CHAR) \
+ { \
+ if (set != JISX0212_set) \
+ { \
+ if (__builtin_expect (outptr + 4 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = ESC; \
+ *outptr++ = '$'; \
+ *outptr++ = '('; \
+ *outptr++ = 'D'; \
+ set = JISX0212_set; \
+ } \
+ \
+ if (__builtin_expect (outptr + 2 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = buf[0]; \
+ *outptr++ = buf[1]; \
+ result = __GCONV_OK; \
+ break; \
+ } \
+ \
+ break; \
+ \
+ case chinese: \
+ assert (var == iso2022jp2); \
+ \
+ /* Try GB 2312. */ \
+ written = ucs4_to_gb2312 (ch, buf, 2); \
+ if (written != __UNKNOWN_10646_CHAR) \
+ { \
+ if (set != GB2312_set) \
+ { \
+ if (__builtin_expect (outptr + 3 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = ESC; \
+ *outptr++ = '$'; \
+ *outptr++ = 'A'; \
+ set = GB2312_set; \
+ } \
+ \
+ if (__builtin_expect (outptr + 2 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = buf[0]; \
+ *outptr++ = buf[1]; \
+ result = __GCONV_OK; \
+ break; \
+ } \
+ \
+ break; \
+ \
+ case korean: \
+ assert (var == iso2022jp2); \
+ \
+ /* Try KSC 5601. */ \
+ written = ucs4_to_ksc5601 (ch, buf, 2); \
+ if (written != __UNKNOWN_10646_CHAR) \
+ { \
+ if (set != KSC5601_set) \
+ { \
+ if (__builtin_expect (outptr + 4 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = ESC; \
+ *outptr++ = '$'; \
+ *outptr++ = '('; \
+ *outptr++ = 'C'; \
+ set = KSC5601_set; \
+ } \
+ \
+ if (__builtin_expect (outptr + 2 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = buf[0]; \
+ *outptr++ = buf[1]; \
+ result = __GCONV_OK; \
+ break; \
+ } \
+ \
+ break; \
+ \
+ case other: \
+ assert (var == iso2022jp2); \
+ \
+ /* Try JIS X 0201 Kana. This is not officially part \
+ of ISO-2022-JP-2, according to RFC 1554. Therefore \
+ we try this only after all other attempts. */ \
+ written = ucs4_to_jisx0201 (ch, buf); \
+ if (written != __UNKNOWN_10646_CHAR && buf[0] >= 0x80) \
+ { \
+ if (set != JISX0201_Kana_set) \
+ { \
+ if (__builtin_expect (outptr + 3 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = ESC; \
+ *outptr++ = '('; \
+ *outptr++ = 'I'; \
+ set = JISX0201_Kana_set; \
+ } \
+ \
+ if (__builtin_expect (outptr + 1 > outend, 0)) \
+ { \
+ result = __GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = buf[0] - 0x80; \
+ result = __GCONV_OK; \
+ break; \
+ } \
+ \
+ break; \
+ \
+ default: \
+ abort (); \
+ } \
+ while (result == __GCONV_ILLEGAL_INPUT \
+ && (conversion_list = CVLIST_REST (conversion_list)) != 0);\
+ \
+ if (result == __GCONV_FULL_OUTPUT) \
+ break; \
+ \
+ if (result == __GCONV_ILLEGAL_INPUT) \
+ { \
+ STANDARD_ERR_HANDLER (4); \
} \
} \
} \
@@ -910,8 +1066,9 @@ gconv_end (struct __gconv_step *data)
#define LOOP_NEED_FLAGS
#define EXTRA_LOOP_DECLS , enum variant var, int *setp
#define INIT_PARAMS int set = *setp & CURRENT_SEL_MASK; \
- int set2 = *setp & CURRENT_ASSIGN_MASK
-#define UPDATE_PARAMS *setp = set | set2
+ int set2 = *setp & CURRENT_ASSIGN_MASK; \
+ int tag = *setp & CURRENT_TAG_MASK;
+#define UPDATE_PARAMS *setp = set | set2 | tag
#include <iconv/loop.c>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 08:13:08 +0000