X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/130c94fc7747fd586b677f48fbabd2ecf10297c5..4aed151cd144c6c74f28d537c9d8f0285e72fec3:/charset.plp

diff --git a/charset.plp b/charset.plp
index 6577f4c..734d227 100644
--- a/charset.plp
+++ b/charset.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'charset cheat sheet',
-	version => 'v1.0',
+	version => '1.0',
 	description => [
 		"Reference sheet with all glyphs in common character encoding tables,",
 		"and an overview of Unicode ranges and UTF-8 bytes.",
@@ -60,9 +60,10 @@ my @request = map {
 			$row{set} = sprintf 'Unicode block U+%02Xxx', $start >> 8;
 		}
 		elsif ($input eq 'U') {
-			$row{table} = ' ' x 512;
+			$row{table} = ' ' x 1024;
 			$row{set} = 'Unicode planes';
-			$row{cell} = do 'charset-ucplanes.inc.pl';
+			$row{cell} = do 'charset-ucplanes.inc.pl'
+				or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
 			@nibble = (map { $_.0, $_.8 } 0 .. 7);
 			$nibsize = 8;
 		}
@@ -70,12 +71,14 @@ my @request = map {
 			if ($row{set} eq 'Internal') {
 				$row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
 				$row{set} = 'Unicode BMP';
-				$row{cell} = do 'charset-unicode.inc.pl';
+				$row{cell} = do 'charset-unicode.inc.pl'
+					or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
 			}
 			elsif ($row{set} eq 'utf-8-strict') {
 				$row{table} = undef;
 				$row{set} = 'UTF-8';
-				$row{cell} = do 'charset-utf8.inc.pl';
+				$row{cell} = do 'charset-utf8.inc.pl'
+					or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
 			}
 			else {
 				$row{table} = decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
@@ -101,6 +104,45 @@ for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
 	);
 }
 
+sub range_cell {
+	my ($table, $offset) = @_;
+	my $def = $table->{$offset} or return;
+	my ($len, $class, $name, $title) = @{$def};
+
+	my $attr = '';
+	$len /= $nibsize;
+	$name //= $len <= 2 ? 'res' : 'reserved';
+
+	if (my $part = $offset/$nibsize % 16) {
+		# continued row
+		my $cols = 16 - $part;  # remaining
+		$cols = $len if $len < $cols; #TODO: optimise
+		if ($len -= $cols) {
+			# continued on new row
+			$table->{$offset + $nibsize*$cols} = [$len*$nibsize, "$class joinu", $name, $title];
+			$name = '';
+			$class .= ' joind';
+		}
+		$len = $cols;
+	}
+	elsif (my $rows = $len >> 4) {
+		# multiple full rows
+		if ($len -= $rows << 4) {
+			# partial row remains
+			$table->{$offset + $nibsize*$rows * 16} = [$len*$nibsize, "$class joinu", '', $title];
+			$class .= ' joind';
+		}
+		$attr .= sprintf ' rowspan=%d', $rows;
+		$len = 16;
+	}
+
+	$attr .= sprintf ' colspan=%d', $len unless $len == 1;
+	$attr .= $1 if $class and $class =~ s/( \w+="[^"]*")//;
+	$attr .= sprintf ' class="%s"', $class if $class;
+	$attr .= sprintf ' title="%s"', EscapeHTML($title) if $title;
+	return "<td$attr>$name";
+}
+
 for my $row (@request) {
 	printf '<div class="section"><table class="glyphs%s">', !$row->{cell} && ' charmap';
 	printf '<caption>%s</caption>', $row->{set};
@@ -112,11 +154,15 @@ for my $row (@request) {
 	}
 	print '<tbody>';
 	for my $msb (0 .. (length($row->{table}) || 256) - 1 >> 4) {
-		printf '<tr><th>%X', $msb + ($row->{offset} >> 4);
+		printf '<tr><th>%X', ($msb + ($row->{offset} >> 4)) * $nibsize;
 		for my $lsb (0 .. $#nibble) {
 			my $val = ( ($msb<<4) + $lsb ) * $nibsize;
 			if ($row->{cell}) {
-				print $row->{cell}->($val);
+				if (ref $row->{cell} eq 'CODE') {
+					print $row->{cell}->($val);
+					next;
+				}
+				print range_cell($row->{cell}, $val);
 				next;
 			}