From: SADAHIRO Tomoyuki <BQW10602@nifty.com>
Date: Thu, 30 May 2002 23:56:51 +0000 (+0900)
Subject: [Patch perl@16861] charnames::vianame tweak
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=94ec6410737406e8f52c36270d784db8d61e0145;p=p5sagit%2Fp5-mst-13.2.git

[Patch perl@16861] charnames::vianame tweak
Message-Id: <20020530235541.D722.BQW10602@nifty.com>

p4raw-id: //depot/perl@16890
---

diff --git a/lib/charnames.pm b/lib/charnames.pm
index af33c86..e3d06f3 100644
--- a/lib/charnames.pm
+++ b/lib/charnames.pm
@@ -235,8 +235,19 @@ sub vianame
 
     $txt = do "unicore/Name.pl" unless $txt;
 
-    if ($txt =~ m/^([0-9A-F]+)\t\t($arg)$/m) {
-        return $vianame{$arg} = hex $1;
+    my $pos = index $txt, "\t\t$arg\n";
+    if ($[ <= $pos) {
+	my $posLF = rindex $txt, "\n", $pos;
+	(my $code = substr $txt, $posLF + 1, 6) =~ tr/\t//d;
+	return $vianame{$arg} = hex $code;
+
+	# If $pos is at the 1st line, $posLF must be $[ - 1 (not found);
+	# then $posLF + 1 equals to $[ (at the beginning of $txt).
+	# Otherwise $posLF is the position of "\n";
+	# then $posLF + 1 must be the position of the next to "\n"
+	# (the beginning of the line).
+	# substr($txt, $posLF + 1, 6) may be "0000\t\t", "00A1\t\t",
+	# "10300\t", "100000", etc. So we can get the code via removing TAB.
     } else {
         return;
     }