Update.

1998-04-13 14:52  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/cns11643.c: New file.
	* iconvdata/cns11643.h: New file.
	* iconvdata/cns11643l1.c: New file.
	* iconvdata/cns11643l1.h: New file.
	* iconvdata/euctw.c: New file.
	* iconvdata/Makefile: Add rules for EUC-TW and CNS.
	* iconvdata/gconv-modules: Likewise.

	* iconvdata/eucjp.c: Several bug fixes and improvements.
	* iconvdata/gb2312.h: Likewise.
	* iconvdata/jis0201.h: Likewise.
	* iconvdata/jis0208.h: Likewise.
	* iconvdata/jis0212.h: Likewise.

1 files changed, 233 insertions, 0 deletions

diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h
new file mode 100644
index 0000000000..f791d4cdb3
--- /dev/null
+++ b/iconvdata/cns11643.h
@@ -0,0 +1,233 @@
+/* Access functions for CNS 11643, plane 2 handling.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdint.h>
+
+/* Table for CNS 11643, plane 2 to UCS4 conversion.  */
+extern const uint16_t cns11643l2_to_ucs4_tab[];
+extern const uint16_t cns11643l14_to_ucs4_tab[];
+
+
+static inline wchar_t
+cns11643_to_ucs4 (const char **s, size_t avail, unsigned char offset)
+{
+  unsigned char ch = *(*s);
+  unsigned char ch2;
+  unsigned char ch3;
+  wchar_t result;
+  int idx;
+
+  if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) > 0x30)
+    return UNKNOWN_10646_CHAR;
+
+  if (avail < 3)
+    return 0;
+
+  ch2 = (*s)[1];
+  if ((ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
+    return UNKNOWN_10646_CHAR;
+
+  ch3 = (*s)[2];
+  if ((ch3 - offset) <= 0x20 || (ch3 - offset) >= 0x7f)
+    return UNKNOWN_10646_CHAR;
+
+  idx = (ch2 - 0x21 - offset) * 94 + (ch3 - 0x21 - offset);
+
+  if ((ch - 0x21 - offset) == 1)
+    {
+      if (idx > 0x2196)
+	return UNKNOWN_10646_CHAR;
+      result = cns11643l1_to_ucs4_tab[idx];
+    }
+  else if ((ch - 0x21 - offset) == 2)
+    {
+      if (idx > 0x1de1)
+	return UNKNOWN_10646_CHAR;
+      result = cns11643l2_to_ucs4_tab[idx];
+    }
+  else if ((ch - 0x21 - offset) == 0xe)
+    {
+      if (idx > 0x19bd)
+	return UNKNOWN_10646_CHAR;
+      result = cns11643l14_to_ucs4_tab[idx];
+    }
+  else
+    return UNKNOWN_10646_CHAR;
+
+  if (result != L'\0')
+    (*s) += 3;
+  else
+    result = UNKNOWN_10646_CHAR;
+
+  return result;
+}
+
+
+/* Tables for the UCS4 -> CNS conversion.  */
+extern const char cns11643l1_from_ucs4_tab1[][2];
+extern const char cns11643l1_from_ucs4_tab2[][2];
+extern const char cns11643l1_from_ucs4_tab3[][2];
+extern const char cns11643l1_from_ucs4_tab4[][2];
+extern const char cns11643l1_from_ucs4_tab5[][2];
+extern const char cns11643l1_from_ucs4_tab6[][2];
+extern const char cns11643l1_from_ucs4_tab7[][2];
+extern const char cns11643l1_from_ucs4_tab8[][2];
+extern const char cns11643l1_from_ucs4_tab9[][2];
+extern const char cns11643l1_from_ucs4_tab10[][2];
+extern const char cns11643l1_from_ucs4_tab11[][2];
+extern const char cns11643l1_from_ucs4_tab12[][2];
+extern const char cns11643l1_from_ucs4_tab13[][2];
+extern const char cns11643l1_from_ucs4_tab14[][2];
+extern const char cns11643_from_ucs4_tab[][3];
+
+
+static inline size_t
+ucs4_to_cns11643 (wchar_t wch, char *s, size_t avail)
+{
+  unsigned int ch = (unsigned int) wch;
+  char buf[2];
+  const char *cp = NULL;
+  int needed = 2;
+
+  if (ch < 0xa7)
+    cp = "";
+  else if (ch < 0xf7)
+    cp = cns11643l1_from_ucs4_tab1[ch - 0xa7];
+  else if (ch < 0x2c7)
+    cp = "";
+  else if (ch <= 0x2d9)
+    cp = cns11643l1_from_ucs4_tab2[ch - 0x2c7];
+  else if (ch < 0x391)
+    cp = "";
+  else if (ch <= 0x3c9)
+    cp = cns11643l1_from_ucs4_tab3[ch - 0x391];
+  else if (ch < 0x2013)
+    cp = "";
+  else if (ch <= 0x203e)
+    cp = cns11643l1_from_ucs4_tab4[ch - 0x2013];
+  else if (ch == 0x2103)
+    cp = "\x22\x6a";
+  else if (ch == 0x2105)
+    cp = "\x22\x22";
+  else if (ch == 0x2109)
+    cp = "\x22\x6b";
+  else if (ch < 0x2160)
+    cp = "";
+  else if (ch <= 0x2169)
+    {
+      buf[0] = '\x24';
+      buf[1] = '\x2b' + (ch - 0x2160);
+      cp = buf;
+    }
+  else if (ch < 0x2170)
+    cp = "";
+  else if (ch <= 0x2179)
+    {
+      buf[0] = '\x26';
+      buf[1] = '\x35' + (ch - 0x2170);
+      cp = buf;
+    }
+  else if (ch < 0x2190)
+    cp = "";
+  else if (ch <= 0x2199)
+    cp = cns11643l1_from_ucs4_tab5[ch - 0x2190];
+  else if (ch < 0x2215)
+    cp = "";
+  else if (ch <= 0x2267)
+    cp = cns11643l1_from_ucs4_tab6[ch - 0x2215];
+  else if (ch == 0x22a5)
+    cp = "\x22\x47";
+  else if (ch == 0x22bf)
+    cp = "\x22\x4a";
+  else if (ch < 0x2400)
+    cp = "";
+  else if (ch <= 0x2421)
+    cp = cns11643l1_from_ucs4_tab7[ch - 0x2400];
+  else if (ch < 0x2460)
+    cp = "";
+  else if (ch <= 0x247d)
+    cp = cns11643l1_from_ucs4_tab8[ch - 0x2460];
+  else if (ch < 0x2500)
+    cp = "";
+  else if (ch <= 0x2642)
+    cp = cns11643l1_from_ucs4_tab9[ch - 0x2500];
+  else if (ch < 0x3000)
+    cp = "";
+  else if (ch <= 0x3029)
+    cp = cns11643l1_from_ucs4_tab10[ch - 0x3000];
+  else if (ch == 0x30fb)
+    cp = "\x21\x26";
+  else if (ch < 0x3105)
+    cp = "";
+  else if (ch <= 0x3129)
+    {
+      buf[0] = '\x25';
+      buf[1] = '\x26' + (ch - 0x3105);
+      cp = buf;
+    }
+  else if (ch == 0x32a3)
+    cp = "\x22\x21";
+  else if (ch < 0x338e)
+    cp = "";
+  else if (ch <= 0x33d5)
+    cp = cns11643l1_from_ucs4_tab11[ch - 0x338e];
+  else if (ch < 0x4e00)
+    cp = "";
+  else if (ch <= 0x9f9c)
+    {
+      cp = cns11643l1_from_ucs4_tab12[ch - 0x4e00];
+
+      if (cp[0] == '\0')
+	{
+	  /* Let's try the other planes.  */
+	  needed = 3;
+	  cp = cns11643_from_ucs4_tab[ch - 0x4e00];
+	}
+    }
+  else if (ch < 0xfe30)
+    cp = "";
+  else if (ch <= 0xfe6b)
+    cp = cns11643l1_from_ucs4_tab13[ch - 0xfe30];
+  else if (ch < 0xff01)
+    cp = "";
+  else if (ch <= 0xff5d)
+    cp = cns11643l1_from_ucs4_tab14[ch - 0xff01];
+  else if (ch == 0xffe0)
+    cp = "\x22\x66";
+  else if (ch == 0xffe1)
+    cp = "\x22\x67";
+  else if (ch == 0xffe5)
+    cp = "\x22\x64";
+  else
+    cp = "";
+
+  if (cp[0] == '\0')
+    return UNKNOWN_10646_CHAR;
+
+  if (avail < needed)
+    return 0;
+
+  s[0] = cp[0];
+  s[1] = cp[1];
+  if (needed == 3)
+    s[2] = cp[2];
+
+  return needed;
+}