X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/19b5c65d6d32527bdd0edfe5a2c4f4fe0da7dc87..290c85c0f46c87ae95eeece911bdd3f57ba51dfd:/font.plp

diff --git a/font.plp b/font.plp
index 8c9b098..a93835c 100644
--- a/font.plp
+++ b/font.plp
@@ -55,6 +55,7 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
 <style>
 	.glyphs tbody th[!colspan] { text-align: right }
 	.glyphs tbody td { font-family: "$fontmeta->{name}" }
+	.glyphs tbody td:nth-child(18) { border-left-width: 2px }
 </style>
 EOT
 	say '<table class="glyphs big">';
@@ -74,31 +75,29 @@ EOT
 	);
 
 	for my $cp ($offset .. $offset+$pagerows-1) {
-		state $sameblock;
+		state $colpos;
 		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) {
+		if ($block ne (state $sameblock = $block) and $block ne 'No_Block') {
+			print '<tbody>';
+			printf '<tr><th colspan=%d>%s', $pagecols+1, $block
+				unless $block eq 'No_Block';
+			say '';
 			$sameblock = $block;
-			if (my $gap = $cp % $pagecols) {
-				say sprintf '<tr><th>%X<th colspan=%d>', $cp, $gap;
-			}
+			$colpos = 0;
 		}
 
-		say sprintf '<tr><th>%X', $cp if $cp % $pagecols == 0;
+		say sprintf '<tr><th>%X', $cp if $colpos++ % $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
+		# display literal character, with placeholder circle if non-spacing/enclosing
+		my $html = ($class =~ /\bM[ne]\b/ && chr 9676) . EscapeHTML(chr $cp);
 		say sprintf '<td class="%s" title="U+%04X%s">%s',
 			!$class ? ('l0', $cp, '', '') :
 			$cover{$cp} ? $np ? 'l2' : 'l5' : $np ? 'Xi' : 'l1',
 			$cp, !!$name && ": $name",
-			($cover{$cp} || !$np) && EscapeHTML(chr $cp);
+			($cover{$cp} || !$np) && $html;
 	}
 	say '</table>';
 
@@ -123,6 +122,8 @@ my @ossel = @{ $cover->{osdefault} };
 my @fontlist = map { @{ $cover->{os}->{$_} } } @ossel;
 
 my @rows = (
+	'version/11',
+	'version/63',
 	'block/Latin-1 Supplement',
 	'block/Latin Extended-A',
 	'block/Latin Extended Additional',
@@ -183,6 +184,7 @@ for (@rows) {
 	my $row = $cover->{$group}->{$name};
 
 	print '<tr>';
+	$name = sprintf 'Unicode v%.1f', $name / 10 if $group eq 'version';
 	$name = sprintf '<a href="%s">%s</a>', EncodeURI("/chars/$group/$name"), EscapeHTML($name)
 		if $row->{count} and $row->{count} < 1280;
 	print '<th>', $name;