Upgrade to Text-Tabs+Wrap-2001.0929 from David Muir Sharnoff.

[p5sagit/p5-mst-13.2.git] / lib / utf8_heavy.pl

diff --git a/lib/utf8_heavy.pl b/lib/utf8_heavy.pl
index b73cea0..ed3da17 100644 (file)
--- a/lib/utf8_heavy.pl
+++ b/lib/utf8_heavy.pl
@@ -24,13 +24,22 @@ sub SWASHNEW {
     my $caller;
     my $i = 0;
     while (($caller = caller($i)) eq __PACKAGE__) { $i++ }
-    my $encoding = $enc{$caller} || "unicode";
+    my $encoding = $enc{$caller} || "unicore";
     (my $file = $type) =~ s!::!/!g;
-    if ($file =~ /^In(.+)/) {
+    if ($file =~ /^(?:In|in|IN|iN)[- _]?(.+?)\s*$/) { # /i would cause recursion.
        my $In = $1;
        defined %utf8::In || do "$encoding/In.pl";
-       if (exists $utf8::In{$In}) {
-           $file = "$encoding/In/$utf8::In{$In}";
+       my $prefix = substr(lc($In), 0, 3);
+       if (exists $utf8::InPat{$prefix}) {
+           for my $k (keys %{$utf8::InPat{$prefix}}) {
+               if ($In =~ /^$k$/i) {
+                   $In = $utf8::InPat{$prefix}->{$k};
+                   if (exists $utf8::In{$In}) {
+                       $file = "$encoding/In/$utf8::In{$In}";
+                       last;
+                   }
+               }
+           }
        }
     } else {
        $file =~ s#^(Is|To)([A-Z].*)#$1/$2#;
@@ -43,7 +52,7 @@ sub SWASHNEW {
            || do "$file.pl"
            || do "$encoding/$file.pl"
            || do "$encoding/Is/${type}.pl"
-           || croak("Can't find $encoding character property \"$type\"");
+           || croak("Can't find Unicode character property \"$type\"");
     }
 
     $| = 1;