X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/9588d24fc5f365734cdc8599134432d59c33f0c2..b13bb406f89eaebf04c8fd8ffe69cde30d5aa0bd:/font.plp?q=%25d diff --git a/font.plp b/font.plp index 0b58eed..d789262 100644 --- a/font.plp +++ b/font.plp @@ -4,18 +4,42 @@ my $font = $Request; Html({ title => 'font coverage '.($font ? "for $font" : 'sheet'), - version => '1.2', + version => '1.4', keywords => [qw( unicode font glyph char character support overview cover coverage 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 = eval { Data("data/font/$font") } + or Abort("Unknown font $font", '404 font not found', ref $@ && $@->[1]); + + my $map = eval { + $get{map} or return; + + my $groupinfo = Data('data/unicode-cover'); + + 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,14 +52,14 @@ if ($font) { return $_->[0]->[0] for Unicode::UCD::charblock(ucfirst) || (); # block die "Unknown offset query '$_'\n"; }; - die $@ if $@; + Abort($@, '400 invalid offset') if $@; say "
Version %s released %s contains %d glyphs.", !!$_->[2] && qq( title="revision $_->[2]"), $_->[1], $_->[0], - scalar @cover, + scalar @{ $fontmeta->{cover} }, ) for [ grep { $_ } ($fontmeta->{date} || '?') =~ s/T.*//r, @@ -62,7 +86,7 @@ if ($font) { require Shiar_Sheet::FormatChar; my $glyphs = Shiar_Sheet::FormatChar->new; - my %cover = map { ($_ => 1) } @cover; # lookup map + my %cover = map { ($_ => 1) } @{ $fontmeta->{cover} }; # lookup map say <<"EOT"; @@ -78,21 +102,27 @@ if ($font) { EOT say '
%X', $cp; + } + $lastcp = $cp; + } + } + say sprintf ' | |
---|---|
%X', $cp if $colpos++ % $pagecols == 0; my $info = $glyphs->glyph_info($cp); my ($class, $name, $mnem, $entity, $string) = @{$info}; my $np = $class =~ /\bC\S\b/; # noprint if control or invalid # display literal character, with placeholder circle if non-spacing/enclosing - my $html = ($class =~ /\bM[ne]\b/ && chr 9676) . EscapeHTML(chr $cp); + $string ||= ($class =~ /\bM[ne]\b/ && chr 9676) . chr($cp); + my $html = $np ? !!$cover{$cp} && sprintf("%d;", $cp) : + EscapeHTML($string); say sprintf ' | %s', - !$class ? ('l0', $cp, '', '') : + !$class ? ('l0', $cp, '', '') : ( $cover{$cp} ? $np ? 'l2' : 'l5' : $np ? 'Xi' : 'l1', $cp, !!$name && ": $name", - ($cover{$cp} || !$np) && $html; + $html + ); } say ' |