X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/dc6b482b5e7e1d3d35b5193fc820c5e1afc29a6e..3f38a7192491a73a1527179cdd68218f023aed61:/chars.plp

diff --git a/chars.plp b/chars.plp
index 04420cd..1723699 100644
--- a/chars.plp
+++ b/chars.plp
@@ -2,11 +2,10 @@
 
 Html({
 	title => 'character support sheet',
-	version => '1.1',
+	version => '1.2',
 	keywords => [qw'
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
-	stylesheet => [qw'light dark mono circus red'],
 	data => [qw( data/unicode-cover.inc.pl data/font data/unicode-char.inc.pl )],
 	raw => <<'EOT',
 <style>
@@ -22,7 +21,7 @@ EOT
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 
-my $groupinfo = do 'data/unicode-cover.inc.pl' or die $@ || $!;
+my $groupinfo = Data('data/unicode-cover');
 
 my @ossel = @{ $groupinfo->{osdefault} };
 my @fontlist = map { $_->{file} }
@@ -30,11 +29,10 @@ my @fontlist = map { $_->{file} }
 
 my %font;
 for my $fontid (@fontlist) {
-		my ($fontmeta, @fontrange) = do "data/font/$fontid.inc.pl";
-		$fontmeta or next;
+		my $fontmeta = eval { Data("data/font/$fontid") } or next;
 		$font{$fontid} = {
 			(map { (-$_ => $fontmeta->{$_}) } keys %{$fontmeta}),
-			map { (chr $_ => 1) } @fontrange
+			map { (chr $_ => 1) } @{ $fontmeta->{cover} }
 		};
 }
 
@@ -62,8 +60,7 @@ my $query = eval {
 say "<h1>$title</h1>";
 
 if (!$query) {
-	Alert('Unicode group not specified', $@);
-	exit;
+	Abort(["Unicode group not found", $@], '404 no matches');
 };
 
 for ($parent || 'Unicode range') {
@@ -82,15 +79,16 @@ for ($parent || 'Unicode range') {
 my @chars;
 for (map { split /[^\d-]/ } $query) {
 	my @range = split /-/, $_, 2;
-	m/^[0-9]+$/ or die "Invalid code point $_ in query $query\n" for @range;
+	m/^[0-9]+$/ or Abort("Invalid code point $_ in query $query", 400)
+		for @range;
 	push @chars, chr $_ for $range[0] .. ($range[1] // $range[0]);
 }
 
-@chars or die "No match for query $query\n";
+@chars or Abort("No match for query $query", '404 no results');
 
-@chars <= 1500 or die sprintf(
-	'Too many matches (%d) for query %s'."\n",
-	scalar @chars, $query,
+@chars <= 1500 or Abort(
+	sprintf('Too many matches (%d) for query', scalar @chars),
+	'403 not allowed', $query
 );
 
 # output character list