X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/bac74b5934f22cc3d0e971d26fe0275f7f5db7b3..abfe2b33cdf66bbed85b33b3c8b8103201c544f9:/charset.plp?ds=inline
diff --git a/charset.plp b/charset.plp
index 3bf294e..9d7375d 100644
--- a/charset.plp
+++ b/charset.plp
@@ -15,129 +15,259 @@ Html({
data => [qw'charset-unicode.inc.pl charset-utf8.inc.pl'],
});
+my @tablist = split /[^\w-]+/, $Request || 'default';
+
:>
Character encoding
<:
+use POSIX qw( ceil );
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)
-# (~16x faster than decoding in loop;
-# substr strings is twice as fast as splitting to an array)
-my %ALIAS = (
-# default => [qw(unicode utf-8 iso-8859-1 cp437 -cp1252- --iso-8859-15- -koi8-f)],
- default => [qw(unicode- utf-8 iso-8859-1 -cp1252- --iso-8859-15- cp437 -cp850)],
- 0 => [qw(cp437 -cp863)],
- 1 => [qw(iso-8859-1 -cp1252 -MacRoman -cp850)],
- 2 => [qw(iso-8859-2 -cp1250 -cp852 -MacCentralEurRoman -MacCroatian -MacRumanian)],
- 5 => [qw(koi8-f -iso-8859-5 -cp1251 -MacCyrillic -cp855 -cp866)],
- 7 => [qw(iso-8859-7 -cp1253 -MacGreek -cp737 -cp869)],
- 8 => [qw(iso-8859-8 -cp1255 -MacHebrew -cp862)],
-);
-my @request = map {
- if (my $input = $_) {
- my %row = (offset => 0);
- my $endpoint = 255;
- if ($input =~ s/^--//) {
- $row{offset} = $endpoint > 160 ? 160 : 48;
- }
- elsif ($input =~ s/^-//) {
- $row{offset} = $endpoint > 128 ? 128 : 32;
+my @request;
+
+sub tabinput {
+ # generate character table(s)
+ my $input = shift or return;
+
+ state $ALIAS = {
+ default => [qw( unicode+0-192 utf-8 iso-8859-1 iso-8859-15 cp1252 cp437 cp850 )],
+ us => [qw( cp437 cp863 AdobeStandardEncoding gsm0338 )],
+ ebcdic => [qw( cp37 cp500 cp875 cp1026 cp1047 posix-bc )],
+ iso => [map {"iso-8859-$_"} 1 .. 11, 13 .. 16],
+ dos => [qw( cp437 cp865 cp861 cp860 cp863 cp850 cp857 cp852 cp775
+ cp737 cp869 cp866 cp855 cp862 cp864 )],
+ aix => [qw( cp1006 )],
+ win => [qw( cp1252 cp1250 cp1254 cp1257 cp1258 cp1253 cp1251 cp1255 cp1256 cp874 )],
+
+ westeur => [qw( iso-8859-1 iso-8859-15 cp1252 iso-8859-14 cp850 hp-roman8 nextstep MacRoman )],
+ centeur => [qw( iso-8859-2 iso-8859-16 cp1250 cp852 MacRomanian MacCroatian MacCentralEurRoman )], # MacRumanian only for DB
+ turkish => [qw( iso-8859-9 iso-8859-3 cp1254 cp857 MacTurkish )],
+ baltic => [qw( iso-8859-4 iso-8859-13 cp1257 cp775 )],
+ nordic => [qw( iso-8859-10 cp865 cp861 MacIcelandic MacSami )],
+ cyrillic => [qw( koi8-r koi8-u koi8-f iso-8859-5 cp1251 MacCyrillic cp866 cp855 )], # MacUkrainian is broken
+ arabic => [qw( iso-8859-6 cp1006 cp864 cp1256 MacArabic )], # MacFarsi same as MacArabic?
+ greek => [qw( iso-8859-7 cp1253 MacGreek cp737 cp869 )],
+ hebrew => [qw( iso-8859-8 cp1255 MacHebrew cp862 )],
+ thai => [qw( iso-8859-11 cp874 MacThai )],
+ vietnamese => [qw( viscii cp1258 MacVietnamese )],
+ symbol => [qw( symbol dingbats MacDingbats AdobeZdingbat AdobeSymbol )],
+ # iso-code shorthand
+ 1 => 'westeur',
+ 2 => 'centeur',
+ 3 => 'turkish',
+ 4 => 'baltic',
+ 5 => 'cyrillic',
+ 6 => 'arabic',
+ 7 => 'greek',
+ 8 => 'hebrew',
+ 9 => 'turkish',
+ 10 => 'nordic',
+ 11 => 'thai',
+ };
+ if (my $follow = $ALIAS->{$input}) {
+ tabinput($_) for ref $follow ? @{$follow} : $follow;
+ return;
+ }
+
+ state $visible = {}; # all present tables
+ my %row = (offset => 0, cols => 16);
+ my $endpoint = 255;
+ my $params = $input =~ s/[+](.*)\z// ? $1 : undef;
+
+ if (not defined $params) {
+ use List::Util qw( first pairfirst pairs );
+
+ state $INHERIT = {
+ 'cp437' => ['cp850' => 0], # ascii range overridden later
+ 'gsm0338' => ['ascii' => '0-127'],
+
+ 'iso-8859-2' => ['iso-8859-1' => '160'],
+ 'iso-8859-3' => ['iso-8859-1' => '160'],
+ 'iso-8859-4' => ['iso-8859-2' => '160'],
+ 'iso-8859-5' => ['iso-8859-1' => '160'],
+ 'iso-8859-6' => ['iso-8859-1' => '160'],
+ 'iso-8859-7' => ['iso-8859-1' => '160'],
+ 'iso-8859-8' => ['iso-8859-1' => '160'],
+ 'iso-8859-9' => ['iso-8859-1' => '208'],
+ 'iso-8859-10' => ['iso-8859-4' => '160'],
+ 'iso-8859-11' => ['iso-8859-1' => '160'],
+ 'iso-8859-13' => ['iso-8859-4' => '160'],
+ 'iso-8859-14' => ['iso-8859-1' => '160'],
+ 'iso-8859-15' => ['iso-8859-1' => '160-191'],
+ 'iso-8859-16' => ['iso-8859-2' => '160'],
+ 'hp-roman8' => ['iso-8859-1' => '160'],
+
+ 'cp1252' => ['iso-8859-1' => '128-159'],
+ 'cp1250' => ['iso-8859-2' => '128-191'],
+ 'cp1254' => ['iso-8859-9' => '128-159'],
+ 'cp874' => ['iso-8859-11' => '128-159'], # windows-874 actually cp1162
+ 'cp1257' => ['iso-8859-13' => '128'],
+ 'cp1251' => ['cp1252' => '128'],
+ 'cp1253' => ['cp1252' => '128'],
+ 'cp1255' => ['iso-8859-8' => '128-223', 'cp1252' => '128'],
+ 'cp1256' => ['cp1252' => '128'],
+
+ 'cp850' => ['cp437' => '144'],
+ 'cp860' => ['cp437' => '128-175'],
+ 'cp861' => ['cp865' => '128-175'],
+ 'cp863' => ['cp437' => '128-175'],
+ 'cp865' => ['cp437' => '144-175'],
+ 'cp852' => ['cp850' => '128', 'cp437' => '128'],
+ 'cp857' => ['cp850' => '128-239', 'cp437' => '128'],
+ 'cp775' => ['cp850' => '128'], # partial cp437
+ 'cp866' => ['cp437' => '128'],
+ 'cp855' => ['cp437' => '128'],
+ 'cp1006' => ['cp437' => '128'],
+ 'cp737' => ['cp437' => '128'],
+ 'cp869' => ['cp437' => '128'],
+ 'cp862' => ['cp437' => '128'],
+ 'cp864' => ['cp437' => '128'],
+
+ 'koi8-u' => ['koi8-r' => 128],
+ 'koi8-f' => ['koi8-u' => 128],
+
+ 'MacRomanian' => ['MacRoman' => '160'],
+ 'MacCroatian' => ['MacRoman' => '160'],
+ 'MacCentralEurRoman' => ['MacRoman' => '128'],
+ 'MacTurkish' => ['MacRoman' => '208-223'], # F5 is unassigned
+ 'MacCyrillic' => ['MacRoman' => '128'],
+ 'MacHebrew' => ['MacRoman' => '128'],
+ };
+
+ my @parents = @{ $INHERIT->{$input} || [] };
+
+ if (my ($parent, $part) = pairfirst { exists $visible->{$a} } @parents) {
+ $row{parent} = $parent;
+ $params = $part;
+ $_ eq $part or $params = 128 for $visible->{$parent} // ();
}
- if ($input =~ s/-$//) {
- $endpoint = $row{offset} ? $row{offset} < 160 ? 159 : 191 : 127;
+ elsif (exists $visible->{ascii}) {
+ $row{parent} = $parents[0];
+ $params = $parents[1] || 128;
+ exists $visible->{$_} or $visible->{$_} = $params for $row{parent};
+ $params = 128 if $params >= 128; # ascii offset at most
}
- if ($row{offset}) {
- $row{setnote} = 'over cp437' if $input eq 'cp850';
- $row{setnote} = 'over iso-8859-1' if $input =~ /^iso-8859-|^cp125/;
+ elsif (@parents) {
+ $row{parent} = $parents[0];
}
+ exists $visible->{$_} or $visible->{$_} = $params // 0 for $row{parent};
+ }
- if ($input =~ /^U([0-9a-f]+)(?:-([0-9a-f]+))?/) {
- my $start = hex($1) << ($2 ? 4 : 8);
- my $end = $2 ? hex($2) << 4 : $start + 240;
- $row{table} = join '', map { chr } $start .. $end+15;
- utf8::upgrade($row{table}); # prevent latin1 output
- $row{set} = sprintf 'Unicode block U+%02Xxx', $start >> 8;
+ if (defined $params and $params =~ m/^ (\d+) (-\d+)? /x) {
+ $row{offset} = $1;
+ $endpoint = -$2 if $2;
+ }
+
+ if ($input =~ /^U([0-9a-f]+)(?:-([0-9a-f]+))?/) {
+ my $start = hex($1) << ($2 ? 4 : 8);
+ my $end = $2 ? hex($2) << 4 : $start + 240;
+ $row{table} = join '', map { chr } $start .. $end+15;
+ utf8::upgrade($row{table}); # prevent latin1 output
+ $row{len} = length $row{table};
+ $row{set} = sprintf 'Unicode block U+%02Xxx', $start >> 8;
+ }
+ elsif ($input eq 'U') {
+ $row{len} = 1024;
+ $row{set} = 'Unicode planes';
+ $row{cell} = do 'charset-ucplanes.inc.pl'
+ or Alert('Table data could not be read', $@ || $!);
+ $row{cols} *= 2;
+ }
+ elsif ($row{set} = Encode::resolve_alias($input)) {
+ if ($row{set} eq 'Internal') {
+ $row{len} = $endpoint < 255 ? 640 : 8192;
+ $row{set} = 'Unicode BMP';
+ $row{cell} = do 'charset-unicode.inc.pl'
+ or Alert('Table data could not be read', $@ || $!);
}
- elsif ($input eq 'U') {
- $row{table} = ' ' x 1024;
- $row{set} = 'Unicode planes';
- $row{cell} = do 'charset-ucplanes.inc.pl'
- or printf "Table data could not be read: %s.
\n", $@ || $!;
- @nibble = (map { $_.0, $_.8 } 0 .. 7);
- $nibsize = 8;
+ elsif ($row{set} eq 'utf-8-strict') {
+ $row{len} = 256;
+ $row{set} = 'UTF-8';
+ $row{cell} = do 'charset-utf8.inc.pl'
+ or Alert('Table data could not be read', $@ || $!);
}
- elsif ($row{set} = resolve_alias($input)) {
- if ($row{set} eq 'Internal') {
- $row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
- $row{set} = 'Unicode BMP';
- $row{cell} = do 'charset-unicode.inc.pl'
- or printf "Table data could not be read: %s.
\n", $@ || $!;
- }
- elsif ($row{set} eq 'utf-8-strict') {
- $row{table} = undef;
- $row{set} = 'UTF-8';
- $row{cell} = do 'charset-utf8.inc.pl'
- or printf "Table data could not be read: %s.
\n", $@ || $!;
+ else {
+ if ($row{set} eq 'MacHebrew') {
+ # array of possibly multiple characters per code point
+ $row{table} = [
+ map { Encode::decode($row{set}, pack 'C*', $_) } $row{offset} .. $endpoint
+ ];
}
else {
- $row{table} = decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
+ # ~16x faster than decoding in loop;
+ # substr strings is twice as fast as splitting to an array
+ $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
}
+ $row{len} = $endpoint - $row{offset};
+
+ if ($row{set} eq 'cp437' and !$row{offset}) {
+ substr($row{table}, 237, 1) = pack 'U*', 0x3D5; # phi sign
+ substr($row{table}, 0, 32) = pack 'U*', map {hex} qw(
+ 2007 263A 263B 2665 2666 2663 2660 2022
+ 25D8 25CB 25D9 2642 2640 266A 266B 263C
+ 25BA 25C4 2195 203C 00B6 00A7 25AC 21A8
+ 2191 2193 2192 2190 221F 2194 25B2 25BC
+ );
+ }
+
+ $visible->{ascii} = # assume common base
+ $visible->{ $row{set} } = undef;
}
- else {
- say "Encoding $input
unknown
";
- }
- $row{set} ? \%row : ();
}
else {
- ();
+ Alert("Encoding $input
unknown");
+ return;
}
-} map { defined $ALIAS{$_} ? @{ $ALIAS{$_} } : $_ }
- $ENV{PATH_INFO} =~ /\w/ ? split(m{[/+\s]}, $ENV{PATH_INFO}) : 'default';
-my $NOCHAR = chr 0xFFFD;
-
-for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
- substr($request[$cp437]->{table}, 237, 1) = pack 'U*', 0x3D5; # phi sign
- substr($request[$cp437]->{table}, 0, 32) = pack 'U*', map {hex} qw(
- 2007 263A 263B 2665 2666 2663 2660 2022 25D8 25CB 25D9 2642 2640 266A 266B 263C
- 25BA 25C4 2195 203C 00B6 00A7 25AC 21A8 2191 2193 2192 2190 221F 2194 25B2 25BC
- );
+ push @request, \%row;
}
+tabinput($_) for @tablist;
+
+my $NOCHAR = chr 0xFFFD;
sub range_cell {
- my ($table, $offset) = @_;
+ my ($info, $offset) = @_;
+ my $table = $info->{cell} or return;
my $def = $table->{$offset} or return;
my ($len, $class, $name, $title) = @{$def};
+ my $cols = $info->{cols};
+ my $colsize = $table->{colsize} || 1;
my $attr = '';
- $len /= $nibsize;
+ $len /= $colsize;
$name //= $len <= 2 ? 'res' : 'reserved';
- if (my $part = $offset/$nibsize % 16) {
+ if (my $part = $offset/$colsize % $cols) {
# continued row
- my $cols = 16 - $part; # remaining
- $cols = $len if $len < $cols; #TODO: optimise
- if ($len -= $cols) {
+ my $rest = $cols - $part; # remaining
+ $rest = $len if $len < $rest; #TODO: optimise
+ if ($len -= $rest) {
# continued on new row
- $table->{$offset + $nibsize*$cols} //= [$len*$nibsize, "$class joinu", $name, $title];
- $name = '';
+ my @next = ($len * $colsize, "$class joinu");
+ if ($len > $rest) {
+ # minority remains
+ push @next, $name, $title;
+ $title ||= $name;
+ $name = '';
+ }
+ else {
+ # minority on next row
+ push @next, '"', $title || $name;
+ }
+ $table->{$offset + $colsize*$rest} //= \@next;
$class .= ' joind';
}
- $len = $cols;
+ $len = $rest;
}
- elsif (my $rows = $len >> 4) {
+ elsif (my $rows = int($len / $cols)) {
# multiple full rows
- if ($len -= $rows << 4) {
+ if ($len -= $rows * $cols) {
# partial row remains
- $table->{$offset + $nibsize*$rows * 16} //= [$len*$nibsize, "$class joinu", '', $title];
+ $table->{$offset + $colsize*$rows * $cols} //= [$len*$colsize, "$class joinu", '', $title];
$class .= ' joind';
}
$attr .= sprintf ' rowspan=%d', $rows;
- $len = 16;
+ $len = $cols;
}
$attr .= sprintf ' colspan=%d', $len unless $len == 1;
@@ -148,31 +278,46 @@ sub range_cell {
}
for my $row (@request) {
+ my $cols = $row->{cols};
+ my $colsize = $row->{cell} && $row->{cell}->{colsize} || 1;
+ my $coldigits = ceil(log($colsize * $cols) / log(16)); # uniform length of hexadecimal header
+ my $rowdiv = 16 ** $coldigits; # row divide for column digits
+ $rowdiv = 1 if $rowdiv != $cols * $colsize; # divide only if all columns are matched
+ my $offset = 0;
+ my $endpoint = $offset + $row->{len} * $colsize;
+
printf '', !$row->{cell} && ' charmap';
my $title = $row->{set};
- $title .= " " for $row->{setnote} // ();
+ $title .= " "
+ for grep { $_ ne 'iso-8859-1' } $row->{parent} // ();
printf '%s', $title;
- print '' x 17;
+ print '' x ($cols + 1);
for my $section (qw{thead}) {
- print "<$section>â±";
- print ' | ', $_ for @nibble;
+ print "<$section> |
---|
", $rowdiv == 1 ? '+' : 'â±';
+ printf ' | %0*X', $coldigits, $_ * $colsize for 0 .. $cols - 1;
print "\n";
}
print ' |
';
- for my $msb (0 .. (length($row->{table}) || 256) - 1 >> 4) {
- printf '%X', ($msb + ($row->{offset} >> 4)) * $nibsize;
- for my $lsb (0 .. $#nibble) {
- my $val = ( ($msb<<4) + $lsb ) * $nibsize;
+ while ($offset < $endpoint - 1) {
+ print ' |
---|
';
+ {
+ if (my $rowmod = $offset % $rowdiv) {
+ # offset in column units
+ printf '+%X', $rowmod;
+ }
+ else {
+ # divided row offset
+ printf '%X', ($offset + $row->{offset}) / $rowdiv;
+ }
+ }
+ for (1 .. $cols) {
if ($row->{cell}) {
- if (ref $row->{cell} eq 'CODE') {
- print $row->{cell}->($val);
- next;
- }
- print range_cell($row->{cell}, $val);
+ print range_cell($row, $offset);
next;
}
- my $glyph = substr $row->{table}, $val, 1;
+ my $glyph = ref $row->{table} eq 'ARRAY' ? $row->{table}->[$offset] :
+ substr $row->{table}, $offset, 1;
if ($glyph eq $NOCHAR) {
print ' | ';
next;
@@ -180,9 +325,12 @@ for my $row (@request) {
print "\n".$glyphs->glyph_cell($glyph);
}
+ continue {
+ $offset += $colsize;
+ }
print "\n";
}
- print " |
---|
\n";
+ say '';
}
:>