mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 17:53:37 +08:00
93a568aaba
* iconvdata/JISX0213.TXT: New file. * iconvdata/jisx0213.h: New file. * iconvdata/jisx0213.c: New file. * iconvdata/euc-jisx0213.c: New file. * iconvdata/shift_jisx0213.c: New file. * iconvdata/gconv-modules (EUC-JISX0213, SHIFT_JISX0213): New modules. * iconvdata/EUC-JISX0213.precomposed: New file. * iconvdata/SHIFT_JISX0213.precomposed: New file. * iconvdata/SHIFT_JISX0213.irreversible: New file. * iconvdata/tst-table-to.c (main): Make it work for encodings for which the "to" direction is stateful. * iconvdata/tst-tables.sh: Add EUC-JISX0213, SHIFT_JISX0213. * iconvdata/Makefile (modules): Add libJISX0213, EUC-JISX0213, SHIFT_JISX0213. (libJISX0213-routines): New variable. (LDFLAGS-EUC-JISX0213.so, LDFLAGS-SHIFT_JISX0213.so): New variables. (EUC-JISX0213.so, SHIFT_JISX0213.so): Depend on libJISX0213.so. (LDFLAGS-libJISX0213.so): New variable. (distribute): Add JISX0213.TXT, EUC-JISX0213.precomposed, SHIFT_JISX0213.precomposed, SHIFT_JISX0213.irreversible, jisx0213.c, jisx0213.h, euc-jisx0213.c, shift_jisx0213.c. 2002-04-15 Bruno Haible <bruno@clisp.org> * iconvdata/big5hkscs.c (big5hkscs_to_ucs): Change element type to uint32_t. Update to Unicode 3.2. (from_ucs4, from_ucs4_idx): Update to Unicode 3.2. (BODY for TO_LOOP): Handle the ASCII range specially. * iconvdata/BIG5HKSCS.irreversible: Add one more entry. * iconvdata/testdata/BIG5HKSCS: Remove a character. * iconvdata/testdata/BIG5HKSCS..UTF-8: Regenerated. 2002-04-15 Bruno Haible <bruno@clisp.org> * iconvdata/gb18030.c (__twobyte_to_ucs, __fourbyte_to_ucs, __ucs_to_gb18030_tab1, __ucs_to_gb18030_tab2): Update to Unicode 3.2. 2002-04-15 Bruno Haible <bruno@clisp.org> * iconvdata/cns11643.h (__cns11643_from_ucs4p2c_tab): New declaration. (ucs4_to_cns11643): Update. * iconvdata/cns11643.c: Update to Unicode 3.2. (__cns11643l2*_to_ucs4_tab, __cns11643_from_ucs4p0_tab, __cns11643_from_ucs4p2_tab): Regenerated. (__cns11643_from_ucs4p2c_tab): New array. * iconvdata/EUC-TW.irreversible: Remove two entries. 2002-04-15 Bruno Haible <bruno@clisp.org> * locale/C-translit.h.in: Update to Unicode 3.2. Add <U2047>, <U205F>..<U2063>, <U2145>..<U2149>, <U2A74>..<U2A76>, <U30A0>, <U3251>..<U325F>, <U32B1>..<U32BF>, <UFE00>..<UFE0F>. 2002-04-15 Bruno Haible <bruno@clisp.org>
440 lines
15 KiB
C
440 lines
15 KiB
C
/* Conversion from and to EUC-JISX0213.
|
|
Copyright (C) 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Bruno Haible <bruno@clisp.org>, 2002.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <stdint.h>
|
|
#include <gconv.h>
|
|
|
|
/* The structure of EUC-JISX0213 is as follows:
|
|
|
|
0x00..0x7F: ASCII
|
|
|
|
0x8E{A1..FE}: JISX0201 Katakana, with prefix 0x8E, offset by +0x80.
|
|
|
|
0x8F{A1..FE}{A1..FE}: JISX0213 plane 2, with prefix 0x8F, offset by +0x8080.
|
|
|
|
0x{A1..FE}{A1..FE}: JISX0213 plane 1, offset by +0x8080.
|
|
|
|
Note that some JISX0213 characters are not contained in Unicode 3.2
|
|
and are therefore best represented as sequences of Unicode characters.
|
|
*/
|
|
|
|
#include "jisx0213.h"
|
|
|
|
/* Definitions used in the body of the `gconv' function. */
|
|
#define CHARSET_NAME "EUC-JISX0213//"
|
|
#define FROM_LOOP from_euc_jisx0213
|
|
#define TO_LOOP to_euc_jisx0213
|
|
#define DEFINE_INIT 1
|
|
#define DEFINE_FINI 1
|
|
#define MIN_NEEDED_FROM 1
|
|
#define MAX_NEEDED_FROM 3
|
|
#define MIN_NEEDED_TO 4
|
|
#define PREPARE_LOOP \
|
|
int saved_state; \
|
|
int *statep = &data->__statep->__count;
|
|
#define EXTRA_LOOP_ARGS , statep
|
|
|
|
|
|
/* Since we might have to reset input pointer we must be able to save
|
|
and restore the state. */
|
|
#define SAVE_RESET_STATE(Save) \
|
|
if (Save) \
|
|
saved_state = *statep; \
|
|
else \
|
|
*statep = saved_state
|
|
|
|
|
|
/* During EUC-JISX0213 to UCS-4 conversion, the COUNT element of the state
|
|
contains the last UCS-4 character, shifted by 3 bits.
|
|
During UCS-4 to EUC-JISX0213 conversion, the COUNT element of the state
|
|
contains the last two bytes to be output, shifted by 3 bits. */
|
|
|
|
/* Since this is a stateful encoding we have to provide code which resets
|
|
the output state to the initial state. This has to be done during the
|
|
flushing. */
|
|
#define EMIT_SHIFT_TO_INIT \
|
|
if (data->__statep->__count != 0) \
|
|
{ \
|
|
if (FROM_DIRECTION) \
|
|
{ \
|
|
if (__builtin_expect (outbuf + 4 <= outend, 1)) \
|
|
{ \
|
|
/* Write out the last character. */ \
|
|
*((uint32_t *) outbuf)++ = data->__statep->__count >> 3; \
|
|
data->__statep->__count = 0; \
|
|
} \
|
|
else \
|
|
/* We don't have enough room in the output buffer. */ \
|
|
status = __GCONV_FULL_OUTPUT; \
|
|
} \
|
|
else \
|
|
{ \
|
|
if (__builtin_expect (outbuf + 2 <= outend, 1)) \
|
|
{ \
|
|
/* Write out the last character. */ \
|
|
uint32_t lasttwo = data->__statep->__count >> 3; \
|
|
*outbuf++ = (lasttwo >> 8) & 0xff; \
|
|
*outbuf++ = lasttwo & 0xff; \
|
|
data->__statep->__count = 0; \
|
|
} \
|
|
else \
|
|
/* We don't have enough room in the output buffer. */ \
|
|
status = __GCONV_FULL_OUTPUT; \
|
|
} \
|
|
}
|
|
|
|
|
|
/* First define the conversion function from EUC-JISX0213 to UCS-4. */
|
|
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
|
#define MAX_NEEDED_INPUT MAX_NEEDED_FROM
|
|
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
|
#define LOOPFCT FROM_LOOP
|
|
#define BODY \
|
|
{ \
|
|
uint32_t ch; \
|
|
\
|
|
/* Determine whether there is a buffered character pending. */ \
|
|
ch = *statep >> 3; \
|
|
if (__builtin_expect (ch == 0, 1)) \
|
|
{ \
|
|
/* No - so look at the next input byte. */ \
|
|
ch = *inptr; \
|
|
if (ch < 0x80) \
|
|
/* Plain ASCII character. */ \
|
|
++inptr; \
|
|
else if ((ch >= 0xa1 && ch <= 0xfe) || ch == 0x8e || ch == 0x8f) \
|
|
{ \
|
|
/* Two or three byte character. */ \
|
|
uint32_t ch2; \
|
|
\
|
|
if (__builtin_expect (inptr + 1 >= inend, 0)) \
|
|
{ \
|
|
/* The second byte is not available. */ \
|
|
result = __GCONV_INCOMPLETE_INPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
ch2 = inptr[1]; \
|
|
\
|
|
/* The second byte must be >= 0xa1 and <= 0xfe. */ \
|
|
if (__builtin_expect (ch2 < 0xa1 || ch2 > 0xfe, 0)) \
|
|
{ \
|
|
/* This is an illegal character. */ \
|
|
if (! ignore_errors_p ()) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
++inptr; \
|
|
++*irreversible; \
|
|
break; \
|
|
} \
|
|
\
|
|
if (ch == 0x8e) \
|
|
{ \
|
|
/* Half-width katakana. */ \
|
|
if (__builtin_expect (ch2 > 0xdf, 0)) \
|
|
{ \
|
|
/* This is an illegal character. */ \
|
|
if (! ignore_errors_p ()) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
++inptr; \
|
|
++*irreversible; \
|
|
break; \
|
|
} \
|
|
\
|
|
ch = ch2 + 0xfec0; \
|
|
inptr += 2; \
|
|
} \
|
|
else \
|
|
{ \
|
|
const unsigned char *endp; \
|
|
\
|
|
if (ch == 0x8f) \
|
|
{ \
|
|
/* JISX 0213 plane 2. */ \
|
|
uint32_t ch3; \
|
|
\
|
|
if (__builtin_expect (inptr + 2 >= inend, 0)) \
|
|
{ \
|
|
/* The third byte is not available. */ \
|
|
result = __GCONV_INCOMPLETE_INPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
ch3 = inptr[2]; \
|
|
endp = inptr + 3; \
|
|
\
|
|
ch = jisx0213_to_ucs4 (0x200 - 0x80 + ch2, ch3 ^ 0x80); \
|
|
} \
|
|
else \
|
|
{ \
|
|
/* JISX 0213 plane 1. */ \
|
|
endp = inptr + 2; \
|
|
\
|
|
ch = jisx0213_to_ucs4 (0x100 - 0x80 + ch, ch2 ^ 0x80); \
|
|
} \
|
|
\
|
|
if (ch == 0) \
|
|
{ \
|
|
/* This is an illegal character. */ \
|
|
if (! ignore_errors_p ()) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
++inptr; \
|
|
++*irreversible; \
|
|
break; \
|
|
} \
|
|
\
|
|
inptr = endp; \
|
|
\
|
|
if (ch < 0x80) \
|
|
{ \
|
|
/* It's a combining character. */ \
|
|
uint32_t u1 = __jisx0213_to_ucs_combining[ch - 1][0]; \
|
|
uint32_t u2 = __jisx0213_to_ucs_combining[ch - 1][1]; \
|
|
\
|
|
/* See whether we have room for two characters. */ \
|
|
if (outptr + 8 <= outend) \
|
|
{ \
|
|
put32 (outptr, u1); \
|
|
outptr += 4; \
|
|
put32 (outptr, u2); \
|
|
outptr += 4; \
|
|
continue; \
|
|
} \
|
|
\
|
|
/* Otherwise store only the first character now, and \
|
|
put the second one into the queue. */ \
|
|
ch = u1; \
|
|
*statep = u2 << 3; \
|
|
} \
|
|
} \
|
|
} \
|
|
else \
|
|
{ \
|
|
/* This is illegal. */ \
|
|
if (! ignore_errors_p ()) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
++inptr; \
|
|
++*irreversible; \
|
|
continue; \
|
|
} \
|
|
} \
|
|
\
|
|
put32 (outptr, ch); \
|
|
outptr += 4; \
|
|
}
|
|
#define LOOP_NEED_FLAGS
|
|
#define EXTRA_LOOP_DECLS , int *statep
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
/* Next, define the other direction, from UCS-4 to EUC-JISX0213. */
|
|
|
|
/* Composition tables for each of the relevant combining characters. */
|
|
static const struct
|
|
{
|
|
uint16_t base;
|
|
uint16_t composed;
|
|
} comp_table_data[] =
|
|
{
|
|
#define COMP_TABLE_IDX_02E5 0
|
|
#define COMP_TABLE_LEN_02E5 1
|
|
{ 0xabe4, 0xabe5 }, /* 0x12B65 = 0x12B64 U+02E5 */
|
|
#define COMP_TABLE_IDX_02E9 (COMP_TABLE_IDX_02E5 + COMP_TABLE_LEN_02E5)
|
|
#define COMP_TABLE_LEN_02E9 1
|
|
{ 0xabe0, 0xabe6 }, /* 0x12B66 = 0x12B60 U+02E9 */
|
|
#define COMP_TABLE_IDX_0300 (COMP_TABLE_IDX_02E9 + COMP_TABLE_LEN_02E9)
|
|
#define COMP_TABLE_LEN_0300 5
|
|
{ 0xa9dc, 0xabc4 }, /* 0x12B44 = 0x1295C U+0300 */
|
|
{ 0xabb8, 0xabc8 }, /* 0x12B48 = 0x12B38 U+0300 */
|
|
{ 0xabb7, 0xabca }, /* 0x12B4A = 0x12B37 U+0300 */
|
|
{ 0xabb0, 0xabcc }, /* 0x12B4C = 0x12B30 U+0300 */
|
|
{ 0xabc3, 0xabce }, /* 0x12B4E = 0x12B43 U+0300 */
|
|
#define COMP_TABLE_IDX_0301 (COMP_TABLE_IDX_0300 + COMP_TABLE_LEN_0300)
|
|
#define COMP_TABLE_LEN_0301 4
|
|
{ 0xabb8, 0xabc9 }, /* 0x12B49 = 0x12B38 U+0301 */
|
|
{ 0xabb7, 0xabcb }, /* 0x12B4B = 0x12B37 U+0301 */
|
|
{ 0xabb0, 0xabcd }, /* 0x12B4D = 0x12B30 U+0301 */
|
|
{ 0xabc3, 0xabcf }, /* 0x12B4F = 0x12B43 U+0301 */
|
|
#define COMP_TABLE_IDX_309A (COMP_TABLE_IDX_0301 + COMP_TABLE_LEN_0301)
|
|
#define COMP_TABLE_LEN_309A 14
|
|
{ 0xa4ab, 0xa4f7 }, /* 0x12477 = 0x1242B U+309A */
|
|
{ 0xa4ad, 0xa4f8 }, /* 0x12478 = 0x1242D U+309A */
|
|
{ 0xa4af, 0xa4f9 }, /* 0x12479 = 0x1242F U+309A */
|
|
{ 0xa4b1, 0xa4fa }, /* 0x1247A = 0x12431 U+309A */
|
|
{ 0xa4b3, 0xa4fb }, /* 0x1247B = 0x12433 U+309A */
|
|
{ 0xa5ab, 0xa5f7 }, /* 0x12577 = 0x1252B U+309A */
|
|
{ 0xa5ad, 0xa5f8 }, /* 0x12578 = 0x1252D U+309A */
|
|
{ 0xa5af, 0xa5f9 }, /* 0x12579 = 0x1252F U+309A */
|
|
{ 0xa5b1, 0xa5fa }, /* 0x1257A = 0x12531 U+309A */
|
|
{ 0xa5b3, 0xa5fb }, /* 0x1257B = 0x12533 U+309A */
|
|
{ 0xa5bb, 0xa5fc }, /* 0x1257C = 0x1253B U+309A */
|
|
{ 0xa5c4, 0xa5fd }, /* 0x1257D = 0x12544 U+309A */
|
|
{ 0xa5c8, 0xa5fe }, /* 0x1257E = 0x12548 U+309A */
|
|
{ 0xa6f5, 0xa6f8 }, /* 0x12678 = 0x12675 U+309A */
|
|
};
|
|
|
|
#define MIN_NEEDED_INPUT MIN_NEEDED_TO
|
|
#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
|
|
#define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
|
|
#define LOOPFCT TO_LOOP
|
|
#define BODY \
|
|
{ \
|
|
uint32_t ch = get32 (inptr); \
|
|
\
|
|
if ((*statep >> 3) != 0) \
|
|
{ \
|
|
/* Attempt to combine the last character with this one. */ \
|
|
uint16_t lasttwo = *statep >> 3; \
|
|
unsigned int idx; \
|
|
unsigned int len; \
|
|
\
|
|
if (ch == 0x02e5) \
|
|
idx = COMP_TABLE_IDX_02E5, len = COMP_TABLE_LEN_02E5; \
|
|
else if (ch == 0x02e9) \
|
|
idx = COMP_TABLE_IDX_02E9, len = COMP_TABLE_LEN_02E9; \
|
|
else if (ch == 0x0300) \
|
|
idx = COMP_TABLE_IDX_0300, len = COMP_TABLE_LEN_0300; \
|
|
else if (ch == 0x0301) \
|
|
idx = COMP_TABLE_IDX_0301, len = COMP_TABLE_LEN_0301; \
|
|
else if (ch == 0x309a) \
|
|
idx = COMP_TABLE_IDX_309A, len = COMP_TABLE_LEN_309A; \
|
|
else \
|
|
goto not_combining; \
|
|
\
|
|
do \
|
|
if (comp_table_data[idx].base == lasttwo) \
|
|
break; \
|
|
while (++idx, --len > 0); \
|
|
\
|
|
if (len > 0) \
|
|
{ \
|
|
/* Output the combined character. */ \
|
|
if (__builtin_expect (outptr + 1 >= outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
lasttwo = comp_table_data[idx].composed; \
|
|
*outptr++ = (lasttwo >> 8) & 0xff; \
|
|
*outptr++ = lasttwo & 0xff; \
|
|
*statep = 0; \
|
|
inptr += 4; \
|
|
continue; \
|
|
} \
|
|
\
|
|
not_combining: \
|
|
/* Output the buffered character. */ \
|
|
if (__builtin_expect (outptr + 1 >= outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
*outptr++ = (lasttwo >> 8) & 0xff; \
|
|
*outptr++ = lasttwo & 0xff; \
|
|
*statep = 0; \
|
|
continue; \
|
|
} \
|
|
\
|
|
if (ch < 0x80) \
|
|
/* Plain ASCII character. */ \
|
|
*outptr++ = ch; \
|
|
else if (ch >= 0xff61 && ch <= 0xff9f) \
|
|
{ \
|
|
/* Half-width katakana. */ \
|
|
if (__builtin_expect (outptr + 1 >= outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
*outptr++ = 0x8e; \
|
|
*outptr++ = ch - 0xfec0; \
|
|
} \
|
|
else \
|
|
{ \
|
|
ch = ucs4_to_jisx0213 (ch); \
|
|
if (ch == 0) \
|
|
{ \
|
|
UNICODE_TAG_HANDLER (ch, 4); \
|
|
\
|
|
/* Illegal character. */ \
|
|
STANDARD_ERR_HANDLER (4); \
|
|
} \
|
|
\
|
|
if (ch & 0x0080) \
|
|
{ \
|
|
/* A possible match in comp_table_data. We have to buffer it. */\
|
|
\
|
|
/* We know it's a JISX 0213 plane 1 character. */ \
|
|
assert ((ch & 0x8000) == 0); \
|
|
\
|
|
*statep = (ch | 0x8080) << 3; \
|
|
inptr += 4; \
|
|
continue; \
|
|
} \
|
|
\
|
|
if (ch & 0x8000) \
|
|
{ \
|
|
/* JISX 0213 plane 2. */ \
|
|
if (__builtin_expect (outptr + 2 >= outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
*outptr++ = 0x8f; \
|
|
} \
|
|
else \
|
|
{ \
|
|
/* JISX 0213 plane 1. */ \
|
|
if (__builtin_expect (outptr + 1 >= outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
} \
|
|
*outptr++ = (ch >> 8) | 0x80; \
|
|
*outptr++ = (ch & 0xff) | 0x80; \
|
|
} \
|
|
\
|
|
inptr += 4; \
|
|
}
|
|
#define LOOP_NEED_FLAGS
|
|
#define EXTRA_LOOP_DECLS , int *statep
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
/* Now define the toplevel functions. */
|
|
#include <iconv/skeleton.c>
|