tools: preserve make errors, ignore empty output

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 6f7a55d979cf7a6d14fcac0839019c828232fce2..c510cd24d1bcdbdcd5bf4e151f8dc6d6d02f2f11 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -1,14 +1,15 @@
 <(common.inc.plp)><:
 
 Html({
-       title => 'terminal colour cheat sheet',
-       version => '1.1',
-       description => [
+       title => ($Request ? 'terminal colour' : 'colour palettes') . ' cheat sheet',
+       version => '1.2',
+       description => [!$Request ? "Comparison of various colour palettes." : (
                "Index of all terminal/console colour codes,",
                "with an example result of various environments.",
-       ],
+       )],
        keywords => [qw'
-               color code terminal console escape table xterm rxvt
+               color colour code terminal console escape table xterm rxvt
+               ansi vt100 8bit 4bit cga ega vga rgb hsv game emulator display
        '],
        data => ['termcol.inc.pl'],
        stylesheet => [qw'light dark'],
@@ -18,32 +19,33 @@ my @draw = map { [$_, s/\W+\z//] } grep { $_ } split m(/),
        $get{img} // exists $get{img} && 'indi.png';
 
 my @termlist;
-push @termlist, split /\W+/, $ENV{PATH_INFO} || 'default';
+push @termlist, split /\W+/, $Request || 'default';
 
-:>
-<h1>Terminal colours</h1>
+say "<h1>$_</h1>\n" for $Request ? 'Colour palettes' : 'Terminal colours';
 
-<p>
-<span title="ECMA-48">ANSI</span> (VT100, ISO-6429) 16-colour text palette
-as implemented by various systems and programs.
-<:
-print
-       "@termlist" ne 'default' ? 'Additional palettes are included as specified.' :
-       'Also see <a href="/termcol/more">8-bit legacy hardware</a> palettes.';
+say '<p>';
+if ("@termlist" eq 'default') {
+       say '<span title="ECMA-48">ANSI</span> (VT100, ISO-6429) 16-colour text palette';
+       say 'as implemented by various systems and programs.';
+       say 'Also see <a href="/termcol/legacy">8-bit legacy hardware</a> palettes.';
+}
+elsif ("@termlist" eq 'legacy') {
+       say 'Colour palettes of various 8-bit legacy systems and retro games.';
+       say 'Also see <a href="/termcol">ANSI console</a> palettes.';
+}
+else {
+       say 'Comparison of requested colour palettes.';
+}
 :>
-</p>
 
 <div class="section">
 <:
-use 5.010;
 use Shiar_Sheet::Colour 1.04;
 use List::Util qw( min max );
 use POSIX qw( ceil );
 
 my $palettes = do 'termcol.inc.pl';
 die "Cannot open palette data: $_\n" for $@ || $! || ();
-my $more = do 'termcol-xcolor.inc.pl';
-$palettes = {%$palettes, %$more};
 
 sub colcell {
        my $name = shift // return "<td>\n";
@@ -104,9 +106,17 @@ sub coltable {
 
        if (ref $info eq 'ARRAY') {
                coltable($_) for @{$info};
+               return;
        }
 
-       ref $info eq 'HASH' or next;
+       if (ref $info eq 'CODE') {
+               coltable($_) for $info->($palettes);
+               return;
+       }
+
+       ref $info eq 'HASH' or return;
+       my $order = $get{order} && $get{order}.'order';
+       my $reorder = $info->{$order} // $palettes->{ $info->{parent} }->{$order};
 
        my $caption = $info->{name} // $term;
        $caption = sprintf('<%s %s>%s</%1$s>',
@@ -119,51 +129,53 @@ sub coltable {
                $caption,
        ) if $info->{href} or $info->{title};
 
-       if (my $mapinfo = $info->{rgbmap}) {
-               print '<table class="color mapped">'."\n";
-               printf "<caption>%s</caption>\n", $caption;
-               print coltable_hsv(@{$mapinfo});
-               print "</table>\n\n";
-       }
+       if ($info->{table} or $info->{rgbmap}) {
+               say '<table class="color mapped">';
+               say sprintf '<caption>%s</caption>', $caption;
 
-       if (my $table = $info->{table}) {
-               print '<table class="color mapped">'."\n";
-               printf "<caption>%s</caption>\n", $caption;
-               for my $row (@$table) {
-                       print '<tr>';
-                       print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
-               }
+               print coltable_hsv(@{$_}) for $info->{rgbmap} || ();
 
-       if (@draw) {
-               my $width = scalar @{ $table->[0] };
-               my @imgpal = map {
-                       [ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
-               } map { @{$_} } @{$table};
-               for (@draw) {
-                       print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
+               if (my $table = $info->{table}) {
+                       $table = [ @{$table}[@{$reorder}] ] if $reorder;
+
+                       for my $row (@$table) {
+                               if (!$row) {
+                                       say '<tbody>';
+                                       next;
+                               }
+                               print '<tr>';
+                               print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
+                       }
+
+                       if (@draw) {
+                               my $width = scalar @{ $table->[0] };
+                               my @imgpal = map {
+                                       [ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
+                               } map { @{$_} } @{$table};
+                               for (@draw) {
+                                       print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
+                               }
+                       }
                }
-       }
-               print "</table>\n\n";
+
+               say "</table>\n";
        }
 
        if (my $palette = $info->{list}) {
-               my $order = $get{order} && $get{order}.'order';
-               my $colours = colorder($palette,
-                       $info->{$order} // $palettes->{ $info->{parent} }->{$order}
-               );
+               my $colours = colorder($palette, $reorder);
 
                my $rows = 8;
                my $columns = ceil(@{$palette} / $rows);
 
-               print '<table class=color>', "\n";
-               printf "<caption>%s</caption>\n", $caption;
+               say '<table class=color>';
+               say sprintf '<caption>%s</caption>', $caption;
                for my $row (0 .. $rows - 1) {
                        print '<tr>';
                        for my $col (0 .. $columns - 1) {
                                my $num = $row + $col * $rows;
                                my ($rgb, $name) = split /:/, $colours->[$num], 3;
                                $name //= $rgb && $num;
-                               $name = [ $name, [] ] if $term =~ /^msx/ and !$num;
+                               $name = [ $name, [] ] if $term =~ /^msx/ and !$name;  # no bg for transparency
                                $name = [ $name, ['#333'] ] if $term eq 'xkcd';
                                print colcell($name, $rgb);
                        }
@@ -175,7 +187,7 @@ sub coltable {
                        );
                        print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
                }
-               print "</table>\n\n";
+               say "</table>\n";
        }
 }