From 3dc08a7eecc97660b30740f65f4fc4f334600c2e Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 16 Feb 2007 01:04:59 +0000
Subject: [PATCH] * iconvdata/johab.c (BODY for FROM_LOOP, BODY for TO_LOOP):
 Enable

	mapping of 0xD9 0xE6 and of 0xD9 0xE7.
	Reported by Jungshik Shin <jungshik@google.com>.
---
 ChangeLog                 | 6 ++++++
 iconvdata/johab.c         | 6 +++---
 localedata/ChangeLog      | 5 +++++
 localedata/charmaps/JOHAB | 2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2ab5dae4d..c4da7c3a2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-02  Bruno Haible  <bruno@clisp.org>
+
+	* iconvdata/johab.c (BODY for FROM_LOOP, BODY for TO_LOOP): Enable
+	mapping of 0xD9 0xE6 and of 0xD9 0xE7.
+	Reported by Jungshik Shin <jungshik@google.com>.
+
 2007-02-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/x86_64/bits/atomic;h: Fix asm parameters for some
diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index 6d6f92235c..8f0ab64e8e 100644
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -1,5 +1,5 @@
 /* Mapping tables for JOHAB handling.
-   Copyright (C) 1998, 1999, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000-2002, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jungshik Shin <jshin@pantheon.yale.edu>
    and Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -239,7 +239,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		if (__builtin_expect (ch2 < 0x31, 0)			      \
 		    || (__builtin_expect (ch2 > 0x7e, 0) && ch2 < 0x91)	      \
 		    || __builtin_expect (ch2, 0) == 0xff		      \
-		    || (__builtin_expect (ch, 0) == 0xd9 && ch2 > 0xe5)	      \
+		    || (__builtin_expect (ch, 0) == 0xd9 && ch2 > 0xe7)	      \
 		    || (__builtin_expect (ch, 0) == 0xda		      \
 			&& ch2 > 0xa0 && ch2 < 0xd4)			      \
 		    || (__builtin_expect (ch, 0) == 0xde && ch2 > 0xf1))      \
@@ -386,7 +386,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 		break;							      \
 	      }								      \
 	    if (__builtin_expect (written == __UNKNOWN_10646_CHAR, 0)	      \
-		|| (outptr[0] == 0x22 && outptr[1] > 0x65))		      \
+		|| (outptr[0] == 0x22 && outptr[1] > 0x67))		      \
 	      {								      \
 		UNICODE_TAG_HANDLER (ch, 4);				      \
 		STANDARD_TO_LOOP_ERR_HANDLER (4);			      \
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 39e87c2dd4..459a74188a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-02  Bruno Haible  <bruno@clisp.org>
+
+	* charmaps/JOHAB: Add mappings for 0xD9 0xE6 and 0xD9 0xE7.
+	Reported by Jungshik Shin <jungshik@google.com>.
+
 2007-01-19  Ulrich Drepper  <drepper@redhat.com>
 
 	* charmaps/BRF: New file.
diff --git a/localedata/charmaps/JOHAB b/localedata/charmaps/JOHAB
index e0e6f5751d..5a638eebcf 100644
--- a/localedata/charmaps/JOHAB
+++ b/localedata/charmaps/JOHAB
@@ -11520,6 +11520,8 @@ CHARMAP
 <U33C2>     /xd9/xe3     SQUARE AM
 <U33D8>     /xd9/xe4     SQUARE PM
 <U2121>     /xd9/xe5     TELEPHONE SIGN
+<U20AC>     /xd9/xe6     EURO SIGN
+<U00AE>     /xd9/xe7     REGISTERED SIGN
 <UFF01>     /xda/x31     FULLWIDTH EXCLAMATION MARK
 <UFF02>     /xda/x32     FULLWIDTH QUOTATION MARK
 <UFF03>     /xda/x33     FULLWIDTH NUMBER SIGN
-- 
2.11.4.GIT