X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/36266207701530f9b615f5b06b86f29b1178fa34..35a635c705ad1449df22a7cf5f6623b9445e40e3:/font.plp

diff --git a/font.plp b/font.plp
index d4d7deb..07df3bd 100644
--- 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});
@@ -158,10 +158,11 @@ EOT
 		# display literal character, with placeholder circle if non-spacing/enclosing
 		my $html = ($class =~ /\bM[ne]\b/ && chr 9676) . EscapeHTML(chr $cp);
 		say sprintf '<td class="%s" title="U+%04X%s">%s',
-			!$class ? ('l0', $cp, '', '') :
+			!$class ? ('l0', $cp, '', '') : (
 			$cover{$cp} ? $np ? 'l2' : 'l5' : $np ? 'Xi' : 'l1',
 			$cp, !!$name && ": $name",
-			($cover{$cp} || !$np) && $html;
+			($cover{$cp} || !$np) && $html
+			);
 	}
 	say '</table>';
 
@@ -180,7 +181,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 +219,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};
 }