<:
use Shiar_Sheet::FormatChar;
my $glyphs = Shiar_Sheet::FormatChar->new;
-my @nibble = (0..9, 'A'..'F');
-my $nibsize = 1;
+my $cols = 16; # columns
+my $colsize = 1; # increment per column
-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)
$row{table} = ' ' x 1024;
$row{set} = 'Unicode planes';
$row{cell} = do 'charset-ucplanes.inc.pl'
- or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
- @nibble = (map { $_.0, $_.8 } 0 .. 7);
- $nibsize = 8;
+ or Alert('Table data could not be read', $@ || $!);
+ $colsize = 8;
+ $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'
- or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+ 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 printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+ 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 {
- say "<p class=error>Encoding <q>$input</q> unknown</p>";
+ Alert("Encoding <q>$input</q> unknown");
}
$row{set} ? \%row : ();
}
();
}
} 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) {
my ($len, $class, $name, $title) = @{$def};
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;
my $title = $row->{set};
$title .= " <aside>($_)</aside>" for $row->{setnote} // ();
printf '<caption>%s</caption>', $title;
- print '<col>' x 17;
+ print '<col>' x ($cols + 1);
+ my $coldigits = $colsize * $cols <= 16 ? 1 : 2; # uniform length of hexadecimal header
for my $section (qw{thead}) {
print "<$section><tr><th>↱";
- print '<th>', $_ for @nibble;
+ printf '<th>%0*X', $coldigits, $_ * $colsize for 0 .. $cols - 1;
print "\n";
}
print '<tbody>';
- for my $msb (0 .. (length($row->{table}) || 256) - 1 >> 4) {
- printf '<tr><th>%X', ($msb + ($row->{offset} >> 4)) * $nibsize;
- for my $lsb (0 .. $#nibble) {
- my $val = ( ($msb<<4) + $lsb ) * $nibsize;
+ for my $msb (0 .. ((length($row->{table}) || 256) - 1) / $cols) {
+ printf '<tr><th>%X', ($msb + int($row->{offset} / $cols)) * $cols * $colsize;
+ for my $lsb (0 .. $cols - 1) {
+ my $val = ( ($msb * $cols) + $lsb ) * $colsize;
if ($row->{cell}) {
- if (ref $row->{cell} eq 'CODE') {
- print $row->{cell}->($val);
- next;
- }
print range_cell($row->{cell}, $val);
next;
}
}
print "\n";
}
- print "</table></div>\n";
+ say '</table></div>';
}
:>