charset: warn about include errors

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index 15183cfb479eae12889f06cfd41d5512b3be4c62..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);
@@ -134,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";