termcol: move generated xcolors include to data/

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index d7c59c171c5c22db71b0d5ac06b08f0aa8d4efa5..c0a4cb0b6032ddf36bd181a0d78a85f8f6c7d1cb 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -136,7 +136,7 @@ sub cell {
                if ($input =~ /[ -~]/) {
                        push @class, 'l5', 'u-ascii'; # ascii
                }
-               elsif ($input =~ /^\p{in=6.0}+$/) {
+               elsif ($input =~ /^\p{in=6.0}+$/ and $input !~ /\p{Co}/) {
                        push @class, 'l2'; # in unicode 6.0
                }
                else {
@@ -248,11 +248,15 @@ sub table {
        my @colheads;
        while ($digraphs->[0] !~ /^\./) {
                my $cell = shift @$digraphs or last;
+               if ($cell eq '>') {
+                       push @colheads, '<tr>';
+                       next;
+               }
                push @colheads, join('',
                        '<',
                        $cell =~ s/^-// ? 'td' : 'th',
                        $cell =~ s/:(.*)// && qq{ title="$1"},
-                       $cell =~ s/^>// && ' colspan=2',
+                       $cell =~ s/^(>+)// && ' colspan='.(length($1) + 1),
                        '>',
                        $cell eq '_' ? '&nbsp;' : $cell
                );