iconv mapping of 0xA8 0xEC in CP1258 is non-canonical

diff --git a/ChangeLog b/ChangeLog
index 05eb2e051d12982203c5445fbb7c1b6e7b2c6aff..2866f71a72d17a3ae7bc6aa16ba96ab9c99686ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-06  Bruno Haible  <bruno@clisp.org>
 
+       [BZ #13061]
+       * iconvdata/cp1258.c (comp_table_data): Combine U+00A8 U+0301 to
+       U+0385, not to U+1FEE.
+
        [BZ #13062]
        * iconvdata/tcvn5712-1.c (comp_table_data): Remove useless and wrong
        entry for U+00A5 U+0301.

diff --git a/NEWS b/NEWS
index e94b59f996d4811052c8ae8a1a35fc7d6282c483..376d2d1de656cc6fae24b5439bf6c880764dffcb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,12 +10,12 @@ Version 2.15
 * The following bugs are resolved with this release:
 
   6779, 6783, 9696, 10103, 10709, 11589, 12403, 12847, 12868, 12852, 12874,
-  12885, 12892, 12907, 12922, 12935, 13007, 13021, 13062, 13067, 13068,
-  13085, 13088, 13090, 13092, 13096, 13114, 13118, 13123, 13134, 13138,
-  13147, 13150, 13166, 13179, 13185, 13189, 13192, 13268, 13276, 13282,
-  13291, 13305, 13328, 13335, 13337, 13344, 13358, 13367, 13413, 13416,
-  13423, 13439, 13446, 13472, 13484, 13506, 13515, 13523, 13524, 13538,
-  13540
+  12885, 12892, 12907, 12922, 12935, 13007, 13021, 13061, 13062, 13067,
+  13068, 13085, 13088, 13090, 13092, 13096, 13114, 13118, 13123, 13134,
+  13138, 13147, 13150, 13166, 13179, 13185, 13189, 13192, 13268, 13276,
+  13282, 13291, 13305, 13328, 13335, 13337, 13344, 13358, 13367, 13413,
+  13416, 13423, 13439, 13446, 13472, 13484, 13506, 13515, 13523, 13524,
+  13538, 13540
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.

diff --git a/iconvdata/cp1258.c b/iconvdata/cp1258.c
index 2b741ba96fec452f4936db4733399b16b1cb18a9..b7d23182eb1232ac1571266c0fd5bd066f407b82 100644 (file)
--- a/iconvdata/cp1258.c
+++ b/iconvdata/cp1258.c
@@ -197,8 +197,7 @@ static const struct
     { 0x0077, 0x1E83 },
     { 0x0079, 0x00FD },
     { 0x007A, 0x017A },
-    /* { 0x00A5, 0x0385 }, Wrong, A5 is Yen sign */
-    { 0x00A8, 0x1FEE },
+    { 0x00A8, 0x0385 }, /* prefer U+0385 over U+1FEE */
     { 0x00C2, 0x1EA4 },
     { 0x00C5, 0x01FA },
     { 0x00C6, 0x01FC },