charset: divide and append row offset label

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index d96ca454159657c87035b4ced238d8535c7c58bb..73b37407b2ff71ecce5fd84f1d526c8aa823caaa 100644 (file)
--- 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,15 @@ sub range_cell {
 }
 
 for my $row (@request) {
+       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;  # divider of row headers
+
        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
        for my $section (qw{thead}) {
                print "<$section><tr><th>↱";
                printf '<th>%0*X', $coldigits, $_ * $colsize for 0 .. $cols - 1;
@@ -159,14 +173,21 @@ for my $row (@request) {
        }
        print '<tbody>';
        for my $msb (0 .. ((length($row->{table}) || 256) - 1) / $cols) {
-               printf '<tr><th>%X', ($msb + int($row->{offset} / $cols)) * $cols * $colsize;
+               print '<tr><th>';
+               {
+                       my $rowlabel = ($msb + int($row->{offset} / $cols)) * $cols * $colsize;
+                       if (my $rowmod = $rowlabel % $rowdiv) {
+                               # offset in column units
+                               printf '<small>+%X</small>', $rowmod;
+                       }
+                       else {
+                               # divided row offset
+                               printf '%X', $rowlabel / $rowdiv;
+                       }
+               }
                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;
                        }