X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/6907147e74f53469d6a987927ca133fd1a9d587b..HEAD:/font.plp

diff --git a/font.plp b/font.plp
index 5315764..7019573 100644
--- a/font.plp
+++ b/font.plp
@@ -1,22 +1,45 @@
 <(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.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;
 
@@ -29,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 "<h1>Font coverage</h1>";
 	say "<h2>$_</h2>" for EscapeHTML($fontmeta->{name});
 	printf("<p>Version <strong%s>%s</strong> released %s contains %d glyphs.",
 		!!$_->[2] && qq( title="revision $_->[2]"),
 		$_->[1], $_->[0],
-		scalar @cover,
+		scalar @{ $fontmeta->{cover} },
 	) for [
 		grep { $_ }
 		($fontmeta->{date} || '?') =~ s/T.*//r,
@@ -51,7 +74,7 @@ if ($font) {
 			(map { "with <em>$_</em>" } $_ || ()),
 			('and published as freeware "Core Web font"') x ($_ eq 'Windows 2000'),
 			(map { "under a $_ license" }
-				map { $fontmeta->{license} ? qq(<a href="$fontmeta->{license}">$_</a>) : $_ }
+				map { $fontmeta->{license} ? qq(<a href="$fontmeta->{license}" rel=nofollow>$_</a>) : $_ }
 				$_ && $_ ne 'Android' ? 'proprietary' : 'free',
 			),
 		);
@@ -63,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";
 
@@ -79,21 +102,27 @@ if ($font) {
 EOT
 	say '<table class="glyphs big">';
 
+	my $offsetlink = '?' . join('&amp;',
+		(map { $_ . '=' . EncodeURI($get{$_}) } grep { defined $get{$_} } qw{ map }),
+		'q',
+	);
 	say "<caption>$_</caption>" for join(' ', grep {$_}
-		$offset > $pagerows && sprintf('<a rel="start" href="?q=%d">◄</a>', 0),
+		$offset > $pagerows && sprintf('<a rel="start" href="%s=%d">◄</a>', $offsetlink, 0),
 		$offset > 0 && sprintf(
-			'<a rel="prev" href="?q=%d" title="U+%1$04X">◅</a>',
-			$offset - $pagerows,
+			'<a rel="prev" href="%s=%d" title="U+%2$04X">◅</a>',
+			$offsetlink, $offset - $pagerows,
 		),
-		sprintf('U+%04X', $offset),
-		Unicode::UCD::charblock($offset),
-		$offset + $pagerows < 0x11_0000 && sprintf(
-			'<a rel="next" href="?q=%d" title="U+%1$04X">▻</a>',
-			$offset + $pagerows,
+		sprintf('U+%04X', $map ? $map->[$offset] : $offset),
+		Unicode::UCD::charblock($map ? $map->[$offset] : $offset),
+		$offset + $pagerows < ($map ? @{$map} : 0x11_0000) && sprintf(
+			'<a rel="next" href="%s=%d" title="U+%2$04X">▻</a>',
+			$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,18 +134,37 @@ 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 '<th>%X', $cp;
+				}
+				$lastcp = $cp;
+			}
+		}
+
 		say sprintf '<tr><th>%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);
+		$string ||= ($class =~ /\bM[ne]\b/ && chr 9676) . chr($cp);
+		my $html = $np ? !!$cover{$cp} && sprintf("&#%d;", $cp) :
+			EscapeHTML($string);
 		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;
+			$html
+			);
 	}
 	say '</table>';
 
@@ -135,7 +183,7 @@ Character support of Unicode
 
 <:
 
-my $cover = do 'unicode-cover.inc.pl' or die $@ || $!;
+my $cover = Data('data/unicode-cover');
 
 my @ossel = @{ $cover->{osdefault} };
 my @fontlist = map { @{ $cover->{os}->{$_} } } @ossel;
@@ -173,13 +221,13 @@ 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};
 }
 
 # output character list
 
-print '<table class=mapped>';
+print '<table class="mapped cover">';
 print '<col><col>';
 print "<colgroup span=$_>"
 	for map { scalar @{ $cover->{os}->{$_} } } @ossel;
@@ -227,7 +275,7 @@ for (@rows) {
 
 		my $rel = $count / $row->{count};
 		my $class = $rel < .5 ? 2 : $rel < .9 ? 3 : 4;
-		printf '<td class="%s">%d%%', "l$class", $rel*100;
+		printf '<td class="%s">%d', "l$class", $rel*10;
 	}
 	say '</tr>';
 }