keyboard: fix empty key titles

[sheet.git] / chars.plp

diff --git a/chars.plp b/chars.plp
index 83c40abc4ab686a8ad71e31608cf0100721819d6..04420cd123a3558e7170f43b6e120d40dd20f158 100644 (file)
--- a/chars.plp
+++ b/chars.plp
@@ -2,19 +2,27 @@
 
 Html({
        title => 'character support sheet',
-       version => '1.0',
+       version => '1.1',
        keywords => [qw'
                unicode glyph char character reference common ipa symbol sign mark table digraph
        '],
        stylesheet => [qw'light dark mono circus red'],
-       data => [qw( unicode-cover.inc.pl ttfsupport unicode-char.inc.pl )],
+       data => [qw( data/unicode-cover.inc.pl data/font data/unicode-char.inc.pl )],
+       raw => <<'EOT',
+<style>
+       tbody tr:hover th {
+               font-size: 300%;
+               min-width: 1.2em;
+               border-width: 1px;
+       }
+</style>
+EOT
 });
 
-use 5.010;
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 
-my $groupinfo = do 'unicode-cover.inc.pl' or die $@ || $!;
+my $groupinfo = do 'data/unicode-cover.inc.pl' or die $@ || $!;
 
 my @ossel = @{ $groupinfo->{osdefault} };
 my @fontlist = map { $_->{file} }
@@ -22,7 +30,7 @@ my @fontlist = map { $_->{file} }
 
 my %font;
 for my $fontid (@fontlist) {
-               my ($fontmeta, @fontrange) = do "ttfsupport/$fontid.inc.pl";
+               my ($fontmeta, @fontrange) = do "data/font/$fontid.inc.pl";
                $fontmeta or next;
                $font{$fontid} = {
                        (map { (-$_ => $fontmeta->{$_}) } keys %{$fontmeta}),
@@ -34,8 +42,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";
@@ -55,7 +62,7 @@ my $query = eval {
 say "<h1>$title</h1>";
 
 if (!$query) {
-       say "<p>Unicode group not specified: $@</p>";
+       Alert('Unicode group not specified', $@);
        exit;
 };
 
@@ -114,14 +121,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 => '✘']