X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/9a4d89685edcb4399aa500d38de84b0101ad09b2..78e7e013ac8a271fa95b7a740d6b02fb8752c836:/charset.plp?ds=sidebyside
diff --git a/charset.plp b/charset.plp
index e84ae82..402d839 100644
--- a/charset.plp
+++ b/charset.plp
@@ -2,7 +2,7 @@
Html({
title => 'charset cheat sheet',
- version => 'v1.0',
+ version => '1.0',
description => [
"Reference sheet with all glyphs in common character encoding tables,",
"and an overview of Unicode ranges and UTF-8 bytes.",
@@ -12,15 +12,17 @@ Html({
reference common overview table
'],
stylesheet => [qw'light'],
+ data => [qw'charset-unicode.inc.pl charset-utf8.inc.pl'],
});
:>
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;
+my @nibble = (0..9, 'A'..'F');
+my $nibsize = 1;
use Encode qw(decode resolve_alias);
# generate character table(s)
@@ -58,13 +60,15 @@ my @request = map {
$row{set} = sprintf 'Unicode block U+%02Xxx', $start >> 8;
}
elsif ($input eq 'U') {
- $row{table} = ' ' x 512;
+ $row{table} = ' ' x 1024;
$row{set} = 'Unicode planes';
$row{cell} = do 'charset-ucplanes.inc.pl';
+ @nibble = (map { $_.0, $_.8 } 0 .. 7);
+ $nibsize = 8;
}
elsif ($row{set} = resolve_alias($input)) {
if ($row{set} eq 'Internal') {
- $row{table} = ' ' x ($endpoint < 255 ? 640 : 4096);
+ $row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
$row{set} = 'Unicode BMP';
$row{cell} = do 'charset-unicode.inc.pl';
}
@@ -97,9 +101,8 @@ 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}) {
@@ -111,40 +114,23 @@ for my $row (@request) {
for my $msb (0 .. (length($row->{table}) || 256) - 1 >> 4) {
printf '%X', $msb + ($row->{offset} >> 4);
for my $lsb (0 .. $#nibble) {
+ my $val = ( ($msb<<4) + $lsb ) * $nibsize;
if ($row->{cell}) {
- print $row->{cell}->(($msb<<4) + $lsb);
+ print $row->{cell}->($val);
next;
}
- my $glyph = substr $row->{table}, ($msb<<4) + $lsb, 1;
+ my $glyph = substr $row->{table}, $val, 1;
if ($glyph eq $NOCHAR) {
print ' | ';
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";
}
:>
@@ -183,7 +169,7 @@ for my $row (@request) {
- unicode 5.0
+ | unicode 7.0
| proposed
| deprecated
| unassigned
|