digraphs: fix html (escape index chars; thead syntax)

[sheet.git] / digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 075a398ceb6bce8faf7b4424433e44a497f2557b..ab9aab583ee0549e68de3df80bb1f54b27aa64fa 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -42,15 +42,16 @@ my @chars2 = (@chars, ['_']);  # trailing character (extended set)
 
 print '<table><col>';
 print qq'<colgroup span="$_">' for map {scalar @$_} @chars2;
-print "\n";
+print "</colgroup><col>\n";
 for my $section (qw{thead tfoot}) {
        print "<$section><tr><th>&nbsp;";
-       print "<th>$_" for map {@$_} @chars2;
+       print '<th>', quote($_) for map {@$_} @chars2;
+       print "<th>&nbsp;\n";
 }
 for my $c1group (@chars) {
        print '<tbody>';
        for my $c1 (@$c1group) {
-               print "<tr><th>$c1";
+               print '<tr><th>', quote($c1);
                for my $c2 (map {@$_} @chars2) {
                        my $mnem = $c1 . $c2;
                        if (not defined $di->{$mnem}) {
@@ -61,9 +62,9 @@ for my $c1group (@chars) {
                                printf '<td class="X Xr" title="%s">', quote($mnem);
                                next;
                        }
-                       my ($codepoint, $name, $prop, $script) = @{ $di->{$mnem} };
+                       my ($codepoint, $name, $prop, $script, $string) = @{ $di->{$mnem} };
 
-                       my $glyph = chr $codepoint;
+                       my $glyph = $string || chr $codepoint;
                        utf8::upgrade($glyph);  # prevent latin1 output
                        my $desc = $mnem . ($name && " ($name)");
                        my @class = ('X', grep {$_} $prop, $script);
@@ -74,7 +75,7 @@ for my $c1group (@chars) {
                        printf "\n".'<td class="%s" title="%s">%s',
                                join(' ', @class), quote($desc), $glyph;
                }
-               print "\n<th>$c1\n";
+               print "\n<th>", quote($c1), "\n";
        }
 }
 print "</table>\n";
@@ -96,6 +97,7 @@ print "</table>\n";
        <td class="X Latin">latin
        <td class="X Hebrew">hebrew
        <td class="X Arabic">arabic
+       <td class="X Hangul">korean
        <td class="X Hiragana">japanese
        <td class="X Bopomofo">chinese
        </table>