about summary refs log tree commit diff
path: root/iconvdata/jisx0213.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-04-20 07:58:48 +0000
committerUlrich Drepper <drepper@redhat.com>2002-04-20 07:58:48 +0000
commit93a568aaba1d3da3497102dfe1eeb81070a24c1c (patch)
tree2832e216f8fe8085a1fca7b71bd01ff2b65e704f /iconvdata/jisx0213.h
parente2806aaf5d84e7eb63cc11633e9e833d8d1421b5 (diff)
downloadglibc-93a568aaba1d3da3497102dfe1eeb81070a24c1c.tar.gz
glibc-93a568aaba1d3da3497102dfe1eeb81070a24c1c.tar.xz
glibc-93a568aaba1d3da3497102dfe1eeb81070a24c1c.zip
Update.
	* 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>
Diffstat (limited to 'iconvdata/jisx0213.h')
-rw-r--r--iconvdata/jisx0213.h78
1 files changed, 78 insertions, 0 deletions
diff --git a/iconvdata/jisx0213.h b/iconvdata/jisx0213.h
new file mode 100644
index 0000000000..5632e523bc
--- /dev/null
+++ b/iconvdata/jisx0213.h
@@ -0,0 +1,78 @@
+/* Functions for JISX0213 conversion.
+   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.  */
+
+#ifndef _JISX0213_H
+#define _JISX0213_H	1
+
+#include <stdint.h>
+
+extern const uint16_t __jisx0213_to_ucs_combining[][2];
+extern const uint16_t __jisx0213_to_ucs_main[120 * 94];
+extern const uint32_t __jisx0213_to_ucs_pagestart[];
+extern const int16_t __jisx0213_from_ucs_level1[2715];
+extern const uint16_t __jisx0213_from_ucs_level2[];
+
+#define NELEMS(arr) (sizeof (arr) / sizeof (arr[0]))
+
+static inline uint32_t
+jisx0213_to_ucs4 (unsigned int row, unsigned int col)
+{
+  uint32_t val;
+
+  if (row >= 0x121 && row <= 0x17e)
+    row -= 289;
+  else if (row == 0x221)
+    row -= 451;
+  else if (row >= 0x223 && row <= 0x225)
+    row -= 452;
+  else if (row == 0x228)
+    row -= 454;
+  else if (row >= 0x22c && row <= 0x22f)
+    row -= 457;
+  else if (row >= 0x26e && row <= 0x27e)
+    row -= 519;
+  else
+    return 0x0000;
+
+  if (col >= 0x21 && col <= 0x7e)
+    col -= 0x21;
+  else
+    return 0x0000;
+
+  val = __jisx0213_to_ucs_main[row * 94 + col];
+  val = __jisx0213_to_ucs_pagestart[val >> 8] + (val & 0xff);
+  if (val == 0xfffd)
+    val = 0x0000;
+  return val;
+}
+
+static inline uint16_t
+ucs4_to_jisx0213 (uint32_t ucs)
+{
+  if (ucs < NELEMS (__jisx0213_from_ucs_level1) << 6)
+    {
+      int index1 = __jisx0213_from_ucs_level1[ucs >> 6];
+      if (index1 >= 0)
+	return __jisx0213_from_ucs_level2[(index1 << 6) + (ucs & 0x3f)];
+    }
+  return 0x0000;
+}
+
+#endif /* _JISX0213_H */