X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/cc3aea5b110f944ce10a22cdea96a0b3f6da15c9..1b025f386b84705e81bd75c166bf0f08d5891608:/charset.plp diff --git a/charset.plp b/charset.plp index 15183cf..28c21c9 100644 --- a/charset.plp +++ b/charset.plp @@ -19,28 +19,26 @@ Html({
Encoding $input unknown
\n"; + Alert("Encoding$inputunknown"); } - \%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) { @@ -102,67 +106,96 @@ for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) { } 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; + $attr .= $1 if $class and $class =~ s/( \w+="[^"]*")//; $attr .= sprintf ' class="%s"', $class if $class; $attr .= sprintf ' title="%s"', EscapeHTML($title) if $title; return "
â±"; - print ' | ', $_ for @nibble; + print "<$section> |
---|---|
", $rowdiv == 1 ? '+' : 'â±'; + printf ' | %0*X', $coldigits, $_ * $colsize for 0 .. $cols - 1; print "\n"; } print ' |
%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 = substr $row->{table}, $offset, 1; if ($glyph eq $NOCHAR) { print ' | '; next; @@ -170,9 +203,12 @@ for my $row (@request) { print "\n".$glyphs->glyph_cell($glyph); } + continue { + $offset += $colsize; + } print "\n"; } - print " |