common: prepare path request in global variable

[sheet.git] / chars.plp

diff --git a/chars.plp b/chars.plp
index a637eae8528f89b119a46fccd4c93ae1d6c3e944..a175f8d136105b45729a77e3223273686c18ff1c 100644 (file)
--- a/chars.plp
+++ b/chars.plp
@@ -33,8 +33,7 @@ for my $fontid (@fontlist) {
 
 my ($title, $parent) = ('Character overview');
 my $query = eval {
-       for ($ENV{PATH_INFO} || ()) {
-               s{^/}{};
+       for ($Request || ()) {
                return $_ if m{^[0-9 +-]+$};
 
                my ($cat, $name) = split m{/}, $_, 2 or die "invalid query\n";
@@ -113,14 +112,14 @@ for my $chr (@chars) {
        my $codepoint = ord $chr;
        my $ascii = $codepoint <= 127;
 
-       print "<tr><th>$chr\n";
+       say '<tr><th>', $chr;
        my $info = $glyphs->glyph_info($codepoint);
-       my ($class, $name, $mnem, $html, $string) = @$info;
+       my ($class, $name, $mnem, $entity, $string) = @$info;
        print "<td>$_" for sprintf('%X', $codepoint), EscapeHTML($name || '?');
        printf '<td class="%s">%s', @$_ for (
                [$ascii ? 'l0' : defined $mnem ? $class =~ /\bu-di\b/ ? 'l4' : 'l3' : 'l1',
                        EscapeHTML($mnem) // ''],
-               [$ascii ? 'l0' : defined $html ? 'l4' : 'l1', $html // ''],
+               [$ascii ? 'l0' : defined $entity ? 'l4' : 'l1', $entity // ''],
                (map {
                        !defined $font{$_}->{-name} ? [l0 => '?'] :
                        $font{$_}->{$chr} ? [l4 => '✔'] : [l1 => '✘']