font: mark 16th column

[sheet.git] / common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index 1e3f30a9dd38d97586b78b88b3c071b48d9d2a32..cb282c0a71bf3964895063452803fc8ddb9a6a48 100644 (file)
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -8,7 +8,11 @@ use open ':std' => ':utf8';
 
 use File::stat 'stat';
 use HTTP::Date;
-use Shiar_Sheet::KeySigns qw(%sign);  # dependant on $get{ascii}
+
+$PLP::ERROR = sub {
+       my ($text, $html) = @_;
+       print '<p class="error"><strong>Fatal error</strong>: '.$html."</p>\n\n";
+};
 
 our $style;
 our $showkeys = !exists $get{keys} ? undef :
@@ -22,19 +26,21 @@ sub stylesheet {
        if (exists $get{style}) {
                $style = $styles{ $get{style} };
                require CGI::Cookie;
-               AddCookie(CGI::Cookie->new(
+               if (my $cookie = CGI::Cookie->new(
                        -name    => 'style',
                        -value   => $style,
                        -path    => '/',  # site-wide; current page is confusing to most users
                        -expires => $style ? '+5y' : '-1d',
-               )->as_string);
+               )) {
+                       AddCookie($cookie->as_string);
+               }
        }
 
        $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $_[0];
 
        return join "\n", map { sprintf(
                '<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
-               $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.5", $_
+               $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.6", $_
        ) } @_;
 }
 
@@ -77,17 +83,16 @@ sub Html {
                !$showkeys ? '<style type="text/css"> .no {visibility:hidden} </style>'
                        : $showkeys eq 'ghost' ? '<style type="text/css"> .no, .alias {opacity:.5} </style>'
                        : (),
-               '<script type="text/javascript" src="/keys.js"></script>',
+               '<script type="text/javascript" src="/keys.js?1.6"></script>',
        ) if $meta->{keys};
 
        # flatten arrays
        ref $_ eq 'ARRAY' and $_ = join ' ',  @$_ for $meta->{description};
        ref $_ eq 'ARRAY' and $_ = join ', ', @$_ for $meta->{keywords};
-       ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{rawstyle}, $meta->{raw};
+       ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{raw};
        ref $_ eq 'ARRAY' and $_ = stylesheet(@$_)."\n" for $meta->{stylesheet};
 
        # other vars
-       my $sep = $meta->{charset} eq 'utf-8' ? '•' : ' -- ';
        my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
 
        # leading output
@@ -116,7 +121,7 @@ EOT
         rel="code" title="Written in Perl">plp</a>
        <a href="http://git.shiar.nl/sheet.git/history/HEAD:/$file.plp"
         rel="vcs-git" title="Git repository">$meta->{version}</a>
-       created by <a href="http://shiar.nl/" rel="author">Shiar</a> $sep
+       created by <a href="http://shiar.nl/" rel="author">Shiar</a> •
        <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="copyright"
         title="Licensed under the GNU Affero General Public License, version 3">AGPLv3</a>
 </p>