Prefer special case mappings.

p4raw-id: //depot/perl@14760

diff --git a/lib/unicore/To/Lower.pl b/lib/unicore/To/Lower.pl
index b7ef2a0..a3d67fa 100644 (file)
--- a/lib/unicore/To/Lower.pl
+++ b/lib/unicore/To/Lower.pl
@@ -613,40 +613,14 @@ return <<'END';
 1F6D           1F65
 1F6E           1F66
 1F6F           1F67
-1F88           1F80
-1F89           1F81
-1F8A           1F82
-1F8B           1F83
-1F8C           1F84
-1F8D           1F85
-1F8E           1F86
-1F8F           1F87
-1F98           1F90
-1F99           1F91
-1F9A           1F92
-1F9B           1F93
-1F9C           1F94
-1F9D           1F95
-1F9E           1F96
-1F9F           1F97
-1FA8           1FA0
-1FA9           1FA1
-1FAA           1FA2
-1FAB           1FA3
-1FAC           1FA4
-1FAD           1FA5
-1FAE           1FA6
-1FAF           1FA7
 1FB8           1FB0
 1FB9           1FB1
 1FBA           1F70
 1FBB           1F71
-1FBC           1FB3
 1FC8           1F72
 1FC9           1F73
 1FCA           1F74
 1FCB           1F75
-1FCC           1FC3
 1FD8           1FD0
 1FD9           1FD1
 1FDA           1F76
@@ -660,7 +634,6 @@ return <<'END';
 1FF9           1F79
 1FFA           1F7C
 1FFB           1F7D
-1FFC           1FF3
 2126           03C9
 212A           006B
 212B           00E5

diff --git a/lib/unicore/To/Title.pl b/lib/unicore/To/Title.pl
index 1a58400..37fefb2 100644 (file)
--- a/lib/unicore/To/Title.pl
+++ b/lib/unicore/To/Title.pl
@@ -687,41 +687,14 @@ return <<'END';
 1F7B           1FEB
 1F7C           1FFA
 1F7D           1FFB
-1F80           1F88
-1F81           1F89
-1F82           1F8A
-1F83           1F8B
-1F84           1F8C
-1F85           1F8D
-1F86           1F8E
-1F87           1F8F
-1F90           1F98
-1F91           1F99
-1F92           1F9A
-1F93           1F9B
-1F94           1F9C
-1F95           1F9D
-1F96           1F9E
-1F97           1F9F
-1FA0           1FA8
-1FA1           1FA9
-1FA2           1FAA
-1FA3           1FAB
-1FA4           1FAC
-1FA5           1FAD
-1FA6           1FAE
-1FA7           1FAF
 1FB0           1FB8
 1FB1           1FB9
-1FB3           1FBC
 1FBE           0399
-1FC3           1FCC
 1FD0           1FD8
 1FD1           1FD9
 1FE0           1FE8
 1FE1           1FE9
 1FE5           1FEC
-1FF3           1FFC
 2170           2160
 2171           2161
 2172           2162

diff --git a/lib/unicore/To/Upper.pl b/lib/unicore/To/Upper.pl
index decd6a8..575ab3f 100644 (file)
--- a/lib/unicore/To/Upper.pl
+++ b/lib/unicore/To/Upper.pl
@@ -714,41 +714,14 @@ return <<'END';
 1F7B           1FEB
 1F7C           1FFA
 1F7D           1FFB
-1F80           1F88
-1F81           1F89
-1F82           1F8A
-1F83           1F8B
-1F84           1F8C
-1F85           1F8D
-1F86           1F8E
-1F87           1F8F
-1F90           1F98
-1F91           1F99
-1F92           1F9A
-1F93           1F9B
-1F94           1F9C
-1F95           1F9D
-1F96           1F9E
-1F97           1F9F
-1FA0           1FA8
-1FA1           1FA9
-1FA2           1FAA
-1FA3           1FAB
-1FA4           1FAC
-1FA5           1FAD
-1FA6           1FAE
-1FA7           1FAF
 1FB0           1FB8
 1FB1           1FB9
-1FB3           1FBC
 1FBE           0399
-1FC3           1FCC
 1FD0           1FD8
 1FD1           1FD9
 1FE0           1FE8
 1FE1           1FE9
 1FE5           1FEC
-1FF3           1FFC
 2170           2160
 2171           2161
 2172           2162

diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index 2caf287..654301e 100644 (file)
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -1661,6 +1661,10 @@ sub SpecialCasing_txt()
             my $tostr =
               join "", map { sprintf "\\x{%s}", $_ } split ' ', $to;
             push @OUT, sprintf qq['%04X' => "$tostr",\n], $ix;
+           # Remove any single-character mappings for
+           # the same character since we are going for
+           # the special casing rules.
+           $NormalCase =~ s/^$code\t\t\w+\n//m;
         }
         push @OUT, (
                     ");\n\n",