diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | iconvdata/iso_6937-2.c | 46 | ||||
| -rw-r--r-- | localedata/ChangeLog | 10 | ||||
| -rw-r--r-- | localedata/SUPPORTED | 132 | ||||
| -rw-r--r-- | localedata/locales/lg_UG (renamed from localedata/locales/lug_UG) | 24 |
5 files changed, 165 insertions, 56 deletions
@@ -1,3 +1,12 @@ +2003-12-31 Bruno Haible <bruno@clisp.org> + + * iconvdata/iso_6937-2.c (to_ucs4): Map 0x7E to U+007E, not U+203E. + Map 0xA6 to U+0023. Map 0xA8 to U+00A4. + (to_ucs4_comb): Map 0xC5 0x20 to U+00AF. + (from_ucs4): Map U+00ED to 0xC2 0x69, not 0xC2 0xE9. + (BODY for TO_LOOP): Don't map U+02DC. Map U+02DD to 0xCD 0x20, not + 0x00 0x20. Don't map U+2500..U+25E3. + 2004-01-19 Jakub Jelinek <jakub@redhat.com> * posix/regexec.c (get_subexp): Remove bkref_str variable. diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c index b6bf2c0..fe2d8a2 100644 --- a/iconvdata/iso_6937-2.c +++ b/iconvdata/iso_6937-2.c @@ -1,5 +1,5 @@ /* Generic conversion to and from ISO 6937-2. - Copyright (C) 1998, 1999, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000-2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -39,13 +39,13 @@ static const uint32_t to_ucs4[256] = /* 0x60 */ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, /* 0x68 */ 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, /* 0x70 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - /* 0x78 */ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x203e, 0x007f, + /* 0x78 */ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, /* 0x80 */ 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, /* 0x88 */ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, /* 0x90 */ 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, /* 0x98 */ 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, - /* 0xa0 */ 0x0000, 0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0000, 0x00a7, - /* 0xa8 */ 0x0000, 0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, + /* 0xa0 */ 0x0000, 0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0023, 0x00a7, + /* 0xa8 */ 0x00a4, 0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, /* 0xb0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, /* 0xb8 */ 0x00f7, 0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, /* 0xc0 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -124,7 +124,7 @@ static const uint32_t to_ucs4_comb[15][96] = }, /* 0xc5 */ { - /* 0x20 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x20 */ 0x00af, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -317,7 +317,7 @@ static const char from_ucs4[][2] = /* 0x00dc */ "\xc8\x55", "\xc2\x59", "\xec\x00", "\xfb\x00", "\xc1\x61", /* 0x00e1 */ "\xc2\x61", "\xc3\x61", "\xc4\x61", "\xc8\x61", "\xca\x61", /* 0x00e6 */ "\xf1\x00", "\xcb\x63", "\xc1\x65", "\xc2\x65", "\xc3\x65", - /* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\xe9", "\xc3\x69", "\xc8\x69", + /* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\x69", "\xc3\x69", "\xc8\x69", /* 0x00f0 */ "\xf3\x00", "\xc4\x6e", "\xc1\x6f", "\xc2\x6f", "\xc3\x6f", /* 0x00f5 */ "\xc4\x6f", "\xc8\x6f", "\xb8\x00", "\xf9\x00", "\xc1\x75", /* 0x00fa */ "\xc2\x75", "\xc3\x75", "\xc8\x75", "\xc2\x79", "\xfc\x00", @@ -364,14 +364,6 @@ static const char from_ucs4[][2] = ... 0x2190 "\xac\x00", "\xad\x00", "\xae\x00", "\xaf\x00", ... - 0x2500 "\xd6\x00", "\x00\x00", "\xd7\x00", - ... - 0x253c "\xe5\x00", - ... - 0x2571 "\xd8\x00", "\xd9\x00", - ... - 0x25e2 "\xda\x00", "\xdb\x00", - ... 0x266a "\xd5\x00" These would blow up the table and are therefore handled specially in @@ -478,9 +470,10 @@ static const char from_ucs4[][2] = case 0x2c7: \ cp = "\xcf\x20"; \ break; \ - case 0x2d8 ... 0x2dd: \ + case 0x2d8 ... 0x2db: \ + case 0x2dd: \ { \ - static const char map[6] = "\xc6\xc7\xca\xce\x00"; \ + static const char map[6] = "\xc6\xc7\xca\xce\x00\xcd"; \ \ tmp[0] = map[ch - 0x2d8]; \ tmp[1] = ' '; \ @@ -518,27 +511,6 @@ static const char from_ucs4[][2] = tmp[1] = '\0'; \ cp = tmp; \ break; \ - case 0x2500: \ - cp = "\xd6"; \ - break; \ - case 0x2502: \ - cp = "\xd7"; \ - break; \ - case 0x253c: \ - cp = "\xe5"; \ - break; \ - case 0x2571: \ - cp = "\xd8"; \ - break; \ - case 0x2572: \ - cp = "\xd9"; \ - break; \ - case 0x25e2: \ - cp = "\xda"; \ - break; \ - case 0x25e3: \ - cp = "\xdb"; \ - break; \ case 0x266a: \ cp = "\xd5"; \ break; \ diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 497d8ff..1e1e16d 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,13 @@ +2004-01-19 Ulrich Drepper <drepper@redhat.com> + + * SUPPORTED: Add all kinds of UTF-8 locales. + +2004-01-18 Bruno Haible <bruno@clisp.org> + + * locales/lg_UG: Renamed from lug_UG, with trivial updates. + * locales/lug_UG: Remove file. + * SUPPORTED: Create lg_UG instead of lug_UG. + 2003-12-31 Bruno Haible <bruno@clisp.org> * charmaps/IBM866NAV: Fix the character values. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 3ec589d..518c621 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -9,26 +9,45 @@ aa_ET/UTF-8 \ af_ZA/ISO-8859-1 \ am_ET/UTF-8 \ an_ES/ISO-8859-15 \ +ar_AE.UTF-8/UTF-8 \ ar_AE/ISO-8859-6 \ +ar_BH.UTF-8/UTF-8 \ ar_BH/ISO-8859-6 \ +ar_DZ.UTF-8/UTF-8 \ ar_DZ/ISO-8859-6 \ +ar_EG.UTF-8/UTF-8 \ ar_EG/ISO-8859-6 \ ar_IN/UTF-8 \ +ar_IQ.UTF-8/UTF-8 \ ar_IQ/ISO-8859-6 \ +ar_JO.UTF-8/UTF-8 \ ar_JO/ISO-8859-6 \ +ar_KW.UTF-8/UTF-8 \ ar_KW/ISO-8859-6 \ +ar_LB.UTF-8/UTF-8 \ ar_LB/ISO-8859-6 \ +ar_LY.UTF-8/UTF-8 \ ar_LY/ISO-8859-6 \ +ar_MA.UTF-8/UTF-8 \ ar_MA/ISO-8859-6 \ +ar_OM.UTF-8/UTF-8 \ ar_OM/ISO-8859-6 \ +ar_QA.UTF-8/UTF-8 \ ar_QA/ISO-8859-6 \ +ar_SA.UTF-8/UTF-8 \ ar_SA/ISO-8859-6 \ +ar_SD.UTF-8/UTF-8 \ ar_SD/ISO-8859-6 \ +ar_SY.UTF-8/UTF-8 \ ar_SY/ISO-8859-6 \ +ar_TN.UTF-8/UTF-8 \ ar_TN/ISO-8859-6 \ +ar_YE.UTF-8/UTF-8 \ ar_YE/ISO-8859-6 \ az_AZ.UTF-8/UTF-8 \ +be_BY.UTF-8/UTF-8 \ be_BY/CP1251 \ +bg_BG.UTF-8/UTF-8 \ bg_BG/CP1251 \ bn_BD/UTF-8 \ bn_IN/UTF-8 \ @@ -36,72 +55,125 @@ br_FR/ISO-8859-1 \ br_FR@euro/ISO-8859-15 \ bs_BA/ISO-8859-2 \ byn_ER/UTF-8 \ +ca_ES.UTF-8/UTF-8 \ ca_ES/ISO-8859-1 \ ca_ES@euro/ISO-8859-15 \ +cs_CZ.UTF-8/UTF-8 \ cs_CZ/ISO-8859-2 \ +cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ +da_DK.UTF-8/UTF-8 \ da_DK/ISO-8859-1 \ +de_AT.UTF-8/UTF-8 \ de_AT/ISO-8859-1 \ de_AT@euro/ISO-8859-15 \ +de_BE.UTF-8/UTF-8 \ de_BE/ISO-8859-1 \ de_BE@euro/ISO-8859-15 \ +de_CH.UTF-8/UTF-8 \ de_CH/ISO-8859-1 \ +de_DE.UTF-8/UTF-8 \ de_DE/ISO-8859-1 \ de_DE@euro/ISO-8859-15 \ +de_LU.UTF-8/UTF-8 \ de_LU/ISO-8859-1 \ de_LU@euro/ISO-8859-15 \ +el_GR.UTF-8/UTF-8 \ el_GR/ISO-8859-7 \ +en_AU.UTF-8/UTF-8 \ en_AU/ISO-8859-1 \ +en_BW.UTF-8/UTF-8 \ en_BW/ISO-8859-1 \ +en_CA.UTF-8/UTF-8 \ en_CA/ISO-8859-1 \ +en_DK.UTF-8/UTF-8 \ en_DK/ISO-8859-1 \ +en_GB.UTF-8/UTF-8 \ en_GB/ISO-8859-1 \ +en_HK.UTF-8/UTF-8 \ en_HK/ISO-8859-1 \ +en_IE.UTF-8/UTF-8 \ en_IE/ISO-8859-1 \ en_IE@euro/ISO-8859-15 \ en_IN/UTF-8 \ +en_NZ.UTF-8/UTF-8 \ en_NZ/ISO-8859-1 \ +en_PH.UTF-8/UTF-8 \ en_PH/ISO-8859-1 \ +en_SG.UTF-8/UTF-8 \ en_SG/ISO-8859-1 \ +en_US.UTF-8/UTF-8 \ en_US/ISO-8859-1 \ +en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ +en_ZW.UTF-8/UTF-8 \ en_ZW/ISO-8859-1 \ +es_AR.UTF-8/UTF-8 \ es_AR/ISO-8859-1 \ +es_BO.UTF-8/UTF-8 \ es_BO/ISO-8859-1 \ +es_CL.UTF-8/UTF-8 \ es_CL/ISO-8859-1 \ +es_CO.UTF-8/UTF-8 \ es_CO/ISO-8859-1 \ +es_CR.UTF-8/UTF-8 \ es_CR/ISO-8859-1 \ +es_DO.UTF-8/UTF-8 \ es_DO/ISO-8859-1 \ +es_EC.UTF-8/UTF-8 \ es_EC/ISO-8859-1 \ +es_ES.UTF-8/UTF-8 \ es_ES/ISO-8859-1 \ es_ES@euro/ISO-8859-15 \ +es_GT.UTF-8/UTF-8 \ es_GT/ISO-8859-1 \ +es_HN.UTF-8/UTF-8 \ es_HN/ISO-8859-1 \ +es_MX.UTF-8/UTF-8 \ es_MX/ISO-8859-1 \ +es_NI.UTF-8/UTF-8 \ es_NI/ISO-8859-1 \ +es_PA.UTF-8/UTF-8 \ es_PA/ISO-8859-1 \ +es_PE.UTF-8/UTF-8 \ es_PE/ISO-8859-1 \ +es_PR.UTF-8/UTF-8 \ es_PR/ISO-8859-1 \ +es_PY.UTF-8/UTF-8 \ es_PY/ISO-8859-1 \ +es_SV.UTF-8/UTF-8 \ es_SV/ISO-8859-1 \ +es_US.UTF-8/UTF-8 \ es_US/ISO-8859-1 \ +es_UY.UTF-8/UTF-8 \ es_UY/ISO-8859-1 \ +es_VE.UTF-8/UTF-8 \ es_VE/ISO-8859-1 \ +et_EE.UTF-8/UTF-8 \ et_EE/ISO-8859-1 \ +eu_ES.UTF-8/UTF-8 \ eu_ES/ISO-8859-1 \ eu_ES@euro/ISO-8859-15 \ fa_IR/UTF-8 \ +fi_FI.UTF-8/UTF-8 \ fi_FI/ISO-8859-1 \ fi_FI@euro/ISO-8859-15 \ +fo_FO.UTF-8/UTF-8 \ fo_FO/ISO-8859-1 \ +fr_BE.UTF-8/UTF-8 \ fr_BE/ISO-8859-1 \ fr_BE@euro/ISO-8859-15 \ +fr_CA.UTF-8/UTF-8 \ fr_CA/ISO-8859-1 \ +fr_CH.UTF-8/UTF-8 \ fr_CH/ISO-8859-1 \ +fr_FR.UTF-8/UTF-8 \ fr_FR/ISO-8859-1 \ fr_FR@euro/ISO-8859-15 \ +fr_LU.UTF-8/UTF-8 \ fr_LU/ISO-8859-1 \ fr_LU@euro/ISO-8859-15 \ +ga_IE.UTF-8/UTF-8 \ ga_IE/ISO-8859-1 \ ga_IE@euro/ISO-8859-15 \ gd_GB/ISO-8859-15 \ @@ -109,98 +181,144 @@ gez_ER/UTF-8 \ gez_ER@abegede/UTF-8 \ gez_ET/UTF-8 \ gez_ET@abegede/UTF-8 \ +gl_ES.UTF-8/UTF-8 \ gl_ES/ISO-8859-1 \ gl_ES@euro/ISO-8859-15 \ gu_IN/UTF-8 \ +gv_GB.UTF-8/UTF-8 \ gv_GB/ISO-8859-1 \ +he_IL.UTF-8/UTF-8 \ he_IL/ISO-8859-8 \ hi_IN/UTF-8 \ +hr_HR.UTF-8/UTF-8 \ hr_HR/ISO-8859-2 \ +hu_HU.UTF-8/UTF-8 \ hu_HU/ISO-8859-2 \ +id_ID.UTF-8/UTF-8 \ id_ID/ISO-8859-1 \ +is_IS.UTF-8/UTF-8 \ is_IS/ISO-8859-1 \ +it_CH.UTF-8/UTF-8 \ it_CH/ISO-8859-1 \ +it_IT.UTF-8/UTF-8 \ it_IT/ISO-8859-1 \ it_IT@euro/ISO-8859-15 \ +iw_IL.UTF-8/UTF-8 \ iw_IL/ISO-8859-8 \ ja_JP.EUC-JP/EUC-JP \ +ja_JP.UTF-8/UTF-8 \ ka_GE/GEORGIAN-PS \ +kl_GL.UTF-8/UTF-8 \ kl_GL/ISO-8859-1 \ kn_IN/UTF-8 \ ko_KR.EUC-KR/EUC-KR \ ko_KR.UTF-8/UTF-8 \ +kw_GB.UTF-8/UTF-8 \ kw_GB/ISO-8859-1 \ +lg_UG/ISO-8859-10 \ lo_LA/UTF-8 \ +lt_LT.UTF-8/UTF-8 \ lt_LT/ISO-8859-13 \ -lug_UG/ISO-8859-10 \ +lv_LV.UTF-8/UTF-8 \ lv_LV/ISO-8859-13 \ mi_NZ/ISO-8859-13 \ +mk_MK.UTF-8/UTF-8 \ mk_MK/ISO-8859-5 \ ml_IN/UTF-8 \ mn_MN/UTF-8 \ mr_IN/UTF-8 \ +ms_MY.UTF-8/UTF-8 \ ms_MY/ISO-8859-1 \ +mt_MT.UTF-8/UTF-8 \ mt_MT/ISO-8859-3 \ +nb_NO.UTF-8/UTF-8 \ +nb_NO/ISO-8859-1 \ ne_NP/UTF-8 \ +nl_BE.UTF-8/UTF-8 \ nl_BE/ISO-8859-1 \ nl_BE@euro/ISO-8859-15 \ +nl_NL.UTF-8/UTF-8 \ nl_NL/ISO-8859-1 \ nl_NL@euro/ISO-8859-15 \ -nb_NO/ISO-8859-1 \ +nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ +no_NO.UTF-8/UTF-8 \ oc_FR/ISO-8859-1 \ om_ET/UTF-8 \ om_KE/ISO-8859-1 \ pa_IN/UTF-8 \ +pl_PL.UTF-8/UTF-8 \ pl_PL/ISO-8859-2 \ +pt_BR.UTF-8/UTF-8 \ pt_BR/ISO-8859-1 \ +pt_PT.UTF-8/UTF-8 \ pt_PT/ISO-8859-1 \ pt_PT@euro/ISO-8859-15 \ +ro_RO.UTF-8/UTF-8 \ ro_RO/ISO-8859-2 \ -ru_RU/ISO-8859-5 \ ru_RU.KOI8-R/KOI8-R \ +ru_RU.UTF-8/UTF-8 \ +ru_RU/ISO-8859-5 \ +ru_UA.UTF-8/UTF-8 \ ru_UA/KOI8-U \ se_NO/UTF-8 \ sid_ET/UTF-8 \ +sk_SK.UTF-8/UTF-8 \ sk_SK/ISO-8859-2 \ +sl_SI.UTF-8/UTF-8 \ sl_SI/ISO-8859-2 \ so_DJ/ISO-8859-1 \ so_ET/UTF-8 \ so_KE/ISO-8859-1 \ so_SO/ISO-8859-1 \ +sq_AL.UTF-8/UTF-8 \ sq_AL/ISO-8859-1 \ +sr_YU.UTF-8/UTF-8 \ +sr_YU.UTF-8@cyrillic/UTF-8 \ sr_YU/ISO-8859-2 \ sr_YU@cyrillic/ISO-8859-5 \ +st_ZA.UTF-8/UTF-8 \ st_ZA/ISO-8859-1 \ +sv_FI.UTF-8/UTF-8 \ sv_FI/ISO-8859-1 \ sv_FI@euro/ISO-8859-15 \ +sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ/KOI8-T \ +th_TH.UTF-8/UTF-8 \ th_TH/TIS-620 \ ti_ER/UTF-8 \ ti_ET/UTF-8 \ tig_ER/UTF-8 \ tl_PH/ISO-8859-1 \ +tr_TR.UTF-8/UTF-8 \ tr_TR/ISO-8859-9 \ tt_RU.UTF-8/UTF-8 \ +uk_UA.UTF-8/UTF-8 \ uk_UA/KOI8-U \ ur_PK/UTF-8 \ uz_UZ/ISO-8859-1 \ uz_UZ@cyrillic/UTF-8 \ -vi_VN/UTF-8 \ vi_VN.TCVN/TCVN5712-1 \ +vi_VN/UTF-8 \ wa_BE/ISO-8859-1 \ wa_BE@euro/ISO-8859-15 \ +wa_BE.UTF-8/UTF-8 \ +xh_ZA.UTF-8/UTF-8 \ xh_ZA/ISO-8859-1 \ yi_US/CP1255 \ -zh_CN/GB2312 \ zh_CN.GB18030/GB18030 \ zh_CN.GBK/GBK \ +zh_CN.UTF-8/UTF-8 \ +zh_CN/GB2312 \ +zh_HK.UTF-8/UTF-8 \ zh_HK/BIG5-HKSCS \ -zh_SG/GB2312 \ zh_SG.GBK/GBK \ -zh_TW/BIG5 \ +zh_SG/GB2312 \ zh_TW.EUC-TW/EUC-TW \ +zh_TW.UTF-8/UTF-8 \ +zh_TW/BIG5 \ +zu_ZA.UTF-8/UTF-8 \ zu_ZA/ISO-8859-1 \ diff --git a/localedata/locales/lug_UG b/localedata/locales/lg_UG index 58b8d1b..5d05dd2 100644 --- a/localedata/locales/lug_UG +++ b/localedata/locales/lg_UG @@ -9,7 +9,7 @@ comment_char % % Email: kompyuta@kizito.uklinux.net % Tel: +41 - (0)1772 724325 % Fax: -% Language: lug +% Language: lg % Territory: UG % Revision: 1.0 % Date: 2001-11-04 @@ -32,17 +32,17 @@ territory "Uganda" revision "1.0" date "2001-11-04" % -category "lug_UG:2001";LC_IDENTIFICATION -category "lug_UG:2001";LC_CTYPE -category "lug_UG:2001";LC_COLLATE -category "lug_UG:2001";LC_TIME -category "lug_UG:2001";LC_NUMERIC -category "lug_UG:2001";LC_MONETARY -category "lug_UG:2001";LC_MESSAGES -category "lug_UG:2001";LC_PAPER -category "lug_UG:2001";LC_NAME -category "lug_UG:2001";LC_ADDRESS -category "lug_UG:2001";LC_TELEPHONE +category "lg_UG:2001";LC_IDENTIFICATION +category "lg_UG:2001";LC_CTYPE +category "lg_UG:2001";LC_COLLATE +category "lg_UG:2001";LC_TIME +category "lg_UG:2001";LC_NUMERIC +category "lg_UG:2001";LC_MONETARY +category "lg_UG:2001";LC_MESSAGES +category "lg_UG:2001";LC_PAPER +category "lg_UG:2001";LC_NAME +category "lg_UG:2001";LC_ADDRESS +category "lg_UG:2001";LC_TELEPHONE END LC_IDENTIFICATION |