digits: reorder columns to start with zero

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 8b00318a43850ee2a5ad5567de66f317a71589f2..834b71bc03405f32198a348af6a9995f71d20738 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -3,6 +3,7 @@ package Shiar_Sheet::FormatChar;
 use 5.010;
 use strict;
 use warnings;
+use utf8;
 
 use Data::Dump 'pp';
 use PLP::Functions 'EscapeHTML';
@@ -51,7 +52,7 @@ sub glyphs_html {
                EscapeHTML($_[0]), # cell
                join(' | ', map { $_->[1] } @chars), # title
                $chars[0][2], # class
-               join(' ',  grep { defined } map { $_->[3] } @chars), # digraph
+               join(' ',  map { $_->[3] // '…' } @chars), # digraph
        );
 }
 
@@ -80,7 +81,7 @@ sub cell {
 
                $input =~ s/^\\//;  # escaped char
                ($cell, $title, my $class, $mnem, $entity) = $self->glyphs_html($input);
-               my $codepoint = ord(substr $input, 0, 1);
+               my $codepoint = ord $input;
 
                if ($self->{style} eq 'univer') {
                        if ($input =~ /\p{age=unassigned}/) {
@@ -108,7 +109,10 @@ sub cell {
                }
 
                if ($self->{style} eq 'di') {
-                       if ($class =~ /\bu-di\b/) {
+                       if ($mnem =~ /…/) {
+                               # incomplete representation, usually partial
+                       }
+                       elsif ($class =~ /\bu-di\b/) {
                                push @class, ('l4', 'u-di'); # standard digraph
                        }
                        elsif ($class =~ /\bu-prop\b/) {
@@ -177,10 +181,12 @@ sub cell {
                }
        }
 
-       return sprintf('<td%s%s%s>%s%s',
-               defined $title  ? qq{ title="$title"}  : '',
-               @class ? sprintf(' class="%s"', join ' ', @class) : '',
-               $html || '',
+       return sprintf('<%s>%s%s',
+               join(' ', 'td',
+                       defined $title  ? qq{ title="$title"}  : (),
+                       @class ? sprintf('class="%s"', join ' ', @class) : (),
+                       $html || (),
+               ),
                $cell eq '' ? '&nbsp;' : $cell,
                $anno,
        );
@@ -221,9 +227,13 @@ sub table {
                        $colspan++;
                        next;
                }
+               elsif ($cell eq '>-') {
+                       $rows[-1] .= '<th>';
+                       next;
+               }
 
                $rows[-1] .= $self->cell($cell,
-                       $colspan > 1 && qq{ colspan="$colspan"},
+                       $colspan > 1 && qq{colspan="$colspan"},
                );
 
                $colspan = 1;