summary refs log tree commit diff
path: root/iconvdata/jisx0213.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-08-02 22:33:57 +0000
committerUlrich Drepper <drepper@redhat.com>2004-08-02 22:33:57 +0000
commit5d32be9a0a5489d9274de87b3657b1e16e27ef3f (patch)
tree3548f254c276ead1792229961bfc3306fb98ac1c /iconvdata/jisx0213.h
parentf95bb511f47cf3e35f1aa7b4621cabb150d40ae4 (diff)
downloadglibc-5d32be9a0a5489d9274de87b3657b1e16e27ef3f.tar.gz
glibc-5d32be9a0a5489d9274de87b3657b1e16e27ef3f.tar.xz
glibc-5d32be9a0a5489d9274de87b3657b1e16e27ef3f.zip
Update.
2004-08-02  Jakub Jelinek  <jakub@redhat.com>

	* iconvdata/ibm932.c (BODY): Avoid binary search for ch >= 0xffff.
	Always treat high as highest number in range + 1.
	* iconvdata/ibm943.c (BODY): Likewise.

2004-07-31  Bruno Haible  <bruno@clisp.org>

	* iconvdata/JISX0213.TXT: Updated to JISX0213 plane 1 version 2004.
	* iconvdata/jisx0213.c (__jisx0213_to_ucs_main,
	__jisx0213_to_ucs_pagestart, __jisx0213_from_ucs_level1,
	__jisx0213_from_ucs_level2): Regenerated.
	* iconvdata/jisx0213.h (jisx0213_added_in_2004_p): New function.
	* iconvdata/iso-2022-jp-3.c (JISX0213_1_2000_set): Renamed from
	JISX0213_1_set.
	(JISX0213_1_2004_set): New enum value.
	(BODY for FROM_LOOP): Treat ESC $ ( Q like ESC $ ( O.
	(BODY for TO_LOOP): For JISX 0213 plane 1 characters, emit ESC $ ( O
	when possible, ESC $ ( Q when needed.
	* iconvdata/testdata/EUC-JISX0213: Add the 10 new characters.
	* iconvdata/testdata/EUC-JISX0213..UTF8: Update.
	* iconvdata/testdata/SHIFT_JISX0213: Add the 10 new characters.
	* iconvdata/testdata/SHIFT_JISX0213..UTF8: Update.
	* iconvdata/testdata/ISO-2022-JP-3: Add the 10 new JISX0213 characters.
	* iconvdata/testdata/ISO-2022-JP-3..UTF8: Update.

2004-07-22  Bruno Haible  <bruno@clisp.org>

	* iconvdata/gconv-modules (ISO-8859-7): Add alias ISO_8859-7:2003.
Diffstat (limited to 'iconvdata/jisx0213.h')
-rw-r--r--iconvdata/jisx0213.h25
1 files changed, 24 insertions, 1 deletions
diff --git a/iconvdata/jisx0213.h b/iconvdata/jisx0213.h
index c92c70fdee..c549f590b0 100644
--- a/iconvdata/jisx0213.h
+++ b/iconvdata/jisx0213.h
@@ -1,5 +1,5 @@
 /* Functions for JISX0213 conversion.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -77,4 +77,27 @@ ucs4_to_jisx0213 (uint32_t ucs)
   return 0x0000;
 }
 
+static inline int
+__attribute ((always_inline))
+jisx0213_added_in_2004_p (uint16_t val)
+{
+  /* From JISX 0213:2000 to JISX 0213:2004, 10 characters were added to
+     plane 1, and plane 2 was left unchanged.  See ISO-IR-233.  */
+  switch (val >> 8)
+    {
+    case 0x2e:
+      return val == 0x2e21;
+    case 0x2f:
+      return val == 0x2f7e;
+    case 0x4f:
+      return val == 0x4f54 || 0x4f7e;
+    case 0x74:
+      return val == 0x7427;
+    case 0x7e:
+      return val >= 0x7e7a && val <= 0x7e7e;
+    default:
+      return 0;
+    }
+}
+
 #endif /* _JISX0213_H */