charset: common unicode cell formatting function

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index 402d8398067851939d1eb7b8fbcb1b2e0faf68be..e55e771f2acd2a78196d0cb41db45db4b060a2c1 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -101,6 +101,43 @@ 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 = '';
+       $name //= $len <= 2 ? 'res' : 'reserved';
+
+       if (my $part = $offset % 16) {
+               # continued row
+               my $cols = 16 - $part;  # remaining
+               $cols = $len if $len < $cols; #TODO: optimise
+               if ($len -= $cols) {
+                       # continued on new row
+                       $table->{$offset + $cols} = [$len, "$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 + $rows * 16} = [$len, "$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};
@@ -116,7 +153,11 @@ for my $row (@request) {
                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;
                        }