common: common Alert function to format error messages

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index e55e771f2acd2a78196d0cb41db45db4b060a2c1..d3b27b5df1c9513bffbde53de22307f642f3f2e1 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -24,19 +24,18 @@ 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 = $_) {
@@ -51,6 +50,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 +65,38 @@ my @request = map {
                elsif ($input eq 'U') {
                        $row{table} = ' ' x 1024;
                        $row{set} = 'Unicode planes';
-                       $row{cell} = do 'charset-ucplanes.inc.pl';
+                       $row{cell} = do 'charset-ucplanes.inc.pl'
+                               or Alert('Table data could not be read', $@ || $!);
                        @nibble = (map { $_.0, $_.8 } 0 .. 7);
                        $nibsize = 8;
                }
-               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 "<p>Encoding $input unknown</p>\n";
+                       Alert("Encoding <q>$input</q> 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) {
@@ -107,15 +113,16 @@ sub range_cell {
        my ($len, $class, $name, $title) = @{$def};
 
        my $attr = '';
+       $len /= $nibsize;
        $name //= $len <= 2 ? 'res' : 'reserved';
 
-       if (my $part = $offset % 16) {
+       if (my $part = $offset/$nibsize % 16) {
                # continued row
                my $cols = 16 - $part;  # remaining
                $cols = $len if $len < $cols; #TODO: optimise
                if ($len -= $cols) {
                        # continued on new row
-                       $table->{$offset + $cols} = [$len, "$class joinu", $name, $title];
+                       $table->{$offset + $nibsize*$cols} //= [$len*$nibsize, "$class joinu", $name, $title];
                        $name = '';
                        $class .= ' joind';
                }
@@ -125,7 +132,7 @@ sub range_cell {
                # multiple full rows
                if ($len -= $rows << 4) {
                        # partial row remains
-                       $table->{$offset + $rows * 16} = [$len, "$class joinu", '', $title];
+                       $table->{$offset + $nibsize*$rows * 16} //= [$len*$nibsize, "$class joinu", '', $title];
                        $class .= ' joind';
                }
                $attr .= sprintf ' rowspan=%d', $rows;
@@ -133,6 +140,7 @@ sub range_cell {
        }
 
        $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 "<td$attr>$name";
@@ -140,7 +148,9 @@ sub range_cell {
 
 for my $row (@request) {
        printf '<div class="section"><table class="glyphs%s">', !$row->{cell} && ' charmap';
-       printf '<caption>%s</caption>', $row->{set};
+       my $title = $row->{set};
+       $title .= " <aside>($_)</aside>" for $row->{setnote} // ();
+       printf '<caption>%s</caption>', $title;
        print '<col>' x 17;
        for my $section (qw{thead}) {
                print "<$section><tr><th>↱";
@@ -149,7 +159,7 @@ for my $row (@request) {
        }
        print '<tbody>';
        for my $msb (0 .. (length($row->{table}) || 256) - 1 >> 4) {
-               printf '<tr><th>%X', $msb + ($row->{offset} >> 4);
+               printf '<tr><th>%X', ($msb + ($row->{offset} >> 4)) * $nibsize;
                for my $lsb (0 .. $#nibble) {
                        my $val = ( ($msb<<4) + $lsb ) * $nibsize;
                        if ($row->{cell}) {
@@ -171,7 +181,7 @@ for my $row (@request) {
                }
                print "\n";
        }
-       print "</table></div>\n";
+       say '</table></div>';
 }
 
 :>