unicode: prevent empty row at table header rows

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index ba380356ac7a69debe2060458a36f8117472b132..a80625839c6386d9b80c1c18bae5a2798695da0a 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -6,7 +6,7 @@ use warnings;
 use Data::Dump 'pp';
 use PLP::Functions 'EscapeHTML';
 
-our $VERSION = '1.01';
+our $VERSION = '1.03';
 
 our $diinfo = do 'digraphs.inc.pl';
 our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
@@ -83,9 +83,20 @@ sub cell {
 
                ($cell, $title, my $class, $mnem) = $self->glyphs_html($input);
 
-               if (defined $mnem) {
-                       push @class, 'di-d'; # digraph
-                       push @class, 'di-prop' if $class =~ /\bXz\b/; # unofficial
+               if ($self->{digraph}) {
+                       if (defined $mnem) {
+                               push @class, 'di-d'; # digraph
+                               push @class, 'di-prop' if $class =~ /\bXz\b/; # unofficial
+                       }
+               }
+               else {
+                       my $codepoint = ord(substr $input, 0, 1);
+                       if ($codepoint <= 0xFF) {
+                               push @class, 'di-d';  # latin1
+                       }
+                       elsif ($codepoint <= 0xD7FF) {
+                               push @class, 'di-prop';  # bmp
+                       }
                }
 
                if ($input =~ /[ -~]/) {
@@ -100,12 +111,13 @@ sub cell {
                defined $title  ? qq{ title="$title"}  : '',
                @class ? sprintf(' class="%s"', join ' ', @class) : '',
                $html || '',
-               $cell eq '' ? '&nbsp;' : $cell,
-               $self->{digraph} && defined $mnem && length $mnem
+               $cell eq '' ? ('&nbsp;', '') : ($cell,
+                       $self->{digraph} && defined $mnem && length $mnem
                        ? sprintf(' <small class="digraph">%s</small>', EscapeHTML($mnem))
                        : $self->{unicode} + $cell =~ /^[^a-zA-Z]$/ > 0
                                ? sprintf(' <small class="%s">%04X</small>', 'value', ord $cell)
-                               : '',
+                               : ''
+               ),
        );
 }
 
@@ -130,7 +142,7 @@ sub table {
        for my $cell (@$digraphs) {
                if ($cell =~ s/^\.//) {
                        # dot indicates start of a new row
-                       push @rows, '';
+                       push @rows, '<tr>';
                        if ($cell =~ s/^>//) {
                                # header cell text follows
                                $cell =~ s/_/ /g;  # underscores may be used instead of whitespace (for qw//ability)
@@ -153,7 +165,7 @@ sub table {
 
        return sprintf qq{<table class="glyphs%s">\n%s</table>\n},
                $self->{digraph} || $self->{unicode} >= 0 ? ' dilabel' : '',
-               join '', map {"<tr>$_\n"} @rows;
+               join '', map {"$_\n"} @rows;
 }
 
 sub print {