From c02ee425ec16ba1c726d4eba2a70720102f63280 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Sat, 2 Oct 2010 11:18:42 +0100 Subject: Update Unicode-Collate to CPAN version 0.61 [DELTA] 0.61 Sat Oct 2 11:41:29 2010 - U::C::Locale newly supports locales: hr, ig, sq. - precomposites of e-dot-below, o-dot-below, o-tilde are tailored as well. (affected locales: et, yo) - Vietnamese (vi): added contractions for non-blocked decompositions * base + dot-below + diacritical such as "a\x{323}\x{306} etc. * base + tone + horn such as "o\x{300}\x{31B}" etc. --- MANIFEST | 6 ++ Porting/Maintainers.pl | 2 +- cpan/Unicode-Collate/Changes | 8 ++ cpan/Unicode-Collate/Collate.pm | 2 +- cpan/Unicode-Collate/Collate/Locale.pm | 14 ++- cpan/Unicode-Collate/Collate/Locale/ca.pl | 20 ++-- cpan/Unicode-Collate/Collate/Locale/cs.pl | 4 +- cpan/Unicode-Collate/Collate/Locale/da.pl | 18 ++-- cpan/Unicode-Collate/Collate/Locale/et.pl | 8 ++ cpan/Unicode-Collate/Collate/Locale/fo.pl | 8 +- cpan/Unicode-Collate/Collate/Locale/hr.pl | 49 +++++++++ cpan/Unicode-Collate/Collate/Locale/ig.pl | 53 ++++++++++ cpan/Unicode-Collate/Collate/Locale/mt.pl | 8 +- cpan/Unicode-Collate/Collate/Locale/sk.pl | 4 +- cpan/Unicode-Collate/Collate/Locale/sq.pl | 48 +++++++++ cpan/Unicode-Collate/Collate/Locale/vi.pl | 60 ++++++++++- cpan/Unicode-Collate/Collate/Locale/yo.pl | 6 ++ cpan/Unicode-Collate/README | 2 +- cpan/Unicode-Collate/t/loc_de.t | 23 ++++- cpan/Unicode-Collate/t/loc_et.t | 23 +++-- cpan/Unicode-Collate/t/loc_fr.t | 4 +- cpan/Unicode-Collate/t/loc_hr.t | 120 ++++++++++++++++++++++ cpan/Unicode-Collate/t/loc_ig.t | 143 ++++++++++++++++++++++++++ cpan/Unicode-Collate/t/loc_nb.t | 8 +- cpan/Unicode-Collate/t/loc_nn.t | 8 +- cpan/Unicode-Collate/t/loc_sq.t | 160 ++++++++++++++++++++++++++++++ cpan/Unicode-Collate/t/loc_vi.t | 99 +++++++++++++++++- cpan/Unicode-Collate/t/loc_yo.t | 11 +- pod/perldelta.pod | 4 +- 29 files changed, 858 insertions(+), 65 deletions(-) create mode 100644 cpan/Unicode-Collate/Collate/Locale/hr.pl create mode 100644 cpan/Unicode-Collate/Collate/Locale/ig.pl create mode 100644 cpan/Unicode-Collate/Collate/Locale/sq.pl create mode 100644 cpan/Unicode-Collate/t/loc_hr.t create mode 100644 cpan/Unicode-Collate/t/loc_ig.t create mode 100644 cpan/Unicode-Collate/t/loc_sq.t diff --git a/MANIFEST b/MANIFEST index 63d04b2844..dce1738604 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2406,6 +2406,8 @@ cpan/Unicode-Collate/Collate/Locale/fo.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/fr.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/ha.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/haw.pl Unicode::Collate +cpan/Unicode-Collate/Collate/Locale/hr.pl Unicode::Collate +cpan/Unicode-Collate/Collate/Locale/ig.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/is.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/kl.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/lt.pl Unicode::Collate @@ -2419,6 +2421,7 @@ cpan/Unicode-Collate/Collate/Locale.pm Unicode::Collate cpan/Unicode-Collate/Collate/Locale/ro.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/sk.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/sl.pl Unicode::Collate +cpan/Unicode-Collate/Collate/Locale/sq.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/sv.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/sw.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/tn.pl Unicode::Collate @@ -2456,6 +2459,8 @@ cpan/Unicode-Collate/t/loc_fo.t Unicode::Collate cpan/Unicode-Collate/t/loc_fr.t Unicode::Collate cpan/Unicode-Collate/t/loc_ha.t Unicode::Collate cpan/Unicode-Collate/t/loc_haw.t Unicode::Collate +cpan/Unicode-Collate/t/loc_hr.t Unicode::Collate +cpan/Unicode-Collate/t/loc_ig.t Unicode::Collate cpan/Unicode-Collate/t/loc_is.t Unicode::Collate cpan/Unicode-Collate/t/loc_kl.t Unicode::Collate cpan/Unicode-Collate/t/loc_lt.t Unicode::Collate @@ -2469,6 +2474,7 @@ cpan/Unicode-Collate/t/loc_pl.t Unicode::Collate cpan/Unicode-Collate/t/loc_ro.t Unicode::Collate cpan/Unicode-Collate/t/loc_sk.t Unicode::Collate cpan/Unicode-Collate/t/loc_sl.t Unicode::Collate +cpan/Unicode-Collate/t/loc_sq.t Unicode::Collate cpan/Unicode-Collate/t/loc_sv.t Unicode::Collate cpan/Unicode-Collate/t/loc_sw.t Unicode::Collate cpan/Unicode-Collate/t/loc_test.t Unicode::Collate diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 416dda7955..e8243c4a24 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1506,7 +1506,7 @@ use File::Glob qw(:case); 'Unicode::Collate' => { 'MAINTAINER' => 'sadahiro', - 'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-0.60-withoutworldwriteables.tar.gz', + 'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-0.61-withoutworldwriteables.tar.gz', 'FILES' => q[cpan/Unicode-Collate], # ignore experimental XS version 'EXCLUDED' => [ qr{X$}, diff --git a/cpan/Unicode-Collate/Changes b/cpan/Unicode-Collate/Changes index cc7e75fd99..6498e24901 100644 --- a/cpan/Unicode-Collate/Changes +++ b/cpan/Unicode-Collate/Changes @@ -1,5 +1,13 @@ Revision history for Perl module Unicode::Collate. +0.61 Sat Oct 2 11:41:29 2010 + - U::C::Locale newly supports locales: hr, ig, sq. + - precomposites of e-dot-below, o-dot-below, o-tilde are tailored as well. + (affected locales: et, yo) + - Vietnamese (vi): added contractions for non-blocked decompositions + * base + dot-below + diacritical such as "a\x{323}\x{306} etc. + * base + tone + horn such as "o\x{300}\x{31B}" etc. + 0.60 Thu Sep 23 21:37:36 2010 - bug fix: index() [and its friends including gmatch()] didn't remove ignorable characters in the substring correctly. diff --git a/cpan/Unicode-Collate/Collate.pm b/cpan/Unicode-Collate/Collate.pm index bdc00ddeab..2f0b3a7ae9 100644 --- a/cpan/Unicode-Collate/Collate.pm +++ b/cpan/Unicode-Collate/Collate.pm @@ -14,7 +14,7 @@ use File::Spec; no warnings 'utf8'; -our $VERSION = '0.60'; +our $VERSION = '0.61'; our $PACKAGE = __PACKAGE__; my @Path = qw(Unicode Collate); diff --git a/cpan/Unicode-Collate/Collate/Locale.pm b/cpan/Unicode-Collate/Collate/Locale.pm index 0715ca929c..cff7bc2778 100644 --- a/cpan/Unicode-Collate/Collate/Locale.pm +++ b/cpan/Unicode-Collate/Collate/Locale.pm @@ -4,7 +4,7 @@ use strict; use Carp; use base qw(Unicode::Collate); -our $VERSION = '0.60'; +our $VERSION = '0.61'; use File::Spec; @@ -13,8 +13,8 @@ my $KeyPath = File::Spec->catfile('allkeys.txt'); my $PL_EXT = '.pl'; my %LocaleFile = map { ($_, $_) } qw( - af az ca cs cy da eo es et fi fil fo fr ha haw - is kl lt lv mt nn nso om pl ro sk sl sv sw tn tr vi wo yo + af az ca cs cy da eo es et fi fil fo fr ha haw hr ig is kl + lt lv mt nn nso om pl ro sk sl sq sv sw tn tr vi wo yo ); $LocaleFile{'default'} = ''; $LocaleFile{'de__phonebook'} = 'de_phone'; @@ -172,6 +172,8 @@ this method returns a string C<'default'> meaning no special tailoring. fr French ha Hausa haw Hawaiian + hr Croatian + ig Igbo is Icelandic kl Kalaallisut lt Lithuanian @@ -185,6 +187,7 @@ this method returns a string C<'default'> meaning no special tailoring. ro Romanian sk Slovak sl Slovenian + sq Albanian sv Swedish sw Swahili tn Tswana @@ -209,8 +212,9 @@ Tests for Unicode::Collate::Locale are named F. If a certain letter is tailored, its equivalents are not always tailored as well as it. For example, even though W is tailored, fullwidth W (C), W with acute (C), etc. are not -tailored. Thus the result may depend on whether source strings -are normalized or not. +tailored. The result may depend on whether source strings are +normalized or not, and whether decomposed or composed. +Thus C<(normalization =E undef> is less preferred. =back diff --git a/cpan/Unicode-Collate/Collate/Locale/ca.pl b/cpan/Unicode-Collate/Collate/Locale/ca.pl index 692ec50ea6..44459b03b8 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ca.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ca.pl @@ -2,16 +2,16 @@ backwards => 2, entry => <<'ENTRY', # for DUCET v5.2.0 0063 0068 ; [.123E.0020.0002.0063] # -0063 0048 ; [.123E.0020.0007.0063][.0.0.2.0] # -0043 0068 ; [.123E.0020.0007.0043][.0.0.8.0] # +0063 0048 ; [.123E.0020.0007.0063][.0000.0000.0002.0000] # +0043 0068 ; [.123E.0020.0007.0043][.0000.0000.0008.0000] # 0043 0048 ; [.123E.0020.0008.0043] # -006C 006C ; [.1331.0020.0002.006C][.0.0.1.0] # -006C 00B7 006C ; [.1331.0020.0002.006C][.0.0.7.0] # -006C 004C ; [.1331.0020.0007.006C][.0.0.2.0][.0.0.1.0] # -006C 00B7 004C ; [.1331.0020.0007.006C][.0.0.2.0][.0.0.7.0] # -004C 006C ; [.1331.0020.0007.004C][.0.0.8.0][.0.0.1.0] # -004C 00B7 006C ; [.1331.0020.0007.004C][.0.0.8.0][.0.0.7.0] # -004C 004C ; [.1331.0020.0008.004C][.0.0.1.0] # -004C 00B7 004C ; [.1331.0020.0008.004C][.0.0.7.0] # +006C 006C ; [.1331.0020.0002.006C][.0000.0000.0001.0000] # +006C 00B7 006C ; [.1331.0020.0002.006C][.0000.0000.0007.0000] # +006C 004C ; [.1331.0020.0007.006C][.0000.0000.0002.0000][.0000.0000.0001.0000] # +006C 00B7 004C ; [.1331.0020.0007.006C][.0000.0000.0002.0000][.0000.0000.0007.0000] # +004C 006C ; [.1331.0020.0007.004C][.0000.0000.0008.0000][.0000.0000.0001.0000] # +004C 00B7 006C ; [.1331.0020.0007.004C][.0000.0000.0008.0000][.0000.0000.0007.0000] # +004C 004C ; [.1331.0020.0008.004C][.0000.0000.0001.0000] # +004C 00B7 004C ; [.1331.0020.0008.004C][.0000.0000.0007.0000] # ENTRY }; diff --git a/cpan/Unicode-Collate/Collate/Locale/cs.pl b/cpan/Unicode-Collate/Collate/Locale/cs.pl index ce1a6b7523..4c76aa0bf0 100644 --- a/cpan/Unicode-Collate/Collate/Locale/cs.pl +++ b/cpan/Unicode-Collate/Collate/Locale/cs.pl @@ -5,8 +5,8 @@ 010C ; [.123E.0020.0008.010C] # LATIN CAPITAL LETTER C WITH CARON 0043 030C ; [.123E.0020.0008.010C] # LATIN CAPITAL LETTER C WITH CARON 0063 0068 ; [.12D4.0020.0002.0063] # -0063 0048 ; [.12D4.0020.0007.0063][.0.0.2.0] # -0043 0068 ; [.12D4.0020.0007.0043][.0.0.8.0] # +0063 0048 ; [.12D4.0020.0007.0063][.0000.0000.0002.0000] # +0043 0068 ; [.12D4.0020.0007.0043][.0000.0000.0008.0000] # 0043 0048 ; [.12D4.0020.0008.0043] # 0159 ; [.13DB.0020.0002.0159] # LATIN SMALL LETTER R WITH CARON 0072 030C ; [.13DB.0020.0002.0159] # LATIN SMALL LETTER R WITH CARON diff --git a/cpan/Unicode-Collate/Collate/Locale/da.pl b/cpan/Unicode-Collate/Collate/Locale/da.pl index 6b707f17d6..41a2a1baa3 100644 --- a/cpan/Unicode-Collate/Collate/Locale/da.pl +++ b/cpan/Unicode-Collate/Collate/Locale/da.pl @@ -60,16 +60,16 @@ 004F 030B ; [.14AF.0022.0008.0150] # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE 0153 ; [.14AF.0023.0002.0153] # LATIN SMALL LIGATURE OE 0152 ; [.14AF.0023.0008.0152] # LATIN CAPITAL LIGATURE OE -00E5 ; [.14B0.0020.0002.00E5][.0.0.1.0] # LATIN SMALL LETTER A WITH RING ABOVE -0061 030A ; [.14B0.0020.0002.00E5][.0.0.1.0] # LATIN SMALL LETTER A WITH RING ABOVE -00C5 ; [.14B0.0020.0008.00C5][.0.0.1.0] # LATIN CAPITAL LETTER A WITH RING ABOVE -0041 030A ; [.14B0.0020.0008.00C5][.0.0.1.0] # LATIN CAPITAL LETTER A WITH RING ABOVE -212B ; [.14B0.0020.0008.00C5][.0.0.1.0] # ANGSTROM SIGN +00E5 ; [.14B0.0020.0002.00E5][.0000.0000.0001.0000] # LATIN SMALL LETTER A WITH RING ABOVE +0061 030A ; [.14B0.0020.0002.00E5][.0000.0000.0001.0000] # LATIN SMALL LETTER A WITH RING ABOVE +00C5 ; [.14B0.0020.0008.00C5][.0000.0000.0001.0000] # LATIN CAPITAL LETTER A WITH RING ABOVE +0041 030A ; [.14B0.0020.0008.00C5][.0000.0000.0001.0000] # LATIN CAPITAL LETTER A WITH RING ABOVE +212B ; [.14B0.0020.0008.00C5][.0000.0000.0001.0000] # ANGSTROM SIGN 01FB ; [.14B0.0020.0002.00E5][.0000.0000.0001.0000][.0000.0032.0002.0301] # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE 01FA ; [.14B0.0020.0008.00C5][.0000.0000.0001.0000][.0000.0032.0002.0301] # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE -0061 0061 ; [.14B0.0020.0002.0061][.0.0.7.0] # -0041 0061 ; [.14B0.0020.0007.0041][.0.0.2.0] # -0061 0041 ; [.14B0.0020.0007.0061][.0.0.8.0] # -0041 0041 ; [.14B0.0020.0008.0041][.0.0.7.0] # +0061 0061 ; [.14B0.0020.0002.0061][.0000.0000.0007.0000] # +0041 0061 ; [.14B0.0020.0007.0041][.0000.0000.0002.0000] # +0061 0041 ; [.14B0.0020.0007.0061][.0000.0000.0008.0000] # +0041 0041 ; [.14B0.0020.0008.0041][.0000.0000.0007.0000] # ENTRY }; diff --git a/cpan/Unicode-Collate/Collate/Locale/et.pl b/cpan/Unicode-Collate/Collate/Locale/et.pl index 0ee593f8da..be5a43b340 100644 --- a/cpan/Unicode-Collate/Collate/Locale/et.pl +++ b/cpan/Unicode-Collate/Collate/Locale/et.pl @@ -16,6 +16,14 @@ 006F 0303 ; [.1493.0020.0002.00F5] # LATIN SMALL LETTER O WITH TILDE 00D5 ; [.1493.0020.0008.00D5] # LATIN CAPITAL LETTER O WITH TILDE 004F 0303 ; [.1493.0020.0008.00D5] # LATIN CAPITAL LETTER O WITH TILDE +1E4D ; [.1493.0020.0002.00F5][.0000.0032.0002.0301] # LATIN SMALL LETTER O WITH TILDE AND ACUTE +1E4C ; [.1493.0020.0008.00D5][.0000.0032.0002.0301] # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE +022D ; [.1493.0020.0002.00F5][.0000.005B.0002.0304] # LATIN SMALL LETTER O WITH TILDE AND MACRON +022C ; [.1493.0020.0008.00D5][.0000.005B.0002.0304] # LATIN CAPITAL LETTER O WITH TILDE AND MACRON +1E4F ; [.1493.0020.0002.00F5][.0000.0047.0002.0308] # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS +1E4E ; [.1493.0020.0008.00D5][.0000.0047.0002.0308] # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS +1EE1 ; [.1493.0020.0002.00F5][.0000.0068.0002.031B] # LATIN SMALL LETTER O WITH HORN AND TILDE +1EE0 ; [.1493.0020.0008.00D5][.0000.0068.0002.031B] # LATIN CAPITAL LETTER O WITH HORN AND TILDE 00E4 ; [.1494.0020.0002.00E4] # LATIN SMALL LETTER A WITH DIAERESIS 0061 0308 ; [.1494.0020.0002.00E4] # LATIN SMALL LETTER A WITH DIAERESIS 00C4 ; [.1494.0020.0008.00C4] # LATIN CAPITAL LETTER A WITH DIAERESIS diff --git a/cpan/Unicode-Collate/Collate/Locale/fo.pl b/cpan/Unicode-Collate/Collate/Locale/fo.pl index b759203614..629424079c 100644 --- a/cpan/Unicode-Collate/Collate/Locale/fo.pl +++ b/cpan/Unicode-Collate/Collate/Locale/fo.pl @@ -66,9 +66,9 @@ 212B ; [.14B0.0020.0008.00C5] # ANGSTROM SIGN 01FB ; [.14B0.0020.0002.00E5][.0000.0032.0002.0301] # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE 01FA ; [.14B0.0020.0008.00C5][.0000.0032.0002.0301] # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE -0061 0061 ; [.14B0.0020.001C.0061][.0.0.2.0] # -0061 0041 ; [.14B0.0020.001C.0061][.0.0.8.0] # -0041 0061 ; [.14B0.0020.001D.0041][.0.0.2.0] # -0041 0041 ; [.14B0.0020.001D.0041][.0.0.8.0] # +0061 0061 ; [.14B0.0020.001C.0061][.0000.0000.0002.0000] # +0061 0041 ; [.14B0.0020.001C.0061][.0000.0000.0008.0000] # +0041 0061 ; [.14B0.0020.001D.0041][.0000.0000.0002.0000] # +0041 0041 ; [.14B0.0020.001D.0041][.0000.0000.0008.0000] # ENTRY }; diff --git a/cpan/Unicode-Collate/Collate/Locale/hr.pl b/cpan/Unicode-Collate/Collate/Locale/hr.pl new file mode 100644 index 0000000000..83ed61631a --- /dev/null +++ b/cpan/Unicode-Collate/Collate/Locale/hr.pl @@ -0,0 +1,49 @@ ++{ + entry => <<'ENTRY', # for DUCET v5.2.0 +010D ; [.123E.0020.0002.010D] # LATIN SMALL LETTER C WITH CARON +0063 030C ; [.123E.0020.0002.010D] # LATIN SMALL LETTER C WITH CARON +010C ; [.123E.0020.0008.010C] # LATIN CAPITAL LETTER C WITH CARON +0043 030C ; [.123E.0020.0008.010C] # LATIN CAPITAL LETTER C WITH CARON +0107 ; [.123F.0020.0002.0107] # LATIN SMALL LETTER C WITH ACUTE +0063 0301 ; [.123F.0020.0002.0107] # LATIN SMALL LETTER C WITH ACUTE +0106 ; [.123F.0020.0008.0106] # LATIN CAPITAL LETTER C WITH ACUTE +0043 0301 ; [.123F.0020.0008.0106] # LATIN CAPITAL LETTER C WITH ACUTE +01C6 ; [.1251.0020.0002.01C6] # LATIN SMALL LETTER DZ WITH CARON +0064 017D ; [.1251.0020.0007.0064][.0000.0000.0002.0000] # +01C5 ; [.1251.0020.0007.01C5][.0000.0000.0008.0000] # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON +01C4 ; [.1251.0020.0008.01C4] # LATIN CAPITAL LETTER DZ WITH CARON +0064 017E ; [.1251.0020.0002.01C6] # +0044 017E ; [.1251.0020.0007.01C5][.0000.0000.0008.0000] # +0044 017D ; [.1251.0020.0008.01C4] # +0064 007A 030C ; [.1251.0020.0002.01C6] # +0064 005A 030C ; [.1251.0020.0007.0064][.0000.0000.0002.0000] # +0044 007A 030C ; [.1251.0020.0007.01C5][.0000.0000.0008.0000] # +0044 005A 030C ; [.1251.0020.0008.01C4] # +0111 ; [.1252.0020.0002.0111] # LATIN SMALL LETTER D WITH STROKE +0064 0335 ; [.1252.0020.0002.0111] # LATIN SMALL LETTER D WITH STROKE +0110 ; [.1252.0020.0008.0110] # LATIN CAPITAL LETTER D WITH STROKE +0044 0335 ; [.1252.0020.0008.0110] # LATIN CAPITAL LETTER D WITH STROKE +01C9 ; [.1331.0020.0002.01C9] # LATIN SMALL LETTER LJ +006C 006A ; [.1331.0020.0002.01C9] # +006C 004A ; [.1331.0020.0007.006C][.0000.0000.0002.0000] # +01C8 ; [.1331.0020.0007.01C8][.0000.0000.0008.0000] # LATIN CAPITAL LETTER L WITH SMALL LETTER J +004C 006A ; [.1331.0020.0007.01C8][.0000.0000.0008.0000] # +01C7 ; [.1331.0020.0008.01C7] # LATIN CAPITAL LETTER LJ +004C 004A ; [.1331.0020.0008.01C7] # +01CC ; [.136E.0020.0002.01CC] # LATIN SMALL LETTER NJ +006E 006A ; [.136E.0020.0002.01CC] # +006E 004A ; [.136E.0020.0007.006E][.0000.0000.0002.0000] # +01CB ; [.136E.0020.0007.01CB][.0000.0000.0008.0000] # LATIN CAPITAL LETTER N WITH SMALL LETTER J +004E 006A ; [.136E.0020.0007.01CB][.0000.0000.0008.0000] # +01CA ; [.136E.0020.0008.01CA] # LATIN CAPITAL LETTER NJ +004E 004A ; [.136E.0020.0008.01CA] # +0161 ; [.1411.0020.0002.0161] # LATIN SMALL LETTER S WITH CARON +0073 030C ; [.1411.0020.0002.0161] # LATIN SMALL LETTER S WITH CARON +0160 ; [.1411.0020.0008.0160] # LATIN CAPITAL LETTER S WITH CARON +0053 030C ; [.1411.0020.0008.0160] # LATIN CAPITAL LETTER S WITH CARON +017E ; [.14AE.0020.0002.017E] # LATIN SMALL LETTER Z WITH CARON +007A 030C ; [.14AE.0020.0002.017E] # LATIN SMALL LETTER Z WITH CARON +017D ; [.14AE.0020.0008.017D] # LATIN CAPITAL LETTER Z WITH CARON +005A 030C ; [.14AE.0020.0008.017D] # LATIN CAPITAL LETTER Z WITH CARON +ENTRY +}; diff --git a/cpan/Unicode-Collate/Collate/Locale/ig.pl b/cpan/Unicode-Collate/Collate/Locale/ig.pl new file mode 100644 index 0000000000..bc871634a7 --- /dev/null +++ b/cpan/Unicode-Collate/Collate/Locale/ig.pl @@ -0,0 +1,53 @@ ++{ + entry => <<'ENTRY', # for DUCET v5.2.0 +0063 0068 ; [.1226.0020.0002.0063] # +0043 0068 ; [.1226.0020.0007.0043] # +0043 0048 ; [.1226.0020.0008.0043] # +0067 0062 ; [.12B1.0020.0002.0067] # +0047 0062 ; [.12B1.0020.0007.0047] # +0047 0042 ; [.12B1.0020.0008.0047] # +0067 0068 ; [.12B2.0020.0002.0067] # +0047 0068 ; [.12B2.0020.0007.0047] # +0047 0048 ; [.12B2.0020.0008.0047] # +0067 0077 ; [.12B3.0020.0002.0067] # +0047 0077 ; [.12B3.0020.0007.0047] # +0047 0057 ; [.12B3.0020.0008.0047] # +1ECB ; [.12ED.0020.0002.1ECB] # LATIN SMALL LETTER I WITH DOT BELOW +0069 0323 ; [.12ED.0020.0002.1ECB] # LATIN SMALL LETTER I WITH DOT BELOW +1ECA ; [.12ED.0020.0008.1ECA] # LATIN CAPITAL LETTER I WITH DOT BELOW +0049 0323 ; [.12ED.0020.0008.1ECA] # LATIN CAPITAL LETTER I WITH DOT BELOW +006B 0070 ; [.131F.0020.0002.006B] # +004B 0070 ; [.131F.0020.0007.004B] # +004B 0050 ; [.131F.0020.0008.004B] # +006B 0077 ; [.1320.0020.0002.006B] # +004B 0077 ; [.1320.0020.0007.004B] # +004B 0057 ; [.1320.0020.0008.004B] # +1E45 ; [.136E.0020.0002.1E45] # LATIN SMALL LETTER N WITH DOT ABOVE +006E 0307 ; [.136E.0020.0002.1E45] # LATIN SMALL LETTER N WITH DOT ABOVE +1E44 ; [.136E.0020.0008.1E44] # LATIN CAPITAL LETTER N WITH DOT ABOVE +004E 0307 ; [.136E.0020.0008.1E44] # LATIN CAPITAL LETTER N WITH DOT ABOVE +006E 0077 ; [.136F.0020.0002.006E] # +004E 0077 ; [.136F.0020.0007.004E] # +004E 0057 ; [.136F.0020.0008.004E] # +006E 0079 ; [.1370.0020.0002.006E] # +004E 0079 ; [.1370.0020.0007.004E] # +004E 0059 ; [.1370.0020.0008.004E] # +1ECD ; [.138F.0020.0002.1ECD] # LATIN SMALL LETTER O WITH DOT BELOW +006F 0323 ; [.138F.0020.0002.1ECD] # LATIN SMALL LETTER O WITH DOT BELOW +1ECC ; [.138F.0020.0008.1ECC] # LATIN CAPITAL LETTER O WITH DOT BELOW +004F 0323 ; [.138F.0020.0008.1ECC] # LATIN CAPITAL LETTER O WITH DOT BELOW +1ED9 ; [.138F.0020.0002.1ECD][.0000.003C.0002.0302] # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW +1ED8 ; [.138F.0020.0008.1ECC][.0000.003C.0002.0302] # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW +1EE3 ; [.138F.0020.0002.1ECD][.0000.0068.0002.031B] # LATIN SMALL LETTER O WITH HORN AND DOT BELOW +1EE2 ; [.138F.0020.0008.1ECC][.0000.0068.0002.031B] # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW +0073 0068 ; [.1411.0020.0002.0073] # +0053 0068 ; [.1411.0020.0007.0053] # +0053 0048 ; [.1411.0020.0008.0053] # +1EE5 ; [.1454.0020.0002.1EE5] # LATIN SMALL LETTER U WITH DOT BELOW +0075 0323 ; [.1454.0020.0002.1EE5] # LATIN SMALL LETTER U WITH DOT BELOW +1EE4 ; [.1454.0020.0008.1EE4] # LATIN CAPITAL LETTER U WITH DOT BELOW +0055 0323 ; [.1454.0020.0008.1EE4] # LATIN CAPITAL LETTER U WITH DOT BELOW +1EF1 ; [.1454.0020.0002.1EE5][.0000.0068.0002.031B] # LATIN SMALL LETTER U WITH HORN AND DOT BELOW +1EF0 ; [.1454.0020.0008.1EE4][.0000.0068.0002.031B] # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW +ENTRY +}; diff --git a/cpan/Unicode-Collate/Collate/Locale/mt.pl b/cpan/Unicode-Collate/Collate/Locale/mt.pl index 08aa5aebf4..ad67cc00f3 100644 --- a/cpan/Unicode-Collate/Collate/Locale/mt.pl +++ b/cpan/Unicode-Collate/Collate/Locale/mt.pl @@ -10,12 +10,12 @@ 0120 ; [.12AF.0020.0008.0120] # LATIN CAPITAL LETTER G WITH DOT ABOVE 0047 0307 ; [.12AF.0020.0008.0120] # LATIN CAPITAL LETTER G WITH DOT ABOVE 0067 0127 ; [.12D2.0020.0002.0067] # -0067 0126 ; [.12D2.0020.0007.0067][0.0.2.0] # -0047 0127 ; [.12D2.0020.0007.0047][0.0.8.0] # +0067 0126 ; [.12D2.0020.0007.0067][.0000.0000.0002.0000] # +0047 0127 ; [.12D2.0020.0007.0047][.0000.0000.0008.0000] # 0047 0126 ; [.12D2.0020.0008.0047] # 0067 0068 0335 ; [.12D2.0020.0002.0067] # -0067 0048 0335 ; [.12D2.0020.0007.0067][0.0.2.0] # -0047 0068 0335 ; [.12D2.0020.0007.0047][0.0.8.0] # +0067 0048 0335 ; [.12D2.0020.0007.0067][.0000.0000.0002.0000] # +0047 0068 0335 ; [.12D2.0020.0007.0047][.0000.0000.0008.0000] # 0047 0048 0335 ; [.12D2.0020.0008.0047] # 0127 ; [.12EB.0020.0002.0127] # LATIN SMALL LETTER H WITH STROKE 0068 0335 ; [.12EB.0020.0002.0127] # LATIN SMALL LETTER H WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/sk.pl b/cpan/Unicode-Collate/Collate/Locale/sk.pl index fe100ce841..20ec6f8a24 100644 --- a/cpan/Unicode-Collate/Collate/Locale/sk.pl +++ b/cpan/Unicode-Collate/Collate/Locale/sk.pl @@ -11,8 +11,8 @@ 010C ; [.123E.0020.0008.010C] # LATIN CAPITAL LETTER C WITH CARON 0043 030C ; [.123E.0020.0008.010C] # LATIN CAPITAL LETTER C WITH CARON 0063 0068 ; [.12D4.0020.0002.0063] # -0063 0048 ; [.12D4.0020.0007.0063][.0.0.2.0] # -0043 0068 ; [.12D4.0020.0007.0043][.0.0.8.0] # +0063 0048 ; [.12D4.0020.0007.0063][.0000.0000.0002.0000] # +0043 0068 ; [.12D4.0020.0007.0043][.0000.0000.0008.0000] # 0043 0048 ; [.12D4.0020.0008.0043] # 00F4 ; [.138F.0020.0002.00F4] # LATIN SMALL LETTER O WITH CIRCUMFLEX 006F 0302 ; [.138F.0020.0002.00F4] # LATIN SMALL LETTER O WITH CIRCUMFLEX diff --git a/cpan/Unicode-Collate/Collate/Locale/sq.pl b/cpan/Unicode-Collate/Collate/Locale/sq.pl new file mode 100644 index 0000000000..b579fe6ee4 --- /dev/null +++ b/cpan/Unicode-Collate/Collate/Locale/sq.pl @@ -0,0 +1,48 @@ ++{ + entry => <<'ENTRY', # for DUCET v5.2.0 +00E7 ; [.124F.0020.0002.00E7] # LATIN SMALL LETTER C WITH CEDILLA +0063 0327 ; [.124F.0020.0002.00E7] # LATIN SMALL LETTER C WITH CEDILLA +00C7 ; [.124F.0020.0008.00C7] # LATIN CAPITAL LETTER C WITH CEDILLA +0043 0327 ; [.124F.0020.0008.00C7] # LATIN CAPITAL LETTER C WITH CEDILLA +0064 0068 ; [.126A.0020.0002.0064] # +0064 0048 ; [.126A.0020.0007.0064][.0000.0000.0002.0000] # +0044 0068 ; [.126A.0020.0007.0044][.0000.0000.0008.0000] # +0044 0048 ; [.126A.0020.0008.0044] # +00EB ; [.12A2.0020.0002.00EB] # LATIN SMALL LETTER E WITH DIAERESIS +0065 0308 ; [.12A2.0020.0002.00EB] # LATIN SMALL LETTER E WITH DIAERESIS +00CB ; [.12A2.0020.0008.00CB] # LATIN CAPITAL LETTER E WITH DIAERESIS +0045 0308 ; [.12A2.0020.0008.00CB] # LATIN CAPITAL LETTER E WITH DIAERESIS +0067 006A ; [.12D2.0020.0002.0067] # +0067 004A ; [.12D2.0020.0007.0067][.0000.0000.0002.0000] # +0047 006A ; [.12D2.0020.0007.0047][.0000.0000.0008.0000] # +0047 004A ; [.12D2.0020.0008.0047] # +006C 006C ; [.135E.0020.0002.006C] # +006C 004C ; [.135E.0020.0007.006C][.0000.0000.0002.0000] # +004C 006C ; [.135E.0020.0007.004C][.0000.0000.0008.0000] # +004C 004C ; [.135E.0020.0008.004C] # +006E 006A ; [.138D.0020.0002.006E] # +006E 004A ; [.138D.0020.0007.006E][.0000.0000.0002.0000] # +004E 006A ; [.138D.0020.0007.004E][.0000.0000.0008.0000] # +004E 004A ; [.138D.0020.0008.004E] # +0072 0072 ; [.140F.0020.0002.0072] # +0072 0052 ; [.140F.0020.0007.0072][.0000.0000.0002.0000] # +0052 0072 ; [.140F.0020.0007.0052][.0000.0000.0008.0000] # +0052 0052 ; [.140F.0020.0008.0052] # +0073 0068 ; [.1432.0020.0002.0073] # +0073 0048 ; [.1432.0020.0007.0073][.0000.0000.0002.0000] # +0053 0068 ; [.1432.0020.0007.0053][.0000.0000.0008.0000] # +0053 0048 ; [.1432.0020.0008.0053] # +0074 0068 ; [.1452.0020.0002.0074] # +0074 0048 ; [.1452.0020.0007.0074][.0000.0000.0002.0000] # +0054 0068 ; [.1452.0020.0007.0054][.0000.0000.0008.0000] # +0054 0048 ; [.1452.0020.0008.0054] # +0078 0068 ; [.149B.0020.0002.0078] # +0078 0048 ; [.149B.0020.0007.0078][.0000.0000.0002.0000] # +0058 0068 ; [.149B.0020.0007.0058][.0000.0000.0008.0000] # +0058 0048 ; [.149B.0020.0008.0058] # +007A 0068 ; [.14C9.0020.0002.007A] # +007A 0048 ; [.14C9.0020.0007.007A][.0000.0000.0002.0000] # +005A 0068 ; [.14C9.0020.0007.005A][.0000.0000.0008.0000] # +005A 0048 ; [.14C9.0020.0008.005A] # +ENTRY +}; diff --git a/cpan/Unicode-Collate/Collate/Locale/vi.pl b/cpan/Unicode-Collate/Collate/Locale/vi.pl index 2057ecf0db..ce93c00b3c 100644 --- a/cpan/Unicode-Collate/Collate/Locale/vi.pl +++ b/cpan/Unicode-Collate/Collate/Locale/vi.pl @@ -146,9 +146,65 @@ 1EE8 ; [.1454.0020.0008.01AF][.0000.0038.0002.0301] # LATIN CAPITAL LETTER U WITH HORN AND ACUTE 1EEF ; [.1454.0020.0002.01B0][.0000.0037.0002.0303] # LATIN SMALL LETTER U WITH HORN AND TILDE 1EEE ; [.1454.0020.0008.01AF][.0000.0037.0002.0303] # LATIN CAPITAL LETTER U WITH HORN AND TILDE -1EEC ; [.1454.0020.0008.01AF][.0000.0036.0002.0309] # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE 1EED ; [.1454.0020.0002.01B0][.0000.0036.0002.0309] # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE -1EF0 ; [.1454.0020.0008.01AF][.0000.0039.0002.0323] # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW +1EEC ; [.1454.0020.0008.01AF][.0000.0036.0002.0309] # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE 1EF1 ; [.1454.0020.0002.01B0][.0000.0039.0002.0323] # LATIN SMALL LETTER U WITH HORN AND DOT BELOW +1EF0 ; [.1454.0020.0008.01AF][.0000.0039.0002.0323] # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW +1EA1 0306 ; [.1210.0020.0002.0103][.0000.0039.0002.0323] # +1EA0 0306 ; [.1210.0020.0008.0102][.0000.0039.0002.0323] # +1EA1 0302 ; [.1211.0020.0002.00E2][.0000.0039.0002.0323] # +1EA0 0302 ; [.1211.0020.0008.00C2][.0000.0039.0002.0323] # +1EB9 0302 ; [.126C.0020.0002.00EA][.0000.0039.0002.0323] # +1EB8 0302 ; [.126C.0020.0008.00CA][.0000.0039.0002.0323] # +1ECD 0302 ; [.138F.0020.0002.00F4][.0000.0039.0002.0323] # +1ECC 0302 ; [.138F.0020.0008.00D4][.0000.0039.0002.0323] # +00F2 031B ; [.1390.0020.0002.01A1][.0000.0035.0002.0300] # +1ECF 031B ; [.1390.0020.0002.01A1][.0000.0036.0002.0309] # +00F5 031B ; [.1390.0020.0002.01A1][.0000.0037.0002.0303] # +00F3 031B ; [.1390.0020.0002.01A1][.0000.0038.0002.0301] # +1ECD 031B ; [.1390.0020.0002.01A1][.0000.0039.0002.0323] # +00D2 031B ; [.1390.0020.0008.01A0][.0000.0035.0002.0300] # +1ECE 031B ; [.1390.0020.0008.01A0][.0000.0036.0002.0309] # +00D5 031B ; [.1390.0020.0008.01A0][.0000.0037.0002.0303] # +00D3 031B ; [.1390.0020.0008.01A0][.0000.0038.0002.0301] # +1ECC 031B ; [.1390.0020.0008.01A0][.0000.0039.0002.0323] # +00F9 031B ; [.1454.0020.0002.01B0][.0000.0035.0002.0300] # +1EE7 031B ; [.1454.0020.0002.01B0][.0000.0036.0002.0309] # +0169 031B ; [.1454.0020.0002.01B0][.0000.0037.0002.0303] # +00FA 031B ; [.1454.0020.0002.01B0][.0000.0038.0002.0301] # +1EE5 031B ; [.1454.0020.0002.01B0][.0000.0039.0002.0323] # +00D9 031B ; [.1454.0020.0008.01AF][.0000.0035.0002.0300] # +1EE6 031B ; [.1454.0020.0008.01AF][.0000.0036.0002.0309] # +0168 031B ; [.1454.0020.0008.01AF][.0000.0037.0002.0303] # +00DA 031B ; [.1454.0020.0008.01AF][.0000.0038.0002.0301] # +1EE4 031B ; [.1454.0020.0008.01AF][.0000.0039.0002.0323] # +0061 0323 0306 ; [.1210.0020.0002.0103][.0000.0039.0002.0323] # +0041 0323 0306 ; [.1210.0020.0008.0102][.0000.0039.0002.0323] # +0061 0323 0302 ; [.1211.0020.0002.00E2][.0000.0039.0002.0323] # +0041 0323 0302 ; [.1211.0020.0008.00C2][.0000.0039.0002.0323] # +0065 0323 0302 ; [.126C.0020.0002.00EA][.0000.0039.0002.0323] # +0045 0323 0302 ; [.126C.0020.0008.00CA][.0000.0039.0002.0323] # +006F 0323 0302 ; [.138F.0020.0002.00F4][.0000.0039.0002.0323] # +004F 0323 0302 ; [.138F.0020.0008.00D4][.0000.0039.0002.0323] # +006F 0300 031B ; [.1390.0020.0002.01A1][.0000.0035.0002.0300] # +006F 0309 031B ; [.1390.0020.0002.01A1][.0000.0036.0002.0309] # +006F 0303 031B ; [.1390.0020.0002.01A1][.0000.0037.0002.0303] # +006F 0301 031B ; [.1390.0020.0002.01A1][.0000.0038.0002.0301] # +006F 0323 031B ; [.1390.0020.0002.01A1][.0000.0039.0002.0323] # +004F 0300 031B ; [.1390.0020.0008.01A0][.0000.0035.0002.0300] # +004F 0309 031B ; [.1390.0020.0008.01A0][.0000.0036.0002.0309] # +004F 0303 031B ; [.1390.0020.0008.01A0][.0000.0037.0002.0303] # +004F 0301 031B ; [.1390.0020.0008.01A0][.0000.0038.0002.0301] # +004F 0323 031B ; [.1390.0020.0008.01A0][.0000.0039.0002.0323] # +0075 0300 031B ; [.1454.0020.0002.01B0][.0000.0035.0002.0300] # +0075 0309 031B ; [.1454.0020.0002.01B0][.0000.0036.0002.0309] # +0075 0303 031B ; [.1454.0020.0002.01B0][.0000.0037.0002.0303] # +0075 0301 031B ; [.1454.0020.0002.01B0][.0000.0038.0002.0301] # +0075 0323 031B ; [.1454.0020.0002.01B0][.0000.0039.0002.0323] # +0055 0300 031B ; [.1454.0020.0008.01AF][.0000.0035.0002.0300] # +0055 0309 031B ; [.1454.0020.0008.01AF][.0000.0036.0002.0309] # +0055 0303 031B ; [.1454.0020.0008.01AF][.0000.0037.0002.0303] # +0055 0301 031B ; [.1454.0020.0008.01AF][.0000.0038.0002.0301] # +0055 0323 031B ; [.1454.0020.0008.01AF][.0000.0039.0002.0323] # ENTRY }; diff --git a/cpan/Unicode-Collate/Collate/Locale/yo.pl b/cpan/Unicode-Collate/Collate/Locale/yo.pl index 884d83fb7c..35728cd523 100644 --- a/cpan/Unicode-Collate/Collate/Locale/yo.pl +++ b/cpan/Unicode-Collate/Collate/Locale/yo.pl @@ -4,6 +4,8 @@ 0065 0323 ; [.126C.0020.0002.1EB9] # LATIN SMALL LETTER E WITH DOT BELOW 1EB8 ; [.126C.0020.0008.1EB8] # LATIN CAPITAL LETTER E WITH DOT BELOW 0045 0323 ; [.126C.0020.0008.1EB8] # LATIN CAPITAL LETTER E WITH DOT BELOW +1EC7 ; [.126C.0020.0002.1EB9][.0000.003C.0002.0302] # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW +1EC6 ; [.126C.0020.0008.1EB8][.0000.003C.0002.0302] # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW 0067 0062 ; [.12B1.0020.0002.0067] # 0047 0062 ; [.12B1.0020.0007.0047] # 0047 0042 ; [.12B1.0020.0008.0047] # @@ -11,6 +13,10 @@ 006F 0323 ; [.138F.0020.0002.1ECD] # LATIN SMALL LETTER O WITH DOT BELOW 1ECC ; [.138F.0020.0008.1ECC] # LATIN CAPITAL LETTER O WITH DOT BELOW 004F 0323 ; [.138F.0020.0008.1ECC] # LATIN CAPITAL LETTER O WITH DOT BELOW +1ED9 ; [.138F.0020.0002.1ECD][.0000.003C.0002.0302] # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW +1ED8 ; [.138F.0020.0008.1ECC][.0000.003C.0002.0302] # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW +1EE3 ; [.138F.0020.0002.1ECD][.0000.0068.0002.031B] # LATIN SMALL LETTER O WITH HORN AND DOT BELOW +1EE2 ; [.138F.0020.0008.1ECC][.0000.0068.0002.031B] # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW 1E63 ; [.1411.0020.0002.1E63] # LATIN SMALL LETTER S WITH DOT BELOW 0073 0323 ; [.1411.0020.0002.1E63] # LATIN SMALL LETTER S WITH DOT BELOW 1E62 ; [.1411.0020.0008.1E62] # LATIN CAPITAL LETTER S WITH DOT BELOW diff --git a/cpan/Unicode-Collate/README b/cpan/Unicode-Collate/README index 4a04396861..78e13f4735 100644 --- a/cpan/Unicode-Collate/README +++ b/cpan/Unicode-Collate/README @@ -1,4 +1,4 @@ -Unicode/Collate version 0.60 +Unicode/Collate version 0.61 =============================== NAME diff --git a/cpan/Unicode-Collate/t/loc_de.t b/cpan/Unicode-Collate/t/loc_de.t index 066ea0594e..4eafdb63b0 100644 --- a/cpan/Unicode-Collate/t/loc_de.t +++ b/cpan/Unicode-Collate/t/loc_de.t @@ -4,7 +4,7 @@ use warnings; use Unicode::Collate::Locale; use Test; -plan tests => 20; +plan tests => 32; my $auml = pack 'U', 0xE4; my $Auml = pack 'U', 0xC4; @@ -48,4 +48,23 @@ ok($objDe->gt("O\x{308}", "O")); ok($objDe->gt("u\x{308}", "u")); ok($objDe->gt("U\x{308}", "U")); -# 20 +ok($objDe->eq("a\x{308}", "A\x{308}")); +ok($objDe->eq("o\x{308}", "O\x{308}")); +ok($objDe->eq("u\x{308}", "U\x{308}")); + +# 23 + +$objDe->change(level => 3); + +ok($objDe->lt("a\x{308}", "A\x{308}")); +ok($objDe->lt("o\x{308}", "O\x{308}")); +ok($objDe->lt("u\x{308}", "U\x{308}")); + +ok($objDe->eq("a\x{308}", $auml)); +ok($objDe->eq("A\x{308}", $Auml)); +ok($objDe->eq("o\x{308}", $ouml)); +ok($objDe->eq("O\x{308}", $Ouml)); +ok($objDe->eq("u\x{308}", $uuml)); +ok($objDe->eq("U\x{308}", $Uuml)); + +# 32 diff --git a/cpan/Unicode-Collate/t/loc_et.t b/cpan/Unicode-Collate/t/loc_et.t index 0fad62d5e0..ed8a53ec8d 100644 --- a/cpan/Unicode-Collate/t/loc_et.t +++ b/cpan/Unicode-Collate/t/loc_et.t @@ -4,7 +4,7 @@ use warnings; use Unicode::Collate::Locale; use Test; -plan tests => 53; +plan tests => 61; my $objEt = Unicode::Collate::Locale-> new(locale => 'ET', normalization => undef); @@ -62,14 +62,25 @@ ok($objEt->eq("o\x{303}", pack('U', 0xF5))); ok($objEt->eq("O\x{303}", pack('U', 0xD5))); ok($objEt->eq("a\x{308}", pack('U', 0xE4))); ok($objEt->eq("A\x{308}", pack('U', 0xC4))); -ok($objEt->eq("a\x{308}\x{304}", "\x{1DF}")); -ok($objEt->eq("A\x{308}\x{304}", "\x{1DE}")); ok($objEt->eq("o\x{308}", pack('U', 0xF6))); ok($objEt->eq("O\x{308}", pack('U', 0xD6))); -ok($objEt->eq("o\x{308}\x{304}", "\x{22B}")); -ok($objEt->eq("O\x{308}\x{304}", "\x{22A}")); ok($objEt->eq("u\x{308}", pack('U', 0xFC))); ok($objEt->eq("U\x{308}", pack('U', 0xDC))); + +# 41 + +ok($objEt->eq("o\x{303}\x{301}","\x{1E4D}")); +ok($objEt->eq("O\x{303}\x{301}","\x{1E4C}")); +ok($objEt->eq("o\x{303}\x{304}", "\x{22D}")); +ok($objEt->eq("O\x{303}\x{304}", "\x{22C}")); +ok($objEt->eq("o\x{303}\x{308}","\x{1E4F}")); +ok($objEt->eq("O\x{303}\x{308}","\x{1E4E}")); +ok($objEt->eq("o\x{303}\x{31B}","\x{1EE1}")); +ok($objEt->eq("O\x{303}\x{31B}","\x{1EE0}")); +ok($objEt->eq("a\x{308}\x{304}", "\x{1DF}")); +ok($objEt->eq("A\x{308}\x{304}", "\x{1DE}")); +ok($objEt->eq("o\x{308}\x{304}", "\x{22B}")); +ok($objEt->eq("O\x{308}\x{304}", "\x{22A}")); ok($objEt->eq("u\x{308}\x{300}", "\x{1DC}")); ok($objEt->eq("U\x{308}\x{300}", "\x{1DB}")); ok($objEt->eq("u\x{308}\x{301}", "\x{1D8}")); @@ -79,4 +90,4 @@ ok($objEt->eq("U\x{308}\x{304}", "\x{1D5}")); ok($objEt->eq("u\x{308}\x{30C}", "\x{1DA}")); ok($objEt->eq("U\x{308}\x{30C}", "\x{1D9}")); -# 53 +# 61 diff --git a/cpan/Unicode-Collate/t/loc_fr.t b/cpan/Unicode-Collate/t/loc_fr.t index 3cc1c17264..bfd7403ac1 100644 --- a/cpan/Unicode-Collate/t/loc_fr.t +++ b/cpan/Unicode-Collate/t/loc_fr.t @@ -6,8 +6,8 @@ use Unicode::Collate::Locale; use Test; plan tests => 26; -my $ae = pack 'U', 0xE6; -my $AE = pack 'U', 0xC6; +my $ae = pack 'U', 0xE6; +my $AE = pack 'U', 0xC6; my $objFr = Unicode::Collate::Locale-> new(locale => 'FR', normalization => undef); diff --git a/cpan/Unicode-Collate/t/loc_hr.t b/cpan/Unicode-Collate/t/loc_hr.t new file mode 100644 index 0000000000..beded45b92 --- /dev/null +++ b/cpan/Unicode-Collate/t/loc_hr.t @@ -0,0 +1,120 @@ +#!perl +use strict; +use warnings; +use Unicode::Collate::Locale; + +use Test; +plan tests => 86; + +my $objHr = Unicode::Collate::Locale-> + new(locale => 'HR', normalization => undef); + +ok(1); +ok($objHr->getlocale, 'hr'); + +$objHr->change(level => 1); + +ok($objHr->lt("c", "c\x{30C}")); +ok($objHr->lt("c\x{30C}", "c\x{301}")); +ok($objHr->gt("d", "c\x{301}")); +ok($objHr->lt("d", "dz\x{30C}")); +ok($objHr->lt("dzz", "dz\x{30C}")); +ok($objHr->lt("dz\x{30C}", "d\x{335}")); +ok($objHr->gt("e", "d\x{335}")); +ok($objHr->lt("l", "lj")); +ok($objHr->lt("lz","lj")); +ok($objHr->gt("m", "lj")); +ok($objHr->lt("n", "nj")); +ok($objHr->lt("nz","nj")); +ok($objHr->gt("o", "nj")); +ok($objHr->lt("s", "s\x{30C}")); +ok($objHr->lt("sz","s\x{30C}")); +ok($objHr->gt("t", "s\x{30C}")); +ok($objHr->lt("z", "z\x{30C}")); +ok($objHr->lt("zz","z\x{30C}")); +ok($objHr->lt("z\x{30C}", "\x{292}")); # U+0292 EZH + +# 21 + +$objHr->change(level => 2); + +ok($objHr->eq("c\x{30C}", "C\x{30C}")); +ok($objHr->eq("c\x{301}", "C\x{301}")); +ok($objHr->eq("dz\x{30C}","dZ\x{30C}")); +ok($objHr->eq("dZ\x{30C}","Dz\x{30C}")); +ok($objHr->eq("Dz\x{30C}","DZ\x{30C}")); +ok($objHr->eq("d\x{335}", "D\x{335}")); +ok($objHr->eq("lj", "lJ")); +ok($objHr->eq("lJ", "Lj")); +ok($objHr->eq("Lj", "LJ")); +ok($objHr->eq("nj", "nJ")); +ok($objHr->eq("nJ", "Nj")); +ok($objHr->eq("Nj", "NJ")); +ok($objHr->eq("s\x{30C}", "S\x{30C}")); +ok($objHr->eq("z\x{30C}", "Z\x{30C}")); + +# 35 + +$objHr->change(level => 3); + +ok($objHr->lt("c\x{30C}", "C\x{30C}")); +ok($objHr->lt("c\x{301}", "C\x{301}")); +ok($objHr->lt("dz\x{30C}","dZ\x{30C}")); +ok($objHr->lt("dZ\x{30C}","Dz\x{30C}")); +ok($objHr->lt("Dz\x{30C}","DZ\x{30C}")); +ok($objHr->lt("d\x{335}", "D\x{335}")); +ok($objHr->lt("lj", "lJ")); +ok($objHr->lt("lJ", "Lj")); +ok($objHr->lt("Lj", "LJ")); +ok($objHr->lt("nj", "nJ")); +ok($objHr->lt("nJ", "Nj")); +ok($objHr->lt("Nj", "NJ")); +ok($objHr->lt("s\x{30C}", "S\x{30C}")); +ok($objHr->lt("z\x{30C}", "Z\x{30C}")); + +# 49 + +ok($objHr->eq("c\x{30C}", "\x{10D}")); +ok($objHr->eq("C\x{30C}", "\x{10C}")); +ok($objHr->eq("c\x{301}", "\x{107}")); +ok($objHr->eq("C\x{301}", "\x{106}")); +ok($objHr->eq("dz\x{30C}", "\x{1C6}")); +ok($objHr->eq("Dz\x{30C}", "\x{1C5}")); +ok($objHr->eq("DZ\x{30C}", "\x{1C4}")); +ok($objHr->eq("dz\x{30C}", "d\x{17E}")); +ok($objHr->eq("dZ\x{30C}", "d\x{17D}")); +ok($objHr->eq("Dz\x{30C}", "D\x{17E}")); +ok($objHr->eq("DZ\x{30C}", "D\x{17D}")); +ok($objHr->eq("d\x{335}", "\x{111}")); +ok($objHr->eq("D\x{335}", "\x{110}")); +ok($objHr->eq("lj", "\x{1C9}")); +ok($objHr->eq("Lj", "\x{1C8}")); +ok($objHr->eq("LJ", "\x{1C7}")); +ok($objHr->eq("nj", "\x{1CC}")); +ok($objHr->eq("Nj", "\x{1CB}")); +ok($objHr->eq("NJ", "\x{1CA}")); +ok($objHr->eq("s\x{30C}", "\x{161}")); +ok($objHr->eq("S\x{30C}", "\x{160}")); +ok($objHr->eq("z\x{30C}", "\x{17E}")); +ok($objHr->eq("Z\x{30C}", "\x{17D}")); + +# 72 + +$objHr->change(upper_before_lower => 1); + +ok($objHr->gt("c\x{30C}", "C\x{30C}")); +ok($objHr->gt("c\x{301}", "C\x{301}")); +ok($objHr->gt("dz\x{30C}","dZ\x{30C}")); +ok($objHr->gt("dZ\x{30C}","Dz\x{30C}")); +ok($objHr->gt("Dz\x{30C}","DZ\x{30C}")); +ok($objHr->gt("d\x{335}", "D\x{335}")); +ok($objHr->gt("lj", "lJ")); +ok($objHr->gt("lJ", "Lj")); +ok($objHr->gt("Lj", "LJ")); +ok($objHr->gt("nj", "nJ")); +ok($objHr->gt("nJ", "Nj")); +ok($objHr->gt("Nj", "NJ")); +ok($objHr->gt("s\x{30C}", "S\x{30C}")); +ok($objHr->gt("z\x{30C}", "Z\x{30C}")); + +# 86 diff --git a/cpan/Unicode-Collate/t/loc_ig.t b/cpan/Unicode-Collate/t/loc_ig.t new file mode 100644 index 0000000000..970bb7aaf0 --- /dev/null +++ b/cpan/Unicode-Collate/t/loc_ig.t @@ -0,0 +1,143 @@ +#!perl +use strict; +use warnings; +use Unicode::Collate::Locale; + +use Test; +plan tests => 108; + +my $objIg = Unicode::Collate::Locale-> + new(locale => 'IG', normalization => undef); + +ok(1); +ok($objIg->getlocale, 'ig'); + +$objIg->change(level => 1); + +ok($objIg->lt("b", "ch")); +ok($objIg->lt("bz","ch")); +ok($objIg->gt("c", "ch")); +ok($objIg->lt("g", "gb")); +ok($objIg->lt("gz","gb")); +ok($objIg->lt("gb","gh")); +ok($objIg->lt("gh","gw")); +ok($objIg->gt("h", "gw")); +ok($objIg->lt("i", "i\x{323}")); +ok($objIg->gt("j", "i\x{323}")); +ok($objIg->lt("k", "kp")); +ok($objIg->lt("kz","kp")); +ok($objIg->lt("kp","kw")); +ok($objIg->gt("l", "kw")); +ok($objIg->lt("n", "n\x{307}")); +ok($objIg->lt("nz","n\x{307}")); +ok($objIg->gt("nw","n\x{307}")); +ok($objIg->lt("nw", "ny")); +ok($objIg->gt("o", "ny")); +ok($objIg->lt("o", "o\x{323}")); +ok($objIg->gt("p", "o\x{323}")); +ok($objIg->lt("s", "sh")); +ok($objIg->lt("sz","sh")); +ok($objIg->gt("t", "sh")); +ok($objIg->lt("u", "u\x{323}")); +ok($objIg->gt("v", "u\x{323}")); + +# 28 + +$objIg->change(level => 2); + +ok($objIg->eq("ch", "Ch")); +ok($objIg->eq("Ch", "CH")); +ok($objIg->eq("gb", "Gb")); +ok($objIg->eq("Gb", "GB")); +ok($objIg->eq("gh", "Gh")); +ok($objIg->eq("Gh", "GH")); +ok($objIg->eq("gw", "Gw")); +ok($objIg->eq("Gw", "GW")); +ok($objIg->eq("i\x{323}", "I\x{323}")); +ok($objIg->eq("kp", "Kp")); +ok($objIg->eq("Kp", "KP")); +ok($objIg->eq("kw", "Kw")); +ok($objIg->eq("Kw", "KW")); +ok($objIg->eq("n\x{307}", "N\x{307}")); +ok($objIg->eq("nw", "Nw")); +ok($objIg->eq("Nw", "NW")); +ok($objIg->eq("ny", "Ny")); +ok($objIg->eq("Ny", "NY")); +ok($objIg->eq("o\x{323}", "O\x{323}")); +ok($objIg->eq("sh", "Sh")); +ok($objIg->eq("Sh", "SH")); +ok($objIg->eq("u\x{323}", "U\x{323}")); + +# 50 + +$objIg->change(level => 3); + +ok($objIg->lt("ch", "Ch")); +ok($objIg->lt("Ch", "CH")); +ok($objIg->lt("gb", "Gb")); +ok($objIg->lt("Gb", "GB")); +ok($objIg->lt("gh", "Gh")); +ok($objIg->lt("Gh", "GH")); +ok($objIg->lt("gw", "Gw")); +ok($objIg->lt("Gw", "GW")); +ok($objIg->lt("i\x{323}", "I\x{323}")); +ok($objIg->lt("kp", "Kp")); +ok($objIg->lt("Kp", "KP")); +ok($objIg->lt("kw", "Kw")); +ok($objIg->lt("Kw", "KW")); +ok($objIg->lt("n\x{307}", "N\x{307}")); +ok($objIg->lt("nw", "Nw")); +ok($objIg->lt("Nw", "NW")); +ok($objIg->lt("ny", "Ny")); +ok($objIg->lt("Ny", "NY")); +ok($objIg->lt("o\x{323}", "O\x{323}")); +ok($objIg->lt("sh", "Sh")); +ok($objIg->lt("Sh", "SH")); +ok($objIg->lt("u\x{323}", "U\x{323}")); + +# 72 + +ok($objIg->eq("i\x{323}", "\x{1ECB}")); +ok($objIg->eq("I\x{323}", "\x{1ECA}")); +ok($objIg->eq("n\x{307}", "\x{1E45}")); +ok($objIg->eq("N\x{307}", "\x{1E44}")); +ok($objIg->eq("o\x{323}", "\x{1ECD}")); +ok($objIg->eq("O\x{323}", "\x{1ECC}")); +ok($objIg->eq("u\x{323}", "\x{1EE5}")); +ok($objIg->eq("U\x{323}", "\x{1EE4}")); + +ok($objIg->eq("o\x{323}\x{302}", "\x{1ED9}")); +ok($objIg->eq("O\x{323}\x{302}", "\x{1ED8}")); +ok($objIg->eq("o\x{323}\x{31B}", "\x{1EE3}")); +ok($objIg->eq("O\x{323}\x{31B}", "\x{1EE2}")); +ok($objIg->eq("u\x{323}\x{31B}", "\x{1EF1}")); +ok($objIg->eq("U\x{323}\x{31B}", "\x{1EF0}")); + +# 86 + +$objIg->change(upper_before_lower => 1); + +ok($objIg->gt("ch", "Ch")); +ok($objIg->gt("Ch", "CH")); +ok($objIg->gt("gb", "Gb")); +ok($objIg->gt("Gb", "GB")); +ok($objIg->gt("gh", "Gh")); +ok($objIg->gt("Gh", "GH")); +ok($objIg->gt("gw", "Gw")); +ok($objIg->gt("Gw", "GW")); +ok($objIg->gt("i\x{323}", "I\x{323}")); +ok($objIg->gt("kp", "Kp")); +ok($objIg->gt("Kp", "KP")); +ok($objIg->gt("kw", "Kw")); +ok($objIg->gt("Kw", "KW")); +ok($objIg->gt("n\x{307}", "N\x{307}")); +ok($objIg->gt("nw", "Nw")); +ok($objIg->gt("Nw", "NW")); +ok($objIg->gt("ny", "Ny")); +ok($objIg->gt("Ny", "NY")); +ok($objIg->gt("o\x{323}", "O\x{323}")); +ok($objIg->gt("sh", "Sh")); +ok($objIg->gt("Sh", "SH")); +ok($objIg->gt("u\x{323}", "U\x{323}")); + +# 108 diff --git a/cpan/Unicode-Collate/t/loc_nb.t b/cpan/Unicode-Collate/t/loc_nb.t index d648a685e9..0aba13437a 100644 --- a/cpan/Unicode-Collate/t/loc_nb.t +++ b/cpan/Unicode-Collate/t/loc_nb.t @@ -31,7 +31,7 @@ ok($objNb->getlocale, 'nb'); $objNb->change(level => 1); -ok($objNb->lt("z", $ae)); +ok($objNb->lt('z', $ae)); ok($objNb->lt($ae, $ostk)); ok($objNb->lt($ostk, $arng)); ok($objNb->lt($arng, "\x{292}")); @@ -42,8 +42,7 @@ ok($objNb->eq('d', "\x{111}")); ok($objNb->eq("\x{111}", $eth)); ok($objNb->eq('y', $uuml)); ok($objNb->eq($uuml, "\x{171}")); - -ok($objNb->eq($ae, $auml)); +ok($objNb->eq($ae, $auml)); ok($objNb->eq($auml, "\x{119}")); ok($objNb->eq($ostk, $ouml)); ok($objNb->eq($ouml, "\x{151}")); @@ -57,8 +56,7 @@ ok($objNb->lt('d', "\x{111}")); ok($objNb->lt("\x{111}", $eth)); ok($objNb->lt('y', $uuml)); ok($objNb->lt($uuml, "\x{171}")); - -ok($objNb->lt($ae, $auml)); +ok($objNb->lt($ae, $auml)); ok($objNb->lt($auml, "\x{119}")); ok($objNb->lt($ostk, $ouml)); ok($objNb->lt($ouml, "\x{151}")); diff --git a/cpan/Unicode-Collate/t/loc_nn.t b/cpan/Unicode-Collate/t/loc_nn.t index fc6514abb7..9f3cb0be37 100644 --- a/cpan/Unicode-Collate/t/loc_nn.t +++ b/cpan/Unicode-Collate/t/loc_nn.t @@ -31,7 +31,7 @@ ok($objNn->getlocale, 'nn'); $objNn->change(level => 1); -ok($objNn->lt("z", $ae)); +ok($objNn->lt('z', $ae)); ok($objNn->lt($ae, $ostk)); ok($objNn->lt($ostk, $arng)); ok($objNn->lt($arng, "\x{292}")); @@ -42,8 +42,7 @@ ok($objNn->eq('d', "\x{111}")); ok($objNn->eq("\x{111}", $eth)); ok($objNn->eq('y', $uuml)); ok($objNn->eq($uuml, "\x{171}")); - -ok($objNn->eq($ae, $auml)); +ok($objNn->eq($ae, $auml)); ok($objNn->eq($auml, "\x{119}")); ok($objNn->eq($ostk, $ouml)); ok($objNn->eq($ouml, "\x{151}")); @@ -57,8 +56,7 @@ ok($objNn->lt('d', "\x{111}")); ok($objNn->lt("\x{111}", $eth)); ok($objNn->lt('y', $uuml)); ok($objNn->lt($uuml, "\x{171}")); - -ok($objNn->lt($ae, $auml)); +ok($objNn->lt($ae, $auml)); ok($objNn->lt($auml, "\x{119}")); ok($objNn->lt($ostk, $ouml)); ok($objNn->lt($ouml, "\x{151}")); diff --git a/cpan/Unicode-Collate/t/loc_sq.t b/cpan/Unicode-Collate/t/loc_sq.t new file mode 100644 index 0000000000..93b4a706e5 --- /dev/null +++ b/cpan/Unicode-Collate/t/loc_sq.t @@ -0,0 +1,160 @@ +#!perl +use strict; +use warnings; +use Unicode::Collate::Locale; + +use Test; +plan tests => 126; + +my $objSq = Unicode::Collate::Locale-> + new(locale => 'SQ', normalization => undef); + +ok(1); +ok($objSq->getlocale, 'sq'); + +$objSq->change(level => 1); + +ok($objSq->lt("c", "c\x{327}")); +ok($objSq->lt("cz","c\x{327}")); +ok($objSq->gt("d", "c\x{327}")); +ok($objSq->lt("d", "dh")); +ok($objSq->lt("dz","dh")); +ok($objSq->gt("e", "dh")); +ok($objSq->lt("e", "e\x{308}")); +ok($objSq->lt("ez","e\x{308}")); +ok($objSq->gt("f", "e\x{308}")); +ok($objSq->lt("g", "gj")); +ok($objSq->lt("gz","gj")); +ok($objSq->gt("h", "gj")); +ok($objSq->lt("l", "ll")); +ok($objSq->lt("lz","ll")); +ok($objSq->gt("m", "ll")); +ok($objSq->lt("n", "nj")); +ok($objSq->lt("nz","nj")); +ok($objSq->gt("o", "nj")); +ok($objSq->lt("r", "rr")); +ok($objSq->lt("rz","rr")); +ok($objSq->gt("s", "rr")); +ok($objSq->lt("s", "sh")); +ok($objSq->lt("sz","sh")); +ok($objSq->gt("t", "sh")); +ok($objSq->lt("t", "th")); +ok($objSq->lt("tz","th")); +ok($objSq->gt("u", "th")); +ok($objSq->lt("x", "xh")); +ok($objSq->lt("xz","xh")); +ok($objSq->gt("y", "xh")); +ok($objSq->lt("z", "zh")); +ok($objSq->lt("zz","zh")); +ok($objSq->lt("zh", "\x{1B7}")); + +# 35 + +$objSq->change(level => 2); + +ok($objSq->eq("c\x{327}", "C\x{327}")); +ok($objSq->eq("dh", "dH")); +ok($objSq->eq("dH", "Dh")); +ok($objSq->eq("Dh", "DH")); +ok($objSq->eq("e\x{308}", "E\x{308}")); +ok($objSq->eq("gj", "gJ")); +ok($objSq->eq("gJ", "Gj")); +ok($objSq->eq("Gj", "GJ")); +ok($objSq->eq("ll", "lL")); +ok($objSq->eq("lL", "Ll")); +ok($objSq->eq("Ll", "LL")); +ok($objSq->eq("nj", "nJ")); +ok($objSq->eq("nJ", "Nj")); +ok($objSq->eq("Nj", "NJ")); +ok($objSq->eq("rr", "rR")); +ok($objSq->eq("rR", "Rr")); +ok($objSq->eq("Rr", "RR")); +ok($objSq->eq("sh", "sH")); +ok($objSq->eq("sH", "Sh")); +ok($objSq->eq("Sh", "SH")); +ok($objSq->eq("th", "tH")); +ok($objSq->eq("tH", "Th")); +ok($objSq->eq("Th", "TH")); +ok($objSq->eq("xh", "xH")); +ok($objSq->eq("xH", "Xh")); +ok($objSq->eq("Xh", "XH")); +ok($objSq->eq("zh", "zH")); +ok($objSq->eq("zH", "Zh")); +ok($objSq->eq("Zh", "ZH")); + +# 64 + +$objSq->change(level => 3); + +ok($objSq->lt("c\x{327}", "C\x{327}")); +ok($objSq->lt("dh", "dH")); +ok($objSq->lt("dH", "Dh")); +ok($objSq->lt("Dh", "DH")); +ok($objSq->lt("e\x{308}", "E\x{308}")); +ok($objSq->lt("gj", "gJ")); +ok($objSq->lt("gJ", "Gj")); +ok($objSq->lt("Gj", "GJ")); +ok($objSq->lt("ll", "lL")); +ok($objSq->lt("lL", "Ll")); +ok($objSq->lt("Ll", "LL")); +ok($objSq->lt("nj", "nJ")); +ok($objSq->lt("nJ", "Nj")); +ok($objSq->lt("Nj", "NJ")); +ok($objSq->lt("rr", "rR")); +ok($objSq->lt("rR", "Rr")); +ok($objSq->lt("Rr", "RR")); +ok($objSq->lt("sh", "sH")); +ok($objSq->lt("sH", "Sh")); +ok($objSq->lt("Sh", "SH")); +ok($objSq->lt("th", "tH")); +ok($objSq->lt("tH", "Th")); +ok($objSq->lt("Th", "TH")); +ok($objSq->lt("xh", "xH")); +ok($objSq->lt("xH", "Xh")); +ok($objSq->lt("Xh", "XH")); +ok($objSq->lt("zh", "zH")); +ok($objSq->lt("zH", "Zh")); +ok($objSq->lt("Zh", "ZH")); + +# 93 + +ok($objSq->eq("c\x{327}", pack('U', 0xE7))); +ok($objSq->eq("C\x{327}", pack('U', 0xC7))); +ok($objSq->eq("e\x{308}", pack('U', 0xEB))); +ok($objSq->eq("E\x{308}", pack('U', 0xCB))); + +# 97 + +$objSq->change(upper_before_lower => 1); + +ok($objSq->gt("c\x{327}", "C\x{327}")); +ok($objSq->gt("dh", "dH")); +ok($objSq->gt("dH", "Dh")); +ok($objSq->gt("Dh", "DH")); +ok($objSq->gt("e\x{308}", "E\x{308}")); +ok($objSq->gt("gj", "gJ")); +ok($objSq->gt("gJ", "Gj")); +ok($objSq->gt("Gj", "GJ")); +ok($objSq->gt("ll", "lL")); +ok($objSq->gt("lL", "Ll")); +ok($objSq->gt("Ll", "LL")); +ok($objSq->gt("nj", "nJ")); +ok($objSq->gt("nJ", "Nj")); +ok($objSq->gt("Nj", "NJ")); +ok($objSq->gt("rr", "rR")); +ok($objSq->gt("rR", "Rr")); +ok($objSq->gt("Rr", "RR")); +ok($objSq->gt("sh", "sH")); +ok($objSq->gt("sH", "Sh")); +ok($objSq->gt("Sh", "SH")); +ok($objSq->gt("th", "tH")); +ok($objSq->gt("tH", "Th")); +ok($objSq->gt("Th", "TH")); +ok($objSq->gt("xh", "xH")); +ok($objSq->gt("xH", "Xh")); +ok($objSq->gt("Xh", "XH")); +ok($objSq->gt("zh", "zH")); +ok($objSq->gt("zH", "Zh")); +ok($objSq->gt("Zh", "ZH")); + +# 126 diff --git a/cpan/Unicode-Collate/t/loc_vi.t b/cpan/Unicode-Collate/t/loc_vi.t index 8af5154710..3b5e2ee38e 100644 --- a/cpan/Unicode-Collate/t/loc_vi.t +++ b/cpan/Unicode-Collate/t/loc_vi.t @@ -4,7 +4,7 @@ use warnings; use Unicode::Collate::Locale; use Test; -plan tests => 194; +plan tests => 270; my $objVi = Unicode::Collate::Locale-> new(locale => 'VI', normalization => undef); @@ -235,3 +235,100 @@ ok($objVi->eq("u\x{306}", "\x{16D}")); ok($objVi->eq("U\x{306}", "\x{16C}")); # 194 + +ok($objVi->eq("a\x{306}\x{323}", "\x{1EA1}\x{306}")); +ok($objVi->eq("A\x{306}\x{323}", "\x{1EA0}\x{306}")); +ok($objVi->eq("a\x{302}\x{323}", "\x{1EA1}\x{302}")); +ok($objVi->eq("A\x{302}\x{323}", "\x{1EA0}\x{302}")); +ok($objVi->eq("e\x{302}\x{323}", "\x{1EB9}\x{302}")); +ok($objVi->eq("E\x{302}\x{323}", "\x{1EB8}\x{302}")); +ok($objVi->eq("o\x{302}\x{323}", "\x{1ECD}\x{302}")); +ok($objVi->eq("O\x{302}\x{323}", "\x{1ECC}\x{302}")); +ok($objVi->eq("o\x{31B}\x{300}", pack('U*', 0xF2, 0x31B))); +ok($objVi->eq("o\x{31B}\x{309}", "\x{1ECF}\x{31B}")); +ok($objVi->eq("o\x{31B}\x{303}", pack('U*', 0xF5, 0x31B))); +ok($objVi->eq("o\x{31B}\x{301}", pack('U*', 0xF3, 0x31B))); +ok($objVi->eq("o\x{31B}\x{323}", "\x{1ECD}\x{31B}")); +ok($objVi->eq("O\x{31B}\x{300}", pack('U*', 0xD2, 0x31B))); +ok($objVi->eq("O\x{31B}\x{309}", "\x{1ECE}\x{31B}")); +ok($objVi->eq("O\x{31B}\x{303}", pack('U*', 0xD5, 0x31B))); +ok($objVi->eq("O\x{31B}\x{301}", pack('U*', 0xD3, 0x31B))); +ok($objVi->eq("O\x{31B}\x{323}", "\x{1ECC}\x{31B}")); +ok($objVi->eq("u\x{31B}\x{300}", pack('U*', 0xF9, 0x31B))); +ok($objVi->eq("u\x{31B}\x{309}", "\x{1EE7}\x{31B}")); +ok($objVi->eq("u\x{31B}\x{303}", "\x{169}\x{31B}")); +ok($objVi->eq("u\x{31B}\x{301}", pack('U*', 0xFA, 0x31B))); +ok($objVi->eq("u\x{31B}\x{323}", "\x{1EE5}\x{31B}")); +ok($objVi->eq("U\x{31B}\x{300}", pack('U*', 0xD9, 0x31B))); +ok($objVi->eq("U\x{31B}\x{309}", "\x{1EE6}\x{31B}")); +ok($objVi->eq("U\x{31B}\x{303}", "\x{168}\x{31B}")); +ok($objVi->eq("U\x{31B}\x{301}", pack('U*', 0xDA, 0x31B))); +ok($objVi->eq("U\x{31B}\x{323}", "\x{1EE4}\x{31B}")); + +# 222 + +ok($objVi->eq("a\x{306}\x{323}", "a\x{323}\x{306}")); +ok($objVi->eq("A\x{306}\x{323}", "A\x{323}\x{306}")); +ok($objVi->eq("a\x{302}\x{323}", "a\x{323}\x{302}")); +ok($objVi->eq("A\x{302}\x{323}", "A\x{323}\x{302}")); +ok($objVi->eq("e\x{302}\x{323}", "e\x{323}\x{302}")); +ok($objVi->eq("E\x{302}\x{323}", "E\x{323}\x{302}")); +ok($objVi->eq("o\x{302}\x{323}", "o\x{323}\x{302}")); +ok($objVi->eq("O\x{302}\x{323}", "O\x{323}\x{302}")); +ok($objVi->eq("o\x{31B}\x{300}", "o\x{300}\x{31B}")); +ok($objVi->eq("o\x{31B}\x{309}", "o\x{309}\x{31B}")); +ok($objVi->eq("o\x{31B}\x{303}", "o\x{303}\x{31B}")); +ok($objVi->eq("o\x{31B}\x{301}", "o\x{301}\x{31B}")); +ok($objVi->eq("o\x{31B}\x{323}", "o\x{323}\x{31B}")); +ok($objVi->eq("O\x{31B}\x{300}", "O\x{300}\x{31B}")); +ok($objVi->eq("O\x{31B}\x{309}", "O\x{309}\x{31B}")); +ok($objVi->eq("O\x{31B}\x{303}", "O\x{303}\x{31B}")); +ok($objVi->eq("O\x{31B}\x{301}", "O\x{301}\x{31B}")); +ok($objVi->eq("O\x{31B}\x{323}", "O\x{323}\x{31B}")); +ok($objVi->eq("u\x{31B}\x{300}", "u\x{300}\x{31B}")); +ok($objVi->eq("u\x{31B}\x{309}", "u\x{309}\x{31B}")); +ok($objVi->eq("u\x{31B}\x{303}", "u\x{303}\x{31B}")); +ok($objVi->eq("u\x{31B}\x{301}", "u\x{301}\x{31B}")); +ok($objVi->eq("u\x{31B}\x{323}", "u\x{323}\x{31B}")); +ok($objVi->eq("U\x{31B}\x{300}", "U\x{300}\x{31B}")); +ok($objVi->eq("U\x{31B}\x{309}", "U\x{309}\x{31B}")); +ok($objVi->eq("U\x{31B}\x{303}", "U\x{303}\x{31B}")); +ok($objVi->eq("U\x{31B}\x{301}", "U\x{301}\x{31B}")); +ok($objVi->eq("U\x{31B}\x{323}", "U\x{323}\x{31B}")); + +# 250 + +$objVi->change(normalization => undef); + +ok($objVi->index("a\x{306}\x{323}", "a\x{323}\x{306}"), 0); +ok($objVi->index("o\x{31B}\x{300}", "o\x{300}\x{31B}"), 0); +ok($objVi->index("a\x{306}\x{323}", pack('U*', 0x1EA1, 0x306)), 0); +ok($objVi->index("o\x{31B}\x{300}", pack('U*', 0x00F2, 0x31B)), 0); + +ok($objVi->index("A\x{306}\x{323}", "a\x{323}\x{306}"), -1); +ok($objVi->index("O\x{31B}\x{300}", "o\x{300}\x{31B}"), -1); +ok($objVi->index("A\x{306}\x{323}", pack('U*', 0x1EA1, 0x306)), -1); +ok($objVi->index("O\x{31B}\x{300}", pack('U*', 0x00F2, 0x31B)), -1); + +# 258 + +$objVi->change(level => 2); + +ok($objVi->index("A\x{306}\x{323}", "a\x{323}\x{306}"), 0); +ok($objVi->index("O\x{31B}\x{300}", "o\x{300}\x{31B}"), 0); +ok($objVi->index("A\x{306}\x{323}", pack('U*', 0x1EA1, 0x306)), 0); +ok($objVi->index("O\x{31B}\x{300}", pack('U*', 0x00F2, 0x31B)), 0); + +ok($objVi->index("A\x{306}", "a\x{323}\x{306}"), -1); +ok($objVi->index("O\x{31B}", "o\x{300}\x{31B}"), -1); +ok($objVi->index("A\x{306}", pack('U*', 0x1EA1, 0x306)), -1); +ok($objVi->index("O\x{31B}", pack('U*', 0x00F2, 0x31B)), -1); + +$objVi->change(level => 1); + +ok($objVi->index("A\x{306}", "a\x{323}\x{306}"), 0); +ok($objVi->index("O\x{31B}", "o\x{300}\x{31B}"), 0); +ok($objVi->index("A\x{306}", pack('U*', 0x1EA1, 0x306)), 0); +ok($objVi->index("O\x{31B}", pack('U*', 0x00F2, 0x31B)), 0); + +# 270 diff --git a/cpan/Unicode-Collate/t/loc_yo.t b/cpan/Unicode-Collate/t/loc_yo.t index 9a2a1a01fc..06823f5719 100644 --- a/cpan/Unicode-Collate/t/loc_yo.t +++ b/cpan/Unicode-Collate/t/loc_yo.t @@ -4,7 +4,7 @@ use warnings; use Unicode::Collate::Locale; use Test; -plan tests => 27; +plan tests => 33; my $objYo = Unicode::Collate::Locale-> new(locale => 'YO', normalization => undef); @@ -53,4 +53,11 @@ ok($objYo->eq("O\x{323}", "\x{1ECC}")); ok($objYo->eq("s\x{323}", "\x{1E63}")); ok($objYo->eq("S\x{323}", "\x{1E62}")); -# 27 +ok($objYo->eq("e\x{323}\x{302}", "\x{1EC7}")); +ok($objYo->eq("E\x{323}\x{302}", "\x{1EC6}")); +ok($objYo->eq("o\x{323}\x{302}", "\x{1ED9}")); +ok($objYo->eq("O\x{323}\x{302}", "\x{1ED8}")); +ok($objYo->eq("o\x{323}\x{31B}", "\x{1EE3}")); +ok($objYo->eq("O\x{323}\x{31B}", "\x{1EE2}")); + +# 33 diff --git a/pod/perldelta.pod b/pod/perldelta.pod index e3018dab98..b2e5185141 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -272,7 +272,9 @@ C has been upgrade from version 1.77_03 to 1.81 =item * -C has been upgraded from version 0.59 to 0.60 +C has been upgraded from version 0.59 to 0.61 + +U::C::Locale newly supports locales: de__phonebook, nso, om, tn, vi, hr, ig, sq =item * -- cgit v1.2.1