diff mbox

localedata: GBK: add mapping for 0x80->Euro sign [BZ #20864]

Message ID 20161125161735.3823-1-vapier@gentoo.org
State Committed
Headers

Commit Message

Mike Frysinger Nov. 25, 2016, 4:17 p.m. UTC 
  Microsoft long ago added a mapping for 0x80 to the Euro sign to their
CP936.  While GBK 1.0 doesn't include this mapping, it is compatible,
and Microsoft and glibc alias the two codepages.  We could split them
apart so GBK wouldn't include the mapping, but that seems like a lot
of work for little gain.

2016-11-25  Mike Frysinger  <vapier@gentoo.org>

	[BZ #20864]
	* localedata/GBK: Map 0x80 to U20AC.
---
 localedata/charmaps/GBK | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Florian Weimer Nov. 25, 2016, 4:26 p.m. UTC | #1 
On 11/25/2016 05:17 PM, Mike Frysinger wrote:
> Microsoft long ago added a mapping for 0x80 to the Euro sign to their
> CP936.  While GBK 1.0 doesn't include this mapping, it is compatible,
> and Microsoft and glibc alias the two codepages.  We could split them
> apart so GBK wouldn't include the mapping, but that seems like a lot
> of work for little gain.
>
> 2016-11-25  Mike Frysinger  <vapier@gentoo.org>
>
> 	[BZ #20864]
> 	* localedata/GBK: Map 0x80 to U20AC.

Looks okay to me.

Thanks,
Florian
Andreas Schwab Nov. 28, 2016, 9:23 a.m. UTC | #2 
FAIL: iconvdata/tst-tables
failed: ./tst-table.sh /home/abuild/rpmbuild/BUILD/glibc-2.24.90.20161127.gb964e06/cc-base/ /home/abuild/rpmbuild/BUILD/glibc-2.24.90.20161127.gb964e06/cc-base/iconvdata/ GBK 

Andreas.
diff mbox

Patch

diff --git a/localedata/charmaps/GBK b/localedata/charmaps/GBK
index 4c35f1426c64..4186896f2a9b 100644
--- a/localedata/charmaps/GBK
+++ b/localedata/charmaps/GBK
@@ -3,10 +3,15 @@ 
 <mb_cur_min> 1
 <comment_char> %
 <escape_char> /
+% https://en.wikipedia.org/wiki/GBK
 
+% https://www-01.ibm.com/software/globalization/ccsid/ccsid936.html
 % alias CP936
+
+% ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WindowsBestFit
 % alias MS936
 % alias WINDOWS-936
+
 CHARMAP
 <U0000>     /x00         NULL (NUL)
 <U0001>     /x01         START OF HEADING (SOH)
@@ -136,6 +141,8 @@  CHARMAP
 <U007D>     /x7d         RIGHT CURLY BRACKET
 <U007E>     /x7e         TILDE
 <U007F>     /x7f         DELETE (DEL)
+% This isn't in GBK 1.0, but Microsoft added it to their CP936 page.
+<U20AC>     /x80         EURO SIGN
 
 <U4E02>     /x81/x40     <CJK>
 <U4E04>     /x81/x41     <CJK>