charset: common cell formatting for unicode planes

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index 98a7345b28d072bf254a9ac37f82af7d85812c7a..15183cfb479eae12889f06cfd41d5512b3be4c62 100644 (file)
--- 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.",
@@ -21,6 +21,8 @@ Html({
 <:
 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)
@@ -58,9 +60,11 @@ 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';
+                       @nibble = (map { $_.0, $_.8 } 0 .. 7);
+                       $nibsize = 8;
                }
                elsif ($row{set} = resolve_alias($input)) {
                        if ($row{set} eq 'Internal') {
@@ -97,7 +101,44 @@ for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
        );
 }
 
-my @nibble = (0..9, 'A'..'F');
+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 .= 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};
@@ -109,14 +150,19 @@ 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}->(($msb<<4) + $lsb);
+                               if (ref $row->{cell} eq 'CODE') {
+                                       print $row->{cell}->($val);
+                                       next;
+                               }
+                               print range_cell($row->{cell}, $val);
                                next;
                        }
 
-                       my $glyph = substr $row->{table}, ($msb<<4) + $lsb, 1;
+                       my $glyph = substr $row->{table}, $val, 1;
                        if ($glyph eq $NOCHAR) {
                                print '<td>';
                                next;