X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/6907147e74f53469d6a987927ca133fd1a9d587b..b13de6a22c6a8bc47358c506f603ab2b4a0f979b:/font.plp?q=%25d
diff --git a/font.plp b/font.plp
index 5315764..3a39c2e 100644
--- a/font.plp
+++ b/font.plp
@@ -1,23 +1,46 @@
<(common.inc.plp)><:
-use 5.014;
-my $font = $ENV{PATH_INFO} =~ s{^/}{}r;
+my $font = $Request;
Html({
title => 'font coverage '.($font ? "for $font" : 'sheet'),
- version => 'v1.2',
+ version => '1.2',
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";
+ my ($fontmeta, @cover) = do "data/font/$font.inc.pl";
$fontmeta or die "Unknown font $font\n";
+ 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;
+ };
+ die $@ if $@;
+
require Unicode::UCD;
my $pagerows = 0x200;
@@ -51,7 +74,7 @@ if ($font) {
(map { "with $_" } $_ || ()),
('and published as freeware "Core Web font"') x ($_ eq 'Windows 2000'),
(map { "under a $_ license" }
- map { $fontmeta->{license} ? qq($_) : $_ }
+ map { $fontmeta->{license} ? qq($_) : $_ }
$_ && $_ ne 'Android' ? 'proprietary' : 'free',
),
);
@@ -79,21 +102,27 @@ if ($font) {
EOT
say '
';
+ my $offsetlink = '?' . join('&',
+ (map { $_ . '=' . EncodeURI($get{$_}) } grep { defined $get{$_} } qw{ map }),
+ 'q',
+ );
say "$_" for join(' ', grep {$_}
- $offset > $pagerows && sprintf('â', 0),
+ $offset > $pagerows && sprintf('â', $offsetlink, 0),
$offset > 0 && sprintf(
- 'â
',
- $offset - $pagerows,
+ 'â
',
+ $offsetlink, $offset - $pagerows,
),
- sprintf('U+%04X', $offset),
- Unicode::UCD::charblock($offset),
- $offset + $pagerows < 0x11_0000 && sprintf(
- 'â»',
- $offset + $pagerows,
+ sprintf('U+%04X', $map ? $map->[$offset] : $offset),
+ Unicode::UCD::charblock($map ? $map->[$offset] : $offset),
+ $offset + $pagerows < ($map ? @{$map} : 0x11_0000) && sprintf(
+ 'â»',
+ $offsetlink, $offset + $pagerows,
),
);
for my $cp ($offset .. $offset+$pagerows-1) {
+ $cp = $map->[$cp] or next if $map;
+
state $colpos;
my $block = Unicode::UCD::charblock($cp);
if ($block ne (state $sameblock = $block) and $block ne 'No_Block') {
@@ -105,10 +134,26 @@ EOT
$colpos = 0;
}
+ if ($map) {
+ # compare previous code point and indicate gaps
+ state $lastcp = 0;
+ if ($cp != ++$lastcp) {
+ if (!$colpos or $colpos++ % $pagecols > $pagecols - 3) {
+ # nearly last column, start new row
+ $colpos = 0;
+ }
+ else {
+ # mark repositioning in existing row
+ printf '%X', $cp;
+ }
+ $lastcp = $cp;
+ }
+ }
+
say sprintf ' | %X', $cp if $colpos++ % $pagecols == 0;
my $info = $glyphs->glyph_info($cp);
- my ($class, $name, $mnem, $html, $string) = @{$info};
+ 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);
@@ -135,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;
@@ -179,7 +224,7 @@ if (my $group = $get{q}) {
# output character list
-print '';
+print '';
print '';
print ""
for map { scalar @{ $cover->{os}->{$_} } } @ossel;
@@ -227,7 +272,7 @@ for (@rows) {
my $rel = $count / $row->{count};
my $class = $rel < .5 ? 2 : $rel < .9 ? 3 : 4;
- printf '%d%%', "l$class", $rel*100;
+ printf ' | %d', "l$class", $rel*10;
}
say '';
}
| |
---|