termcol: default values for rgb table colours

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 9262bf35c64a090ccf9e1c8b32c70540060c9893..ead8cb5d9e812522967a4c45bed4f0d2b46e533b 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -233,6 +233,8 @@ sub coltable_hsv {
        my $hmax = 2 * $dim * 3;  # each face of the rgb cube
        my $vmax = $dim - 1;
        my $smax = $dim - 1;
+       $rgbval ||= sub { int $_[0] * 255 / $vmax };
+       $greyramp ||= [];
 
        my %greymap;  # name => value
        my @colmap;  # saturation => value => hue => [name, r,g,b]
@@ -261,7 +263,7 @@ sub coltable_hsv {
                }
        }
 
-       my $out = '<table class=mapped>';
+       my $out = '';
        $out .= sprintf '<colgroup span=%d>', 3 * @{$_} for @colmap;
        my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
        for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
@@ -279,25 +281,28 @@ sub coltable_hsv {
                $out .= '<tr>' unless $col++ % $colbreak;
                $out .= colcell($num, ($greymap{$num}) x 3);
        }
-       $out .= "</table>\n\n";
 
        return $out;
 }
 
 {
        print "<h2>88-colour space</h2>\n";
+       print "<table class=mapped>\n";
        print coltable_hsv(4,
                sub {(0, 139, 205, 255)[$_[0]]},
                [map { ($_ + 2 + ($_>0)) * 255/11 } 0 .. 7],
        );
+       print "</table>\n";
 }
 
 if ($ENV{PATH_INFO} =~ /256/) {
        print "<h2>256-colour space</h2>\n";
+       print "<table class=mapped>\n";
        print coltable_hsv(6,
                sub { $_[0] && $_[0]*40 + 55 },
                [ map { $_ * 10 + 8 } 0 .. 23 ],
        );
+       print "</table>\n";
 }
 :></div>
 <hr>