X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/108d13f833e9daeff4ea1552e2e1bee1e0ed8c22..1b025f386b84705e81bd75c166bf0f08d5891608:/charset.plp

diff --git a/charset.plp b/charset.plp
index 4c01b78..28c21c9 100644
--- a/charset.plp
+++ b/charset.plp
@@ -19,12 +19,10 @@ Html({
 <h1>Character encoding</h1>
 
 <:
+use POSIX qw( ceil );
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
-my @nibble = (0..9, 'A'..'F');
-my $nibsize = 1;
 
-use Encode qw(decode resolve_alias);
 # generate character table(s)
 # (~16x faster than decoding in loop;
 #  substr strings is twice as fast as splitting to an array)
@@ -40,7 +38,7 @@ my %ALIAS = (
 );
 my @request = map {
 	if (my $input = $_) {
-		my %row = (offset => 0);
+		my %row = (offset => 0, cols => 16);
 		my $endpoint = 255;
 		if ($input =~ s/^--//) {
 			$row{offset} = $endpoint > 160 ? 160 : 48;
@@ -67,29 +65,28 @@ my @request = map {
 			$row{table} = ' ' x 1024;
 			$row{set} = 'Unicode planes';
 			$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;
+				or Alert('Table data could not be read', $@ || $!);
+			$row{cols} *= 2;
 		}
-		elsif ($row{set} = resolve_alias($input)) {
+		elsif ($row{set} = Encode::resolve_alias($input)) {
 			if ($row{set} eq 'Internal') {
 				$row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
 				$row{set} = 'Unicode BMP';
 				$row{cell} = do 'charset-unicode.inc.pl'
-					or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+					or Alert('Table data could not be read', $@ || $!);
 			}
 			elsif ($row{set} eq 'utf-8-strict') {
 				$row{table} = undef;
 				$row{set} = 'UTF-8';
 				$row{cell} = do 'charset-utf8.inc.pl'
-					or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+					or Alert('Table data could not be read', $@ || $!);
 			}
 			else {
-				$row{table} = decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
+				$row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
 			}
 		}
 		else {
-			say "<p class=error>Encoding <q>$input</q> unknown</p>";
+			Alert("Encoding <q>$input</q> unknown");
 		}
 		$row{set} ? \%row : ();
 	}
@@ -109,35 +106,48 @@ for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
 }
 
 sub range_cell {
-	my ($table, $offset) = @_;
+	my ($info, $offset) = @_;
+	my $table = $info->{cell} or return;
 	my $def = $table->{$offset} or return;
 	my ($len, $class, $name, $title) = @{$def};
 
+	my $cols = $info->{cols};
+	my $colsize = $table->{colsize} || 1;
 	my $attr = '';
-	$len /= $nibsize;
+	$len /= $colsize;
 	$name //= $len <= 2 ? 'res' : 'reserved';
 
-	if (my $part = $offset/$nibsize % 16) {
+	if (my $part = $offset/$colsize % $cols) {
 		# continued row
-		my $cols = 16 - $part;  # remaining
-		$cols = $len if $len < $cols; #TODO: optimise
-		if ($len -= $cols) {
+		my $rest = $cols - $part;  # remaining
+		$rest = $len if $len < $rest; #TODO: optimise
+		if ($len -= $rest) {
 			# continued on new row
-			$table->{$offset + $nibsize*$cols} //= [$len*$nibsize, "$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 = $cols;
+		$len = $rest;
 	}
-	elsif (my $rows = $len >> 4) {
+	elsif (my $rows = int($len / $cols)) {
 		# multiple full rows
-		if ($len -= $rows << 4) {
+		if ($len -= $rows * $cols) {
 			# partial row remains
-			$table->{$offset + $nibsize*$rows * 16} //= [$len*$nibsize, "$class joinu", '', $title];
+			$table->{$offset + $colsize*$rows * $cols} //= [$len*$colsize, "$class joinu", '', $title];
 			$class .= ' joind';
 		}
 		$attr .= sprintf ' rowspan=%d', $rows;
-		$len = 16;
+		$len = $cols;
 	}
 
 	$attr .= sprintf ' colspan=%d', $len unless $len == 1;
@@ -148,31 +158,44 @@ sub range_cell {
 }
 
 for my $row (@request) {
+	my $cols = $row->{cols};
+	my $colsize = $row->{cell} && $row->{cell}->{colsize} || 1;
+	my $coldigits = ceil(log($colsize * $cols) / log(16));  # uniform length of hexadecimal header
+	my $rowdiv = 16 ** $coldigits;  # row divide for column digits
+	$rowdiv = 1 if $rowdiv != $cols * $colsize;  # divide only if all columns are matched
+	my $offset = 0;
+	my $endpoint = $offset + (length($row->{table}) || 256) * $colsize;
+
 	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 17;
+	print '<col>' x ($cols + 1);
 	for my $section (qw{thead}) {
-		print "<$section><tr><th>↱";
-		print '<th>', $_ for @nibble;
+		print "<$section><tr><th>", $rowdiv == 1 ? '+' : '↱';
+		printf '<th>%0*X', $coldigits, $_ * $colsize for 0 .. $cols - 1;
 		print "\n";
 	}
 	print '<tbody>';
-	for my $msb (0 .. (length($row->{table}) || 256) - 1 >> 4) {
-		printf '<tr><th>%X', ($msb + ($row->{offset} >> 4)) * $nibsize;
-		for my $lsb (0 .. $#nibble) {
-			my $val = ( ($msb<<4) + $lsb ) * $nibsize;
+	while ($offset < $endpoint - 1) {
+		print '<tr><th>';
+		{
+			if (my $rowmod = $offset % $rowdiv) {
+				# offset in column units
+				printf '<small>+%X</small>', $rowmod;
+			}
+			else {
+				# divided row offset
+				printf '%X', ($offset + $row->{offset}) / $rowdiv;
+			}
+		}
+		for (1 .. $cols) {
 			if ($row->{cell}) {
-				if (ref $row->{cell} eq 'CODE') {
-					print $row->{cell}->($val);
-					next;
-				}
-				print range_cell($row->{cell}, $val);
+				print range_cell($row, $offset);
 				next;
 			}
 
-			my $glyph = substr $row->{table}, $val, 1;
+			my $glyph = substr $row->{table}, $offset, 1;
 			if ($glyph eq $NOCHAR) {
 				print '<td>';
 				next;
@@ -180,6 +203,9 @@ for my $row (@request) {
 
 			print "\n".$glyphs->glyph_cell($glyph);
 		}
+		continue {
+			$offset += $colsize;
+		}
 		print "\n";
 	}
 	say '</table></div>';