X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/4e051d54eec34ed62a4fa8982c2b34493a61e016..ccf2f210912568cc5c5188a821de5a48368021a5:/charset.plp?ds=sidebyside
diff --git a/charset.plp b/charset.plp
index 73b3740..92b918f 100644
--- a/charset.plp
+++ b/charset.plp
@@ -15,6 +15,8 @@ Html({
data => [qw'charset-unicode.inc.pl charset-utf8.inc.pl'],
});
+my @tablist = split /[^\w-]+/, $Request || 'default';
+
:>
Character encoding
@@ -22,95 +24,123 @@ Html({
use POSIX qw( ceil );
use Shiar_Sheet::FormatChar;
my $glyphs = Shiar_Sheet::FormatChar->new;
-my $cols = 16; # columns
-
-# 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;
- }
- if ($input =~ s/-$//) {
- $endpoint = $row{offset} ? $row{offset} < 160 ? 159 : 191 : 127;
- }
- if ($row{offset}) {
- $row{setnote} = 'over cp437' if $input eq 'cp850';
- $row{setnote} = 'over iso-8859-1' if $input =~ /^iso-8859-|^cp125/;
- }
- 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;
- }
- elsif ($input eq 'U') {
- $row{table} = ' ' x 1024;
- $row{set} = 'Unicode planes';
- $row{cell} = do 'charset-ucplanes.inc.pl'
+sub tabinput {
+ # generate character table(s)
+ my $input = shift or return;
+
+ state $ALIAS = {
+ default => [qw(unicode- utf-8 iso-8859-1 -cp1252-- --iso-8859-15-- cp437 -cp850)],
+ us => [qw( cp437 -cp863 AdobeStandardEncoding gsm0338-- )],
+ ebcdic => [qw( cp37 cp500 cp875 cp1026 cp1047 posix-bc )],
+ westeur => [qw( iso-8859-1 --iso-8859-15-- -cp1252-- --iso-8859-14 -cp850 -MacRoman -nextstep --hp-roman8 )],
+ centeur => [qw( iso-8859-2 --iso-8859-16 -cp1250 -cp852 -MacCentralEurRoman -MacCroatian -MacRomanian )], # MacRumanian only for DB
+ turkish => [qw( iso-8859-3 -iso-8859-9 -cp857 -cp1254 -MacTurkish )],
+ baltic => [qw( iso-8859-4 --iso-8859-13 -cp775 -cp1257 )],
+ nordic => [qw( iso-8859-10 -cp865 --cp861-- -MacIcelandic --MacSami )],
+ cyrillic => [qw( koi8-f -koi8-r- --koi8-u- -iso-8859-5 -cp1251 -MacCyrillic -cp855 -cp866 )], # 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}) {
+ return map { tabinput($_) } ref $follow ? @{$follow} : $follow;
+ }
+
+ my %row = (offset => 0, cols => 16);
+ my $endpoint = 255;
+ if ($input =~ s/^--//) {
+ $row{offset} = $endpoint > 160 ? 160 : 48;
+ }
+ elsif ($input =~ s/^-//) {
+ $row{offset} = $endpoint > 128 ? 128 : 32;
+ }
+ if ($input =~ s/--$//) {
+ $endpoint = $row{offset} ? $row{offset} < 160 ? 159 : 191 : 127;
+ }
+ elsif ($input =~ s/-$//) {
+ $endpoint = 192;
+ }
+ if ($row{offset}) {
+ $row{setnote} = 'over cp437' if $input eq 'cp850';
+ $row{setnote} = 'over iso-8859-1' if $input =~ /^iso-8859-|^cp125/;
+ }
+
+ 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;
+ }
+ elsif ($input eq 'U') {
+ $row{table} = ' ' x 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{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
+ $row{set} = 'Unicode BMP';
+ $row{cell} = do 'charset-unicode.inc.pl'
or Alert('Table data could not be read', $@ || $!);
- $cols *= 2;
}
- elsif ($row{set} = Encode::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 Alert('Table data could not be read', $@ || $!);
- }
- elsif ($row{set} eq 'utf-8-strict') {
- $row{table} = undef;
- $row{set} = 'UTF-8';
- $row{cell} = do 'charset-utf8.inc.pl'
- or Alert('Table data could not be read', $@ || $!);
- }
- else {
- $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
- }
+ elsif ($row{set} eq 'utf-8-strict') {
+ $row{table} = undef;
+ $row{set} = 'UTF-8';
+ $row{cell} = do 'charset-utf8.inc.pl'
+ or Alert('Table data could not be read', $@ || $!);
}
else {
- Alert("Encoding $input
unknown");
+ $row{table} = Encode::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)
+
+ if ($row{set} eq 'cp437') {
+ 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
+ );
+ }
}
- $row{set} ? \%row : ();
}
else {
- ();
+ Alert("Encoding $input
unknown");
+ return;
}
-} map { defined $ALIAS{$_} ? @{ $ALIAS{$_} } : $_ }
- $Request =~ /\w/ ? split(m{[/+\s]}, $Request) : '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
- );
+ return \%row;
}
+my @request = map { tabinput($_) } @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 /= $colsize;
@@ -157,9 +187,13 @@ 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; # divider of row headers
+ 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 + (length($row->{table}) || 256) * $colsize;
printf '', !$row->{cell} && ' charmap';
my $title = $row->{set};
@@ -167,32 +201,30 @@ for my $row (@request) {
printf '%s', $title;
print '' x ($cols + 1);
for my $section (qw{thead}) {
- print "<$section>â±";
+ 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) / $cols) {
+ while ($offset < $endpoint - 1) {
print '';
{
- my $rowlabel = ($msb + int($row->{offset} / $cols)) * $cols * $colsize;
- if (my $rowmod = $rowlabel % $rowdiv) {
+ if (my $rowmod = $offset % $rowdiv) {
# offset in column units
printf '+%X', $rowmod;
}
else {
# divided row offset
- printf '%X', $rowlabel / $rowdiv;
+ printf '%X', ($offset + $row->{offset}) / $rowdiv;
}
}
- for my $lsb (0 .. $cols - 1) {
- my $val = ( ($msb * $cols) + $lsb ) * $colsize;
+ for (1 .. $cols) {
if ($row->{cell}) {
- print range_cell($row->{cell}, $val);
+ print range_cell($row, $offset);
next;
}
- my $glyph = substr $row->{table}, $val, 1;
+ my $glyph = substr $row->{table}, $offset, 1;
if ($glyph eq $NOCHAR) {
print ' | ';
next;
@@ -200,6 +232,9 @@ for my $row (@request) {
print "\n".$glyphs->glyph_cell($glyph);
}
+ continue {
+ $offset += $colsize;
+ }
print "\n";
}
say ' |
---|
';