X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/05b96f1d0e64293580fd10484092d339b14b56a2..v1.3-34-g4af2c4c329:/charset.plp?ds=sidebyside
diff --git a/charset.plp b/charset.plp
index e2b2e27..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)
@@ -122,25 +121,7 @@ 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";
}
|