chars: rename $html parameter from glyph_info method

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index ee0c31065f9c7e716dafb92b38960d8af0a8b911..80546556aae9f5153d73166c8e95b07ad33c8863 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -31,7 +31,7 @@ sub glyph_html {
        my ($self, $char) = @_;
        my $codepoint = ord $char;
        my $info = $self->glyph_info($codepoint);
-       my ($class, $name, $mnem, $html, $string) = @$info;
+       my ($class, $name, $mnem, $entity, $string) = @$info;
 
        my $cell = EscapeHTML($string || $char);
        my $title = sprintf 'U+%04X%s', $codepoint, $name && " ($name)";
@@ -39,7 +39,7 @@ sub glyph_html {
        $cell = "<span>$cell</span>" if $class =~ /\bZs\b/;
        $cell = '&nbsp;' if $cell eq '';
 
-       return ($cell, EscapeHTML($title), "X $class", $mnem, $html);
+       return ($cell, EscapeHTML($title), "X $class", $mnem, $entity);
 }
 
 sub glyphs_html {
@@ -181,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,
        );
@@ -225,9 +227,17 @@ sub table {
                        $colspan++;
                        next;
                }
+               elsif ($cell eq '>-') {
+                       $rows[-1] .= '<th>';
+                       next;
+               }
+               elsif ($cell =~ m/^</) {
+                       $rows[-1] .= '<td>'.$cell;
+                       next;
+               }
 
                $rows[-1] .= $self->cell($cell,
-                       $colspan > 1 && qq{ colspan="$colspan"},
+                       $colspan > 1 && qq{colspan="$colspan"},
                );
 
                $colspan = 1;