charset: formatted column header

Replace hardcoded nibble count by dynamic modulo adjusted for column width.

diff --git a/charset.plp b/charset.plp
index d954e321ff130c194673e02184ad17788f211c12..d96ca454159657c87035b4ced238d8535c7c58bb 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -21,8 +21,8 @@ Html({
 <:
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
-my @nibble = (0..9, 'A'..'F');
-my $nibsize = 1;
+my $cols = 16;  # columns
+my $colsize = 1;  # increment per column
 
 # generate character table(s)
 # (~16x faster than decoding in loop;
@@ -67,8 +67,7 @@ my @request = map {
                        $row{set} = 'Unicode planes';
                        $row{cell} = do 'charset-ucplanes.inc.pl'
                                or Alert('Table data could not be read', $@ || $!);
-                       @nibble = (map { $_.0, $_.8 } 0 .. 7);
-                       $nibsize = 8;
+                       $colsize = 8;
                }
                elsif ($row{set} = Encode::resolve_alias($input)) {
                        if ($row{set} eq 'Internal') {
@@ -113,30 +112,30 @@ sub range_cell {
        my ($len, $class, $name, $title) = @{$def};
 
        my $attr = '';
-       $len /= $nibsize;
+       $len /= $colsize;
        $name //= $len <= 2 ? 'res' : 'reserved';
 
-       if (my $part = $offset/$nibsize % @nibble) {
+       if (my $part = $offset/$colsize % $cols) {
                # continued row
-               my $cols = @nibble - $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];
+                       $table->{$offset + $colsize*$rest} //= [$len*$colsize, "$class joinu", $name, $title];
                        $name = '';
                        $class .= ' joind';
                }
-               $len = $cols;
+               $len = $rest;
        }
-       elsif (my $rows = int($len / @nibble)) {
+       elsif (my $rows = int($len / $cols)) {
                # multiple full rows
-               if ($len -= $rows * @nibble) {
+               if ($len -= $rows * $cols) {
                        # partial row remains
-                       $table->{$offset + $nibsize*$rows * @nibble} //= [$len*$nibsize, "$class joinu", '', $title];
+                       $table->{$offset + $colsize*$rows * $cols} //= [$len*$colsize, "$class joinu", '', $title];
                        $class .= ' joind';
                }
                $attr .= sprintf ' rowspan=%d', $rows;
-               $len = scalar @nibble;
+               $len = $cols;
        }
 
        $attr .= sprintf ' colspan=%d', $len unless $len == 1;
@@ -151,17 +150,18 @@ for my $row (@request) {
        my $title = $row->{set};
        $title .= " <aside>($_)</aside>" for $row->{setnote} // ();
        printf '<caption>%s</caption>', $title;
-       print '<col>' x (@nibble + 1);
+       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>↱";
-               print '<th>', $_ for @nibble;
+               printf '<th>%0*X', $coldigits, $_ * $colsize for 0 .. $cols - 1;
                print "\n";
        }
        print '<tbody>';
-       for my $msb (0 .. ((length($row->{table}) || 256) - 1) / @nibble) {
-               printf '<tr><th>%X', ($msb + int($row->{offset} / @nibble)) * @nibble * $nibsize;
-               for my $lsb (0 .. $#nibble) {
-                       my $val = ( ($msb * @nibble) + $lsb ) * $nibsize;
+       for my $msb (0 .. ((length($row->{table}) || 256) - 1) / $cols) {
+               printf '<tr><th>%X', ($msb + int($row->{offset} / $cols)) * $cols * $colsize;
+               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);