diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-11-25 11:12:10 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-11-26 17:20:22 -0500 |
| commit | aa4d00ca39e604ac4e9fead401ccd4483e11a281 (patch) | |
| tree | 372c5350139f0cb00472dc80fadc2a72a051b240 | |
| parent | bf469f0ce98df9875daef625a85abd1160c44335 (diff) | |
| download | glibc-aa4d00ca39e604ac4e9fead401ccd4483e11a281.tar.gz glibc-aa4d00ca39e604ac4e9fead401ccd4483e11a281.tar.xz glibc-aa4d00ca39e604ac4e9fead401ccd4483e11a281.zip | |
localedata: GBK: add mapping for 0x80->Euro sign [BZ #20864]
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.
| -rw-r--r-- | localedata/ChangeLog | 5 | ||||
| -rw-r--r-- | localedata/charmaps/GBK | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index f5c58ae0dc..cb514baae3 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2016-11-26 Mike Frysinger <vapier@gentoo.org> + + [BZ #20864] + * localedata/GBK: Map 0x80 to U20AC. + 2016-08-24 Ernestas Kulik <ernestas.kulik@gmail.com> [BZ #20497] diff --git a/localedata/charmaps/GBK b/localedata/charmaps/GBK index 4c35f1426c..4186896f2a 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> |