Date: Sun, 3 Jul 2016 18:21:11 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302329 - in head: . etc/mtree share share/colldef share/ctypedef share/locale-links share/monetdef share/msgdef share/numericdef share/timedef tools/build/mk tools/tools/locale/tools Message-ID: <201607031821.u63ILBL1076497@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Jul 3 18:21:11 2016 New Revision: 302329 URL: https://svnweb.freebsd.org/changeset/base/302329 Log: Posixify the locales name for variants For all locales with variants: - if no ambiguity on the locale (only one variant) just use the regular name - if ambiguity, pick one as default and append @<variant> to the others respecting POSIX As a result: - All the 3 components locales added recently are renamed to the usual 2 components version for all but sr_RS.UTF-8 - Set sr_RS.UTF-8 to the cyrillic variant - Add sr_RS.UTF-8@latin - Remove the symlinks aliases they were created to represent the 2 components version as aliasas and are now useless - Update the OptionalObsoleteFiles.inc and ObsoleteFiles.inc to reflect those changes Discussed with: ache@ Approved by: re@ (gjb) Added: head/share/colldef/kk_KZ.UTF-8.src (contents, props changed) head/share/colldef/zh_CN.UTF-8.src (contents, props changed) head/share/colldef/zh_TW.UTF-8.src (contents, props changed) head/share/ctypedef/ja_JP.SJIS.src (contents, props changed) head/share/ctypedef/zh_CN.GB18030.src (contents, props changed) head/share/ctypedef/zh_TW.Big5.src (contents, props changed) head/share/monetdef/kk_KZ.UTF-8.src (contents, props changed) head/share/monetdef/mn_MN.UTF-8.src (contents, props changed) head/share/monetdef/sr_RS.UTF-8@latin.src (contents, props changed) head/share/monetdef/zh_CN.GB2312.src (contents, props changed) head/share/monetdef/zh_CN.GBK.src (contents, props changed) head/share/monetdef/zh_CN.UTF-8.src (contents, props changed) head/share/monetdef/zh_CN.eucCN.src (contents, props changed) head/share/monetdef/zh_HK.UTF-8.src (contents, props changed) head/share/monetdef/zh_TW.Big5.src (contents, props changed) head/share/monetdef/zh_TW.UTF-8.src (contents, props changed) head/share/msgdef/kk_KZ.UTF-8.src (contents, props changed) head/share/msgdef/mn_MN.UTF-8.src (contents, props changed) head/share/msgdef/sr_RS.ISO8859-5.src (contents, props changed) head/share/msgdef/sr_RS.UTF-8.src (contents, props changed) head/share/msgdef/sr_RS.UTF-8@latin.src (contents, props changed) head/share/msgdef/zh_CN.GB2312.src (contents, props changed) head/share/msgdef/zh_CN.GBK.src (contents, props changed) head/share/msgdef/zh_CN.UTF-8.src (contents, props changed) head/share/msgdef/zh_HK.UTF-8.src (contents, props changed) head/share/msgdef/zh_TW.Big5.src (contents, props changed) head/share/msgdef/zh_TW.UTF-8.src (contents, props changed) head/share/numericdef/zh_CN.GB2312.src (contents, props changed) head/share/numericdef/zh_CN.eucCN.src (contents, props changed) head/share/numericdef/zh_TW.Big5.src (contents, props changed) head/share/timedef/kk_KZ.UTF-8.src (contents, props changed) head/share/timedef/mn_MN.UTF-8.src (contents, props changed) head/share/timedef/sr_RS.ISO8859-2.src (contents, props changed) head/share/timedef/sr_RS.ISO8859-5.src (contents, props changed) head/share/timedef/sr_RS.UTF-8.src (contents, props changed) head/share/timedef/sr_RS.UTF-8@latin.src (contents, props changed) head/share/timedef/zh_CN.GB2312.src (contents, props changed) head/share/timedef/zh_CN.GBK.src (contents, props changed) head/share/timedef/zh_CN.UTF-8.src (contents, props changed) head/share/timedef/zh_CN.eucCN.src (contents, props changed) head/share/timedef/zh_HK.UTF-8.src (contents, props changed) head/share/timedef/zh_TW.Big5.src (contents, props changed) head/share/timedef/zh_TW.UTF-8.src (contents, props changed) Deleted: head/share/colldef/kk_Cyrl_KZ.UTF-8.src head/share/colldef/zh_Hans_CN.UTF-8.src head/share/colldef/zh_Hant_TW.UTF-8.src head/share/ctypedef/ja_JP.eucJP.src head/share/ctypedef/zh_Hans_CN.eucCN.src head/share/ctypedef/zh_Hant_TW.Big5.src head/share/locale-links/ head/share/monetdef/kk_Cyrl_KZ.UTF-8.src head/share/monetdef/mn_Cyrl_MN.UTF-8.src head/share/monetdef/sr_Latn_RS.UTF-8.src head/share/monetdef/zh_Hans_CN.GB2312.src head/share/monetdef/zh_Hans_CN.GBK.src head/share/monetdef/zh_Hans_CN.UTF-8.src head/share/monetdef/zh_Hans_CN.eucCN.src head/share/monetdef/zh_Hant_HK.UTF-8.src head/share/monetdef/zh_Hant_TW.Big5.src head/share/monetdef/zh_Hant_TW.UTF-8.src head/share/msgdef/kk_Cyrl_KZ.UTF-8.src head/share/msgdef/mn_Cyrl_MN.UTF-8.src head/share/msgdef/sr_Cyrl_RS.ISO8859-5.src head/share/msgdef/sr_Cyrl_RS.UTF-8.src head/share/msgdef/sr_Latn_RS.UTF-8.src head/share/msgdef/zh_Hans_CN.GB2312.src head/share/msgdef/zh_Hans_CN.GBK.src head/share/msgdef/zh_Hans_CN.UTF-8.src head/share/msgdef/zh_Hant_HK.UTF-8.src head/share/msgdef/zh_Hant_TW.Big5.src head/share/msgdef/zh_Hant_TW.UTF-8.src head/share/numericdef/zh_Hans_CN.GB2312.src head/share/numericdef/zh_Hans_CN.eucCN.src head/share/numericdef/zh_Hant_TW.Big5.src head/share/timedef/kk_Cyrl_KZ.UTF-8.src head/share/timedef/mn_Cyrl_MN.UTF-8.src head/share/timedef/sr_Cyrl_RS.ISO8859-5.src head/share/timedef/sr_Cyrl_RS.UTF-8.src head/share/timedef/sr_Latn_RS.ISO8859-2.src head/share/timedef/sr_Latn_RS.UTF-8.src head/share/timedef/zh_Hans_CN.GB2312.src head/share/timedef/zh_Hans_CN.GBK.src head/share/timedef/zh_Hans_CN.UTF-8.src head/share/timedef/zh_Hans_CN.eucCN.src head/share/timedef/zh_Hant_HK.UTF-8.src head/share/timedef/zh_Hant_TW.Big5.src head/share/timedef/zh_Hant_TW.UTF-8.src Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.usr.dist head/share/Makefile head/share/colldef/Makefile head/share/ctypedef/Makefile head/share/monetdef/Makefile head/share/msgdef/Makefile head/share/numericdef/Makefile head/share/timedef/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/tools/locale/tools/cldr2def.pl head/tools/tools/locale/tools/finalize Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sun Jul 3 18:19:48 2016 (r302328) +++ head/ObsoleteFiles.inc Sun Jul 3 18:21:11 2016 (r302329) @@ -38,6 +38,105 @@ # xargs -n1 | sort | uniq -d; # done +# 20160703: POSIXify locales with variants +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hant_TW.UTF-8 +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hant_TW.Big5 +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hant_HK.UTF-8 +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.eucCN +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.UTF-8 +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.GBK +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB2312 +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB18030 +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/sr_Latn_RS.UTF-8 +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME +OLD_DIRS+=usr/share/locale/sr_Latn_RS.ISO8859-2 +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.UTF-8 +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC +OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME +OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.ISO8859-5 +OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/mn_Cyrl_MN.UTF-8 +OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/kk_Cyrl_KZ.UTF-8 # 20160608: removed pam_verbose_error OLD_LIBS+=usr/lib/libpam.so.5 OLD_LIBS+=usr/lib/pam_chroot.so.5 @@ -398,13 +497,6 @@ OLD_FILES+=usr/share/locale/lt_LT.ISO885 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-4 -OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE -OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE -OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES -OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY -OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC -OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME -OLD_DIRS+=usr/share/locale/mn_MN.UTF-8 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Sun Jul 3 18:19:48 2016 (r302328) +++ head/etc/mtree/BSD.usr.dist Sun Jul 3 18:21:11 2016 (r302329) @@ -769,7 +769,7 @@ .. ja_JP.eucJP .. - kk_Cyrl_KZ.UTF-8 + kk_KZ.UTF-8 .. ko_KR.CP949 .. @@ -785,7 +785,7 @@ .. lv_LV.UTF-8 .. - mn_Cyrl_MN.UTF-8 + mn_MN.UTF-8 .. nb_NO.ISO8859-1 .. @@ -851,13 +851,13 @@ .. sl_SI.UTF-8 .. - sr_Cyrl_RS.ISO8859-5 + sr_RS.ISO8859-5 .. - sr_Cyrl_RS.UTF-8 + sr_RS.UTF-8 .. - sr_Latn_RS.ISO8859-2 + sr_RS.ISO8859-2 .. - sr_Latn_RS.UTF-8 + sr_RS.UTF-8@latin .. sv_FI.ISO8859-1 .. @@ -893,22 +893,6 @@ .. zh_CN.UTF-8 .. - zh_Hans_CN.GB18030 - .. - zh_Hans_CN.GB2312 - .. - zh_Hans_CN.GBK - .. - zh_Hans_CN.UTF-8 - .. - zh_Hans_CN.eucCN - .. - zh_Hant_HK.UTF-8 - .. - zh_Hant_TW.Big5 - .. - zh_Hant_TW.UTF-8 - .. zh_HK.UTF-8 .. zh_TW.Big5 Modified: head/share/Makefile ============================================================================== --- head/share/Makefile Sun Jul 3 18:19:48 2016 (r302328) +++ head/share/Makefile Sun Jul 3 18:21:11 2016 (r302329) @@ -13,7 +13,6 @@ SUBDIR= ${_colldef} \ ${_examples} \ ${_i18n} \ keys \ - ${_locale-links} \ ${_man} \ ${_me} \ misc \ @@ -61,7 +60,6 @@ _i18n= i18n .if ${MK_LOCALES} != "no" _colldef= colldef _ctypedef= ctypedef -_locale-links= locale-links _monetdef= monetdef _msgdef= msgdef _numericdef= numericdef Modified: head/share/colldef/Makefile ============================================================================== --- head/share/colldef/Makefile Sun Jul 3 18:19:48 2016 (r302328) +++ head/share/colldef/Makefile Sun Jul 3 18:21:11 2016 (r302329) @@ -9,7 +9,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/lo .src.LC_COLLATE: localedef -D -U -i ${.IMPSRC} \ - -f ${MAPLOC}/map.${.TARGET:T:R:E} ${.OBJDIR}/${.IMPSRC:T:R} + -f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} ${.OBJDIR}/${.IMPSRC:T:R} LOCALES+= af_ZA.UTF-8 LOCALES+= am_ET.UTF-8 @@ -30,7 +30,7 @@ LOCALES+= hu_HU.UTF-8 LOCALES+= hy_AM.UTF-8 LOCALES+= is_IS.UTF-8 LOCALES+= ja_JP.UTF-8 -LOCALES+= kk_Cyrl_KZ.UTF-8 +LOCALES+= kk_KZ.UTF-8 LOCALES+= ko_KR.UTF-8 LOCALES+= lt_LT.UTF-8 LOCALES+= lv_LV.UTF-8 @@ -44,15 +44,15 @@ LOCALES+= sl_SI.UTF-8 LOCALES+= sv_SE.UTF-8 LOCALES+= tr_TR.UTF-8 LOCALES+= uk_UA.UTF-8 -LOCALES+= zh_Hans_CN.UTF-8 -LOCALES+= zh_Hant_TW.UTF-8 +LOCALES+= zh_CN.UTF-8 +LOCALES+= zh_TW.UTF-8 LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-15 LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-1 LOCALES_MAPPED+= be_BY.UTF-8 be_BY.ISO8859-5 LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1251 LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1131 -LOCALES_MAPPED+= ru_RU.UTF-8 sr_Cyrl_RS.ISO8859-5 +LOCALES_MAPPED+= ru_RU.UTF-8 sr_RS.ISO8859-5 LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.KOI8-R LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.ISO8859-5 LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.CP866 @@ -66,7 +66,8 @@ LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO88 LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-1 LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-15 LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-1 -LOCALES_MAPPED+= en_US.UTF-8 sr_Latn_RS.ISO8859-2 +LOCALES_MAPPED+= en_US.UTF-8 sr_RS.UTF-8@latin +LOCALES_MAPPED+= en_US.UTF-8 sr_RS.ISO8859-2 LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-15 LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-1 LOCALES_MAPPED+= en_US.UTF-8 pt_BR.ISO8859-1 @@ -147,9 +148,9 @@ LOCALES_MAPPED+= tr_TR.UTF-8 tr_TR.ISO88 LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.KOI8-U LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.ISO8859-5 LOCALES_MAPPED+= uk_UA.UTF-8 uk_UA.CP1251 -LOCALES_MAPPED+= zh_Hans_CN.UTF-8 zh_Hans_CN.GBK -LOCALES_MAPPED+= zh_Hans_CN.UTF-8 zh_Hans_CN.GB18030 -LOCALES_MAPPED+= zh_Hant_TW.UTF-8 zh_Hant_TW.Big5 +LOCALES_MAPPED+= zh_CN.UTF-8 zh_CN.GBK +LOCALES_MAPPED+= zh_CN.UTF-8 zh_CN.GB18030 +LOCALES_MAPPED+= zh_TW.UTF-8 zh_TW.Big5 LOCALES+= cs_CZ.ISO8859-2 LOCALES+= da_DK.ISO8859-1 @@ -159,8 +160,8 @@ LOCALES+= hu_HU.ISO8859-2 LOCALES+= nb_NO.ISO8859-1 LOCALES+= nb_NO.ISO8859-15 LOCALES+= sk_SK.ISO8859-2 -LOCALES+= zh_Hans_CN.GB2312 -LOCALES+= zh_Hans_CN.eucCN +LOCALES+= zh_CN.GB2312 +LOCALES+= zh_CN.eucCN SAME+= ar_SA.UTF-8 ar_QA.UTF-8 @@ -168,13 +169,12 @@ SAME+= ar_SA.UTF-8 ar_MA.UTF-8 SAME+= ar_SA.UTF-8 ar_JO.UTF-8 SAME+= ar_SA.UTF-8 ar_EG.UTF-8 SAME+= ar_SA.UTF-8 ar_AE.UTF-8 -SAME+= ru_RU.UTF-8 sr_Cyrl_RS.UTF-8 -SAME+= ru_RU.UTF-8 mn_Cyrl_MN.UTF-8 +SAME+= ru_RU.UTF-8 sr_RS.UTF-8 +SAME+= ru_RU.UTF-8 mn_MN.UTF-8 SAME+= ru_RU.UTF-8 bg_BG.UTF-8 SAME+= ca_AD.UTF-8 ca_IT.UTF-8 SAME+= ca_AD.UTF-8 ca_FR.UTF-8 SAME+= ca_AD.UTF-8 ca_ES.UTF-8 -SAME+= en_US.UTF-8 sr_Latn_RS.UTF-8 SAME+= en_US.UTF-8 pt_PT.UTF-8 SAME+= en_US.UTF-8 pt_BR.UTF-8 SAME+= en_US.UTF-8 nn_NO.UTF-8 @@ -204,7 +204,7 @@ SAME+= es_MX.UTF-8 es_CR.UTF-8 SAME+= es_MX.UTF-8 es_AR.UTF-8 SAME+= se_NO.UTF-8 se_FI.UTF-8 SAME+= sv_SE.UTF-8 sv_FI.UTF-8 -SAME+= zh_Hant_TW.UTF-8 zh_Hant_HK.UTF-8 +SAME+= zh_TW.UTF-8 zh_HK.UTF-8 SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) FILES= ${LOCALES:S/$/.LC_COLLATE/} @@ -224,7 +224,7 @@ FILES+= $t.LC_COLLATE FILESDIR_$t.LC_COLLATE= ${LOCALEDIR}/$t $t.LC_COLLATE: ${.CURDIR}/$f.src localedef -D -U -i ${.ALLSRC} \ - -f ${MAPLOC}/map.${.TARGET:T:R:E} \ + -f ${MAPLOC}/map.${.TARGET:T:R:E:C/@.*//} \ ${.OBJDIR}/${.TARGET:T:R} .endfor Added: head/share/colldef/kk_KZ.UTF-8.src ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/colldef/kk_KZ.UTF-8.src Sun Jul 3 18:21:11 2016 (r302329) @@ -0,0 +1,1000 @@ +# Warning: Do not edit. This file is automatically extracted from the +# tools in /usr/src/tools/tools/locale. The data is obtained from the +# CLDR project, obtained from http://cldr.unicode.org/ +# ----------------------------------------------------------------------------- +comment_char * +escape_char / +LC_COLLATE +************* + + + +* Define collation weights as symbols + +collating-symbol <X01> +collating-symbol <X05> +collating-symbol <X10> +collating-symbol <X20> +collating-symbol <X2C> +collating-symbol <X70> +collating-symbol <X86> +collating-symbol <X88> +collating-symbol <X8A> +collating-symbol <X8C> +collating-symbol <X96> +collating-symbol <X98> +collating-symbol <X9C> +collating-symbol <X9E> +collating-symbol <XA0> +collating-symbol <XA4> +collating-symbol <XA6> +collating-symbol <XAC> +collating-symbol <XAE> +collating-symbol <XB8> +collating-symbol <XC0> +collating-symbol <XE0> +collating-symbol <XE2> +collating-symbol <X0200> +collating-symbol <X0304> +collating-symbol <X0306> +collating-symbol <X0308> +collating-symbol <X030A> +collating-symbol <X030C> +collating-symbol <X0400> +collating-symbol <X050A> +collating-symbol <X050E> +collating-symbol <X0600> +collating-symbol <X0722> +collating-symbol <X072C> +collating-symbol <X0750> +collating-symbol <X0758> +collating-symbol <X0800> +collating-symbol <X0900> +collating-symbol <X0968> +collating-symbol <X0976> +collating-symbol <X098C> +collating-symbol <X098E> +collating-symbol <X0990> +collating-symbol <X0992> +collating-symbol <X0994> +collating-symbol <X0996> +collating-symbol <X0A7A> +collating-symbol <X0A7C> +collating-symbol <X0A84> +collating-symbol <X0A86> +collating-symbol <X0A88> +collating-symbol <X0A8A> +collating-symbol <X0A8E> +collating-symbol <X0A90> +collating-symbol <X0AF0> +collating-symbol <X0C04> +collating-symbol <X0C0A> +collating-symbol <X0C55> +collating-symbol <X0C63> +collating-symbol <X0C6B> +collating-symbol <X0C6D> +collating-symbol <X0C6F> +collating-symbol <X0C73> +collating-symbol <X0C77> +collating-symbol <X0D26> +collating-symbol <X1000> +collating-symbol <X1200> +collating-symbol <X1400> +collating-symbol <X1600> +collating-symbol <X1700> +collating-symbol <X1800> +collating-symbol <X1A00> +collating-symbol <X1C00> +collating-symbol <X1E00> +collating-symbol <X2000> +collating-symbol <X2200> +collating-symbol <X2400> +collating-symbol <X2500> +collating-symbol <X2900> +collating-symbol <X2B00> +collating-symbol <X2C00> +collating-symbol <X2D00> +collating-symbol <X2F00> +collating-symbol <X3100> +collating-symbol <X3300> +collating-symbol <X3500> +collating-symbol <X3700> +collating-symbol <X3900> +collating-symbol <X3A00> +collating-symbol <X3B00> +collating-symbol <X3D00> +collating-symbol <X3F00> +collating-symbol <X4100> +collating-symbol <X4300> +collating-symbol <X4500> +collating-symbol <X4700> +collating-symbol <X4800> +collating-symbol <X4900> +collating-symbol <X4B00> +collating-symbol <X4D00> +collating-symbol <X4F00> +collating-symbol <X5100> +collating-symbol <X5300> +collating-symbol <X5500> +collating-symbol <X5600> +collating-symbol <X5700> +collating-symbol <X5900> +collating-symbol <X5B00> +collating-symbol <X5D00> +collating-symbol <X6006> +collating-symbol <X6008> +collating-symbol <X600A> +collating-symbol <X600C> +collating-symbol <X600E> +collating-symbol <X6010> +collating-symbol <X6012> +collating-symbol <X6014> +collating-symbol <X6016> +collating-symbol <X6018> +collating-symbol <X601A> +collating-symbol <X601C> +collating-symbol <X601E> +collating-symbol <X6020> +collating-symbol <X6022> +collating-symbol <X6023> +collating-symbol <X6024> +collating-symbol <X6026> +collating-symbol <X6028> +collating-symbol <X602A> +collating-symbol <X602C> +collating-symbol <X602E> +collating-symbol <X6030> +collating-symbol <X6032> +collating-symbol <X6034> +collating-symbol <X6036> +collating-symbol <X6038> +collating-symbol <X603A> +collating-symbol <X603C> +collating-symbol <X603E> +collating-symbol <X6040> +collating-symbol <X6042> +collating-symbol <X6044> +collating-symbol <X6046> +collating-symbol <X6048> +collating-symbol <X604A> +collating-symbol <X604C> +collating-symbol <X604E> +collating-symbol <X6050> +collating-symbol <X6052> +collating-symbol <X6054> +collating-symbol <X6056> +collating-symbol <X6058> +collating-symbol <X605A> +collating-symbol <X605C> +collating-symbol <X605E> +collating-symbol <X6060> +collating-symbol <X6062> +collating-symbol <X6064> +collating-symbol <X6066> +collating-symbol <X6068> +collating-symbol <X606A> +collating-symbol <X606C> +collating-symbol <X606E> +collating-symbol <X6070> +collating-symbol <X6072> +collating-symbol <X6074> +collating-symbol <X6076> +collating-symbol <X6078> +collating-symbol <X607A> +collating-symbol <X607C> +collating-symbol <X6080> +collating-symbol <X6081> +collating-symbol <X6082> +collating-symbol <X6084> +collating-symbol <X6086> +collating-symbol <X6088> +collating-symbol <X608A> +collating-symbol <X608C> +collating-symbol <X608E> +collating-symbol <X6090> +collating-symbol <X6092> +collating-symbol <X6094> +collating-symbol <X6096> +collating-symbol <X6098> +collating-symbol <X609A> +collating-symbol <X609C> +collating-symbol <X609E> +collating-symbol <X60A0> +collating-symbol <X60A2> +collating-symbol <X60A4> +collating-symbol <X60A6> +collating-symbol <X60A8> +collating-symbol <X60AA> +collating-symbol <X60AC> +collating-symbol <X60AE> +collating-symbol <X60AF> +collating-symbol <X60B0> +collating-symbol <X60B2> +collating-symbol <X60B4> +collating-symbol <X60B6> +collating-symbol <X60B8> +collating-symbol <X60BA> +collating-symbol <X60BC> +collating-symbol <X6400> +collating-symbol <X6B00> +collating-symbol <X7200> + +order_start forward;forward;forward;forward + + +* collation weights in order + +<X01> +<X05> +<X10> +<X20> +<X2C> +<X70> +<X86> +<X88> +<X8A> +<X8C> +<X96> +<X98> +<X9C> +<X9E> +<XA0> +<XA4> +<XA6> +<XAC> +<XAE> +<XB8> +<XC0> +<XE0> +<XE2> +<X0200> +<X0304> +<X0306> +<X0308> +<X030A> +<X030C> +<X0400> +<X050A> +<X050E> +<X0600> +<X0722> +<X072C> +<X0750> +<X0758> +<X0800> +<X0900> +<X0968> +<X0976> +<X098C> +<X098E> +<X0990> +<X0992> +<X0994> +<X0996> +<X0A7A> +<X0A7C> +<X0A84> +<X0A86> +<X0A88> +<X0A8A> +<X0A8E> +<X0A90> +<X0AF0> +<X0C04> +<X0C0A> +<X0C55> +<X0C63> +<X0C6B> +<X0C6D> +<X0C6F> +<X0C73> +<X0C77> +<X0D26> +<X1000> +<X1200> +<X1400> +<X1600> +<X1700> +<X1800> +<X1A00> +<X1C00> +<X1E00> +<X2000> +<X2200> +<X2400> +<X2500> +<X2900> +<X2B00> +<X2C00> +<X2D00> +<X2F00> +<X3100> +<X3300> +<X3500> +<X3700> +<X3900> +<X3A00> +<X3B00> +<X3D00> +<X3F00> +<X4100> +<X4300> +<X4500> +<X4700> +<X4800> +<X4900> +<X4B00> +<X4D00> +<X4F00> +<X5100> +<X5300> +<X5500> +<X5600> +<X5700> +<X5900> +<X5B00> +<X5D00> +<X6006> +<X6008> +<X600A> +<X600C> +<X600E> +<X6010> +<X6012> +<X6014> +<X6016> +<X6018> +<X601A> +<X601C> +<X601E> +<X6020> +<X6022> +<X6023> +<X6024> +<X6026> +<X6028> +<X602A> +<X602C> +<X602E> +<X6030> +<X6032> +<X6034> +<X6036> +<X6038> +<X603A> +<X603C> +<X603E> +<X6040> +<X6042> +<X6044> +<X6046> +<X6048> +<X604A> +<X604C> +<X604E> +<X6050> +<X6052> +<X6054> +<X6056> +<X6058> +<X605A> +<X605C> +<X605E> +<X6060> +<X6062> +<X6064> +<X6066> +<X6068> +<X606A> +<X606C> +<X606E> +<X6070> +<X6072> +<X6074> +<X6076> +<X6078> +<X607A> +<X607C> +<X6080> +<X6081> +<X6082> +<X6084> +<X6086> +<X6088> +<X608A> +<X608C> +<X608E> +<X6090> +<X6092> +<X6094> +<X6096> +<X6098> +<X609A> +<X609C> +<X609E> +<X60A0> +<X60A2> +<X60A4> +<X60A6> +<X60A8> +<X60AA> +<X60AC> +<X60AE> +<X60AF> +<X60B0> +<X60B2> +<X60B4> +<X60B6> +<X60B8> +<X60BA> +<X60BC> +<X6400> +<X6B00> +<X7200> + +* assignment of characters to weights + +<NULL> IGNORE;IGNORE;IGNORE;<NULL> +<START_OF_HEADING> IGNORE;IGNORE;IGNORE;<START_OF_HEADING> +<START_OF_TEXT> IGNORE;IGNORE;IGNORE;<START_OF_TEXT> +<END_OF_TEXT> IGNORE;IGNORE;IGNORE;<END_OF_TEXT> +<END_OF_TRANSMISSION> IGNORE;IGNORE;IGNORE;<END_OF_TRANSMISSION> +<ENQUIRY> IGNORE;IGNORE;IGNORE;<ENQUIRY> +<ACKNOWLEDGE> IGNORE;IGNORE;IGNORE;<ACKNOWLEDGE> +<ALERT> IGNORE;IGNORE;IGNORE;<ALERT> +<BACKSPACE> IGNORE;IGNORE;IGNORE;<BACKSPACE> +<SHIFT_OUT> IGNORE;IGNORE;IGNORE;<SHIFT_OUT> +<SHIFT_IN> IGNORE;IGNORE;IGNORE;<SHIFT_IN> +<DATA_LINK_ESCAPE> IGNORE;IGNORE;IGNORE;<DATA_LINK_ESCAPE> +<DEVICE_CONTROL_ONE> IGNORE;IGNORE;IGNORE;<DEVICE_CONTROL_ONE> +<DEVICE_CONTROL_TWO> IGNORE;IGNORE;IGNORE;<DEVICE_CONTROL_TWO> +<DEVICE_CONTROL_THREE> IGNORE;IGNORE;IGNORE;<DEVICE_CONTROL_THREE> +<DEVICE_CONTROL_FOUR> IGNORE;IGNORE;IGNORE;<DEVICE_CONTROL_FOUR> +<NEGATIVE_ACKNOWLEDGE> IGNORE;IGNORE;IGNORE;<NEGATIVE_ACKNOWLEDGE> +<SYNCHRONOUS_IDLE> IGNORE;IGNORE;IGNORE;<SYNCHRONOUS_IDLE> +<END_OF_TRANSMISSION_BLOCK> IGNORE;IGNORE;IGNORE;<END_OF_TRANSMISSION_BLOCK> +<CANCEL> IGNORE;IGNORE;IGNORE;<CANCEL> +<END_OF_MEDIUM> IGNORE;IGNORE;IGNORE;<END_OF_MEDIUM> +<SUBSTITUTE> IGNORE;IGNORE;IGNORE;<SUBSTITUTE> +<ESCAPE> IGNORE;IGNORE;IGNORE;<ESCAPE> +<INFORMATION_SEPARATOR_FOUR> IGNORE;IGNORE;IGNORE;<INFORMATION_SEPARATOR_FOUR> +<INFORMATION_SEPARATOR_THREE> IGNORE;IGNORE;IGNORE;<INFORMATION_SEPARATOR_THREE> +<INFORMATION_SEPARATOR_TWO> IGNORE;IGNORE;IGNORE;<INFORMATION_SEPARATOR_TWO> +<INFORMATION_SEPARATOR_ONE> IGNORE;IGNORE;IGNORE;<INFORMATION_SEPARATOR_ONE> +<DELETE> IGNORE;IGNORE;IGNORE;<DELETE> +<COMBINING_CYRILLIC_HUNDRED_THOUSANDS_SIGN> IGNORE;IGNORE;IGNORE;<COMBINING_CYRILLIC_HUNDRED_THOUSANDS_SIGN> +<COMBINING_CYRILLIC_MILLIONS_SIGN> IGNORE;IGNORE;IGNORE;<COMBINING_CYRILLIC_MILLIONS_SIGN> +<COMBINING_CYRILLIC_TEN_MILLIONS_SIGN> IGNORE;IGNORE;IGNORE;<COMBINING_CYRILLIC_TEN_MILLIONS_SIGN> +<COMBINING_CYRILLIC_HUNDRED_MILLIONS_SIGN> IGNORE;IGNORE;IGNORE;<COMBINING_CYRILLIC_HUNDRED_MILLIONS_SIGN> +<COMBINING_CYRILLIC_THOUSAND_MILLIONS_SIGN> IGNORE;IGNORE;IGNORE;<COMBINING_CYRILLIC_THOUSAND_MILLIONS_SIGN> +<COMBINING_CYRILLIC_PALATALIZATION> IGNORE;<XA6>;<X05>;<COMBINING_CYRILLIC_PALATALIZATION> +<COMBINING_CYRILLIC_POKRYTIE> IGNORE;<XA6>;<X05>;<COMBINING_CYRILLIC_POKRYTIE> +<COMBINING_CYRILLIC_KAVYKA> IGNORE;<XA6>;<X05>;<COMBINING_CYRILLIC_KAVYKA> +<COMBINING_CYRILLIC_PAYEROK> IGNORE;<XA6>;<X05>;<COMBINING_CYRILLIC_PAYEROK> +<COMBINING_CYRILLIC_TITLO> IGNORE;<XE0>;<X05>;<COMBINING_CYRILLIC_TITLO> +<COMBINING_CYRILLIC_VZMET> IGNORE;<XE2>;<X05>;<COMBINING_CYRILLIC_VZMET> +<tab> <X0304>;<X05>;<X05>;<tab> +<newline> <X0306>;<X05>;<X05>;<newline> +<vertical-tab> <X0308>;<X05>;<X05>;<vertical-tab> +<form-feed> <X030A>;<X05>;<X05>;<form-feed> +<carriage-return> <X030C>;<X05>;<X05>;<carriage-return> +<space> <X0400>;<X05>;<X05>;<space> +<LOW_LINE> <X050A>;<X05>;<X05>;<LOW_LINE> +<HYPHEN-MINUS> <X050E>;<X05>;<X05>;<HYPHEN-MINUS> +<COMMA> <X0600>;<X05>;<X05>;<COMMA> +<SEMICOLON> <X0722>;<X05>;<X05>;<SEMICOLON> +<COLON> <X072C>;<X05>;<X05>;<COLON> +<EXCLAMATION_MARK> <X0750>;<X05>;<X05>;<EXCLAMATION_MARK> +<QUESTION_MARK> <X0758>;<X05>;<X05>;<QUESTION_MARK> +<FULL_STOP> <X0800>;<X05>;<X05>;<FULL_STOP> +<APOSTROPHE> <X0968>;<X05>;<X05>;<APOSTROPHE> +<QUOTATION_MARK> <X0976>;<X05>;<X05>;<QUOTATION_MARK> +<LEFT_PARENTHESIS> <X098C>;<X05>;<X05>;<LEFT_PARENTHESIS> +<RIGHT_PARENTHESIS> <X098E>;<X05>;<X05>;<RIGHT_PARENTHESIS> +<LEFT_SQUARE_BRACKET> <X0990>;<X05>;<X05>;<LEFT_SQUARE_BRACKET> +<RIGHT_SQUARE_BRACKET> <X0992>;<X05>;<X05>;<RIGHT_SQUARE_BRACKET> +<LEFT_CURLY_BRACKET> <X0994>;<X05>;<X05>;<LEFT_CURLY_BRACKET> +<RIGHT_CURLY_BRACKET> <X0996>;<X05>;<X05>;<RIGHT_CURLY_BRACKET> +<COMMERCIAL_AT> <X0A7A>;<X05>;<X05>;<COMMERCIAL_AT> +<ASTERISK> <X0A7C>;<X05>;<X05>;<ASTERISK> +<SLAVONIC_ASTERISK> <X0A84>;<X05>;<X05>;<SLAVONIC_ASTERISK> +<SOLIDUS> <X0A86>;<X05>;<X05>;<SOLIDUS> +<REVERSE_SOLIDUS> <X0A88>;<X05>;<X05>;<REVERSE_SOLIDUS> +<AMPERSAND> <X0A8A>;<X05>;<X05>;<AMPERSAND> +<NUMBER_SIGN> <X0A8E>;<X05>;<X05>;<NUMBER_SIGN> +<PERCENT_SIGN> <X0A90>;<X05>;<X05>;<PERCENT_SIGN> +<CYRILLIC_KAVYKA> <X0AF0>;<X05>;<X05>;<CYRILLIC_KAVYKA> +<GRAVE_ACCENT> <X0C04>;<X05>;<X05>;<GRAVE_ACCENT> +<CIRCUMFLEX_ACCENT> <X0C0A>;<X05>;<X05>;<CIRCUMFLEX_ACCENT> +<CYRILLIC_THOUSANDS_SIGN> "<X0C55><X0200>";<X05>;"<X05><XC0>";<CYRILLIC_THOUSANDS_SIGN> +<PLUS_SIGN> <X0C63>;<X05>;<X05>;<PLUS_SIGN> +<LESS-THAN_SIGN> <X0C6B>;<X05>;<X05>;<LESS-THAN_SIGN> +<EQUALS_SIGN> <X0C6D>;<X05>;<X05>;<EQUALS_SIGN> +<GREATER-THAN_SIGN> <X0C6F>;<X05>;<X05>;<GREATER-THAN_SIGN> +<VERTICAL_LINE> <X0C73>;<X05>;<X05>;<VERTICAL_LINE> +<TILDE> <X0C77>;<X05>;<X05>;<TILDE> +<DOLLAR_SIGN> <X0D26>;<X05>;<X05>;<DOLLAR_SIGN> +<zero> <X1200>;<X05>;<X05>;<zero> +<one> <X1400>;<X05>;<X05>;<one> +<two> <X1600>;<X05>;<X05>;<two> +<three> <X1800>;<X05>;<X05>;<three> +<four> <X1A00>;<X05>;<X05>;<four> +<five> <X1C00>;<X05>;<X05>;<five> +<six> <X1E00>;<X05>;<X05>;<six> +<seven> <X2000>;<X05>;<X05>;<seven> +<eight> <X2200>;<X05>;<X05>;<eight> +<nine> <X2400>;<X05>;<X05>;<nine> +<a> <X2900>;<X05>;<X05>;<a> +<A> <X2900>;<X05>;<X9C>;<A> +<b> <X2B00>;<X05>;<X05>;<b> +<B> <X2B00>;<X05>;<X9C>;<B> +<c> <X2D00>;<X05>;<X05>;<c> +<C> <X2D00>;<X05>;<X9C>;<C> +<d> <X2F00>;<X05>;<X05>;<d> +<D> <X2F00>;<X05>;<X9C>;<D> +<e> <X3100>;<X05>;<X05>;<e> +<E> <X3100>;<X05>;<X9C>;<E> +<f> <X3300>;<X05>;<X05>;<f> +<F> <X3300>;<X05>;<X9C>;<F> +<g> <X3500>;<X05>;<X05>;<g> +<G> <X3500>;<X05>;<X9C>;<G> +<h> <X3700>;<X05>;<X05>;<h> +<H> <X3700>;<X05>;<X9C>;<H> +<i> <X3900>;<X05>;<X05>;<i> +<I> <X3900>;<X05>;<X9C>;<I> +<j> <X3B00>;<X05>;<X05>;<j> +<J> <X3B00>;<X05>;<X9C>;<J> +<k> <X3D00>;<X05>;<X05>;<k> +<K> <X3D00>;<X05>;<X9C>;<K> +<l> <X3F00>;<X05>;<X05>;<l> +<L> <X3F00>;<X05>;<X9C>;<L> +<m> <X4100>;<X05>;<X05>;<m> +<M> <X4100>;<X05>;<X9C>;<M> +<n> <X4300>;<X05>;<X05>;<n> +<N> <X4300>;<X05>;<X9C>;<N> +<o> <X4500>;<X05>;<X05>;<o> +<O> <X4500>;<X05>;<X9C>;<O> +<p> <X4700>;<X05>;<X05>;<p> +<P> <X4700>;<X05>;<X9C>;<P> +<q> <X4900>;<X05>;<X05>;<q> +<Q> <X4900>;<X05>;<XA0>;<Q> +<r> <X4B00>;<X05>;<X05>;<r> +<R> <X4B00>;<X05>;<X9C>;<R> +<s> <X4D00>;<X05>;<X05>;<s> +<S> <X4D00>;<X05>;<X9C>;<S> +<t> <X4F00>;<X05>;<X05>;<t> +<T> <X4F00>;<X05>;<X9C>;<T> +<u> <X5100>;<X05>;<X05>;<u> +<U> <X5100>;<X05>;<X9C>;<U> +<v> <X5300>;<X05>;<X05>;<v> +<V> <X5300>;<X05>;<X9C>;<V> +<w> <X5500>;<X05>;<X05>;<w> +<W> <X5500>;<X05>;<XA0>;<W> +<x> <X5700>;<X05>;<X05>;<x> +<X> <X5700>;<X05>;<X9C>;<X> +<y> <X5900>;<X05>;<X05>;<y> +<Y> <X5900>;<X05>;<X9C>;<Y> +<z> <X5B00>;<X05>;<X05>;<z> +<Z> <X5B00>;<X05>;<X9C>;<Z> +<CYRILLIC_SMALL_LETTER_A> <X6006>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_A> +<COMBINING_CYRILLIC_LETTER_A> <X6006>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_A> +<CYRILLIC_CAPITAL_LETTER_A> <X6006>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_A> +<CYRILLIC_SMALL_LETTER_A_WITH_BREVE> <X6006>;"<X05><X8C>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_A_WITH_BREVE> +<CYRILLIC_CAPITAL_LETTER_A_WITH_BREVE> <X6006>;"<X05><X8C>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_A_WITH_BREVE> +<CYRILLIC_SMALL_LETTER_A_WITH_DIAERESIS> <X6006>;"<X05><X96>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_A_WITH_DIAERESIS> +<CYRILLIC_CAPITAL_LETTER_A_WITH_DIAERESIS> <X6006>;"<X05><X96>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_A_WITH_DIAERESIS> +<CYRILLIC_SMALL_LETTER_SCHWA> <X6008>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_SCHWA> +<CYRILLIC_CAPITAL_LETTER_SCHWA> <X6008>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LETTER_SCHWA> +<CYRILLIC_SMALL_LETTER_SCHWA_WITH_DIAERESIS> <X6008>;"<X05><X96>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_SCHWA_WITH_DIAERESIS> +<CYRILLIC_CAPITAL_LETTER_SCHWA_WITH_DIAERESIS> <X6008>;"<X05><X96>";"<XA0><X05>";<CYRILLIC_CAPITAL_LETTER_SCHWA_WITH_DIAERESIS> +<CYRILLIC_SMALL_LIGATURE_A_IE> <X600A>;<X05>;<X05>;<CYRILLIC_SMALL_LIGATURE_A_IE> +<CYRILLIC_CAPITAL_LIGATURE_A_IE> <X600A>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LIGATURE_A_IE> +<CYRILLIC_SMALL_LETTER_BE> <X600C>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_BE> +<COMBINING_CYRILLIC_LETTER_BE> <X600C>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_BE> +<CYRILLIC_CAPITAL_LETTER_BE> <X600C>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_BE> +<CYRILLIC_SMALL_LETTER_VE> <X600E>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_VE> +<COMBINING_CYRILLIC_LETTER_VE> <X600E>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_VE> +<CYRILLIC_CAPITAL_LETTER_VE> <X600E>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_VE> +<CYRILLIC_SMALL_LETTER_GHE> <X6010>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_GHE> +<COMBINING_CYRILLIC_LETTER_GHE> <X6010>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_GHE> +<CYRILLIC_CAPITAL_LETTER_GHE> <X6010>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_GHE> +<CYRILLIC_SMALL_LETTER_GJE> <X6010>;"<X05><X88>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_GJE> +<CYRILLIC_CAPITAL_LETTER_GJE> <X6010>;"<X05><X88>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_GJE> +<CYRILLIC_SMALL_LETTER_GHE_WITH_UPTURN> <X6010>;<X70>;<X05>;<CYRILLIC_SMALL_LETTER_GHE_WITH_UPTURN> +<CYRILLIC_CAPITAL_LETTER_GHE_WITH_UPTURN> <X6010>;<X70>;<XA0>;<CYRILLIC_CAPITAL_LETTER_GHE_WITH_UPTURN> +<CYRILLIC_SMALL_LETTER_GHE_WITH_STROKE> <X6012>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_GHE_WITH_STROKE> +<CYRILLIC_CAPITAL_LETTER_GHE_WITH_STROKE> <X6012>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LETTER_GHE_WITH_STROKE> +<CYRILLIC_SMALL_LETTER_GHE_WITH_STROKE_AND_HOOK> <X6014>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_GHE_WITH_STROKE_AND_HOOK> +<CYRILLIC_CAPITAL_LETTER_GHE_WITH_STROKE_AND_HOOK> <X6014>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LETTER_GHE_WITH_STROKE_AND_HOOK> +<CYRILLIC_SMALL_LETTER_GHE_WITH_MIDDLE_HOOK> <X6016>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_GHE_WITH_MIDDLE_HOOK> +<CYRILLIC_CAPITAL_LETTER_GHE_WITH_MIDDLE_HOOK> <X6016>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LETTER_GHE_WITH_MIDDLE_HOOK> +<CYRILLIC_SMALL_LETTER_GHE_WITH_DESCENDER> <X6018>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_GHE_WITH_DESCENDER> +<CYRILLIC_CAPITAL_LETTER_GHE_WITH_DESCENDER> <X6018>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LETTER_GHE_WITH_DESCENDER> +<CYRILLIC_SMALL_LETTER_DE> <X601A>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_DE> +<COMBINING_CYRILLIC_LETTER_DE> <X601A>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_DE> +<CYRILLIC_CAPITAL_LETTER_DE> <X601A>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_DE> +<CYRILLIC_SMALL_LETTER_KOMI_DE> "<X601C><X0200>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_KOMI_DE> +<CYRILLIC_CAPITAL_LETTER_KOMI_DE> "<X601C><X0200>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_KOMI_DE> +<CYRILLIC_SMALL_LETTER_DWE> "<X601C><X0900>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_DWE> +<CYRILLIC_CAPITAL_LETTER_DWE> "<X601C><X0900>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_DWE> +<CYRILLIC_SMALL_LETTER_DJE> <X601E>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_DJE> +<CYRILLIC_CAPITAL_LETTER_DJE> <X601E>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LETTER_DJE> +<CYRILLIC_SMALL_LETTER_SOFT_DE> "<X6020><X0200>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_SOFT_DE> +<CYRILLIC_CAPITAL_LETTER_SOFT_DE> "<X6020><X0200>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_SOFT_DE> +<CYRILLIC_SMALL_LETTER_KOMI_DJE> "<X6020><X0900>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_KOMI_DJE> +<CYRILLIC_CAPITAL_LETTER_KOMI_DJE> "<X6020><X0900>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_KOMI_DJE> +<CYRILLIC_SMALL_LETTER_ZE_WITH_DESCENDER> "<X6020><X1000>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_ZE_WITH_DESCENDER> +<CYRILLIC_CAPITAL_LETTER_ZE_WITH_DESCENDER> "<X6020><X1000>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_ZE_WITH_DESCENDER> +<CYRILLIC_SMALL_LETTER_IE> <X6022>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_IE> +<COMBINING_CYRILLIC_LETTER_IE> <X6022>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_IE> +<CYRILLIC_CAPITAL_LETTER_IE> <X6022>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_IE> +<CYRILLIC_SMALL_LETTER_IE_WITH_GRAVE> <X6022>;"<X05><X8A>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_IE_WITH_GRAVE> +<CYRILLIC_CAPITAL_LETTER_IE_WITH_GRAVE> <X6022>;"<X05><X8A>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_IE_WITH_GRAVE> +<CYRILLIC_SMALL_LETTER_IE_WITH_BREVE> <X6022>;"<X05><X8C>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_IE_WITH_BREVE> +<CYRILLIC_CAPITAL_LETTER_IE_WITH_BREVE> <X6022>;"<X05><X8C>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_IE_WITH_BREVE> +<CYRILLIC_SMALL_LETTER_IO> <X6023>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_IO> +<CYRILLIC_CAPITAL_LETTER_IO> <X6023>;<X05>;<X86>;<CYRILLIC_CAPITAL_LETTER_IO> +<CYRILLIC_SMALL_LETTER_UKRAINIAN_IE> <X6024>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_UKRAINIAN_IE> +<COMBINING_CYRILLIC_LETTER_UKRAINIAN_IE> <X6024>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_UKRAINIAN_IE> +<CYRILLIC_CAPITAL_LETTER_UKRAINIAN_IE> <X6024>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_UKRAINIAN_IE> +<CYRILLIC_SMALL_LETTER_ZHE> <X6026>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_ZHE> +<COMBINING_CYRILLIC_LETTER_ZHE> <X6026>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_ZHE> +<CYRILLIC_CAPITAL_LETTER_ZHE> <X6026>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_ZHE> +<CYRILLIC_SMALL_LETTER_ZHE_WITH_BREVE> <X6026>;"<X05><X8C>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_ZHE_WITH_BREVE> +<CYRILLIC_CAPITAL_LETTER_ZHE_WITH_BREVE> <X6026>;"<X05><X8C>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_ZHE_WITH_BREVE> +<CYRILLIC_SMALL_LETTER_ZHE_WITH_DIAERESIS> <X6026>;"<X05><X96>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_ZHE_WITH_DIAERESIS> +<CYRILLIC_CAPITAL_LETTER_ZHE_WITH_DIAERESIS> <X6026>;"<X05><X96>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_ZHE_WITH_DIAERESIS> +<CYRILLIC_SMALL_LETTER_DZZHE> "<X6028><X0200>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_DZZHE> +<CYRILLIC_CAPITAL_LETTER_DZZHE> "<X6028><X0200>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_DZZHE> +<CYRILLIC_SMALL_LETTER_ZHWE> "<X6028><X0900>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_ZHWE> +<CYRILLIC_CAPITAL_LETTER_ZHWE> "<X6028><X0900>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_ZHWE> +<CYRILLIC_SMALL_LETTER_ZHE_WITH_DESCENDER> "<X6028><X1000>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_ZHE_WITH_DESCENDER> +<CYRILLIC_CAPITAL_LETTER_ZHE_WITH_DESCENDER> "<X6028><X1000>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_ZHE_WITH_DESCENDER> +<CYRILLIC_SMALL_LETTER_ZE> <X602A>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_ZE> +<COMBINING_CYRILLIC_LETTER_ZE> <X602A>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_ZE> +<CYRILLIC_CAPITAL_LETTER_ZE> <X602A>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_ZE> +<CYRILLIC_SMALL_LETTER_ZE_WITH_DIAERESIS> <X602A>;"<X05><X96>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_ZE_WITH_DIAERESIS> +<CYRILLIC_CAPITAL_LETTER_ZE_WITH_DIAERESIS> <X602A>;"<X05><X96>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_ZE_WITH_DIAERESIS> +<CYRILLIC_SMALL_LETTER_ZEMLYA> "<X602C><X0200>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_ZEMLYA> +<CYRILLIC_CAPITAL_LETTER_ZEMLYA> "<X602C><X0200>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_ZEMLYA> +<CYRILLIC_SMALL_LETTER_KOMI_ZJE> "<X602C><X0900>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_KOMI_ZJE> +<CYRILLIC_CAPITAL_LETTER_KOMI_ZJE> "<X602C><X0900>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_KOMI_ZJE> +<CYRILLIC_SMALL_LETTER_REVERSED_ZE> "<X602C><X1000>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_REVERSED_ZE> +<CYRILLIC_CAPITAL_LETTER_REVERSED_ZE> "<X602C><X1000>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_REVERSED_ZE> +<CYRILLIC_SMALL_LETTER_DZELO> "<X602C><X1700>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_DZELO> +<CYRILLIC_CAPITAL_LETTER_DZELO> "<X602C><X1700>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_DZELO> +<CYRILLIC_SMALL_LETTER_DZE> <X602E>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_DZE> +<CYRILLIC_CAPITAL_LETTER_DZE> <X602E>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LETTER_DZE> +<CYRILLIC_SMALL_LETTER_REVERSED_DZE> "<X6030><X0200>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_REVERSED_DZE> +<CYRILLIC_CAPITAL_LETTER_REVERSED_DZE> "<X6030><X0200>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_REVERSED_DZE> +<CYRILLIC_SMALL_LETTER_ABKHASIAN_DZE> "<X6030><X0900>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_ABKHASIAN_DZE> +<CYRILLIC_CAPITAL_LETTER_ABKHASIAN_DZE> "<X6030><X0900>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_ABKHASIAN_DZE> +<CYRILLIC_SMALL_LETTER_DZZE> "<X6030><X1000>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_DZZE> +<CYRILLIC_CAPITAL_LETTER_DZZE> "<X6030><X1000>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_DZZE> +<CYRILLIC_SMALL_LETTER_KOMI_DZJE> "<X6030><X1700>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_KOMI_DZJE> +<CYRILLIC_CAPITAL_LETTER_KOMI_DZJE> "<X6030><X1700>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_KOMI_DZJE> +<CYRILLIC_SMALL_LETTER_DZWE> "<X6030><X1E00>";<X05>;"<X05><XC0>";<CYRILLIC_SMALL_LETTER_DZWE> +<CYRILLIC_CAPITAL_LETTER_DZWE> "<X6030><X1E00>";<X05>;"<XA0><XC0>";<CYRILLIC_CAPITAL_LETTER_DZWE> +<CYRILLIC_SMALL_LETTER_I> <X6032>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_I> +<COMBINING_CYRILLIC_LETTER_I> <X6032>;<X05>;<X20>;<COMBINING_CYRILLIC_LETTER_I> +<CYRILLIC_CAPITAL_LETTER_I> <X6032>;<X05>;<XAE>;<CYRILLIC_CAPITAL_LETTER_I> +<CYRILLIC_SMALL_LETTER_I_WITH_GRAVE> <X6032>;"<X05><X8A>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_I_WITH_GRAVE> +<CYRILLIC_CAPITAL_LETTER_I_WITH_GRAVE> <X6032>;"<X05><X8A>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_I_WITH_GRAVE> +<CYRILLIC_SMALL_LETTER_I_WITH_DIAERESIS> <X6032>;"<X05><X96>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_I_WITH_DIAERESIS> +<CYRILLIC_CAPITAL_LETTER_I_WITH_DIAERESIS> <X6032>;"<X05><X96>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_I_WITH_DIAERESIS> +<CYRILLIC_SMALL_LETTER_I_WITH_MACRON> <X6032>;"<X05><XA4>";"<X05><X05>";<CYRILLIC_SMALL_LETTER_I_WITH_MACRON> +<CYRILLIC_CAPITAL_LETTER_I_WITH_MACRON> <X6032>;"<X05><XA4>";"<XAE><X05>";<CYRILLIC_CAPITAL_LETTER_I_WITH_MACRON> +<CYRILLIC_SMALL_LETTER_SHORT_I_WITH_TAIL> <X6034>;<X05>;<X05>;<CYRILLIC_SMALL_LETTER_SHORT_I_WITH_TAIL> +<CYRILLIC_CAPITAL_LETTER_SHORT_I_WITH_TAIL> <X6034>;<X05>;<XA0>;<CYRILLIC_CAPITAL_LETTER_SHORT_I_WITH_TAIL> +<COMBINING_CYRILLIC_LETTER_YI> <X6036>;"<X05><X96>";"<X20><X20>";<COMBINING_CYRILLIC_LETTER_YI> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607031821.u63ILBL1076497>