X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/108d13f833e9daeff4ea1552e2e1bee1e0ed8c22..87d94e5fa2a28dac9f26632cc25a29fe088cb1e2:/font.plp diff --git a/font.plp b/font.plp index cc07c05..ec61202 100644 --- a/font.plp +++ b/font.plp @@ -10,12 +10,36 @@ 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 'data/unicode-cover.inc.pl' or die $@ || $!; + + my ($cat, $name) = split m{/}, $get{map}, 2 or die "invalid map\n"; + if (!$name) { + ($cat, $name) = ('table', $cat); + } + + my $row = $groupinfo->{$cat}->{$name} + or die "unknown character group $cat/$name\n"; + my $query = $row->{query}; + + my @map; + for (map { split /[^\d-]/ } $query) { + my @range = split /-/, $_, 2; + m/^[0-9]+$/ or die "Invalid code point $_ in query $query\n" for @range; + push @map, $_ for $range[0] .. ($range[1] // $range[0]); + } + return \@map; + }; + Abort($@, '404 invalid query') if $@; require Unicode::UCD; @@ -28,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 "
%X', $cp; + } + $lastcp = $cp; + } + } + say sprintf ' |
---|
%X', $cp if $colpos++ % $pagecols == 0; my $info = $glyphs->glyph_info($cp); @@ -134,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; @@ -172,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}; } |