termcol: declare rgb maps in include data

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 686316cf8f8f1cb9b3cb6734913147991c001f9b..a040eed1aa161c9661052319977c687889eb01bb 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -73,9 +73,13 @@ if ($get{v}) {
 }
 
 my @termlist = qw( cga xterm tango app html xkcd );
 }
 
 my @termlist = qw( cga xterm tango app html xkcd );

-push @termlist, qw( c64 msx2 mac2 risc arnegame ) if exists $get{v};
+push @termlist, qw( c64 msx2 mac2 risc arnegame cpc ) if exists $get{v};
+push @termlist, qw( ansi88 );
+push @termlist, qw( ansi256 ) if $ENV{PATH_INFO} =~ /256/;
+

 for my $term (@termlist) {
 for my $term (@termlist) {

-       my ($info, @index) = @{ $palettes->{$term} };
+       my $info = $palettes->{$term};
+       ref $info eq 'HASH' or next;

        my $caption = $info->{name} // $term;
        $caption = sprintf('<%s %s>%s</%1$s>',
                $info->{href} ? 'a' : 'span',
        my $caption = $info->{name} // $term;
        $caption = sprintf('<%s %s>%s</%1$s>',
                $info->{href} ? 'a' : 'span',


@@ -87,32 +91,26 @@ for my $term (@termlist) {
                $caption,
        ) if $info->{href} or $info->{title};
 
                $caption,
        ) if $info->{href} or $info->{title};
 

-       print '<table>', "\n";
-       printf "<caption>%s</caption>\n", $caption;
-       for my $num (0 .. $#index) {
-               my ($rgb, $name) = split /:/, $index[$num], 3;
-               $name ||= $num;
-               $name = [ $name, ['#333'] ] if $term eq 'xkcd';
-               print '<tr>', colcell($name, $rgb);
+       if (my $mapinfo = $info->{rgbmap}) {
+               print '<table class="mapped">'."\n";
+               printf "<caption>%s</caption>\n", $caption;
+               print coltable_hsv(@{$mapinfo});
+               print "</table>\n\n";

        }
        }

-       print "</table>\n\n";
-}

 
 

-if (exists $get{v}) {
-       print "<table class=mapped>\n";
-       print "<caption>Amstrad CPC</caption>\n";
-       print coltable_hsv(3, sub {
-               $_[2] + 3 * ($_[0] + 3 * $_[1]),
-               map { $_ && $_ * 127 + 1 } @_
-       });
-       print "</table>\n\n";
+       if (my $colours = $info->{list}) {
+               print '<table>', "\n";
+               printf "<caption>%s</caption>\n", $caption;
+               for my $num (0 .. $#{$colours}) {
+                       my ($rgb, $name) = split /:/, $colours->[$num], 3;
+                       $name ||= $num;
+                       $name = [ $name, ['#333'] ] if $term eq 'xkcd';
+                       print '<tr>', colcell($name, $rgb);
+               }
+               print "</table>\n\n";
+       }

 }
 }

-:></div>
-
-<hr>

 
 

-<div class="section">
-<:

 sub coltable_hsv {
        my ($dim, $rgbval, $greyramp) = @_;
 
 sub coltable_hsv {
        my ($dim, $rgbval, $greyramp) = @_;
 


@@ -171,31 +169,6 @@ sub coltable_hsv {
        return $out;
 }
 
        return $out;
 }
 

-{
-       print "<h2>88-colour space</h2>\n";
-       print "<table class=mapped>\n";
-       print coltable_hsv(4,
-               sub {
-                       $_[2] + 4 * ($_[1] + 4 * $_[0]) + 16,
-                       map { (0, 139, 205, 255)[$_] } @_
-               },
-               [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 {
-                       $_[2] + 6 * ($_[1] + 6 * $_[0]) + 16,
-                       map { $_ && $_*40 + 55 } @_
-               },
-               [ map { $_ * 10 + 8 } 0 .. 23 ],
-       );
-       print "</table>\n";
-}

 :></div>
 <hr>
 
 :></div>
 <hr>