charset: declare most significant includes for page date

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index e84ae8261b63cc22f957afc310dc801b68645b85..26b58e4af9bbcf2baca42b180a89fcb734247c63 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -12,15 +12,15 @@ Html({
                reference common overview table
        '],
        stylesheet => [qw'light'],
+       data => [qw'charset-unicode.inc.pl charset-utf8.inc.pl'],
 });
 
 :>
 <h1>Character encoding</h1>
 
 <:
-my $diinfo = do 'digraphs.inc.pl';
-my %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
-       keys %$diinfo;
+use Shiar_Sheet::FormatChar;
+my $glyphs = Shiar_Sheet::FormatChar->new;
 
 use Encode qw(decode resolve_alias);
 # generate character table(s)
@@ -99,7 +99,7 @@ for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
 
 my @nibble = (0..9, 'A'..'F');
 for my $row (@request) {
-       printf '<section><table class="glyphs%s">', !$row->{cell} && ' charmap';
+       printf '<div class="section"><table class="glyphs%s">', !$row->{cell} && ' charmap';
        printf '<caption>%s</caption>', $row->{set};
        print '<col>' x 17;
        for my $section (qw{thead}) {
@@ -122,29 +122,11 @@ for my $row (@request) {
                                next;
                        }
 
-                       my $info = [ord $glyph];
-                       if (defined (my $mnem = $di{ord $glyph})) {
-                               $info = $diinfo->{$mnem};
-                       }
-                       else {
-                               require Unicode::UCD;
-                               my $fullinfo = Unicode::UCD::charinfo(ord $glyph);
-                               $info = [@$fullinfo{qw/code name category script string/}] if $fullinfo;
-                       }
-                       my ($codepoint, $name, $prop, $script, $string) = @$info;
-
-                       $glyph = EscapeHTML($string || $glyph);
-                       my $desc = sprintf 'U+%04X%s', $codepoint, $name && " ($name)";
-                       my @class = ('X', grep {$_} $prop, $script);
-
-                       $glyph = "<span>$glyph</span>" if $prop eq 'Zs';
-
-                       printf "\n".'<td class="%s" title="%s">%s',
-                               join(' ', @class), EscapeHTML($desc), $glyph;
+                       print "\n".$glyphs->glyph_cell($glyph);
                }
                print "\n";
        }
-       print "</table></section>\n";
+       print "</table></div>\n";
 }
 
 :>
@@ -183,7 +165,7 @@ for my $row (@request) {
        </table>
 
        <table class="glyphs"><tr>
-       <td class="X">unicode 5.0
+       <td class="X">unicode 7.0
        <td class="X Xr">proposed
        <td class="X Xd">deprecated
        <td class="">unassigned