X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d060777e2e9e8a69dbee19936894cd62174871b6..2337f25b4499555c4ad9755c91c2b930172a35e4:/charset.plp

diff --git a/charset.plp b/charset.plp
index d96ca45..1186585 100644
--- a/charset.plp
+++ b/charset.plp
@@ -19,10 +19,10 @@ Html({
 <h1>Character encoding</h1>
 
 <:
+use POSIX qw( ceil );
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 my $cols = 16;  # columns
-my $colsize = 1;  # increment per column
 
 # generate character table(s)
 # (~16x faster than decoding in loop;
@@ -67,7 +67,7 @@ my @request = map {
 			$row{set} = 'Unicode planes';
 			$row{cell} = do 'charset-ucplanes.inc.pl'
 				or Alert('Table data could not be read', $@ || $!);
-			$colsize = 8;
+			$cols *= 2;
 		}
 		elsif ($row{set} = Encode::resolve_alias($input)) {
 			if ($row{set} eq 'Internal') {
@@ -111,6 +111,7 @@ sub range_cell {
 	my $def = $table->{$offset} or return;
 	my ($len, $class, $name, $title) = @{$def};
 
+	my $colsize = $table->{colsize} || 1;
 	my $attr = '';
 	$len /= $colsize;
 	$name //= $len <= 2 ? 'res' : 'reserved';
@@ -121,8 +122,18 @@ sub range_cell {
 		$rest = $len if $len < $rest; #TODO: optimise
 		if ($len -= $rest) {
 			# continued on new row
-			$table->{$offset + $colsize*$rest} //= [$len*$colsize, "$class joinu", $name, $title];
-			$name = '';
+			my @next = ($len * $colsize, "$class joinu");
+			if ($len > $rest) {
+				# minority remains
+				push @next, $name, $title;
+				$title ||= $name;
+				$name = '';
+			}
+			else {
+				# minority on next row
+				push @next, '"', $title || $name;
+			}
+			$table->{$offset + $colsize*$rest} //= \@next;
 			$class .= ' joind';
 		}
 		$len = $rest;
@@ -146,12 +157,13 @@ sub range_cell {
 }
 
 for my $row (@request) {
+	my $colsize = $row->{cell} && $row->{cell}->{colsize} || 1;
 	printf '<div class="section"><table class="glyphs%s">', !$row->{cell} && ' charmap';
 	my $title = $row->{set};
 	$title .= " <aside>($_)</aside>" for $row->{setnote} // ();
 	printf '<caption>%s</caption>', $title;
 	print '<col>' x ($cols + 1);
-	my $coldigits = $colsize * $cols <= 16 ? 1 : 2;  # uniform length of hexadecimal header
+	my $coldigits = ceil(log($colsize * $cols) / log(16));  # uniform length of hexadecimal header
 	for my $section (qw{thead}) {
 		print "<$section><tr><th>↱";
 		printf '<th>%0*X', $coldigits, $_ * $colsize for 0 .. $cols - 1;
@@ -163,10 +175,6 @@ for my $row (@request) {
 		for my $lsb (0 .. $cols - 1) {
 			my $val = ( ($msb * $cols) + $lsb ) * $colsize;
 			if ($row->{cell}) {
-				if (ref $row->{cell} eq 'CODE') {
-					print $row->{cell}->($val);
-					next;
-				}
 				print range_cell($row->{cell}, $val);
 				next;
 			}