charset: warn about include errors

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index e55e771f2acd2a78196d0cb41db45db4b060a2c1..734d227a0131104c025143e9cb9fd3e299480044 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -62,7 +62,8 @@ 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 printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
                        @nibble = (map { $_.0, $_.8 } 0 .. 7);
                        $nibsize = 8;
                }
@@ -70,12 +71,14 @@ my @request = map {
                        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 printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
                        }
                        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 printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
                        }
                        else {
                                $row{table} = decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
@@ -107,15 +110,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 +129,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 +137,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";
@@ -149,7 +154,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}) {