Index: patches/converters.patch |
=================================================================== |
--- patches/converters.patch (revision 291774) |
+++ patches/converters.patch (working copy) |
@@ -56,52 +56,6 @@ |
CHARMAP |
<U0000> \x00 |0 |
<U0001> \x01 |0 |
-Index: source/data/mappings/windows-936-2000.ucm |
-=================================================================== |
---- source/data/mappings/windows-936-2000.ucm (revision 259715) |
-+++ source/data/mappings/windows-936-2000.ucm (working copy) |
-@@ -37,7 +37,8 @@ |
- |
- # build an extension-only (delta) .cnv file |
- # requires the base .cnv file at runtime |
--<icu:base> "ibm-1386_P100-2001" |
-+# CHROME : we don't want ibm-1386 |
-+#<icu:base> "ibm-1386_P100-2001" |
- |
- # The following was the generated state table. |
- # This does not account for unassigned characters |
-@@ -259,6 +260,7 @@ |
- <U01DA> \xA8\xB7 |0 |
- <U01DB> \xA8\xB8 |1 |
- <U01DC> \xA8\xB8 |0 |
-+<U01F9> \xA8\xBF |1 |
- <U0251> \xA8\xBB |0 |
- <U0261> \xA8\xC0 |0 |
- <U02C7> \xA1\xA6 |0 |
-@@ -380,6 +382,7 @@ |
- <U044E> \xA7\xF0 |0 |
- <U044F> \xA7\xF1 |0 |
- <U0451> \xA7\xD7 |0 |
-+<U1E3F> \xA8\xBC |1 |
- <U2010> \xA9\x5C |0 |
- <U2013> \xA8\x43 |0 |
- <U2014> \xA1\xAA |0 |
-@@ -472,6 +475,7 @@ |
- <U2299> \xA1\xD1 |0 |
- <U22A5> \xA1\xCD |0 |
- <U22BF> \xA8\x53 |0 |
-+<U22EF> \xA1\xAD |1 |
- <U2312> \xA1\xD0 |0 |
- <U2460> \xA2\xD9 |0 |
- <U2461> \xA2\xDA |0 |
-@@ -696,6 +700,7 @@ |
- <U3015> \xA1\xB3 |0 |
- <U3016> \xA1\xBC |0 |
- <U3017> \xA1\xBD |0 |
-+<U301C> \xA1\xAB |1 |
- <U301D> \xA8\x94 |0 |
- <U301E> \xA8\x95 |0 |
- <U3021> \xA9\x40 |0 |
Index: source/data/mappings/convrtrs.txt |
=================================================================== |
--- source/data/mappings/convrtrs.txt (revision 259715) |
@@ -246,7 +200,7 @@ |
-# - the usual IBM PC control code rotation (1A-1C-7F) |
-# - the Windows table has roundtrips for bytes 80, A0, and FD-FF to U+0080 and PUA |
-ibm-943_P15A-2003 { UTR22* } |
-+shift_jis-html5 { UTR22* } |
++shift_jis-html |
ibm-943 # Leave untagged because this isn't the default |
Shift_JIS { IANA* MIME* WINDOWS JAVA } |
MS_Kanji { IANA WINDOWS JAVA } |
@@ -296,7 +250,7 @@ |
+# Chrome: Instead of ibm-33722_P*, we use what's specified in the WHATWG |
+# encoding standard (HTML5). All the |
+# 3-byte seqeunces in the normative EUC-JP are now decode-only. |
-+euc-jp-html5 { UTR22* } |
++euc-jp-html |
+ EUC-JP { MIME* IANA JAVA* WINDOWS*} |
Extended_UNIX_Code_Packed_Format_for_Japanese { IANA* JAVA WINDOWS } |
csEUCPkdFmtJapanese { IANA JAVA WINDOWS } |
@@ -331,14 +285,14 @@ |
- cp950 { JAVA* } |
- 950 { JAVA } |
- x-IBM950 { JAVA } |
++# Chrome: HTML5 has big5-hkscs as an alias for big5 |
++# TODO(jshin): Decide if Chrome should follow spec. crbug.com/277040 |
ibm-1375_P100-2007 { UTR22* } # Big5-HKSCS-2004 with Unicode 3.1 mappings. This uses supplementary characters. |
ibm-1375 { IBM* } |
Big5-HKSCS { IANA* JAVA* } |
big5hk { JAVA } |
HKSCS-BIG5 # From http://www.openi18n.org/localenameguide/ |
+ |
-+# Chrome: HTML5 has big5-hkscs as an alias for big5 |
-+# TODO(jshin): Decide if Chrome should follow spec. crbug.com/277040 |
ibm-5471_P100-2006 { UTR22* } # Big5-HKSCS-2001 with Unicode 3.0 mappings. This uses many PUA characters. |
ibm-5471 { IBM* } |
Big5-HKSCS |
@@ -576,7 +530,7 @@ |
-ibm-902_P100-1999 { UTR22* } ibm-902 { IBM* } # PC Estonian (w/ euro update), update of ibm-922 |
-ibm-922_P100-1999 { UTR22* } ibm-922 { IBM* } IBM922 { JAVA } cp922 { JAVA* } 922 { JAVA } x-IBM922 { JAVA } # PC Estonian (w/o euro update) |
+# Chrome: Use the table from the WHATWG encoding standard (HTML5). |
-+ibm-866_html5-2012 { UTR22* } ibm-866 { IBM* } IBM866 { IANA* MIME* JAVA } cp866 { IANA MIME WINDOWS JAVA* } 866 { IANA JAVA } csIBM866 { IANA JAVA } # PC Russian (w/o euro update) |
++ibm866-html ibm-866 { IBM* } IBM866 { IANA* MIME* JAVA } cp866 { IANA MIME WINDOWS JAVA* } 866 { IANA JAVA } csIBM866 { IANA JAVA } # PC Russian (w/o euro update) |
ibm-1168_P100-2002 { UTR22* } ibm-1168 { IBM* } KOI8-U { IANA* WINDOWS } windows-21866 { WINDOWS* } # Ukrainian KOI8. koi8-ru != KOI8-U and Microsoft is wrong for aliasing them as the same. |
-ibm-4909_P100-1999 { UTR22* } ibm-4909 { IBM* } # ISO Greek (w/ euro update), update of ibm-813 |
@@ -648,25 +602,25 @@ |
# Partially algorithmic converters |
# [U_ENABLE_GENERIC_ISO_2022] |
-@@ -943,322 +672,25 @@ |
+@@ -943,322 +672,21 @@ |
# Language-specific variants of ISO-2022 continue to be available as listed below. |
# ISO_2022 ISO-2022 |
-+# Chrome: The encoding standard only supports ISO-2022-JP and HZ-GB. |
-+# Keep ISO-2022-{KR,CN,CN-Ext} until we're sure what to do about |
-+# replacement encodings. See crbug.com/277037 |
-+# TODO(jshin): Remove them when the bug is resolved. |
++# Chrome: The encoding standard only supports ISO-2022-JP. |
++# Remove ISO-2022-{KR,CN,CN-Ext} and HZ-GB from the alias table. |
++# See crbug.com/277037 and https://www.w3.org/Bugs/Public/show_bug.cgi?id=25339 |
++# about HZ-GB. |
ISO_2022,locale=ja,version=0 ISO-2022-JP { IANA* MIME* JAVA* } csISO2022JP { IANA JAVA } x-windows-iso2022jp { JAVA } x-windows-50220 { JAVA } |
-ISO_2022,locale=ja,version=1 ISO-2022-JP-1 { MIME* } JIS_Encoding { IANA* } csJISEncoding { IANA } ibm-5054 { IBM* } JIS x-windows-50221 { JAVA* } |
-ISO_2022,locale=ja,version=2 ISO-2022-JP-2 { IANA* MIME* } csISO2022JP2 { IANA } |
-ISO_2022,locale=ja,version=3 JIS7 |
-ISO_2022,locale=ja,version=4 JIS8 |
- ISO_2022,locale=ko,version=0 ISO-2022-KR { IANA* MIME* JAVA* } csISO2022KR { IANA JAVA } # This uses ibm-949 |
+-ISO_2022,locale=ko,version=0 ISO-2022-KR { IANA* MIME* JAVA* } csISO2022KR { IANA JAVA } # This uses ibm-949 |
-ISO_2022,locale=ko,version=1 ibm-25546 { IBM* } |
- ISO_2022,locale=zh,version=0 ISO-2022-CN { IANA* JAVA* } csISO2022CN { JAVA } x-ISO-2022-CN-GB { JAVA } |
- ISO_2022,locale=zh,version=1 ISO-2022-CN-EXT { IANA* } |
+-ISO_2022,locale=zh,version=0 ISO-2022-CN { IANA* JAVA* } csISO2022CN { JAVA } x-ISO-2022-CN-GB { JAVA } |
+-ISO_2022,locale=zh,version=1 ISO-2022-CN-EXT { IANA* } |
-ISO_2022,locale=zh,version=2 ISO-2022-CN-CNS x-ISO-2022-CN-CNS { JAVA* } |
- HZ HZ-GB-2312 { IANA* } |
+-HZ HZ-GB-2312 { IANA* } |
-x11-compound-text COMPOUND_TEXT x-compound-text { JAVA* } |
-ISCII,version=0 x-ISCII91 { JAVA* } x-iscii-de { WINDOWS } windows-57002 { WINDOWS* } iscii-dev ibm-4902 { IBM* } # ibm-806 contains non-standard box drawing symbols. |