termcol: avoid plp code breaks for hsv tables

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index e6851fdb10b36933b14fb422ccac85f8c337b6e7..9262bf35c64a090ccf9e1c8b32c70540060c9893 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -16,12 +16,23 @@ Html({
 :>
 <h1>Terminal colours</h1>
 
+<p>
+<span title="ECMA-48">ANSI</span> (VT100, ISO-6429) 16-colour text palette
+as implemented by various systems and programs.
+<:
+print
+       !exists $get{v} ? 'Also see <a href="?v">8-bit legacy hardware</a> palettes.' :
+       'Also included are 8-bit legacy hardware palettes.';
+:>
+</p>
+
 <div class="section">
 <:
-use Shiar_Sheet::Colour '1.01';
+use Shiar_Sheet::Colour '1.03';
+use List::Util qw( min max );
 
 sub colcell {
-       my $name = shift;
+       my $name = shift // return "<td colspan=3>\n";
        my $col = Shiar_Sheet::Colour->new(@_);
        my $minhex = $col->rgb24;
        my $css     = '#' . $col->rgb48;
@@ -158,6 +169,15 @@ my %col = (
                qw/ 000 000 161 373 117 237 511 267
                    711 733 661 663 141 625 555 777 /,
        ],
+       arnejmp => [
+               sprintf('<a href="%s" title="%s">%s</a>',
+                       'http://androidarts.com/palette/16pal.htm',
+                       "Arne's Japanese Machine Palette v3 (MSX)",
+                       'A:JMP',
+               ),
+               qw/ 000000 191028 46AF45 A1D685 453E78 7664FE 833129 9EC2E8
+                   DC534B E18D79 D6B97B E9D8A1 216C4B D365C8 AFAAB9 F5F4EB /,
+       ],
        arnegame => [
                sprintf('<a href="%s" title="%s">%s</a>',
                        'http://androidarts.com/palette/16pal.htm',
@@ -174,6 +194,11 @@ my %col = (
 if ($get{v}) {
        my %reorder = (
                arnegame => [ 0,5,9,12 , 3,6,10,13,1 , 4,7,8,11,14,15,2 ],
+               arnegame => [ 0,3,10,6,12,9,13,1 , 5,7,11,8,14,4,15,2 ],
+               c64 => [ 0,2,5,9,6,4,3,15 , 11,10,13,7,14,8,12,1 ],
+               msx2 => [ 0,6,2,10,4,13,7,14 , 1,8,3,11,5,9,12,15 ],
+               risc => [ 7,11,13,14,8,12,15,1, 6,5,10,9,4,3,2,0],
+               mac2 => [ 15,3,9,11,6,5,7,12 , 14,2,8,1,13,4,10,0 ],
        );
        $reorder{$_} = $reorder{msx2} for qw( msx1 arnejmp );
        while (my ($name, $order) = each %reorder) {
@@ -201,54 +226,79 @@ for my $term (@termlist) {
 <hr>
 
 <div class="section">
-<h2>88-colour space</h2>
 <:
-for my $r (0 .. 3) {
-       print '<table>';
-       for my $g (0 .. 3) {
-               print '<tr>';
-               for my $b (0 .. 3) {
-                       my $index = $r*4*4 + $g*4 + $b + 16;
-                       print colcell($index, map {(0, 139, 205, 255)[$_]} $r, $g, $b);
+sub coltable_hsv {
+       my ($dim, $rgbval, $greyramp) = @_;
+
+       my $hmax = 2 * $dim * 3;  # each face of the rgb cube
+       my $vmax = $dim - 1;
+       my $smax = $dim - 1;
+
+       my %greymap;  # name => value
+       my @colmap;  # saturation => value => hue => [name, r,g,b]
+       my $offset = 16;
+
+       for my $r (0 .. $dim - 1) {
+               for my $g (0 .. $dim - 1) {
+                       for my $b (0 .. $dim - 1) {
+                               my $index = $r*$dim*$dim + $g*$dim + $b + $offset;
+                               my @rgb = ($r, $g, $b);
+
+                               my $h = Shiar_Sheet::Colour->new(@rgb)->hue * $hmax;
+                               my $v = max(@rgb);
+                               my $s = abs(min(@rgb) - max(@rgb));
+
+                               if (!$s) {
+                                       $greymap{$index} = $rgbval->($r);
+                                       next;
+                               }
+
+                               $v = $vmax - $v;
+                               $s = $smax - $s - $v;
+
+                               $colmap[$s][$v][$h] = [$index, map { $rgbval->($_) } @rgb];
+                       }
                }
        }
-       print "</table>\n";
-}
-print "\n";
 
-print '<table><tr>';
-print colcell(80+$_, (($_ + 2 + ($_>0)) * 255/11) x 3) for 0 .. 7;
-print "</table>\n\n";
+       my $out = '<table class=mapped>';
+       $out .= sprintf '<colgroup span=%d>', 3 * @{$_} for @colmap;
+       my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
+       for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
+               $out .= '<tr>';
+               $out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
+       }
 
-:></div>
-<: if ($ENV{PATH_INFO} =~ /256/) { :>
-<hr>
+       $offset += $dim ** 3;
+       $greymap{$offset++} = $_ for @{$greyramp};
 
-<div class="section">
-<h2>256-colour space</h2>
-<:
-for my $r (0 .. 5) {
-       print '<table>';
-       for my $g (0 .. 5) {
-               print '<tr>';
-               for my $b (0 .. 5) {
-                       my $index = $r*6*6 + $g*6 + $b + 16;
-                       print colcell($index, map { $_ && $_*40 + 55 } $r, $g, $b);
-               }
+       $out .= '<tbody>';
+       my $col = 0;
+       my $colbreak = scalar map { @$_ } @colmap;  # same width as hue rows
+       for my $num (sort { $greymap{$a} <=> $greymap{$b} } keys %greymap) {
+               $out .= '<tr>' unless $col++ % $colbreak;
+               $out .= colcell($num, ($greymap{$num}) x 3);
        }
-       print "</table>\n";
+       $out .= "</table>\n\n";
+
+       return $out;
 }
-print "\n";
 
-       print '<table>';
-for my $row (0, 12) {
-       print '<tr>';
-       print colcell(232+$_, ($_*10 + 8) x 3) for $row .. $row+11;
+{
+       print "<h2>88-colour space</h2>\n";
+       print coltable_hsv(4,
+               sub {(0, 139, 205, 255)[$_[0]]},
+               [map { ($_ + 2 + ($_>0)) * 255/11 } 0 .. 7],
+       );
 }
-       print "</table>\n";
-print "\n";
 
+if ($ENV{PATH_INFO} =~ /256/) {
+       print "<h2>256-colour space</h2>\n";
+       print coltable_hsv(6,
+               sub { $_[0] && $_[0]*40 + 55 },
+               [ map { $_ * 10 + 8 } 0 .. 23 ],
+       );
+}
 :></div>
-<: } :>
 <hr>