X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/9a4d89685edcb4399aa500d38de84b0101ad09b2..5fadf3bba74628ae85920b5c2d71f804e3256601:/charset.plp
diff --git a/charset.plp b/charset.plp
index e84ae82..e5fdd45 100644
--- a/charset.plp
+++ b/charset.plp
@@ -18,9 +18,8 @@ Html({
Character encoding
<:
-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 +98,7 @@ for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
my @nibble = (0..9, 'A'..'F');
for my $row (@request) {
- printf '', !$row->{cell} && ' charmap';
+ printf '', !$row->{cell} && ' charmap';
printf '%s', $row->{set};
print '' x 17;
for my $section (qw{thead}) {
@@ -122,29 +121,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 = "$glyph" if $prop eq 'Zs';
-
- printf "\n".'%s',
- join(' ', @class), EscapeHTML($desc), $glyph;
+ print "\n".$glyphs->glyph_cell($glyph);
}
print "\n";
}
- print " |
\n";
+ print "
\n";
}
:>