diff options
author | Jarkko Hietaniemi <jhi@iki.fi> | 2015-03-20 07:07:21 -0400 |
---|---|---|
committer | Jarkko Hietaniemi <jhi@iki.fi> | 2015-03-20 07:13:17 -0400 |
commit | 126be117f430e22872b7c083797271ef6f2e51a0 (patch) | |
tree | 502795c499c7e8f69e50fd38611d627495b763b5 /cpan | |
parent | ce1e892ee997ffdf17c58c5e7f0be91098aa2be3 (diff) | |
download | perl-126be117f430e22872b7c083797271ef6f2e51a0.tar.gz |
Update Unicode-Collate to CPAN version 1.12
[DELTA]
1.12 Mon Mar 16 20:21:15 2015
- XS: [rt.cpan.org #102663] IRIX 6.5 failures with Unicode::Collate
(porting: avoid non-zero values in the initializer of an array)
Diffstat (limited to 'cpan')
97 files changed, 152 insertions, 112 deletions
diff --git a/cpan/Unicode-Collate/Collate.pm b/cpan/Unicode-Collate/Collate.pm index dfc983670c..f939b66d55 100644 --- a/cpan/Unicode-Collate/Collate.pm +++ b/cpan/Unicode-Collate/Collate.pm @@ -17,7 +17,7 @@ use File::Spec; no warnings 'utf8'; -our $VERSION = '1.11'; +our $VERSION = '1.12'; our $PACKAGE = __PACKAGE__; ### begin XS only ### diff --git a/cpan/Unicode-Collate/Collate.xs b/cpan/Unicode-Collate/Collate.xs index 91537e1490..6adcbeb500 100644 --- a/cpan/Unicode-Collate/Collate.xs +++ b/cpan/Unicode-Collate/Collate.xs @@ -268,8 +268,8 @@ _derivCE_9 (code) _derivCE_24 = 5 PREINIT: UV base, aaaa, bbbb; - U8 a[VCE_Length + 1] = "\x00\xFF\xFF\x00\x20\x00\x02\xFF\xFF"; - U8 b[VCE_Length + 1] = "\x00\xFF\xFF\x00\x00\x00\x00\xFF\xFF"; + U8 a[VCE_Length + 1] = "\x00\x00\x00\x00\x00\x00\x00\x00\x00"; + U8 b[VCE_Length + 1] = "\x00\x00\x00\x00\x00\x00\x00\x00\x00"; bool basic_unified = 0; PPCODE: if (CJK_UidIni <= code) { @@ -299,6 +299,8 @@ _derivCE_9 (code) a[2] = (U8)(aaaa & 0xFF); b[1] = (U8)(bbbb >> 8); b[2] = (U8)(bbbb & 0xFF); + a[4] = (U8)(0x20); /* second octet of level 2 */ + a[6] = (U8)(0x02); /* second octet of level 3 */ a[7] = b[7] = (U8)(code >> 8); a[8] = b[8] = (U8)(code & 0xFF); EXTEND(SP, 2); @@ -311,8 +313,8 @@ _derivCE_8 (code) UV code PREINIT: UV aaaa, bbbb; - U8 a[VCE_Length + 1] = "\x00\xFF\xFF\x00\x02\x00\x01\xFF\xFF"; - U8 b[VCE_Length + 1] = "\x00\xFF\xFF\x00\x00\x00\x00\xFF\xFF"; + U8 a[VCE_Length + 1] = "\x00\x00\x00\x00\x00\x00\x00\x00\x00"; + U8 b[VCE_Length + 1] = "\x00\x00\x00\x00\x00\x00\x00\x00\x00"; PPCODE: aaaa = 0xFF80 + (code >> 15); bbbb = (code & 0x7FFF) | 0x8000; @@ -320,6 +322,8 @@ _derivCE_8 (code) a[2] = (U8)(aaaa & 0xFF); b[1] = (U8)(bbbb >> 8); b[2] = (U8)(bbbb & 0xFF); + a[4] = (U8)(0x02); /* second octet of level 2 */ + a[6] = (U8)(0x01); /* second octet of level 3 */ a[7] = b[7] = (U8)(code >> 8); a[8] = b[8] = (U8)(code & 0xFF); EXTEND(SP, 2); @@ -331,10 +335,12 @@ void _uideoCE_8 (code) UV code PREINIT: - U8 uice[VCE_Length + 1] = "\x00\xFF\xFF\x00\x20\x00\x02\xFF\xFF"; + U8 uice[VCE_Length + 1] = "\x00\x00\x00\x00\x00\x00\x00\x00\x00"; PPCODE: uice[1] = uice[7] = (U8)(code >> 8); uice[2] = uice[8] = (U8)(code & 0xFF); + uice[4] = (U8)(0x20); /* second octet of level 2 */ + uice[6] = (U8)(0x02); /* second octet of level 3 */ PUSHs(sv_2mortal(newSVpvn((char *) uice, VCE_Length))); diff --git a/cpan/Unicode-Collate/Collate/CJK/Big5.pm b/cpan/Unicode-Collate/Collate/CJK/Big5.pm index f734dee042..0ea47af2ee 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Big5.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Big5.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.11'; +our $VERSION = '1.12'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/GB2312.pm b/cpan/Unicode-Collate/Collate/CJK/GB2312.pm index 9ad06b04ed..8052bfa580 100644 --- a/cpan/Unicode-Collate/Collate/CJK/GB2312.pm +++ b/cpan/Unicode-Collate/Collate/CJK/GB2312.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.11'; +our $VERSION = '1.12'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/JISX0208.pm b/cpan/Unicode-Collate/Collate/CJK/JISX0208.pm index 4406c803ca..e8d5f4425d 100644 --- a/cpan/Unicode-Collate/Collate/CJK/JISX0208.pm +++ b/cpan/Unicode-Collate/Collate/CJK/JISX0208.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.11'; +our $VERSION = '1.12'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/Korean.pm b/cpan/Unicode-Collate/Collate/CJK/Korean.pm index ac39beb573..3746d01d4e 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Korean.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Korean.pm @@ -5,7 +5,7 @@ use strict; use warnings; use Unicode::Collate; -our $VERSION = '1.11'; +our $VERSION = '1.12'; my %jamo2prim = ( 0x1100, 0x376F, 0x1101, 0x3770, 0x1102, 0x3771, 0x1103, 0x3772, diff --git a/cpan/Unicode-Collate/Collate/CJK/Pinyin.pm b/cpan/Unicode-Collate/Collate/CJK/Pinyin.pm index e64b7569f1..b8f3976caa 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Pinyin.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Pinyin.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.11'; +our $VERSION = '1.12'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/Stroke.pm b/cpan/Unicode-Collate/Collate/CJK/Stroke.pm index 34c7dd9a07..a7f7526826 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Stroke.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Stroke.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.11'; +our $VERSION = '1.12'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm b/cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm index 251ce525f0..9e5ced0f9f 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.11'; +our $VERSION = '1.12'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/Locale.pm b/cpan/Unicode-Collate/Collate/Locale.pm index 4662861165..184ab6c7da 100644 --- a/cpan/Unicode-Collate/Collate/Locale.pm +++ b/cpan/Unicode-Collate/Collate/Locale.pm @@ -5,7 +5,7 @@ use warnings; use Carp; use base qw(Unicode::Collate); -our $VERSION = '1.11'; +our $VERSION = '1.12'; my $PL_EXT = '.pl'; diff --git a/cpan/Unicode-Collate/Collate/Locale/af.pl b/cpan/Unicode-Collate/Collate/Locale/af.pl index ebb30819e8..f962e61700 100644 --- a/cpan/Unicode-Collate/Collate/Locale/af.pl +++ b/cpan/Unicode-Collate/Collate/Locale/af.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0149 ; [.1A7D.0020.0009] # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE ENTRY diff --git a/cpan/Unicode-Collate/Collate/Locale/ar.pl b/cpan/Unicode-Collate/Collate/Locale/ar.pl index 84657443c3..c5eef3195a 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ar.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ar.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0629 ; [.2025.0021.0002] # ARABIC LETTER TEH MARBUTA FE94 ; [.2025.0021.0019] # ARABIC LETTER TEH MARBUTA FINAL FORM diff --git a/cpan/Unicode-Collate/Collate/Locale/as.pl b/cpan/Unicode-Collate/Collate/Locale/as.pl index 7afc12d74b..a7efd2a033 100644 --- a/cpan/Unicode-Collate/Collate/Locale/as.pl +++ b/cpan/Unicode-Collate/Collate/Locale/as.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0982 ; [.23CC.0020.0002][.FFF1.0000.0000] # BENGALI SIGN ANUSVARA 0981 ; [.23CC.0020.0002][.FFF2.0000.0000] # BENGALI SIGN CANDRABINDU diff --git a/cpan/Unicode-Collate/Collate/Locale/az.pl b/cpan/Unicode-Collate/Collate/Locale/az.pl index 2c8c32a9e7..09f159b170 100644 --- a/cpan/Unicode-Collate/Collate/Locale/az.pl +++ b/cpan/Unicode-Collate/Collate/Locale/az.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # schwa doesn't require tailoring entry => <<'ENTRY', # for DUCET v7.0.0 00E7 ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA diff --git a/cpan/Unicode-Collate/Collate/Locale/be.pl b/cpan/Unicode-Collate/Collate/Locale/be.pl index 592a6b16b7..8c2af06574 100644 --- a/cpan/Unicode-Collate/Collate/Locale/be.pl +++ b/cpan/Unicode-Collate/Collate/Locale/be.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435, 0x0416, 0x0436, 0x0417, 0x0437, 0x0406, 0x0456, 0x041E, 0x043E, 0x04E8, 0x04E9, 0x041A, 0x043A, 0x0427, 0x0447, 0x042B, 0x044B, diff --git a/cpan/Unicode-Collate/Collate/Locale/bg.pl b/cpan/Unicode-Collate/Collate/Locale/bg.pl index b7042805d0..645125ce0c 100644 --- a/cpan/Unicode-Collate/Collate/Locale/bg.pl +++ b/cpan/Unicode-Collate/Collate/Locale/bg.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435, 0x0416, 0x0436, 0x0417, 0x0437, 0x0406, 0x0456, 0x041E, 0x043E, 0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443, 0x0427, 0x0447, diff --git a/cpan/Unicode-Collate/Collate/Locale/bn.pl b/cpan/Unicode-Collate/Collate/Locale/bn.pl index 120d2ff69f..a876406ad8 100644 --- a/cpan/Unicode-Collate/Collate/Locale/bn.pl +++ b/cpan/Unicode-Collate/Collate/Locale/bn.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0982 ; [.23CC.0020.0002][.FFF1.0000.0000] # BENGALI SIGN ANUSVARA 0983 ; [.23CC.0020.0002][.FFF2.0000.0000] # BENGALI SIGN VISARGA diff --git a/cpan/Unicode-Collate/Collate/Locale/ca.pl b/cpan/Unicode-Collate/Collate/Locale/ca.pl index 3946bdb0aa..308c68f305 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ca.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ca.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, backwards => 2, entry => <<'ENTRY', # for DUCET v7.0.0 0063 0068 ; [.193F.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H> diff --git a/cpan/Unicode-Collate/Collate/Locale/cs.pl b/cpan/Unicode-Collate/Collate/Locale/cs.pl index f9be2aab5d..f75d2668a4 100644 --- a/cpan/Unicode-Collate/Collate/Locale/cs.pl +++ b/cpan/Unicode-Collate/Collate/Locale/cs.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 010D ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON 0063 030C ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON diff --git a/cpan/Unicode-Collate/Collate/Locale/cy.pl b/cpan/Unicode-Collate/Collate/Locale/cy.pl index b7f3c6a391..4449bcd641 100644 --- a/cpan/Unicode-Collate/Collate/Locale/cy.pl +++ b/cpan/Unicode-Collate/Collate/Locale/cy.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0063 0068 ; [.193F.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H> 0043 0068 ; [.193F.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H> diff --git a/cpan/Unicode-Collate/Collate/Locale/da.pl b/cpan/Unicode-Collate/Collate/Locale/da.pl index 614bce7279..2e5097170a 100644 --- a/cpan/Unicode-Collate/Collate/Locale/da.pl +++ b/cpan/Unicode-Collate/Collate/Locale/da.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, upper_before_lower => 1, entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/de_phone.pl b/cpan/Unicode-Collate/Collate/Locale/de_phone.pl index 1c3617f026..00daa92e09 100644 --- a/cpan/Unicode-Collate/Collate/Locale/de_phone.pl +++ b/cpan/Unicode-Collate/Collate/Locale/de_phone.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00E4 ; [.190C.0021.0002][.196E.0021.0002] # LATIN SMALL LETTER A WITH DIAERESIS 0061 0308 ; [.190C.0021.0002][.196E.0021.0002] # LATIN SMALL LETTER A WITH DIAERESIS diff --git a/cpan/Unicode-Collate/Collate/Locale/ee.pl b/cpan/Unicode-Collate/Collate/Locale/ee.pl index 6d19565a00..4ac1b91ba0 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ee.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ee.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # d-tail, open-e, f-hook, gamma, eng, open-o, v-hook don't require tailoring entry => <<'ENTRY', # for DUCET v7.0.0 0302 ; [.0000.0029.0002] # COMBINING CIRCUMFLEX ACCENT diff --git a/cpan/Unicode-Collate/Collate/Locale/eo.pl b/cpan/Unicode-Collate/Collate/Locale/eo.pl index 8904187ca6..bdecddb2c8 100644 --- a/cpan/Unicode-Collate/Collate/Locale/eo.pl +++ b/cpan/Unicode-Collate/Collate/Locale/eo.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0109 ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CIRCUMFLEX 0063 0302 ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CIRCUMFLEX diff --git a/cpan/Unicode-Collate/Collate/Locale/es.pl b/cpan/Unicode-Collate/Collate/Locale/es.pl index bd7473322b..c1515723ed 100644 --- a/cpan/Unicode-Collate/Collate/Locale/es.pl +++ b/cpan/Unicode-Collate/Collate/Locale/es.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00F1 ; [.1A7E.0020.0002] # LATIN SMALL LETTER N WITH TILDE 006E 0303 ; [.1A7E.0020.0002] # LATIN SMALL LETTER N WITH TILDE diff --git a/cpan/Unicode-Collate/Collate/Locale/es_trad.pl b/cpan/Unicode-Collate/Collate/Locale/es_trad.pl index fcfbcfe71a..cc1bdfc03a 100644 --- a/cpan/Unicode-Collate/Collate/Locale/es_trad.pl +++ b/cpan/Unicode-Collate/Collate/Locale/es_trad.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0063 0068 ; [.193F.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H> 0043 0068 ; [.193F.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H> diff --git a/cpan/Unicode-Collate/Collate/Locale/et.pl b/cpan/Unicode-Collate/Collate/Locale/et.pl index 66dfa3942a..8611cc5f08 100644 --- a/cpan/Unicode-Collate/Collate/Locale/et.pl +++ b/cpan/Unicode-Collate/Collate/Locale/et.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0161 ; [.1B54.0020.0002] # LATIN SMALL LETTER S WITH CARON 0073 030C ; [.1B54.0020.0002] # LATIN SMALL LETTER S WITH CARON diff --git a/cpan/Unicode-Collate/Collate/Locale/fa.pl b/cpan/Unicode-Collate/Collate/Locale/fa.pl index 11d9bc0099..f68dfd9b15 100644 --- a/cpan/Unicode-Collate/Collate/Locale/fa.pl +++ b/cpan/Unicode-Collate/Collate/Locale/fa.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0650 ; [.0000.0077.0002] # ARABIC KASRA 064B ; [.0000.007B.0002] # ARABIC FATHATAN diff --git a/cpan/Unicode-Collate/Collate/Locale/fi.pl b/cpan/Unicode-Collate/Collate/Locale/fi.pl index 377a433c38..65211cc814 100644 --- a/cpan/Unicode-Collate/Collate/Locale/fi.pl +++ b/cpan/Unicode-Collate/Collate/Locale/fi.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # in cldr test/fi.xml why x{110}x < xdx though xd < x{110} ? entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002][.0000.0039.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/fi_phone.pl b/cpan/Unicode-Collate/Collate/Locale/fi_phone.pl index a290717522..aa8335e504 100644 --- a/cpan/Unicode-Collate/Collate/Locale/fi_phone.pl +++ b/cpan/Unicode-Collate/Collate/Locale/fi_phone.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # in cldr test/fi.xml why x{110}x < xdx though xd < x{110} ? entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002][.0000.0039.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/fil.pl b/cpan/Unicode-Collate/Collate/Locale/fil.pl index 5988318982..e0a3bf8ada 100644 --- a/cpan/Unicode-Collate/Collate/Locale/fil.pl +++ b/cpan/Unicode-Collate/Collate/Locale/fil.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00F1 ; [.1A7E.0020.0002] # LATIN SMALL LETTER N WITH TILDE 006E 0303 ; [.1A7E.0020.0002] # LATIN SMALL LETTER N WITH TILDE diff --git a/cpan/Unicode-Collate/Collate/Locale/fo.pl b/cpan/Unicode-Collate/Collate/Locale/fo.pl index ee947d32bb..0f8e8e0930 100644 --- a/cpan/Unicode-Collate/Collate/Locale/fo.pl +++ b/cpan/Unicode-Collate/Collate/Locale/fo.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/fr.pl b/cpan/Unicode-Collate/Collate/Locale/fr.pl index e53c018484..b5083bd630 100644 --- a/cpan/Unicode-Collate/Collate/Locale/fr.pl +++ b/cpan/Unicode-Collate/Collate/Locale/fr.pl @@ -1,4 +1,4 @@ +{ - locale_version => 1.11, + locale_version => 1.12, backwards => 2, }; diff --git a/cpan/Unicode-Collate/Collate/Locale/gu.pl b/cpan/Unicode-Collate/Collate/Locale/gu.pl index 38a222f757..6984e21438 100644 --- a/cpan/Unicode-Collate/Collate/Locale/gu.pl +++ b/cpan/Unicode-Collate/Collate/Locale/gu.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0A82 ; [.2438.0020.0002][.FFF1.0000.0000] # GUJARATI SIGN ANUSVARA 0A81 ; [.2438.0021.0002][.FFF1.0000.0000] # GUJARATI SIGN CANDRABINDU diff --git a/cpan/Unicode-Collate/Collate/Locale/ha.pl b/cpan/Unicode-Collate/Collate/Locale/ha.pl index 303fcc50a6..244d693356 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ha.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ha.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # b-hook, d-hook, k-hook, y-hook don't require tailoring entry => <<'ENTRY', # for DUCET v7.0.0 0073 0068 ; [.1B34.0020.0002] # <LATIN SMALL LETTER S, LATIN SMALL LETTER H> diff --git a/cpan/Unicode-Collate/Collate/Locale/haw.pl b/cpan/Unicode-Collate/Collate/Locale/haw.pl index c67e26faee..059b55ff76 100644 --- a/cpan/Unicode-Collate/Collate/Locale/haw.pl +++ b/cpan/Unicode-Collate/Collate/Locale/haw.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0065 ; [.190D.0020.0002] # LATIN SMALL LETTER E 0045 ; [.190D.0020.0008] # LATIN CAPITAL LETTER E diff --git a/cpan/Unicode-Collate/Collate/Locale/hi.pl b/cpan/Unicode-Collate/Collate/Locale/hi.pl index 8fc90192c4..0b72a65b27 100644 --- a/cpan/Unicode-Collate/Collate/Locale/hi.pl +++ b/cpan/Unicode-Collate/Collate/Locale/hi.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0902 ; [.235B.0020.0002][.FFF1.0000.0000] # DEVANAGARI SIGN ANUSVARA 0901 ; [.235B.0021.0002][.FFF1.0000.0000] # DEVANAGARI SIGN CANDRABINDU diff --git a/cpan/Unicode-Collate/Collate/Locale/hr.pl b/cpan/Unicode-Collate/Collate/Locale/hr.pl index db73f1e3c5..2a8e8feb51 100644 --- a/cpan/Unicode-Collate/Collate/Locale/hr.pl +++ b/cpan/Unicode-Collate/Collate/Locale/hr.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 010D ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON 0063 030C ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON diff --git a/cpan/Unicode-Collate/Collate/Locale/hu.pl b/cpan/Unicode-Collate/Collate/Locale/hu.pl index 93fe5820b6..c5e8ca0e64 100644 --- a/cpan/Unicode-Collate/Collate/Locale/hu.pl +++ b/cpan/Unicode-Collate/Collate/Locale/hu.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0063 0073 ; [.193F.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER S> 0063 0053 ; [.193F.0020.0007][.0000.0000.0002] # <LATIN SMALL LETTER C, LATIN CAPITAL LETTER S> diff --git a/cpan/Unicode-Collate/Collate/Locale/hy.pl b/cpan/Unicode-Collate/Collate/Locale/hy.pl index ab0c1b0a77..8d02f53622 100644 --- a/cpan/Unicode-Collate/Collate/Locale/hy.pl +++ b/cpan/Unicode-Collate/Collate/Locale/hy.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0587 ; [.1FBD.0020.0002][.FFF1.0000.0000] # ARMENIAN SMALL LIGATURE ECH YIWN 0584 ; [.1FBD.0020.0002][.FFF0.0000.0000] # ARMENIAN SMALL LETTER KEH diff --git a/cpan/Unicode-Collate/Collate/Locale/ig.pl b/cpan/Unicode-Collate/Collate/Locale/ig.pl index d336161bcb..c5a852b982 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ig.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ig.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0063 0068 ; [.1926.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H> 0043 0068 ; [.1926.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H> diff --git a/cpan/Unicode-Collate/Collate/Locale/is.pl b/cpan/Unicode-Collate/Collate/Locale/is.pl index aedb0d9854..0c0c06b1e2 100644 --- a/cpan/Unicode-Collate/Collate/Locale/is.pl +++ b/cpan/Unicode-Collate/Collate/Locale/is.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00E1 ; [.1924.0020.0002] # LATIN SMALL LETTER A WITH ACUTE 0061 0301 ; [.1924.0020.0002] # LATIN SMALL LETTER A WITH ACUTE diff --git a/cpan/Unicode-Collate/Collate/Locale/ja.pl b/cpan/Unicode-Collate/Collate/Locale/ja.pl index 52591ce791..a8fa6635db 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ja.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ja.pl @@ -1,6 +1,6 @@ use Unicode::Collate::CJK::JISX0208; +{ - locale_version => 1.11, + locale_version => 1.12, overrideCJK => \&Unicode::Collate::CJK::JISX0208::weightJISX0208, entry => <<'ENTRY', # for DUCET v7.0.0 30A1 ; [.38D4.0020.000F.0002] # KATAKANA LETTER SMALL A diff --git a/cpan/Unicode-Collate/Collate/Locale/kk.pl b/cpan/Unicode-Collate/Collate/Locale/kk.pl index b9ff2189a8..24e5abbe7e 100644 --- a/cpan/Unicode-Collate/Collate/Locale/kk.pl +++ b/cpan/Unicode-Collate/Collate/Locale/kk.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435, 0x0416, 0x0436, 0x0417, 0x0437, 0x0406, 0x0456, 0x041E, 0x043E, 0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443, 0x0427, 0x0447, diff --git a/cpan/Unicode-Collate/Collate/Locale/kl.pl b/cpan/Unicode-Collate/Collate/Locale/kl.pl index ea9012b9f9..9fcae20b18 100644 --- a/cpan/Unicode-Collate/Collate/Locale/kl.pl +++ b/cpan/Unicode-Collate/Collate/Locale/kl.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/kn.pl b/cpan/Unicode-Collate/Collate/Locale/kn.pl index 7c11dbff89..ef846e660e 100644 --- a/cpan/Unicode-Collate/Collate/Locale/kn.pl +++ b/cpan/Unicode-Collate/Collate/Locale/kn.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0C82 ; [.2549.0020.0002][.FFF1.0000.0000] # KANNADA SIGN ANUSVARA 0C83 ; [.2549.0020.0002][.FFF2.0000.0000] # KANNADA SIGN VISARGA diff --git a/cpan/Unicode-Collate/Collate/Locale/ko.pl b/cpan/Unicode-Collate/Collate/Locale/ko.pl index 12521b57f1..e328bf4b55 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ko.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ko.pl @@ -1,6 +1,6 @@ use Unicode::Collate::CJK::Korean; +{ - locale_version => 1.11, + locale_version => 1.12, overrideCJK => \&Unicode::Collate::CJK::Korean::weightKorean, entry => <<'ENTRY', # for DUCET v7.0.0 F967 ; [.3776.0021.0002.4E0D][.37FA.0020.0002] # CJK COMPATIBILITY IDEOGRAPH-F967 diff --git a/cpan/Unicode-Collate/Collate/Locale/kok.pl b/cpan/Unicode-Collate/Collate/Locale/kok.pl index 43ea4858be..d2e645acad 100644 --- a/cpan/Unicode-Collate/Collate/Locale/kok.pl +++ b/cpan/Unicode-Collate/Collate/Locale/kok.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0902 ; [.235B.0020.0002][.FFF1.0000.0000] # DEVANAGARI SIGN ANUSVARA 0901 ; [.235B.0021.0002][.FFF1.0000.0000] # DEVANAGARI SIGN CANDRABINDU diff --git a/cpan/Unicode-Collate/Collate/Locale/ln.pl b/cpan/Unicode-Collate/Collate/Locale/ln.pl index 85eb3e42c8..e461791fae 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ln.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ln.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 025B ; [.196F.0020.0002] # LATIN SMALL LETTER OPEN E 0190 ; [.196F.0020.0008] # LATIN CAPITAL LETTER OPEN E diff --git a/cpan/Unicode-Collate/Collate/Locale/lt.pl b/cpan/Unicode-Collate/Collate/Locale/lt.pl index 4b96426dd0..5782ba22fd 100644 --- a/cpan/Unicode-Collate/Collate/Locale/lt.pl +++ b/cpan/Unicode-Collate/Collate/Locale/lt.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # in cldr test/lt.xml why I-dot-acute > I-dot though i-dot-acute < i-dot ? entry => <<'ENTRY', # for DUCET v7.0.0 0049 0307 ; [.19F6.0020.0008][.0000.002E.0002] # <LATIN CAPITAL LETTER I, COMBINING DOT ABOVE> diff --git a/cpan/Unicode-Collate/Collate/Locale/lv.pl b/cpan/Unicode-Collate/Collate/Locale/lv.pl index 95bf61c9ac..c490ce38a9 100644 --- a/cpan/Unicode-Collate/Collate/Locale/lv.pl +++ b/cpan/Unicode-Collate/Collate/Locale/lv.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 010D ; [.1952.0020.0002] # LATIN SMALL LETTER C WITH CARON 0063 030C ; [.1952.0020.0002] # LATIN SMALL LETTER C WITH CARON diff --git a/cpan/Unicode-Collate/Collate/Locale/mk.pl b/cpan/Unicode-Collate/Collate/Locale/mk.pl index e89dc5621d..8ad888de3c 100644 --- a/cpan/Unicode-Collate/Collate/Locale/mk.pl +++ b/cpan/Unicode-Collate/Collate/Locale/mk.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0415, 0x0435, 0x0416, 0x0436, 0x0417, 0x0437, 0x0418, 0x0438, 0x0406, 0x0456, 0x041E, 0x043E, 0x04E8, 0x04E9, 0x0423, 0x0443, 0x0427, 0x0447, 0x042B, 0x044B, diff --git a/cpan/Unicode-Collate/Collate/Locale/ml.pl b/cpan/Unicode-Collate/Collate/Locale/ml.pl index c0091687f3..1cced22934 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ml.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ml.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0D3D ; [.0000.00C0.0002] # MALAYALAM SIGN AVAGRAHA 0D57 ; [.25C8.0020.0002] # MALAYALAM AU LENGTH MARK diff --git a/cpan/Unicode-Collate/Collate/Locale/mr.pl b/cpan/Unicode-Collate/Collate/Locale/mr.pl index 0218d97361..98bc0b174f 100644 --- a/cpan/Unicode-Collate/Collate/Locale/mr.pl +++ b/cpan/Unicode-Collate/Collate/Locale/mr.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0902 ; [.235B.0020.0002][.FFF1.0000.0000] # DEVANAGARI SIGN ANUSVARA 0901 ; [.235B.0021.0002][.FFF1.0000.0000] # DEVANAGARI SIGN CANDRABINDU diff --git a/cpan/Unicode-Collate/Collate/Locale/mt.pl b/cpan/Unicode-Collate/Collate/Locale/mt.pl index c2fb76225b..e8cca669ab 100644 --- a/cpan/Unicode-Collate/Collate/Locale/mt.pl +++ b/cpan/Unicode-Collate/Collate/Locale/mt.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, upper_before_lower => 1, entry => <<'ENTRY', # for DUCET v7.0.0 010B ; [.193D.0020.0002] # LATIN SMALL LETTER C WITH DOT ABOVE diff --git a/cpan/Unicode-Collate/Collate/Locale/nb.pl b/cpan/Unicode-Collate/Collate/Locale/nb.pl index c037e7d414..749807d721 100644 --- a/cpan/Unicode-Collate/Collate/Locale/nb.pl +++ b/cpan/Unicode-Collate/Collate/Locale/nb.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/nn.pl b/cpan/Unicode-Collate/Collate/Locale/nn.pl index c037e7d414..749807d721 100644 --- a/cpan/Unicode-Collate/Collate/Locale/nn.pl +++ b/cpan/Unicode-Collate/Collate/Locale/nn.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/nso.pl b/cpan/Unicode-Collate/Collate/Locale/nso.pl index 89d9056bf5..0a43662ca5 100644 --- a/cpan/Unicode-Collate/Collate/Locale/nso.pl +++ b/cpan/Unicode-Collate/Collate/Locale/nso.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00EA ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH CIRCUMFLEX 0065 0302 ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH CIRCUMFLEX diff --git a/cpan/Unicode-Collate/Collate/Locale/om.pl b/cpan/Unicode-Collate/Collate/Locale/om.pl index b813134845..4c4e9ce6ab 100644 --- a/cpan/Unicode-Collate/Collate/Locale/om.pl +++ b/cpan/Unicode-Collate/Collate/Locale/om.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0063 0068 ; [.1BE4.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H> 0043 0068 ; [.1BE4.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H> diff --git a/cpan/Unicode-Collate/Collate/Locale/or.pl b/cpan/Unicode-Collate/Collate/Locale/or.pl index ecbfe0dcff..3af7bfed51 100644 --- a/cpan/Unicode-Collate/Collate/Locale/or.pl +++ b/cpan/Unicode-Collate/Collate/Locale/or.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0B01 ; [.2489.0020.0002][.FFF1.0000.0000] # ORIYA SIGN CANDRABINDU 0B02 ; [.2489.0020.0002][.FFF2.0000.0000] # ORIYA SIGN ANUSVARA diff --git a/cpan/Unicode-Collate/Collate/Locale/pa.pl b/cpan/Unicode-Collate/Collate/Locale/pa.pl index 9dbed5faca..0db0eca062 100644 --- a/cpan/Unicode-Collate/Collate/Locale/pa.pl +++ b/cpan/Unicode-Collate/Collate/Locale/pa.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0A71 ; [.0000.00BD.0002] # GURMUKHI ADDAK 0A03 ; [.0000.00BC.0002] # GURMUKHI SIGN VISARGA diff --git a/cpan/Unicode-Collate/Collate/Locale/pl.pl b/cpan/Unicode-Collate/Collate/Locale/pl.pl index f7cb9c6170..2b155f462b 100644 --- a/cpan/Unicode-Collate/Collate/Locale/pl.pl +++ b/cpan/Unicode-Collate/Collate/Locale/pl.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0105 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH OGONEK 0061 0328 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH OGONEK diff --git a/cpan/Unicode-Collate/Collate/Locale/ro.pl b/cpan/Unicode-Collate/Collate/Locale/ro.pl index ecb87a8b2c..9a59f36a0a 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ro.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ro.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0103 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH BREVE 0061 0306 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH BREVE diff --git a/cpan/Unicode-Collate/Collate/Locale/ru.pl b/cpan/Unicode-Collate/Collate/Locale/ru.pl index b7042805d0..645125ce0c 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ru.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ru.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435, 0x0416, 0x0436, 0x0417, 0x0437, 0x0406, 0x0456, 0x041E, 0x043E, 0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443, 0x0427, 0x0447, diff --git a/cpan/Unicode-Collate/Collate/Locale/sa.pl b/cpan/Unicode-Collate/Collate/Locale/sa.pl index 0218d97361..98bc0b174f 100644 --- a/cpan/Unicode-Collate/Collate/Locale/sa.pl +++ b/cpan/Unicode-Collate/Collate/Locale/sa.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0902 ; [.235B.0020.0002][.FFF1.0000.0000] # DEVANAGARI SIGN ANUSVARA 0901 ; [.235B.0021.0002][.FFF1.0000.0000] # DEVANAGARI SIGN CANDRABINDU diff --git a/cpan/Unicode-Collate/Collate/Locale/se.pl b/cpan/Unicode-Collate/Collate/Locale/se.pl index 96acf54014..957b896673 100644 --- a/cpan/Unicode-Collate/Collate/Locale/se.pl +++ b/cpan/Unicode-Collate/Collate/Locale/se.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # eng, g-stroke, t-stroke don't require tailoring entry => <<'ENTRY', # for DUCET v7.0.0 00E1 ; [.1924.0020.0002] # LATIN SMALL LETTER A WITH ACUTE diff --git a/cpan/Unicode-Collate/Collate/Locale/si.pl b/cpan/Unicode-Collate/Collate/Locale/si.pl index f226cf4965..5510c730b1 100644 --- a/cpan/Unicode-Collate/Collate/Locale/si.pl +++ b/cpan/Unicode-Collate/Collate/Locale/si.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0D82 ; [.25DC.0020.0002][.FFF1.0000.0000] # SINHALA SIGN ANUSVARAYA 0D83 ; [.25DC.0020.0002][.FFF2.0000.0000] # SINHALA SIGN VISARGAYA diff --git a/cpan/Unicode-Collate/Collate/Locale/si_dict.pl b/cpan/Unicode-Collate/Collate/Locale/si_dict.pl index 154a4e34b4..7f2a1feb99 100644 --- a/cpan/Unicode-Collate/Collate/Locale/si_dict.pl +++ b/cpan/Unicode-Collate/Collate/Locale/si_dict.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0D82 ; [.25DC.0020.0002][.FFF1.0000.0000] # SINHALA SIGN ANUSVARAYA 0D83 ; [.25DC.0020.0002][.FFF2.0000.0000] # SINHALA SIGN VISARGAYA diff --git a/cpan/Unicode-Collate/Collate/Locale/sk.pl b/cpan/Unicode-Collate/Collate/Locale/sk.pl index 0a81f09575..ce7eaf098f 100644 --- a/cpan/Unicode-Collate/Collate/Locale/sk.pl +++ b/cpan/Unicode-Collate/Collate/Locale/sk.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00E4 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS 0061 0308 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS diff --git a/cpan/Unicode-Collate/Collate/Locale/sl.pl b/cpan/Unicode-Collate/Collate/Locale/sl.pl index 3fec1a3786..6d5bd70253 100644 --- a/cpan/Unicode-Collate/Collate/Locale/sl.pl +++ b/cpan/Unicode-Collate/Collate/Locale/sl.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 010D ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON 0063 030C ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON diff --git a/cpan/Unicode-Collate/Collate/Locale/sq.pl b/cpan/Unicode-Collate/Collate/Locale/sq.pl index 3e0efc7d17..deaf1036d8 100644 --- a/cpan/Unicode-Collate/Collate/Locale/sq.pl +++ b/cpan/Unicode-Collate/Collate/Locale/sq.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00E7 ; [.1952.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA 0063 0327 ; [.1952.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA diff --git a/cpan/Unicode-Collate/Collate/Locale/sr.pl b/cpan/Unicode-Collate/Collate/Locale/sr.pl index 0b1744789e..90d5c73b2b 100644 --- a/cpan/Unicode-Collate/Collate/Locale/sr.pl +++ b/cpan/Unicode-Collate/Collate/Locale/sr.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435, 0x0416, 0x0436, 0x0417, 0x0437, 0x0418, 0x0438, 0x0406, 0x0456, 0x041E, 0x043E, 0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443, diff --git a/cpan/Unicode-Collate/Collate/Locale/sv.pl b/cpan/Unicode-Collate/Collate/Locale/sv.pl index 966a649785..7e26b33648 100644 --- a/cpan/Unicode-Collate/Collate/Locale/sv.pl +++ b/cpan/Unicode-Collate/Collate/Locale/sv.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/sv_refo.pl b/cpan/Unicode-Collate/Collate/Locale/sv_refo.pl index 80eab222fe..9d850b7193 100644 --- a/cpan/Unicode-Collate/Collate/Locale/sv_refo.pl +++ b/cpan/Unicode-Collate/Collate/Locale/sv_refo.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0111 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/ta.pl b/cpan/Unicode-Collate/Collate/Locale/ta.pl index bfb7bb90f2..70097121e7 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ta.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ta.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0B82 ; [.24CC.0020.0002][.FFF0.0000.0000] # TAMIL SIGN ANUSVARA 0B83 ; [.24CC.0020.0002][.FFF1.0000.0000] # TAMIL SIGN VISARGA diff --git a/cpan/Unicode-Collate/Collate/Locale/te.pl b/cpan/Unicode-Collate/Collate/Locale/te.pl index 3f49d4b706..22aaffad29 100644 --- a/cpan/Unicode-Collate/Collate/Locale/te.pl +++ b/cpan/Unicode-Collate/Collate/Locale/te.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0C01 ; [.2500.0020.0002][.FFF1.0000.0000] # TELUGU SIGN CANDRABINDU 0C02 ; [.2500.0020.0002][.FFF2.0000.0000] # TELUGU SIGN ANUSVARA diff --git a/cpan/Unicode-Collate/Collate/Locale/th.pl b/cpan/Unicode-Collate/Collate/Locale/th.pl index d678747606..1924027a6b 100644 --- a/cpan/Unicode-Collate/Collate/Locale/th.pl +++ b/cpan/Unicode-Collate/Collate/Locale/th.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, variable => 'shifted', alternate => 'shifted', entry => <<'ENTRY', # for DUCET v7.0.0 diff --git a/cpan/Unicode-Collate/Collate/Locale/tn.pl b/cpan/Unicode-Collate/Collate/Locale/tn.pl index 89d9056bf5..0a43662ca5 100644 --- a/cpan/Unicode-Collate/Collate/Locale/tn.pl +++ b/cpan/Unicode-Collate/Collate/Locale/tn.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00EA ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH CIRCUMFLEX 0065 0302 ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH CIRCUMFLEX diff --git a/cpan/Unicode-Collate/Collate/Locale/to.pl b/cpan/Unicode-Collate/Collate/Locale/to.pl index 472fca1646..0125da2dd0 100644 --- a/cpan/Unicode-Collate/Collate/Locale/to.pl +++ b/cpan/Unicode-Collate/Collate/Locale/to.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 006E 0067 ; [.1A7E.0020.0002] # <LATIN SMALL LETTER N, LATIN SMALL LETTER G> 004E 0067 ; [.1A7E.0020.0007] # <LATIN CAPITAL LETTER N, LATIN SMALL LETTER G> diff --git a/cpan/Unicode-Collate/Collate/Locale/tr.pl b/cpan/Unicode-Collate/Collate/Locale/tr.pl index 6288f2bbfb..beaba4f703 100644 --- a/cpan/Unicode-Collate/Collate/Locale/tr.pl +++ b/cpan/Unicode-Collate/Collate/Locale/tr.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 00E7 ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA 0063 0327 ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA diff --git a/cpan/Unicode-Collate/Collate/Locale/uk.pl b/cpan/Unicode-Collate/Collate/Locale/uk.pl index 0585112fc1..73c1090b5f 100644 --- a/cpan/Unicode-Collate/Collate/Locale/uk.pl +++ b/cpan/Unicode-Collate/Collate/Locale/uk.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435, 0x0416, 0x0436, 0x0417, 0x0437, 0x041E, 0x043E, 0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443, 0x0427, 0x0447, 0x042B, 0x044B, diff --git a/cpan/Unicode-Collate/Collate/Locale/ur.pl b/cpan/Unicode-Collate/Collate/Locale/ur.pl index 767d14c000..53de5d425d 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ur.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ur.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0623 ; [.2015.0021.0002] # ARABIC LETTER ALEF WITH HAMZA ABOVE 0627 0654 ; [.2015.0021.0002] # ARABIC LETTER ALEF WITH HAMZA ABOVE diff --git a/cpan/Unicode-Collate/Collate/Locale/vi.pl b/cpan/Unicode-Collate/Collate/Locale/vi.pl index bab2e0577f..c03a83956d 100644 --- a/cpan/Unicode-Collate/Collate/Locale/vi.pl +++ b/cpan/Unicode-Collate/Collate/Locale/vi.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # 0306 is not a Vietnamese tone, just to avoid \x{306} eq. to something. entry => <<'ENTRY', # for DUCET v7.0.0 0309 ; [.0000.0026.0002][.0000.00F0.0000] # COMBINING HOOK ABOVE diff --git a/cpan/Unicode-Collate/Collate/Locale/wae.pl b/cpan/Unicode-Collate/Collate/Locale/wae.pl index a530399740..84815663a4 100644 --- a/cpan/Unicode-Collate/Collate/Locale/wae.pl +++ b/cpan/Unicode-Collate/Collate/Locale/wae.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0061 0061 ; [.190C.0020.0002][.0000.0024.0002] # <LATIN SMALL LETTER A, LATIN SMALL LETTER A> 00E4 00E4 ; [.190C.0020.0002][.0000.002D.0002] # <LATIN SMALL LETTER A WITH DIAERESIS, LATIN SMALL LETTER A WITH DIAERESIS> diff --git a/cpan/Unicode-Collate/Collate/Locale/wo.pl b/cpan/Unicode-Collate/Collate/Locale/wo.pl index 74c7858f95..3d78de32a3 100644 --- a/cpan/Unicode-Collate/Collate/Locale/wo.pl +++ b/cpan/Unicode-Collate/Collate/Locale/wo.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, # eng doesn't require tailoring entry => <<'ENTRY', # for DUCET v7.0.0 00E0 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH GRAVE diff --git a/cpan/Unicode-Collate/Collate/Locale/yo.pl b/cpan/Unicode-Collate/Collate/Locale/yo.pl index 4afdc41953..5cffcd1222 100644 --- a/cpan/Unicode-Collate/Collate/Locale/yo.pl +++ b/cpan/Unicode-Collate/Collate/Locale/yo.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 1EB9 ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH DOT BELOW 0065 0323 ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH DOT BELOW diff --git a/cpan/Unicode-Collate/Collate/Locale/zh.pl b/cpan/Unicode-Collate/Collate/Locale/zh.pl index e8a2b4469b..ec4296ffb6 100644 --- a/cpan/Unicode-Collate/Collate/Locale/zh.pl +++ b/cpan/Unicode-Collate/Collate/Locale/zh.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.11, + locale_version => 1.12, entry => <<'ENTRY', # for DUCET v7.0.0 0101 ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON 0061 0304 ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON diff --git a/cpan/Unicode-Collate/Collate/Locale/zh_big5.pl b/cpan/Unicode-Collate/Collate/Locale/zh_big5.pl index ff35bb198a..d8929ef259 100644 --- a/cpan/Unicode-Collate/Collate/Locale/zh_big5.pl +++ b/cpan/Unicode-Collate/Collate/Locale/zh_big5.pl @@ -1,6 +1,6 @@ use Unicode::Collate::CJK::Big5; +{ - locale_version => 1.11, + locale_version => 1.12, overrideCJK => \&Unicode::Collate::CJK::Big5::weightBig5, entry => <<'ENTRY', # for DUCET v7.0.0 0101 ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON diff --git a/cpan/Unicode-Collate/Collate/Locale/zh_gb.pl b/cpan/Unicode-Collate/Collate/Locale/zh_gb.pl index 5bcaf2dff6..ad117218d7 100644 --- a/cpan/Unicode-Collate/Collate/Locale/zh_gb.pl +++ b/cpan/Unicode-Collate/Collate/Locale/zh_gb.pl @@ -1,6 +1,6 @@ use Unicode::Collate::CJK::GB2312; +{ - locale_version => 1.11, + locale_version => 1.12, overrideCJK => \&Unicode::Collate::CJK::GB2312::weightGB2312, entry => <<'ENTRY', # for DUCET v7.0.0 0101 ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON diff --git a/cpan/Unicode-Collate/Collate/Locale/zh_pin.pl b/cpan/Unicode-Collate/Collate/Locale/zh_pin.pl index c4e88a9b8d..37a7b315f2 100644 --- a/cpan/Unicode-Collate/Collate/Locale/zh_pin.pl +++ b/cpan/Unicode-Collate/Collate/Locale/zh_pin.pl @@ -1,6 +1,6 @@ use Unicode::Collate::CJK::Pinyin; +{ - locale_version => 1.11, + locale_version => 1.12, overrideCJK => \&Unicode::Collate::CJK::Pinyin::weightPinyin, entry => <<'ENTRY', # for DUCET v7.0.0 0101 ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON diff --git a/cpan/Unicode-Collate/Collate/Locale/zh_strk.pl b/cpan/Unicode-Collate/Collate/Locale/zh_strk.pl index bc6fd192c5..dc88d0468c 100644 --- a/cpan/Unicode-Collate/Collate/Locale/zh_strk.pl +++ b/cpan/Unicode-Collate/Collate/Locale/zh_strk.pl @@ -1,6 +1,6 @@ use Unicode::Collate::CJK::Stroke; +{ - locale_version => 1.11, + locale_version => 1.12, overrideCJK => \&Unicode::Collate::CJK::Stroke::weightStroke, entry => <<'ENTRY', # for DUCET v7.0.0 0101 ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON diff --git a/cpan/Unicode-Collate/Collate/Locale/zh_zhu.pl b/cpan/Unicode-Collate/Collate/Locale/zh_zhu.pl index 906fee1946..1463055e34 100644 --- a/cpan/Unicode-Collate/Collate/Locale/zh_zhu.pl +++ b/cpan/Unicode-Collate/Collate/Locale/zh_zhu.pl @@ -1,6 +1,6 @@ use Unicode::Collate::CJK::Zhuyin; +{ - locale_version => 1.11, + locale_version => 1.12, overrideCJK => \&Unicode::Collate::CJK::Zhuyin::weightZhuyin, entry => <<'ENTRY', # for DUCET v7.0.0 02C9 ; [.0000.0199.0002] # MODIFIER LETTER MACRON diff --git a/cpan/Unicode-Collate/t/ident.t b/cpan/Unicode-Collate/t/ident.t index 0b5ddb397d..874d845e83 100644 --- a/cpan/Unicode-Collate/t/ident.t +++ b/cpan/Unicode-Collate/t/ident.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..45\n"; } +BEGIN { $| = 1; print "1..48\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -107,9 +107,14 @@ ok($Collator->viewSortKey('a'), ok($Collator->viewSortKey("\x{304C}"), '[1926 | 0020 013D | 000E 0002 | FFFF FFFF | 0000 304C]'); +ok($Collator->viewSortKey("\x{4E00}"), + '[FB40 CE00 | 0020 | 0002 | FFFF FFFF | 0000 4E00]'); + ok($Collator->viewSortKey("\x{100000}"), '[FBE0 8000 | 0020 | 0002 | FFFF FFFF | 0010 0000]'); +##### 38 + eval { require Unicode::Normalize }; if (!$@) { $Collator->change(normalization => "NFD"); @@ -122,7 +127,7 @@ if (!$@) { $Collator->change(normalization => undef); -##### 38 +##### 39 $Collator->change(level => 3); @@ -139,7 +144,7 @@ $Collator->change(level => 1); ok($Collator->viewSortKey("\x{304C}"), '[1926 | | | | 0000 304C]'); -##### 41 +##### 42 $Collator->change(UCA_Version => 8); @@ -161,4 +166,10 @@ $Collator->change(level => 4); ok($Collator->viewSortKey("\x{304C}"), '[1926|0020 013D|000E 0002|FFFF FFFF|0000 304C]'); -##### 45 +ok($Collator->viewSortKey("\x{4E00}"), + '[4E00|0020|0002|FFFF|0000 4E00]'); + +ok($Collator->viewSortKey("\x{100000}"), + '[FFA0 8000|0002|0001|FFFF FFFF|0010 0000]'); + +##### 48 diff --git a/cpan/Unicode-Collate/t/loc_es.t b/cpan/Unicode-Collate/t/loc_es.t index e3a081d07d..72d5fce67c 100644 --- a/cpan/Unicode-Collate/t/loc_es.t +++ b/cpan/Unicode-Collate/t/loc_es.t @@ -37,7 +37,7 @@ my $objEs = Unicode::Collate::Locale-> new(locale => 'ES', normalization => undef); ok($objEs->getlocale, 'es'); -ok($objEs->locale_version, 1.11); +ok($objEs->locale_version, 1.12); $objEs->change(level => 1); diff --git a/cpan/Unicode-Collate/t/loc_estr.t b/cpan/Unicode-Collate/t/loc_estr.t index d8a2b0e58a..e4d3588247 100644 --- a/cpan/Unicode-Collate/t/loc_estr.t +++ b/cpan/Unicode-Collate/t/loc_estr.t @@ -37,7 +37,7 @@ my $objEsTrad = Unicode::Collate::Locale-> new(locale => 'ES-trad', normalization => undef); ok($objEsTrad->getlocale, 'es__traditional'); -ok($objEsTrad->locale_version, 1.11); +ok($objEsTrad->locale_version, 1.12); $objEsTrad->change(level => 1); diff --git a/cpan/Unicode-Collate/t/loc_fr.t b/cpan/Unicode-Collate/t/loc_fr.t index fa8cdf41e1..779a1bf8d2 100644 --- a/cpan/Unicode-Collate/t/loc_fr.t +++ b/cpan/Unicode-Collate/t/loc_fr.t @@ -40,7 +40,7 @@ my $objFr = Unicode::Collate::Locale-> new(locale => 'FR', normalization => undef); ok($objFr->getlocale, 'fr'); -ok($objFr->locale_version, 1.11); +ok($objFr->locale_version, 1.12); $objFr->change(level => 1); diff --git a/cpan/Unicode-Collate/t/view.t b/cpan/Unicode-Collate/t/view.t index 381d4c5456..91da5968bd 100644 --- a/cpan/Unicode-Collate/t/view.t +++ b/cpan/Unicode-Collate/t/view.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..93\n"; } # 53 + 4 x @Versions +BEGIN { $| = 1; print "1..106\n"; } # 62 + 4 x @Versions my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -39,9 +39,12 @@ my $Collator = Unicode::Collate->new( UCA_Version => 24, ); -ok($Collator->viewSortKey(""), "[| | |]"); +ok($Collator->viewSortKey(""), '[| | |]'); +ok($Collator->viewSortKey("\0"), '[| | |]'); +ok($Collator->viewSortKey("\x{200B}"), '[| | |]'); -ok($Collator->viewSortKey("A"), "[0A15 | 0020 | 0008 | FFFF]"); +ok($Collator->viewSortKey("A"), '[0A15 | 0020 | 0008 | FFFF]'); +ok($Collator->viewSortKey('a'), '[0A15 | 0020 | 0002 | FFFF]'); ok($Collator->viewSortKey("ABC"), "[0A15 0A29 0A3D | 0020 0020 0020 | 0008 0008 0008 | FFFF FFFF FFFF]"); @@ -53,6 +56,15 @@ ok($Collator->viewSortKey("!\x{300}"), "[| | | 024B]"); ok($Collator->viewSortKey("\x{300}"), "[| 0035 | 0002 | FFFF]"); +ok($Collator->viewSortKey("\x{304C}"), + '[1926 | 0020 013D | 000E 0002 | FFFF FFFF]'); + +ok($Collator->viewSortKey("\x{4E00}"), + '[FB40 CE00 | 0020 | 0002 | FFFF FFFF]'); + +ok($Collator->viewSortKey("\x{100000}"), + '[FBE0 8000 | 0020 | 0002 | FFFF FFFF]'); + $Collator->change(level => 3); ok($Collator->viewSortKey("A"), "[0A15 | 0020 | 0008 |]"); @@ -62,7 +74,7 @@ ok($Collator->viewSortKey("A"), "[0A15 | 0020 | |]"); $Collator->change(level => 1); ok($Collator->viewSortKey("A"), "[0A15 | | |]"); -##### 10 +##### 16 $Collator->change(level => 4, UCA_Version => 8); @@ -80,6 +92,15 @@ ok($Collator->viewSortKey("!\x{300}"), "[|0035|0002|024B FFFF]"); ok($Collator->viewSortKey("\x{300}"), "[|0035|0002|FFFF]"); +ok($Collator->viewSortKey("\x{304C}"), + '[1926|0020 013D|000E 0002|FFFF FFFF]'); + +ok($Collator->viewSortKey("\x{4E00}"), + '[4E00|0020|0002|FFFF]'); + +ok($Collator->viewSortKey("\x{100000}"), + '[FFA0 8000|0002|0001|FFFF FFFF]'); + $Collator->change(level => 3); ok($Collator->viewSortKey("A"), "[0A15|0020|0008|]"); @@ -89,7 +110,7 @@ ok($Collator->viewSortKey("A"), "[0A15|0020||]"); $Collator->change(level => 1); ok($Collator->viewSortKey("A"), "[0A15|||]"); -##### 19 +##### 28 $Collator->change(level => 3, UCA_Version => 9); ok($Collator->viewSortKey("A\x{300}z\x{301}"), @@ -115,6 +136,8 @@ $Collator->change(backwards => []); ok($Collator->viewSortKey("A\x{300}z\x{301}"), "[0A15 0C13 | 0020 0035 0020 0032 | 0008 0002 0002 0002 |]"); +##### 34 + $Collator->change(level => 4); # Variable @@ -158,7 +181,7 @@ ok($Collator->viewSortKey("?!."), '[| | | 024E 024B 0255]'); $Collator->change(%origVar); -##### 37 +##### 46 # Level 3 weight @@ -199,7 +222,7 @@ ok($Collator->viewSortKey("a\x{3042}"), ok($Collator->viewSortKey("A\x{30A2}"), '[0A15 1921 | 0020 0020 | 0008 0011 | FFFF FFFF]'); -##### 47 +##### 56 our $el = Unicode::Collate->new( entry => <<'ENTRY', @@ -243,9 +266,9 @@ ok($el->viewSortKey("l\x{FF4C}\x{217C}\x{2113}\x{24DB}"), ok($el->viewSortKey("L\x{FF2C}\x{216C}\x{2112}\x{24C1}"), "[$el12 | 0008 0009 000A 000B 000C | FFFF FFFF FFFF FFFF FFFF]"); -##### 53 +##### 62 -my @Versions = (9, 11, 14, 16, 18, 20, 22, 24, 26, 28); +my @Versions = (9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30); for my $v (@Versions) { $Collator->change(UCA_Version => $v); |