From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 6 Mar 2015 08:09:09 +0000 (+0100)
Subject: font: caption block name
X-Git-Tag: v1.7~42
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/19b5c65d6d32527bdd0edfe5a2c4f4fe0da7dc87

font: caption block name
---

diff --git a/font.plp b/font.plp
index 8867921..8c9b098 100644
--- a/font.plp
+++ b/font.plp
@@ -18,7 +18,8 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
 
 	require Unicode::UCD;
 
-	my $size = 0x200;
+	my $pagerows = 0x200;
+	my $pagecols = 32;
 	my $offset = eval {
 		local $_ = $get{q} || 0;
 		return $_ if /\A\d+\z/;  # numeric
@@ -52,28 +53,47 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
 	say <<"EOT";
 
 <style>
-	.glyphs tbody th { text-align: right }
+	.glyphs tbody th[!colspan] { text-align: right }
 	.glyphs tbody td { font-family: "$fontmeta->{name}" }
 </style>
 EOT
 	say '<table class="glyphs big">';
+
 	say "<caption>$_</caption>" for join(' ', grep {$_}
-		$offset > $size && sprintf('<a rel="start" href="?q=%d">◄</a>', 0),
+		$offset > $pagerows && sprintf('<a rel="start" href="?q=%d">◄</a>', 0),
 		$offset > 0 && sprintf(
 			'<a rel="prev" href="?q=%d" title="U+%1$04X">◅</a>',
-			$offset - $size,
+			$offset - $pagerows,
 		),
-		sprintf('U+%04X', $offset), #TODO: block name
-		$offset + $size < 0x11_0000 && sprintf(
+		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 + $size,
+			$offset + $pagerows,
 		),
 	);
-	for my $cp ($offset .. $offset+$size-1) {
+
+	for my $cp ($offset .. $offset+$pagerows-1) {
+		state $sameblock;
+		my $block = Unicode::UCD::charblock($cp);
+
+		if ($sameblock and $sameblock ne $block and $block ne 'No_Block') {
+			say sprintf '<tbody><tr><th colspan=%d>%s', $pagecols+1, $block;
+			undef $sameblock;
+		}
+
+		if (not $sameblock) {
+			$sameblock = $block;
+			if (my $gap = $cp % $pagecols) {
+				say sprintf '<tr><th>%X<th colspan=%d>', $cp, $gap;
+			}
+		}
+
+		say sprintf '<tr><th>%X', $cp if $cp % $pagecols == 0;
+
 		my $info = $glyphs->glyph_info($cp);
 		my ($class, $name, $mnem, $html, $string) = @{$info};
 		my $np = $class =~ /\bC\S\b/;  # noprint if control or invalid
-		say sprintf '<tr><th>%X', $cp if $cp % 32 == 0;
 		say sprintf '<td class="%s" title="U+%04X%s">%s',
 			!$class ? ('l0', $cp, '', '') :
 			$cover{$cp} ? $np ? 'l2' : 'l5' : $np ? 'Xi' : 'l1',