termcol: prepend palette title in colour data

diff --git a/termcol.plp b/termcol.plp
index 2d3eea409cfebbc0313c87629d592fbc00bf40cd..96f9b75a472ed08704f37103638a9ec0d6031ba9 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -41,76 +41,67 @@ sub colcell {
 }
 
 my %col = (
-       -html => [
+       html => [
                sprintf('<a title="%s" href="%s">html</a>',
                        'HTML keywords (inherited by CSS≥2.1 and SVG), mostly identical to X11',
                        'http://www.w3.org/TR/css3-color/#html4',
                ),
-       ],
-       html => [
                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 => [
+               undef,  # linux console, kde?
                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 => [
+               undef,  # rxvt except for blues
                qw/000000 CC0000 00CC00 CCCC00 4682B4 CC00CC 00CCCC E5E5E5
                   4C4C4C FF0000 00FF00 FFFF00 1E90FF FF00FF 00FFFF FFFFFF/,
        ],
-#      -tango => default Gnome theme
        tango => [
+               undef,  # default Gnome theme
                qw/2E3436 CC0000 4E9A06 C4A000 3465A4 75507B 06989A D3D7CF
                   555753 EF2929 8AE234 FCE94F 729FCF AD7FA8 34E2E2 EEEEEC/,
        ],
-       -xkcd => [
+       xkcd => [
                sprintf('<a title="%s" href="%s">xkcd</a>',
                        'human averages in xkcd survey results',
                        'http://blog.xkcd.com/2010/05/03/color-survey-results/',
                ),
-       ],
-       xkcd => [
                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 => [
+       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',
                ),
-       ],
-       android => [
                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',
-       ],
        app => [
+               'Term.app',
                qw/000000 C23621 25BC24 ADAD27 492EE1 D338D3 33BBC8 CBCCCD
                   818383 FC391F 31E722 EAEC23 5833FF F935F8 14F0F0 E9EBEB /,
        ],
        putty => [
+               'PuTTY',
                qw/000000 BB0000 00BB00 BBBB00 0000BB BB00BB 00BBBB BBBBBB
                   555555 FF5555 55FF55 FFFF55 5555FF FF55FF 55FFFF FFFFFF /,
        ],
-       -slutty => [
+       slutty => [
                sprintf('<a href="%s" title="%s">SluTTY</a>',
                        'http://www.npjh.com/slutty.html',
                        'PuTTY fork with light colour scheme',
                ),
-       ],
-       slutty => [
                qw/000000 9C1D1D 6C9446 AC9A47 335786 8F6496 486768 E0DCDC
                   2F2F2F CD5757 8FC35B D1C45E 5C81A9 BC95B7 76CBCB EEEEEC /,
        ],
@@ -118,10 +109,10 @@ my %col = (
 
 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} }) {
+       printf "<caption>%s</caption>\n", $col{$term}[0] || $term;
+       for my $num (1 .. $#{ $col{$term} }) {
                my ($rgb, $name) = split /:/, $col{$term}[$num], 2;
-               $name ||= $num;
+               $name ||= $num - 1;
                $name = [ $name, ['#333'] ] if $term eq 'xkcd';
                print '<tr>', colcell($name, $rgb);
        }