X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/7f9b1647257de067fb1ca3c58ac19bae8c747141..2337f25b4499555c4ad9755c91c2b930172a35e4:/charset.plp?ds=sidebyside
diff --git a/charset.plp b/charset.plp
index 33eb679..1186585 100644
--- a/charset.plp
+++ b/charset.plp
@@ -19,10 +19,10 @@ Html({
Character encoding
<:
+use POSIX qw( ceil );
use Shiar_Sheet::FormatChar;
my $glyphs = Shiar_Sheet::FormatChar->new;
my $cols = 16; # columns
-my $colsize = 1; # increment per column
# generate character table(s)
# (~16x faster than decoding in loop;
@@ -67,7 +67,7 @@ my @request = map {
$row{set} = 'Unicode planes';
$row{cell} = do 'charset-ucplanes.inc.pl'
or Alert('Table data could not be read', $@ || $!);
- $colsize = 8;
+ $cols *= 2;
}
elsif ($row{set} = Encode::resolve_alias($input)) {
if ($row{set} eq 'Internal') {
@@ -111,6 +111,7 @@ sub range_cell {
my $def = $table->{$offset} or return;
my ($len, $class, $name, $title) = @{$def};
+ my $colsize = $table->{colsize} || 1;
my $attr = '';
$len /= $colsize;
$name //= $len <= 2 ? 'res' : 'reserved';
@@ -156,12 +157,13 @@ sub range_cell {
}
for my $row (@request) {
+ my $colsize = $row->{cell} && $row->{cell}->{colsize} || 1;
printf '', !$row->{cell} && ' charmap';
my $title = $row->{set};
$title .= " " for $row->{setnote} // ();
printf '%s', $title;
print '' x ($cols + 1);
- my $coldigits = $colsize * $cols <= 16 ? 1 : 2; # uniform length of hexadecimal header
+ my $coldigits = ceil(log($colsize * $cols) / log(16)); # uniform length of hexadecimal header
for my $section (qw{thead}) {
print "<$section>â±";
printf ' | %0*X', $coldigits, $_ * $colsize for 0 .. $cols - 1;
@@ -173,10 +175,6 @@ for my $row (@request) {
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;
}
|
---|