termcol: include colour names with rgb definition

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 6d4d69fe9b2a9832ba7eec99be6c5da1cb6fbf6c..2d3eea409cfebbc0313c87629d592fbc00bf40cd 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -46,19 +46,18 @@ my %col = (
                        'HTML keywords (inherited by CSS≥2.1 and SVG), mostly identical to X11',
                        'http://www.w3.org/TR/css3-color/#html4',
                ),
-               qw/black maroon green olive  navy purple  cyan silver
-                  gray  red    lime  yellow blue fuchsia aqua white/,
-               qw/reset bold dim italic underline blink fastblink
-                  reverse hidden/,
        ],
        html => [
-               qw/000000 800000 008000 808000 000080 800080 008080 C0C0C0
-                  808080 FF0000 00FF00 FFFF00 0000FF FF00FF 00FFFF FFFFFF/,
+               qw/000000:black 800000:maroon  008000:green 808000:olive
+                  000080:navy  800080:purple  008080:cyan  C0C0C0:silver
+                  808080:gray  FF0000:red     00FF00:lime  FFFF00:yellow
+                  0000FF:blue  FF00FF:fuchsia 00FFFF:aqua  FFFFFF:white /,
        ],
 #      -cga => linux console, kde?
        cga => [
                qw/000000 AA0000 00AA00 AA5500 0000AA AA00AA 00AAAA AAAAAA
                   555555 FF5555 55FF55 FFFF55 5555FF FF55FF 55FFFF FFFFFF/,
+#              qw/reset bold dim italic underline blink fastblink reverse hidden/,
        ],
 #      -xterm => rxvt except for blues
        xterm => [
@@ -75,24 +74,24 @@ my %col = (
                        'human averages in xkcd survey results',
                        'http://blog.xkcd.com/2010/05/03/color-survey-results/',
                ),
-               qw/black  maroon green  olive  navy   purple teal   silver
-                  grey   red    lime   yellow blue  fuchsia cyan   white/,
        ],
        xkcd => [
-               qw/000000 650021 15b01a 6e750e 01153e 7e1e9c 029386 c5c9c7
-                  929591 e50000 aaff32 ffff14 0343df ed0dd9 00ffff ffffff/,
+               qw/000000:black 650021:maroon  15b01a:green 6e750e:olive
+                  01153e:navy  7e1e9c:purple  029386:teal  c5c9c7:silver
+                  929591:grey  e50000:red     aaff32:lime  ffff14:yellow
+                  0343df:blue  ed0dd9:fuchsia 00ffff:cyan  ffffff:white /,
        ],
        -android => [
                sprintf('<a href="%s" title="%s">android</a>',
                        'http://developer.android.com/guide/practices/ui_guidelines/icon_design.html',
                        'recommended colour palette for Android icons',
                ),
-               qw/white  light  medium dark   black  blue1  blue2  blue3
-                  green1 green2 green3 orange1 orange2 orange3 red /,
        ],
        android => [
-               qw/FFFFFF BFBFBF 808080 404040 000000 6699FF 3366CC 003399
-                  99CC33 00CC00 669933 FFCC00 FF9900 FF6600 CC0000 /,
+               qw/FFFFFF:white   BFBFBF:light   808080:medium  404040:dark
+                  000000:black   6699FF:blue1   3366CC:blue2   003399:blue3
+                  99CC33:green1  00CC00:green2  669933:green3  FFCC00:orange1
+                  FF9900:orange2 FF6600:orange3 CC0000:red /,
        ],
        -app => [
                'Term.app',
@@ -121,8 +120,8 @@ for my $term (qw/cga xterm tango app html xkcd/) {
        print '<table>', "\n";
        printf "<caption>%s</caption>\n", $col{"-$term"}[0] || $term;
        for my $num (0 .. $#{ $col{$term} }) {
-               my $rgb = $col{$term}[$num];
-               my $name = $col{"-$term"}[$num + 1] || $num;
+               my ($rgb, $name) = split /:/, $col{$term}[$num], 2;
+               $name ||= $num;
                $name = [ $name, ['#333'] ] if $term eq 'xkcd';
                print '<tr>', colcell($name, $rgb);
        }