X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/81aefba6ac586eccbe18b4e90efc175e34fff5ad..1b025f386b84705e81bd75c166bf0f08d5891608:/charset.plp?ds=sidebyside
diff --git a/charset.plp b/charset.plp
index 402d839..28c21c9 100644
--- a/charset.plp
+++ b/charset.plp
@@ -19,28 +19,26 @@ Html({
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)],
+ 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 %row = (offset => 0, cols => 16);
my $endpoint = 255;
if ($input =~ s/^--//) {
$row{offset} = $endpoint > 160 ? 160 : 48;
@@ -51,6 +49,10 @@ my @request = map {
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);
@@ -62,35 +64,37 @@ my @request = map {
elsif ($input eq 'U') {
$row{table} = ' ' x 1024;
$row{set} = 'Unicode planes';
- $row{cell} = do 'charset-ucplanes.inc.pl';
- @nibble = (map { $_.0, $_.8 } 0 .. 7);
- $nibsize = 8;
+ $row{cell} = do 'charset-ucplanes.inc.pl'
+ or Alert('Table data could not be read', $@ || $!);
+ $row{cols} *= 2;
}
- elsif ($row{set} = resolve_alias($input)) {
+ 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';
+ $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';
+ $row{cell} = do 'charset-utf8.inc.pl'
+ or Alert('Table data could not be read', $@ || $!);
}
else {
- $row{table} = decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
+ $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
}
}
else {
- print "Encoding $input unknown
\n";
+ Alert("Encoding $input
unknown");
}
- \%row;
+ $row{set} ? \%row : ();
}
else {
();
}
} map { defined $ALIAS{$_} ? @{ $ALIAS{$_} } : $_ }
- $ENV{PATH_INFO} =~ /\w/ ? split(m{[/+\s]}, $ENV{PATH_INFO}) : 'default';
+ $Request =~ /\w/ ? split(m{[/+\s]}, $Request) : 'default';
my $NOCHAR = chr 0xFFFD;
for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
@@ -101,26 +105,97 @@ for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
);
}
+sub range_cell {
+ 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;
+ $name //= $len <= 2 ? 'res' : 'reserved';
+
+ if (my $part = $offset/$colsize % $cols) {
+ # continued row
+ my $rest = $cols - $part; # remaining
+ $rest = $len if $len < $rest; #TODO: optimise
+ if ($len -= $rest) {
+ # continued on new row
+ 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 = $rest;
+ }
+ elsif (my $rows = int($len / $cols)) {
+ # multiple full rows
+ if ($len -= $rows * $cols) {
+ # partial row remains
+ $table->{$offset + $colsize*$rows * $cols} //= [$len*$colsize, "$class joinu", '', $title];
+ $class .= ' joind';
+ }
+ $attr .= sprintf ' rowspan=%d', $rows;
+ $len = $cols;
+ }
+
+ $attr .= sprintf ' colspan=%d', $len unless $len == 1;
+ $attr .= $1 if $class and $class =~ s/( \w+="[^"]*")//;
+ $attr .= sprintf ' class="%s"', $class if $class;
+ $attr .= sprintf ' title="%s"', EscapeHTML($title) if $title;
+ return "$name";
+}
+
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 + (length($row->{table}) || 256) * $colsize;
+
printf '', !$row->{cell} && ' charmap';
- printf '%s', $row->{set};
- print '' x 17;
+ my $title = $row->{set};
+ $title .= " " for $row->{setnote} // ();
+ printf '%s', $title;
+ 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);
- 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}) {
- print $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;
@@ -128,9 +203,12 @@ for my $row (@request) {
print "\n".$glyphs->glyph_cell($glyph);
}
+ continue {
+ $offset += $colsize;
+ }
print "\n";
}
- print " |
---|
\n";
+ say '';
}
:>
|