diff options
Diffstat (limited to 'cpan/Unicode-Collate/t')
24 files changed, 1783 insertions, 1478 deletions
diff --git a/cpan/Unicode-Collate/t/cjkrange.t b/cpan/Unicode-Collate/t/cjkrange.t index 8e851dca7b..ac4dc69826 100644 --- a/cpan/Unicode-Collate/t/cjkrange.t +++ b/cpan/Unicode-Collate/t/cjkrange.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..463\n"; } # 1 + 42 x @Versions +BEGIN { $| = 1; print "1..664\n"; } # 1 + 51 x @Versions my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -46,13 +46,15 @@ my $coll = Unicode::Collate->new( # 9FBC..9FC3 are CJK UI since UCA_Version 18 (Unicode 5.1). # 9FC4..9FCB are CJK UI since UCA_Version 20 (Unicode 5.2). # 9FCC is CJK UI since UCA_Version 24 (Unicode 6.1). +# 9FCD..9FD5 are CJK UI since UCA_Version 32 (Unicode 8.0). # 3400..4DB5 are CJK UI Ext.A since UCA_Version 8 (Unicode 3.0). # 20000..2A6D6 are CJK UI Ext.B since UCA_Version 8 (Unicode 3.1). # 2A700..2B734 are CJK UI Ext.C since UCA_Version 20 (Unicode 5.2). # 2B740..2B81D are CJK UI Ext.D since UCA_Version 22 (Unicode 6.0). +# 2B820..2CEA1 are CJK UI Ext.E since UCA_Version 32 (Unicode 8.0). -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32); for my $v (@Versions) { $coll->change(UCA_Version => $v); @@ -67,7 +69,9 @@ for my $v (@Versions) { ok($coll->cmp("\x{3400}", "\x{9FC4}") == ($v >= 20 ? 1 : -1)); # new ok($coll->cmp("\x{3400}", "\x{9FCB}") == ($v >= 20 ? 1 : -1)); # new ok($coll->cmp("\x{3400}", "\x{9FCC}") == ($v >= 24 ? 1 : -1)); # new - ok($coll->cmp("\x{3400}", "\x{9FCD}") == -1); # na + ok($coll->cmp("\x{3400}", "\x{9FCD}") == ($v >= 32 ? 1 : -1)); # new + ok($coll->cmp("\x{3400}", "\x{9FD5}") == ($v >= 32 ? 1 : -1)); # new + ok($coll->cmp("\x{3400}", "\x{9FD6}") == -1); # na ok($coll->cmp("\x{3400}", "\x{9FFF}") == -1); # na # UI < UI @@ -79,8 +83,10 @@ for my $v (@Versions) { ok($coll->cmp("\x{9FC3}", "\x{9FC4}") == -1); # new < new ok($coll->cmp("\x{9FC4}", "\x{9FCB}") == -1); # new < new ok($coll->cmp("\x{9FCB}", "\x{9FCC}") == -1); # new < new - ok($coll->cmp("\x{9FCC}", "\x{9FCD}") == -1); # new < na - ok($coll->cmp("\x{9FCD}", "\x{9FFF}") == -1); # na < na + ok($coll->cmp("\x{9FCC}", "\x{9FCD}") == -1); # new < new + ok($coll->cmp("\x{9FCD}", "\x{9FD5}") == -1); # new < new + ok($coll->cmp("\x{9FD5}", "\x{9FD6}") == -1); # new < na + ok($coll->cmp("\x{9FD6}", "\x{9FFF}") == -1); # na < na # Ext.A < Ext.B ok($coll->cmp("\x{3400}", "\x{20000}") == -1); @@ -112,5 +118,12 @@ for my $v (@Versions) { ok($coll->cmp("\x{2FFF}", "\x{2B81D}") == ($v >= 22 ? 1 : -1)); # na > D ok($coll->cmp("\x{2FFF}", "\x{2B81E}") == -1); # na < na ok($coll->cmp("\x{2FFF}", "\x{2B81F}") == -1); # na < na + + # Ext.E + ok($coll->cmp("\x{2B820}","\x{2CEA1}") == -1); # E < E + ok($coll->cmp("\x{2FFF}", "\x{2B820}") == ($v >= 32 ? 1 : -1)); # na > E + ok($coll->cmp("\x{2FFF}", "\x{2CEA1}") == ($v >= 32 ? 1 : -1)); # na > E + ok($coll->cmp("\x{2FFF}", "\x{2CEA2}") == -1); # na < na + ok($coll->cmp("\x{2FFF}", "\x{2CEAF}") == -1); # na < na } diff --git a/cpan/Unicode-Collate/t/compatui.t b/cpan/Unicode-Collate/t/compatui.t index 8d1e85d30b..cf4bcab49c 100644 --- a/cpan/Unicode-Collate/t/compatui.t +++ b/cpan/Unicode-Collate/t/compatui.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..771\n"; } # 1 + 70 x @Versions +BEGIN { $| = 1; print "1..911\n"; } # 1 + 70 x @Versions my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -33,7 +33,7 @@ ok(1); ######################### -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32); # 12 compatibility ideographs are treated as unified ideographs: # FA0E, FA0F, FA11, FA13, FA14, FA1F, FA21, FA23, FA24, FA27, FA28, FA29. diff --git a/cpan/Unicode-Collate/t/default.t b/cpan/Unicode-Collate/t/default.t index bdc46dbcb5..85d604f3a7 100644 --- a/cpan/Unicode-Collate/t/default.t +++ b/cpan/Unicode-Collate/t/default.t @@ -165,10 +165,10 @@ my $Tailored = Unicode::Collate->new( ); # Ka vs Kje -ok($Collator->gt("\x{45C}", "\x{43A}")); -ok($Collator->gt("\x{40C}", "\x{41A}")); -ok($Tailored->gt("\x{45C}", "\x{43A}")); -ok($Tailored->gt("\x{40C}", "\x{41A}")); +ok($Collator->eq("\x{45C}", "\x{43A}")); +ok($Collator->eq("\x{40C}", "\x{41A}")); +ok($Tailored->eq("\x{45C}", "\x{43A}")); +ok($Tailored->eq("\x{40C}", "\x{41A}")); # 60 diff --git a/cpan/Unicode-Collate/t/hangtype.t b/cpan/Unicode-Collate/t/hangtype.t index ea9f4936f9..b0a033df4c 100644 --- a/cpan/Unicode-Collate/t/hangtype.t +++ b/cpan/Unicode-Collate/t/hangtype.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..551\n"; } # 1 + 50 x @Versions +BEGIN { $| = 1; print "1..651\n"; } # 1 + 50 x @Versions my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -33,7 +33,7 @@ ok(1); ######################### -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32); for my $v (@Versions) { ok(Unicode::Collate::getHST(0x0000, $v), ''); diff --git a/cpan/Unicode-Collate/t/illegal.t b/cpan/Unicode-Collate/t/illegal.t index 26fff3a357..ea662bb5ac 100644 --- a/cpan/Unicode-Collate/t/illegal.t +++ b/cpan/Unicode-Collate/t/illegal.t @@ -30,7 +30,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..136\n"; } # 81 + 5 x @Versions +BEGIN { $| = 1; print "1..146\n"; } # 81 + 5 x @Versions my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -192,7 +192,7 @@ my $out = Unicode::Collate->new( overrideOut => sub { 0xFFFD }, ); -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32); for my $v (@Versions) { $out->change(UCA_Version => $v); diff --git a/cpan/Unicode-Collate/t/loc_be.t b/cpan/Unicode-Collate/t/loc_be.t index 5d1dfeeb29..26ca455b47 100644 --- a/cpan/Unicode-Collate/t/loc_be.t +++ b/cpan/Unicode-Collate/t/loc_be.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..189\n"; } +BEGIN { $| = 1; print "1..138\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -40,184 +40,155 @@ ok($objBe->getlocale, 'be'); $objBe->change(level => 1); -ok($objBe->gt("\x{451}", "\x{435}")); -ok($objBe->lt("\x{451}", "\x{454}")); - -# 4 - -ok($objBe->gt("\x{4E5}", "\x{438}")); # not suppressed -ok($objBe->gt("\x{4E4}", "\x{418}")); # not suppressed -ok($objBe->gt("\x{439}", "\x{438}")); # not suppressed -ok($objBe->gt("\x{419}", "\x{418}")); # not suppressed -ok($objBe->gt("\x{45E}", "\x{443}")); # not suppressed -ok($objBe->gt("\x{40E}", "\x{423}")); # not suppressed -ok($objBe->gt("\x{4F1}", "\x{443}")); # not suppressed -ok($objBe->gt("\x{4F0}", "\x{423}")); # not suppressed -ok($objBe->gt("\x{4F3}", "\x{443}")); # not suppressed -ok($objBe->gt("\x{4F2}", "\x{423}")); # not suppressed - -# 14 - -ok($objBe->eq("\x{4D1}", "\x{430}")); -ok($objBe->eq("\x{4D0}", "\x{410}")); -ok($objBe->eq("\x{4D3}", "\x{430}")); -ok($objBe->eq("\x{4D2}", "\x{410}")); -ok($objBe->eq("\x{4DB}", "\x{4D9}")); -ok($objBe->eq("\x{4DA}", "\x{4D8}")); -ok($objBe->eq("\x{453}", "\x{433}")); -ok($objBe->eq("\x{403}", "\x{413}")); -ok($objBe->eq("\x{450}", "\x{435}")); # not contraction -ok($objBe->eq("\x{400}", "\x{415}")); # not contraction -ok($objBe->eq("\x{4D7}", "\x{435}")); -ok($objBe->eq("\x{4D6}", "\x{415}")); -ok($objBe->eq("\x{4C2}", "\x{436}")); # not contraction -ok($objBe->eq("\x{4C1}", "\x{416}")); # not contraction -ok($objBe->eq("\x{4DD}", "\x{436}")); -ok($objBe->eq("\x{4DC}", "\x{416}")); -ok($objBe->eq("\x{4DF}", "\x{437}")); -ok($objBe->eq("\x{4DE}", "\x{417}")); -ok($objBe->eq("\x{45D}", "\x{438}")); # not contraction -ok($objBe->eq("\x{40D}", "\x{418}")); # not contraction -ok($objBe->eq("\x{4E3}", "\x{438}")); # not contraction -ok($objBe->eq("\x{4E2}", "\x{418}")); # not contraction -ok($objBe->eq("\x{457}", "\x{456}")); -ok($objBe->eq("\x{407}", "\x{406}")); -ok($objBe->eq("\x{4E7}", "\x{43E}")); -ok($objBe->eq("\x{4E6}", "\x{41E}")); -ok($objBe->eq("\x{4EB}", "\x{4E9}")); -ok($objBe->eq("\x{4EA}", "\x{4E8}")); -ok($objBe->eq("\x{45C}", "\x{43A}")); -ok($objBe->eq("\x{40C}", "\x{41A}")); -ok($objBe->eq("\x{4EF}", "\x{443}")); # not contraction -ok($objBe->eq("\x{4EE}", "\x{423}")); # not contraction -ok($objBe->eq("\x{4F5}", "\x{447}")); -ok($objBe->eq("\x{4F4}", "\x{427}")); -ok($objBe->eq("\x{4F9}", "\x{44B}")); -ok($objBe->eq("\x{4F8}", "\x{42B}")); -ok($objBe->eq("\x{4ED}", "\x{44D}")); -ok($objBe->eq("\x{4EC}", "\x{42D}")); -ok($objBe->eq("\x{477}", "\x{475}")); -ok($objBe->eq("\x{476}", "\x{474}")); - -# 54 +ok($objBe->lt("\x{430}z", "\x{431}")); +ok($objBe->lt("\x{431}z", "\x{432}")); +ok($objBe->lt("\x{432}z", "\x{433}")); +ok($objBe->lt("\x{433}z", "\x{434}")); +ok($objBe->lt("\x{434}z", "\x{435}")); +ok($objBe->lt("\x{435}z", "\x{451}")); +ok($objBe->lt("\x{451}z", "\x{436}")); +ok($objBe->lt("\x{436}z", "\x{437}")); +ok($objBe->lt("\x{437}z", "\x{438}")); +ok($objBe->lt("\x{438}z", "\x{456}")); +ok($objBe->lt("\x{456}z", "\x{439}")); +ok($objBe->lt("\x{439}z", "\x{43a}")); +ok($objBe->lt("\x{43a}z", "\x{43b}")); +ok($objBe->lt("\x{43b}z", "\x{43c}")); +ok($objBe->lt("\x{43c}z", "\x{43d}")); +ok($objBe->lt("\x{43d}z", "\x{43e}")); +ok($objBe->lt("\x{43e}z", "\x{43f}")); +ok($objBe->lt("\x{43f}z", "\x{440}")); +ok($objBe->lt("\x{440}z", "\x{441}")); +ok($objBe->lt("\x{441}z", "\x{442}")); +ok($objBe->lt("\x{442}z", "\x{443}")); +ok($objBe->lt("\x{443}z", "\x{45e}")); +ok($objBe->lt("\x{45e}z", "\x{444}")); +ok($objBe->lt("\x{444}z", "\x{445}")); +ok($objBe->lt("\x{445}z", "\x{446}")); +ok($objBe->lt("\x{446}z", "\x{447}")); +ok($objBe->lt("\x{447}z", "\x{448}")); +ok($objBe->lt("\x{448}z", "\x{44b}")); +ok($objBe->lt("\x{44b}z", "\x{44c}")); +ok($objBe->lt("\x{44c}z", "\x{44d}")); +ok($objBe->lt("\x{44d}z", "\x{44e}")); +ok($objBe->lt("\x{44e}z", "\x{44f}")); + +ok($objBe->lt("\x{410}z", "\x{411}")); +ok($objBe->lt("\x{411}z", "\x{412}")); +ok($objBe->lt("\x{412}z", "\x{413}")); +ok($objBe->lt("\x{413}z", "\x{414}")); +ok($objBe->lt("\x{414}z", "\x{415}")); +ok($objBe->lt("\x{415}z", "\x{401}")); +ok($objBe->lt("\x{401}z", "\x{416}")); +ok($objBe->lt("\x{416}z", "\x{417}")); +ok($objBe->lt("\x{417}z", "\x{418}")); +ok($objBe->lt("\x{418}z", "\x{406}")); +ok($objBe->lt("\x{406}z", "\x{419}")); +ok($objBe->lt("\x{419}z", "\x{41a}")); +ok($objBe->lt("\x{41a}z", "\x{41b}")); +ok($objBe->lt("\x{41b}z", "\x{41c}")); +ok($objBe->lt("\x{41c}z", "\x{41d}")); +ok($objBe->lt("\x{41d}z", "\x{41e}")); +ok($objBe->lt("\x{41e}z", "\x{41f}")); +ok($objBe->lt("\x{41f}z", "\x{420}")); +ok($objBe->lt("\x{420}z", "\x{421}")); +ok($objBe->lt("\x{421}z", "\x{422}")); +ok($objBe->lt("\x{422}z", "\x{423}")); +ok($objBe->lt("\x{423}z", "\x{40e}")); +ok($objBe->lt("\x{40e}z", "\x{424}")); +ok($objBe->lt("\x{424}z", "\x{425}")); +ok($objBe->lt("\x{425}z", "\x{426}")); +ok($objBe->lt("\x{426}z", "\x{427}")); +ok($objBe->lt("\x{427}z", "\x{428}")); +ok($objBe->lt("\x{428}z", "\x{42b}")); +ok($objBe->lt("\x{42b}z", "\x{42c}")); +ok($objBe->lt("\x{42c}z", "\x{42d}")); +ok($objBe->lt("\x{42d}z", "\x{42e}")); +ok($objBe->lt("\x{42e}z", "\x{42f}")); + +# 66 $objBe->change(level => 2); +ok($objBe->eq("\x{430}", "\x{410}")); +ok($objBe->eq("\x{431}", "\x{411}")); +ok($objBe->eq("\x{432}", "\x{412}")); +ok($objBe->eq("\x{433}", "\x{413}")); +ok($objBe->eq("\x{434}", "\x{414}")); +ok($objBe->eq("\x{435}", "\x{415}")); ok($objBe->eq("\x{451}", "\x{401}")); - -# 55 - -ok($objBe->gt("\x{4D1}", "\x{430}")); -ok($objBe->gt("\x{4D0}", "\x{410}")); -ok($objBe->gt("\x{4D3}", "\x{430}")); -ok($objBe->gt("\x{4D2}", "\x{410}")); -ok($objBe->gt("\x{4DB}", "\x{4D9}")); -ok($objBe->gt("\x{4DA}", "\x{4D8}")); -ok($objBe->gt("\x{453}", "\x{433}")); -ok($objBe->gt("\x{403}", "\x{413}")); -ok($objBe->gt("\x{450}", "\x{435}")); # not contraction -ok($objBe->gt("\x{400}", "\x{415}")); # not contraction -ok($objBe->gt("\x{4D7}", "\x{435}")); -ok($objBe->gt("\x{4D6}", "\x{415}")); -ok($objBe->gt("\x{4C2}", "\x{436}")); # not contraction -ok($objBe->gt("\x{4C1}", "\x{416}")); # not contraction -ok($objBe->gt("\x{4DD}", "\x{436}")); -ok($objBe->gt("\x{4DC}", "\x{416}")); -ok($objBe->gt("\x{4DF}", "\x{437}")); -ok($objBe->gt("\x{4DE}", "\x{417}")); -ok($objBe->gt("\x{45D}", "\x{438}")); # not contraction -ok($objBe->gt("\x{40D}", "\x{418}")); # not contraction -ok($objBe->gt("\x{4E3}", "\x{438}")); # not contraction -ok($objBe->gt("\x{4E2}", "\x{418}")); # not contraction -ok($objBe->gt("\x{457}", "\x{456}")); -ok($objBe->gt("\x{407}", "\x{406}")); -ok($objBe->gt("\x{4E7}", "\x{43E}")); -ok($objBe->gt("\x{4E6}", "\x{41E}")); -ok($objBe->gt("\x{4EB}", "\x{4E9}")); -ok($objBe->gt("\x{4EA}", "\x{4E8}")); -ok($objBe->gt("\x{45C}", "\x{43A}")); -ok($objBe->gt("\x{40C}", "\x{41A}")); -ok($objBe->gt("\x{4EF}", "\x{443}")); # not contraction -ok($objBe->gt("\x{4EE}", "\x{423}")); # not contraction -ok($objBe->gt("\x{4F5}", "\x{447}")); -ok($objBe->gt("\x{4F4}", "\x{427}")); -ok($objBe->gt("\x{4F9}", "\x{44B}")); -ok($objBe->gt("\x{4F8}", "\x{42B}")); -ok($objBe->gt("\x{4ED}", "\x{44D}")); -ok($objBe->gt("\x{4EC}", "\x{42D}")); -ok($objBe->gt("\x{477}", "\x{475}")); -ok($objBe->gt("\x{476}", "\x{474}")); - -# 95 +ok($objBe->eq("\x{436}", "\x{416}")); +ok($objBe->eq("\x{437}", "\x{417}")); +ok($objBe->eq("\x{438}", "\x{418}")); +ok($objBe->eq("\x{456}", "\x{406}")); +ok($objBe->eq("\x{439}", "\x{419}")); +ok($objBe->eq("\x{43a}", "\x{41a}")); +ok($objBe->eq("\x{43b}", "\x{41b}")); +ok($objBe->eq("\x{43c}", "\x{41c}")); +ok($objBe->eq("\x{43d}", "\x{41d}")); +ok($objBe->eq("\x{43e}", "\x{41e}")); +ok($objBe->eq("\x{43f}", "\x{41f}")); +ok($objBe->eq("\x{440}", "\x{420}")); +ok($objBe->eq("\x{441}", "\x{421}")); +ok($objBe->eq("\x{442}", "\x{422}")); +ok($objBe->eq("\x{443}", "\x{423}")); +ok($objBe->eq("\x{45e}", "\x{40e}")); +ok($objBe->eq("\x{444}", "\x{424}")); +ok($objBe->eq("\x{445}", "\x{425}")); +ok($objBe->eq("\x{446}", "\x{426}")); +ok($objBe->eq("\x{447}", "\x{427}")); +ok($objBe->eq("\x{448}", "\x{428}")); +ok($objBe->eq("\x{44b}", "\x{42b}")); +ok($objBe->eq("\x{44c}", "\x{42c}")); +ok($objBe->eq("\x{44d}", "\x{42d}")); +ok($objBe->eq("\x{44e}", "\x{42e}")); +ok($objBe->eq("\x{44f}", "\x{42f}")); + +# 99 $objBe->change(level => 3); +ok($objBe->lt("\x{430}", "\x{410}")); +ok($objBe->lt("\x{431}", "\x{411}")); +ok($objBe->lt("\x{432}", "\x{412}")); +ok($objBe->lt("\x{433}", "\x{413}")); +ok($objBe->lt("\x{434}", "\x{414}")); +ok($objBe->lt("\x{435}", "\x{415}")); ok($objBe->lt("\x{451}", "\x{401}")); - -# 96 +ok($objBe->lt("\x{436}", "\x{416}")); +ok($objBe->lt("\x{437}", "\x{417}")); +ok($objBe->lt("\x{438}", "\x{418}")); +ok($objBe->lt("\x{456}", "\x{406}")); +ok($objBe->lt("\x{439}", "\x{419}")); +ok($objBe->lt("\x{43a}", "\x{41a}")); +ok($objBe->lt("\x{43b}", "\x{41b}")); +ok($objBe->lt("\x{43c}", "\x{41c}")); +ok($objBe->lt("\x{43d}", "\x{41d}")); +ok($objBe->lt("\x{43e}", "\x{41e}")); +ok($objBe->lt("\x{43f}", "\x{41f}")); +ok($objBe->lt("\x{440}", "\x{420}")); +ok($objBe->lt("\x{441}", "\x{421}")); +ok($objBe->lt("\x{442}", "\x{422}")); +ok($objBe->lt("\x{443}", "\x{423}")); +ok($objBe->lt("\x{45e}", "\x{40e}")); +ok($objBe->lt("\x{444}", "\x{424}")); +ok($objBe->lt("\x{445}", "\x{425}")); +ok($objBe->lt("\x{446}", "\x{426}")); +ok($objBe->lt("\x{447}", "\x{427}")); +ok($objBe->lt("\x{448}", "\x{428}")); +ok($objBe->lt("\x{44b}", "\x{42b}")); +ok($objBe->lt("\x{44c}", "\x{42c}")); +ok($objBe->lt("\x{44d}", "\x{42d}")); +ok($objBe->lt("\x{44e}", "\x{42e}")); +ok($objBe->lt("\x{44f}", "\x{42f}")); + +# 132 ok($objBe->eq("\x{451}", "\x{435}\x{308}")); ok($objBe->eq("\x{401}", "\x{415}\x{308}")); -ok($objBe->eq("\x{4E5}", "\x{438}\x{308}")); # not suppressed -ok($objBe->eq("\x{4E4}", "\x{418}\x{308}")); # not suppressed -ok($objBe->eq("\x{439}", "\x{438}\x{306}")); # not suppressed -ok($objBe->eq("\x{419}", "\x{418}\x{306}")); # not suppressed -ok($objBe->eq("\x{45E}", "\x{443}\x{306}")); # not suppressed -ok($objBe->eq("\x{40E}", "\x{423}\x{306}")); # not suppressed -ok($objBe->eq("\x{4F1}", "\x{443}\x{308}")); # not suppressed -ok($objBe->eq("\x{4F0}", "\x{423}\x{308}")); # not suppressed -ok($objBe->eq("\x{4F3}", "\x{443}\x{30B}")); # not suppressed -ok($objBe->eq("\x{4F2}", "\x{423}\x{30B}")); # not suppressed - -# 108 - -for my $i ("", "\0") { - ok($objBe->eq("\x{4D1}", "\x{430}$i\x{306}")); - ok($objBe->eq("\x{4D0}", "\x{410}$i\x{306}")); - ok($objBe->eq("\x{4D3}", "\x{430}$i\x{308}")); - ok($objBe->eq("\x{4D2}", "\x{410}$i\x{308}")); - ok($objBe->eq("\x{4DB}", "\x{4D9}$i\x{308}")); - ok($objBe->eq("\x{4DA}", "\x{4D8}$i\x{308}")); - ok($objBe->eq("\x{453}", "\x{433}$i\x{301}")); - ok($objBe->eq("\x{403}", "\x{413}$i\x{301}")); - ok($objBe->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction - ok($objBe->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction - ok($objBe->eq("\x{4D7}", "\x{435}$i\x{306}")); - ok($objBe->eq("\x{4D6}", "\x{415}$i\x{306}")); - ok($objBe->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction - ok($objBe->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction - ok($objBe->eq("\x{4DD}", "\x{436}$i\x{308}")); - ok($objBe->eq("\x{4DC}", "\x{416}$i\x{308}")); - ok($objBe->eq("\x{4DF}", "\x{437}$i\x{308}")); - ok($objBe->eq("\x{4DE}", "\x{417}$i\x{308}")); - ok($objBe->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction - ok($objBe->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction - ok($objBe->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction - ok($objBe->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction - ok($objBe->eq("\x{457}", "\x{456}$i\x{308}")); - ok($objBe->eq("\x{407}", "\x{406}$i\x{308}")); - ok($objBe->eq("\x{4E7}", "\x{43E}$i\x{308}")); - ok($objBe->eq("\x{4E6}", "\x{41E}$i\x{308}")); - ok($objBe->eq("\x{4EB}", "\x{4E9}$i\x{308}")); - ok($objBe->eq("\x{4EA}", "\x{4E8}$i\x{308}")); - ok($objBe->eq("\x{45C}", "\x{43A}$i\x{301}")); - ok($objBe->eq("\x{40C}", "\x{41A}$i\x{301}")); - ok($objBe->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction - ok($objBe->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction - ok($objBe->eq("\x{4F5}", "\x{447}$i\x{308}")); - ok($objBe->eq("\x{4F4}", "\x{427}$i\x{308}")); - ok($objBe->eq("\x{4F9}", "\x{44B}$i\x{308}")); - ok($objBe->eq("\x{4F8}", "\x{42B}$i\x{308}")); - ok($objBe->eq("\x{4ED}", "\x{44D}$i\x{308}")); - ok($objBe->eq("\x{4EC}", "\x{42D}$i\x{308}")); - ok($objBe->eq("\x{477}", "\x{475}$i\x{30F}")); - ok($objBe->eq("\x{476}", "\x{474}$i\x{30F}")); -} - -# 188 - -$objBe->change(upper_before_lower => 1); - -ok($objBe->gt("\x{451}", "\x{401}")); +ok($objBe->eq("\x{439}", "\x{438}\x{306}")); +ok($objBe->eq("\x{419}", "\x{418}\x{306}")); +ok($objBe->eq("\x{45e}", "\x{443}\x{306}")); +ok($objBe->eq("\x{40e}", "\x{423}\x{306}")); -# 189 +# 138 diff --git a/cpan/Unicode-Collate/t/loc_bg.t b/cpan/Unicode-Collate/t/loc_bg.t index 792b4b10fb..15ecff7a1a 100644 --- a/cpan/Unicode-Collate/t/loc_bg.t +++ b/cpan/Unicode-Collate/t/loc_bg.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..202\n"; } +BEGIN { $| = 1; print "1..122\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -36,179 +36,143 @@ ok(1); my $objBg = Unicode::Collate::Locale-> new(locale => 'BG', normalization => undef); -ok($objBg->getlocale, 'bg'); +ok($objBg->getlocale, 'default'); # no tailoring since 1.17 $objBg->change(level => 1); -ok($objBg->gt("\x{4E5}", "\x{438}")); # not suppressed -ok($objBg->gt("\x{4E4}", "\x{418}")); # not suppressed -ok($objBg->gt("\x{439}", "\x{438}")); # not suppressed -ok($objBg->gt("\x{419}", "\x{418}")); # not suppressed - -# 6 - -ok($objBg->eq("\x{4D1}", "\x{430}")); -ok($objBg->eq("\x{4D0}", "\x{410}")); -ok($objBg->eq("\x{4D3}", "\x{430}")); -ok($objBg->eq("\x{4D2}", "\x{410}")); -ok($objBg->eq("\x{4DB}", "\x{4D9}")); -ok($objBg->eq("\x{4DA}", "\x{4D8}")); -ok($objBg->eq("\x{453}", "\x{433}")); -ok($objBg->eq("\x{403}", "\x{413}")); -ok($objBg->eq("\x{450}", "\x{435}")); # not contraction -ok($objBg->eq("\x{400}", "\x{415}")); # not contraction -ok($objBg->eq("\x{451}", "\x{435}")); # not contraction -ok($objBg->eq("\x{401}", "\x{415}")); # not contraction -ok($objBg->eq("\x{4D7}", "\x{435}")); -ok($objBg->eq("\x{4D6}", "\x{415}")); -ok($objBg->eq("\x{4C2}", "\x{436}")); # not contraction -ok($objBg->eq("\x{4C1}", "\x{416}")); # not contraction -ok($objBg->eq("\x{4DD}", "\x{436}")); -ok($objBg->eq("\x{4DC}", "\x{416}")); -ok($objBg->eq("\x{4DF}", "\x{437}")); -ok($objBg->eq("\x{4DE}", "\x{417}")); -ok($objBg->eq("\x{45D}", "\x{438}")); # not contraction -ok($objBg->eq("\x{40D}", "\x{418}")); # not contraction -ok($objBg->eq("\x{4E3}", "\x{438}")); # not contraction -ok($objBg->eq("\x{4E2}", "\x{418}")); # not contraction -ok($objBg->eq("\x{457}", "\x{456}")); -ok($objBg->eq("\x{407}", "\x{406}")); -ok($objBg->eq("\x{4E7}", "\x{43E}")); -ok($objBg->eq("\x{4E6}", "\x{41E}")); -ok($objBg->eq("\x{4EB}", "\x{4E9}")); -ok($objBg->eq("\x{4EA}", "\x{4E8}")); -ok($objBg->eq("\x{45C}", "\x{43A}")); -ok($objBg->eq("\x{40C}", "\x{41A}")); -ok($objBg->eq("\x{4EF}", "\x{443}")); # not contraction -ok($objBg->eq("\x{4EE}", "\x{423}")); # not contraction -ok($objBg->eq("\x{45E}", "\x{443}")); -ok($objBg->eq("\x{40E}", "\x{423}")); -ok($objBg->eq("\x{4F1}", "\x{443}")); -ok($objBg->eq("\x{4F0}", "\x{423}")); -ok($objBg->eq("\x{4F3}", "\x{443}")); -ok($objBg->eq("\x{4F2}", "\x{423}")); -ok($objBg->eq("\x{4F5}", "\x{447}")); -ok($objBg->eq("\x{4F4}", "\x{427}")); -ok($objBg->eq("\x{4F9}", "\x{44B}")); -ok($objBg->eq("\x{4F8}", "\x{42B}")); -ok($objBg->eq("\x{4ED}", "\x{44D}")); -ok($objBg->eq("\x{4EC}", "\x{42D}")); -ok($objBg->eq("\x{477}", "\x{475}")); -ok($objBg->eq("\x{476}", "\x{474}")); - -# 54 +ok($objBg->lt("\x{430}z", "\x{431}")); +ok($objBg->lt("\x{431}z", "\x{432}")); +ok($objBg->lt("\x{432}z", "\x{433}")); +ok($objBg->lt("\x{433}z", "\x{434}")); +ok($objBg->lt("\x{434}z", "\x{435}")); +ok($objBg->lt("\x{435}z", "\x{436}")); +ok($objBg->lt("\x{436}z", "\x{437}")); +ok($objBg->lt("\x{437}z", "\x{438}")); +ok($objBg->lt("\x{438}z", "\x{439}")); +ok($objBg->lt("\x{439}z", "\x{43a}")); +ok($objBg->lt("\x{43a}z", "\x{43b}")); +ok($objBg->lt("\x{43b}z", "\x{43c}")); +ok($objBg->lt("\x{43c}z", "\x{43d}")); +ok($objBg->lt("\x{43d}z", "\x{43e}")); +ok($objBg->lt("\x{43e}z", "\x{43f}")); +ok($objBg->lt("\x{43f}z", "\x{440}")); +ok($objBg->lt("\x{440}z", "\x{441}")); +ok($objBg->lt("\x{441}z", "\x{442}")); +ok($objBg->lt("\x{442}z", "\x{443}")); +ok($objBg->lt("\x{443}z", "\x{444}")); +ok($objBg->lt("\x{444}z", "\x{445}")); +ok($objBg->lt("\x{445}z", "\x{446}")); +ok($objBg->lt("\x{446}z", "\x{447}")); +ok($objBg->lt("\x{447}z", "\x{448}")); +ok($objBg->lt("\x{448}z", "\x{449}")); +ok($objBg->lt("\x{449}z", "\x{44a}")); +ok($objBg->lt("\x{44a}z", "\x{44c}")); +ok($objBg->lt("\x{44c}z", "\x{44e}")); +ok($objBg->lt("\x{44e}z", "\x{44f}")); + +ok($objBg->lt("\x{410}z", "\x{411}")); +ok($objBg->lt("\x{411}z", "\x{412}")); +ok($objBg->lt("\x{412}z", "\x{413}")); +ok($objBg->lt("\x{413}z", "\x{414}")); +ok($objBg->lt("\x{414}z", "\x{415}")); +ok($objBg->lt("\x{415}z", "\x{416}")); +ok($objBg->lt("\x{416}z", "\x{417}")); +ok($objBg->lt("\x{417}z", "\x{418}")); +ok($objBg->lt("\x{418}z", "\x{419}")); +ok($objBg->lt("\x{419}z", "\x{41a}")); +ok($objBg->lt("\x{41a}z", "\x{41b}")); +ok($objBg->lt("\x{41b}z", "\x{41c}")); +ok($objBg->lt("\x{41c}z", "\x{41d}")); +ok($objBg->lt("\x{41d}z", "\x{41e}")); +ok($objBg->lt("\x{41e}z", "\x{41f}")); +ok($objBg->lt("\x{41f}z", "\x{420}")); +ok($objBg->lt("\x{420}z", "\x{421}")); +ok($objBg->lt("\x{421}z", "\x{422}")); +ok($objBg->lt("\x{422}z", "\x{423}")); +ok($objBg->lt("\x{423}z", "\x{424}")); +ok($objBg->lt("\x{424}z", "\x{425}")); +ok($objBg->lt("\x{425}z", "\x{426}")); +ok($objBg->lt("\x{426}z", "\x{427}")); +ok($objBg->lt("\x{427}z", "\x{428}")); +ok($objBg->lt("\x{428}z", "\x{429}")); +ok($objBg->lt("\x{429}z", "\x{42a}")); +ok($objBg->lt("\x{42a}z", "\x{42c}")); +ok($objBg->lt("\x{42c}z", "\x{42e}")); +ok($objBg->lt("\x{42e}z", "\x{42f}")); + +# 60 $objBg->change(level => 2); -ok($objBg->gt("\x{4D1}", "\x{430}")); -ok($objBg->gt("\x{4D0}", "\x{410}")); -ok($objBg->gt("\x{4D3}", "\x{430}")); -ok($objBg->gt("\x{4D2}", "\x{410}")); -ok($objBg->gt("\x{4DB}", "\x{4D9}")); -ok($objBg->gt("\x{4DA}", "\x{4D8}")); -ok($objBg->gt("\x{453}", "\x{433}")); -ok($objBg->gt("\x{403}", "\x{413}")); -ok($objBg->gt("\x{450}", "\x{435}")); # not contraction -ok($objBg->gt("\x{400}", "\x{415}")); # not contraction -ok($objBg->gt("\x{451}", "\x{435}")); # not contraction -ok($objBg->gt("\x{401}", "\x{415}")); # not contraction -ok($objBg->gt("\x{4D7}", "\x{435}")); -ok($objBg->gt("\x{4D6}", "\x{415}")); -ok($objBg->gt("\x{4C2}", "\x{436}")); # not contraction -ok($objBg->gt("\x{4C1}", "\x{416}")); # not contraction -ok($objBg->gt("\x{4DD}", "\x{436}")); -ok($objBg->gt("\x{4DC}", "\x{416}")); -ok($objBg->gt("\x{4DF}", "\x{437}")); -ok($objBg->gt("\x{4DE}", "\x{417}")); -ok($objBg->gt("\x{45D}", "\x{438}")); # not contraction -ok($objBg->gt("\x{40D}", "\x{418}")); # not contraction -ok($objBg->gt("\x{4E3}", "\x{438}")); # not contraction -ok($objBg->gt("\x{4E2}", "\x{418}")); # not contraction -ok($objBg->gt("\x{457}", "\x{456}")); -ok($objBg->gt("\x{407}", "\x{406}")); -ok($objBg->gt("\x{4E7}", "\x{43E}")); -ok($objBg->gt("\x{4E6}", "\x{41E}")); -ok($objBg->gt("\x{4EB}", "\x{4E9}")); -ok($objBg->gt("\x{4EA}", "\x{4E8}")); -ok($objBg->gt("\x{45C}", "\x{43A}")); -ok($objBg->gt("\x{40C}", "\x{41A}")); -ok($objBg->gt("\x{4EF}", "\x{443}")); # not contraction -ok($objBg->gt("\x{4EE}", "\x{423}")); # not contraction -ok($objBg->gt("\x{45E}", "\x{443}")); -ok($objBg->gt("\x{40E}", "\x{423}")); -ok($objBg->gt("\x{4F1}", "\x{443}")); -ok($objBg->gt("\x{4F0}", "\x{423}")); -ok($objBg->gt("\x{4F3}", "\x{443}")); -ok($objBg->gt("\x{4F2}", "\x{423}")); -ok($objBg->gt("\x{4F5}", "\x{447}")); -ok($objBg->gt("\x{4F4}", "\x{427}")); -ok($objBg->gt("\x{4F9}", "\x{44B}")); -ok($objBg->gt("\x{4F8}", "\x{42B}")); -ok($objBg->gt("\x{4ED}", "\x{44D}")); -ok($objBg->gt("\x{4EC}", "\x{42D}")); -ok($objBg->gt("\x{477}", "\x{475}")); -ok($objBg->gt("\x{476}", "\x{474}")); - -# 102 +ok($objBg->eq("\x{430}", "\x{410}")); +ok($objBg->eq("\x{431}", "\x{411}")); +ok($objBg->eq("\x{432}", "\x{412}")); +ok($objBg->eq("\x{433}", "\x{413}")); +ok($objBg->eq("\x{434}", "\x{414}")); +ok($objBg->eq("\x{435}", "\x{415}")); +ok($objBg->eq("\x{436}", "\x{416}")); +ok($objBg->eq("\x{437}", "\x{417}")); +ok($objBg->eq("\x{438}", "\x{418}")); +ok($objBg->eq("\x{439}", "\x{419}")); +ok($objBg->eq("\x{43a}", "\x{41a}")); +ok($objBg->eq("\x{43b}", "\x{41b}")); +ok($objBg->eq("\x{43c}", "\x{41c}")); +ok($objBg->eq("\x{43d}", "\x{41d}")); +ok($objBg->eq("\x{43e}", "\x{41e}")); +ok($objBg->eq("\x{43f}", "\x{41f}")); +ok($objBg->eq("\x{440}", "\x{420}")); +ok($objBg->eq("\x{441}", "\x{421}")); +ok($objBg->eq("\x{442}", "\x{422}")); +ok($objBg->eq("\x{443}", "\x{423}")); +ok($objBg->eq("\x{444}", "\x{424}")); +ok($objBg->eq("\x{445}", "\x{425}")); +ok($objBg->eq("\x{446}", "\x{426}")); +ok($objBg->eq("\x{447}", "\x{427}")); +ok($objBg->eq("\x{448}", "\x{428}")); +ok($objBg->eq("\x{449}", "\x{429}")); +ok($objBg->eq("\x{44a}", "\x{42a}")); +ok($objBg->eq("\x{44c}", "\x{42c}")); +ok($objBg->eq("\x{44e}", "\x{42e}")); +ok($objBg->eq("\x{44f}", "\x{42f}")); + +# 90 $objBg->change(level => 3); -ok($objBg->eq("\x{4E5}", "\x{438}\x{308}")); # not suppressed -ok($objBg->eq("\x{4E4}", "\x{418}\x{308}")); # not suppressed -ok($objBg->eq("\x{439}", "\x{438}\x{306}")); # not suppressed -ok($objBg->eq("\x{419}", "\x{418}\x{306}")); # not suppressed - -# 106 - -for my $i ("", "\0") { - ok($objBg->eq("\x{4D1}", "\x{430}$i\x{306}")); - ok($objBg->eq("\x{4D0}", "\x{410}$i\x{306}")); - ok($objBg->eq("\x{4D3}", "\x{430}$i\x{308}")); - ok($objBg->eq("\x{4D2}", "\x{410}$i\x{308}")); - ok($objBg->eq("\x{4DB}", "\x{4D9}$i\x{308}")); - ok($objBg->eq("\x{4DA}", "\x{4D8}$i\x{308}")); - ok($objBg->eq("\x{453}", "\x{433}$i\x{301}")); - ok($objBg->eq("\x{403}", "\x{413}$i\x{301}")); - ok($objBg->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction - ok($objBg->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction - ok($objBg->eq("\x{451}", "\x{435}$i\x{308}")); # not contraction - ok($objBg->eq("\x{401}", "\x{415}$i\x{308}")); # not contraction - ok($objBg->eq("\x{4D7}", "\x{435}$i\x{306}")); - ok($objBg->eq("\x{4D6}", "\x{415}$i\x{306}")); - ok($objBg->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction - ok($objBg->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction - ok($objBg->eq("\x{4DD}", "\x{436}$i\x{308}")); - ok($objBg->eq("\x{4DC}", "\x{416}$i\x{308}")); - ok($objBg->eq("\x{4DF}", "\x{437}$i\x{308}")); - ok($objBg->eq("\x{4DE}", "\x{417}$i\x{308}")); - ok($objBg->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction - ok($objBg->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction - ok($objBg->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction - ok($objBg->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction - ok($objBg->eq("\x{457}", "\x{456}$i\x{308}")); - ok($objBg->eq("\x{407}", "\x{406}$i\x{308}")); - ok($objBg->eq("\x{4E7}", "\x{43E}$i\x{308}")); - ok($objBg->eq("\x{4E6}", "\x{41E}$i\x{308}")); - ok($objBg->eq("\x{4EB}", "\x{4E9}$i\x{308}")); - ok($objBg->eq("\x{4EA}", "\x{4E8}$i\x{308}")); - ok($objBg->eq("\x{45C}", "\x{43A}$i\x{301}")); - ok($objBg->eq("\x{40C}", "\x{41A}$i\x{301}")); - ok($objBg->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction - ok($objBg->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction - ok($objBg->eq("\x{45E}", "\x{443}$i\x{306}")); - ok($objBg->eq("\x{40E}", "\x{423}$i\x{306}")); - ok($objBg->eq("\x{4F1}", "\x{443}$i\x{308}")); - ok($objBg->eq("\x{4F0}", "\x{423}$i\x{308}")); - ok($objBg->eq("\x{4F3}", "\x{443}$i\x{30B}")); - ok($objBg->eq("\x{4F2}", "\x{423}$i\x{30B}")); - ok($objBg->eq("\x{4F5}", "\x{447}$i\x{308}")); - ok($objBg->eq("\x{4F4}", "\x{427}$i\x{308}")); - ok($objBg->eq("\x{4F9}", "\x{44B}$i\x{308}")); - ok($objBg->eq("\x{4F8}", "\x{42B}$i\x{308}")); - ok($objBg->eq("\x{4ED}", "\x{44D}$i\x{308}")); - ok($objBg->eq("\x{4EC}", "\x{42D}$i\x{308}")); - ok($objBg->eq("\x{477}", "\x{475}$i\x{30F}")); - ok($objBg->eq("\x{476}", "\x{474}$i\x{30F}")); -} - -# 202 +ok($objBg->lt("\x{430}", "\x{410}")); +ok($objBg->lt("\x{431}", "\x{411}")); +ok($objBg->lt("\x{432}", "\x{412}")); +ok($objBg->lt("\x{433}", "\x{413}")); +ok($objBg->lt("\x{434}", "\x{414}")); +ok($objBg->lt("\x{435}", "\x{415}")); +ok($objBg->lt("\x{436}", "\x{416}")); +ok($objBg->lt("\x{437}", "\x{417}")); +ok($objBg->lt("\x{438}", "\x{418}")); +ok($objBg->lt("\x{439}", "\x{419}")); +ok($objBg->lt("\x{43a}", "\x{41a}")); +ok($objBg->lt("\x{43b}", "\x{41b}")); +ok($objBg->lt("\x{43c}", "\x{41c}")); +ok($objBg->lt("\x{43d}", "\x{41d}")); +ok($objBg->lt("\x{43e}", "\x{41e}")); +ok($objBg->lt("\x{43f}", "\x{41f}")); +ok($objBg->lt("\x{440}", "\x{420}")); +ok($objBg->lt("\x{441}", "\x{421}")); +ok($objBg->lt("\x{442}", "\x{422}")); +ok($objBg->lt("\x{443}", "\x{423}")); +ok($objBg->lt("\x{444}", "\x{424}")); +ok($objBg->lt("\x{445}", "\x{425}")); +ok($objBg->lt("\x{446}", "\x{426}")); +ok($objBg->lt("\x{447}", "\x{427}")); +ok($objBg->lt("\x{448}", "\x{428}")); +ok($objBg->lt("\x{449}", "\x{429}")); +ok($objBg->lt("\x{44a}", "\x{42a}")); +ok($objBg->lt("\x{44c}", "\x{42c}")); +ok($objBg->lt("\x{44e}", "\x{42e}")); +ok($objBg->lt("\x{44f}", "\x{42f}")); + +# 120 + +ok($objBg->eq("\x{439}", "\x{438}\x{306}")); +ok($objBg->eq("\x{419}", "\x{418}\x{306}")); + +# 122 diff --git a/cpan/Unicode-Collate/t/loc_bscy.t b/cpan/Unicode-Collate/t/loc_bscy.t index ce3457f981..8245e60ad3 100644 --- a/cpan/Unicode-Collate/t/loc_bscy.t +++ b/cpan/Unicode-Collate/t/loc_bscy.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..210\n"; } +BEGIN { $| = 1; print "1..128\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -40,173 +40,151 @@ ok($objBsCyrl->getlocale, 'bs_Cyrl'); $objBsCyrl->change(level => 1); -ok($objBsCyrl->eq("\x{4D1}", "\x{430}")); -ok($objBsCyrl->eq("\x{4D0}", "\x{410}")); -ok($objBsCyrl->eq("\x{4D3}", "\x{430}")); -ok($objBsCyrl->eq("\x{4D2}", "\x{410}")); -ok($objBsCyrl->eq("\x{4DB}", "\x{4D9}")); -ok($objBsCyrl->eq("\x{4DA}", "\x{4D8}")); -ok($objBsCyrl->eq("\x{453}", "\x{433}")); -ok($objBsCyrl->eq("\x{403}", "\x{413}")); -ok($objBsCyrl->eq("\x{450}", "\x{435}")); # not contraction -ok($objBsCyrl->eq("\x{400}", "\x{415}")); # not contraction -ok($objBsCyrl->eq("\x{451}", "\x{435}")); # not contraction -ok($objBsCyrl->eq("\x{401}", "\x{415}")); # not contraction -ok($objBsCyrl->eq("\x{4D7}", "\x{435}")); -ok($objBsCyrl->eq("\x{4D6}", "\x{415}")); -ok($objBsCyrl->eq("\x{4C2}", "\x{436}")); # not contraction -ok($objBsCyrl->eq("\x{4C1}", "\x{416}")); # not contraction -ok($objBsCyrl->eq("\x{4DD}", "\x{436}")); -ok($objBsCyrl->eq("\x{4DC}", "\x{416}")); -ok($objBsCyrl->eq("\x{4DF}", "\x{437}")); -ok($objBsCyrl->eq("\x{4DE}", "\x{417}")); -ok($objBsCyrl->eq("\x{45D}", "\x{438}")); # not contraction -ok($objBsCyrl->eq("\x{40D}", "\x{418}")); # not contraction -ok($objBsCyrl->eq("\x{4E3}", "\x{438}")); # not contraction -ok($objBsCyrl->eq("\x{4E2}", "\x{418}")); # not contraction -ok($objBsCyrl->eq("\x{4E5}", "\x{438}")); -ok($objBsCyrl->eq("\x{4E4}", "\x{418}")); -ok($objBsCyrl->eq("\x{457}", "\x{456}")); -ok($objBsCyrl->eq("\x{407}", "\x{406}")); -ok($objBsCyrl->eq("\x{439}", "\x{438}")); -ok($objBsCyrl->eq("\x{419}", "\x{418}")); -ok($objBsCyrl->eq("\x{4E7}", "\x{43E}")); -ok($objBsCyrl->eq("\x{4E6}", "\x{41E}")); -ok($objBsCyrl->eq("\x{4EB}", "\x{4E9}")); -ok($objBsCyrl->eq("\x{4EA}", "\x{4E8}")); -ok($objBsCyrl->eq("\x{45C}", "\x{43A}")); -ok($objBsCyrl->eq("\x{40C}", "\x{41A}")); -ok($objBsCyrl->eq("\x{4EF}", "\x{443}")); # not contraction -ok($objBsCyrl->eq("\x{4EE}", "\x{423}")); # not contraction -ok($objBsCyrl->eq("\x{45E}", "\x{443}")); -ok($objBsCyrl->eq("\x{40E}", "\x{423}")); -ok($objBsCyrl->eq("\x{4F1}", "\x{443}")); -ok($objBsCyrl->eq("\x{4F0}", "\x{423}")); -ok($objBsCyrl->eq("\x{4F3}", "\x{443}")); -ok($objBsCyrl->eq("\x{4F2}", "\x{423}")); -ok($objBsCyrl->eq("\x{4F5}", "\x{447}")); -ok($objBsCyrl->eq("\x{4F4}", "\x{427}")); -ok($objBsCyrl->eq("\x{4F9}", "\x{44B}")); -ok($objBsCyrl->eq("\x{4F8}", "\x{42B}")); -ok($objBsCyrl->eq("\x{4ED}", "\x{44D}")); -ok($objBsCyrl->eq("\x{4EC}", "\x{42D}")); -ok($objBsCyrl->eq("\x{477}", "\x{475}")); -ok($objBsCyrl->eq("\x{476}", "\x{474}")); - -# 54 +ok($objBsCyrl->lt("\x{430}z", "\x{431}")); +ok($objBsCyrl->lt("\x{431}z", "\x{432}")); +ok($objBsCyrl->lt("\x{432}z", "\x{433}")); +ok($objBsCyrl->lt("\x{433}z", "\x{434}")); +ok($objBsCyrl->lt("\x{434}z", "\x{452}")); +ok($objBsCyrl->lt("\x{452}z", "\x{435}")); +ok($objBsCyrl->lt("\x{435}z", "\x{436}")); +ok($objBsCyrl->lt("\x{436}z", "\x{437}")); +ok($objBsCyrl->lt("\x{437}z", "\x{438}")); +ok($objBsCyrl->lt("\x{438}z", "\x{458}")); +ok($objBsCyrl->lt("\x{458}z", "\x{43a}")); +ok($objBsCyrl->lt("\x{43a}z", "\x{43b}")); +ok($objBsCyrl->lt("\x{43b}z", "\x{459}")); +ok($objBsCyrl->lt("\x{459}z", "\x{43c}")); +ok($objBsCyrl->lt("\x{43c}z", "\x{43d}")); +ok($objBsCyrl->lt("\x{43d}z", "\x{45a}")); +ok($objBsCyrl->lt("\x{45a}z", "\x{43e}")); +ok($objBsCyrl->lt("\x{43e}z", "\x{43f}")); +ok($objBsCyrl->lt("\x{43f}z", "\x{440}")); +ok($objBsCyrl->lt("\x{440}z", "\x{441}")); +ok($objBsCyrl->lt("\x{441}z", "\x{442}")); +ok($objBsCyrl->lt("\x{442}z", "\x{45b}")); +ok($objBsCyrl->lt("\x{45b}z", "\x{443}")); +ok($objBsCyrl->lt("\x{443}z", "\x{444}")); +ok($objBsCyrl->lt("\x{444}z", "\x{445}")); +ok($objBsCyrl->lt("\x{445}z", "\x{446}")); +ok($objBsCyrl->lt("\x{446}z", "\x{447}")); +ok($objBsCyrl->lt("\x{447}z", "\x{45f}")); +ok($objBsCyrl->lt("\x{45f}z", "\x{448}")); + +ok($objBsCyrl->lt("\x{410}z", "\x{411}")); +ok($objBsCyrl->lt("\x{411}z", "\x{412}")); +ok($objBsCyrl->lt("\x{412}z", "\x{413}")); +ok($objBsCyrl->lt("\x{413}z", "\x{414}")); +ok($objBsCyrl->lt("\x{414}z", "\x{402}")); +ok($objBsCyrl->lt("\x{402}z", "\x{415}")); +ok($objBsCyrl->lt("\x{415}z", "\x{416}")); +ok($objBsCyrl->lt("\x{416}z", "\x{417}")); +ok($objBsCyrl->lt("\x{417}z", "\x{418}")); +ok($objBsCyrl->lt("\x{418}z", "\x{408}")); +ok($objBsCyrl->lt("\x{408}z", "\x{41a}")); +ok($objBsCyrl->lt("\x{41a}z", "\x{41b}")); +ok($objBsCyrl->lt("\x{41b}z", "\x{409}")); +ok($objBsCyrl->lt("\x{409}z", "\x{41c}")); +ok($objBsCyrl->lt("\x{41c}z", "\x{41d}")); +ok($objBsCyrl->lt("\x{41d}z", "\x{40a}")); +ok($objBsCyrl->lt("\x{40a}z", "\x{41e}")); +ok($objBsCyrl->lt("\x{41e}z", "\x{41f}")); +ok($objBsCyrl->lt("\x{41f}z", "\x{420}")); +ok($objBsCyrl->lt("\x{420}z", "\x{421}")); +ok($objBsCyrl->lt("\x{421}z", "\x{422}")); +ok($objBsCyrl->lt("\x{422}z", "\x{40b}")); +ok($objBsCyrl->lt("\x{40b}z", "\x{423}")); +ok($objBsCyrl->lt("\x{423}z", "\x{424}")); +ok($objBsCyrl->lt("\x{424}z", "\x{425}")); +ok($objBsCyrl->lt("\x{425}z", "\x{426}")); +ok($objBsCyrl->lt("\x{426}z", "\x{427}")); +ok($objBsCyrl->lt("\x{427}z", "\x{40f}")); +ok($objBsCyrl->lt("\x{40f}z", "\x{428}")); + +# 60 + +ok($objBsCyrl->eq("\x{438}", "\x{439}")); +ok($objBsCyrl->eq("\x{418}", "\x{419}")); + +# 62 $objBsCyrl->change(level => 2); -ok($objBsCyrl->gt("\x{4D1}", "\x{430}")); -ok($objBsCyrl->gt("\x{4D0}", "\x{410}")); -ok($objBsCyrl->gt("\x{4D3}", "\x{430}")); -ok($objBsCyrl->gt("\x{4D2}", "\x{410}")); -ok($objBsCyrl->gt("\x{4DB}", "\x{4D9}")); -ok($objBsCyrl->gt("\x{4DA}", "\x{4D8}")); -ok($objBsCyrl->gt("\x{453}", "\x{433}")); -ok($objBsCyrl->gt("\x{403}", "\x{413}")); -ok($objBsCyrl->gt("\x{450}", "\x{435}")); # not contraction -ok($objBsCyrl->gt("\x{400}", "\x{415}")); # not contraction -ok($objBsCyrl->gt("\x{451}", "\x{435}")); # not contraction -ok($objBsCyrl->gt("\x{401}", "\x{415}")); # not contraction -ok($objBsCyrl->gt("\x{4D7}", "\x{435}")); -ok($objBsCyrl->gt("\x{4D6}", "\x{415}")); -ok($objBsCyrl->gt("\x{4C2}", "\x{436}")); # not contraction -ok($objBsCyrl->gt("\x{4C1}", "\x{416}")); # not contraction -ok($objBsCyrl->gt("\x{4DD}", "\x{436}")); -ok($objBsCyrl->gt("\x{4DC}", "\x{416}")); -ok($objBsCyrl->gt("\x{4DF}", "\x{437}")); -ok($objBsCyrl->gt("\x{4DE}", "\x{417}")); -ok($objBsCyrl->gt("\x{45D}", "\x{438}")); # not contraction -ok($objBsCyrl->gt("\x{40D}", "\x{418}")); # not contraction -ok($objBsCyrl->gt("\x{4E3}", "\x{438}")); # not contraction -ok($objBsCyrl->gt("\x{4E2}", "\x{418}")); # not contraction -ok($objBsCyrl->gt("\x{4E5}", "\x{438}")); -ok($objBsCyrl->gt("\x{4E4}", "\x{418}")); -ok($objBsCyrl->gt("\x{457}", "\x{456}")); -ok($objBsCyrl->gt("\x{407}", "\x{406}")); -ok($objBsCyrl->gt("\x{439}", "\x{438}")); -ok($objBsCyrl->gt("\x{419}", "\x{418}")); -ok($objBsCyrl->gt("\x{4E7}", "\x{43E}")); -ok($objBsCyrl->gt("\x{4E6}", "\x{41E}")); -ok($objBsCyrl->gt("\x{4EB}", "\x{4E9}")); -ok($objBsCyrl->gt("\x{4EA}", "\x{4E8}")); -ok($objBsCyrl->gt("\x{45C}", "\x{43A}")); -ok($objBsCyrl->gt("\x{40C}", "\x{41A}")); -ok($objBsCyrl->gt("\x{4EF}", "\x{443}")); # not contraction -ok($objBsCyrl->gt("\x{4EE}", "\x{423}")); # not contraction -ok($objBsCyrl->gt("\x{45E}", "\x{443}")); -ok($objBsCyrl->gt("\x{40E}", "\x{423}")); -ok($objBsCyrl->gt("\x{4F1}", "\x{443}")); -ok($objBsCyrl->gt("\x{4F0}", "\x{423}")); -ok($objBsCyrl->gt("\x{4F3}", "\x{443}")); -ok($objBsCyrl->gt("\x{4F2}", "\x{423}")); -ok($objBsCyrl->gt("\x{4F5}", "\x{447}")); -ok($objBsCyrl->gt("\x{4F4}", "\x{427}")); -ok($objBsCyrl->gt("\x{4F9}", "\x{44B}")); -ok($objBsCyrl->gt("\x{4F8}", "\x{42B}")); -ok($objBsCyrl->gt("\x{4ED}", "\x{44D}")); -ok($objBsCyrl->gt("\x{4EC}", "\x{42D}")); -ok($objBsCyrl->gt("\x{477}", "\x{475}")); -ok($objBsCyrl->gt("\x{476}", "\x{474}")); - -# 106 +ok($objBsCyrl->lt("\x{438}", "\x{439}")); +ok($objBsCyrl->lt("\x{418}", "\x{419}")); + +# 64 + +ok($objBsCyrl->eq("\x{430}", "\x{410}")); +ok($objBsCyrl->eq("\x{431}", "\x{411}")); +ok($objBsCyrl->eq("\x{432}", "\x{412}")); +ok($objBsCyrl->eq("\x{433}", "\x{413}")); +ok($objBsCyrl->eq("\x{434}", "\x{414}")); +ok($objBsCyrl->eq("\x{452}", "\x{402}")); +ok($objBsCyrl->eq("\x{435}", "\x{415}")); +ok($objBsCyrl->eq("\x{436}", "\x{416}")); +ok($objBsCyrl->eq("\x{437}", "\x{417}")); +ok($objBsCyrl->eq("\x{438}", "\x{418}")); +ok($objBsCyrl->eq("\x{439}", "\x{419}")); +ok($objBsCyrl->eq("\x{458}", "\x{408}")); +ok($objBsCyrl->eq("\x{43a}", "\x{41a}")); +ok($objBsCyrl->eq("\x{43b}", "\x{41b}")); +ok($objBsCyrl->eq("\x{459}", "\x{409}")); +ok($objBsCyrl->eq("\x{43c}", "\x{41c}")); +ok($objBsCyrl->eq("\x{43d}", "\x{41d}")); +ok($objBsCyrl->eq("\x{45a}", "\x{40a}")); +ok($objBsCyrl->eq("\x{43e}", "\x{41e}")); +ok($objBsCyrl->eq("\x{43f}", "\x{41f}")); +ok($objBsCyrl->eq("\x{440}", "\x{420}")); +ok($objBsCyrl->eq("\x{441}", "\x{421}")); +ok($objBsCyrl->eq("\x{442}", "\x{422}")); +ok($objBsCyrl->eq("\x{45b}", "\x{40b}")); +ok($objBsCyrl->eq("\x{443}", "\x{423}")); +ok($objBsCyrl->eq("\x{444}", "\x{424}")); +ok($objBsCyrl->eq("\x{445}", "\x{425}")); +ok($objBsCyrl->eq("\x{446}", "\x{426}")); +ok($objBsCyrl->eq("\x{447}", "\x{427}")); +ok($objBsCyrl->eq("\x{45f}", "\x{40f}")); +ok($objBsCyrl->eq("\x{448}", "\x{428}")); + +# 95 $objBsCyrl->change(level => 3); -for my $i ("", "\0") { - ok($objBsCyrl->eq("\x{4D1}", "\x{430}$i\x{306}")); - ok($objBsCyrl->eq("\x{4D0}", "\x{410}$i\x{306}")); - ok($objBsCyrl->eq("\x{4D3}", "\x{430}$i\x{308}")); - ok($objBsCyrl->eq("\x{4D2}", "\x{410}$i\x{308}")); - ok($objBsCyrl->eq("\x{4DB}", "\x{4D9}$i\x{308}")); - ok($objBsCyrl->eq("\x{4DA}", "\x{4D8}$i\x{308}")); - ok($objBsCyrl->eq("\x{453}", "\x{433}$i\x{301}")); - ok($objBsCyrl->eq("\x{403}", "\x{413}$i\x{301}")); - ok($objBsCyrl->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction - ok($objBsCyrl->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction - ok($objBsCyrl->eq("\x{451}", "\x{435}$i\x{308}")); # not contraction - ok($objBsCyrl->eq("\x{401}", "\x{415}$i\x{308}")); # not contraction - ok($objBsCyrl->eq("\x{4D7}", "\x{435}$i\x{306}")); - ok($objBsCyrl->eq("\x{4D6}", "\x{415}$i\x{306}")); - ok($objBsCyrl->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction - ok($objBsCyrl->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction - ok($objBsCyrl->eq("\x{4DD}", "\x{436}$i\x{308}")); - ok($objBsCyrl->eq("\x{4DC}", "\x{416}$i\x{308}")); - ok($objBsCyrl->eq("\x{4DF}", "\x{437}$i\x{308}")); - ok($objBsCyrl->eq("\x{4DE}", "\x{417}$i\x{308}")); - ok($objBsCyrl->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction - ok($objBsCyrl->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction - ok($objBsCyrl->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction - ok($objBsCyrl->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction - ok($objBsCyrl->eq("\x{4E5}", "\x{438}$i\x{308}")); - ok($objBsCyrl->eq("\x{4E4}", "\x{418}$i\x{308}")); - ok($objBsCyrl->eq("\x{457}", "\x{456}$i\x{308}")); - ok($objBsCyrl->eq("\x{407}", "\x{406}$i\x{308}")); - ok($objBsCyrl->eq("\x{439}", "\x{438}$i\x{306}")); - ok($objBsCyrl->eq("\x{419}", "\x{418}$i\x{306}")); - ok($objBsCyrl->eq("\x{4E7}", "\x{43E}$i\x{308}")); - ok($objBsCyrl->eq("\x{4E6}", "\x{41E}$i\x{308}")); - ok($objBsCyrl->eq("\x{4EB}", "\x{4E9}$i\x{308}")); - ok($objBsCyrl->eq("\x{4EA}", "\x{4E8}$i\x{308}")); - ok($objBsCyrl->eq("\x{45C}", "\x{43A}$i\x{301}")); - ok($objBsCyrl->eq("\x{40C}", "\x{41A}$i\x{301}")); - ok($objBsCyrl->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction - ok($objBsCyrl->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction - ok($objBsCyrl->eq("\x{45E}", "\x{443}$i\x{306}")); - ok($objBsCyrl->eq("\x{40E}", "\x{423}$i\x{306}")); - ok($objBsCyrl->eq("\x{4F1}", "\x{443}$i\x{308}")); - ok($objBsCyrl->eq("\x{4F0}", "\x{423}$i\x{308}")); - ok($objBsCyrl->eq("\x{4F3}", "\x{443}$i\x{30B}")); - ok($objBsCyrl->eq("\x{4F2}", "\x{423}$i\x{30B}")); - ok($objBsCyrl->eq("\x{4F5}", "\x{447}$i\x{308}")); - ok($objBsCyrl->eq("\x{4F4}", "\x{427}$i\x{308}")); - ok($objBsCyrl->eq("\x{4F9}", "\x{44B}$i\x{308}")); - ok($objBsCyrl->eq("\x{4F8}", "\x{42B}$i\x{308}")); - ok($objBsCyrl->eq("\x{4ED}", "\x{44D}$i\x{308}")); - ok($objBsCyrl->eq("\x{4EC}", "\x{42D}$i\x{308}")); - ok($objBsCyrl->eq("\x{477}", "\x{475}$i\x{30F}")); - ok($objBsCyrl->eq("\x{476}", "\x{474}$i\x{30F}")); -} - -# 210 +ok($objBsCyrl->lt("\x{430}", "\x{410}")); +ok($objBsCyrl->lt("\x{431}", "\x{411}")); +ok($objBsCyrl->lt("\x{432}", "\x{412}")); +ok($objBsCyrl->lt("\x{433}", "\x{413}")); +ok($objBsCyrl->lt("\x{434}", "\x{414}")); +ok($objBsCyrl->lt("\x{452}", "\x{402}")); +ok($objBsCyrl->lt("\x{435}", "\x{415}")); +ok($objBsCyrl->lt("\x{436}", "\x{416}")); +ok($objBsCyrl->lt("\x{437}", "\x{417}")); +ok($objBsCyrl->lt("\x{438}", "\x{418}")); +ok($objBsCyrl->lt("\x{439}", "\x{419}")); +ok($objBsCyrl->lt("\x{458}", "\x{408}")); +ok($objBsCyrl->lt("\x{43a}", "\x{41a}")); +ok($objBsCyrl->lt("\x{43b}", "\x{41b}")); +ok($objBsCyrl->lt("\x{459}", "\x{409}")); +ok($objBsCyrl->lt("\x{43c}", "\x{41c}")); +ok($objBsCyrl->lt("\x{43d}", "\x{41d}")); +ok($objBsCyrl->lt("\x{45a}", "\x{40a}")); +ok($objBsCyrl->lt("\x{43e}", "\x{41e}")); +ok($objBsCyrl->lt("\x{43f}", "\x{41f}")); +ok($objBsCyrl->lt("\x{440}", "\x{420}")); +ok($objBsCyrl->lt("\x{441}", "\x{421}")); +ok($objBsCyrl->lt("\x{442}", "\x{422}")); +ok($objBsCyrl->lt("\x{45b}", "\x{40b}")); +ok($objBsCyrl->lt("\x{443}", "\x{423}")); +ok($objBsCyrl->lt("\x{444}", "\x{424}")); +ok($objBsCyrl->lt("\x{445}", "\x{425}")); +ok($objBsCyrl->lt("\x{446}", "\x{426}")); +ok($objBsCyrl->lt("\x{447}", "\x{427}")); +ok($objBsCyrl->lt("\x{45f}", "\x{40f}")); +ok($objBsCyrl->lt("\x{448}", "\x{428}")); + +# 126 + +ok($objBsCyrl->eq("\x{439}", "\x{438}\x{306}")); +ok($objBsCyrl->eq("\x{419}", "\x{418}\x{306}")); + +# 128 diff --git a/cpan/Unicode-Collate/t/loc_cyrl.t b/cpan/Unicode-Collate/t/loc_cyrl.t index d625d5dc3b..7366ed00a5 100644 --- a/cpan/Unicode-Collate/t/loc_cyrl.t +++ b/cpan/Unicode-Collate/t/loc_cyrl.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..130\n"; } +BEGIN { $| = 1; print "1..208\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -40,139 +40,182 @@ ok($objNoSuppress->getlocale, 'default'); $objNoSuppress->change(level => 1); -ok($objNoSuppress->gt("\x{4D1}", "\x{430}")); # not suppressed -ok($objNoSuppress->gt("\x{4D0}", "\x{410}")); # not suppressed -ok($objNoSuppress->gt("\x{4D3}", "\x{430}")); # not suppressed -ok($objNoSuppress->gt("\x{4D2}", "\x{410}")); # not suppressed -ok($objNoSuppress->gt("\x{4DB}", "\x{4D9}")); # not suppressed -ok($objNoSuppress->gt("\x{4DA}", "\x{4D8}")); # not suppressed -ok($objNoSuppress->gt("\x{453}", "\x{433}")); # not suppressed -ok($objNoSuppress->gt("\x{403}", "\x{413}")); # not suppressed -ok($objNoSuppress->gt("\x{4D7}", "\x{435}")); # not suppressed -ok($objNoSuppress->gt("\x{4D6}", "\x{415}")); # not suppressed -ok($objNoSuppress->gt("\x{4DD}", "\x{436}")); # not suppressed -ok($objNoSuppress->gt("\x{4DC}", "\x{416}")); # not suppressed -ok($objNoSuppress->gt("\x{4DF}", "\x{437}")); # not suppressed -ok($objNoSuppress->gt("\x{4DE}", "\x{417}")); # not suppressed -ok($objNoSuppress->gt("\x{4E5}", "\x{438}")); # not suppressed -ok($objNoSuppress->gt("\x{4E4}", "\x{418}")); # not suppressed -ok($objNoSuppress->gt("\x{457}", "\x{456}")); # not suppressed -ok($objNoSuppress->gt("\x{407}", "\x{406}")); # not suppressed ok($objNoSuppress->gt("\x{439}", "\x{438}")); # not suppressed ok($objNoSuppress->gt("\x{419}", "\x{418}")); # not suppressed -ok($objNoSuppress->gt("\x{4E7}", "\x{43E}")); # not suppressed -ok($objNoSuppress->gt("\x{4E6}", "\x{41E}")); # not suppressed -ok($objNoSuppress->gt("\x{4EB}", "\x{4E9}")); # not suppressed -ok($objNoSuppress->gt("\x{4EA}", "\x{4E8}")); # not suppressed -ok($objNoSuppress->gt("\x{45C}", "\x{43A}")); # not suppressed -ok($objNoSuppress->gt("\x{40C}", "\x{41A}")); # not suppressed -ok($objNoSuppress->gt("\x{45E}", "\x{443}")); # not suppressed -ok($objNoSuppress->gt("\x{40E}", "\x{423}")); # not suppressed -ok($objNoSuppress->gt("\x{4F1}", "\x{443}")); # not suppressed -ok($objNoSuppress->gt("\x{4F0}", "\x{423}")); # not suppressed -ok($objNoSuppress->gt("\x{4F3}", "\x{443}")); # not suppressed -ok($objNoSuppress->gt("\x{4F2}", "\x{423}")); # not suppressed -ok($objNoSuppress->gt("\x{4F5}", "\x{447}")); # not suppressed -ok($objNoSuppress->gt("\x{4F4}", "\x{427}")); # not suppressed -ok($objNoSuppress->gt("\x{4F9}", "\x{44B}")); # not suppressed -ok($objNoSuppress->gt("\x{4F8}", "\x{42B}")); # not suppressed -ok($objNoSuppress->gt("\x{4ED}", "\x{44D}")); # not suppressed -ok($objNoSuppress->gt("\x{4EC}", "\x{42D}")); # not suppressed -ok($objNoSuppress->gt("\x{477}", "\x{475}")); # not suppressed -ok($objNoSuppress->gt("\x{476}", "\x{474}")); # not suppressed - -# 42 +# 4 + +ok($objNoSuppress->eq("\x{4D1}", "\x{430}")); # not contraction +ok($objNoSuppress->eq("\x{4D0}", "\x{410}")); # not contraction +ok($objNoSuppress->eq("\x{4D3}", "\x{430}")); # not contraction +ok($objNoSuppress->eq("\x{4D2}", "\x{410}")); # not contraction +ok($objNoSuppress->eq("\x{4DB}", "\x{4D9}")); # not contraction +ok($objNoSuppress->eq("\x{4DA}", "\x{4D8}")); # not contraction +ok($objNoSuppress->eq("\x{453}", "\x{433}")); # not contraction +ok($objNoSuppress->eq("\x{403}", "\x{413}")); # not contraction ok($objNoSuppress->eq("\x{450}", "\x{435}")); # not contraction ok($objNoSuppress->eq("\x{400}", "\x{415}")); # not contraction +ok($objNoSuppress->eq("\x{4D7}", "\x{435}")); # not contraction +ok($objNoSuppress->eq("\x{4D6}", "\x{415}")); # not contraction ok($objNoSuppress->eq("\x{451}", "\x{435}")); # not contraction ok($objNoSuppress->eq("\x{401}", "\x{415}")); # not contraction ok($objNoSuppress->eq("\x{4C2}", "\x{436}")); # not contraction ok($objNoSuppress->eq("\x{4C1}", "\x{416}")); # not contraction +ok($objNoSuppress->eq("\x{4DD}", "\x{436}")); # not contraction +ok($objNoSuppress->eq("\x{4DC}", "\x{416}")); # not contraction +ok($objNoSuppress->eq("\x{4DF}", "\x{437}")); # not contraction +ok($objNoSuppress->eq("\x{4DE}", "\x{417}")); # not contraction ok($objNoSuppress->eq("\x{45D}", "\x{438}")); # not contraction ok($objNoSuppress->eq("\x{40D}", "\x{418}")); # not contraction +ok($objNoSuppress->eq("\x{4E5}", "\x{438}")); # not contraction +ok($objNoSuppress->eq("\x{4E4}", "\x{418}")); # not contraction ok($objNoSuppress->eq("\x{4E3}", "\x{438}")); # not contraction ok($objNoSuppress->eq("\x{4E2}", "\x{418}")); # not contraction +ok($objNoSuppress->eq("\x{457}", "\x{456}")); # not contraction +ok($objNoSuppress->eq("\x{407}", "\x{406}")); # not contraction +ok($objNoSuppress->eq("\x{45C}", "\x{43A}")); # not contraction +ok($objNoSuppress->eq("\x{40C}", "\x{41A}")); # not contraction +ok($objNoSuppress->eq("\x{4E7}", "\x{43E}")); # not contraction +ok($objNoSuppress->eq("\x{4E6}", "\x{41E}")); # not contraction +ok($objNoSuppress->eq("\x{4EB}", "\x{4E9}")); # not contraction +ok($objNoSuppress->eq("\x{4EA}", "\x{4E8}")); # not contraction +ok($objNoSuppress->eq("\x{45E}", "\x{443}")); # not contraction +ok($objNoSuppress->eq("\x{40E}", "\x{423}")); # not contraction +ok($objNoSuppress->eq("\x{4F1}", "\x{443}")); # not contraction +ok($objNoSuppress->eq("\x{4F0}", "\x{423}")); # not contraction +ok($objNoSuppress->eq("\x{4F3}", "\x{443}")); # not contraction +ok($objNoSuppress->eq("\x{4F2}", "\x{423}")); # not contraction ok($objNoSuppress->eq("\x{4EF}", "\x{443}")); # not contraction ok($objNoSuppress->eq("\x{4EE}", "\x{423}")); # not contraction +ok($objNoSuppress->eq("\x{4F5}", "\x{447}")); # not contraction +ok($objNoSuppress->eq("\x{4F4}", "\x{427}")); # not contraction +ok($objNoSuppress->eq("\x{4F9}", "\x{44B}")); # not contraction +ok($objNoSuppress->eq("\x{4F8}", "\x{42B}")); # not contraction +ok($objNoSuppress->eq("\x{4ED}", "\x{44D}")); # not contraction +ok($objNoSuppress->eq("\x{4EC}", "\x{42D}")); # not contraction +ok($objNoSuppress->eq("\x{477}", "\x{475}")); # not contraction +ok($objNoSuppress->eq("\x{476}", "\x{474}")); # not contraction # 54 $objNoSuppress->change(level => 2); +ok($objNoSuppress->gt("\x{4D1}", "\x{430}")); # not contraction +ok($objNoSuppress->gt("\x{4D0}", "\x{410}")); # not contraction +ok($objNoSuppress->gt("\x{4D3}", "\x{430}")); # not contraction +ok($objNoSuppress->gt("\x{4D2}", "\x{410}")); # not contraction +ok($objNoSuppress->gt("\x{4DB}", "\x{4D9}")); # not contraction +ok($objNoSuppress->gt("\x{4DA}", "\x{4D8}")); # not contraction +ok($objNoSuppress->gt("\x{453}", "\x{433}")); # not contraction +ok($objNoSuppress->gt("\x{403}", "\x{413}")); # not contraction ok($objNoSuppress->gt("\x{450}", "\x{435}")); # not contraction ok($objNoSuppress->gt("\x{400}", "\x{415}")); # not contraction +ok($objNoSuppress->gt("\x{4D7}", "\x{435}")); # not contraction +ok($objNoSuppress->gt("\x{4D6}", "\x{415}")); # not contraction ok($objNoSuppress->gt("\x{451}", "\x{435}")); # not contraction ok($objNoSuppress->gt("\x{401}", "\x{415}")); # not contraction ok($objNoSuppress->gt("\x{4C2}", "\x{436}")); # not contraction ok($objNoSuppress->gt("\x{4C1}", "\x{416}")); # not contraction +ok($objNoSuppress->gt("\x{4DD}", "\x{436}")); # not contraction +ok($objNoSuppress->gt("\x{4DC}", "\x{416}")); # not contraction +ok($objNoSuppress->gt("\x{4DF}", "\x{437}")); # not contraction +ok($objNoSuppress->gt("\x{4DE}", "\x{417}")); # not contraction ok($objNoSuppress->gt("\x{45D}", "\x{438}")); # not contraction ok($objNoSuppress->gt("\x{40D}", "\x{418}")); # not contraction +ok($objNoSuppress->gt("\x{4E5}", "\x{438}")); # not contraction +ok($objNoSuppress->gt("\x{4E4}", "\x{418}")); # not contraction ok($objNoSuppress->gt("\x{4E3}", "\x{438}")); # not contraction ok($objNoSuppress->gt("\x{4E2}", "\x{418}")); # not contraction +ok($objNoSuppress->gt("\x{457}", "\x{456}")); # not contraction +ok($objNoSuppress->gt("\x{407}", "\x{406}")); # not contraction +ok($objNoSuppress->gt("\x{45C}", "\x{43A}")); # not contraction +ok($objNoSuppress->gt("\x{40C}", "\x{41A}")); # not contraction +ok($objNoSuppress->gt("\x{4E7}", "\x{43E}")); # not contraction +ok($objNoSuppress->gt("\x{4E6}", "\x{41E}")); # not contraction +ok($objNoSuppress->gt("\x{4EB}", "\x{4E9}")); # not contraction +ok($objNoSuppress->gt("\x{4EA}", "\x{4E8}")); # not contraction +ok($objNoSuppress->gt("\x{45E}", "\x{443}")); # not contraction +ok($objNoSuppress->gt("\x{40E}", "\x{423}")); # not contraction +ok($objNoSuppress->gt("\x{4F1}", "\x{443}")); # not contraction +ok($objNoSuppress->gt("\x{4F0}", "\x{423}")); # not contraction +ok($objNoSuppress->gt("\x{4F3}", "\x{443}")); # not contraction +ok($objNoSuppress->gt("\x{4F2}", "\x{423}")); # not contraction ok($objNoSuppress->gt("\x{4EF}", "\x{443}")); # not contraction ok($objNoSuppress->gt("\x{4EE}", "\x{423}")); # not contraction +ok($objNoSuppress->gt("\x{4F5}", "\x{447}")); # not contraction +ok($objNoSuppress->gt("\x{4F4}", "\x{427}")); # not contraction +ok($objNoSuppress->gt("\x{4F9}", "\x{44B}")); # not contraction +ok($objNoSuppress->gt("\x{4F8}", "\x{42B}")); # not contraction +ok($objNoSuppress->gt("\x{4ED}", "\x{44D}")); # not contraction +ok($objNoSuppress->gt("\x{4EC}", "\x{42D}")); # not contraction +ok($objNoSuppress->gt("\x{477}", "\x{475}")); # not contraction +ok($objNoSuppress->gt("\x{476}", "\x{474}")); # not contraction -# 66 +# 104 $objNoSuppress->change(level => 3); -ok($objNoSuppress->eq("\x{4D1}", "\x{430}\x{306}")); # not suppressed -ok($objNoSuppress->eq("\x{4D0}", "\x{410}\x{306}")); # not suppressed -ok($objNoSuppress->eq("\x{4D3}", "\x{430}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4D2}", "\x{410}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4DB}", "\x{4D9}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4DA}", "\x{4D8}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{453}", "\x{433}\x{301}")); # not suppressed -ok($objNoSuppress->eq("\x{403}", "\x{413}\x{301}")); # not suppressed -ok($objNoSuppress->eq("\x{4D7}", "\x{435}\x{306}")); # not suppressed -ok($objNoSuppress->eq("\x{4D6}", "\x{415}\x{306}")); # not suppressed -ok($objNoSuppress->eq("\x{4DD}", "\x{436}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4DC}", "\x{416}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4DF}", "\x{437}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4DE}", "\x{417}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4E5}", "\x{438}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4E4}", "\x{418}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{457}", "\x{456}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{407}", "\x{406}\x{308}")); # not suppressed ok($objNoSuppress->eq("\x{439}", "\x{438}\x{306}")); # not suppressed ok($objNoSuppress->eq("\x{419}", "\x{418}\x{306}")); # not suppressed -ok($objNoSuppress->eq("\x{4E7}", "\x{43E}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4E6}", "\x{41E}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4EB}", "\x{4E9}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4EA}", "\x{4E8}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{45C}", "\x{43A}\x{301}")); # not suppressed -ok($objNoSuppress->eq("\x{40C}", "\x{41A}\x{301}")); # not suppressed -ok($objNoSuppress->eq("\x{45E}", "\x{443}\x{306}")); # not suppressed -ok($objNoSuppress->eq("\x{40E}", "\x{423}\x{306}")); # not suppressed -ok($objNoSuppress->eq("\x{4F1}", "\x{443}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4F0}", "\x{423}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4F3}", "\x{443}\x{30B}")); # not suppressed -ok($objNoSuppress->eq("\x{4F2}", "\x{423}\x{30B}")); # not suppressed -ok($objNoSuppress->eq("\x{4F5}", "\x{447}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4F4}", "\x{427}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4F9}", "\x{44B}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4F8}", "\x{42B}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4ED}", "\x{44D}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{4EC}", "\x{42D}\x{308}")); # not suppressed -ok($objNoSuppress->eq("\x{477}", "\x{475}\x{30F}")); # not suppressed -ok($objNoSuppress->eq("\x{476}", "\x{474}\x{30F}")); # not suppressed # 106 +ok($objNoSuppress->gt("\x{439}", "\x{438}\0\x{306}")); # not suppressed +ok($objNoSuppress->gt("\x{419}", "\x{418}\0\x{306}")); # not suppressed + +# 108 + for my $i ("", "\0") { + ok($objNoSuppress->eq("\x{4D1}", "\x{430}$i\x{306}")); # not contraction + ok($objNoSuppress->eq("\x{4D0}", "\x{410}$i\x{306}")); # not contraction + ok($objNoSuppress->eq("\x{4D3}", "\x{430}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4D2}", "\x{410}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4DB}", "\x{4D9}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4DA}", "\x{4D8}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{453}", "\x{433}$i\x{301}")); # not contraction + ok($objNoSuppress->eq("\x{403}", "\x{413}$i\x{301}")); # not contraction ok($objNoSuppress->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction ok($objNoSuppress->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction + ok($objNoSuppress->eq("\x{4D7}", "\x{435}$i\x{306}")); # not contraction + ok($objNoSuppress->eq("\x{4D6}", "\x{415}$i\x{306}")); # not contraction ok($objNoSuppress->eq("\x{451}", "\x{435}$i\x{308}")); # not contraction ok($objNoSuppress->eq("\x{401}", "\x{415}$i\x{308}")); # not contraction ok($objNoSuppress->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction ok($objNoSuppress->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction + ok($objNoSuppress->eq("\x{4DD}", "\x{436}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4DC}", "\x{416}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4DF}", "\x{437}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4DE}", "\x{417}$i\x{308}")); # not contraction ok($objNoSuppress->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction ok($objNoSuppress->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction + ok($objNoSuppress->eq("\x{4E5}", "\x{438}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4E4}", "\x{418}$i\x{308}")); # not contraction ok($objNoSuppress->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction ok($objNoSuppress->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction + ok($objNoSuppress->eq("\x{457}", "\x{456}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{407}", "\x{406}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{45C}", "\x{43A}$i\x{301}")); # not contraction + ok($objNoSuppress->eq("\x{40C}", "\x{41A}$i\x{301}")); # not contraction + ok($objNoSuppress->eq("\x{4E7}", "\x{43E}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4E6}", "\x{41E}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4EB}", "\x{4E9}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4EA}", "\x{4E8}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{45E}", "\x{443}$i\x{306}")); # not contraction + ok($objNoSuppress->eq("\x{40E}", "\x{423}$i\x{306}")); # not contraction + ok($objNoSuppress->eq("\x{4F1}", "\x{443}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4F0}", "\x{423}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4F3}", "\x{443}$i\x{30B}")); # not contraction + ok($objNoSuppress->eq("\x{4F2}", "\x{423}$i\x{30B}")); # not contraction ok($objNoSuppress->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction ok($objNoSuppress->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction + ok($objNoSuppress->eq("\x{4F5}", "\x{447}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4F4}", "\x{427}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4F9}", "\x{44B}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4F8}", "\x{42B}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4ED}", "\x{44D}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{4EC}", "\x{42D}$i\x{308}")); # not contraction + ok($objNoSuppress->eq("\x{477}", "\x{475}$i\x{30F}")); # not contraction + ok($objNoSuppress->eq("\x{476}", "\x{474}$i\x{30F}")); # not contraction } -# 130 +# 208 diff --git a/cpan/Unicode-Collate/t/loc_es.t b/cpan/Unicode-Collate/t/loc_es.t index cee4eec620..443823afcc 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.14); +ok($objEs->locale_version, 1.17); $objEs->change(level => 1); diff --git a/cpan/Unicode-Collate/t/loc_estr.t b/cpan/Unicode-Collate/t/loc_estr.t index cc3e477e95..416bafac3f 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.14); +ok($objEsTrad->locale_version, 1.17); $objEsTrad->change(level => 1); diff --git a/cpan/Unicode-Collate/t/loc_fr.t b/cpan/Unicode-Collate/t/loc_fr.t index 0e3aaa9435..651b770698 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.14); +ok($objFr->locale_version, 1.17); $objFr->change(level => 1); diff --git a/cpan/Unicode-Collate/t/loc_kk.t b/cpan/Unicode-Collate/t/loc_kk.t index 294e974c0c..2d783079bc 100644 --- a/cpan/Unicode-Collate/t/loc_kk.t +++ b/cpan/Unicode-Collate/t/loc_kk.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..211\n"; } +BEGIN { $| = 1; print "1..172\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -40,200 +40,189 @@ ok($objKk->getlocale, 'kk'); $objKk->change(level => 1); -ok($objKk->gt("\x{451}", "\x{435}")); -ok($objKk->lt("\x{451}", "\x{454}")); -ok($objKk->gt("\x{4AF}", "\x{4B1}")); -ok($objKk->lt("\x{4AF}", "\x{A64B}")); -ok($objKk->gt("\x{456}", "\x{4F9}")); -ok($objKk->lt("\x{456}", "\x{44C}")); - -# 8 - -ok($objKk->gt("\x{4E5}", "\x{438}")); # not suppressed -ok($objKk->gt("\x{4E4}", "\x{418}")); # not suppressed -ok($objKk->gt("\x{439}", "\x{438}")); # not suppressed -ok($objKk->gt("\x{419}", "\x{418}")); # not suppressed - -# 12 - -ok($objKk->eq("\x{4D1}", "\x{430}")); -ok($objKk->eq("\x{4D0}", "\x{410}")); -ok($objKk->eq("\x{4D3}", "\x{430}")); -ok($objKk->eq("\x{4D2}", "\x{410}")); -ok($objKk->eq("\x{4DB}", "\x{4D9}")); -ok($objKk->eq("\x{4DA}", "\x{4D8}")); -ok($objKk->eq("\x{453}", "\x{433}")); -ok($objKk->eq("\x{403}", "\x{413}")); -ok($objKk->eq("\x{450}", "\x{435}")); # not contraction -ok($objKk->eq("\x{400}", "\x{415}")); # not contraction -ok($objKk->eq("\x{4D7}", "\x{435}")); -ok($objKk->eq("\x{4D6}", "\x{415}")); -ok($objKk->eq("\x{4C2}", "\x{436}")); # not contraction -ok($objKk->eq("\x{4C1}", "\x{416}")); # not contraction -ok($objKk->eq("\x{4DD}", "\x{436}")); -ok($objKk->eq("\x{4DC}", "\x{416}")); -ok($objKk->eq("\x{4DF}", "\x{437}")); -ok($objKk->eq("\x{4DE}", "\x{417}")); -ok($objKk->eq("\x{45D}", "\x{438}")); # not contraction -ok($objKk->eq("\x{40D}", "\x{418}")); # not contraction -ok($objKk->eq("\x{4E3}", "\x{438}")); # not contraction -ok($objKk->eq("\x{4E2}", "\x{418}")); # not contraction -ok($objKk->eq("\x{457}", "\x{456}")); -ok($objKk->eq("\x{407}", "\x{406}")); -ok($objKk->eq("\x{4E7}", "\x{43E}")); -ok($objKk->eq("\x{4E6}", "\x{41E}")); -ok($objKk->eq("\x{4EB}", "\x{4E9}")); -ok($objKk->eq("\x{4EA}", "\x{4E8}")); -ok($objKk->eq("\x{45C}", "\x{43A}")); -ok($objKk->eq("\x{40C}", "\x{41A}")); -ok($objKk->eq("\x{4EF}", "\x{443}")); # not contraction -ok($objKk->eq("\x{4EE}", "\x{423}")); # not contraction -ok($objKk->eq("\x{45E}", "\x{443}")); -ok($objKk->eq("\x{40E}", "\x{423}")); -ok($objKk->eq("\x{4F1}", "\x{443}")); -ok($objKk->eq("\x{4F0}", "\x{423}")); -ok($objKk->eq("\x{4F3}", "\x{443}")); -ok($objKk->eq("\x{4F2}", "\x{423}")); -ok($objKk->eq("\x{4F5}", "\x{447}")); -ok($objKk->eq("\x{4F4}", "\x{427}")); -ok($objKk->eq("\x{4F9}", "\x{44B}")); -ok($objKk->eq("\x{4F8}", "\x{42B}")); -ok($objKk->eq("\x{4ED}", "\x{44D}")); -ok($objKk->eq("\x{4EC}", "\x{42D}")); -ok($objKk->eq("\x{477}", "\x{475}")); -ok($objKk->eq("\x{476}", "\x{474}")); - -# 58 +ok($objKk->lt("\x{430}z", "\x{4d9}")); +ok($objKk->lt("\x{4d9}z", "\x{431}")); +ok($objKk->lt("\x{431}z", "\x{432}")); +ok($objKk->lt("\x{432}z", "\x{433}")); +ok($objKk->lt("\x{433}z", "\x{493}")); +ok($objKk->lt("\x{493}z", "\x{434}")); +ok($objKk->lt("\x{434}z", "\x{435}")); +ok($objKk->lt("\x{435}z", "\x{451}")); +ok($objKk->lt("\x{451}z", "\x{436}")); +ok($objKk->lt("\x{436}z", "\x{437}")); +ok($objKk->lt("\x{437}z", "\x{438}")); +ok($objKk->lt("\x{438}z", "\x{439}")); +ok($objKk->lt("\x{439}z", "\x{43a}")); +ok($objKk->lt("\x{43a}z", "\x{49b}")); +ok($objKk->lt("\x{49b}z", "\x{43b}")); +ok($objKk->lt("\x{43b}z", "\x{43c}")); +ok($objKk->lt("\x{43c}z", "\x{43d}")); +ok($objKk->lt("\x{43d}z", "\x{4a3}")); +ok($objKk->lt("\x{4a3}z", "\x{43e}")); +ok($objKk->lt("\x{43e}z", "\x{4e9}")); +ok($objKk->lt("\x{4e9}z", "\x{43f}")); +ok($objKk->lt("\x{43f}z", "\x{440}")); +ok($objKk->lt("\x{440}z", "\x{441}")); +ok($objKk->lt("\x{441}z", "\x{442}")); +ok($objKk->lt("\x{442}z", "\x{443}")); +ok($objKk->lt("\x{443}z", "\x{4b1}")); +ok($objKk->lt("\x{4b1}z", "\x{4af}")); +ok($objKk->lt("\x{4af}z", "\x{444}")); +ok($objKk->lt("\x{444}z", "\x{445}")); +ok($objKk->lt("\x{445}z", "\x{4bb}")); +ok($objKk->lt("\x{4bb}z", "\x{446}")); +ok($objKk->lt("\x{446}z", "\x{447}")); +ok($objKk->lt("\x{447}z", "\x{448}")); +ok($objKk->lt("\x{448}z", "\x{449}")); +ok($objKk->lt("\x{449}z", "\x{44a}")); +ok($objKk->lt("\x{44a}z", "\x{44b}")); +ok($objKk->lt("\x{44b}z", "\x{456}")); +ok($objKk->lt("\x{456}z", "\x{44c}")); +ok($objKk->lt("\x{44c}z", "\x{44d}")); +ok($objKk->lt("\x{44d}z", "\x{44e}")); +ok($objKk->lt("\x{44e}z", "\x{44f}")); + +ok($objKk->lt("\x{410}z", "\x{4d8}")); +ok($objKk->lt("\x{4d8}z", "\x{411}")); +ok($objKk->lt("\x{411}z", "\x{412}")); +ok($objKk->lt("\x{412}z", "\x{413}")); +ok($objKk->lt("\x{413}z", "\x{492}")); +ok($objKk->lt("\x{492}z", "\x{414}")); +ok($objKk->lt("\x{414}z", "\x{415}")); +ok($objKk->lt("\x{415}z", "\x{401}")); +ok($objKk->lt("\x{401}z", "\x{416}")); +ok($objKk->lt("\x{416}z", "\x{417}")); +ok($objKk->lt("\x{417}z", "\x{418}")); +ok($objKk->lt("\x{418}z", "\x{419}")); +ok($objKk->lt("\x{419}z", "\x{41a}")); +ok($objKk->lt("\x{41a}z", "\x{49a}")); +ok($objKk->lt("\x{49a}z", "\x{41b}")); +ok($objKk->lt("\x{41b}z", "\x{41c}")); +ok($objKk->lt("\x{41c}z", "\x{41d}")); +ok($objKk->lt("\x{41d}z", "\x{4a2}")); +ok($objKk->lt("\x{4a2}z", "\x{41e}")); +ok($objKk->lt("\x{41e}z", "\x{4e8}")); +ok($objKk->lt("\x{4e8}z", "\x{41f}")); +ok($objKk->lt("\x{41f}z", "\x{420}")); +ok($objKk->lt("\x{420}z", "\x{421}")); +ok($objKk->lt("\x{421}z", "\x{422}")); +ok($objKk->lt("\x{422}z", "\x{423}")); +ok($objKk->lt("\x{423}z", "\x{4b0}")); +ok($objKk->lt("\x{4b0}z", "\x{4ae}")); +ok($objKk->lt("\x{4ae}z", "\x{424}")); +ok($objKk->lt("\x{424}z", "\x{425}")); +ok($objKk->lt("\x{425}z", "\x{4ba}")); +ok($objKk->lt("\x{4ba}z", "\x{426}")); +ok($objKk->lt("\x{426}z", "\x{427}")); +ok($objKk->lt("\x{427}z", "\x{428}")); +ok($objKk->lt("\x{428}z", "\x{429}")); +ok($objKk->lt("\x{429}z", "\x{42a}")); +ok($objKk->lt("\x{42a}z", "\x{42b}")); +ok($objKk->lt("\x{42b}z", "\x{406}")); +ok($objKk->lt("\x{406}z", "\x{42c}")); +ok($objKk->lt("\x{42c}z", "\x{42d}")); +ok($objKk->lt("\x{42d}z", "\x{42e}")); +ok($objKk->lt("\x{42e}z", "\x{42f}")); + +# 84 $objKk->change(level => 2); +ok($objKk->eq("\x{430}", "\x{410}")); +ok($objKk->eq("\x{4d9}", "\x{4d8}")); +ok($objKk->eq("\x{431}", "\x{411}")); +ok($objKk->eq("\x{432}", "\x{412}")); +ok($objKk->eq("\x{433}", "\x{413}")); +ok($objKk->eq("\x{493}", "\x{492}")); +ok($objKk->eq("\x{434}", "\x{414}")); +ok($objKk->eq("\x{435}", "\x{415}")); ok($objKk->eq("\x{451}", "\x{401}")); -ok($objKk->eq("\x{4AF}", "\x{4AE}")); +ok($objKk->eq("\x{436}", "\x{416}")); +ok($objKk->eq("\x{437}", "\x{417}")); +ok($objKk->eq("\x{438}", "\x{418}")); +ok($objKk->eq("\x{439}", "\x{419}")); +ok($objKk->eq("\x{43a}", "\x{41a}")); +ok($objKk->eq("\x{49b}", "\x{49a}")); +ok($objKk->eq("\x{43b}", "\x{41b}")); +ok($objKk->eq("\x{43c}", "\x{41c}")); +ok($objKk->eq("\x{43d}", "\x{41d}")); +ok($objKk->eq("\x{4a3}", "\x{4a2}")); +ok($objKk->eq("\x{43e}", "\x{41e}")); +ok($objKk->eq("\x{4e9}", "\x{4e8}")); +ok($objKk->eq("\x{43f}", "\x{41f}")); +ok($objKk->eq("\x{440}", "\x{420}")); +ok($objKk->eq("\x{441}", "\x{421}")); +ok($objKk->eq("\x{442}", "\x{422}")); +ok($objKk->eq("\x{443}", "\x{423}")); +ok($objKk->eq("\x{4b1}", "\x{4b0}")); +ok($objKk->eq("\x{4af}", "\x{4ae}")); +ok($objKk->eq("\x{444}", "\x{424}")); +ok($objKk->eq("\x{445}", "\x{425}")); +ok($objKk->eq("\x{4bb}", "\x{4ba}")); +ok($objKk->eq("\x{446}", "\x{426}")); +ok($objKk->eq("\x{447}", "\x{427}")); +ok($objKk->eq("\x{448}", "\x{428}")); +ok($objKk->eq("\x{449}", "\x{429}")); +ok($objKk->eq("\x{44a}", "\x{42a}")); +ok($objKk->eq("\x{44b}", "\x{42b}")); ok($objKk->eq("\x{456}", "\x{406}")); +ok($objKk->eq("\x{44c}", "\x{42c}")); +ok($objKk->eq("\x{44d}", "\x{42d}")); +ok($objKk->eq("\x{44e}", "\x{42e}")); +ok($objKk->eq("\x{44f}", "\x{42f}")); -# 61 - -ok($objKk->gt("\x{4D1}", "\x{430}")); -ok($objKk->gt("\x{4D0}", "\x{410}")); -ok($objKk->gt("\x{4D3}", "\x{430}")); -ok($objKk->gt("\x{4D2}", "\x{410}")); -ok($objKk->gt("\x{4DB}", "\x{4D9}")); -ok($objKk->gt("\x{4DA}", "\x{4D8}")); -ok($objKk->gt("\x{453}", "\x{433}")); -ok($objKk->gt("\x{403}", "\x{413}")); -ok($objKk->gt("\x{450}", "\x{435}")); # not contraction -ok($objKk->gt("\x{400}", "\x{415}")); # not contraction -ok($objKk->gt("\x{4D7}", "\x{435}")); -ok($objKk->gt("\x{4D6}", "\x{415}")); -ok($objKk->gt("\x{4C2}", "\x{436}")); # not contraction -ok($objKk->gt("\x{4C1}", "\x{416}")); # not contraction -ok($objKk->gt("\x{4DD}", "\x{436}")); -ok($objKk->gt("\x{4DC}", "\x{416}")); -ok($objKk->gt("\x{4DF}", "\x{437}")); -ok($objKk->gt("\x{4DE}", "\x{417}")); -ok($objKk->gt("\x{45D}", "\x{438}")); # not contraction -ok($objKk->gt("\x{40D}", "\x{418}")); # not contraction -ok($objKk->gt("\x{4E3}", "\x{438}")); # not contraction -ok($objKk->gt("\x{4E2}", "\x{418}")); # not contraction -ok($objKk->gt("\x{457}", "\x{456}")); -ok($objKk->gt("\x{407}", "\x{406}")); -ok($objKk->gt("\x{4E7}", "\x{43E}")); -ok($objKk->gt("\x{4E6}", "\x{41E}")); -ok($objKk->gt("\x{4EB}", "\x{4E9}")); -ok($objKk->gt("\x{4EA}", "\x{4E8}")); -ok($objKk->gt("\x{45C}", "\x{43A}")); -ok($objKk->gt("\x{40C}", "\x{41A}")); -ok($objKk->gt("\x{4EF}", "\x{443}")); # not contraction -ok($objKk->gt("\x{4EE}", "\x{423}")); # not contraction -ok($objKk->gt("\x{45E}", "\x{443}")); -ok($objKk->gt("\x{40E}", "\x{423}")); -ok($objKk->gt("\x{4F1}", "\x{443}")); -ok($objKk->gt("\x{4F0}", "\x{423}")); -ok($objKk->gt("\x{4F3}", "\x{443}")); -ok($objKk->gt("\x{4F2}", "\x{423}")); -ok($objKk->gt("\x{4F5}", "\x{447}")); -ok($objKk->gt("\x{4F4}", "\x{427}")); -ok($objKk->gt("\x{4F9}", "\x{44B}")); -ok($objKk->gt("\x{4F8}", "\x{42B}")); -ok($objKk->gt("\x{4ED}", "\x{44D}")); -ok($objKk->gt("\x{4EC}", "\x{42D}")); -ok($objKk->gt("\x{477}", "\x{475}")); -ok($objKk->gt("\x{476}", "\x{474}")); - -# 107 +# 126 $objKk->change(level => 3); +ok($objKk->lt("\x{430}", "\x{410}")); +ok($objKk->lt("\x{4d9}", "\x{4d8}")); +ok($objKk->lt("\x{431}", "\x{411}")); +ok($objKk->lt("\x{432}", "\x{412}")); +ok($objKk->lt("\x{433}", "\x{413}")); +ok($objKk->lt("\x{493}", "\x{492}")); +ok($objKk->lt("\x{434}", "\x{414}")); +ok($objKk->lt("\x{435}", "\x{415}")); ok($objKk->lt("\x{451}", "\x{401}")); -ok($objKk->lt("\x{4AF}", "\x{4AE}")); +ok($objKk->lt("\x{436}", "\x{416}")); +ok($objKk->lt("\x{437}", "\x{417}")); +ok($objKk->lt("\x{438}", "\x{418}")); +ok($objKk->lt("\x{439}", "\x{419}")); +ok($objKk->lt("\x{43a}", "\x{41a}")); +ok($objKk->lt("\x{49b}", "\x{49a}")); +ok($objKk->lt("\x{43b}", "\x{41b}")); +ok($objKk->lt("\x{43c}", "\x{41c}")); +ok($objKk->lt("\x{43d}", "\x{41d}")); +ok($objKk->lt("\x{4a3}", "\x{4a2}")); +ok($objKk->lt("\x{43e}", "\x{41e}")); +ok($objKk->lt("\x{4e9}", "\x{4e8}")); +ok($objKk->lt("\x{43f}", "\x{41f}")); +ok($objKk->lt("\x{440}", "\x{420}")); +ok($objKk->lt("\x{441}", "\x{421}")); +ok($objKk->lt("\x{442}", "\x{422}")); +ok($objKk->lt("\x{443}", "\x{423}")); +ok($objKk->lt("\x{4b1}", "\x{4b0}")); +ok($objKk->lt("\x{4af}", "\x{4ae}")); +ok($objKk->lt("\x{444}", "\x{424}")); +ok($objKk->lt("\x{445}", "\x{425}")); +ok($objKk->lt("\x{4bb}", "\x{4ba}")); +ok($objKk->lt("\x{446}", "\x{426}")); +ok($objKk->lt("\x{447}", "\x{427}")); +ok($objKk->lt("\x{448}", "\x{428}")); +ok($objKk->lt("\x{449}", "\x{429}")); +ok($objKk->lt("\x{44a}", "\x{42a}")); +ok($objKk->lt("\x{44b}", "\x{42b}")); ok($objKk->lt("\x{456}", "\x{406}")); +ok($objKk->lt("\x{44c}", "\x{42c}")); +ok($objKk->lt("\x{44d}", "\x{42d}")); +ok($objKk->lt("\x{44e}", "\x{42e}")); +ok($objKk->lt("\x{44f}", "\x{42f}")); -# 110 +# 168 ok($objKk->eq("\x{451}", "\x{435}\x{308}")); ok($objKk->eq("\x{401}", "\x{415}\x{308}")); -ok($objKk->eq("\x{4E5}", "\x{438}\x{308}")); # not suppressed -ok($objKk->eq("\x{4E4}", "\x{418}\x{308}")); # not suppressed -ok($objKk->eq("\x{439}", "\x{438}\x{306}")); # not suppressed -ok($objKk->eq("\x{419}", "\x{418}\x{306}")); # not suppressed - -# 116 - -for my $i ("", "\0") { - ok($objKk->eq("\x{4D1}", "\x{430}$i\x{306}")); - ok($objKk->eq("\x{4D0}", "\x{410}$i\x{306}")); - ok($objKk->eq("\x{4D3}", "\x{430}$i\x{308}")); - ok($objKk->eq("\x{4D2}", "\x{410}$i\x{308}")); - ok($objKk->eq("\x{4DB}", "\x{4D9}$i\x{308}")); - ok($objKk->eq("\x{4DA}", "\x{4D8}$i\x{308}")); - ok($objKk->eq("\x{453}", "\x{433}$i\x{301}")); - ok($objKk->eq("\x{403}", "\x{413}$i\x{301}")); - ok($objKk->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction - ok($objKk->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction - ok($objKk->eq("\x{4D7}", "\x{435}$i\x{306}")); - ok($objKk->eq("\x{4D6}", "\x{415}$i\x{306}")); - ok($objKk->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction - ok($objKk->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction - ok($objKk->eq("\x{4DD}", "\x{436}$i\x{308}")); - ok($objKk->eq("\x{4DC}", "\x{416}$i\x{308}")); - ok($objKk->eq("\x{4DF}", "\x{437}$i\x{308}")); - ok($objKk->eq("\x{4DE}", "\x{417}$i\x{308}")); - ok($objKk->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction - ok($objKk->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction - ok($objKk->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction - ok($objKk->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction - ok($objKk->eq("\x{457}", "\x{456}$i\x{308}")); - ok($objKk->eq("\x{407}", "\x{406}$i\x{308}")); - ok($objKk->eq("\x{4E7}", "\x{43E}$i\x{308}")); - ok($objKk->eq("\x{4E6}", "\x{41E}$i\x{308}")); - ok($objKk->eq("\x{4EB}", "\x{4E9}$i\x{308}")); - ok($objKk->eq("\x{4EA}", "\x{4E8}$i\x{308}")); - ok($objKk->eq("\x{45C}", "\x{43A}$i\x{301}")); - ok($objKk->eq("\x{40C}", "\x{41A}$i\x{301}")); - ok($objKk->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction - ok($objKk->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction - ok($objKk->eq("\x{45E}", "\x{443}$i\x{306}")); - ok($objKk->eq("\x{40E}", "\x{423}$i\x{306}")); - ok($objKk->eq("\x{4F1}", "\x{443}$i\x{308}")); - ok($objKk->eq("\x{4F0}", "\x{423}$i\x{308}")); - ok($objKk->eq("\x{4F3}", "\x{443}$i\x{30B}")); - ok($objKk->eq("\x{4F2}", "\x{423}$i\x{30B}")); - ok($objKk->eq("\x{4F5}", "\x{447}$i\x{308}")); - ok($objKk->eq("\x{4F4}", "\x{427}$i\x{308}")); - ok($objKk->eq("\x{4F9}", "\x{44B}$i\x{308}")); - ok($objKk->eq("\x{4F8}", "\x{42B}$i\x{308}")); - ok($objKk->eq("\x{4ED}", "\x{44D}$i\x{308}")); - ok($objKk->eq("\x{4EC}", "\x{42D}$i\x{308}")); - ok($objKk->eq("\x{477}", "\x{475}$i\x{30F}")); - ok($objKk->eq("\x{476}", "\x{474}$i\x{30F}")); -} - -# 208 - -$objKk->change(upper_before_lower => 1); - -ok($objKk->gt("\x{451}", "\x{401}")); -ok($objKk->gt("\x{4AF}", "\x{4AE}")); -ok($objKk->gt("\x{456}", "\x{406}")); +ok($objKk->eq("\x{439}", "\x{438}\x{306}")); +ok($objKk->eq("\x{419}", "\x{418}\x{306}")); -# 211 +# 172 diff --git a/cpan/Unicode-Collate/t/loc_mk.t b/cpan/Unicode-Collate/t/loc_mk.t index df575840eb..937cf9385b 100644 --- a/cpan/Unicode-Collate/t/loc_mk.t +++ b/cpan/Unicode-Collate/t/loc_mk.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..202\n"; } +BEGIN { $| = 1; print "1..148\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -40,175 +40,171 @@ ok($objMk->getlocale, 'mk'); $objMk->change(level => 1); -ok($objMk->gt("\x{453}", "\x{433}")); # not suppressed -ok($objMk->gt("\x{403}", "\x{413}")); # not suppressed -ok($objMk->gt("\x{45C}", "\x{43A}")); # not suppressed -ok($objMk->gt("\x{40C}", "\x{41A}")); # not suppressed - -# 6 - -ok($objMk->eq("\x{4D1}", "\x{430}")); -ok($objMk->eq("\x{4D0}", "\x{410}")); -ok($objMk->eq("\x{4D3}", "\x{430}")); -ok($objMk->eq("\x{4D2}", "\x{410}")); -ok($objMk->eq("\x{4DB}", "\x{4D9}")); -ok($objMk->eq("\x{4DA}", "\x{4D8}")); -ok($objMk->eq("\x{450}", "\x{435}")); # not contraction -ok($objMk->eq("\x{400}", "\x{415}")); # not contraction -ok($objMk->eq("\x{451}", "\x{435}")); # not contraction -ok($objMk->eq("\x{401}", "\x{415}")); # not contraction -ok($objMk->eq("\x{4D7}", "\x{435}")); -ok($objMk->eq("\x{4D6}", "\x{415}")); -ok($objMk->eq("\x{4C2}", "\x{436}")); # not contraction -ok($objMk->eq("\x{4C1}", "\x{416}")); # not contraction -ok($objMk->eq("\x{4DD}", "\x{436}")); -ok($objMk->eq("\x{4DC}", "\x{416}")); -ok($objMk->eq("\x{4DF}", "\x{437}")); -ok($objMk->eq("\x{4DE}", "\x{417}")); -ok($objMk->eq("\x{45D}", "\x{438}")); # not contraction -ok($objMk->eq("\x{40D}", "\x{418}")); # not contraction -ok($objMk->eq("\x{4E3}", "\x{438}")); # not contraction -ok($objMk->eq("\x{4E2}", "\x{418}")); # not contraction -ok($objMk->eq("\x{4E5}", "\x{438}")); -ok($objMk->eq("\x{4E4}", "\x{418}")); -ok($objMk->eq("\x{457}", "\x{456}")); -ok($objMk->eq("\x{407}", "\x{406}")); -ok($objMk->eq("\x{439}", "\x{438}")); -ok($objMk->eq("\x{419}", "\x{418}")); -ok($objMk->eq("\x{4E7}", "\x{43E}")); -ok($objMk->eq("\x{4E6}", "\x{41E}")); -ok($objMk->eq("\x{4EB}", "\x{4E9}")); -ok($objMk->eq("\x{4EA}", "\x{4E8}")); -ok($objMk->eq("\x{4EF}", "\x{443}")); # not contraction -ok($objMk->eq("\x{4EE}", "\x{423}")); # not contraction -ok($objMk->eq("\x{45E}", "\x{443}")); -ok($objMk->eq("\x{40E}", "\x{423}")); -ok($objMk->eq("\x{4F1}", "\x{443}")); -ok($objMk->eq("\x{4F0}", "\x{423}")); -ok($objMk->eq("\x{4F3}", "\x{443}")); -ok($objMk->eq("\x{4F2}", "\x{423}")); -ok($objMk->eq("\x{4F5}", "\x{447}")); -ok($objMk->eq("\x{4F4}", "\x{427}")); -ok($objMk->eq("\x{4F9}", "\x{44B}")); -ok($objMk->eq("\x{4F8}", "\x{42B}")); -ok($objMk->eq("\x{4ED}", "\x{44D}")); -ok($objMk->eq("\x{4EC}", "\x{42D}")); -ok($objMk->eq("\x{477}", "\x{475}")); -ok($objMk->eq("\x{476}", "\x{474}")); - -# 54 +ok($objMk->lt("\x{430}z", "\x{431}")); +ok($objMk->lt("\x{431}z", "\x{432}")); +ok($objMk->lt("\x{432}z", "\x{433}")); +ok($objMk->lt("\x{433}z", "\x{434}")); +ok($objMk->lt("\x{434}z", "\x{503}")); +ok($objMk->lt("\x{503}z", "\x{453}")); +ok($objMk->lt("\x{453}z", "\x{435}")); +ok($objMk->lt("\x{435}z", "\x{436}")); +ok($objMk->lt("\x{436}z", "\x{437}")); +ok($objMk->lt("\x{437}z", "\x{455}")); +ok($objMk->lt("\x{455}z", "\x{438}")); +ok($objMk->lt("\x{438}z", "\x{458}")); +ok($objMk->lt("\x{458}z", "\x{43a}")); +ok($objMk->lt("\x{43a}z", "\x{43b}")); +ok($objMk->lt("\x{43b}z", "\x{459}")); +ok($objMk->lt("\x{459}z", "\x{43c}")); +ok($objMk->lt("\x{43c}z", "\x{43d}")); +ok($objMk->lt("\x{43d}z", "\x{45a}")); +ok($objMk->lt("\x{45a}z", "\x{43e}")); +ok($objMk->lt("\x{43e}z", "\x{43f}")); +ok($objMk->lt("\x{43f}z", "\x{440}")); +ok($objMk->lt("\x{440}z", "\x{441}")); +ok($objMk->lt("\x{441}z", "\x{442}")); +ok($objMk->lt("\x{442}z", "\x{45b}")); +ok($objMk->lt("\x{45b}z", "\x{45c}")); +ok($objMk->lt("\x{45c}z", "\x{443}")); +ok($objMk->lt("\x{443}z", "\x{444}")); +ok($objMk->lt("\x{444}z", "\x{445}")); +ok($objMk->lt("\x{445}z", "\x{446}")); +ok($objMk->lt("\x{446}z", "\x{447}")); +ok($objMk->lt("\x{447}z", "\x{45f}")); +ok($objMk->lt("\x{45f}z", "\x{448}")); + +ok($objMk->lt("\x{410}z", "\x{411}")); +ok($objMk->lt("\x{411}z", "\x{412}")); +ok($objMk->lt("\x{412}z", "\x{413}")); +ok($objMk->lt("\x{413}z", "\x{414}")); +ok($objMk->lt("\x{414}z", "\x{502}")); +ok($objMk->lt("\x{502}z", "\x{403}")); +ok($objMk->lt("\x{403}z", "\x{415}")); +ok($objMk->lt("\x{415}z", "\x{416}")); +ok($objMk->lt("\x{416}z", "\x{417}")); +ok($objMk->lt("\x{417}z", "\x{405}")); +ok($objMk->lt("\x{405}z", "\x{418}")); +ok($objMk->lt("\x{418}z", "\x{408}")); +ok($objMk->lt("\x{408}z", "\x{41a}")); +ok($objMk->lt("\x{41a}z", "\x{41b}")); +ok($objMk->lt("\x{41b}z", "\x{409}")); +ok($objMk->lt("\x{409}z", "\x{41c}")); +ok($objMk->lt("\x{41c}z", "\x{41d}")); +ok($objMk->lt("\x{41d}z", "\x{40a}")); +ok($objMk->lt("\x{40a}z", "\x{41e}")); +ok($objMk->lt("\x{41e}z", "\x{41f}")); +ok($objMk->lt("\x{41f}z", "\x{420}")); +ok($objMk->lt("\x{420}z", "\x{421}")); +ok($objMk->lt("\x{421}z", "\x{422}")); +ok($objMk->lt("\x{422}z", "\x{40b}")); +ok($objMk->lt("\x{40b}z", "\x{40c}")); +ok($objMk->lt("\x{40c}z", "\x{423}")); +ok($objMk->lt("\x{423}z", "\x{424}")); +ok($objMk->lt("\x{424}z", "\x{425}")); +ok($objMk->lt("\x{425}z", "\x{426}")); +ok($objMk->lt("\x{426}z", "\x{427}")); +ok($objMk->lt("\x{427}z", "\x{40f}")); +ok($objMk->lt("\x{40f}z", "\x{428}")); + +# 66 + +ok($objMk->eq("\x{438}", "\x{439}")); +ok($objMk->eq("\x{418}", "\x{419}")); + +# 68 $objMk->change(level => 2); -ok($objMk->gt("\x{4D1}", "\x{430}")); -ok($objMk->gt("\x{4D0}", "\x{410}")); -ok($objMk->gt("\x{4D3}", "\x{430}")); -ok($objMk->gt("\x{4D2}", "\x{410}")); -ok($objMk->gt("\x{4DB}", "\x{4D9}")); -ok($objMk->gt("\x{4DA}", "\x{4D8}")); -ok($objMk->gt("\x{450}", "\x{435}")); # not contraction -ok($objMk->gt("\x{400}", "\x{415}")); # not contraction -ok($objMk->gt("\x{451}", "\x{435}")); # not contraction -ok($objMk->gt("\x{401}", "\x{415}")); # not contraction -ok($objMk->gt("\x{4D7}", "\x{435}")); -ok($objMk->gt("\x{4D6}", "\x{415}")); -ok($objMk->gt("\x{4C2}", "\x{436}")); # not contraction -ok($objMk->gt("\x{4C1}", "\x{416}")); # not contraction -ok($objMk->gt("\x{4DD}", "\x{436}")); -ok($objMk->gt("\x{4DC}", "\x{416}")); -ok($objMk->gt("\x{4DF}", "\x{437}")); -ok($objMk->gt("\x{4DE}", "\x{417}")); -ok($objMk->gt("\x{45D}", "\x{438}")); # not contraction -ok($objMk->gt("\x{40D}", "\x{418}")); # not contraction -ok($objMk->gt("\x{4E3}", "\x{438}")); # not contraction -ok($objMk->gt("\x{4E2}", "\x{418}")); # not contraction -ok($objMk->gt("\x{4E5}", "\x{438}")); -ok($objMk->gt("\x{4E4}", "\x{418}")); -ok($objMk->gt("\x{457}", "\x{456}")); -ok($objMk->gt("\x{407}", "\x{406}")); -ok($objMk->gt("\x{439}", "\x{438}")); -ok($objMk->gt("\x{419}", "\x{418}")); -ok($objMk->gt("\x{4E7}", "\x{43E}")); -ok($objMk->gt("\x{4E6}", "\x{41E}")); -ok($objMk->gt("\x{4EB}", "\x{4E9}")); -ok($objMk->gt("\x{4EA}", "\x{4E8}")); -ok($objMk->gt("\x{4EF}", "\x{443}")); # not contraction -ok($objMk->gt("\x{4EE}", "\x{423}")); # not contraction -ok($objMk->gt("\x{45E}", "\x{443}")); -ok($objMk->gt("\x{40E}", "\x{423}")); -ok($objMk->gt("\x{4F1}", "\x{443}")); -ok($objMk->gt("\x{4F0}", "\x{423}")); -ok($objMk->gt("\x{4F3}", "\x{443}")); -ok($objMk->gt("\x{4F2}", "\x{423}")); -ok($objMk->gt("\x{4F5}", "\x{447}")); -ok($objMk->gt("\x{4F4}", "\x{427}")); -ok($objMk->gt("\x{4F9}", "\x{44B}")); -ok($objMk->gt("\x{4F8}", "\x{42B}")); -ok($objMk->gt("\x{4ED}", "\x{44D}")); -ok($objMk->gt("\x{4EC}", "\x{42D}")); -ok($objMk->gt("\x{477}", "\x{475}")); -ok($objMk->gt("\x{476}", "\x{474}")); - -# 102 +ok($objMk->lt("\x{438}", "\x{439}")); +ok($objMk->lt("\x{418}", "\x{419}")); + +# 70 + +ok($objMk->eq("\x{430}", "\x{410}")); +ok($objMk->eq("\x{431}", "\x{411}")); +ok($objMk->eq("\x{432}", "\x{412}")); +ok($objMk->eq("\x{433}", "\x{413}")); +ok($objMk->eq("\x{434}", "\x{414}")); +ok($objMk->eq("\x{503}", "\x{502}")); +ok($objMk->eq("\x{453}", "\x{403}")); +ok($objMk->eq("\x{435}", "\x{415}")); +ok($objMk->eq("\x{436}", "\x{416}")); +ok($objMk->eq("\x{437}", "\x{417}")); +ok($objMk->eq("\x{455}", "\x{405}")); +ok($objMk->eq("\x{438}", "\x{418}")); +ok($objMk->eq("\x{439}", "\x{419}")); +ok($objMk->eq("\x{458}", "\x{408}")); +ok($objMk->eq("\x{43a}", "\x{41a}")); +ok($objMk->eq("\x{43b}", "\x{41b}")); +ok($objMk->eq("\x{459}", "\x{409}")); +ok($objMk->eq("\x{43c}", "\x{41c}")); +ok($objMk->eq("\x{43d}", "\x{41d}")); +ok($objMk->eq("\x{45a}", "\x{40a}")); +ok($objMk->eq("\x{43e}", "\x{41e}")); +ok($objMk->eq("\x{43f}", "\x{41f}")); +ok($objMk->eq("\x{440}", "\x{420}")); +ok($objMk->eq("\x{441}", "\x{421}")); +ok($objMk->eq("\x{442}", "\x{422}")); +ok($objMk->eq("\x{45b}", "\x{40b}")); +ok($objMk->eq("\x{45c}", "\x{40c}")); +ok($objMk->eq("\x{443}", "\x{423}")); +ok($objMk->eq("\x{444}", "\x{424}")); +ok($objMk->eq("\x{445}", "\x{425}")); +ok($objMk->eq("\x{446}", "\x{426}")); +ok($objMk->eq("\x{447}", "\x{427}")); +ok($objMk->eq("\x{45f}", "\x{40f}")); +ok($objMk->eq("\x{448}", "\x{428}")); + +# 104 $objMk->change(level => 3); -ok($objMk->eq("\x{453}", "\x{433}\x{301}")); # not suppressed -ok($objMk->eq("\x{403}", "\x{413}\x{301}")); # not suppressed -ok($objMk->eq("\x{45C}", "\x{43A}\x{301}")); # not suppressed -ok($objMk->eq("\x{40C}", "\x{41A}\x{301}")); # not suppressed - -# 106 - -for my $i ("", "\0") { - ok($objMk->eq("\x{4D1}", "\x{430}$i\x{306}")); - ok($objMk->eq("\x{4D0}", "\x{410}$i\x{306}")); - ok($objMk->eq("\x{4D3}", "\x{430}$i\x{308}")); - ok($objMk->eq("\x{4D2}", "\x{410}$i\x{308}")); - ok($objMk->eq("\x{4DB}", "\x{4D9}$i\x{308}")); - ok($objMk->eq("\x{4DA}", "\x{4D8}$i\x{308}")); - ok($objMk->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction - ok($objMk->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction - ok($objMk->eq("\x{451}", "\x{435}$i\x{308}")); # not contraction - ok($objMk->eq("\x{401}", "\x{415}$i\x{308}")); # not contraction - ok($objMk->eq("\x{4D7}", "\x{435}$i\x{306}")); - ok($objMk->eq("\x{4D6}", "\x{415}$i\x{306}")); - ok($objMk->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction - ok($objMk->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction - ok($objMk->eq("\x{4DD}", "\x{436}$i\x{308}")); - ok($objMk->eq("\x{4DC}", "\x{416}$i\x{308}")); - ok($objMk->eq("\x{4DF}", "\x{437}$i\x{308}")); - ok($objMk->eq("\x{4DE}", "\x{417}$i\x{308}")); - ok($objMk->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction - ok($objMk->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction - ok($objMk->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction - ok($objMk->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction - ok($objMk->eq("\x{4E5}", "\x{438}$i\x{308}")); - ok($objMk->eq("\x{4E4}", "\x{418}$i\x{308}")); - ok($objMk->eq("\x{457}", "\x{456}$i\x{308}")); - ok($objMk->eq("\x{407}", "\x{406}$i\x{308}")); - ok($objMk->eq("\x{439}", "\x{438}$i\x{306}")); - ok($objMk->eq("\x{419}", "\x{418}$i\x{306}")); - ok($objMk->eq("\x{4E7}", "\x{43E}$i\x{308}")); - ok($objMk->eq("\x{4E6}", "\x{41E}$i\x{308}")); - ok($objMk->eq("\x{4EB}", "\x{4E9}$i\x{308}")); - ok($objMk->eq("\x{4EA}", "\x{4E8}$i\x{308}")); - ok($objMk->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction - ok($objMk->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction - ok($objMk->eq("\x{45E}", "\x{443}$i\x{306}")); - ok($objMk->eq("\x{40E}", "\x{423}$i\x{306}")); - ok($objMk->eq("\x{4F1}", "\x{443}$i\x{308}")); - ok($objMk->eq("\x{4F0}", "\x{423}$i\x{308}")); - ok($objMk->eq("\x{4F3}", "\x{443}$i\x{30B}")); - ok($objMk->eq("\x{4F2}", "\x{423}$i\x{30B}")); - ok($objMk->eq("\x{4F5}", "\x{447}$i\x{308}")); - ok($objMk->eq("\x{4F4}", "\x{427}$i\x{308}")); - ok($objMk->eq("\x{4F9}", "\x{44B}$i\x{308}")); - ok($objMk->eq("\x{4F8}", "\x{42B}$i\x{308}")); - ok($objMk->eq("\x{4ED}", "\x{44D}$i\x{308}")); - ok($objMk->eq("\x{4EC}", "\x{42D}$i\x{308}")); - ok($objMk->eq("\x{477}", "\x{475}$i\x{30F}")); - ok($objMk->eq("\x{476}", "\x{474}$i\x{30F}")); -} - -# 202 +ok($objMk->lt("\x{430}", "\x{410}")); +ok($objMk->lt("\x{431}", "\x{411}")); +ok($objMk->lt("\x{432}", "\x{412}")); +ok($objMk->lt("\x{433}", "\x{413}")); +ok($objMk->lt("\x{434}", "\x{414}")); +ok($objMk->lt("\x{503}", "\x{502}")); +ok($objMk->lt("\x{453}", "\x{403}")); +ok($objMk->lt("\x{435}", "\x{415}")); +ok($objMk->lt("\x{436}", "\x{416}")); +ok($objMk->lt("\x{437}", "\x{417}")); +ok($objMk->lt("\x{455}", "\x{405}")); +ok($objMk->lt("\x{438}", "\x{418}")); +ok($objMk->lt("\x{439}", "\x{419}")); +ok($objMk->lt("\x{458}", "\x{408}")); +ok($objMk->lt("\x{43a}", "\x{41a}")); +ok($objMk->lt("\x{43b}", "\x{41b}")); +ok($objMk->lt("\x{459}", "\x{409}")); +ok($objMk->lt("\x{43c}", "\x{41c}")); +ok($objMk->lt("\x{43d}", "\x{41d}")); +ok($objMk->lt("\x{45a}", "\x{40a}")); +ok($objMk->lt("\x{43e}", "\x{41e}")); +ok($objMk->lt("\x{43f}", "\x{41f}")); +ok($objMk->lt("\x{440}", "\x{420}")); +ok($objMk->lt("\x{441}", "\x{421}")); +ok($objMk->lt("\x{442}", "\x{422}")); +ok($objMk->lt("\x{45b}", "\x{40b}")); +ok($objMk->lt("\x{45c}", "\x{40c}")); +ok($objMk->lt("\x{443}", "\x{423}")); +ok($objMk->lt("\x{444}", "\x{424}")); +ok($objMk->lt("\x{445}", "\x{425}")); +ok($objMk->lt("\x{446}", "\x{426}")); +ok($objMk->lt("\x{447}", "\x{427}")); +ok($objMk->lt("\x{45f}", "\x{40f}")); +ok($objMk->lt("\x{448}", "\x{428}")); + +# 138 + +ok($objMk->eq("\x{453}", "\x{433}\x{301}")); +ok($objMk->eq("\x{453}", "\x{433}\x{341}")); +ok($objMk->eq("\x{403}", "\x{413}\x{301}")); +ok($objMk->eq("\x{403}", "\x{413}\x{341}")); +ok($objMk->eq("\x{439}", "\x{438}\x{306}")); +ok($objMk->eq("\x{419}", "\x{418}\x{306}")); +ok($objMk->eq("\x{45c}", "\x{43a}\x{301}")); +ok($objMk->eq("\x{45c}", "\x{43a}\x{341}")); +ok($objMk->eq("\x{40c}", "\x{41a}\x{301}")); +ok($objMk->eq("\x{40c}", "\x{41a}\x{341}")); + +# 148 diff --git a/cpan/Unicode-Collate/t/loc_mncy.t b/cpan/Unicode-Collate/t/loc_mncy.t new file mode 100644 index 0000000000..cea6078015 --- /dev/null +++ b/cpan/Unicode-Collate/t/loc_mncy.t @@ -0,0 +1,208 @@ + +BEGIN { + unless ('A' eq pack('U', 0x41)) { + print "1..0 # Unicode::Collate cannot pack a Unicode code point\n"; + exit 0; + } + unless (0x41 == unpack('U', 'A')) { + print "1..0 # Unicode::Collate cannot get a Unicode code point\n"; + exit 0; + } + if ($ENV{PERL_CORE}) { + chdir('t') if -d 't'; + @INC = $^O eq 'MacOS' ? qw(::lib) : qw(../lib); + } +} + +use strict; +use warnings; +BEGIN { $| = 1; print "1..146\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + +use Unicode::Collate::Locale; + +ok(1); + +######################### + +my $objMnCyrl = Unicode::Collate::Locale-> + new(locale => 'MN-CYRL', normalization => undef); + +ok($objMnCyrl->getlocale, 'default'); + +$objMnCyrl->change(level => 1); + +ok($objMnCyrl->lt("\x{430}z", "\x{431}")); +ok($objMnCyrl->lt("\x{431}z", "\x{432}")); +ok($objMnCyrl->lt("\x{432}z", "\x{433}")); +ok($objMnCyrl->lt("\x{433}z", "\x{434}")); +ok($objMnCyrl->lt("\x{434}z", "\x{435}")); +ok($objMnCyrl->lt("\x{435}z", "\x{436}")); +ok($objMnCyrl->lt("\x{436}z", "\x{437}")); +ok($objMnCyrl->lt("\x{437}z", "\x{438}")); +ok($objMnCyrl->lt("\x{438}z", "\x{439}")); +ok($objMnCyrl->lt("\x{439}z", "\x{43a}")); +ok($objMnCyrl->lt("\x{43a}z", "\x{43b}")); +ok($objMnCyrl->lt("\x{43b}z", "\x{43c}")); +ok($objMnCyrl->lt("\x{43c}z", "\x{43d}")); +ok($objMnCyrl->lt("\x{43d}z", "\x{43e}")); +ok($objMnCyrl->lt("\x{43e}z", "\x{4e9}")); +ok($objMnCyrl->lt("\x{4e9}z", "\x{43f}")); +ok($objMnCyrl->lt("\x{43f}z", "\x{440}")); +ok($objMnCyrl->lt("\x{440}z", "\x{441}")); +ok($objMnCyrl->lt("\x{441}z", "\x{442}")); +ok($objMnCyrl->lt("\x{442}z", "\x{443}")); +ok($objMnCyrl->lt("\x{443}z", "\x{4af}")); +ok($objMnCyrl->lt("\x{4af}z", "\x{444}")); +ok($objMnCyrl->lt("\x{444}z", "\x{445}")); +ok($objMnCyrl->lt("\x{445}z", "\x{446}")); +ok($objMnCyrl->lt("\x{446}z", "\x{447}")); +ok($objMnCyrl->lt("\x{447}z", "\x{448}")); +ok($objMnCyrl->lt("\x{448}z", "\x{449}")); +ok($objMnCyrl->lt("\x{449}z", "\x{44a}")); +ok($objMnCyrl->lt("\x{44a}z", "\x{44b}")); +ok($objMnCyrl->lt("\x{44b}z", "\x{44c}")); +ok($objMnCyrl->lt("\x{44c}z", "\x{44d}")); +ok($objMnCyrl->lt("\x{44d}z", "\x{44e}")); +ok($objMnCyrl->lt("\x{44e}z", "\x{44f}")); + +ok($objMnCyrl->lt("\x{410}z", "\x{411}")); +ok($objMnCyrl->lt("\x{411}z", "\x{412}")); +ok($objMnCyrl->lt("\x{412}z", "\x{413}")); +ok($objMnCyrl->lt("\x{413}z", "\x{414}")); +ok($objMnCyrl->lt("\x{414}z", "\x{415}")); +ok($objMnCyrl->lt("\x{415}z", "\x{416}")); +ok($objMnCyrl->lt("\x{416}z", "\x{417}")); +ok($objMnCyrl->lt("\x{417}z", "\x{418}")); +ok($objMnCyrl->lt("\x{418}z", "\x{419}")); +ok($objMnCyrl->lt("\x{419}z", "\x{41a}")); +ok($objMnCyrl->lt("\x{41a}z", "\x{41b}")); +ok($objMnCyrl->lt("\x{41b}z", "\x{41c}")); +ok($objMnCyrl->lt("\x{41c}z", "\x{41d}")); +ok($objMnCyrl->lt("\x{41d}z", "\x{41e}")); +ok($objMnCyrl->lt("\x{41e}z", "\x{4e8}")); +ok($objMnCyrl->lt("\x{4e8}z", "\x{41f}")); +ok($objMnCyrl->lt("\x{41f}z", "\x{420}")); +ok($objMnCyrl->lt("\x{420}z", "\x{421}")); +ok($objMnCyrl->lt("\x{421}z", "\x{422}")); +ok($objMnCyrl->lt("\x{422}z", "\x{423}")); +ok($objMnCyrl->lt("\x{423}z", "\x{4ae}")); +ok($objMnCyrl->lt("\x{4ae}z", "\x{424}")); +ok($objMnCyrl->lt("\x{424}z", "\x{425}")); +ok($objMnCyrl->lt("\x{425}z", "\x{426}")); +ok($objMnCyrl->lt("\x{426}z", "\x{427}")); +ok($objMnCyrl->lt("\x{427}z", "\x{428}")); +ok($objMnCyrl->lt("\x{428}z", "\x{429}")); +ok($objMnCyrl->lt("\x{429}z", "\x{42a}")); +ok($objMnCyrl->lt("\x{42a}z", "\x{42b}")); +ok($objMnCyrl->lt("\x{42b}z", "\x{42c}")); +ok($objMnCyrl->lt("\x{42c}z", "\x{42d}")); +ok($objMnCyrl->lt("\x{42d}z", "\x{42e}")); +ok($objMnCyrl->lt("\x{42e}z", "\x{42f}")); + +# 68 + +ok($objMnCyrl->eq("\x{435}", "\x{451}")); +ok($objMnCyrl->eq("\x{415}", "\x{401}")); + +# 70 + +$objMnCyrl->change(level => 2); + +ok($objMnCyrl->lt("\x{435}", "\x{451}")); +ok($objMnCyrl->lt("\x{415}", "\x{401}")); + +# 72 + +ok($objMnCyrl->eq("\x{430}", "\x{410}")); +ok($objMnCyrl->eq("\x{431}", "\x{411}")); +ok($objMnCyrl->eq("\x{432}", "\x{412}")); +ok($objMnCyrl->eq("\x{433}", "\x{413}")); +ok($objMnCyrl->eq("\x{434}", "\x{414}")); +ok($objMnCyrl->eq("\x{435}", "\x{415}")); +ok($objMnCyrl->eq("\x{451}", "\x{401}")); +ok($objMnCyrl->eq("\x{436}", "\x{416}")); +ok($objMnCyrl->eq("\x{437}", "\x{417}")); +ok($objMnCyrl->eq("\x{438}", "\x{418}")); +ok($objMnCyrl->eq("\x{439}", "\x{419}")); +ok($objMnCyrl->eq("\x{43a}", "\x{41a}")); +ok($objMnCyrl->eq("\x{43b}", "\x{41b}")); +ok($objMnCyrl->eq("\x{43c}", "\x{41c}")); +ok($objMnCyrl->eq("\x{43d}", "\x{41d}")); +ok($objMnCyrl->eq("\x{43e}", "\x{41e}")); +ok($objMnCyrl->eq("\x{4e9}", "\x{4e8}")); +ok($objMnCyrl->eq("\x{43f}", "\x{41f}")); +ok($objMnCyrl->eq("\x{440}", "\x{420}")); +ok($objMnCyrl->eq("\x{441}", "\x{421}")); +ok($objMnCyrl->eq("\x{442}", "\x{422}")); +ok($objMnCyrl->eq("\x{443}", "\x{423}")); +ok($objMnCyrl->eq("\x{4af}", "\x{4ae}")); +ok($objMnCyrl->eq("\x{444}", "\x{424}")); +ok($objMnCyrl->eq("\x{445}", "\x{425}")); +ok($objMnCyrl->eq("\x{446}", "\x{426}")); +ok($objMnCyrl->eq("\x{447}", "\x{427}")); +ok($objMnCyrl->eq("\x{448}", "\x{428}")); +ok($objMnCyrl->eq("\x{449}", "\x{429}")); +ok($objMnCyrl->eq("\x{44a}", "\x{42a}")); +ok($objMnCyrl->eq("\x{44b}", "\x{42b}")); +ok($objMnCyrl->eq("\x{44c}", "\x{42c}")); +ok($objMnCyrl->eq("\x{44d}", "\x{42d}")); +ok($objMnCyrl->eq("\x{44e}", "\x{42e}")); +ok($objMnCyrl->eq("\x{44f}", "\x{42f}")); + +# 107 + +$objMnCyrl->change(level => 3); + +ok($objMnCyrl->lt("\x{430}", "\x{410}")); +ok($objMnCyrl->lt("\x{431}", "\x{411}")); +ok($objMnCyrl->lt("\x{432}", "\x{412}")); +ok($objMnCyrl->lt("\x{433}", "\x{413}")); +ok($objMnCyrl->lt("\x{434}", "\x{414}")); +ok($objMnCyrl->lt("\x{435}", "\x{415}")); +ok($objMnCyrl->lt("\x{451}", "\x{401}")); +ok($objMnCyrl->lt("\x{436}", "\x{416}")); +ok($objMnCyrl->lt("\x{437}", "\x{417}")); +ok($objMnCyrl->lt("\x{438}", "\x{418}")); +ok($objMnCyrl->lt("\x{439}", "\x{419}")); +ok($objMnCyrl->lt("\x{43a}", "\x{41a}")); +ok($objMnCyrl->lt("\x{43b}", "\x{41b}")); +ok($objMnCyrl->lt("\x{43c}", "\x{41c}")); +ok($objMnCyrl->lt("\x{43d}", "\x{41d}")); +ok($objMnCyrl->lt("\x{43e}", "\x{41e}")); +ok($objMnCyrl->lt("\x{4e9}", "\x{4e8}")); +ok($objMnCyrl->lt("\x{43f}", "\x{41f}")); +ok($objMnCyrl->lt("\x{440}", "\x{420}")); +ok($objMnCyrl->lt("\x{441}", "\x{421}")); +ok($objMnCyrl->lt("\x{442}", "\x{422}")); +ok($objMnCyrl->lt("\x{443}", "\x{423}")); +ok($objMnCyrl->lt("\x{4af}", "\x{4ae}")); +ok($objMnCyrl->lt("\x{444}", "\x{424}")); +ok($objMnCyrl->lt("\x{445}", "\x{425}")); +ok($objMnCyrl->lt("\x{446}", "\x{426}")); +ok($objMnCyrl->lt("\x{447}", "\x{427}")); +ok($objMnCyrl->lt("\x{448}", "\x{428}")); +ok($objMnCyrl->lt("\x{449}", "\x{429}")); +ok($objMnCyrl->lt("\x{44a}", "\x{42a}")); +ok($objMnCyrl->lt("\x{44b}", "\x{42b}")); +ok($objMnCyrl->lt("\x{44c}", "\x{42c}")); +ok($objMnCyrl->lt("\x{44d}", "\x{42d}")); +ok($objMnCyrl->lt("\x{44e}", "\x{42e}")); +ok($objMnCyrl->lt("\x{44f}", "\x{42f}")); + +# 142 + +ok($objMnCyrl->eq("\x{451}", "\x{435}\x{308}")); +ok($objMnCyrl->eq("\x{401}", "\x{415}\x{308}")); +ok($objMnCyrl->eq("\x{439}", "\x{438}\x{306}")); +ok($objMnCyrl->eq("\x{419}", "\x{418}\x{306}")); + +# 146 diff --git a/cpan/Unicode-Collate/t/loc_ru.t b/cpan/Unicode-Collate/t/loc_ru.t index fb7f3f4b4f..2e332ab631 100644 --- a/cpan/Unicode-Collate/t/loc_ru.t +++ b/cpan/Unicode-Collate/t/loc_ru.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..202\n"; } +BEGIN { $| = 1; print "1..138\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -36,179 +36,165 @@ ok(1); my $objRu = Unicode::Collate::Locale-> new(locale => 'RU', normalization => undef); -ok($objRu->getlocale, 'ru'); +ok($objRu->getlocale, 'default'); # no tailoring since 1.17 $objRu->change(level => 1); -ok($objRu->gt("\x{4E5}", "\x{438}")); # not suppressed -ok($objRu->gt("\x{4E4}", "\x{418}")); # not suppressed -ok($objRu->gt("\x{439}", "\x{438}")); # not suppressed -ok($objRu->gt("\x{419}", "\x{418}")); # not suppressed - -# 6 - -ok($objRu->eq("\x{4D1}", "\x{430}")); -ok($objRu->eq("\x{4D0}", "\x{410}")); -ok($objRu->eq("\x{4D3}", "\x{430}")); -ok($objRu->eq("\x{4D2}", "\x{410}")); -ok($objRu->eq("\x{4DB}", "\x{4D9}")); -ok($objRu->eq("\x{4DA}", "\x{4D8}")); -ok($objRu->eq("\x{453}", "\x{433}")); -ok($objRu->eq("\x{403}", "\x{413}")); -ok($objRu->eq("\x{450}", "\x{435}")); # not contraction -ok($objRu->eq("\x{400}", "\x{415}")); # not contraction -ok($objRu->eq("\x{451}", "\x{435}")); # not contraction -ok($objRu->eq("\x{401}", "\x{415}")); # not contraction -ok($objRu->eq("\x{4D7}", "\x{435}")); -ok($objRu->eq("\x{4D6}", "\x{415}")); -ok($objRu->eq("\x{4C2}", "\x{436}")); # not contraction -ok($objRu->eq("\x{4C1}", "\x{416}")); # not contraction -ok($objRu->eq("\x{4DD}", "\x{436}")); -ok($objRu->eq("\x{4DC}", "\x{416}")); -ok($objRu->eq("\x{4DF}", "\x{437}")); -ok($objRu->eq("\x{4DE}", "\x{417}")); -ok($objRu->eq("\x{45D}", "\x{438}")); # not contraction -ok($objRu->eq("\x{40D}", "\x{418}")); # not contraction -ok($objRu->eq("\x{4E3}", "\x{438}")); # not contraction -ok($objRu->eq("\x{4E2}", "\x{418}")); # not contraction -ok($objRu->eq("\x{457}", "\x{456}")); -ok($objRu->eq("\x{407}", "\x{406}")); -ok($objRu->eq("\x{4E7}", "\x{43E}")); -ok($objRu->eq("\x{4E6}", "\x{41E}")); -ok($objRu->eq("\x{4EB}", "\x{4E9}")); -ok($objRu->eq("\x{4EA}", "\x{4E8}")); -ok($objRu->eq("\x{45C}", "\x{43A}")); -ok($objRu->eq("\x{40C}", "\x{41A}")); -ok($objRu->eq("\x{4EF}", "\x{443}")); # not contraction -ok($objRu->eq("\x{4EE}", "\x{423}")); # not contraction -ok($objRu->eq("\x{45E}", "\x{443}")); -ok($objRu->eq("\x{40E}", "\x{423}")); -ok($objRu->eq("\x{4F1}", "\x{443}")); -ok($objRu->eq("\x{4F0}", "\x{423}")); -ok($objRu->eq("\x{4F3}", "\x{443}")); -ok($objRu->eq("\x{4F2}", "\x{423}")); -ok($objRu->eq("\x{4F5}", "\x{447}")); -ok($objRu->eq("\x{4F4}", "\x{427}")); -ok($objRu->eq("\x{4F9}", "\x{44B}")); -ok($objRu->eq("\x{4F8}", "\x{42B}")); -ok($objRu->eq("\x{4ED}", "\x{44D}")); -ok($objRu->eq("\x{4EC}", "\x{42D}")); -ok($objRu->eq("\x{477}", "\x{475}")); -ok($objRu->eq("\x{476}", "\x{474}")); - -# 54 +ok($objRu->lt("\x{430}z", "\x{431}")); +ok($objRu->lt("\x{431}z", "\x{432}")); +ok($objRu->lt("\x{432}z", "\x{433}")); +ok($objRu->lt("\x{433}z", "\x{434}")); +ok($objRu->lt("\x{434}z", "\x{435}")); +ok($objRu->lt("\x{435}z", "\x{436}")); +ok($objRu->lt("\x{436}z", "\x{437}")); +ok($objRu->lt("\x{437}z", "\x{438}")); +ok($objRu->lt("\x{438}z", "\x{439}")); +ok($objRu->lt("\x{439}z", "\x{43a}")); +ok($objRu->lt("\x{43a}z", "\x{43b}")); +ok($objRu->lt("\x{43b}z", "\x{43c}")); +ok($objRu->lt("\x{43c}z", "\x{43d}")); +ok($objRu->lt("\x{43d}z", "\x{43e}")); +ok($objRu->lt("\x{43e}z", "\x{43f}")); +ok($objRu->lt("\x{43f}z", "\x{440}")); +ok($objRu->lt("\x{440}z", "\x{441}")); +ok($objRu->lt("\x{441}z", "\x{442}")); +ok($objRu->lt("\x{442}z", "\x{443}")); +ok($objRu->lt("\x{443}z", "\x{444}")); +ok($objRu->lt("\x{444}z", "\x{445}")); +ok($objRu->lt("\x{445}z", "\x{446}")); +ok($objRu->lt("\x{446}z", "\x{447}")); +ok($objRu->lt("\x{447}z", "\x{448}")); +ok($objRu->lt("\x{448}z", "\x{449}")); +ok($objRu->lt("\x{449}z", "\x{44a}")); +ok($objRu->lt("\x{44a}z", "\x{44b}")); +ok($objRu->lt("\x{44b}z", "\x{44c}")); +ok($objRu->lt("\x{44c}z", "\x{44d}")); +ok($objRu->lt("\x{44d}z", "\x{44e}")); +ok($objRu->lt("\x{44e}z", "\x{44f}")); + +ok($objRu->lt("\x{410}z", "\x{411}")); +ok($objRu->lt("\x{411}z", "\x{412}")); +ok($objRu->lt("\x{412}z", "\x{413}")); +ok($objRu->lt("\x{413}z", "\x{414}")); +ok($objRu->lt("\x{414}z", "\x{415}")); +ok($objRu->lt("\x{415}z", "\x{416}")); +ok($objRu->lt("\x{416}z", "\x{417}")); +ok($objRu->lt("\x{417}z", "\x{418}")); +ok($objRu->lt("\x{418}z", "\x{419}")); +ok($objRu->lt("\x{419}z", "\x{41a}")); +ok($objRu->lt("\x{41a}z", "\x{41b}")); +ok($objRu->lt("\x{41b}z", "\x{41c}")); +ok($objRu->lt("\x{41c}z", "\x{41d}")); +ok($objRu->lt("\x{41d}z", "\x{41e}")); +ok($objRu->lt("\x{41e}z", "\x{41f}")); +ok($objRu->lt("\x{41f}z", "\x{420}")); +ok($objRu->lt("\x{420}z", "\x{421}")); +ok($objRu->lt("\x{421}z", "\x{422}")); +ok($objRu->lt("\x{422}z", "\x{423}")); +ok($objRu->lt("\x{423}z", "\x{424}")); +ok($objRu->lt("\x{424}z", "\x{425}")); +ok($objRu->lt("\x{425}z", "\x{426}")); +ok($objRu->lt("\x{426}z", "\x{427}")); +ok($objRu->lt("\x{427}z", "\x{428}")); +ok($objRu->lt("\x{428}z", "\x{429}")); +ok($objRu->lt("\x{429}z", "\x{42a}")); +ok($objRu->lt("\x{42a}z", "\x{42b}")); +ok($objRu->lt("\x{42b}z", "\x{42c}")); +ok($objRu->lt("\x{42c}z", "\x{42d}")); +ok($objRu->lt("\x{42d}z", "\x{42e}")); +ok($objRu->lt("\x{42e}z", "\x{42f}")); + +# 64 + +ok($objRu->eq("\x{435}", "\x{451}")); +ok($objRu->eq("\x{415}", "\x{401}")); + +# 66 $objRu->change(level => 2); -ok($objRu->gt("\x{4D1}", "\x{430}")); -ok($objRu->gt("\x{4D0}", "\x{410}")); -ok($objRu->gt("\x{4D3}", "\x{430}")); -ok($objRu->gt("\x{4D2}", "\x{410}")); -ok($objRu->gt("\x{4DB}", "\x{4D9}")); -ok($objRu->gt("\x{4DA}", "\x{4D8}")); -ok($objRu->gt("\x{453}", "\x{433}")); -ok($objRu->gt("\x{403}", "\x{413}")); -ok($objRu->gt("\x{450}", "\x{435}")); # not contraction -ok($objRu->gt("\x{400}", "\x{415}")); # not contraction -ok($objRu->gt("\x{451}", "\x{435}")); # not contraction -ok($objRu->gt("\x{401}", "\x{415}")); # not contraction -ok($objRu->gt("\x{4D7}", "\x{435}")); -ok($objRu->gt("\x{4D6}", "\x{415}")); -ok($objRu->gt("\x{4C2}", "\x{436}")); # not contraction -ok($objRu->gt("\x{4C1}", "\x{416}")); # not contraction -ok($objRu->gt("\x{4DD}", "\x{436}")); -ok($objRu->gt("\x{4DC}", "\x{416}")); -ok($objRu->gt("\x{4DF}", "\x{437}")); -ok($objRu->gt("\x{4DE}", "\x{417}")); -ok($objRu->gt("\x{45D}", "\x{438}")); # not contraction -ok($objRu->gt("\x{40D}", "\x{418}")); # not contraction -ok($objRu->gt("\x{4E3}", "\x{438}")); # not contraction -ok($objRu->gt("\x{4E2}", "\x{418}")); # not contraction -ok($objRu->gt("\x{457}", "\x{456}")); -ok($objRu->gt("\x{407}", "\x{406}")); -ok($objRu->gt("\x{4E7}", "\x{43E}")); -ok($objRu->gt("\x{4E6}", "\x{41E}")); -ok($objRu->gt("\x{4EB}", "\x{4E9}")); -ok($objRu->gt("\x{4EA}", "\x{4E8}")); -ok($objRu->gt("\x{45C}", "\x{43A}")); -ok($objRu->gt("\x{40C}", "\x{41A}")); -ok($objRu->gt("\x{4EF}", "\x{443}")); # not contraction -ok($objRu->gt("\x{4EE}", "\x{423}")); # not contraction -ok($objRu->gt("\x{45E}", "\x{443}")); -ok($objRu->gt("\x{40E}", "\x{423}")); -ok($objRu->gt("\x{4F1}", "\x{443}")); -ok($objRu->gt("\x{4F0}", "\x{423}")); -ok($objRu->gt("\x{4F3}", "\x{443}")); -ok($objRu->gt("\x{4F2}", "\x{423}")); -ok($objRu->gt("\x{4F5}", "\x{447}")); -ok($objRu->gt("\x{4F4}", "\x{427}")); -ok($objRu->gt("\x{4F9}", "\x{44B}")); -ok($objRu->gt("\x{4F8}", "\x{42B}")); -ok($objRu->gt("\x{4ED}", "\x{44D}")); -ok($objRu->gt("\x{4EC}", "\x{42D}")); -ok($objRu->gt("\x{477}", "\x{475}")); -ok($objRu->gt("\x{476}", "\x{474}")); - -# 102 +ok($objRu->lt("\x{435}", "\x{451}")); +ok($objRu->lt("\x{415}", "\x{401}")); + +# 68 + +ok($objRu->eq("\x{430}", "\x{410}")); +ok($objRu->eq("\x{431}", "\x{411}")); +ok($objRu->eq("\x{432}", "\x{412}")); +ok($objRu->eq("\x{433}", "\x{413}")); +ok($objRu->eq("\x{434}", "\x{414}")); +ok($objRu->eq("\x{435}", "\x{415}")); +ok($objRu->eq("\x{451}", "\x{401}")); +ok($objRu->eq("\x{436}", "\x{416}")); +ok($objRu->eq("\x{437}", "\x{417}")); +ok($objRu->eq("\x{438}", "\x{418}")); +ok($objRu->eq("\x{439}", "\x{419}")); +ok($objRu->eq("\x{43a}", "\x{41a}")); +ok($objRu->eq("\x{43b}", "\x{41b}")); +ok($objRu->eq("\x{43c}", "\x{41c}")); +ok($objRu->eq("\x{43d}", "\x{41d}")); +ok($objRu->eq("\x{43e}", "\x{41e}")); +ok($objRu->eq("\x{43f}", "\x{41f}")); +ok($objRu->eq("\x{440}", "\x{420}")); +ok($objRu->eq("\x{441}", "\x{421}")); +ok($objRu->eq("\x{442}", "\x{422}")); +ok($objRu->eq("\x{443}", "\x{423}")); +ok($objRu->eq("\x{444}", "\x{424}")); +ok($objRu->eq("\x{445}", "\x{425}")); +ok($objRu->eq("\x{446}", "\x{426}")); +ok($objRu->eq("\x{447}", "\x{427}")); +ok($objRu->eq("\x{448}", "\x{428}")); +ok($objRu->eq("\x{449}", "\x{429}")); +ok($objRu->eq("\x{44a}", "\x{42a}")); +ok($objRu->eq("\x{44b}", "\x{42b}")); +ok($objRu->eq("\x{44c}", "\x{42c}")); +ok($objRu->eq("\x{44d}", "\x{42d}")); +ok($objRu->eq("\x{44e}", "\x{42e}")); +ok($objRu->eq("\x{44f}", "\x{42f}")); + +# 101 $objRu->change(level => 3); -ok($objRu->eq("\x{4E5}", "\x{438}\x{308}")); # not suppressed -ok($objRu->eq("\x{4E4}", "\x{418}\x{308}")); # not suppressed -ok($objRu->eq("\x{439}", "\x{438}\x{306}")); # not suppressed -ok($objRu->eq("\x{419}", "\x{418}\x{306}")); # not suppressed - -# 106 - -for my $i ("", "\0") { - ok($objRu->eq("\x{4D1}", "\x{430}$i\x{306}")); - ok($objRu->eq("\x{4D0}", "\x{410}$i\x{306}")); - ok($objRu->eq("\x{4D3}", "\x{430}$i\x{308}")); - ok($objRu->eq("\x{4D2}", "\x{410}$i\x{308}")); - ok($objRu->eq("\x{4DB}", "\x{4D9}$i\x{308}")); - ok($objRu->eq("\x{4DA}", "\x{4D8}$i\x{308}")); - ok($objRu->eq("\x{453}", "\x{433}$i\x{301}")); - ok($objRu->eq("\x{403}", "\x{413}$i\x{301}")); - ok($objRu->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction - ok($objRu->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction - ok($objRu->eq("\x{451}", "\x{435}$i\x{308}")); # not contraction - ok($objRu->eq("\x{401}", "\x{415}$i\x{308}")); # not contraction - ok($objRu->eq("\x{4D7}", "\x{435}$i\x{306}")); - ok($objRu->eq("\x{4D6}", "\x{415}$i\x{306}")); - ok($objRu->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction - ok($objRu->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction - ok($objRu->eq("\x{4DD}", "\x{436}$i\x{308}")); - ok($objRu->eq("\x{4DC}", "\x{416}$i\x{308}")); - ok($objRu->eq("\x{4DF}", "\x{437}$i\x{308}")); - ok($objRu->eq("\x{4DE}", "\x{417}$i\x{308}")); - ok($objRu->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction - ok($objRu->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction - ok($objRu->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction - ok($objRu->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction - ok($objRu->eq("\x{457}", "\x{456}$i\x{308}")); - ok($objRu->eq("\x{407}", "\x{406}$i\x{308}")); - ok($objRu->eq("\x{4E7}", "\x{43E}$i\x{308}")); - ok($objRu->eq("\x{4E6}", "\x{41E}$i\x{308}")); - ok($objRu->eq("\x{4EB}", "\x{4E9}$i\x{308}")); - ok($objRu->eq("\x{4EA}", "\x{4E8}$i\x{308}")); - ok($objRu->eq("\x{45C}", "\x{43A}$i\x{301}")); - ok($objRu->eq("\x{40C}", "\x{41A}$i\x{301}")); - ok($objRu->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction - ok($objRu->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction - ok($objRu->eq("\x{45E}", "\x{443}$i\x{306}")); - ok($objRu->eq("\x{40E}", "\x{423}$i\x{306}")); - ok($objRu->eq("\x{4F1}", "\x{443}$i\x{308}")); - ok($objRu->eq("\x{4F0}", "\x{423}$i\x{308}")); - ok($objRu->eq("\x{4F3}", "\x{443}$i\x{30B}")); - ok($objRu->eq("\x{4F2}", "\x{423}$i\x{30B}")); - ok($objRu->eq("\x{4F5}", "\x{447}$i\x{308}")); - ok($objRu->eq("\x{4F4}", "\x{427}$i\x{308}")); - ok($objRu->eq("\x{4F9}", "\x{44B}$i\x{308}")); - ok($objRu->eq("\x{4F8}", "\x{42B}$i\x{308}")); - ok($objRu->eq("\x{4ED}", "\x{44D}$i\x{308}")); - ok($objRu->eq("\x{4EC}", "\x{42D}$i\x{308}")); - ok($objRu->eq("\x{477}", "\x{475}$i\x{30F}")); - ok($objRu->eq("\x{476}", "\x{474}$i\x{30F}")); -} - -# 202 +ok($objRu->lt("\x{430}", "\x{410}")); +ok($objRu->lt("\x{431}", "\x{411}")); +ok($objRu->lt("\x{432}", "\x{412}")); +ok($objRu->lt("\x{433}", "\x{413}")); +ok($objRu->lt("\x{434}", "\x{414}")); +ok($objRu->lt("\x{435}", "\x{415}")); +ok($objRu->lt("\x{451}", "\x{401}")); +ok($objRu->lt("\x{436}", "\x{416}")); +ok($objRu->lt("\x{437}", "\x{417}")); +ok($objRu->lt("\x{438}", "\x{418}")); +ok($objRu->lt("\x{439}", "\x{419}")); +ok($objRu->lt("\x{43a}", "\x{41a}")); +ok($objRu->lt("\x{43b}", "\x{41b}")); +ok($objRu->lt("\x{43c}", "\x{41c}")); +ok($objRu->lt("\x{43d}", "\x{41d}")); +ok($objRu->lt("\x{43e}", "\x{41e}")); +ok($objRu->lt("\x{43f}", "\x{41f}")); +ok($objRu->lt("\x{440}", "\x{420}")); +ok($objRu->lt("\x{441}", "\x{421}")); +ok($objRu->lt("\x{442}", "\x{422}")); +ok($objRu->lt("\x{443}", "\x{423}")); +ok($objRu->lt("\x{444}", "\x{424}")); +ok($objRu->lt("\x{445}", "\x{425}")); +ok($objRu->lt("\x{446}", "\x{426}")); +ok($objRu->lt("\x{447}", "\x{427}")); +ok($objRu->lt("\x{448}", "\x{428}")); +ok($objRu->lt("\x{449}", "\x{429}")); +ok($objRu->lt("\x{44a}", "\x{42a}")); +ok($objRu->lt("\x{44b}", "\x{42b}")); +ok($objRu->lt("\x{44c}", "\x{42c}")); +ok($objRu->lt("\x{44d}", "\x{42d}")); +ok($objRu->lt("\x{44e}", "\x{42e}")); +ok($objRu->lt("\x{44f}", "\x{42f}")); + +# 134 + +ok($objRu->eq("\x{451}", "\x{435}\x{308}")); +ok($objRu->eq("\x{401}", "\x{415}\x{308}")); +ok($objRu->eq("\x{439}", "\x{438}\x{306}")); +ok($objRu->eq("\x{419}", "\x{418}\x{306}")); + +# 138 diff --git a/cpan/Unicode-Collate/t/loc_sr.t b/cpan/Unicode-Collate/t/loc_sr.t index 8eea66a8af..b6a89c59ec 100644 --- a/cpan/Unicode-Collate/t/loc_sr.t +++ b/cpan/Unicode-Collate/t/loc_sr.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..210\n"; } +BEGIN { $| = 1; print "1..128\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -40,173 +40,151 @@ ok($objSr->getlocale, 'sr'); $objSr->change(level => 1); -ok($objSr->eq("\x{4D1}", "\x{430}")); -ok($objSr->eq("\x{4D0}", "\x{410}")); -ok($objSr->eq("\x{4D3}", "\x{430}")); -ok($objSr->eq("\x{4D2}", "\x{410}")); -ok($objSr->eq("\x{4DB}", "\x{4D9}")); -ok($objSr->eq("\x{4DA}", "\x{4D8}")); -ok($objSr->eq("\x{453}", "\x{433}")); -ok($objSr->eq("\x{403}", "\x{413}")); -ok($objSr->eq("\x{450}", "\x{435}")); # not contraction -ok($objSr->eq("\x{400}", "\x{415}")); # not contraction -ok($objSr->eq("\x{451}", "\x{435}")); # not contraction -ok($objSr->eq("\x{401}", "\x{415}")); # not contraction -ok($objSr->eq("\x{4D7}", "\x{435}")); -ok($objSr->eq("\x{4D6}", "\x{415}")); -ok($objSr->eq("\x{4C2}", "\x{436}")); # not contraction -ok($objSr->eq("\x{4C1}", "\x{416}")); # not contraction -ok($objSr->eq("\x{4DD}", "\x{436}")); -ok($objSr->eq("\x{4DC}", "\x{416}")); -ok($objSr->eq("\x{4DF}", "\x{437}")); -ok($objSr->eq("\x{4DE}", "\x{417}")); -ok($objSr->eq("\x{45D}", "\x{438}")); # not contraction -ok($objSr->eq("\x{40D}", "\x{418}")); # not contraction -ok($objSr->eq("\x{4E3}", "\x{438}")); # not contraction -ok($objSr->eq("\x{4E2}", "\x{418}")); # not contraction -ok($objSr->eq("\x{4E5}", "\x{438}")); -ok($objSr->eq("\x{4E4}", "\x{418}")); -ok($objSr->eq("\x{457}", "\x{456}")); -ok($objSr->eq("\x{407}", "\x{406}")); -ok($objSr->eq("\x{439}", "\x{438}")); -ok($objSr->eq("\x{419}", "\x{418}")); -ok($objSr->eq("\x{4E7}", "\x{43E}")); -ok($objSr->eq("\x{4E6}", "\x{41E}")); -ok($objSr->eq("\x{4EB}", "\x{4E9}")); -ok($objSr->eq("\x{4EA}", "\x{4E8}")); -ok($objSr->eq("\x{45C}", "\x{43A}")); -ok($objSr->eq("\x{40C}", "\x{41A}")); -ok($objSr->eq("\x{4EF}", "\x{443}")); # not contraction -ok($objSr->eq("\x{4EE}", "\x{423}")); # not contraction -ok($objSr->eq("\x{45E}", "\x{443}")); -ok($objSr->eq("\x{40E}", "\x{423}")); -ok($objSr->eq("\x{4F1}", "\x{443}")); -ok($objSr->eq("\x{4F0}", "\x{423}")); -ok($objSr->eq("\x{4F3}", "\x{443}")); -ok($objSr->eq("\x{4F2}", "\x{423}")); -ok($objSr->eq("\x{4F5}", "\x{447}")); -ok($objSr->eq("\x{4F4}", "\x{427}")); -ok($objSr->eq("\x{4F9}", "\x{44B}")); -ok($objSr->eq("\x{4F8}", "\x{42B}")); -ok($objSr->eq("\x{4ED}", "\x{44D}")); -ok($objSr->eq("\x{4EC}", "\x{42D}")); -ok($objSr->eq("\x{477}", "\x{475}")); -ok($objSr->eq("\x{476}", "\x{474}")); - -# 54 +ok($objSr->lt("\x{430}z", "\x{431}")); +ok($objSr->lt("\x{431}z", "\x{432}")); +ok($objSr->lt("\x{432}z", "\x{433}")); +ok($objSr->lt("\x{433}z", "\x{434}")); +ok($objSr->lt("\x{434}z", "\x{452}")); +ok($objSr->lt("\x{452}z", "\x{435}")); +ok($objSr->lt("\x{435}z", "\x{436}")); +ok($objSr->lt("\x{436}z", "\x{437}")); +ok($objSr->lt("\x{437}z", "\x{438}")); +ok($objSr->lt("\x{438}z", "\x{458}")); +ok($objSr->lt("\x{458}z", "\x{43a}")); +ok($objSr->lt("\x{43a}z", "\x{43b}")); +ok($objSr->lt("\x{43b}z", "\x{459}")); +ok($objSr->lt("\x{459}z", "\x{43c}")); +ok($objSr->lt("\x{43c}z", "\x{43d}")); +ok($objSr->lt("\x{43d}z", "\x{45a}")); +ok($objSr->lt("\x{45a}z", "\x{43e}")); +ok($objSr->lt("\x{43e}z", "\x{43f}")); +ok($objSr->lt("\x{43f}z", "\x{440}")); +ok($objSr->lt("\x{440}z", "\x{441}")); +ok($objSr->lt("\x{441}z", "\x{442}")); +ok($objSr->lt("\x{442}z", "\x{45b}")); +ok($objSr->lt("\x{45b}z", "\x{443}")); +ok($objSr->lt("\x{443}z", "\x{444}")); +ok($objSr->lt("\x{444}z", "\x{445}")); +ok($objSr->lt("\x{445}z", "\x{446}")); +ok($objSr->lt("\x{446}z", "\x{447}")); +ok($objSr->lt("\x{447}z", "\x{45f}")); +ok($objSr->lt("\x{45f}z", "\x{448}")); + +ok($objSr->lt("\x{410}z", "\x{411}")); +ok($objSr->lt("\x{411}z", "\x{412}")); +ok($objSr->lt("\x{412}z", "\x{413}")); +ok($objSr->lt("\x{413}z", "\x{414}")); +ok($objSr->lt("\x{414}z", "\x{402}")); +ok($objSr->lt("\x{402}z", "\x{415}")); +ok($objSr->lt("\x{415}z", "\x{416}")); +ok($objSr->lt("\x{416}z", "\x{417}")); +ok($objSr->lt("\x{417}z", "\x{418}")); +ok($objSr->lt("\x{418}z", "\x{408}")); +ok($objSr->lt("\x{408}z", "\x{41a}")); +ok($objSr->lt("\x{41a}z", "\x{41b}")); +ok($objSr->lt("\x{41b}z", "\x{409}")); +ok($objSr->lt("\x{409}z", "\x{41c}")); +ok($objSr->lt("\x{41c}z", "\x{41d}")); +ok($objSr->lt("\x{41d}z", "\x{40a}")); +ok($objSr->lt("\x{40a}z", "\x{41e}")); +ok($objSr->lt("\x{41e}z", "\x{41f}")); +ok($objSr->lt("\x{41f}z", "\x{420}")); +ok($objSr->lt("\x{420}z", "\x{421}")); +ok($objSr->lt("\x{421}z", "\x{422}")); +ok($objSr->lt("\x{422}z", "\x{40b}")); +ok($objSr->lt("\x{40b}z", "\x{423}")); +ok($objSr->lt("\x{423}z", "\x{424}")); +ok($objSr->lt("\x{424}z", "\x{425}")); +ok($objSr->lt("\x{425}z", "\x{426}")); +ok($objSr->lt("\x{426}z", "\x{427}")); +ok($objSr->lt("\x{427}z", "\x{40f}")); +ok($objSr->lt("\x{40f}z", "\x{428}")); + +# 60 + +ok($objSr->eq("\x{438}", "\x{439}")); +ok($objSr->eq("\x{418}", "\x{419}")); + +# 62 $objSr->change(level => 2); -ok($objSr->gt("\x{4D1}", "\x{430}")); -ok($objSr->gt("\x{4D0}", "\x{410}")); -ok($objSr->gt("\x{4D3}", "\x{430}")); -ok($objSr->gt("\x{4D2}", "\x{410}")); -ok($objSr->gt("\x{4DB}", "\x{4D9}")); -ok($objSr->gt("\x{4DA}", "\x{4D8}")); -ok($objSr->gt("\x{453}", "\x{433}")); -ok($objSr->gt("\x{403}", "\x{413}")); -ok($objSr->gt("\x{450}", "\x{435}")); # not contraction -ok($objSr->gt("\x{400}", "\x{415}")); # not contraction -ok($objSr->gt("\x{451}", "\x{435}")); # not contraction -ok($objSr->gt("\x{401}", "\x{415}")); # not contraction -ok($objSr->gt("\x{4D7}", "\x{435}")); -ok($objSr->gt("\x{4D6}", "\x{415}")); -ok($objSr->gt("\x{4C2}", "\x{436}")); # not contraction -ok($objSr->gt("\x{4C1}", "\x{416}")); # not contraction -ok($objSr->gt("\x{4DD}", "\x{436}")); -ok($objSr->gt("\x{4DC}", "\x{416}")); -ok($objSr->gt("\x{4DF}", "\x{437}")); -ok($objSr->gt("\x{4DE}", "\x{417}")); -ok($objSr->gt("\x{45D}", "\x{438}")); # not contraction -ok($objSr->gt("\x{40D}", "\x{418}")); # not contraction -ok($objSr->gt("\x{4E3}", "\x{438}")); # not contraction -ok($objSr->gt("\x{4E2}", "\x{418}")); # not contraction -ok($objSr->gt("\x{4E5}", "\x{438}")); -ok($objSr->gt("\x{4E4}", "\x{418}")); -ok($objSr->gt("\x{457}", "\x{456}")); -ok($objSr->gt("\x{407}", "\x{406}")); -ok($objSr->gt("\x{439}", "\x{438}")); -ok($objSr->gt("\x{419}", "\x{418}")); -ok($objSr->gt("\x{4E7}", "\x{43E}")); -ok($objSr->gt("\x{4E6}", "\x{41E}")); -ok($objSr->gt("\x{4EB}", "\x{4E9}")); -ok($objSr->gt("\x{4EA}", "\x{4E8}")); -ok($objSr->gt("\x{45C}", "\x{43A}")); -ok($objSr->gt("\x{40C}", "\x{41A}")); -ok($objSr->gt("\x{4EF}", "\x{443}")); # not contraction -ok($objSr->gt("\x{4EE}", "\x{423}")); # not contraction -ok($objSr->gt("\x{45E}", "\x{443}")); -ok($objSr->gt("\x{40E}", "\x{423}")); -ok($objSr->gt("\x{4F1}", "\x{443}")); -ok($objSr->gt("\x{4F0}", "\x{423}")); -ok($objSr->gt("\x{4F3}", "\x{443}")); -ok($objSr->gt("\x{4F2}", "\x{423}")); -ok($objSr->gt("\x{4F5}", "\x{447}")); -ok($objSr->gt("\x{4F4}", "\x{427}")); -ok($objSr->gt("\x{4F9}", "\x{44B}")); -ok($objSr->gt("\x{4F8}", "\x{42B}")); -ok($objSr->gt("\x{4ED}", "\x{44D}")); -ok($objSr->gt("\x{4EC}", "\x{42D}")); -ok($objSr->gt("\x{477}", "\x{475}")); -ok($objSr->gt("\x{476}", "\x{474}")); - -# 106 +ok($objSr->lt("\x{438}", "\x{439}")); +ok($objSr->lt("\x{418}", "\x{419}")); + +# 64 + +ok($objSr->eq("\x{430}", "\x{410}")); +ok($objSr->eq("\x{431}", "\x{411}")); +ok($objSr->eq("\x{432}", "\x{412}")); +ok($objSr->eq("\x{433}", "\x{413}")); +ok($objSr->eq("\x{434}", "\x{414}")); +ok($objSr->eq("\x{452}", "\x{402}")); +ok($objSr->eq("\x{435}", "\x{415}")); +ok($objSr->eq("\x{436}", "\x{416}")); +ok($objSr->eq("\x{437}", "\x{417}")); +ok($objSr->eq("\x{438}", "\x{418}")); +ok($objSr->eq("\x{439}", "\x{419}")); +ok($objSr->eq("\x{458}", "\x{408}")); +ok($objSr->eq("\x{43a}", "\x{41a}")); +ok($objSr->eq("\x{43b}", "\x{41b}")); +ok($objSr->eq("\x{459}", "\x{409}")); +ok($objSr->eq("\x{43c}", "\x{41c}")); +ok($objSr->eq("\x{43d}", "\x{41d}")); +ok($objSr->eq("\x{45a}", "\x{40a}")); +ok($objSr->eq("\x{43e}", "\x{41e}")); +ok($objSr->eq("\x{43f}", "\x{41f}")); +ok($objSr->eq("\x{440}", "\x{420}")); +ok($objSr->eq("\x{441}", "\x{421}")); +ok($objSr->eq("\x{442}", "\x{422}")); +ok($objSr->eq("\x{45b}", "\x{40b}")); +ok($objSr->eq("\x{443}", "\x{423}")); +ok($objSr->eq("\x{444}", "\x{424}")); +ok($objSr->eq("\x{445}", "\x{425}")); +ok($objSr->eq("\x{446}", "\x{426}")); +ok($objSr->eq("\x{447}", "\x{427}")); +ok($objSr->eq("\x{45f}", "\x{40f}")); +ok($objSr->eq("\x{448}", "\x{428}")); + +# 95 $objSr->change(level => 3); -for my $i ("", "\0") { - ok($objSr->eq("\x{4D1}", "\x{430}$i\x{306}")); - ok($objSr->eq("\x{4D0}", "\x{410}$i\x{306}")); - ok($objSr->eq("\x{4D3}", "\x{430}$i\x{308}")); - ok($objSr->eq("\x{4D2}", "\x{410}$i\x{308}")); - ok($objSr->eq("\x{4DB}", "\x{4D9}$i\x{308}")); - ok($objSr->eq("\x{4DA}", "\x{4D8}$i\x{308}")); - ok($objSr->eq("\x{453}", "\x{433}$i\x{301}")); - ok($objSr->eq("\x{403}", "\x{413}$i\x{301}")); - ok($objSr->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction - ok($objSr->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction - ok($objSr->eq("\x{451}", "\x{435}$i\x{308}")); # not contraction - ok($objSr->eq("\x{401}", "\x{415}$i\x{308}")); # not contraction - ok($objSr->eq("\x{4D7}", "\x{435}$i\x{306}")); - ok($objSr->eq("\x{4D6}", "\x{415}$i\x{306}")); - ok($objSr->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction - ok($objSr->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction - ok($objSr->eq("\x{4DD}", "\x{436}$i\x{308}")); - ok($objSr->eq("\x{4DC}", "\x{416}$i\x{308}")); - ok($objSr->eq("\x{4DF}", "\x{437}$i\x{308}")); - ok($objSr->eq("\x{4DE}", "\x{417}$i\x{308}")); - ok($objSr->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction - ok($objSr->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction - ok($objSr->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction - ok($objSr->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction - ok($objSr->eq("\x{4E5}", "\x{438}$i\x{308}")); - ok($objSr->eq("\x{4E4}", "\x{418}$i\x{308}")); - ok($objSr->eq("\x{457}", "\x{456}$i\x{308}")); - ok($objSr->eq("\x{407}", "\x{406}$i\x{308}")); - ok($objSr->eq("\x{439}", "\x{438}$i\x{306}")); - ok($objSr->eq("\x{419}", "\x{418}$i\x{306}")); - ok($objSr->eq("\x{4E7}", "\x{43E}$i\x{308}")); - ok($objSr->eq("\x{4E6}", "\x{41E}$i\x{308}")); - ok($objSr->eq("\x{4EB}", "\x{4E9}$i\x{308}")); - ok($objSr->eq("\x{4EA}", "\x{4E8}$i\x{308}")); - ok($objSr->eq("\x{45C}", "\x{43A}$i\x{301}")); - ok($objSr->eq("\x{40C}", "\x{41A}$i\x{301}")); - ok($objSr->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction - ok($objSr->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction - ok($objSr->eq("\x{45E}", "\x{443}$i\x{306}")); - ok($objSr->eq("\x{40E}", "\x{423}$i\x{306}")); - ok($objSr->eq("\x{4F1}", "\x{443}$i\x{308}")); - ok($objSr->eq("\x{4F0}", "\x{423}$i\x{308}")); - ok($objSr->eq("\x{4F3}", "\x{443}$i\x{30B}")); - ok($objSr->eq("\x{4F2}", "\x{423}$i\x{30B}")); - ok($objSr->eq("\x{4F5}", "\x{447}$i\x{308}")); - ok($objSr->eq("\x{4F4}", "\x{427}$i\x{308}")); - ok($objSr->eq("\x{4F9}", "\x{44B}$i\x{308}")); - ok($objSr->eq("\x{4F8}", "\x{42B}$i\x{308}")); - ok($objSr->eq("\x{4ED}", "\x{44D}$i\x{308}")); - ok($objSr->eq("\x{4EC}", "\x{42D}$i\x{308}")); - ok($objSr->eq("\x{477}", "\x{475}$i\x{30F}")); - ok($objSr->eq("\x{476}", "\x{474}$i\x{30F}")); -} - -# 210 +ok($objSr->lt("\x{430}", "\x{410}")); +ok($objSr->lt("\x{431}", "\x{411}")); +ok($objSr->lt("\x{432}", "\x{412}")); +ok($objSr->lt("\x{433}", "\x{413}")); +ok($objSr->lt("\x{434}", "\x{414}")); +ok($objSr->lt("\x{452}", "\x{402}")); +ok($objSr->lt("\x{435}", "\x{415}")); +ok($objSr->lt("\x{436}", "\x{416}")); +ok($objSr->lt("\x{437}", "\x{417}")); +ok($objSr->lt("\x{438}", "\x{418}")); +ok($objSr->lt("\x{439}", "\x{419}")); +ok($objSr->lt("\x{458}", "\x{408}")); +ok($objSr->lt("\x{43a}", "\x{41a}")); +ok($objSr->lt("\x{43b}", "\x{41b}")); +ok($objSr->lt("\x{459}", "\x{409}")); +ok($objSr->lt("\x{43c}", "\x{41c}")); +ok($objSr->lt("\x{43d}", "\x{41d}")); +ok($objSr->lt("\x{45a}", "\x{40a}")); +ok($objSr->lt("\x{43e}", "\x{41e}")); +ok($objSr->lt("\x{43f}", "\x{41f}")); +ok($objSr->lt("\x{440}", "\x{420}")); +ok($objSr->lt("\x{441}", "\x{421}")); +ok($objSr->lt("\x{442}", "\x{422}")); +ok($objSr->lt("\x{45b}", "\x{40b}")); +ok($objSr->lt("\x{443}", "\x{423}")); +ok($objSr->lt("\x{444}", "\x{424}")); +ok($objSr->lt("\x{445}", "\x{425}")); +ok($objSr->lt("\x{446}", "\x{426}")); +ok($objSr->lt("\x{447}", "\x{427}")); +ok($objSr->lt("\x{45f}", "\x{40f}")); +ok($objSr->lt("\x{448}", "\x{428}")); + +# 126 + +ok($objSr->eq("\x{439}", "\x{438}\x{306}")); +ok($objSr->eq("\x{419}", "\x{418}\x{306}")); + +# 128 diff --git a/cpan/Unicode-Collate/t/loc_sw.t b/cpan/Unicode-Collate/t/loc_sw.t index 8ede629f08..8689e835f8 100644 --- a/cpan/Unicode-Collate/t/loc_sw.t +++ b/cpan/Unicode-Collate/t/loc_sw.t @@ -36,7 +36,7 @@ ok(1); my $objSw = Unicode::Collate::Locale-> new(locale => 'SW', normalization => undef); -ok($objSw->getlocale, "default"); # no tailoring since 0.74 +ok($objSw->getlocale, 'default'); # no tailoring since 0.74 $objSw->change(level => 1); diff --git a/cpan/Unicode-Collate/t/loc_ugcy.t b/cpan/Unicode-Collate/t/loc_ugcy.t new file mode 100644 index 0000000000..457c8a5908 --- /dev/null +++ b/cpan/Unicode-Collate/t/loc_ugcy.t @@ -0,0 +1,194 @@ + +BEGIN { + unless ('A' eq pack('U', 0x41)) { + print "1..0 # Unicode::Collate cannot pack a Unicode code point\n"; + exit 0; + } + unless (0x41 == unpack('U', 'A')) { + print "1..0 # Unicode::Collate cannot get a Unicode code point\n"; + exit 0; + } + if ($ENV{PERL_CORE}) { + chdir('t') if -d 't'; + @INC = $^O eq 'MacOS' ? qw(::lib) : qw(../lib); + } +} + +use strict; +use warnings; +BEGIN { $| = 1; print "1..138\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + +use Unicode::Collate::Locale; + +ok(1); + +######################### + +my $objUgCyrl = Unicode::Collate::Locale-> + new(locale => 'UG-CYRL', normalization => undef); + +ok($objUgCyrl->getlocale, 'ug_Cyrl'); + +$objUgCyrl->change(level => 1); + +ok($objUgCyrl->lt("\x{430}z", "\x{431}")); +ok($objUgCyrl->lt("\x{431}z", "\x{432}")); +ok($objUgCyrl->lt("\x{432}z", "\x{433}")); +ok($objUgCyrl->lt("\x{433}z", "\x{493}")); +ok($objUgCyrl->lt("\x{493}z", "\x{434}")); +ok($objUgCyrl->lt("\x{434}z", "\x{435}")); +ok($objUgCyrl->lt("\x{435}z", "\x{4d9}")); +ok($objUgCyrl->lt("\x{4d9}z", "\x{436}")); +ok($objUgCyrl->lt("\x{436}z", "\x{497}")); +ok($objUgCyrl->lt("\x{497}z", "\x{437}")); +ok($objUgCyrl->lt("\x{437}z", "\x{438}")); +ok($objUgCyrl->lt("\x{438}z", "\x{439}")); +ok($objUgCyrl->lt("\x{439}z", "\x{43a}")); +ok($objUgCyrl->lt("\x{43a}z", "\x{49b}")); +ok($objUgCyrl->lt("\x{49b}z", "\x{43b}")); +ok($objUgCyrl->lt("\x{43b}z", "\x{43c}")); +ok($objUgCyrl->lt("\x{43c}z", "\x{43d}")); +ok($objUgCyrl->lt("\x{43d}z", "\x{4a3}")); +ok($objUgCyrl->lt("\x{4a3}z", "\x{43e}")); +ok($objUgCyrl->lt("\x{43e}z", "\x{4e9}")); +ok($objUgCyrl->lt("\x{4e9}z", "\x{43f}")); +ok($objUgCyrl->lt("\x{43f}z", "\x{440}")); +ok($objUgCyrl->lt("\x{440}z", "\x{441}")); +ok($objUgCyrl->lt("\x{441}z", "\x{442}")); +ok($objUgCyrl->lt("\x{442}z", "\x{443}")); +ok($objUgCyrl->lt("\x{443}z", "\x{4af}")); +ok($objUgCyrl->lt("\x{4af}z", "\x{444}")); +ok($objUgCyrl->lt("\x{444}z", "\x{445}")); +ok($objUgCyrl->lt("\x{445}z", "\x{4bb}")); +ok($objUgCyrl->lt("\x{4bb}z", "\x{447}")); +ok($objUgCyrl->lt("\x{447}z", "\x{448}")); +ok($objUgCyrl->lt("\x{448}z", "\x{44e}")); +ok($objUgCyrl->lt("\x{44e}z", "\x{44f}")); + +ok($objUgCyrl->lt("\x{410}z", "\x{411}")); +ok($objUgCyrl->lt("\x{411}z", "\x{412}")); +ok($objUgCyrl->lt("\x{412}z", "\x{413}")); +ok($objUgCyrl->lt("\x{413}z", "\x{492}")); +ok($objUgCyrl->lt("\x{492}z", "\x{414}")); +ok($objUgCyrl->lt("\x{414}z", "\x{415}")); +ok($objUgCyrl->lt("\x{415}z", "\x{4d8}")); +ok($objUgCyrl->lt("\x{4d8}z", "\x{416}")); +ok($objUgCyrl->lt("\x{416}z", "\x{496}")); +ok($objUgCyrl->lt("\x{496}z", "\x{417}")); +ok($objUgCyrl->lt("\x{417}z", "\x{418}")); +ok($objUgCyrl->lt("\x{418}z", "\x{419}")); +ok($objUgCyrl->lt("\x{419}z", "\x{41a}")); +ok($objUgCyrl->lt("\x{41a}z", "\x{49a}")); +ok($objUgCyrl->lt("\x{49a}z", "\x{41b}")); +ok($objUgCyrl->lt("\x{41b}z", "\x{41c}")); +ok($objUgCyrl->lt("\x{41c}z", "\x{41d}")); +ok($objUgCyrl->lt("\x{41d}z", "\x{4a2}")); +ok($objUgCyrl->lt("\x{4a2}z", "\x{41e}")); +ok($objUgCyrl->lt("\x{41e}z", "\x{4e8}")); +ok($objUgCyrl->lt("\x{4e8}z", "\x{41f}")); +ok($objUgCyrl->lt("\x{41f}z", "\x{420}")); +ok($objUgCyrl->lt("\x{420}z", "\x{421}")); +ok($objUgCyrl->lt("\x{421}z", "\x{422}")); +ok($objUgCyrl->lt("\x{422}z", "\x{423}")); +ok($objUgCyrl->lt("\x{423}z", "\x{4ae}")); +ok($objUgCyrl->lt("\x{4ae}z", "\x{424}")); +ok($objUgCyrl->lt("\x{424}z", "\x{425}")); +ok($objUgCyrl->lt("\x{425}z", "\x{4ba}")); +ok($objUgCyrl->lt("\x{4ba}z", "\x{427}")); +ok($objUgCyrl->lt("\x{427}z", "\x{428}")); +ok($objUgCyrl->lt("\x{428}z", "\x{42e}")); +ok($objUgCyrl->lt("\x{42e}z", "\x{42f}")); + +# 68 + +$objUgCyrl->change(level => 2); + +ok($objUgCyrl->eq("\x{430}", "\x{410}")); +ok($objUgCyrl->eq("\x{431}", "\x{411}")); +ok($objUgCyrl->eq("\x{432}", "\x{412}")); +ok($objUgCyrl->eq("\x{433}", "\x{413}")); +ok($objUgCyrl->eq("\x{493}", "\x{492}")); +ok($objUgCyrl->eq("\x{434}", "\x{414}")); +ok($objUgCyrl->eq("\x{435}", "\x{415}")); +ok($objUgCyrl->eq("\x{4d9}", "\x{4d8}")); +ok($objUgCyrl->eq("\x{436}", "\x{416}")); +ok($objUgCyrl->eq("\x{497}", "\x{496}")); +ok($objUgCyrl->eq("\x{437}", "\x{417}")); +ok($objUgCyrl->eq("\x{438}", "\x{418}")); +ok($objUgCyrl->eq("\x{439}", "\x{419}")); +ok($objUgCyrl->eq("\x{43a}", "\x{41a}")); +ok($objUgCyrl->eq("\x{49b}", "\x{49a}")); +ok($objUgCyrl->eq("\x{43b}", "\x{41b}")); +ok($objUgCyrl->eq("\x{43c}", "\x{41c}")); +ok($objUgCyrl->eq("\x{43d}", "\x{41d}")); +ok($objUgCyrl->eq("\x{4a3}", "\x{4a2}")); +ok($objUgCyrl->eq("\x{43e}", "\x{41e}")); +ok($objUgCyrl->eq("\x{4e9}", "\x{4e8}")); +ok($objUgCyrl->eq("\x{43f}", "\x{41f}")); +ok($objUgCyrl->eq("\x{440}", "\x{420}")); +ok($objUgCyrl->eq("\x{441}", "\x{421}")); +ok($objUgCyrl->eq("\x{442}", "\x{422}")); +ok($objUgCyrl->eq("\x{443}", "\x{423}")); +ok($objUgCyrl->eq("\x{4af}", "\x{4ae}")); +ok($objUgCyrl->eq("\x{444}", "\x{424}")); +ok($objUgCyrl->eq("\x{445}", "\x{425}")); +ok($objUgCyrl->eq("\x{4bb}", "\x{4ba}")); +ok($objUgCyrl->eq("\x{447}", "\x{427}")); +ok($objUgCyrl->eq("\x{448}", "\x{428}")); +ok($objUgCyrl->eq("\x{44e}", "\x{42e}")); +ok($objUgCyrl->eq("\x{44f}", "\x{42f}")); + +# 102 + +$objUgCyrl->change(level => 3); + +ok($objUgCyrl->lt("\x{430}", "\x{410}")); +ok($objUgCyrl->lt("\x{431}", "\x{411}")); +ok($objUgCyrl->lt("\x{432}", "\x{412}")); +ok($objUgCyrl->lt("\x{433}", "\x{413}")); +ok($objUgCyrl->lt("\x{493}", "\x{492}")); +ok($objUgCyrl->lt("\x{434}", "\x{414}")); +ok($objUgCyrl->lt("\x{435}", "\x{415}")); +ok($objUgCyrl->lt("\x{4d9}", "\x{4d8}")); +ok($objUgCyrl->lt("\x{436}", "\x{416}")); +ok($objUgCyrl->lt("\x{497}", "\x{496}")); +ok($objUgCyrl->lt("\x{437}", "\x{417}")); +ok($objUgCyrl->lt("\x{438}", "\x{418}")); +ok($objUgCyrl->lt("\x{439}", "\x{419}")); +ok($objUgCyrl->lt("\x{43a}", "\x{41a}")); +ok($objUgCyrl->lt("\x{49b}", "\x{49a}")); +ok($objUgCyrl->lt("\x{43b}", "\x{41b}")); +ok($objUgCyrl->lt("\x{43c}", "\x{41c}")); +ok($objUgCyrl->lt("\x{43d}", "\x{41d}")); +ok($objUgCyrl->lt("\x{4a3}", "\x{4a2}")); +ok($objUgCyrl->lt("\x{43e}", "\x{41e}")); +ok($objUgCyrl->lt("\x{4e9}", "\x{4e8}")); +ok($objUgCyrl->lt("\x{43f}", "\x{41f}")); +ok($objUgCyrl->lt("\x{440}", "\x{420}")); +ok($objUgCyrl->lt("\x{441}", "\x{421}")); +ok($objUgCyrl->lt("\x{442}", "\x{422}")); +ok($objUgCyrl->lt("\x{443}", "\x{423}")); +ok($objUgCyrl->lt("\x{4af}", "\x{4ae}")); +ok($objUgCyrl->lt("\x{444}", "\x{424}")); +ok($objUgCyrl->lt("\x{445}", "\x{425}")); +ok($objUgCyrl->lt("\x{4bb}", "\x{4ba}")); +ok($objUgCyrl->lt("\x{447}", "\x{427}")); +ok($objUgCyrl->lt("\x{448}", "\x{428}")); +ok($objUgCyrl->lt("\x{44e}", "\x{42e}")); +ok($objUgCyrl->lt("\x{44f}", "\x{42f}")); + +# 136 + +ok($objUgCyrl->eq("\x{439}", "\x{438}\x{306}")); +ok($objUgCyrl->eq("\x{419}", "\x{418}\x{306}")); + +# 138 diff --git a/cpan/Unicode-Collate/t/loc_uk.t b/cpan/Unicode-Collate/t/loc_uk.t index de1cc3753d..91ccdc8519 100644 --- a/cpan/Unicode-Collate/t/loc_uk.t +++ b/cpan/Unicode-Collate/t/loc_uk.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..203\n"; } +BEGIN { $| = 1; print "1..144\n"; } my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -40,192 +40,161 @@ ok($objUk->getlocale, 'uk'); $objUk->change(level => 1); -ok($objUk->gt("\x{491}", "\x{433}")); -ok($objUk->lt("\x{491}", "\x{434}")); - -# 4 - -ok($objUk->gt("\x{4E5}", "\x{438}")); # not suppressed -ok($objUk->gt("\x{4E4}", "\x{418}")); # not suppressed -ok($objUk->gt("\x{457}", "\x{456}")); # not suppressed -ok($objUk->gt("\x{407}", "\x{406}")); # not suppressed -ok($objUk->gt("\x{439}", "\x{438}")); # not suppressed -ok($objUk->gt("\x{419}", "\x{418}")); # not suppressed - -# 10 - -ok($objUk->eq("\x{4D1}", "\x{430}")); -ok($objUk->eq("\x{4D0}", "\x{410}")); -ok($objUk->eq("\x{4D3}", "\x{430}")); -ok($objUk->eq("\x{4D2}", "\x{410}")); -ok($objUk->eq("\x{4DB}", "\x{4D9}")); -ok($objUk->eq("\x{4DA}", "\x{4D8}")); -ok($objUk->eq("\x{453}", "\x{433}")); -ok($objUk->eq("\x{403}", "\x{413}")); -ok($objUk->eq("\x{450}", "\x{435}")); # not contraction -ok($objUk->eq("\x{400}", "\x{415}")); # not contraction -ok($objUk->eq("\x{451}", "\x{435}")); # not contraction -ok($objUk->eq("\x{401}", "\x{415}")); # not contraction -ok($objUk->eq("\x{4D7}", "\x{435}")); -ok($objUk->eq("\x{4D6}", "\x{415}")); -ok($objUk->eq("\x{4C2}", "\x{436}")); # not contraction -ok($objUk->eq("\x{4C1}", "\x{416}")); # not contraction -ok($objUk->eq("\x{4DD}", "\x{436}")); -ok($objUk->eq("\x{4DC}", "\x{416}")); -ok($objUk->eq("\x{4DF}", "\x{437}")); -ok($objUk->eq("\x{4DE}", "\x{417}")); -ok($objUk->eq("\x{45D}", "\x{438}")); # not contraction -ok($objUk->eq("\x{40D}", "\x{418}")); # not contraction -ok($objUk->eq("\x{4E3}", "\x{438}")); # not contraction -ok($objUk->eq("\x{4E2}", "\x{418}")); # not contraction -ok($objUk->eq("\x{4E7}", "\x{43E}")); -ok($objUk->eq("\x{4E6}", "\x{41E}")); -ok($objUk->eq("\x{4EB}", "\x{4E9}")); -ok($objUk->eq("\x{4EA}", "\x{4E8}")); -ok($objUk->eq("\x{45C}", "\x{43A}")); -ok($objUk->eq("\x{40C}", "\x{41A}")); -ok($objUk->eq("\x{4EF}", "\x{443}")); # not contraction -ok($objUk->eq("\x{4EE}", "\x{423}")); # not contraction -ok($objUk->eq("\x{45E}", "\x{443}")); -ok($objUk->eq("\x{40E}", "\x{423}")); -ok($objUk->eq("\x{4F1}", "\x{443}")); -ok($objUk->eq("\x{4F0}", "\x{423}")); -ok($objUk->eq("\x{4F3}", "\x{443}")); -ok($objUk->eq("\x{4F2}", "\x{423}")); -ok($objUk->eq("\x{4F5}", "\x{447}")); -ok($objUk->eq("\x{4F4}", "\x{427}")); -ok($objUk->eq("\x{4F9}", "\x{44B}")); -ok($objUk->eq("\x{4F8}", "\x{42B}")); -ok($objUk->eq("\x{4ED}", "\x{44D}")); -ok($objUk->eq("\x{4EC}", "\x{42D}")); -ok($objUk->eq("\x{477}", "\x{475}")); -ok($objUk->eq("\x{476}", "\x{474}")); - -# 56 +ok($objUk->lt("\x{430}z", "\x{431}")); +ok($objUk->lt("\x{431}z", "\x{432}")); +ok($objUk->lt("\x{432}z", "\x{433}")); +ok($objUk->lt("\x{433}z", "\x{491}")); +ok($objUk->lt("\x{491}z", "\x{434}")); +ok($objUk->lt("\x{434}z", "\x{435}")); +ok($objUk->lt("\x{435}z", "\x{454}")); +ok($objUk->lt("\x{454}z", "\x{436}")); +ok($objUk->lt("\x{436}z", "\x{437}")); +ok($objUk->lt("\x{437}z", "\x{438}")); +ok($objUk->lt("\x{438}z", "\x{456}")); +ok($objUk->lt("\x{456}z", "\x{a647}")); +ok($objUk->lt("\x{a647}z","\x{457}")); +ok($objUk->lt("\x{457}z", "\x{439}")); +ok($objUk->lt("\x{439}z", "\x{43a}")); +ok($objUk->lt("\x{43a}z", "\x{43b}")); +ok($objUk->lt("\x{43b}z", "\x{43c}")); +ok($objUk->lt("\x{43c}z", "\x{43d}")); +ok($objUk->lt("\x{43d}z", "\x{43e}")); +ok($objUk->lt("\x{43e}z", "\x{43f}")); +ok($objUk->lt("\x{43f}z", "\x{440}")); +ok($objUk->lt("\x{440}z", "\x{441}")); +ok($objUk->lt("\x{441}z", "\x{442}")); +ok($objUk->lt("\x{442}z", "\x{443}")); +ok($objUk->lt("\x{443}z", "\x{444}")); +ok($objUk->lt("\x{444}z", "\x{445}")); +ok($objUk->lt("\x{445}z", "\x{446}")); +ok($objUk->lt("\x{446}z", "\x{447}")); +ok($objUk->lt("\x{447}z", "\x{448}")); +ok($objUk->lt("\x{448}z", "\x{449}")); +ok($objUk->lt("\x{449}z", "\x{44c}")); +ok($objUk->lt("\x{44c}z", "\x{44e}")); +ok($objUk->lt("\x{44e}z", "\x{44f}")); + +ok($objUk->lt("\x{410}z", "\x{411}")); +ok($objUk->lt("\x{411}z", "\x{412}")); +ok($objUk->lt("\x{412}z", "\x{413}")); +ok($objUk->lt("\x{413}z", "\x{490}")); +ok($objUk->lt("\x{490}z", "\x{414}")); +ok($objUk->lt("\x{414}z", "\x{415}")); +ok($objUk->lt("\x{415}z", "\x{404}")); +ok($objUk->lt("\x{404}z", "\x{416}")); +ok($objUk->lt("\x{416}z", "\x{417}")); +ok($objUk->lt("\x{417}z", "\x{418}")); +ok($objUk->lt("\x{418}z", "\x{406}")); +ok($objUk->lt("\x{406}z", "\x{a646}")); +ok($objUk->lt("\x{a646}z","\x{407}")); +ok($objUk->lt("\x{407}z", "\x{419}")); +ok($objUk->lt("\x{419}z", "\x{41a}")); +ok($objUk->lt("\x{41a}z", "\x{41b}")); +ok($objUk->lt("\x{41b}z", "\x{41c}")); +ok($objUk->lt("\x{41c}z", "\x{41d}")); +ok($objUk->lt("\x{41d}z", "\x{41e}")); +ok($objUk->lt("\x{41e}z", "\x{41f}")); +ok($objUk->lt("\x{41f}z", "\x{420}")); +ok($objUk->lt("\x{420}z", "\x{421}")); +ok($objUk->lt("\x{421}z", "\x{422}")); +ok($objUk->lt("\x{422}z", "\x{423}")); +ok($objUk->lt("\x{423}z", "\x{424}")); +ok($objUk->lt("\x{424}z", "\x{425}")); +ok($objUk->lt("\x{425}z", "\x{426}")); +ok($objUk->lt("\x{426}z", "\x{427}")); +ok($objUk->lt("\x{427}z", "\x{428}")); +ok($objUk->lt("\x{428}z", "\x{429}")); +ok($objUk->lt("\x{429}z", "\x{42c}")); +ok($objUk->lt("\x{42c}z", "\x{42e}")); +ok($objUk->lt("\x{42e}z", "\x{42f}")); + +# 68 $objUk->change(level => 2); +ok($objUk->eq("\x{430}", "\x{410}")); +ok($objUk->eq("\x{431}", "\x{411}")); +ok($objUk->eq("\x{432}", "\x{412}")); +ok($objUk->eq("\x{433}", "\x{413}")); ok($objUk->eq("\x{491}", "\x{490}")); +ok($objUk->eq("\x{434}", "\x{414}")); +ok($objUk->eq("\x{435}", "\x{415}")); +ok($objUk->eq("\x{454}", "\x{404}")); +ok($objUk->eq("\x{436}", "\x{416}")); +ok($objUk->eq("\x{437}", "\x{417}")); +ok($objUk->eq("\x{438}", "\x{418}")); +ok($objUk->eq("\x{456}", "\x{406}")); +ok($objUk->eq("\x{a647}","\x{a646}")); +ok($objUk->eq("\x{457}", "\x{407}")); +ok($objUk->eq("\x{457}", "\x{a676}")); +ok($objUk->eq("\x{a676}","\x{407}")); +ok($objUk->eq("\x{439}", "\x{419}")); +ok($objUk->eq("\x{43a}", "\x{41a}")); +ok($objUk->eq("\x{43b}", "\x{41b}")); +ok($objUk->eq("\x{43c}", "\x{41c}")); +ok($objUk->eq("\x{43d}", "\x{41d}")); +ok($objUk->eq("\x{43e}", "\x{41e}")); +ok($objUk->eq("\x{43f}", "\x{41f}")); +ok($objUk->eq("\x{440}", "\x{420}")); +ok($objUk->eq("\x{441}", "\x{421}")); +ok($objUk->eq("\x{442}", "\x{422}")); +ok($objUk->eq("\x{443}", "\x{423}")); +ok($objUk->eq("\x{444}", "\x{424}")); +ok($objUk->eq("\x{445}", "\x{425}")); +ok($objUk->eq("\x{446}", "\x{426}")); +ok($objUk->eq("\x{447}", "\x{427}")); +ok($objUk->eq("\x{448}", "\x{428}")); +ok($objUk->eq("\x{449}", "\x{429}")); +ok($objUk->eq("\x{44c}", "\x{42c}")); +ok($objUk->eq("\x{44e}", "\x{42e}")); +ok($objUk->eq("\x{44f}", "\x{42f}")); -# 57 - -ok($objUk->gt("\x{4D1}", "\x{430}")); -ok($objUk->gt("\x{4D0}", "\x{410}")); -ok($objUk->gt("\x{4D3}", "\x{430}")); -ok($objUk->gt("\x{4D2}", "\x{410}")); -ok($objUk->gt("\x{4DB}", "\x{4D9}")); -ok($objUk->gt("\x{4DA}", "\x{4D8}")); -ok($objUk->gt("\x{453}", "\x{433}")); -ok($objUk->gt("\x{403}", "\x{413}")); -ok($objUk->gt("\x{450}", "\x{435}")); # not contraction -ok($objUk->gt("\x{400}", "\x{415}")); # not contraction -ok($objUk->gt("\x{451}", "\x{435}")); # not contraction -ok($objUk->gt("\x{401}", "\x{415}")); # not contraction -ok($objUk->gt("\x{4D7}", "\x{435}")); -ok($objUk->gt("\x{4D6}", "\x{415}")); -ok($objUk->gt("\x{4C2}", "\x{436}")); # not contraction -ok($objUk->gt("\x{4C1}", "\x{416}")); # not contraction -ok($objUk->gt("\x{4DD}", "\x{436}")); -ok($objUk->gt("\x{4DC}", "\x{416}")); -ok($objUk->gt("\x{4DF}", "\x{437}")); -ok($objUk->gt("\x{4DE}", "\x{417}")); -ok($objUk->gt("\x{45D}", "\x{438}")); # not contraction -ok($objUk->gt("\x{40D}", "\x{418}")); # not contraction -ok($objUk->gt("\x{4E3}", "\x{438}")); # not contraction -ok($objUk->gt("\x{4E2}", "\x{418}")); # not contraction -ok($objUk->gt("\x{4E7}", "\x{43E}")); -ok($objUk->gt("\x{4E6}", "\x{41E}")); -ok($objUk->gt("\x{4EB}", "\x{4E9}")); -ok($objUk->gt("\x{4EA}", "\x{4E8}")); -ok($objUk->gt("\x{45C}", "\x{43A}")); -ok($objUk->gt("\x{40C}", "\x{41A}")); -ok($objUk->gt("\x{4EF}", "\x{443}")); # not contraction -ok($objUk->gt("\x{4EE}", "\x{423}")); # not contraction -ok($objUk->gt("\x{45E}", "\x{443}")); -ok($objUk->gt("\x{40E}", "\x{423}")); -ok($objUk->gt("\x{4F1}", "\x{443}")); -ok($objUk->gt("\x{4F0}", "\x{423}")); -ok($objUk->gt("\x{4F3}", "\x{443}")); -ok($objUk->gt("\x{4F2}", "\x{423}")); -ok($objUk->gt("\x{4F5}", "\x{447}")); -ok($objUk->gt("\x{4F4}", "\x{427}")); -ok($objUk->gt("\x{4F9}", "\x{44B}")); -ok($objUk->gt("\x{4F8}", "\x{42B}")); -ok($objUk->gt("\x{4ED}", "\x{44D}")); -ok($objUk->gt("\x{4EC}", "\x{42D}")); -ok($objUk->gt("\x{477}", "\x{475}")); -ok($objUk->gt("\x{476}", "\x{474}")); - -# 103 +# 104 $objUk->change(level => 3); +ok($objUk->lt("\x{430}", "\x{410}")); +ok($objUk->lt("\x{431}", "\x{411}")); +ok($objUk->lt("\x{432}", "\x{412}")); +ok($objUk->lt("\x{433}", "\x{413}")); ok($objUk->lt("\x{491}", "\x{490}")); - -# 104 - -ok($objUk->eq("\x{4E5}", "\x{438}\x{308}")); # not suppressed -ok($objUk->eq("\x{4E4}", "\x{418}\x{308}")); # not suppressed -ok($objUk->eq("\x{457}", "\x{456}\x{308}")); # not suppressed -ok($objUk->eq("\x{407}", "\x{406}\x{308}")); # not suppressed -ok($objUk->eq("\x{439}", "\x{438}\x{306}")); # not suppressed -ok($objUk->eq("\x{419}", "\x{418}\x{306}")); # not suppressed - -# 110 - -for my $i ("", "\0") { - ok($objUk->eq("\x{4D1}", "\x{430}$i\x{306}")); - ok($objUk->eq("\x{4D0}", "\x{410}$i\x{306}")); - ok($objUk->eq("\x{4D3}", "\x{430}$i\x{308}")); - ok($objUk->eq("\x{4D2}", "\x{410}$i\x{308}")); - ok($objUk->eq("\x{4DB}", "\x{4D9}$i\x{308}")); - ok($objUk->eq("\x{4DA}", "\x{4D8}$i\x{308}")); - ok($objUk->eq("\x{453}", "\x{433}$i\x{301}")); - ok($objUk->eq("\x{403}", "\x{413}$i\x{301}")); - ok($objUk->eq("\x{450}", "\x{435}$i\x{300}")); # not contraction - ok($objUk->eq("\x{400}", "\x{415}$i\x{300}")); # not contraction - ok($objUk->eq("\x{451}", "\x{435}$i\x{308}")); # not contraction - ok($objUk->eq("\x{401}", "\x{415}$i\x{308}")); # not contraction - ok($objUk->eq("\x{4D7}", "\x{435}$i\x{306}")); - ok($objUk->eq("\x{4D6}", "\x{415}$i\x{306}")); - ok($objUk->eq("\x{4C2}", "\x{436}$i\x{306}")); # not contraction - ok($objUk->eq("\x{4C1}", "\x{416}$i\x{306}")); # not contraction - ok($objUk->eq("\x{4DD}", "\x{436}$i\x{308}")); - ok($objUk->eq("\x{4DC}", "\x{416}$i\x{308}")); - ok($objUk->eq("\x{4DF}", "\x{437}$i\x{308}")); - ok($objUk->eq("\x{4DE}", "\x{417}$i\x{308}")); - ok($objUk->eq("\x{45D}", "\x{438}$i\x{300}")); # not contraction - ok($objUk->eq("\x{40D}", "\x{418}$i\x{300}")); # not contraction - ok($objUk->eq("\x{4E3}", "\x{438}$i\x{304}")); # not contraction - ok($objUk->eq("\x{4E2}", "\x{418}$i\x{304}")); # not contraction - ok($objUk->eq("\x{4E7}", "\x{43E}$i\x{308}")); - ok($objUk->eq("\x{4E6}", "\x{41E}$i\x{308}")); - ok($objUk->eq("\x{4EB}", "\x{4E9}$i\x{308}")); - ok($objUk->eq("\x{4EA}", "\x{4E8}$i\x{308}")); - ok($objUk->eq("\x{45C}", "\x{43A}$i\x{301}")); - ok($objUk->eq("\x{40C}", "\x{41A}$i\x{301}")); - ok($objUk->eq("\x{4EF}", "\x{443}$i\x{304}")); # not contraction - ok($objUk->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction - ok($objUk->eq("\x{45E}", "\x{443}$i\x{306}")); - ok($objUk->eq("\x{40E}", "\x{423}$i\x{306}")); - ok($objUk->eq("\x{4F1}", "\x{443}$i\x{308}")); - ok($objUk->eq("\x{4F0}", "\x{423}$i\x{308}")); - ok($objUk->eq("\x{4F3}", "\x{443}$i\x{30B}")); - ok($objUk->eq("\x{4F2}", "\x{423}$i\x{30B}")); - ok($objUk->eq("\x{4F5}", "\x{447}$i\x{308}")); - ok($objUk->eq("\x{4F4}", "\x{427}$i\x{308}")); - ok($objUk->eq("\x{4F9}", "\x{44B}$i\x{308}")); - ok($objUk->eq("\x{4F8}", "\x{42B}$i\x{308}")); - ok($objUk->eq("\x{4ED}", "\x{44D}$i\x{308}")); - ok($objUk->eq("\x{4EC}", "\x{42D}$i\x{308}")); - ok($objUk->eq("\x{477}", "\x{475}$i\x{30F}")); - ok($objUk->eq("\x{476}", "\x{474}$i\x{30F}")); -} - -# 202 - -$objUk->change(upper_before_lower => 1); - -ok($objUk->gt("\x{491}", "\x{490}")); - -# 203 +ok($objUk->lt("\x{434}", "\x{414}")); +ok($objUk->lt("\x{435}", "\x{415}")); +ok($objUk->lt("\x{454}", "\x{404}")); +ok($objUk->lt("\x{436}", "\x{416}")); +ok($objUk->lt("\x{437}", "\x{417}")); +ok($objUk->lt("\x{438}", "\x{418}")); +ok($objUk->lt("\x{456}", "\x{406}")); +ok($objUk->lt("\x{a647}","\x{a646}")); +ok($objUk->lt("\x{457}", "\x{407}")); +ok($objUk->lt("\x{457}", "\x{a676}")); +ok($objUk->lt("\x{a676}","\x{407}")); +ok($objUk->lt("\x{439}", "\x{419}")); +ok($objUk->lt("\x{43a}", "\x{41a}")); +ok($objUk->lt("\x{43b}", "\x{41b}")); +ok($objUk->lt("\x{43c}", "\x{41c}")); +ok($objUk->lt("\x{43d}", "\x{41d}")); +ok($objUk->lt("\x{43e}", "\x{41e}")); +ok($objUk->lt("\x{43f}", "\x{41f}")); +ok($objUk->lt("\x{440}", "\x{420}")); +ok($objUk->lt("\x{441}", "\x{421}")); +ok($objUk->lt("\x{442}", "\x{422}")); +ok($objUk->lt("\x{443}", "\x{423}")); +ok($objUk->lt("\x{444}", "\x{424}")); +ok($objUk->lt("\x{445}", "\x{425}")); +ok($objUk->lt("\x{446}", "\x{426}")); +ok($objUk->lt("\x{447}", "\x{427}")); +ok($objUk->lt("\x{448}", "\x{428}")); +ok($objUk->lt("\x{449}", "\x{429}")); +ok($objUk->lt("\x{44c}", "\x{42c}")); +ok($objUk->lt("\x{44e}", "\x{42e}")); +ok($objUk->lt("\x{44f}", "\x{42f}")); + +# 140 + +ok($objUk->eq("\x{457}", "\x{456}\x{308}")); +ok($objUk->eq("\x{407}", "\x{406}\x{308}")); +ok($objUk->eq("\x{439}", "\x{438}\x{306}")); +ok($objUk->eq("\x{419}", "\x{418}\x{306}")); + +# 144 diff --git a/cpan/Unicode-Collate/t/overcjk0.t b/cpan/Unicode-Collate/t/overcjk0.t index 9c2dcb190b..f281aeb89d 100644 --- a/cpan/Unicode-Collate/t/overcjk0.t +++ b/cpan/Unicode-Collate/t/overcjk0.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..347\n"; } # 6 + 31 x @Versions +BEGIN { $| = 1; print "1..513\n"; } # 6 + 39 x @Versions my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -59,13 +59,15 @@ ok($ignoreCJK->lt("Pe\x{5B57}rl", "Perl")); # 'r' is unassigned. # 9FBC..9FC3 are CJK UI since UCA_Version 18 (Unicode 5.1). # 9FC4..9FCB are CJK UI since UCA_Version 20 (Unicode 5.2). # 9FCC is CJK UI since UCA_Version 24 (Unicode 6.1). +# 9FCD..9FD5 are CJK UI since UCA_Version 32 (Unicode 8.0). # 3400..4DB5 are CJK UI Ext.A since UCA_Version 8 (Unicode 3.0). # 20000..2A6D6 are CJK UI Ext.B since UCA_Version 8 (Unicode 3.1). # 2A700..2B734 are CJK UI Ext.C since UCA_Version 20 (Unicode 5.2). # 2B740..2B81D are CJK UI Ext.D since UCA_Version 22 (Unicode 6.0). +# 2B820..2CEA1 are CJK UI Ext.E since UCA_Version 32 (Unicode 8.0). -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32); for my $v (@Versions) { $ignoreCJK->change(UCA_Version => $v); @@ -84,8 +86,12 @@ for my $v (@Versions) { ok($ignoreCJK->cmp("\x{9FC4}", "") == ($v >= 20 ? 0 : 1)); ok($ignoreCJK->cmp("\x{9FCB}", "") == ($v >= 20 ? 0 : 1)); ok($ignoreCJK->cmp("\x{9FCC}", "") == ($v >= 24 ? 0 : 1)); - ok($ignoreCJK->cmp("\x{9FCD}", "") == 1); - ok($ignoreCJK->cmp("\x{9FCF}", "") == 1); + ok($ignoreCJK->cmp("\x{9FCD}", "") == ($v >= 32 ? 0 : 1)); + ok($ignoreCJK->cmp("\x{9FCF}", "") == ($v >= 32 ? 0 : 1)); + ok($ignoreCJK->cmp("\x{9FD0}", "") == ($v >= 32 ? 0 : 1)); + ok($ignoreCJK->cmp("\x{9FD5}", "") == ($v >= 32 ? 0 : 1)); + ok($ignoreCJK->cmp("\x{9FD6}", "") == 1); + ok($ignoreCJK->cmp("\x{9FDF}", "") == 1); # Ext.A ok($ignoreCJK->cmp("\x{3400}", "") == 0); @@ -110,5 +116,11 @@ for my $v (@Versions) { ok($ignoreCJK->cmp("\x{2B81D}","") == ($v >= 22 ? 0 : 1)); ok($ignoreCJK->cmp("\x{2B81E}","") == 1); ok($ignoreCJK->cmp("\x{2B81F}","") == 1); + + # Ext.E + ok($ignoreCJK->cmp("\x{2B820}","") == ($v >= 32 ? 0 : 1)); + ok($ignoreCJK->cmp("\x{2CEA1}","") == ($v >= 32 ? 0 : 1)); + ok($ignoreCJK->cmp("\x{2CEA2}","") == 1); + ok($ignoreCJK->cmp("\x{2CEAF}","") == 1); } diff --git a/cpan/Unicode-Collate/t/overcjk1.t b/cpan/Unicode-Collate/t/overcjk1.t index 0cc23dea50..87f5eaac85 100644 --- a/cpan/Unicode-Collate/t/overcjk1.t +++ b/cpan/Unicode-Collate/t/overcjk1.t @@ -16,7 +16,7 @@ BEGIN { use strict; use warnings; -BEGIN { $| = 1; print "1..187\n"; } # 11 + 16 x @Versions +BEGIN { $| = 1; print "1..258\n"; } # 11 + 19 x @Versions my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -64,8 +64,9 @@ ok($overCJK->lt("a\x{4E03}", "A\x{4E01}")); # 9FBC..9FC3 are CJK UI since UCA_Version 18 (Unicode 5.1). # 9FC4..9FCB are CJK UI since UCA_Version 20 (Unicode 5.2). # 9FCC is CJK UI since UCA_Version 24 (Unicode 6.1). +# 9FCD..9FD5 are CJK UI since UCA_Version 32 (Unicode 8.0). -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32); for my $v (@Versions) { $overCJK->change(UCA_Version => $v); @@ -83,7 +84,10 @@ for my $v (@Versions) { ok($overCJK->cmp("a\x{9FC4}", "A\x{9FCA}") == ($v >= 20 ? 1 : -1)); ok($overCJK->cmp("a\x{9FCA}", "A\x{9FCB}") == ($v >= 20 ? 1 : -1)); ok($overCJK->cmp("a\x{9FCB}", "A\x{9FCC}") == ($v >= 24 ? 1 : -1)); - ok($overCJK->cmp("a\x{9FCC}", "A\x{9FCD}") == -1); - ok($overCJK->cmp("a\x{9FCD}", "A\x{9FCF}") == -1); + ok($overCJK->cmp("a\x{9FCC}", "A\x{9FCD}") == ($v >= 32 ? 1 : -1)); + ok($overCJK->cmp("a\x{9FCD}", "A\x{9FCF}") == ($v >= 32 ? 1 : -1)); + ok($overCJK->cmp("a\x{9FCF}", "A\x{9FD5}") == ($v >= 32 ? 1 : -1)); + ok($overCJK->cmp("a\x{9FD5}", "A\x{9FD6}") == -1); + ok($overCJK->cmp("a\x{9FD6}", "A\x{9FDF}") == -1); } diff --git a/cpan/Unicode-Collate/t/version.t b/cpan/Unicode-Collate/t/version.t index 414830f7a2..f1dde6f2e2 100644 --- a/cpan/Unicode-Collate/t/version.t +++ b/cpan/Unicode-Collate/t/version.t @@ -34,8 +34,8 @@ ok(1); ######################### # Fix me when UCA and/or keys.txt is upgraded. -my $UCA_Version = "30"; -my $Base_Unicode_Version = "7.0.0"; +my $UCA_Version = "32"; +my $Base_Unicode_Version = "8.0.0"; my $Key_Version = "3.1.1"; ok(Unicode::Collate::UCA_Version, $UCA_Version); diff --git a/cpan/Unicode-Collate/t/view.t b/cpan/Unicode-Collate/t/view.t index 91da5968bd..0cbbba0259 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..106\n"; } # 62 + 4 x @Versions +BEGIN { $| = 1; print "1..110\n"; } # 62 + 4 x @Versions my $count = 0; sub ok ($;$) { my $p = my $r = shift; @@ -268,7 +268,7 @@ ok($el->viewSortKey("L\x{FF2C}\x{216C}\x{2112}\x{24C1}"), ##### 62 -my @Versions = (9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30); +my @Versions = (9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32); for my $v (@Versions) { $Collator->change(UCA_Version => $v); |