Import perl-5.28.1

looking good sthen@, Great! bluhm@
author: afresh1 <afresh1@openbsd.org> 2019-02-13 21:10:38 +0000
committer: afresh1 <afresh1@openbsd.org> 2019-02-13 21:10:38 +0000
commit: 5759b3d249badf144a6240f7eec4dcf9df003e6b (patch)
tree: 88ca2f73bac6772bb3b7819e5ca28614859b0f2c /gnu/usr.bin/perl/cpan/Unicode-Collate
parent: strsep the -e argument for execve; ok benno (diff)
download: wireguard-openbsd-5759b3d249badf144a6240f7eec4dcf9df003e6b.tar.xz
wireguard-openbsd-5759b3d249badf144a6240f7eec4dcf9df003e6b.zip
64 files changed, 3083 insertions, 1688 deletions
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl
new file mode 100644
index 00000000000..7efe805badf
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl
@@ -0,0 +1,31 @@
++{
+   locale_version => 1.25,
+   entry => <<'ENTRY', # for DUCET v9.0.0
+00E4      ; [.1C48.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS
+0061 0308 ; [.1C48.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS
+00C4      ; [.1C48.0020.0008] # LATIN CAPITAL LETTER A WITH DIAERESIS
+0041 0308 ; [.1C48.0020.0008] # LATIN CAPITAL LETTER A WITH DIAERESIS
+01DF      ; [.1C48.0020.0002][.0000.0032.0002] # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+01DE      ; [.1C48.0020.0008][.0000.0032.0002] # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+00F6      ; [.1DDE.0020.0002] # LATIN SMALL LETTER O WITH DIAERESIS
+006F 0308 ; [.1DDE.0020.0002] # LATIN SMALL LETTER O WITH DIAERESIS
+00D6      ; [.1DDE.0020.0008] # LATIN CAPITAL LETTER O WITH DIAERESIS
+004F 0308 ; [.1DDE.0020.0008] # LATIN CAPITAL LETTER O WITH DIAERESIS
+022B      ; [.1DDE.0020.0002][.0000.0032.0002] # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
+022A      ; [.1DDE.0020.0008][.0000.0032.0002] # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+00FC      ; [.1EB6.0020.0002] # LATIN SMALL LETTER U WITH DIAERESIS
+0075 0308 ; [.1EB6.0020.0002] # LATIN SMALL LETTER U WITH DIAERESIS
+00DC      ; [.1EB6.0020.0008] # LATIN CAPITAL LETTER U WITH DIAERESIS
+0055 0308 ; [.1EB6.0020.0008] # LATIN CAPITAL LETTER U WITH DIAERESIS
+01DC      ; [.1EB6.0020.0002][.0000.0025.0002] # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
+01DB      ; [.1EB6.0020.0008][.0000.0025.0002] # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+01D8      ; [.1EB6.0020.0002][.0000.0024.0002] # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
+01D7      ; [.1EB6.0020.0008][.0000.0024.0002] # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+01D6      ; [.1EB6.0020.0002][.0000.0032.0002] # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
+01D5      ; [.1EB6.0020.0008][.0000.0032.0002] # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+01DA      ; [.1EB6.0020.0002][.0000.0028.0002] # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+01D9      ; [.1EB6.0020.0008][.0000.0028.0002] # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+00DF      ; [.1E71.0020.0002][.1E72.0020.0002] # LATIN SMALL LETTER SHARP S
+1E9E      ; [.1E71.0020.0008][.1E72.0020.0008] # LATIN CAPITAL LETTER SHARP S
+ENTRY
+};
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/dsb.pl b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/dsb.pl
new file mode 100644
index 00000000000..3fbe87500bf
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/dsb.pl
@@ -0,0 +1,59 @@
++{
+   locale_version => 1.25,
+   entry => <<'ENTRY', # for DUCET v9.0.0
+010D      ; [.1C7B.0020.0002] # LATIN SMALL LETTER C WITH CARON
+0063 030C ; [.1C7B.0020.0002] # LATIN SMALL LETTER C WITH CARON
+010C      ; [.1C7B.0020.0008] # LATIN CAPITAL LETTER C WITH CARON
+0043 030C ; [.1C7B.0020.0008] # LATIN CAPITAL LETTER C WITH CARON
+0107      ; [.1C7C.0020.0002] # LATIN SMALL LETTER C WITH ACUTE
+0063 0301 ; [.1C7C.0020.0002] # LATIN SMALL LETTER C WITH ACUTE
+0063 0341 ; [.1C7C.0020.0002] # LATIN SMALL LETTER C WITH ACUTE
+0106      ; [.1C7C.0020.0008] # LATIN CAPITAL LETTER C WITH ACUTE
+0043 0301 ; [.1C7C.0020.0008] # LATIN CAPITAL LETTER C WITH ACUTE
+0043 0341 ; [.1C7C.0020.0008] # LATIN CAPITAL LETTER C WITH ACUTE
+011B      ; [.1CAB.0020.0002] # LATIN SMALL LETTER E WITH CARON
+0065 030C ; [.1CAB.0020.0002] # LATIN SMALL LETTER E WITH CARON
+011A      ; [.1CAB.0020.0008] # LATIN CAPITAL LETTER E WITH CARON
+0045 030C ; [.1CAB.0020.0008] # LATIN CAPITAL LETTER E WITH CARON
+0063 0068 ; [.1D19.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H>
+0063 0048 ; [.1D19.0020.0007][.0000.0000.0002] # <LATIN SMALL LETTER C, LATIN CAPITAL LETTER H>
+0043 0068 ; [.1D19.0020.0007][.0000.0000.0008] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H>
+0043 0048 ; [.1D19.0020.0008] # <LATIN CAPITAL LETTER C, LATIN CAPITAL LETTER H>
+0142      ; [.1D76.0020.0002] # LATIN SMALL LETTER L WITH STROKE
+006C 0335 ; [.1D76.0020.0002] # LATIN SMALL LETTER L WITH STROKE
+0141      ; [.1D76.0020.0008] # LATIN CAPITAL LETTER L WITH STROKE
+004C 0335 ; [.1D76.0020.0008] # LATIN CAPITAL LETTER L WITH STROKE
+0144      ; [.1DBA.0020.0002] # LATIN SMALL LETTER N WITH ACUTE
+006E 0301 ; [.1DBA.0020.0002] # LATIN SMALL LETTER N WITH ACUTE
+006E 0341 ; [.1DBA.0020.0002] # LATIN SMALL LETTER N WITH ACUTE
+0143      ; [.1DBA.0020.0008] # LATIN CAPITAL LETTER N WITH ACUTE
+004E 0301 ; [.1DBA.0020.0008] # LATIN CAPITAL LETTER N WITH ACUTE
+004E 0341 ; [.1DBA.0020.0008] # LATIN CAPITAL LETTER N WITH ACUTE
+0155      ; [.1E34.0020.0002] # LATIN SMALL LETTER R WITH ACUTE
+0072 0301 ; [.1E34.0020.0002] # LATIN SMALL LETTER R WITH ACUTE
+0072 0341 ; [.1E34.0020.0002] # LATIN SMALL LETTER R WITH ACUTE
+0154      ; [.1E34.0020.0008] # LATIN CAPITAL LETTER R WITH ACUTE
+0052 0301 ; [.1E34.0020.0008] # LATIN CAPITAL LETTER R WITH ACUTE
+0052 0341 ; [.1E34.0020.0008] # LATIN CAPITAL LETTER R WITH ACUTE
+0161      ; [.1E72.0020.0002] # LATIN SMALL LETTER S WITH CARON
+0073 030C ; [.1E72.0020.0002] # LATIN SMALL LETTER S WITH CARON
+0160      ; [.1E72.0020.0008] # LATIN CAPITAL LETTER S WITH CARON
+0053 030C ; [.1E72.0020.0008] # LATIN CAPITAL LETTER S WITH CARON
+015B      ; [.1E73.0020.0002] # LATIN SMALL LETTER S WITH ACUTE
+0073 0301 ; [.1E73.0020.0002] # LATIN SMALL LETTER S WITH ACUTE
+0073 0341 ; [.1E73.0020.0002] # LATIN SMALL LETTER S WITH ACUTE
+015A      ; [.1E73.0020.0008] # LATIN CAPITAL LETTER S WITH ACUTE
+0053 0301 ; [.1E73.0020.0008] # LATIN CAPITAL LETTER S WITH ACUTE
+0053 0341 ; [.1E73.0020.0008] # LATIN CAPITAL LETTER S WITH ACUTE
+017E      ; [.1F22.0020.0002] # LATIN SMALL LETTER Z WITH CARON
+007A 030C ; [.1F22.0020.0002] # LATIN SMALL LETTER Z WITH CARON
+017D      ; [.1F22.0020.0008] # LATIN CAPITAL LETTER Z WITH CARON
+005A 030C ; [.1F22.0020.0008] # LATIN CAPITAL LETTER Z WITH CARON
+017A      ; [.1F23.0020.0002] # LATIN SMALL LETTER Z WITH ACUTE
+007A 0301 ; [.1F23.0020.0002] # LATIN SMALL LETTER Z WITH ACUTE
+007A 0341 ; [.1F23.0020.0002] # LATIN SMALL LETTER Z WITH ACUTE
+0179      ; [.1F23.0020.0008] # LATIN CAPITAL LETTER Z WITH ACUTE
+005A 0301 ; [.1F23.0020.0008] # LATIN CAPITAL LETTER Z WITH ACUTE
+005A 0341 ; [.1F23.0020.0008] # LATIN CAPITAL LETTER Z WITH ACUTE
+ENTRY
+};
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/fr_ca.pl b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/fr_ca.pl
new file mode 100644
index 00000000000..ea81cac4b6f
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/fr_ca.pl
@@ -0,0 +1,4 @@
++{
+   locale_version => 1.25,
+   backwards => 2,
+};
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/he.pl b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/he.pl
new file mode 100644
index 00000000000..f73c8d560cf
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/he.pl
@@ -0,0 +1,7 @@
++{
+   locale_version => 1.25,
+   entry => <<'ENTRY', # for DUCET v9.0.0
+05F3      ; [*0305.001F.0002] # HEBREW PUNCTUATION GERESH
+05F4      ; [*030C.001F.0002] # HEBREW PUNCTUATION GERSHAYIM
+ENTRY
+};
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/lkt.pl b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/lkt.pl
new file mode 100644
index 00000000000..dbd577acad0
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/lkt.pl
@@ -0,0 +1,25 @@
++{
+   locale_version => 1.25,
+   entry => <<'ENTRY', # for DUCET v9.0.0
+010D      ; [.1C7B.0020.0002] # LATIN SMALL LETTER C WITH CARON
+0063 030C ; [.1C7B.0020.0002] # LATIN SMALL LETTER C WITH CARON
+010C      ; [.1C7B.0020.0008] # LATIN CAPITAL LETTER C WITH CARON
+0043 030C ; [.1C7B.0020.0008] # LATIN CAPITAL LETTER C WITH CARON
+01E7      ; [.1CF5.0020.0002] # LATIN SMALL LETTER G WITH CARON
+0067 030C ; [.1CF5.0020.0002] # LATIN SMALL LETTER G WITH CARON
+01E6      ; [.1CF5.0020.0008] # LATIN CAPITAL LETTER G WITH CARON
+0047 030C ; [.1CF5.0020.0008] # LATIN CAPITAL LETTER G WITH CARON
+021F      ; [.1D19.0020.0002] # LATIN SMALL LETTER H WITH CARON
+0068 030C ; [.1D19.0020.0002] # LATIN SMALL LETTER H WITH CARON
+021E      ; [.1D19.0020.0008] # LATIN CAPITAL LETTER H WITH CARON
+0048 030C ; [.1D19.0020.0008] # LATIN CAPITAL LETTER H WITH CARON
+0161      ; [.1E72.0020.0002] # LATIN SMALL LETTER S WITH CARON
+0073 030C ; [.1E72.0020.0002] # LATIN SMALL LETTER S WITH CARON
+0160      ; [.1E72.0020.0008] # LATIN CAPITAL LETTER S WITH CARON
+0053 030C ; [.1E72.0020.0008] # LATIN CAPITAL LETTER S WITH CARON
+017E      ; [.1F22.0020.0002] # LATIN SMALL LETTER Z WITH CARON
+007A 030C ; [.1F22.0020.0002] # LATIN SMALL LETTER Z WITH CARON
+017D      ; [.1F22.0020.0008] # LATIN CAPITAL LETTER Z WITH CARON
+005A 030C ; [.1F22.0020.0008] # LATIN CAPITAL LETTER Z WITH CARON
+ENTRY
+};
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/ug_cyrl.pl b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/ug_cyrl.pl
new file mode 100644
index 00000000000..af42f2dbf3a
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/ug_cyrl.pl
@@ -0,0 +1,7 @@
++{
+   locale_version => 1.25,
+   entry => <<'ENTRY', # for DUCET v9.0.0
+04D9      ; [.205B.0020.0002] # CYRILLIC SMALL LETTER SCHWA
+04D8      ; [.205B.0020.0008] # CYRILLIC CAPITAL LETTER SCHWA
+ENTRY
+};
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/vo.pl b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/vo.pl
new file mode 100644
index 00000000000..8b7c4c90048
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/Collate/Locale/vo.pl
@@ -0,0 +1,29 @@
++{
+   locale_version => 1.25,
+   entry => <<'ENTRY', # for DUCET v9.0.0
+00E4      ; [.1C48.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS
+0061 0308 ; [.1C48.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS
+00C4      ; [.1C48.0020.0008] # LATIN CAPITAL LETTER A WITH DIAERESIS
+0041 0308 ; [.1C48.0020.0008] # LATIN CAPITAL LETTER A WITH DIAERESIS
+01DF      ; [.1C48.0020.0002][.0000.0032.0002] # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+01DE      ; [.1C48.0020.0008][.0000.0032.0002] # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+00F6      ; [.1DDE.0020.0002] # LATIN SMALL LETTER O WITH DIAERESIS
+006F 0308 ; [.1DDE.0020.0002] # LATIN SMALL LETTER O WITH DIAERESIS
+00D6      ; [.1DDE.0020.0008] # LATIN CAPITAL LETTER O WITH DIAERESIS
+004F 0308 ; [.1DDE.0020.0008] # LATIN CAPITAL LETTER O WITH DIAERESIS
+022B      ; [.1DDE.0020.0002][.0000.0032.0002] # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
+022A      ; [.1DDE.0020.0008][.0000.0032.0002] # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+00FC      ; [.1EB6.0020.0002] # LATIN SMALL LETTER U WITH DIAERESIS
+0075 0308 ; [.1EB6.0020.0002] # LATIN SMALL LETTER U WITH DIAERESIS
+00DC      ; [.1EB6.0020.0008] # LATIN CAPITAL LETTER U WITH DIAERESIS
+0055 0308 ; [.1EB6.0020.0008] # LATIN CAPITAL LETTER U WITH DIAERESIS
+01DC      ; [.1EB6.0020.0002][.0000.0025.0002] # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
+01DB      ; [.1EB6.0020.0008][.0000.0025.0002] # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+01D8      ; [.1EB6.0020.0002][.0000.0024.0002] # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
+01D7      ; [.1EB6.0020.0008][.0000.0024.0002] # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+01D6      ; [.1EB6.0020.0002][.0000.0032.0002] # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
+01D5      ; [.1EB6.0020.0008][.0000.0032.0002] # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+01DA      ; [.1EB6.0020.0002][.0000.0028.0002] # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+01D9      ; [.1EB6.0020.0008][.0000.0028.0002] # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+ENTRY
+};
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/cjkrange.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/cjkrange.t
index 8e851dca7b0..4ed8710a9d0 100755
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/cjkrange.t
+++ b/gnu/usr.bin/perl/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..901\n"; } # 1 + 60 x @Versions
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -46,13 +46,17 @@ 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).
+# 9FD6..9FEA are CJK UI since UCA_Version 36 (Unicode 10.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).
+# 2CEB0..2EBE0 are CJK UI Ext.F since UCA_Version 36 (Unicode 10.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, 34, 36);
 
 for my $v (@Versions) {
     $coll->change(UCA_Version => $v);
@@ -67,7 +71,11 @@ 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}") == ($v >= 36 ? 1 : -1)); # new
+    ok($coll->cmp("\x{3400}", "\x{9FEA}") == ($v >= 36 ? 1 : -1)); # new
+    ok($coll->cmp("\x{3400}", "\x{9FEB}") == -1); # na
     ok($coll->cmp("\x{3400}", "\x{9FFF}") == -1); # na
 
     # UI < UI
@@ -79,8 +87,12 @@ 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 < new
+    ok($coll->cmp("\x{9FD6}", "\x{9FEA}") == -1); # new < new
+    ok($coll->cmp("\x{9FEA}", "\x{9FEB}") == -1); # new < na
+    ok($coll->cmp("\x{9FEB}", "\x{9FFF}") == -1); # na < na
 
     # Ext.A < Ext.B
     ok($coll->cmp("\x{3400}", "\x{20000}") == -1);
@@ -112,5 +124,19 @@ 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
+
+    # Ext.F
+    ok($coll->cmp("\x{2CEB0}","\x{2EBE0}") == -1); # F < F
+    ok($coll->cmp("\x{2FFF}", "\x{2CEB0}") == ($v >= 36 ? 1 : -1)); # na > F
+    ok($coll->cmp("\x{2FFF}", "\x{2EBE0}") == ($v >= 36 ? 1 : -1)); # na > F
+    ok($coll->cmp("\x{2FFF}", "\x{2EBE1}") == -1); # na < na
+    ok($coll->cmp("\x{2FFF}", "\x{2EBEF}") == -1); # na < na
 }
 
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/compatui.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/compatui.t
index 8d1e85d30ba..96dffd4091e 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/compatui.t
+++ b/gnu/usr.bin/perl/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..1051\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, 34, 36);
 
 # 12 compatibility ideographs are treated as unified ideographs:
 # FA0E, FA0F, FA11, FA13, FA14, FA1F, FA21, FA23, FA24, FA27, FA28, FA29.
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/default.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/default.t
index bdc46dbcb53..85d604f3a76 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/default.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/hangtype.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/hangtype.t
index ea9f4936f9e..42d0c61a500 100755
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/hangtype.t
+++ b/gnu/usr.bin/perl/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..751\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, 34, 36);
 
 for my $v (@Versions) {
     ok(Unicode::Collate::getHST(0x0000, $v), '');
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_af.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_af.t
index 51176c90e41..76d13c83f89 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_af.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_af.t
@@ -43,12 +43,18 @@ $objAf->change(level => 1);
 ok($objAf->eq("n", "N"));
 ok($objAf->eq("N", "\x{149}"));
 
+# 4
+
 $objAf->change(level => 2);
 
 ok($objAf->eq("n", "N"));
 ok($objAf->eq("N", "\x{149}"));
 
+# 6
+
 $objAf->change(level => 3);
 
 ok($objAf->lt("n", "N"));
 ok($objAf->lt("N", "\x{149}"));
+
+# 8
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_as.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_as.t
index 2d28f90f86d..cbc87e471fb 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_as.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_as.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..24\n"; }
+BEGIN { $| = 1; print "1..29\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -42,8 +42,7 @@ $objAs->change(level => 1);
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objAs->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objAs->lt("\x{993}$t", "\x{994}"));
     ok($objAs->lt("\x{994}$t", "\x{982}"));
@@ -55,7 +54,18 @@ for my $h (0, 1) {
     ok($objAs->lt("\x{9A3}$t", "\x{9A4}\x{9CD}\x{200D}"));
     ok($objAs->lt("\x{9A4}\x{9CD}\x{200D}$t", "\x{9A4}"));
 
+    ok($objAs->lt("\x{9A3}$t", "\x{9CE}"));
+    ok($objAs->lt("\x{9CE}$t", "\x{9A4}"));
+
     ok($objAs->lt("\x{9B8}$t", "\x{9B9}"));
     ok($objAs->lt("\x{9B9}$t", "\x{995}\x{9CD}\x{9B7}"));
     ok($objAs->lt("\x{995}\x{9CD}\x{9B7}$t", "\x{9BD}"));
 }
+
+# 28
+
+$objAs->change(level => 3);
+
+ok($objAs->eq("\x{9A4}\x{9CD}\x{200D}", "\x{9CE}"));
+
+# 29
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_az.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_az.t
index 855e6bc084b..97ecf92cd21 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_az.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_az.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..72\n"; }
+BEGIN { $| = 1; print "1..86\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -41,32 +41,44 @@ ok($objAz->getlocale, 'az');
 $objAz->change(level => 1);
 
 ok($objAz->lt("c", "c\x{327}"));
+ok($objAz->lt("cz","c\x{327}"));
 ok($objAz->gt("d", "c\x{327}"));
 ok($objAz->lt("g", "g\x{306}"));
+ok($objAz->lt("gz","g\x{306}"));
 ok($objAz->gt("h", "g\x{306}"));
 ok($objAz->lt("h", "I"));
+ok($objAz->lt("hz","I"));
 ok($objAz->lt("I", "i"));
+ok($objAz->lt("Iz","i"));
 ok($objAz->gt("j", "i"));
 ok($objAz->lt("o", "o\x{308}"));
+ok($objAz->lt("oz","o\x{308}"));
 ok($objAz->gt("p", "o\x{308}"));
 ok($objAz->lt("s", "s\x{327}"));
+ok($objAz->lt("sz","s\x{327}"));
 ok($objAz->gt("t", "s\x{327}"));
 ok($objAz->lt("u", "u\x{308}"));
+ok($objAz->lt("uz","u\x{308}"));
 ok($objAz->gt("v", "u\x{308}"));
 
-# 15
+# 22
 
 ok($objAz->lt("k", "q"));
 ok($objAz->lt("kz","q"));
 ok($objAz->gt("l", "q"));
 ok($objAz->lt("e", "\x{259}"));
+ok($objAz->lt("ez","\x{259}"));
 ok($objAz->gt("f", "\x{259}"));
 ok($objAz->lt("h", "x"));
 ok($objAz->lt("hz","x"));
-ok($objAz->gt("I","x"));
-ok($objAz->gt("i","x"));
+ok($objAz->lt("x", "I"));
+ok($objAz->lt("xz","I"));
+ok($objAz->lt("x", "i"));
+ok($objAz->lt("xz","i"));
+ok($objAz->lt("z", "w"));
+ok($objAz->lt("zz","w"));
 
-# 24
+# 36
 
 $objAz->change(level => 2);
 
@@ -80,8 +92,9 @@ ok($objAz->eq("u\x{308}", "U\x{308}"));
 ok($objAz->eq("q", "Q"));
 ok($objAz->eq("\x{259}", "\x{18F}"));
 ok($objAz->eq("x", "X"));
+ok($objAz->eq("z", "Z"));
 
-# 34
+# 47
 
 $objAz->change(level => 3);
 
@@ -92,11 +105,12 @@ ok($objAz->gt("\x{130}", "i"));
 ok($objAz->lt("o\x{308}", "O\x{308}"));
 ok($objAz->lt("s\x{327}", "S\x{327}"));
 ok($objAz->lt("u\x{308}", "U\x{308}"));
-ok($objAz->lt("k", "K"));
+ok($objAz->lt("q", "Q"));
 ok($objAz->lt("\x{259}", "\x{18F}"));
 ok($objAz->lt("x", "X"));
+ok($objAz->lt("z", "Z"));
 
-# 44
+# 58
 
 ok($objAz->eq("c\x{327}", pack('U', 0xE7)));
 ok($objAz->eq("C\x{327}", pack('U', 0xC7)));
@@ -111,7 +125,7 @@ ok($objAz->eq("I\x{306}", "\x{12C}"));
 ok($objAz->eq("I\x{328}", "\x{12E}"));
 ok($objAz->eq("I\x{307}", "\x{130}"));
 
-# 56
+# 70
 
 ok($objAz->eq("o\x{308}", pack('U', 0xF6)));
 ok($objAz->eq("O\x{308}", pack('U', 0xD6)));
@@ -130,4 +144,4 @@ ok($objAz->eq("U\x{308}\x{304}", "\x{1D5}"));
 ok($objAz->eq("u\x{308}\x{30C}", "\x{1DA}"));
 ok($objAz->eq("U\x{308}\x{30C}", "\x{1D9}"));
 
-# 72
+# 86
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_be.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_be.t
index 5d1dfeeb29c..26ca455b478 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_be.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bg.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bg.t
index 792b4b10fbb..15ecff7a1a3 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bg.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bn.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bn.t
index 385cf5b2fad..2fe96ddb78a 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bn.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bn.t
@@ -42,8 +42,7 @@ $objBn->change(level => 1);
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objBn->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objBn->lt("\x{993}$t", "\x{994}"));
     ok($objBn->lt("\x{994}$t", "\x{982}"));
@@ -51,3 +50,5 @@ for my $h (0, 1) {
     ok($objBn->lt("\x{983}$t", "\x{981}"));
     ok($objBn->lt("\x{981}$t", "\x{995}"));
 }
+
+# 12
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bscy.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bscy.t
index ce3457f9812..8245e60ad34 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_bscy.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ca.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ca.t
index 80923ffe62a..0e756bf0a12 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ca.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ca.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..41\n"; }
+BEGIN { $| = 1; print "1..54\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -55,9 +55,9 @@ ok($objCa->eq("a\x{300}a", "aa\x{300}"));
 
 $objCa->change(level => 2);
 
-ok($objCa->lt("a\x{300}a", "aa\x{300}"));
-ok($objCa->gt("Ca\x{300}ca\x{302}", "ca\x{302}ca\x{300}"));
-ok($objCa->gt("ca\x{300}ca\x{302}", "Ca\x{302}ca\x{300}"));
+ok($objCa->gt("a\x{300}a", "aa\x{300}"));
+ok($objCa->lt("Ca\x{300}ca\x{302}", "ca\x{302}ca\x{300}"));
+ok($objCa->lt("ca\x{300}ca\x{302}", "Ca\x{302}ca\x{300}"));
 
 # 12
 
@@ -97,10 +97,29 @@ ok($objCa->lt("LL", "L${dot}L"));
 
 # 38
 
-$objCa->change(backwards => undef, level => 2);
+$objCa->change(upper_before_lower => 1);
 
-ok($objCa->gt("a\x{300}a", "aa\x{300}"));
-ok($objCa->lt("Ca\x{300}ca\x{302}", "ca\x{302}ca\x{300}"));
-ok($objCa->lt("ca\x{300}ca\x{302}", "Ca\x{302}ca\x{300}"));
+ok($objCa->gt("ch", "cH"));
+ok($objCa->gt("cH", "Ch"));
+ok($objCa->gt("Ch", "CH"));
+
+ok($objCa->gt("ll", "lL"));
+ok($objCa->gt("lL", "Ll"));
+ok($objCa->gt("Ll", "LL"));
+ok($objCa->lt("ll", "l${dot}l"));
+ok($objCa->lt("lL", "l${dot}l"));
+ok($objCa->lt("lL", "l${dot}L"));
+ok($objCa->lt("Ll", "l${dot}L"));
+ok($objCa->lt("Ll", "L${dot}l"));
+ok($objCa->lt("LL", "L${dot}l"));
+ok($objCa->lt("LL", "L${dot}L"));
+
+# 51
+
+$objCa->change(backwards => 2, level => 2);
+
+ok($objCa->lt("a\x{300}a", "aa\x{300}"));
+ok($objCa->gt("Ca\x{300}ca\x{302}", "ca\x{302}ca\x{300}"));
+ok($objCa->gt("ca\x{300}ca\x{302}", "Ca\x{302}ca\x{300}"));
 
-# 41
+# 54
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_cs.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_cs.t
index 4f309eeb30a..b5a7947cfda 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_cs.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_cs.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..34\n"; }
+BEGIN { $| = 1; print "1..42\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -41,17 +41,22 @@ ok($objCs->getlocale, 'cs');
 $objCs->change(level => 1);
 
 ok($objCs->lt("c", "c\x{30C}"));
+ok($objCs->lt("cz","c\x{30C}"));
 ok($objCs->gt("d", "c\x{30C}"));
 ok($objCs->lt("h", "ch"));
+ok($objCs->lt("hz","ch"));
 ok($objCs->gt("i", "ch"));
 ok($objCs->lt("r", "r\x{30C}"));
+ok($objCs->lt("rz","r\x{30C}"));
 ok($objCs->gt("s", "r\x{30C}"));
 ok($objCs->lt("s", "s\x{30C}"));
+ok($objCs->lt("sz","s\x{30C}"));
 ok($objCs->gt("t", "s\x{30C}"));
 ok($objCs->lt("z", "z\x{30C}"));
+ok($objCs->lt("zz","z\x{30C}"));
 ok($objCs->lt("z\x{30C}", "\x{292}")); # U+0292 EZH
 
-# 12
+# 17
 
 $objCs->change(level => 2);
 
@@ -59,11 +64,12 @@ ok($objCs->eq("c\x{30C}", "C\x{30C}"));
 ok($objCs->eq("r\x{30C}", "R\x{30C}"));
 ok($objCs->eq("s\x{30C}", "S\x{30C}"));
 ok($objCs->eq("z\x{30C}", "Z\x{30C}"));
+
 ok($objCs->eq("ch", "cH"));
 ok($objCs->eq("cH", "Ch"));
 ok($objCs->eq("Ch", "CH"));
 
-# 19
+# 24
 
 $objCs->change(level => 3);
 
@@ -71,11 +77,12 @@ ok($objCs->lt("c\x{30C}", "C\x{30C}"));
 ok($objCs->lt("r\x{30C}", "R\x{30C}"));
 ok($objCs->lt("s\x{30C}", "S\x{30C}"));
 ok($objCs->lt("z\x{30C}", "Z\x{30C}"));
+
 ok($objCs->lt("ch", "cH"));
 ok($objCs->lt("cH", "Ch"));
 ok($objCs->lt("Ch", "CH"));
 
-# 26
+# 31
 
 ok($objCs->eq("c\x{30C}", "\x{10D}"));
 ok($objCs->eq("C\x{30C}", "\x{10C}"));
@@ -86,4 +93,12 @@ ok($objCs->eq("S\x{30C}", "\x{160}"));
 ok($objCs->eq("z\x{30C}", "\x{17E}"));
 ok($objCs->eq("Z\x{30C}", "\x{17D}"));
 
-# 34
+# 39
+
+$objCs->change(upper_before_lower => 1);
+
+ok($objCs->gt("ch", "cH"));
+ok($objCs->gt("cH", "Ch"));
+ok($objCs->gt("Ch", "CH"));
+
+# 42
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_cyrl.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_cyrl.t
index d625d5dc3bb..deff690a7dd 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_cyrl.t
+++ b/gnu/usr.bin/perl/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
-
-ok($objNoSuppress->eq("\x{450}", "\x{435}")); # not contraction
-ok($objNoSuppress->eq("\x{400}", "\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{45D}", "\x{438}")); # not contraction
-ok($objNoSuppress->eq("\x{40D}", "\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{4EF}", "\x{443}")); # not contraction
-ok($objNoSuppress->eq("\x{4EE}", "\x{423}")); # not contraction
+
+# 4
+
+ok($objNoSuppress->eq("\x{4D1}", "\x{430}"));
+ok($objNoSuppress->eq("\x{4D0}", "\x{410}"));
+ok($objNoSuppress->eq("\x{4D3}", "\x{430}"));
+ok($objNoSuppress->eq("\x{4D2}", "\x{410}"));
+ok($objNoSuppress->eq("\x{4DB}", "\x{4D9}"));
+ok($objNoSuppress->eq("\x{4DA}", "\x{4D8}"));
+ok($objNoSuppress->eq("\x{453}", "\x{433}"));
+ok($objNoSuppress->eq("\x{403}", "\x{413}"));
+ok($objNoSuppress->eq("\x{450}", "\x{435}"));
+ok($objNoSuppress->eq("\x{400}", "\x{415}"));
+ok($objNoSuppress->eq("\x{4D7}", "\x{435}"));
+ok($objNoSuppress->eq("\x{4D6}", "\x{415}"));
+ok($objNoSuppress->eq("\x{451}", "\x{435}"));
+ok($objNoSuppress->eq("\x{401}", "\x{415}"));
+ok($objNoSuppress->eq("\x{4C2}", "\x{436}"));
+ok($objNoSuppress->eq("\x{4C1}", "\x{416}"));
+ok($objNoSuppress->eq("\x{4DD}", "\x{436}"));
+ok($objNoSuppress->eq("\x{4DC}", "\x{416}"));
+ok($objNoSuppress->eq("\x{4DF}", "\x{437}"));
+ok($objNoSuppress->eq("\x{4DE}", "\x{417}"));
+ok($objNoSuppress->eq("\x{45D}", "\x{438}"));
+ok($objNoSuppress->eq("\x{40D}", "\x{418}"));
+ok($objNoSuppress->eq("\x{4E5}", "\x{438}"));
+ok($objNoSuppress->eq("\x{4E4}", "\x{418}"));
+ok($objNoSuppress->eq("\x{4E3}", "\x{438}"));
+ok($objNoSuppress->eq("\x{4E2}", "\x{418}"));
+ok($objNoSuppress->eq("\x{457}", "\x{456}"));
+ok($objNoSuppress->eq("\x{407}", "\x{406}"));
+ok($objNoSuppress->eq("\x{45C}", "\x{43A}"));
+ok($objNoSuppress->eq("\x{40C}", "\x{41A}"));
+ok($objNoSuppress->eq("\x{4E7}", "\x{43E}"));
+ok($objNoSuppress->eq("\x{4E6}", "\x{41E}"));
+ok($objNoSuppress->eq("\x{4EB}", "\x{4E9}"));
+ok($objNoSuppress->eq("\x{4EA}", "\x{4E8}"));
+ok($objNoSuppress->eq("\x{45E}", "\x{443}"));
+ok($objNoSuppress->eq("\x{40E}", "\x{423}"));
+ok($objNoSuppress->eq("\x{4F1}", "\x{443}"));
+ok($objNoSuppress->eq("\x{4F0}", "\x{423}"));
+ok($objNoSuppress->eq("\x{4F3}", "\x{443}"));
+ok($objNoSuppress->eq("\x{4F2}", "\x{423}"));
+ok($objNoSuppress->eq("\x{4EF}", "\x{443}"));
+ok($objNoSuppress->eq("\x{4EE}", "\x{423}"));
+ok($objNoSuppress->eq("\x{4F5}", "\x{447}"));
+ok($objNoSuppress->eq("\x{4F4}", "\x{427}"));
+ok($objNoSuppress->eq("\x{4F9}", "\x{44B}"));
+ok($objNoSuppress->eq("\x{4F8}", "\x{42B}"));
+ok($objNoSuppress->eq("\x{4ED}", "\x{44D}"));
+ok($objNoSuppress->eq("\x{4EC}", "\x{42D}"));
+ok($objNoSuppress->eq("\x{477}", "\x{475}"));
+ok($objNoSuppress->eq("\x{476}", "\x{474}"));
 
 # 54
 
 $objNoSuppress->change(level => 2);
 
-ok($objNoSuppress->gt("\x{450}", "\x{435}")); # not contraction
-ok($objNoSuppress->gt("\x{400}", "\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{45D}", "\x{438}")); # not contraction
-ok($objNoSuppress->gt("\x{40D}", "\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{4EF}", "\x{443}")); # not contraction
-ok($objNoSuppress->gt("\x{4EE}", "\x{423}")); # not contraction
-
-# 66
+ok($objNoSuppress->gt("\x{4D1}", "\x{430}"));
+ok($objNoSuppress->gt("\x{4D0}", "\x{410}"));
+ok($objNoSuppress->gt("\x{4D3}", "\x{430}"));
+ok($objNoSuppress->gt("\x{4D2}", "\x{410}"));
+ok($objNoSuppress->gt("\x{4DB}", "\x{4D9}"));
+ok($objNoSuppress->gt("\x{4DA}", "\x{4D8}"));
+ok($objNoSuppress->gt("\x{453}", "\x{433}"));
+ok($objNoSuppress->gt("\x{403}", "\x{413}"));
+ok($objNoSuppress->gt("\x{450}", "\x{435}"));
+ok($objNoSuppress->gt("\x{400}", "\x{415}"));
+ok($objNoSuppress->gt("\x{4D7}", "\x{435}"));
+ok($objNoSuppress->gt("\x{4D6}", "\x{415}"));
+ok($objNoSuppress->gt("\x{451}", "\x{435}"));
+ok($objNoSuppress->gt("\x{401}", "\x{415}"));
+ok($objNoSuppress->gt("\x{4C2}", "\x{436}"));
+ok($objNoSuppress->gt("\x{4C1}", "\x{416}"));
+ok($objNoSuppress->gt("\x{4DD}", "\x{436}"));
+ok($objNoSuppress->gt("\x{4DC}", "\x{416}"));
+ok($objNoSuppress->gt("\x{4DF}", "\x{437}"));
+ok($objNoSuppress->gt("\x{4DE}", "\x{417}"));
+ok($objNoSuppress->gt("\x{45D}", "\x{438}"));
+ok($objNoSuppress->gt("\x{40D}", "\x{418}"));
+ok($objNoSuppress->gt("\x{4E5}", "\x{438}"));
+ok($objNoSuppress->gt("\x{4E4}", "\x{418}"));
+ok($objNoSuppress->gt("\x{4E3}", "\x{438}"));
+ok($objNoSuppress->gt("\x{4E2}", "\x{418}"));
+ok($objNoSuppress->gt("\x{457}", "\x{456}"));
+ok($objNoSuppress->gt("\x{407}", "\x{406}"));
+ok($objNoSuppress->gt("\x{45C}", "\x{43A}"));
+ok($objNoSuppress->gt("\x{40C}", "\x{41A}"));
+ok($objNoSuppress->gt("\x{4E7}", "\x{43E}"));
+ok($objNoSuppress->gt("\x{4E6}", "\x{41E}"));
+ok($objNoSuppress->gt("\x{4EB}", "\x{4E9}"));
+ok($objNoSuppress->gt("\x{4EA}", "\x{4E8}"));
+ok($objNoSuppress->gt("\x{45E}", "\x{443}"));
+ok($objNoSuppress->gt("\x{40E}", "\x{423}"));
+ok($objNoSuppress->gt("\x{4F1}", "\x{443}"));
+ok($objNoSuppress->gt("\x{4F0}", "\x{423}"));
+ok($objNoSuppress->gt("\x{4F3}", "\x{443}"));
+ok($objNoSuppress->gt("\x{4F2}", "\x{423}"));
+ok($objNoSuppress->gt("\x{4EF}", "\x{443}"));
+ok($objNoSuppress->gt("\x{4EE}", "\x{423}"));
+ok($objNoSuppress->gt("\x{4F5}", "\x{447}"));
+ok($objNoSuppress->gt("\x{4F4}", "\x{427}"));
+ok($objNoSuppress->gt("\x{4F9}", "\x{44B}"));
+ok($objNoSuppress->gt("\x{4F8}", "\x{42B}"));
+ok($objNoSuppress->gt("\x{4ED}", "\x{44D}"));
+ok($objNoSuppress->gt("\x{4EC}", "\x{42D}"));
+ok($objNoSuppress->gt("\x{477}", "\x{475}"));
+ok($objNoSuppress->gt("\x{476}", "\x{474}"));
+
+# 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{450}", "\x{435}$i\x{300}")); # not contraction
-  ok($objNoSuppress->eq("\x{400}", "\x{415}$i\x{300}")); # 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{45D}", "\x{438}$i\x{300}")); # not contraction
-  ok($objNoSuppress->eq("\x{40D}", "\x{418}$i\x{300}")); # 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{4EF}", "\x{443}$i\x{304}")); # not contraction
-  ok($objNoSuppress->eq("\x{4EE}", "\x{423}$i\x{304}")); # not contraction
+  ok($objNoSuppress->eq("\x{4D1}", "\x{430}$i\x{306}"));
+  ok($objNoSuppress->eq("\x{4D0}", "\x{410}$i\x{306}"));
+  ok($objNoSuppress->eq("\x{4D3}", "\x{430}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4D2}", "\x{410}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4DB}", "\x{4D9}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4DA}", "\x{4D8}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{453}", "\x{433}$i\x{301}"));
+  ok($objNoSuppress->eq("\x{403}", "\x{413}$i\x{301}"));
+  ok($objNoSuppress->eq("\x{450}", "\x{435}$i\x{300}"));
+  ok($objNoSuppress->eq("\x{400}", "\x{415}$i\x{300}"));
+  ok($objNoSuppress->eq("\x{4D7}", "\x{435}$i\x{306}"));
+  ok($objNoSuppress->eq("\x{4D6}", "\x{415}$i\x{306}"));
+  ok($objNoSuppress->eq("\x{451}", "\x{435}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{401}", "\x{415}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4C2}", "\x{436}$i\x{306}"));
+  ok($objNoSuppress->eq("\x{4C1}", "\x{416}$i\x{306}"));
+  ok($objNoSuppress->eq("\x{4DD}", "\x{436}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4DC}", "\x{416}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4DF}", "\x{437}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4DE}", "\x{417}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{45D}", "\x{438}$i\x{300}"));
+  ok($objNoSuppress->eq("\x{40D}", "\x{418}$i\x{300}"));
+  ok($objNoSuppress->eq("\x{4E5}", "\x{438}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4E4}", "\x{418}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4E3}", "\x{438}$i\x{304}"));
+  ok($objNoSuppress->eq("\x{4E2}", "\x{418}$i\x{304}"));
+  ok($objNoSuppress->eq("\x{457}", "\x{456}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{407}", "\x{406}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{45C}", "\x{43A}$i\x{301}"));
+  ok($objNoSuppress->eq("\x{40C}", "\x{41A}$i\x{301}"));
+  ok($objNoSuppress->eq("\x{4E7}", "\x{43E}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4E6}", "\x{41E}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4EB}", "\x{4E9}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4EA}", "\x{4E8}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{45E}", "\x{443}$i\x{306}"));
+  ok($objNoSuppress->eq("\x{40E}", "\x{423}$i\x{306}"));
+  ok($objNoSuppress->eq("\x{4F1}", "\x{443}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4F0}", "\x{423}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4F3}", "\x{443}$i\x{30B}"));
+  ok($objNoSuppress->eq("\x{4F2}", "\x{423}$i\x{30B}"));
+  ok($objNoSuppress->eq("\x{4EF}", "\x{443}$i\x{304}"));
+  ok($objNoSuppress->eq("\x{4EE}", "\x{423}$i\x{304}"));
+  ok($objNoSuppress->eq("\x{4F5}", "\x{447}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4F4}", "\x{427}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4F9}", "\x{44B}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4F8}", "\x{42B}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4ED}", "\x{44D}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{4EC}", "\x{42D}$i\x{308}"));
+  ok($objNoSuppress->eq("\x{477}", "\x{475}$i\x{30F}"));
+  ok($objNoSuppress->eq("\x{476}", "\x{474}$i\x{30F}"));
 }
 
-# 130
+# 208
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_de.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_de.t
index a1f191ceeac..b6d5737e0e9 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_de.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_de.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..32\n"; }
+BEGIN { $| = 1; print "1..50\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -74,11 +74,17 @@ ok($objDe->gt("O\x{308}", "O"));
 ok($objDe->gt("u\x{308}", "u"));
 ok($objDe->gt("U\x{308}", "U"));
 
+# 20
+
 ok($objDe->eq("a\x{308}", "A\x{308}"));
 ok($objDe->eq("o\x{308}", "O\x{308}"));
 ok($objDe->eq("u\x{308}", "U\x{308}"));
 
-# 23
+ok($objDe->eq($auml, $Auml));
+ok($objDe->eq($ouml, $Ouml));
+ok($objDe->eq($uuml, $Uuml));
+
+# 26
 
 $objDe->change(level => 3);
 
@@ -86,6 +92,12 @@ ok($objDe->lt("a\x{308}", "A\x{308}"));
 ok($objDe->lt("o\x{308}", "O\x{308}"));
 ok($objDe->lt("u\x{308}", "U\x{308}"));
 
+ok($objDe->lt($auml, $Auml));
+ok($objDe->lt($ouml, $Ouml));
+ok($objDe->lt($uuml, $Uuml));
+
+# 32
+
 ok($objDe->eq("a\x{308}", $auml));
 ok($objDe->eq("A\x{308}", $Auml));
 ok($objDe->eq("o\x{308}", $ouml));
@@ -93,4 +105,19 @@ ok($objDe->eq("O\x{308}", $Ouml));
 ok($objDe->eq("u\x{308}", $uuml));
 ok($objDe->eq("U\x{308}", $Uuml));
 
-# 32
+# 38
+
+ok($objDe->eq("a\x{308}\x{304}", "\x{1DF}"));
+ok($objDe->eq("A\x{308}\x{304}", "\x{1DE}"));
+ok($objDe->eq("o\x{308}\x{304}", "\x{22B}"));
+ok($objDe->eq("O\x{308}\x{304}", "\x{22A}"));
+ok($objDe->eq("u\x{308}\x{300}", "\x{1DC}"));
+ok($objDe->eq("U\x{308}\x{300}", "\x{1DB}"));
+ok($objDe->eq("u\x{308}\x{301}", "\x{1D8}"));
+ok($objDe->eq("U\x{308}\x{301}", "\x{1D7}"));
+ok($objDe->eq("u\x{308}\x{304}", "\x{1D6}"));
+ok($objDe->eq("U\x{308}\x{304}", "\x{1D5}"));
+ok($objDe->eq("u\x{308}\x{30C}", "\x{1DA}"));
+ok($objDe->eq("U\x{308}\x{30C}", "\x{1D9}"));
+
+# 50
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_deat.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_deat.t
new file mode 100644
index 00000000000..9c20f839738
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_deat.t
@@ -0,0 +1,131 @@
+
+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..46\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 $auml = pack 'U', 0xE4;
+my $Auml = pack 'U', 0xC4;
+my $ouml = pack 'U', 0xF6;
+my $Ouml = pack 'U', 0xD6;
+my $uuml = pack 'U', 0xFC;
+my $Uuml = pack 'U', 0xDC;
+my $eses = pack 'U', 0xDF;
+my $Eses = pack 'U', 0x1E9E;
+
+my $objDeAtPhone = Unicode::Collate::Locale->
+    new(locale => 'DE_AT_phonebook', normalization => undef);
+
+ok($objDeAtPhone->getlocale, 'de_AT_phonebook');
+
+$objDeAtPhone->change(level => 1);
+
+ok($objDeAtPhone->gt($auml, "az"));
+ok($objDeAtPhone->lt($auml, "b"));
+ok($objDeAtPhone->gt($ouml, "oz"));
+ok($objDeAtPhone->lt($ouml, "p"));
+ok($objDeAtPhone->gt($uuml, "uz"));
+ok($objDeAtPhone->lt($uuml, "v"));
+ok($objDeAtPhone->gt($eses, "ssz"));
+ok($objDeAtPhone->lt($eses, "st"));
+
+# 10
+
+$objDeAtPhone->change(level => 2);
+
+ok($objDeAtPhone->eq("a\x{308}", "A\x{308}"));
+ok($objDeAtPhone->eq("o\x{308}", "O\x{308}"));
+ok($objDeAtPhone->eq("u\x{308}", "U\x{308}"));
+
+ok($objDeAtPhone->eq($auml, $Auml));
+ok($objDeAtPhone->eq($ouml, $Ouml));
+ok($objDeAtPhone->eq($uuml, $Uuml));
+ok($objDeAtPhone->eq($eses, $Eses));
+
+# 17
+
+$objDeAtPhone->change(level => 3);
+
+ok($objDeAtPhone->lt("a\x{308}", "A\x{308}"));
+ok($objDeAtPhone->lt("o\x{308}", "O\x{308}"));
+ok($objDeAtPhone->lt("u\x{308}", "U\x{308}"));
+
+ok($objDeAtPhone->lt($auml, $Auml));
+ok($objDeAtPhone->lt($ouml, $Ouml));
+ok($objDeAtPhone->lt($uuml, $Uuml));
+ok($objDeAtPhone->lt($eses, $Eses));
+
+# 24
+
+ok($objDeAtPhone->eq("a\x{308}", $auml));
+ok($objDeAtPhone->eq("A\x{308}", $Auml));
+ok($objDeAtPhone->eq("o\x{308}", $ouml));
+ok($objDeAtPhone->eq("O\x{308}", $Ouml));
+ok($objDeAtPhone->eq("u\x{308}", $uuml));
+ok($objDeAtPhone->eq("U\x{308}", $Uuml));
+
+# 30
+
+ok($objDeAtPhone->eq("a\x{308}\x{304}", "\x{1DF}"));
+ok($objDeAtPhone->eq("A\x{308}\x{304}", "\x{1DE}"));
+ok($objDeAtPhone->eq("o\x{308}\x{304}", "\x{22B}"));
+ok($objDeAtPhone->eq("O\x{308}\x{304}", "\x{22A}"));
+ok($objDeAtPhone->eq("u\x{308}\x{300}", "\x{1DC}"));
+ok($objDeAtPhone->eq("U\x{308}\x{300}", "\x{1DB}"));
+ok($objDeAtPhone->eq("u\x{308}\x{301}", "\x{1D8}"));
+ok($objDeAtPhone->eq("U\x{308}\x{301}", "\x{1D7}"));
+ok($objDeAtPhone->eq("u\x{308}\x{304}", "\x{1D6}"));
+ok($objDeAtPhone->eq("U\x{308}\x{304}", "\x{1D5}"));
+ok($objDeAtPhone->eq("u\x{308}\x{30C}", "\x{1DA}"));
+ok($objDeAtPhone->eq("U\x{308}\x{30C}", "\x{1D9}"));
+
+# 42
+
+{
+  my $objDeLatnAtPhone = Unicode::Collate::Locale->
+    new(locale => 'DE_Latn_AT_phonebook', normalization => undef);
+  ok($objDeLatnAtPhone->getlocale, 'de_AT_phonebook');
+  $objDeLatnAtPhone->change(level => 1);
+  ok($objDeLatnAtPhone->gt($auml, 'az'));
+}
+
+# 44
+
+{
+  my $objDeAt = Unicode::Collate::Locale->
+    new(locale => 'DE_AT', normalization => undef);
+  ok($objDeAt->getlocale, 'default');
+  $objDeAt->change(level => 1);
+  ok($objDeAt->eq($auml, 'a'));
+}
+
+# 46
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_deph.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_deph.t
index 4a11df4153b..26c48641dc5 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_deph.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_deph.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..42\n"; }
+BEGIN { $| = 1; print "1..52\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -65,11 +65,17 @@ ok($objDePhone->gt("O\x{308}", "OE"));
 ok($objDePhone->gt("u\x{308}", "ue"));
 ok($objDePhone->gt("U\x{308}", "UE"));
 
+# 14
+
 ok($objDePhone->eq("a\x{308}", "A\x{308}"));
 ok($objDePhone->eq("o\x{308}", "O\x{308}"));
 ok($objDePhone->eq("u\x{308}", "U\x{308}"));
 
-# 17
+ok($objDePhone->eq($auml, $Auml));
+ok($objDePhone->eq($ouml, $Ouml));
+ok($objDePhone->eq($uuml, $Uuml));
+
+# 20
 
 $objDePhone->change(level => 3);
 
@@ -77,6 +83,12 @@ ok($objDePhone->lt("a\x{308}", "A\x{308}"));
 ok($objDePhone->lt("o\x{308}", "O\x{308}"));
 ok($objDePhone->lt("u\x{308}", "U\x{308}"));
 
+ok($objDePhone->lt($auml, $Auml));
+ok($objDePhone->lt($ouml, $Ouml));
+ok($objDePhone->lt($uuml, $Uuml));
+
+# 26
+
 ok($objDePhone->eq("a\x{308}", $auml));
 ok($objDePhone->eq("A\x{308}", $Auml));
 ok($objDePhone->eq("o\x{308}", $ouml));
@@ -84,7 +96,7 @@ ok($objDePhone->eq("O\x{308}", $Ouml));
 ok($objDePhone->eq("u\x{308}", $uuml));
 ok($objDePhone->eq("U\x{308}", $Uuml));
 
-# 26
+# 32
 
 ok($objDePhone->eq("a\x{308}\x{304}", "\x{1DF}"));
 ok($objDePhone->eq("A\x{308}\x{304}", "\x{1DE}"));
@@ -99,26 +111,44 @@ ok($objDePhone->eq("U\x{308}\x{304}", "\x{1D5}"));
 ok($objDePhone->eq("u\x{308}\x{30C}", "\x{1DA}"));
 ok($objDePhone->eq("U\x{308}\x{30C}", "\x{1D9}"));
 
-# 38
+# 44
 
-my $objDePhoneBook = Unicode::Collate::Locale->
+{
+  my $objDePhoneBook = Unicode::Collate::Locale->
     new(locale => 'de__phonebook', normalization => undef);
+  ok($objDePhoneBook->getlocale, 'de__phonebook');
+  $objDePhoneBook->change(level => 1);
+  ok($objDePhoneBook->eq("a\x{308}", "ae"));
+}
 
-ok($objDePhoneBook->getlocale, 'de__phonebook');
-
-$objDePhoneBook->change(level => 1);
-
-ok($objDePhoneBook->eq("a\x{308}", "ae"));
-
-# 40
+# 46
 
-my $objDePhonebk = Unicode::Collate::Locale->
+{
+  my $objDePhonebk = Unicode::Collate::Locale->
     new(locale => 'de-phonebk', normalization => undef);
+  ok($objDePhonebk->getlocale, 'de__phonebook');
+  $objDePhonebk->change(level => 1);
+  ok($objDePhonebk->eq("a\x{308}", "ae"));
+}
 
-ok($objDePhonebk->getlocale, 'de__phonebook');
+# 48
 
-$objDePhonebk->change(level => 1);
+{
+  my $objDeDePhone = Unicode::Collate::Locale->
+    new(locale => 'de_DE_phone', normalization => undef);
+  ok($objDeDePhone->getlocale, 'de__phonebook');
+  $objDeDePhone->change(level => 1);
+  ok($objDeDePhone->eq("a\x{308}", "ae"));
+}
+
+# 50
 
-ok($objDePhonebk->eq("a\x{308}", "ae"));
+{
+  my $objDeChPhonebk = Unicode::Collate::Locale->
+    new(locale => 'de_CH_phonebk', normalization => undef);
+  ok($objDeChPhonebk->getlocale, 'de__phonebook');
+  $objDeChPhonebk->change(level => 1);
+  ok($objDeChPhonebk->eq("a\x{308}", "ae"));
+}
 
-# 42
+# 52
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_dsb.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_dsb.t
new file mode 100644
index 00000000000..25cee289b79
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_dsb.t
@@ -0,0 +1,137 @@
+
+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..87\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 $objDsb = Unicode::Collate::Locale->
+    new(locale => 'DSB', normalization => undef);
+
+ok($objDsb->getlocale, 'dsb');
+
+$objDsb->change(level => 1);
+
+my @prim = (
+    "cz", "c\x{30C}", "c\x{301}", "d", # 5
+    "ez", "e\x{30C}", "f",             # 8
+    "hz", "ch", "i",                   # 11
+    "kz", "l\x{335}", "l",             # 14
+    "nz", "n\x{301}", "o",             # 17
+    "rz", "r\x{301}", "s",             # 20
+    "sz", "s\x{30C}", "s\x{301}", "t", # 24
+    "zz", "z\x{30C}", "z\x{301}", "\x{292}" # EZH
+);
+
+for (my $i = 1; $i < @prim; $i++) {
+    ok($objDsb->lt($prim[$i-1], $prim[$i]));
+}
+
+# 28
+
+$objDsb->change(level => 2);
+
+ok($objDsb->eq("c\x{30C}", "C\x{30C}"));
+ok($objDsb->eq("c\x{301}", "C\x{301}"));
+ok($objDsb->eq("e\x{30C}", "E\x{30C}"));
+ok($objDsb->eq("l\x{335}", "L\x{335}"));
+ok($objDsb->eq("n\x{301}", "N\x{301}"));
+ok($objDsb->eq("r\x{301}", "R\x{301}"));
+ok($objDsb->eq("s\x{30C}", "S\x{30C}"));
+ok($objDsb->eq("s\x{301}", "S\x{301}"));
+ok($objDsb->eq("z\x{30C}", "Z\x{30C}"));
+ok($objDsb->eq("z\x{301}", "Z\x{301}"));
+
+ok($objDsb->eq("ch", "cH"));
+ok($objDsb->eq("cH", "Ch"));
+ok($objDsb->eq("Ch", "CH"));
+
+# 41
+
+$objDsb->change(level => 3);
+
+ok($objDsb->lt("c\x{30C}", "C\x{30C}"));
+ok($objDsb->lt("c\x{301}", "C\x{301}"));
+ok($objDsb->lt("e\x{30C}", "E\x{30C}"));
+ok($objDsb->lt("l\x{335}", "L\x{335}"));
+ok($objDsb->lt("n\x{301}", "N\x{301}"));
+ok($objDsb->lt("r\x{301}", "R\x{301}"));
+ok($objDsb->lt("s\x{30C}", "S\x{30C}"));
+ok($objDsb->lt("s\x{301}", "S\x{301}"));
+ok($objDsb->lt("z\x{30C}", "Z\x{30C}"));
+ok($objDsb->lt("z\x{301}", "Z\x{301}"));
+
+ok($objDsb->lt("ch", "cH"));
+ok($objDsb->lt("cH", "Ch"));
+ok($objDsb->lt("Ch", "CH"));
+
+# 54
+
+ok($objDsb->eq("c\x{30C}", "\x{10D}"));
+ok($objDsb->eq("C\x{30C}", "\x{10C}"));
+ok($objDsb->eq("c\x{301}", "\x{107}"));
+ok($objDsb->eq("c\x{341}", "\x{107}"));
+ok($objDsb->eq("C\x{301}", "\x{106}"));
+ok($objDsb->eq("C\x{341}", "\x{106}"));
+ok($objDsb->eq("e\x{30C}", "\x{11B}"));
+ok($objDsb->eq("E\x{30C}", "\x{11A}"));
+ok($objDsb->eq("l\x{335}", "\x{142}"));
+ok($objDsb->eq("L\x{335}", "\x{141}"));
+ok($objDsb->eq("n\x{301}", "\x{144}"));
+ok($objDsb->eq("n\x{341}", "\x{144}"));
+ok($objDsb->eq("N\x{301}", "\x{143}"));
+ok($objDsb->eq("N\x{341}", "\x{143}"));
+ok($objDsb->eq("r\x{301}", "\x{155}"));
+ok($objDsb->eq("r\x{341}", "\x{155}"));
+ok($objDsb->eq("R\x{301}", "\x{154}"));
+ok($objDsb->eq("R\x{341}", "\x{154}"));
+ok($objDsb->eq("s\x{30C}", "\x{161}"));
+ok($objDsb->eq("S\x{30C}", "\x{160}"));
+ok($objDsb->eq("s\x{301}", "\x{15B}"));
+ok($objDsb->eq("s\x{341}", "\x{15B}"));
+ok($objDsb->eq("S\x{301}", "\x{15A}"));
+ok($objDsb->eq("S\x{341}", "\x{15A}"));
+ok($objDsb->eq("z\x{30C}", "\x{17E}"));
+ok($objDsb->eq("Z\x{30C}", "\x{17D}"));
+ok($objDsb->eq("z\x{301}", "\x{17A}"));
+ok($objDsb->eq("z\x{341}", "\x{17A}"));
+ok($objDsb->eq("Z\x{301}", "\x{179}"));
+ok($objDsb->eq("Z\x{341}", "\x{179}"));
+
+# 84
+
+$objDsb->change(upper_before_lower => 1);
+
+ok($objDsb->gt("ch", "cH"));
+ok($objDsb->gt("cH", "Ch"));
+ok($objDsb->gt("Ch", "CH"));
+
+# 87
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ee.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ee.t
index 475e194cea9..15eb67af5dc 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ee.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ee.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..120\n"; }
+BEGIN { $| = 1; print "1..124\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -42,39 +42,21 @@ ok($objEe->getlocale, 'ee');
 
 $objEe->change(level => 1);
 
-ok($objEe->lt("d", "d\x{292}"));
-ok($objEe->gt("dz","d\x{292}"));
-ok($objEe->lt("dz","\x{256}"));
-ok($objEe->gt("e", "\x{256}"));
-ok($objEe->lt("e", "\x{25B}"));
-ok($objEe->gt("f", "\x{25B}"));
-ok($objEe->lt("f", "\x{192}"));
-ok($objEe->gt("g", "\x{192}"));
-
-ok($objEe->lt("gz","gb"));
-ok($objEe->lt("gb","\x{263}"));
-ok($objEe->gt("h", "\x{263}"));
-ok($objEe->lt("h", "hz"));
-ok($objEe->lt("hz","x"));
-ok($objEe->lt("x", "i"));
-
-# 16
-
-ok($objEe->lt("kz","kp"));
-ok($objEe->lt("kp","l"));
-ok($objEe->lt("nz","ny"));
-ok($objEe->lt("ny","\x{14B}"));
-ok($objEe->gt("o", "\x{14B}"));
-ok($objEe->lt("o", "\x{254}"));
-ok($objEe->gt("p", "\x{254}"));
-
-ok($objEe->lt("tz","ts"));
-ok($objEe->lt("ts","u"));
-ok($objEe->lt("u", "v"));
-ok($objEe->lt("v", "\x{28B}"));
-ok($objEe->gt("w", "\x{28B}"));
-
-# 28
+my @prim = (
+    "d", "d\x{292}", "dz", "\x{256}", # 5
+    "e",  "\x{25B}", "f",  "\x{192}", # 9
+    "g", "gz", "gb", "\x{263}", "h",  # 14
+    "hz", "x", "i", "kz", "kp", "l",  # 20
+    "nz", "ny", "\x{14B}", "o",       # 24
+    "\x{254}", "p", "tz", "ts", "u",  # 29
+    "v", "\x{28B}", "w",
+);
+
+for (my $i = 1; $i < @prim; $i++) {
+    ok($objEe->lt($prim[$i-1], $prim[$i]));
+}
+
+# 32
 
 ok($objEe->eq("\x{302}",  "\x{30C}"));
 ok($objEe->eq("a\x{302}", "a\x{30C}"));
@@ -90,7 +72,7 @@ ok($objEe->eq("U\x{302}", "U\x{30C}"));
 ok($objEe->eq("y\x{302}", "y\x{30C}"));
 ok($objEe->eq("Y\x{302}", "Y\x{30C}"));
 
-# 41
+# 45
 
 $objEe->change(level => 2);
 
@@ -108,7 +90,7 @@ ok($objEe->gt("U\x{302}", "U\x{30C}"));
 ok($objEe->gt("y\x{302}", "y\x{30C}"));
 ok($objEe->gt("Y\x{302}", "Y\x{30C}"));
 
-# 54
+# 58
 
 ok($objEe->eq("dz", "Dz"));
 ok($objEe->eq("Dz", "DZ"));
@@ -129,7 +111,7 @@ ok($objEe->eq("ts", "Ts"));
 ok($objEe->eq("Ts", "TS"));
 ok($objEe->eq("\x{28B}", "\x{1B2}"));
 
-# 72
+# 76
 
 $objEe->change(level => 3);
 
@@ -152,7 +134,7 @@ ok($objEe->lt("ts", "Ts"));
 ok($objEe->lt("Ts", "TS"));
 ok($objEe->lt("\x{28B}", "\x{1B2}"));
 
-# 90
+# 94
 
 ok($objEe->eq("a\x{302}", pack('U', 0xE2)));
 ok($objEe->eq("A\x{302}", pack('U', 0xC2)));
@@ -167,7 +149,7 @@ ok($objEe->eq("U\x{302}", pack('U', 0xDB)));
 ok($objEe->eq("y\x{302}", "\x{177}"));
 ok($objEe->eq("Y\x{302}", "\x{176}"));
 
-# 102
+# 106
 
 $objEe->change(upper_before_lower => 1);
 
@@ -190,4 +172,4 @@ ok($objEe->gt("ts", "Ts"));
 ok($objEe->gt("Ts", "TS"));
 ok($objEe->gt("\x{28B}", "\x{1B2}"));
 
-# 120
+# 124
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_eo.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_eo.t
index 3ab88907ed4..da87515f538 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_eo.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_eo.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..38\n"; }
+BEGIN { $| = 1; print "1..44\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -41,19 +41,25 @@ ok($objEo->getlocale, 'eo');
 $objEo->change(level => 1);
 
 ok($objEo->lt("c", "c\x{302}"));
+ok($objEo->lt("cz","c\x{302}"));
 ok($objEo->gt("d", "c\x{302}"));
 ok($objEo->lt("g", "g\x{302}"));
+ok($objEo->lt("gz","g\x{302}"));
 ok($objEo->gt("h", "g\x{302}"));
 ok($objEo->lt("h", "h\x{302}"));
+ok($objEo->lt("hz","h\x{302}"));
 ok($objEo->gt("i", "h\x{302}"));
 ok($objEo->lt("j", "j\x{302}"));
+ok($objEo->lt("jz","j\x{302}"));
 ok($objEo->gt("k", "j\x{302}"));
 ok($objEo->lt("s", "s\x{302}"));
+ok($objEo->lt("sz","s\x{302}"));
 ok($objEo->gt("t", "s\x{302}"));
 ok($objEo->lt("u", "u\x{306}"));
+ok($objEo->lt("uz","u\x{306}"));
 ok($objEo->gt("v", "u\x{306}"));
 
-# 14
+# 20
 
 $objEo->change(level => 2);
 
@@ -64,7 +70,7 @@ ok($objEo->eq("j\x{302}", "J\x{302}"));
 ok($objEo->eq("s\x{302}", "S\x{302}"));
 ok($objEo->eq("u\x{306}", "U\x{306}"));
 
-# 20
+# 26
 
 $objEo->change(level => 3);
 
@@ -75,7 +81,7 @@ ok($objEo->lt("j\x{302}", "J\x{302}"));
 ok($objEo->lt("s\x{302}", "S\x{302}"));
 ok($objEo->lt("u\x{306}", "U\x{306}"));
 
-# 26
+# 32
 
 ok($objEo->eq("c\x{302}", "\x{109}"));
 ok($objEo->eq("C\x{302}", "\x{108}"));
@@ -90,4 +96,4 @@ ok($objEo->eq("S\x{302}", "\x{15C}"));
 ok($objEo->eq("u\x{306}", "\x{16D}"));
 ok($objEo->eq("U\x{306}", "\x{16C}"));
 
-# 38
+# 44
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_et.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_et.t
index 2c0e60bda86..8713e6fe1c0 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_et.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_et.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..61\n"; }
+BEGIN { $| = 1; print "1..60\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -44,7 +44,7 @@ ok($objEt->lt("s", "s\x{30C}"));
 ok($objEt->gt("z", "s\x{30C}"));
 ok($objEt->lt("z", "z\x{30C}"));
 ok($objEt->gt("t", "z\x{30C}"));
-ok($objEt->eq("v", "w"));
+ok($objEt->lt("v", "w")); # no tailoring
 ok($objEt->lt("w", "o\x{303}"));
 ok($objEt->lt("o\x{303}", "a\x{308}"));
 ok($objEt->lt("a\x{308}", "o\x{308}"));
@@ -55,7 +55,6 @@ ok($objEt->lt("u\x{308}", "x"));
 
 $objEt->change(level => 2);
 
-ok($objEt->lt("v", "w"));
 ok($objEt->eq("s\x{30C}", "S\x{30C}"));
 ok($objEt->eq("z", "Z"));
 ok($objEt->eq("z\x{30C}", "Z\x{30C}"));
@@ -65,7 +64,7 @@ ok($objEt->eq("a\x{308}", "A\x{308}"));
 ok($objEt->eq("o\x{308}", "O\x{308}"));
 ok($objEt->eq("u\x{308}", "U\x{308}"));
 
-# 21
+# 20
 
 $objEt->change(level => 3);
 
@@ -78,7 +77,7 @@ ok($objEt->lt("a\x{308}", "A\x{308}"));
 ok($objEt->lt("o\x{308}", "O\x{308}"));
 ok($objEt->lt("u\x{308}", "U\x{308}"));
 
-# 29
+# 28
 
 ok($objEt->eq("s\x{30C}", "\x{161}"));
 ok($objEt->eq("S\x{30C}", "\x{160}"));
@@ -93,16 +92,16 @@ ok($objEt->eq("O\x{308}", pack('U', 0xD6)));
 ok($objEt->eq("u\x{308}", pack('U', 0xFC)));
 ok($objEt->eq("U\x{308}", pack('U', 0xDC)));
 
-# 41
+# 40
 
-ok($objEt->eq("o\x{303}\x{301}","\x{1E4D}"));
-ok($objEt->eq("O\x{303}\x{301}","\x{1E4C}"));
+ok($objEt->eq("o\x{303}\x{301}", "\x{1E4D}"));
+ok($objEt->eq("O\x{303}\x{301}", "\x{1E4C}"));
 ok($objEt->eq("o\x{303}\x{304}", "\x{22D}"));
 ok($objEt->eq("O\x{303}\x{304}", "\x{22C}"));
-ok($objEt->eq("o\x{303}\x{308}","\x{1E4F}"));
-ok($objEt->eq("O\x{303}\x{308}","\x{1E4E}"));
-ok($objEt->eq("o\x{303}\x{31B}","\x{1EE1}"));
-ok($objEt->eq("O\x{303}\x{31B}","\x{1EE0}"));
+ok($objEt->eq("o\x{303}\x{308}", "\x{1E4F}"));
+ok($objEt->eq("O\x{303}\x{308}", "\x{1E4E}"));
+ok($objEt->eq("o\x{303}\x{31B}", "\x{1EE1}"));
+ok($objEt->eq("O\x{303}\x{31B}", "\x{1EE0}"));
 ok($objEt->eq("a\x{308}\x{304}", "\x{1DF}"));
 ok($objEt->eq("A\x{308}\x{304}", "\x{1DE}"));
 ok($objEt->eq("o\x{308}\x{304}", "\x{22B}"));
@@ -116,4 +115,4 @@ ok($objEt->eq("U\x{308}\x{304}", "\x{1D5}"));
 ok($objEt->eq("u\x{308}\x{30C}", "\x{1DA}"));
 ok($objEt->eq("U\x{308}\x{30C}", "\x{1D9}"));
 
-# 61
+# 60
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_fil.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_fil.t
index 77f0eacc968..741e26016b3 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_fil.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_fil.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..14\n"; }
+BEGIN { $| = 1; print "1..19\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -42,10 +42,12 @@ $objFil->change(level => 1);
 
 ok($objFil->lt("n", "n\x{303}"));
 ok($objFil->lt("nz","n\x{303}"));
-ok($objFil->lt("n\x{303}", "ng"));
+ok($objFil->gt("ng","n\x{303}"));
+ok($objFil->gt("ng","n\x{303}z"));
 ok($objFil->gt("o", "ng"));
+ok($objFil->gt("o", "ngz"));
 
-# 6
+# 8
 
 $objFil->change(level => 2);
 
@@ -53,7 +55,7 @@ ok($objFil->eq("ng", "Ng"));
 ok($objFil->eq("Ng", "NG"));
 ok($objFil->eq("n\x{303}", "N\x{303}"));
 
-# 9
+# 11
 
 $objFil->change(level => 3);
 
@@ -63,4 +65,12 @@ ok($objFil->lt("n\x{303}", "N\x{303}"));
 ok($objFil->eq("n\x{303}", pack('U', 0xF1)));
 ok($objFil->eq("N\x{303}", pack('U', 0xD1)));
 
-# 14
+# 16
+
+$objFil->change(upper_before_lower => 1);
+
+ok($objFil->gt("ng", "Ng"));
+ok($objFil->gt("Ng", "NG"));
+ok($objFil->gt("n\x{303}", "N\x{303}"));
+
+# 19
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_frca.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_frca.t
new file mode 100644
index 00000000000..0bcf0c05873
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_frca.t
@@ -0,0 +1,53 @@
+
+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..8\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 $objFrCa = Unicode::Collate::Locale->
+    new(locale => 'FR-CA', normalization => undef);
+
+ok($objFrCa->getlocale, 'fr_CA');
+
+$objFrCa->change(level => 2);
+
+ok($objFrCa->lt("a\x{300}a", "aa\x{300}"));
+ok($objFrCa->gt("Ca\x{300}ca\x{302}", "ca\x{302}ca\x{300}"));
+ok($objFrCa->gt("ca\x{300}ca\x{302}", "Ca\x{302}ca\x{300}"));
+
+$objFrCa->change(backwards => undef);
+
+ok($objFrCa->gt("a\x{300}a", "aa\x{300}"));
+ok($objFrCa->lt("Ca\x{300}ca\x{302}", "ca\x{302}ca\x{300}"));
+ok($objFrCa->lt("ca\x{300}ca\x{302}", "Ca\x{302}ca\x{300}"));
+
+# 8
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_gu.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_gu.t
index f9c4b216256..5457999855d 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_gu.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_gu.t
@@ -50,8 +50,7 @@ ok($objGu->eq("\x{A82}", "\x{A81}"));
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objGu->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objGu->lt("\x{AD0}$t", "\x{A82}"));
     ok($objGu->lt("\x{A82}$t", "\x{A83}"));
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ha.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ha.t
index 3740881d5a3..0602098f2ac 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ha.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ha.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..51\n"; }
+BEGIN { $| = 1; print "1..53\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -47,13 +47,15 @@ ok($objHa->gt("e", "\x{257}"));
 ok($objHa->lt("k", "\x{199}"));
 ok($objHa->gt("l", "\x{199}"));
 ok($objHa->lt("s", "sh"));
+ok($objHa->lt("sz","sh"));
 ok($objHa->gt("t", "sh"));
 ok($objHa->lt("t", "ts"));
+ok($objHa->lt("tz","ts"));
 ok($objHa->gt("u", "ts"));
 ok($objHa->lt("y", "\x{1B4}"));
 ok($objHa->gt("z", "\x{1B4}"));
 
-# 14
+# 16
 
 $objHa->change(level => 2);
 
@@ -74,7 +76,7 @@ ok($objHa->eq("\x{1B3}", "\x{2BC}Y"));
 ok($objHa->eq("\x{2BC}Y","'Y"));
 ok($objHa->eq("'Y",      "\x{1B4}"));
 
-# 29
+# 31
 
 $objHa->change(level => 3);
 
@@ -95,7 +97,7 @@ ok($objHa->lt("\x{1B3}", "\x{2BC}Y"));
 ok($objHa->lt("\x{2BC}Y","'Y"));
 ok($objHa->gt("'Y",      "\x{1B4}"));
 
-# 44
+# 46
 
 $objHa->change(upper_before_lower => 1);
 
@@ -107,4 +109,4 @@ ok($objHa->lt("\x{1B3}", "\x{2BC}Y"));
 ok($objHa->lt("\x{2BC}Y","'Y"));
 ok($objHa->lt("'Y",      "\x{1B4}"));
 
-# 51
+# 53
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_haw.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_haw.t
index c2e43acbfec..78f8e02ae94 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_haw.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_haw.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..49\n"; }
+BEGIN { $| = 1; print "1..57\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -52,10 +52,22 @@ ok($objHaw->lt('m', 'n'));
 ok($objHaw->lt('n', 'p'));
 ok($objHaw->lt('p', 'w'));
 ok($objHaw->lt('w', "\x{2BB}"));
-ok($objHaw->gt('b', "\x{2BB}"));
+ok($objHaw->lt('b', "\x{2BB}"));
 
 # 15
 
+ok($objHaw->lt('u', 'b'));
+ok($objHaw->lt('b', 'h'));
+ok($objHaw->gt('x', "\x{2BB}"));
+
+ok($objHaw->lt('aw', 'e'));
+ok($objHaw->lt('ew', 'i'));
+ok($objHaw->lt('iw', 'o'));
+ok($objHaw->lt('ow', 'u'));
+ok($objHaw->lt('uw', 'h'));
+
+# 23
+
 $objHaw->change(level => 2);
 
 ok($objHaw->eq('a', 'A'));
@@ -71,7 +83,7 @@ ok($objHaw->eq('n', 'N'));
 ok($objHaw->eq('p', 'P'));
 ok($objHaw->eq('w', 'W'));
 
-# 27
+# 35
 
 $objHaw->change(level => 3);
 
@@ -88,7 +100,7 @@ ok($objHaw->lt('n', 'N'));
 ok($objHaw->lt('p', 'P'));
 ok($objHaw->lt('w', 'W'));
 
-# 39
+# 47
 
 ok($objHaw->eq("a\x{304}", "\x{101}"));
 ok($objHaw->eq("A\x{304}", "\x{100}"));
@@ -101,4 +113,4 @@ ok($objHaw->eq("O\x{304}", "\x{14C}"));
 ok($objHaw->eq("u\x{304}", "\x{16B}"));
 ok($objHaw->eq("U\x{304}", "\x{16A}"));
 
-# 49
+# 57
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_he.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_he.t
new file mode 100644
index 00000000000..6f4f9fadcb1
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_he.t
@@ -0,0 +1,68 @@
+
+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..16\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 $objHe = Unicode::Collate::Locale->
+    new(locale => 'HE', normalization => undef);
+
+ok($objHe->getlocale, 'he');
+
+$objHe->change(level => 1);
+
+ok($objHe->eq("\x{5F3}", "\x{5F4}"));
+ok($objHe->eq("\x{5F3}", ""));
+ok($objHe->eq("\x{5F4}", ""));
+ok($objHe->eq("\x{5F3}", q<'>));
+ok($objHe->eq("\x{5F4}", q<">));
+
+# 7
+
+$objHe->change(variable => 'non-ignorable');
+
+ok($objHe->ne("\x{5F3}", "\x{5F4}"));
+ok($objHe->eq("\x{5F3}", q<'>));
+ok($objHe->eq("\x{5F4}", q<">));
+ok($objHe->eq("\x{5F3}z",q<'z>));
+ok($objHe->eq("\x{5F4}z",q<"z>));
+
+# 12
+
+$objHe->change(level => 2);
+
+ok($objHe->lt("\x{5F3}", q<'>));
+ok($objHe->lt("\x{5F4}", q<">));
+ok($objHe->lt("\x{5F3}z",q<'z>));
+ok($objHe->lt("\x{5F4}z",q<"z>));
+
+# 16
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_hi.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_hi.t
index 9a6b678791e..094a042c663 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_hi.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_hi.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..10\n"; }
+BEGIN { $| = 1; print "1..12\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -50,12 +50,12 @@ ok($objHi->eq("\x{902}", "\x{901}"));
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objHi->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objHi->lt("\x{950}$t", "\x{902}"));
     ok($objHi->lt("\x{902}$t", "\x{903}"));
+    ok($objHi->lt("\x{903}$t", "\x{A8FD}"));
     ok($objHi->lt("\x{903}$t", "\x{972}"));
 }
 
-# 10
+# 12
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_hy.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_hy.t
index a7282665a52..26114a1a091 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_hy.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_hy.t
@@ -77,8 +77,7 @@ $objHy->change(UCA_Version => 22);
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objHy->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
    ok($objHy->lt("\x{583}$t", "\x{584}"));
    ok($objHy->lt("\x{584}$t", "\x{587}"));
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ig.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ig.t
index 3d07700a114..40d3b199a85 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ig.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ig.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..108\n"; }
+BEGIN { $| = 1; print "1..112\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -46,18 +46,22 @@ ok($objIg->gt("c", "ch"));
 ok($objIg->lt("g", "gb"));
 ok($objIg->lt("gz","gb"));
 ok($objIg->lt("gb","gh"));
+ok($objIg->lt("gbz","gh"));
 ok($objIg->lt("gh","gw"));
+ok($objIg->lt("ghz","gw"));
 ok($objIg->gt("h", "gw"));
 ok($objIg->lt("i", "i\x{323}"));
 ok($objIg->gt("j", "i\x{323}"));
 ok($objIg->lt("k", "kp"));
 ok($objIg->lt("kz","kp"));
 ok($objIg->lt("kp","kw"));
+ok($objIg->lt("kpz","kw"));
 ok($objIg->gt("l", "kw"));
 ok($objIg->lt("n", "n\x{307}"));
 ok($objIg->lt("nz","n\x{307}"));
 ok($objIg->gt("nw","n\x{307}"));
 ok($objIg->lt("nw", "ny"));
+ok($objIg->lt("nwz","ny"));
 ok($objIg->gt("o",  "ny"));
 ok($objIg->lt("o", "o\x{323}"));
 ok($objIg->gt("p", "o\x{323}"));
@@ -67,7 +71,7 @@ ok($objIg->gt("t", "sh"));
 ok($objIg->lt("u", "u\x{323}"));
 ok($objIg->gt("v", "u\x{323}"));
 
-# 28
+# 32
 
 $objIg->change(level => 2);
 
@@ -94,7 +98,7 @@ ok($objIg->eq("sh", "Sh"));
 ok($objIg->eq("Sh", "SH"));
 ok($objIg->eq("u\x{323}", "U\x{323}"));
 
-# 50
+# 54
 
 $objIg->change(level => 3);
 
@@ -121,7 +125,7 @@ ok($objIg->lt("sh", "Sh"));
 ok($objIg->lt("Sh", "SH"));
 ok($objIg->lt("u\x{323}", "U\x{323}"));
 
-# 72
+# 76
 
 ok($objIg->eq("i\x{323}", "\x{1ECB}"));
 ok($objIg->eq("I\x{323}", "\x{1ECA}"));
@@ -139,7 +143,7 @@ ok($objIg->eq("O\x{323}\x{31B}", "\x{1EE2}"));
 ok($objIg->eq("u\x{323}\x{31B}", "\x{1EF1}"));
 ok($objIg->eq("U\x{323}\x{31B}", "\x{1EF0}"));
 
-# 86
+# 90
 
 $objIg->change(upper_before_lower => 1);
 
@@ -166,4 +170,4 @@ ok($objIg->gt("sh", "Sh"));
 ok($objIg->gt("Sh", "SH"));
 ok($objIg->gt("u\x{323}", "U\x{323}"));
 
-# 108
+# 112
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kk.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kk.t
index 294e974c0c9..2d783079bca 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kk.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kn.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kn.t
index 3c273258ba8..a6f00e98097 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kn.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kn.t
@@ -42,8 +42,7 @@ $objKn->change(level => 1);
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objKn->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objKn->lt("\x{C93}$t", "\x{C94}"));
     ok($objKn->lt("\x{C94}$t", "\x{C82}"));
@@ -53,3 +52,4 @@ for my $h (0, 1) {
     ok($objKn->lt("\x{CF2}$t", "\x{C95}"));
 }
 
+# 14
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kok.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kok.t
index 0b87dcbdc0b..5c60e575b62 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kok.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_kok.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..21\n"; }
+BEGIN { $| = 1; print "1..23\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -56,11 +56,11 @@ ok($objKok->eq("\x{933}", "\x{934}"));
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objKok->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objKok->lt("\x{950}$t", "\x{902}"));
     ok($objKok->lt("\x{902}$t", "\x{903}"));
+    ok($objKok->lt("\x{903}$t", "\x{A8FD}"));
     ok($objKok->lt("\x{903}$t", "\x{972}"));
 
     ok($objKok->lt("\x{938}$t", "\x{939}"));
@@ -69,4 +69,4 @@ for my $h (0, 1) {
     ok($objKok->lt("\x{915}\x{94D}\x{937}$t", "\x{93D}"));
 }
 
-# 21
+# 23
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_lkt.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_lkt.t
new file mode 100644
index 00000000000..b3c0aa1b6da
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_lkt.t
@@ -0,0 +1,92 @@
+
+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..37\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 $objLkt = Unicode::Collate::Locale->
+    new(locale => 'LKT', normalization => undef);
+
+ok($objLkt->getlocale, 'lkt');
+
+$objLkt->change(level => 1);
+
+ok($objLkt->lt("c", "c\x{30C}"));
+ok($objLkt->lt("cz","c\x{30C}"));
+ok($objLkt->gt("d", "c\x{30C}"));
+ok($objLkt->lt("g", "g\x{30C}"));
+ok($objLkt->lt("gz","g\x{30C}"));
+ok($objLkt->gt("h", "g\x{30C}"));
+ok($objLkt->lt("h", "h\x{30C}"));
+ok($objLkt->lt("hz","h\x{30C}"));
+ok($objLkt->gt("i", "h\x{30C}"));
+ok($objLkt->lt("s", "s\x{30C}"));
+ok($objLkt->lt("sz","s\x{30C}"));
+ok($objLkt->gt("t", "s\x{30C}"));
+ok($objLkt->lt("z", "z\x{30C}"));
+ok($objLkt->lt("zz", "z\x{30C}"));
+ok($objLkt->lt("z\x{30C}", "\x{292}")); # U+0292 EZH
+
+# 17
+
+$objLkt->change(level => 2);
+
+ok($objLkt->eq("c\x{30C}", "C\x{30C}"));
+ok($objLkt->eq("g\x{30C}", "G\x{30C}"));
+ok($objLkt->eq("h\x{30C}", "H\x{30C}"));
+ok($objLkt->eq("s\x{30C}", "S\x{30C}"));
+ok($objLkt->eq("z\x{30C}", "Z\x{30C}"));
+
+# 22
+
+$objLkt->change(level => 3);
+
+ok($objLkt->lt("c\x{30C}", "C\x{30C}"));
+ok($objLkt->lt("g\x{30C}", "G\x{30C}"));
+ok($objLkt->lt("h\x{30C}", "H\x{30C}"));
+ok($objLkt->lt("s\x{30C}", "S\x{30C}"));
+ok($objLkt->lt("z\x{30C}", "Z\x{30C}"));
+
+# 27
+
+ok($objLkt->eq("c\x{30C}", "\x{10D}"));
+ok($objLkt->eq("C\x{30C}", "\x{10C}"));
+ok($objLkt->eq("g\x{30C}", "\x{1E7}"));
+ok($objLkt->eq("G\x{30C}", "\x{1E6}"));
+ok($objLkt->eq("h\x{30C}", "\x{21F}"));
+ok($objLkt->eq("H\x{30C}", "\x{21E}"));
+ok($objLkt->eq("s\x{30C}", "\x{161}"));
+ok($objLkt->eq("S\x{30C}", "\x{160}"));
+ok($objLkt->eq("z\x{30C}", "\x{17E}"));
+ok($objLkt->eq("Z\x{30C}", "\x{17D}"));
+
+# 37
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mk.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mk.t
index df575840eb5..937cf9385b5 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mk.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mncy.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mncy.t
new file mode 100644
index 00000000000..cea60780153
--- /dev/null
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mr.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mr.t
index 0761fe84591..7b5141f7387 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mr.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_mr.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..23\n"; }
+BEGIN { $| = 1; print "1..25\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -56,11 +56,11 @@ ok($objMr->eq("\x{933}", "\x{934}"));
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objMr->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objMr->lt("\x{950}$t", "\x{902}"));
     ok($objMr->lt("\x{902}$t", "\x{903}"));
+    ok($objMr->lt("\x{903}$t", "\x{A8FD}"));
     ok($objMr->lt("\x{903}$t", "\x{972}"));
 
     ok($objMr->lt("\x{938}$t", "\x{939}"));
@@ -70,4 +70,4 @@ for my $h (0, 1) {
     ok($objMr->lt("\x{91C}\x{94D}\x{91E}$t", "\x{93D}"));
 }
 
-# 23
+# 25
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_or.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_or.t
index 4fffaef1512..37fba06d89e 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_or.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_or.t
@@ -50,8 +50,7 @@ ok($objOr->eq("\x{B2F}", "\x{B5F}"));
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objOr->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objOr->lt("\x{B13}$t", "\x{B14}"));
     ok($objOr->lt("\x{B14}$t", "\x{B01}"));
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_pl.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_pl.t
index 5797b7d75d7..6f135c5ced3 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_pl.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_pl.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..65\n"; }
+BEGIN { $| = 1; print "1..73\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -41,24 +41,32 @@ ok($objPl->getlocale, 'pl');
 $objPl->change(level => 1);
 
 ok($objPl->lt("a", "a\x{328}"));
+ok($objPl->lt("az","a\x{328}"));
 ok($objPl->gt("b", "a\x{328}"));
 ok($objPl->lt("c", "c\x{301}"));
+ok($objPl->lt("cz","c\x{301}"));
 ok($objPl->gt("d", "c\x{301}"));
 ok($objPl->lt("e", "e\x{328}"));
+ok($objPl->lt("ez","e\x{328}"));
 ok($objPl->gt("f", "e\x{328}"));
 ok($objPl->lt("l", "l\x{335}"));
+ok($objPl->lt("lz","l\x{335}"));
 ok($objPl->gt("m", "l\x{335}"));
 ok($objPl->lt("n", "n\x{301}"));
+ok($objPl->lt("nz","n\x{301}"));
 ok($objPl->gt("o", "n\x{301}"));
 ok($objPl->lt("o", "o\x{301}"));
+ok($objPl->lt("oz","o\x{301}"));
 ok($objPl->gt("p", "o\x{301}"));
 ok($objPl->lt("s", "s\x{301}"));
+ok($objPl->lt("sz","s\x{301}"));
 ok($objPl->gt("t", "s\x{301}"));
 ok($objPl->lt("z", "z\x{301}"));
+ok($objPl->lt("zz","z\x{301}"));
 ok($objPl->lt("z\x{301}", "z\x{307}"));
 ok($objPl->lt("z\x{307}", "\x{292}")); # U+0292 EZH
 
-# 19
+# 27
 
 $objPl->change(level => 2);
 
@@ -72,7 +80,7 @@ ok($objPl->eq("s\x{301}", "S\x{301}"));
 ok($objPl->eq("z\x{301}", "Z\x{301}"));
 ok($objPl->eq("z\x{307}", "Z\x{307}"));
 
-# 28
+# 36
 
 $objPl->change(level => 3);
 
@@ -86,7 +94,7 @@ ok($objPl->lt("s\x{301}", "S\x{301}"));
 ok($objPl->lt("z\x{301}", "Z\x{301}"));
 ok($objPl->lt("z\x{307}", "Z\x{307}"));
 
-# 37
+# 45
 
 ok($objPl->eq("a\x{328}", "\x{105}"));
 ok($objPl->eq("A\x{328}", "\x{104}"));
@@ -117,4 +125,4 @@ ok($objPl->eq("Z\x{341}", "\x{179}"));
 ok($objPl->eq("z\x{307}", "\x{17C}"));
 ok($objPl->eq("Z\x{307}", "\x{17B}"));
 
-# 65
+# 73
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ru.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ru.t
index fb7f3f4b4f9..2e332ab6315 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ru.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sa.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sa.t
index 0420f58a578..a03d32e4fc4 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sa.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sa.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..23\n"; }
+BEGIN { $| = 1; print "1..25\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -56,11 +56,11 @@ ok($objSa->eq("\x{933}", "\x{934}"));
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objSa->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objSa->lt("\x{950}$t", "\x{902}"));
     ok($objSa->lt("\x{902}$t", "\x{903}"));
+    ok($objSa->lt("\x{903}$t", "\x{A8FD}"));
     ok($objSa->lt("\x{903}$t", "\x{972}"));
 
     ok($objSa->lt("\x{938}$t", "\x{939}"));
@@ -70,4 +70,4 @@ for my $h (0, 1) {
     ok($objSa->lt("\x{91C}\x{94D}\x{91E}$t", "\x{93D}"));
 }
 
-# 23
+# 25
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_se.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_se.t
index 0908e809024..1b671fd95a9 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_se.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_se.t
@@ -257,14 +257,14 @@ ok($objSe->eq("A\x{308}\x{304}", "\x{1DE}"));
 
 ok($objSe->eq("o\x{308}\x{304}", "\x{22B}"));
 ok($objSe->eq("O\x{308}\x{304}", "\x{22A}"));
-ok($objSe->eq("o\x{303}\x{301}","\x{1E4D}"));
-ok($objSe->eq("O\x{303}\x{301}","\x{1E4C}"));
+ok($objSe->eq("o\x{303}\x{301}", "\x{1E4D}"));
+ok($objSe->eq("O\x{303}\x{301}", "\x{1E4C}"));
 ok($objSe->eq("o\x{303}\x{304}", "\x{22D}"));
 ok($objSe->eq("O\x{303}\x{304}", "\x{22C}"));
-ok($objSe->eq("o\x{303}\x{308}","\x{1E4F}"));
-ok($objSe->eq("O\x{303}\x{308}","\x{1E4E}"));
-ok($objSe->eq("o\x{303}\x{31B}","\x{1EE1}"));
-ok($objSe->eq("O\x{303}\x{31B}","\x{1EE0}"));
+ok($objSe->eq("o\x{303}\x{308}", "\x{1E4F}"));
+ok($objSe->eq("O\x{303}\x{308}", "\x{1E4E}"));
+ok($objSe->eq("o\x{303}\x{31B}", "\x{1EE1}"));
+ok($objSe->eq("O\x{303}\x{31B}", "\x{1EE0}"));
 
 ok($objSe->eq("o\x{302}\x{300}", "\x{1ED3}"));
 ok($objSe->eq("O\x{302}\x{300}", "\x{1ED2}"));
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_si.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_si.t
index fab3882e5a7..d6c6c69550a 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_si.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_si.t
@@ -42,8 +42,7 @@ $objSi->change(level => 1);
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objSi->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objSi->lt("\x{D95}$t", "\x{D96}"));
     ok($objSi->lt("\x{D96}$t", "\x{D82}"));
@@ -55,3 +54,4 @@ for my $h (0, 1) {
     ok($objSi->lt("\x{DA4}$t", "\x{DA6}"));
 }
 
+# 16
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sidt.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sidt.t
index 5bd122a447f..bbdb4e0aff1 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sidt.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sidt.t
@@ -53,8 +53,7 @@ ok($objSiDict->lt("\x{DA5}", "\x{DA3}"));
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objSiDict->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objSiDict->lt("\x{D95}$t", "\x{D96}"));
     ok($objSiDict->lt("\x{D96}$t", "\x{D82}"));
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sr.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sr.t
index 8eea66a8afe..b6a89c59eca 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sr.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sw.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sw.t
index 8ede629f081..8689e835f86 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_sw.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_te.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_te.t
index 44a66db8817..677a29bef54 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_te.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_te.t
@@ -42,8 +42,7 @@ $objTe->change(level => 1);
 
 for my $h (0, 1) {
     no warnings 'utf8';
-    my $t = $h ? pack('U', 0xFFFF) : "";
-    $objTe->change(highestFFFF => 1) if $h;
+    my $t = $h ? pack('U', 0xFFFF) : 'z';
 
     ok($objTe->lt("\x{C13}$t", "\x{C14}"));
     ok($objTe->lt("\x{C14}$t", "\x{C01}"));
@@ -51,3 +50,5 @@ for my $h (0, 1) {
     ok($objTe->lt("\x{C02}$t", "\x{C03}"));
     ok($objTe->lt("\x{C03}$t", "\x{C15}"));
 }
+
+# 12
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_test.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_test.t
index 30c912003d6..6d70ba477fd 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_test.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_test.t
@@ -103,8 +103,8 @@ my $objEsT = Unicode::Collate::Locale->new
 ok($objEsT->getlocale, 'es__traditional');
 
 my $objFr  = Unicode::Collate::Locale->new
-    (normalization => undef, locale => 'FR');
-ok($objFr->getlocale, 'fr');
+    (normalization => undef, locale => 'FR_CA');
+ok($objFr->getlocale, 'fr_CA');
 
 # 16
 
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ugcy.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_ugcy.t
new file mode 100644
index 00000000000..457c8a59085
--- /dev/null
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_uk.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_uk.t
index de1cc3753dc..91ccdc85195 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_uk.t
+++ b/gnu/usr.bin/perl/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/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_vo.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_vo.t
new file mode 100644
index 00000000000..3d124bbe855
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_vo.t
@@ -0,0 +1,105 @@
+
+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..38\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 $auml = pack 'U', 0xE4;
+my $Auml = pack 'U', 0xC4;
+my $ouml = pack 'U', 0xF6;
+my $Ouml = pack 'U', 0xD6;
+my $uuml = pack 'U', 0xFC;
+my $Uuml = pack 'U', 0xDC;
+
+my $objVo = Unicode::Collate::Locale->
+    new(locale => 'VO', normalization => undef);
+
+ok($objVo->getlocale, 'vo');
+
+$objVo->change(level => 1);
+
+ok($objVo->gt($auml, "az"));
+ok($objVo->lt($auml, "b"));
+ok($objVo->gt($ouml, "oz"));
+ok($objVo->lt($ouml, "p"));
+ok($objVo->gt($uuml, "uz"));
+ok($objVo->lt($uuml, "v"));
+
+# 8
+
+$objVo->change(level => 2);
+
+ok($objVo->eq("a\x{308}", "A\x{308}"));
+ok($objVo->eq("o\x{308}", "O\x{308}"));
+ok($objVo->eq("u\x{308}", "U\x{308}"));
+
+ok($objVo->eq($auml, $Auml));
+ok($objVo->eq($ouml, $Ouml));
+ok($objVo->eq($uuml, $Uuml));
+
+# 14
+
+$objVo->change(level => 3);
+
+ok($objVo->lt("a\x{308}", "A\x{308}"));
+ok($objVo->lt("o\x{308}", "O\x{308}"));
+ok($objVo->lt("u\x{308}", "U\x{308}"));
+
+ok($objVo->lt($auml, $Auml));
+ok($objVo->lt($ouml, $Ouml));
+ok($objVo->lt($uuml, $Uuml));
+
+# 20
+
+ok($objVo->eq("a\x{308}", $auml));
+ok($objVo->eq("A\x{308}", $Auml));
+ok($objVo->eq("o\x{308}", $ouml));
+ok($objVo->eq("O\x{308}", $Ouml));
+ok($objVo->eq("u\x{308}", $uuml));
+ok($objVo->eq("U\x{308}", $Uuml));
+
+# 26
+
+ok($objVo->eq("a\x{308}\x{304}", "\x{1DF}"));
+ok($objVo->eq("A\x{308}\x{304}", "\x{1DE}"));
+ok($objVo->eq("o\x{308}\x{304}", "\x{22B}"));
+ok($objVo->eq("O\x{308}\x{304}", "\x{22A}"));
+ok($objVo->eq("u\x{308}\x{300}", "\x{1DC}"));
+ok($objVo->eq("U\x{308}\x{300}", "\x{1DB}"));
+ok($objVo->eq("u\x{308}\x{301}", "\x{1D8}"));
+ok($objVo->eq("U\x{308}\x{301}", "\x{1D7}"));
+ok($objVo->eq("u\x{308}\x{304}", "\x{1D6}"));
+ok($objVo->eq("U\x{308}\x{304}", "\x{1D5}"));
+ok($objVo->eq("u\x{308}\x{30C}", "\x{1DA}"));
+ok($objVo->eq("U\x{308}\x{30C}", "\x{1D9}"));
+
+# 38
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_wo.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_wo.t
index 7cf22125dc9..47315364091 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_wo.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_wo.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..40\n"; }
+BEGIN { $| = 1; print "1..44\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -41,17 +41,21 @@ ok($objWo->getlocale, 'wo');
 $objWo->change(level => 1);
 
 ok($objWo->lt("a", "a\x{300}"));
+ok($objWo->lt("az","a\x{300}"));
 ok($objWo->gt("b", "a\x{300}"));
 ok($objWo->lt("e", "e\x{301}"));
+ok($objWo->lt("ez","e\x{301}"));
 ok($objWo->lt("e\x{301}", "e\x{308}"));
 ok($objWo->gt("f", "e\x{308}"));
 ok($objWo->lt("n", "n\x{303}"));
+ok($objWo->lt("nz","n\x{303}"));
 ok($objWo->lt("n\x{303}", "\x{14B}"));
 ok($objWo->gt("o", "\x{14B}"));
 ok($objWo->lt("o", "o\x{301}"));
+ok($objWo->lt("oz","o\x{301}"));
 ok($objWo->gt("p", "o\x{301}"));
 
-# 12
+# 16
 
 $objWo->change(level => 2);
 
@@ -62,7 +66,7 @@ ok($objWo->eq("n\x{303}", "N\x{303}"));
 ok($objWo->eq( "\x{14B}",  "\x{14A}"));
 ok($objWo->eq("o\x{301}", "O\x{301}"));
 
-# 18
+# 22
 
 $objWo->change(level => 3);
 
@@ -73,7 +77,7 @@ ok($objWo->lt("n\x{303}", "N\x{303}"));
 ok($objWo->lt( "\x{14B}",  "\x{14A}"));
 ok($objWo->lt("o\x{301}", "O\x{301}"));
 
-# 24
+# 28
 
 ok($objWo->eq("a\x{300}", pack('U', 0xE0)));
 ok($objWo->eq("a\x{340}", pack('U', 0xE0)));
@@ -92,4 +96,4 @@ ok($objWo->eq("o\x{341}", pack('U', 0xF3)));
 ok($objWo->eq("O\x{301}", pack('U', 0xD3)));
 ok($objWo->eq("O\x{341}", pack('U', 0xD3)));
 
-# 40
+# 44
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_yo.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_yo.t
index f3f4753172f..c99beaf37e5 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_yo.t
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/loc_yo.t
@@ -16,7 +16,7 @@ BEGIN {
 
 use strict;
 use warnings;
-BEGIN { $| = 1; print "1..33\n"; }
+BEGIN { $| = 1; print "1..36\n"; }
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -41,16 +41,19 @@ ok($objYo->getlocale, 'yo');
 $objYo->change(level => 1);
 
 ok($objYo->lt("e", "e\x{323}"));
+ok($objYo->lt("ez","e\x{323}"));
 ok($objYo->gt("f", "e\x{323}"));
 ok($objYo->lt("g", "gb"));
 ok($objYo->lt("gz","gb"));
 ok($objYo->gt("h", "gb"));
 ok($objYo->lt("o", "o\x{323}"));
+ok($objYo->lt("oz","o\x{323}"));
 ok($objYo->gt("p", "o\x{323}"));
 ok($objYo->lt("s", "s\x{323}"));
+ok($objYo->lt("sz","s\x{323}"));
 ok($objYo->gt("t", "s\x{323}"));
 
-# 11
+# 14
 
 $objYo->change(level => 2);
 
@@ -60,7 +63,7 @@ ok($objYo->eq("Gb", "GB"));
 ok($objYo->eq("o\x{323}", "O\x{323}"));
 ok($objYo->eq("s\x{323}", "S\x{323}"));
 
-# 16
+# 19
 
 $objYo->change(level => 3);
 
@@ -70,7 +73,7 @@ ok($objYo->lt("Gb", "GB"));
 ok($objYo->lt("o\x{323}", "O\x{323}"));
 ok($objYo->lt("s\x{323}", "S\x{323}"));
 
-# 21
+# 24
 
 ok($objYo->eq("e\x{323}", "\x{1EB9}"));
 ok($objYo->eq("E\x{323}", "\x{1EB8}"));
@@ -79,6 +82,8 @@ ok($objYo->eq("O\x{323}", "\x{1ECC}"));
 ok($objYo->eq("s\x{323}", "\x{1E63}"));
 ok($objYo->eq("S\x{323}", "\x{1E62}"));
 
+# 30
+
 ok($objYo->eq("e\x{323}\x{302}", "\x{1EC7}"));
 ok($objYo->eq("E\x{323}\x{302}", "\x{1EC6}"));
 ok($objYo->eq("o\x{323}\x{302}", "\x{1ED9}"));
@@ -86,4 +91,4 @@ ok($objYo->eq("O\x{323}\x{302}", "\x{1ED8}"));
 ok($objYo->eq("o\x{323}\x{31B}", "\x{1EE3}"));
 ok($objYo->eq("O\x{323}\x{31B}", "\x{1EE2}"));
 
-# 33
+# 36
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/nushu.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/nushu.t
new file mode 100644
index 00000000000..4293a9af5de
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/nushu.t
@@ -0,0 +1,73 @@
+
+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..185\n"; } # 5 + 12 x @Versions
+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;
+
+ok(1);
+
+#########################
+
+my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36);
+
+my $Collator = Unicode::Collate->new(
+    table => 'keys.txt',
+    normalization => undef,
+    UCA_Version => 36,
+);
+
+ok($Collator->viewSortKey("\x{1B170}"),
+   '[FB01 8000 | 0020 | 0002 | FFFF |]');
+ok($Collator->viewSortKey("\x{1B171}"),
+   '[FB01 8001 | 0020 | 0002 | FFFF |]');
+ok($Collator->viewSortKey("\x{1B200}"),
+   '[FB01 8090 | 0020 | 0002 | FFFF |]');
+ok($Collator->viewSortKey("\x{1B2FB}"),
+   '[FB01 818B | 0020 | 0002 | FFFF |]');
+
+# Nushu < CJK UI (4E00) < Unassigned.
+
+# 1B170..1B2FB are Nushu Characters since UCA_Version 36 (Unicode 10.0).
+
+for my $v (@Versions) {
+    $Collator->change(UCA_Version => $v);
+
+    ok($Collator->cmp("\x{1B16F}", "\x{4E00}") == 1);
+    ok($Collator->cmp("\x{1B170}", "\x{4E00}") == ($v >= 36 ? -1 : 1));
+    ok($Collator->cmp("\x{1B171}", "\x{4E00}") == ($v >= 36 ? -1 : 1));
+    ok($Collator->cmp("\x{1B1FF}", "\x{4E00}") == ($v >= 36 ? -1 : 1));
+    ok($Collator->cmp("\x{1B200}", "\x{4E00}") == ($v >= 36 ? -1 : 1));
+    ok($Collator->cmp("\x{1B2FB}", "\x{4E00}") == ($v >= 36 ? -1 : 1));
+    ok($Collator->cmp("\x{1B2FC}", "\x{4E00}") == 1);
+    ok($Collator->cmp("\x{1B2FF}", "\x{4E00}") == 1);
+
+    ok($Collator->lt("\x{1B170}", "\x{1B171}"));
+    ok($Collator->lt("\x{1B171}", "\x{1B1FF}"));
+    ok($Collator->lt("\x{1B1FF}", "\x{1B200}"));
+    ok($Collator->lt("\x{1B200}", "\x{1B2FB}"));
+}
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/overcjk0.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/overcjk0.t
index 9c2dcb190b9..12e599de583 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/overcjk0.t
+++ b/gnu/usr.bin/perl/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..696\n"; } # 6 + 46 x @Versions
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -59,13 +59,17 @@ 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).
+# 9FD6..9FEA are CJK UI since UCA_Version 36 (Unicode 10.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).
+# 2CEB0..2EBE0 are CJK UI Ext.F since UCA_Version 36 (Unicode 10.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, 34, 36);
 
 for my $v (@Versions) {
     $ignoreCJK->change(UCA_Version => $v);
@@ -84,8 +88,15 @@ 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}", "") == ($v >= 36 ? 0 : 1));
+    ok($ignoreCJK->cmp("\x{9FDF}", "") == ($v >= 36 ? 0 : 1));
+    ok($ignoreCJK->cmp("\x{9FEA}", "") == ($v >= 36 ? 0 : 1));
+    ok($ignoreCJK->cmp("\x{9FEB}", "") == 1);
+    ok($ignoreCJK->cmp("\x{9FFF}", "") == 1);
 
     # Ext.A
     ok($ignoreCJK->cmp("\x{3400}", "") == 0);
@@ -110,5 +121,17 @@ 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);
+
+    # Ext.F
+    ok($ignoreCJK->cmp("\x{2CEB0}","") == ($v >= 36 ? 0 : 1));
+    ok($ignoreCJK->cmp("\x{2EBE0}","") == ($v >= 36 ? 0 : 1));
+    ok($ignoreCJK->cmp("\x{2EBE1}","") == 1);
+    ok($ignoreCJK->cmp("\x{2EBEF}","") == 1);
 }
 
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/overcjk1.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/overcjk1.t
index 0cc23dea50f..8441979425c 100644
--- a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/overcjk1.t
+++ b/gnu/usr.bin/perl/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..356\n"; } # 11 + 23 x @Versions
 my $count = 0;
 sub ok ($;$) {
     my $p = my $r = shift;
@@ -60,12 +60,15 @@ ok($overCJK->lt("a\x{4E03}", "A\x{4E01}"));
 
 #####
 
+# 4E00..9FA5 are CJK UI.
 # 9FA6..9FBB are CJK UI since UCA_Version 14 (Unicode 4.1).
 # 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).
+# 9FD6..9FEA are CJK UI since UCA_Version 36 (Unicode 10.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, 34, 36);
 
 for my $v (@Versions) {
     $overCJK->change(UCA_Version => $v);
@@ -83,7 +86,14 @@ 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}") == ($v >= 36 ? 1 : -1));
+    ok($overCJK->cmp("a\x{9FD6}", "A\x{9FDF}") == ($v >= 36 ? 1 : -1));
+    ok($overCJK->cmp("a\x{9FDF}", "A\x{9FEA}") == ($v >= 36 ? 1 : -1));
+    ok($overCJK->cmp("a\x{9FEA}", "A\x{9FEB}") == -1);
+    ok($overCJK->cmp("a\x{9FEB}", "A\x{9FEF}") == -1);
+    ok($overCJK->cmp("a\x{9FEF}", "A\x{9FFF}") == -1);
 }
 
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Collate/t/tangut.t b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/tangut.t
new file mode 100644
index 00000000000..171a2056619
--- /dev/null
+++ b/gnu/usr.bin/perl/cpan/Unicode-Collate/t/tangut.t
@@ -0,0 +1,88 @@
+
+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..380\n"; } # 5 + 25 x @Versions
+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;
+
+ok(1);
+
+#########################
+
+my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36);
+
+my $Collator = Unicode::Collate->new(
+    table => 'keys.txt',
+    normalization => undef,
+    UCA_Version => 34,
+);
+
+ok($Collator->viewSortKey("\x{17000}"),
+   '[FB00 8000 | 0020 | 0002 | FFFF FFFF |]');
+ok($Collator->viewSortKey("\x{17001}"),
+   '[FB00 8001 | 0020 | 0002 | FFFF FFFF |]');
+ok($Collator->viewSortKey("\x{18800}"),
+   '[FB00 9800 | 0020 | 0002 | FFFF FFFF |]');
+ok($Collator->viewSortKey("\x{18AF2}"),
+   '[FB00 9AF2 | 0020 | 0002 | FFFF FFFF |]');
+
+# Tangut < CJK UI (4E00) < Unassigned.
+
+# 17000..187EC are Tangut Ideographs since UCA_Version 34 (Unicode 9.0).
+# 18800..18AF2 are Tangut Components since UCA_Version 34 (Unicode 9.0).
+
+for my $v (@Versions) {
+    $Collator->change(UCA_Version => $v);
+
+    ok($Collator->cmp("\x{16FFF}", "\x{4E00}") == 1);
+    ok($Collator->cmp("\x{17000}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{17001}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{17FFF}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{18000}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{187EB}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{187EC}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{187ED}", "\x{4E00}") == 1);
+    ok($Collator->cmp("\x{187FE}", "\x{4E00}") == 1);
+    ok($Collator->cmp("\x{187FF}", "\x{4E00}") == 1);
+    ok($Collator->cmp("\x{18800}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{18801}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{18AF1}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{18AF2}", "\x{4E00}") == ($v >= 34 ? -1 : 1));
+    ok($Collator->cmp("\x{18AF3}", "\x{4E00}") == 1);
+    ok($Collator->cmp("\x{18AFF}", "\x{4E00}") == 1);
+
+    ok($Collator->lt("\x{17000}", "\x{17001}"));
+    ok($Collator->lt("\x{17001}", "\x{17002}"));
+    ok($Collator->lt("\x{17002}", "\x{17FFF}"));
+    ok($Collator->lt("\x{17FFF}", "\x{18000}"));
+    ok($Collator->lt("\x{18000}", "\x{187EB}"));
+    ok($Collator->lt("\x{187EB}", "\x{187EC}"));
+
+    ok($Collator->lt("\x{18800}", "\x{18801}"));
+    ok($Collator->lt("\x{18801}", "\x{18AF1}"));
+    ok($Collator->lt("\x{18AF1}", "\x{18AF2}"));
+}
author	afresh1 <afresh1@openbsd.org>	2019-02-13 21:10:38 +0000
committer	afresh1 <afresh1@openbsd.org>	2019-02-13 21:10:38 +0000
commit	5759b3d249badf144a6240f7eec4dcf9df003e6b (patch)
tree	88ca2f73bac6772bb3b7819e5ca28614859b0f2c /gnu/usr.bin/perl/cpan/Unicode-Collate
parent	strsep the -e argument for execve; ok benno (diff)
download	wireguard-openbsd-5759b3d249badf144a6240f7eec4dcf9df003e6b.tar.xz wireguard-openbsd-5759b3d249badf144a6240f7eec4dcf9df003e6b.zip