diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-05 22:27:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-05 22:27:26 +0000 |
commit | b56b320b5e2515160073fa1b469514002688fe11 (patch) | |
tree | 965a7100c5e45fca8ec803d22b8b6ce14fca4633 /Master/tlpkg/tlperl/lib/utf8_heavy.pl | |
parent | d26c206452d2e285c3bbf949f34011e4a55fd8f9 (diff) |
tlperl 5.22.1 from siep
git-svn-id: svn://tug.org/texlive/trunk@40252 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlperl/lib/utf8_heavy.pl')
-rw-r--r-- | Master/tlpkg/tlperl/lib/utf8_heavy.pl | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Master/tlpkg/tlperl/lib/utf8_heavy.pl b/Master/tlpkg/tlperl/lib/utf8_heavy.pl index 0d2888f5a49..e0c3d5ed636 100644 --- a/Master/tlpkg/tlperl/lib/utf8_heavy.pl +++ b/Master/tlpkg/tlperl/lib/utf8_heavy.pl @@ -95,9 +95,9 @@ sub _loose_name ($) { # keys TYPE, BITS, EXTRAS, LIST, and NONE with values having the # same meanings as the input parameters. # SPECIALS contains a reference to any special-treatment hash in the + # property. # INVERT_IT is non-zero if the result should be inverted before use # USER_DEFINED is non-zero if the result came from a user-defined - # property. my $file; ## file to load data from, and also part of the %Cache key. # Change this to get a different set of Unicode tables @@ -135,8 +135,11 @@ sub _loose_name ($) { my $caller0 = caller(0); - my $caller1 = $type =~ s/(.+)::// ? $1 : $caller0 eq 'main' ? - 'main' : caller(1); + my $caller1 = $type =~ s/(.+)::// + ? $1 + : $caller0 eq 'main' + ? 'main' + : caller(1); if (defined $caller1 && $type =~ /^I[ns]\w+$/) { my $prop = "${caller1}::$type"; @@ -172,7 +175,11 @@ sub _loose_name ($) { } if (miniperl) { eval "require '$unicore_dir/Heavy.pl'"; - last GETFILE if $@; + if ($@) { + print STDERR __LINE__, ": '$@'\n" if DEBUG; + pop @recursed if @recursed; + return $type; + } } else { require "$unicore_dir/Heavy.pl"; @@ -567,8 +574,8 @@ sub _loose_name ($) { $list = join '', $taint, map { $_->[1] } sort { $a->[0] <=> $b->[0] } - map { /^([0-9a-fA-F]+)/; [ CORE::hex($1), $_ ] } - grep { /^([0-9a-fA-F]+)/ and not $seen{$1}++ } @tmp; # XXX doesn't do ranges right + map { /^([0-9a-fA-F]+)/ && !$seen{$1}++ ? [ CORE::hex($1), $_ ] : () } + @tmp; # XXX doesn't do ranges right } else { # mktables has gone to some trouble to make non-user defined |