latin: simplified edgewrite E variant

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 51efa0a233223940a92794089e4591df3aac1a72..3aece81cf64f052ba6fa37283e854d34788e2891 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -2,7 +2,7 @@
 
 Html({
        title => 'terminal colour cheat sheet',
-       version => '1.0',
+       version => '1.1',
        description => [
                "Index of all terminal/console colour codes,",
                "with an example result of various environments.",
@@ -18,17 +18,7 @@ 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';
-
-my %termgroup = (
-       default => [qw( ansi xkcd ansi88 )],
-       more    => [qw( ansi mirc legacy ansi256 )],
-       msx     => [qw( msx1 msx2 arnejmp )],
-       ansi    => [qw( cga xterm tango app html )],
-       legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
-);
-@{$_} = map { $termgroup{$_} ? @{ $termgroup{$_} } : $_ } @{$_}
-       for values %termgroup, \@termlist;
+push @termlist, split /\W+/, $Request || 'default';
 
 :>
 <h1>Terminal colours</h1>
@@ -38,19 +28,21 @@ my %termgroup = (
 as implemented by various systems and programs.
 <:
 print
-       "@termlist" ne "@{ $termgroup{default} }" ? 'Additional palettes are included as specified.' :
+       "@termlist" ne 'default' ? 'Additional palettes are included as specified.' :
        'Also see <a href="/termcol/more">8-bit legacy hardware</a> palettes.';
 :>
 </p>
 
 <div class="section">
 <:
-use 5.010;
-use Shiar_Sheet::Colour '1.04';
+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";
@@ -105,9 +97,16 @@ sub img_egapal {
        } || $@;
 }
 
-for my $term (@termlist) {
+sub coltable {
+       my ($term) = @_;
        my $info = $palettes->{$term};
+
+       if (ref $info eq 'ARRAY') {
+               coltable($_) for @{$info};
+       }
+
        ref $info eq 'HASH' or next;
+
        my $caption = $info->{name} // $term;
        $caption = sprintf('<%s %s>%s</%1$s>',
                $info->{href} ? 'a' : 'span',
@@ -120,32 +119,72 @@ for my $term (@termlist) {
        ) if $info->{href} or $info->{title};
 
        if (my $mapinfo = $info->{rgbmap}) {
-               print '<table class="color mapped">'."\n";
-               printf "<caption>%s</caption>\n", $caption;
+               say '<table class="color mapped">';
+               say sprintf '<caption>%s</caption>', $caption;
                print coltable_hsv(@{$mapinfo});
-               print "</table>\n\n";
+               say "</table>\n";
        }
 
-       if (my $colours = $info->{list}) {
-               if (my $reorder = $info->{ansiorder} and $get{v}) {
-                       $colours = [ map { $colours->[$_] =~ s/:|$/:$_/r } @{$reorder} ];
+       if (my $table = $info->{table}) {
+               say '<table class="color mapped">';
+               say sprintf '<caption>%s</caption>', $caption;
+               for my $row (@$table) {
+                       print '<tr>';
+                       print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
                }
 
-               print '<table class=color>', "\n";
-               printf "<caption>%s</caption>\n", $caption;
-               for my $num (0 .. $#{$colours}) {
-                       my ($rgb, $name) = split /:/, $colours->[$num], 3;
-                       $name //= $num;
-                       $name = [ $name, [] ] if $term =~ /^msx/ and !$num;
-                       $name = [ $name, ['#333'] ] if $term eq 'xkcd';
-                       print '<tr>', colcell($name, $rgb);
+       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, @{$_});
                }
+       }
+               say "</table>\n";
+       }
 
-               print '<tr><td>', img_egapal(\@{$colours}, @{$_}) for @draw;
-               print "</table>\n\n";
+       if (my $palette = $info->{list}) {
+               my $order = $get{order} && $get{order}.'order';
+               my $colours = colorder($palette,
+                       $info->{$order} // $palettes->{ $info->{parent} }->{$order}
+               );
+
+               my $rows = 8;
+               my $columns = ceil(@{$palette} / $rows);
+
+               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, ['#333'] ] if $term eq 'xkcd';
+                               print colcell($name, $rgb);
+                       }
+               }
+
+               for (@draw) {
+                       my $imgpal = colorder($palette,
+                               $info->{ansiorder} // $palettes->{ $info->{parent} }->{ansiorder}
+                       );
+                       print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
+               }
+               say "</table>\n";
        }
 }
 
+sub colorder {
+       my ($palette, $reorder) = @_;
+       return [ map { $palette->[$_] =~ s/:(?![^:])|$/:$_/r } @{$reorder} ]
+               if $reorder;
+       return $palette;
+}
+
 sub coltable_hsv {
        my ($dim, $rgbval, $greyramp) = @_;
 
@@ -171,8 +210,9 @@ sub coltable_hsv {
                                        }
 
                                        $h = 1;  # greyscale hue
-                                       $s = 1;  # lowest saturation for other hues
-                                       $v = $s = $vmax if !$v;  # black at full saturation
+                                       $s = $smax - $v + 1;  # spread brightness over saturation groups
+                                       $v &&= $smax  # highest saturation
+                                               or $v = $s = 1;  # black at initial column
                                }
 
                                $h *= $hmax;
@@ -189,7 +229,7 @@ sub coltable_hsv {
        my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
        for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
                $out .= '<tr>';
-               $out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
+               $out .= colcell(@$_) for map { $_->[$h] } map { reverse @{$_} } @colmap;
        }
 
        if (@greymap) {
@@ -212,6 +252,7 @@ sub coltable_hsv {
        return $out;
 }
 
+coltable($_) for @termlist;
 :></div>
 <hr>