termcol: declare rgb maps in include data

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 6c6f68cea57a90abdc22a7905ce00062408ecc4e..715c17492783a2d3d77edbcd591312e64a66871b 100644 (file)
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -158,4 +158,34 @@ use Shiar_Sheet::Colour '1.02';
                        1B2632::night    005784::sea     31A2F2::sky     B2DCEF::cloud
                )],
        },
+
+       cpc => {
+               name => 'Amstrad CPC',
+               rgbmap => [
+                       3 => sub {
+                               $_[2] + 3 * ($_[0] + 3 * $_[1]),
+                               map { $_ && $_ * 127 + 1 } @_
+                       },
+               ],
+       },
+       ansi88 => {
+               name => '88-colour space',
+               rgbmap => [
+                       4 => sub {
+                               $_[2] + 4 * ($_[1] + 4 * $_[0]) + 16,
+                               map { (0, 139, 205, 255)[$_] } @_
+                       },
+                       [ map { ($_ + 2 + ($_>0)) * 255/11 } 0 .. 7 ],
+               ],
+       },
+       ansi256 => {
+               name => '256-colour space',
+               rgbmap => [
+                       6 => sub {
+                               $_[2] + 6 * ($_[1] + 6 * $_[0]) + 16,
+                               map { $_ && $_*40 + 55 } @_
+                       },
+                       [ map { $_ * 10 + 8 } 0 .. 23 ],
+               ],
+       },
 }

diff --git a/termcol.plp b/termcol.plp
index 44ee75bcd53179846ee0f15233cb42509ea5f33a..a040eed1aa161c9661052319977c687889eb01bb 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -73,7 +73,10 @@ if ($get{v}) {
 }
 
 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) {
        my $info = $palettes->{$term};
        ref $info eq 'HASH' or next;
@@ -88,6 +91,13 @@ for my $term (@termlist) {
                $caption,
        ) if $info->{href} or $info->{title};
 
+       if (my $mapinfo = $info->{rgbmap}) {
+               print '<table class="mapped">'."\n";
+               printf "<caption>%s</caption>\n", $caption;
+               print coltable_hsv(@{$mapinfo});
+               print "</table>\n\n";
+       }
+
        if (my $colours = $info->{list}) {
                print '<table>', "\n";
                printf "<caption>%s</caption>\n", $caption;
@@ -101,21 +111,6 @@ for my $term (@termlist) {
        }
 }
 
-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";
-}
-:></div>
-
-<hr>
-
-<div class="section">
-<:
 sub coltable_hsv {
        my ($dim, $rgbval, $greyramp) = @_;
 
@@ -174,31 +169,6 @@ sub coltable_hsv {
        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>