termcol: group h/s/v columns by saturation level

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index c2e66b9603cb9c5221ea4f0b1c623224f0efe066..74bcbc4ae7f7fde7044bdc5f5a9f927e2b2c88b3 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.02';
+use List::Util qw( min max );
 
 sub colcell {
-       my $name = shift;
+       my $name = shift or 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',
@@ -172,11 +192,20 @@ my %col = (
 );
 
 if ($get{v}) {
-       # reorder by brightness
-       $col{arnegame} = [
-               map { $col{arnegame}[$_ + 1] }
-               qw/ -1  0 5 9 12  3 6 10 13 1  4 7 8 11 14 15 2 /
-       ];
+       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) {
+               for my $pal ( $col{$name}) {
+                       $pal = [ map { $pal->[$_ + 1] =~ s/:|$/:$_/r } -1, @{$order} ];
+               }
+       }
 }
 
 my @termlist = qw( cga xterm tango app html xkcd );
@@ -223,15 +252,41 @@ print "</table>\n\n";
 <div class="section">
 <h2>256-colour space</h2>
 <:
+my @colmap;  # saturation => value => hue => colcell
 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);
+                       my @rgb = map { $_ && $_*40 + 55 } $r, $g, $b;
+
+                       my $h = Shiar_Sheet::Colour->new(@rgb)->hue * 35;
+                       my $v = int(max(@rgb) / 255 * 5);
+                       my $s = abs(min(@rgb) - max(@rgb)) / 255 * 7;
+                       my $grey = !$s;
+
+                       $h-- for grep {$h >= $_} 4, 6, 16, 19, 28, 31;
+                       $v = 5 - $v;
+                       $s = 7 - $s - $v;
+                       $s-- if $s;
+
+                       if ($grey) {
+                               $h = 30;  # greyscale hue
+                               $s -= 2;  # lowest saturation for other hues
+                               $v = $s = 0 if $s < 0;  # black at full saturation
+                       }
+
+                       $colmap[$s][$v][$h] = [$index, @rgb];
                }
        }
+}
+
+{
+       print '<table class=mapped>';
+       printf '<colgroup span=%d>', 3 * @{$_} for @colmap;
+       for my $h (0 .. 30) {
+               print '<tr>';
+               print colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
+       }
        print "</table>\n";
 }
 print "\n";