[PATCH] Fix the bugs I introduced in 011a
This fixes a few tiny glitches I found in 011a, all my fault.
- 011a_recognize_glibc_2.3.2_locale_names.diff
- make the lowercase version of zh_*.gb2312/.gbk the canonical one.
- fix some GBK/GB2312 confusion which I introduced
- remove accidental duplicate alias for ar_KW.iso88596
Index: 011a_recognize_glibc_2.3.2_locale_names.diff
===================================================================
--- 011a_recognize_glibc_2.3.2_locale_names.diff (revision 292)
+++ 011a_recognize_glibc_2.3.2_locale_names.diff (working copy)
@@ -52,11 +52,12 @@
This patch by Branden Robinson.
Major "forward port" by Nathanael Nerode.
-Not submitted upstream.
+Partially submitted upstream. This is so large I don't expect it to all go in at once,
+but any bit would help. --Nathanael
Index: xc/nls/compose.dir
===================================================================
---- xc/nls/compose.dir (revision 271)
+--- xc/nls/compose.dir (revision 292)
+++ xc/nls/compose.dir (working copy)
@@ -1,14 +1,22 @@
XCOMM $Xorg: compose.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
@@ -294,15 +295,16 @@
+iso8859-1/Compose: xh_ZA.ISO8859-1
+XCOMM microsoft-cp1255/Compose: yi_US.CP1255
zh_CN/Compose: zh_CN.eucCN
- zh_CN/Compose: zh_CN.GB2312
+-zh_CN/Compose: zh_CN.GB2312
-zh_CN.gbk/Compose: zh_CN.GBK
++zh_CN/Compose: zh_CN.gb2312
+zh_CN.gbk/Compose: zh_CN.gbk
+zh_HK.big5/Compose: zh_HK.big5
+zh_HK.big5hkscs/Compose: zh_HK.big5-hkscs
+zh_HK.big5hkscs/Compose: zh_HK.Big5-HKSCS
+zh_HK.big5hkscs/Compose: zh_HK.big5hkscs
+zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS
-+zh_CN/Compose: zh_SG.GB2312
++zh_CN/Compose: zh_SG.gb2312
+zh_CN.gbk/Compose: zh_SG.gbk
zh_TW.big5/Compose: zh_TW.big5
-zh_TW.big5/Compose: zh_TW.Big5
@@ -485,9 +487,9 @@
+en_US.UTF-8/Compose: zu_ZA.UTF-8
Index: xc/nls/locale.alias
===================================================================
---- xc/nls/locale.alias (revision 271)
+--- xc/nls/locale.alias (revision 292)
+++ xc/nls/locale.alias (working copy)
-@@ -17,58 +17,105 @@
+@@ -17,58 +17,104 @@
Cextend: en_US.ISO8859-1
Cextend.en: en_US.ISO8859-1
English_United-States.437: C
@@ -544,7 +546,6 @@
ar_JO.utf8: ar_JO.UTF-8
ar_KW: ar_KW.ISO8859-6
+ar_KW.iso88596: ar_KW.ISO8859-6
-+ar_KW.iso88596: ar_KW.ISO8859-6
+ar_KW.ISO-8859-6: ar_KW.ISO8859-6
ar_KW.utf8: ar_KW.UTF-8
ar_LB: ar_LB.ISO8859-6
@@ -596,7 +597,7 @@
be: be_BY.CP1251
be_BY: be_BY.CP1251
be_BY.cp1251: be_BY.CP1251
-@@ -76,7 +123,6 @@
+@@ -76,7 +122,6 @@
be_BY.microsoft-cp1251: be_BY.CP1251
be_BY.MICROSOFT-CP1251: be_BY.CP1251
be_BY.utf8: be_BY.UTF-8
@@ -604,7 +605,7 @@
bg: bg_BG.CP1251
bg_BG: bg_BG.CP1251
bg_BG.cp1251: bg_BG.CP1251
-@@ -84,21 +130,35 @@
+@@ -84,21 +129,35 @@
bg_BG.microsoft-cp1251: bg_BG.CP1251
bg_BG.MICROSOFT-CP1251: bg_BG.CP1251
bg_BG.iso88595: bg_BG.ISO8859-5
@@ -642,7 +643,7 @@
cs: cs_CZ.ISO8859-2
cs_CS: cs_CZ.ISO8859-2
cs_CS.ISO8859-2: cs_CZ.ISO8859-2
-@@ -107,14 +167,19 @@
+@@ -107,14 +166,19 @@
cs_CZ.ISO-8859-2: cs_CZ.ISO8859-2
cs_CZ.ISO_8859-2: cs_CZ.ISO8859-2
cs_CZ.utf8: cs_CZ.UTF-8
@@ -663,7 +664,7 @@
da: da_DK.ISO8859-1
da_DK: da_DK.ISO8859-1
DA_DK: da_DK.ISO8859-1
-@@ -124,24 +189,31 @@
+@@ -124,24 +188,31 @@
da_DK.ISO-8859-1: da_DK.ISO8859-1
da_DK.ISO_8859-1: da_DK.ISO8859-1
da_DK.iso885915: da_DK.ISO8859-15
@@ -697,7 +698,7 @@
de_CH: de_CH.ISO8859-1
de_CH.iso88591: de_CH.ISO8859-1
de_CH.ISO_8859-1: de_CH.ISO8859-1
-@@ -151,6 +223,7 @@
+@@ -151,6 +222,7 @@
de_CH.ISO-8859-15: de_CH.ISO8859-15
de_CH.utf8: de_CH.UTF-8
de_DE: de_DE.ISO8859-1
@@ -705,7 +706,7 @@
de_DE.88591: de_DE.ISO8859-1
de_DE.88591.en: de_DE.ISO8859-1
de_DE.iso88591: de_DE.ISO8859-1
-@@ -161,27 +234,34 @@
+@@ -161,27 +233,34 @@
de_DE.ISO_8859-15: de_DE.ISO8859-15
de_DE.8859-15: de_DE.ISO8859-15
de_DE.8859-15@euro: de_DE.ISO8859-15
@@ -746,7 +747,7 @@
el_GR.utf8: el_GR.UTF-8
en: en_US.ISO8859-1
en.ISO-8859-1: en_US.ISO8859-1
-@@ -194,34 +274,52 @@
+@@ -194,34 +273,52 @@
en_BE@euro: en_BE.ISO8859-15
en_BE.utf8: en_BE.UTF-8
en_BW: en_BW.ISO8859-1
@@ -800,7 +801,7 @@
en_US: en_US.ISO8859-1
EN_US: en_US.ISO8859-1
en_US.88591: en_US.ISO8859-1
-@@ -230,6 +328,7 @@
+@@ -230,6 +327,7 @@
en_US.ISO-8859-1: en_US.ISO8859-1
en_US.ISO_8859-1: en_US.ISO8859-1
en_US.iso885915: en_US.ISO8859-15
@@ -808,7 +809,7 @@
en_US.8859-15: en_US.ISO8859-15
en_US.ISO8859-15@euro: en_US.ISO8859-15
en_US.utf8: en_US.UTF-8
-@@ -249,36 +348,47 @@
+@@ -249,36 +347,47 @@
en_ZA.iso88591: en_ZA.ISO8859-1
en_ZA.ISO-8859-1: en_ZA.ISO8859-1
en_ZA.ISO_8859-1: en_ZA.ISO8859-1
@@ -862,7 +863,7 @@
es_EC.utf8: es_EC.UTF-8
es_ES: es_ES.ISO8859-1
es_ES.88591: es_ES.ISO8859-1
-@@ -287,107 +397,144 @@
+@@ -287,107 +396,144 @@
es_ES.ISO-8859-1: es_ES.ISO8859-1
es_ES.ISO_8859-1: es_ES.ISO8859-1
es_ES.iso885915: es_ES.ISO8859-15
@@ -1017,7 +1018,7 @@
fr_CH.utf8: fr_CH.UTF-8
fr_FR: fr_FR.ISO8859-1
fr_FR.88591: fr_FR.ISO8859-1
-@@ -396,7 +543,10 @@
+@@ -396,7 +542,10 @@
fr_FR.ISO-8859-1: fr_FR.ISO8859-1
fr_FR.ISO_8859-1: fr_FR.ISO8859-1
fr_FR.iso885915: fr_FR.ISO8859-15
@@ -1028,7 +1029,7 @@
fr_FR.utf8: fr_FR.UTF-8
fr_LU: fr_LU.ISO8859-1
fr_LU.88591: fr_LU.ISO8859-1
-@@ -405,38 +555,63 @@
+@@ -405,38 +554,63 @@
fr_LU.ISO-8859-1: fr_LU.ISO8859-1
fr_LU.ISO_8859-1: fr_LU.ISO8859-1
fr_LU.iso885915: fr_LU.ISO8859-15
@@ -1092,7 +1093,7 @@
he_IL.cp1255: he_IL.CP1255
he_IL.microsoftcp1255: he_IL.CP1255
he_IL.microsoft-cp1255: he_IL.CP1255
-@@ -459,7 +634,12 @@
+@@ -459,7 +633,12 @@
hu_HU: hu_HU.ISO8859-2
hu_HU.iso88592: hu_HU.ISO8859-2
hu_HU.ISO-8859-2: hu_HU.ISO8859-2
@@ -1106,7 +1107,7 @@
in: id_ID.ISO8859-1
in_ID: id_ID.ISO8859-1
is: is_IS.ISO8859-1
-@@ -468,12 +648,13 @@
+@@ -468,12 +647,13 @@
is_IS.ISO-8859-1: is_IS.ISO8859-1
is_IS.ISO_8859-1: is_IS.ISO8859-1
is_IS.iso885915: is_IS.ISO8859-15
@@ -1121,7 +1122,7 @@
it_CH.utf8: it_CH.UTF-8
it_IT: it_IT.ISO8859-1
it_IT.88591: it_IT.ISO8859-1
-@@ -482,13 +663,17 @@
+@@ -482,13 +662,17 @@
it_IT.ISO-8859-1: it_IT.ISO8859-1
it_IT.ISO_8859-1: it_IT.ISO8859-1
it_IT.iso885915: it_IT.ISO8859-15
@@ -1144,7 +1145,7 @@
iw: he_IL.ISO8859-8
iw_IL: he_IL.ISO8859-8
Iw_IL: he_IL.ISO8859-8
-@@ -529,8 +714,9 @@
+@@ -529,8 +713,9 @@
kl: kl_GL.ISO8859-1
kl_GL: kl_GL.ISO8859-1
kl_GL.iso88591: kl_GL.ISO8859-1
@@ -1155,7 +1156,7 @@
ko: ko_KR.eucKR
ko_KR: ko_KR.eucKR
KO_KR: ko_KR.eucKR
-@@ -543,8 +729,13 @@
+@@ -543,8 +728,13 @@
kw: kw_GB.ISO8859-1
kw_GB: kw_GB.ISO8859-1
kw_GB.iso88591: kw_GB.ISO8859-1
@@ -1169,7 +1170,7 @@
lo: lo_LA.MULELAO-1
lo_LA: lo_LA.MULELAO-1
lo_LA.cp1133: lo_LA.IBM-CP1133
-@@ -552,14 +743,15 @@
+@@ -552,14 +742,15 @@
lo_LA.mulelao1: lo_LA.MULELAO-1
#if defined(VeryOldFreeBSD)
XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
@@ -1187,7 +1188,7 @@
lt_LT.ISO_8859-4: lt_LT.ISO8859-4
lt_LT.iso885913: lt_LT.ISO8859-13
lt_LT.ISO-8859-13: lt_LT.ISO8859-13
-@@ -568,42 +760,56 @@
+@@ -568,42 +759,56 @@
lv: lv_LV.ISO8859-13
lv_LV: lv_LV.ISO8859-13
lv_LV.iso88594: lv_LV.ISO8859-4
@@ -1248,7 +1249,7 @@
nl_NL: nl_NL.ISO8859-1
nl_NL.88591: nl_NL.ISO8859-1
nl_NL.88591.en: nl_NL.ISO8859-1
-@@ -611,13 +817,27 @@
+@@ -611,13 +816,27 @@
nl_NL.ISO-8859-1: nl_NL.ISO8859-1
nl_NL.ISO_8859-1: nl_NL.ISO8859-1
nl_NL.iso885915: nl_NL.ISO8859-15
@@ -1276,7 +1277,7 @@
no: no_NO.ISO8859-1
no_NO: no_NO.ISO8859-1
no_NO.88591: no_NO.ISO8859-1
-@@ -625,26 +845,29 @@
+@@ -625,26 +844,29 @@
no_NO.iso88591: no_NO.ISO8859-1
no_NO.ISO-8859-1: no_NO.ISO8859-1
no_NO.iso885915: no_NO.ISO8859-15
@@ -1320,7 +1321,7 @@
ph: ph_PH.ISO8859-1
ph_PH: ph_PH.ISO8859-1
ph_PH.iso88591: ph_PH.ISO8859-1
-@@ -663,7 +886,6 @@
+@@ -663,7 +885,6 @@
pt_BR.iso88591: pt_BR.ISO8859-1
pt_BR.ISO-8859-1: pt_BR.ISO8859-1
pt_BR.ISO_8859-1: pt_BR.ISO8859-1
@@ -1328,7 +1329,7 @@
pt_BR.utf8: pt_BR.UTF-8
pt_PT: pt_PT.ISO8859-1
pt_PT.88591: pt_PT.ISO8859-1
-@@ -672,6 +894,8 @@
+@@ -672,6 +893,8 @@
pt_PT.ISO-8859-1: pt_PT.ISO8859-1
pt_PT.ISO_8859-1: pt_PT.ISO8859-1
pt_PT.iso885915: pt_PT.ISO8859-15
@@ -1337,7 +1338,7 @@
pt_PT@euro: pt_PT.ISO8859-15
pt_PT.utf8: pt_PT.UTF-8
pt_PT.UTF-8@euro: pt_PT.UTF-8
-@@ -704,10 +928,10 @@
+@@ -704,10 +927,10 @@
se_NO: se_NO.UTF-8
se_NO.utf8: se_NO.UTF-8
sh: sh_YU.ISO8859-2
@@ -1349,7 +1350,7 @@
sk: sk_SK.ISO8859-2
sk_SK: sk_SK.ISO8859-2
sk_SK.iso88592: sk_SK.ISO8859-2
-@@ -718,20 +942,31 @@
+@@ -718,20 +941,31 @@
sl_SI.iso88592: sl_SI.ISO8859-2
sl_SI.ISO-8859-2: sl_SI.ISO8859-2
sl_SI.utf8: sl_SI.UTF-8
@@ -1381,7 +1382,7 @@
sr_YU.ISO8859-5@cyrillic: sr_YU.ISO8859-5
sr_YU.cp1251@cyrillic: sr_YU.CP1251
sr_YU.CP1251@cyrillic: sr_YU.CP1251
-@@ -740,11 +975,17 @@
+@@ -740,11 +974,17 @@
sr_YU.MICROSOFT-CP1251@cyrillic: sr_YU.CP1251
sr_YU.utf8: sr_YU.UTF-8
sr_YU.UTF-8@cyrillic: sr_YU.UTF-8
@@ -1399,7 +1400,7 @@
sv_FI.utf8: sv_FI.UTF-8
sv_SE: sv_SE.ISO8859-1
sv_SE.88591: sv_SE.ISO8859-1
-@@ -753,12 +994,14 @@
+@@ -753,12 +993,14 @@
sv_SE.ISO-8859-1: sv_SE.ISO8859-1
sv_SE.ISO_8859-1: sv_SE.ISO8859-1
sv_SE.iso885915: sv_SE.ISO8859-15
@@ -1414,7 +1415,7 @@
tg: tg_TJ.KOI8-C
tg_TJ: tg_TJ.KOI8-C
tg_TJ.koi8c: tg_TJ.KOI8-C
-@@ -769,9 +1012,13 @@
+@@ -769,9 +1011,13 @@
th_TH.TIS-620: th_TH.TIS620
th_TH.TACTIS: th_TH.TIS620
th_TH.utf8: th_TH.UTF-8
@@ -1428,7 +1429,7 @@
tr: tr_TR.ISO8859-9
tr_TR: tr_TR.ISO8859-9
TR_TR: tr_TR.ISO8859-9
-@@ -800,6 +1047,9 @@
+@@ -800,6 +1046,9 @@
ur_PK.MICROSOFT-CP1256: ur_PK.CP1256
uz: uz_UZ.UTF-8
uz_UZ: uz_UZ.UTF-8
@@ -1438,7 +1439,7 @@
vi: vi_VN.TCVN
vi_VN: vi_VN.TCVN
Vi_VN: vi_VN.TCVN
-@@ -813,19 +1063,24 @@
+@@ -813,8 +1062,13 @@
wa: wa_BE.ISO8859-1
wa_BE: wa_BE.ISO8859-1
wa_BE.iso88591: wa_BE.ISO8859-1
@@ -1452,26 +1453,13 @@
yi: yi_US.CP1255
yi_US: yi_US.CP1255
yi_US.cp1255: yi_US.CP1255
- yi_US.microsoftcp1255: yi_US.CP1255
- yi_US.microsoft-cp1255: yi_US.CP1255
- yi_US.MICROSOFT-CP1255: yi_US.CP1255
--zh_CN: zh_CN.gb2312
-+zh_CN: zh_CN.gbk
- zh_CN.Big5: zh_TW.big5
- zh_CN.EUC: zh_CN.eucCN
--zh_CN.GB2312: zh_CN.gb2312
- zh_CN.GBK: zh_CN.gbk
-+zh_CN.gb2312: zh_CN.GB2312
- zh_CN.big5: zh_TW.big5
- zh_CN.euc: zh_CN.eucCN
- zh_CN.utf8: zh_CN.UTF-8
-@@ -840,13 +1095,20 @@
+@@ -840,13 +1094,20 @@
zh_HK.Big5: zh_HK.big5
zh_HK.utf8: zh_HK.UTF-8
ZH_HK.UTF-8: zh_CN.UTF-8
-+zh_SG: zh_SG.gbk
++zh_SG: zh_SG.gb2312
+zh_SG.GBK: zh_SG.gbk
-+zh_SG.gb2312: zh_SG.GB2312
++zh_SG.GB2312: zh_SG.gb2312
ZH_SG.UTF-8: zh_SG.UTF-8
zh_TW: zh_TW.big5
zh_TW.Big5: zh_TW.big5
@@ -1486,7 +1474,7 @@
XCOMM The following locale names are used in SCO 3.0
english_uk.8859: en_GB.ISO8859-1
-@@ -875,7 +1137,7 @@
+@@ -875,7 +1136,7 @@
dutch: nl_NL.ISO8859-1
dutch.iso88591: nl_BE.ISO8859-1
eesti: et_EE.ISO8859-1
@@ -1495,7 +1483,7 @@
estonian: et_EE.ISO8859-1
finnish: fi_FI.ISO8859-1
finnish.iso88591: fi_FI.ISO8859-1
-@@ -888,8 +1150,8 @@
+@@ -888,8 +1149,8 @@
german.iso88591: de_CH.ISO8859-1
greek: el_GR.ISO8859-7
greek.iso88597: el_GR.ISO8859-7
@@ -1506,7 +1494,7 @@
hrvatski: hr_HR.ISO8859-2
hungarian: hu_HU.ISO8859-2
icelandic.iso88591: is_IS.ISO8859-1
-@@ -931,103 +1193,103 @@
+@@ -931,103 +1192,103 @@
#ifdef WIN32
XCOMM Microsoft Windows/NT 4.0 SP3
XCOMM parser doesn't grok embedded spaces in locale name
@@ -1708,7 +1696,7 @@
ISO8859-1: en_US.ISO8859-1
Index: xc/nls/locale.dir
===================================================================
---- xc/nls/locale.dir (revision 271)
+--- xc/nls/locale.dir (revision 292)
+++ xc/nls/locale.dir (working copy)
@@ -9,8 +9,13 @@
XCOMM
@@ -1842,7 +1830,7 @@
iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1
iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9
tatar-cyr/XLC_LOCALE: tt_RU.TATAR-CYR
-@@ -220,22 +244,31 @@
+@@ -220,10 +244,12 @@
microsoft-cp1251/XLC_LOCALE: uk_UA.CP1251
koi8-u/XLC_LOCALE: uk_UA.KOI8-U
microsoft-cp1256/XLC_LOCALE: ur_PK.CP1256
@@ -1854,15 +1842,12 @@
+iso8859-1/XLC_LOCALE: xh_ZA.ISO8859-1
microsoft-cp1255/XLC_LOCALE: yi_US.CP1255
zh_CN/XLC_LOCALE: zh_CN.eucCN
--zh_CN/XLC_LOCALE: zh_CN.gb2312
-+zh_CN.gbk/XLC_LOCALE: zh_CN.GB2312
- zh_CN.gbk/XLC_LOCALE: zh_CN.gbk
- zh_HK.big5/XLC_LOCALE: zh_HK.big5
- zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5-hkscs
+ zh_CN/XLC_LOCALE: zh_CN.gb2312
+@@ -233,9 +259,16 @@
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5HKSCS
-+zh_CN.gbk/XLC_LOCALE: zh_SG.GB2312
++zh_CN/XLC_LOCALE: zh_SG.gb2312
+zh_CN.gbk/XLC_LOCALE: zh_SG.gbk
zh_TW.big5/XLC_LOCALE: zh_TW.big5
zh_TW/XLC_LOCALE: zh_TW.eucTW
--
This space intentionally left blank.
Reply to: