X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flocale.t;h=3174fe141a239aa51c542a36b30f1c6d6b640f76;hb=983ffd37e39751798fdd14853511af238c5fe291;hp=19fba597c5450d4f2404ac420a951f4542f78ddd;hpb=b695f709e8a342e35e482b0437eb6cdacdc58b6b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/locale.t b/lib/locale.t
index 19fba59..3174fe1 100644
--- a/lib/locale.t
+++ b/lib/locale.t
@@ -311,9 +311,9 @@ if ($^O eq 'os390') {
 sub in_utf8 () { $^H & 0x08 }
 
 if (in_utf8) {
-    require "locale/utf8";
+    require "lib/locale/utf8";
 } else {
-    require "locale/latin1";
+    require "lib/locale/latin1";
 }
 
 my @Locale;
@@ -719,19 +719,28 @@ foreach $Locale (@Locale) {
             $utf8skip{117}++;
 	} else {
 	    use locale;
-	    use locale;
-	    no utf8; # so that the native 8-bit characters work
+	    no utf8;
 
 	    my @f = ();
 	    foreach my $x (keys %UPPER) {
 		my $y = lc $x;
 		next unless uc $y eq $x;
-		push @f, $x unless $x =~ /$y/i && $y =~ /$x/i;
+		print "# UPPER $x lc $y ",
+			$x =~ /$y/i ? 1 : 0, " ",
+			$y =~ /$x/i ? 1 : 0, "\n" if 0;
+		# With utf8 both will fail since the locale concept
+		# of upper/lower does not work well in Unicode.
+		push @f, $x unless $x =~ /$y/i == $y =~ /$x/i;
 	    }
 	    foreach my $x (keys %lower) {
 		my $y = uc $x;
 		next unless lc $y eq $x;
-		push @f, $x unless $x =~ /$y/i && $y =~ /$x/i;
+		print "# lower $x uc $y ",
+			$x =~ /$y/i ? 1 : 0, " ",
+			$y =~ /$x/i ? 1 : 0, "\n" if 0;
+		# With utf8 both will fail since the locale concept
+		# of upper/lower does not work well in Unicode.
+		push @f, $x unless $x =~ /$y/i == $y =~ /$x/i;
 	    }
 	    tryneoalpha($Locale, 117, @f == 0);
 	    if (@f) {