emoji: silence unused argument warnings

[sheet.git] / font.plp

diff --git a/font.plp b/font.plp
index d4d7debf24147e339fc81579840c33d55aed6fa0..ec612023291030774088846b84e069c3c4020c43 100644 (file)
--- a/font.plp
+++ b/font.plp
@@ -10,17 +10,17 @@ Html({
                script block symbol sign mark reference table
        )],
        stylesheet => [qw( light dark mono circus red )],
-       data => [qw( unicode-cover.inc.pl )],
+       data => [qw( data/unicode-cover.inc.pl )],
 });
 
 if ($font) {
-       my ($fontmeta, @cover) = do "ttfsupport/$font.inc.pl";
-       $fontmeta or die "Unknown font $font\n";
+       my ($fontmeta, @cover) = do "data/font/$font.inc.pl";
+       $fontmeta or Abort("Unknown font $font", '404 font not found');
 
        my $map = eval {
                $get{map} or return;
 
-               my $groupinfo = do 'unicode-cover.inc.pl' or die $@ || $!;
+               my $groupinfo = do 'data/unicode-cover.inc.pl' or die $@ || $!;
 
                my ($cat, $name) = split m{/}, $get{map}, 2 or die "invalid map\n";
                if (!$name) {
@@ -39,7 +39,7 @@ if ($font) {
                }
                return \@map;
        };
-       die $@ if $@;
+       Abort($@, '404 invalid query') if $@;
 
        require Unicode::UCD;
 
@@ -52,7 +52,7 @@ if ($font) {
                return $_->[0]->[0] for Unicode::UCD::charblock(ucfirst) || ();  # block
                die "Unknown offset query '$_'\n";
        };
-       die $@ if $@;
+       Abort($@, '400 invalid offset') if $@;
 
        say "<h1>Font coverage</h1>";
        say "<h2>$_</h2>" for EscapeHTML($fontmeta->{name});
@@ -180,7 +180,7 @@ Character support of Unicode
 
 <:
 
-my $cover = do 'unicode-cover.inc.pl' or die $@ || $!;
+my $cover = do 'data/unicode-cover.inc.pl' or die $@ || $!;
 
 my @ossel = @{ $cover->{osdefault} };
 my @fontlist = map { @{ $cover->{os}->{$_} } } @ossel;
@@ -218,7 +218,7 @@ my @rows = (
 
 if (my $group = $get{q}) {
        my $grouprows = $cover->{$group}
-               or die "Unknown character category $_\n";
+               or Abort("Unknown character category $_", 404);
        @rows = map { "$group/$_" } sort keys %{$grouprows};
 }