termcol: move palette data into separate include

diff --git a/termcol.inc.pl b/termcol.inc.pl
new file mode 100644 (file)
index 0000000..6927868
--- /dev/null
+++ b/termcol.inc.pl
@@ -0,0 +1,142 @@
+use strict;
+use Shiar_Sheet::Colour '1.02';
+
++{
+       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',
+               ),
+               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 => [
+               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 => [
+               undef,  # rxvt except for blues
+               qw/000000 CC0000 00CC00 CCCC00 4682B4 CC00CC 00CCCC E5E5E5
+                  4C4C4C FF0000 00FF00 FFFF00 1E90FF FF00FF 00FFFF FFFFFF/,
+       ],
+       tango => [
+               undef,  # default Gnome theme
+               qw/2E3436 CC0000 4E9A06 C4A000 3465A4 75507B 06989A D3D7CF
+                  555753 EF2929 8AE234 FCE94F 729FCF AD7FA8 34E2E2 EEEEEC/,
+       ],
+       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/',
+               ),
+               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/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',
+               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 => [
+               sprintf('<a href="%s" title="%s">SluTTY</a>',
+                       'http://www.npjh.com/slutty.html',
+                       'PuTTY fork with light colour scheme',
+               ),
+               qw/000000 9C1D1D 6C9446 AC9A47 335786 8F6496 486768 E0DCDC
+                  2F2F2F CD5757 8FC35B D1C45E 5C81A9 BC95B7 76CBCB EEEEEC /,
+       ],
+       mac2 => [
+               'MacII',
+               qw/FFFFFF FBF305 FF6403 DD0907 F20884 4700A5 0000D3 02ABEA
+                  1FB714 006412 562C05 90713A C0C0C0 808080 404040 000000 /,
+       ],
+       risc => [
+               'RISC',  # v2/3
+               qw/FFFFFF DDDDDD BBBBBB 999999 777777 555555 333333 000000
+                  004499 EEEE00 00CC00 DD0000 EEEEBB 558800 FFBB00 00BBFF /,
+       ],
+       c64 => [
+               'C=64',  # commodore 64/128
+               map {
+                       # 5-bit luma ± 2-bit colour angle
+                       my ($y, $neg, $hue) = split /(-)|\+/;
+
+                       # convert to yuv
+                       my ($u, $v) = (0, 0);
+                       if (defined $hue) {
+                               my $RAD = 3.14159;
+                               $hue *= $RAD / 8;
+                               $hue += $RAD if $neg;
+                               $u = cos $hue;
+                               $v = sin $hue;
+                       }
+
+                       # convert to rgb
+                       $y *= 255 / 32;
+                       $_ = $_ * 127.5 + 128 for $u, $v;
+                       Shiar_Sheet::Colour->newyuv($y, $u, $v)->rgb48;
+               }
+               qw/ 0    32  10+5 20-5 12+2 16-2 8+0  24-0
+                   12+6 8+7 16+5 10   15   24-2 15+0 20 /,
+       ],
+       msx1 => [
+               'MSX',
+               map {
+                       my ($y, @c) = split /;/;
+                       $y *= 255;
+                       $_ = ($_ - .47) / .53 * 127.5 + 128 for @c;
+                       Shiar_Sheet::Colour->newyuv($y, @c)->rgb48;
+               }
+               qw/ 0.00;0.47;0.47 0.00;0.47;0.47 0.53;0.20;0.07 0.67;0.27;0.17
+                   0.40;1.00;0.40 0.53;0.93;0.43 0.47;0.30;0.83 0.73;0.70;0.00
+                   0.53;0.27;0.93 0.67;0.27;0.93 0.73;0.07;0.57 0.80;0.17;0.57
+                   0.47;0.23;0.13 0.53;0.67;0.73 0.80;0.47;0.47 1.00;0.47;0.47 /,
+       ],
+       msx2 => [
+               'MSX2',
+               map { s{([0-7])}{sprintf '%02X', $1 / 7 * 255}egr }
+               qw/ 000 000 161 373 117 237 511 267
+                   711 733 661 663 141 625 555 777 /,
+       ],
+       arnejmp => [
+               sprintf('<a href="%s" title="%s">%s</a>',
+                       'http://androidarts.com/palette/16pal.htm',
+                       "Arne's Japanese Machine Palette v3 (MSX)",
+                       'A:JMP',
+               ),
+               qw/ 000000 191028 46AF45 A1D685 453E78 7664FE 833129 9EC2E8
+                   DC534B E18D79 D6B97B E9D8A1 216C4B D365C8 AFAAB9 F5F4EB /,
+       ],
+       arnegame => [
+               sprintf('<a href="%s" title="%s">%s</a>',
+                       'http://androidarts.com/palette/16pal.htm',
+                       'Generic 16 color game palette v20 by Arne Niklas Jansson',
+                       'Arne',
+               ),
+               qw/ 000000::void     9D9D9D::ash     FFFFFF::blind   BE2633::bloodred
+                   E06F8B::pigmeat  493C2B::oldpoop A46422::newpoop EB8931::blaze
+                   F7E26B::zornskin 2F484E::shade   44891A::leaf    A3CE27::slime
+                   1B2632::night    005784::sea     31A2F2::sky     B2DCEF::cloud /,
+       ],
+}

diff --git a/termcol.plp b/termcol.plp
index 4f97abae5cbdb0bc44bc0807c62e6ba5d9818b08..9411ba436523b7bc965b8b99ccaa947b4cd95b60 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -10,6 +10,7 @@ Html({
        keywords => [qw'
                color code terminal console escape table xterm rxvt
        '],
        keywords => [qw'
                color code terminal console escape table xterm rxvt
        '],

+       data => ['termcol.inc.pl'],

        stylesheet => [qw'light dark'],
 });
 
        stylesheet => [qw'light dark'],
 });
 


@@ -31,6 +32,9 @@ print
 use Shiar_Sheet::Colour '1.03';
 use List::Util qw( min max );
 
 use Shiar_Sheet::Colour '1.03';
 use List::Util qw( min max );
 

+my $palettes = do 'termcol.inc.pl';
+die "Cannot open palette data: $_\n" for $@ || $! || ();
+

 sub colcell {
        my $name = shift // return "<td colspan=3>\n";
        my $col = Shiar_Sheet::Colour->new(@_);
 sub colcell {
        my $name = shift // return "<td colspan=3>\n";
        my $col = Shiar_Sheet::Colour->new(@_);


@@ -51,146 +55,6 @@ sub colcell {
        return "$out\n";
 }
 
        return "$out\n";
 }
 

-my %col = (
-       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',
-               ),
-               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 => [
-               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 => [
-               undef,  # rxvt except for blues
-               qw/000000 CC0000 00CC00 CCCC00 4682B4 CC00CC 00CCCC E5E5E5
-                  4C4C4C FF0000 00FF00 FFFF00 1E90FF FF00FF 00FFFF FFFFFF/,
-       ],
-       tango => [
-               undef,  # default Gnome theme
-               qw/2E3436 CC0000 4E9A06 C4A000 3465A4 75507B 06989A D3D7CF
-                  555753 EF2929 8AE234 FCE94F 729FCF AD7FA8 34E2E2 EEEEEC/,
-       ],
-       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/',
-               ),
-               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/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',
-               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 => [
-               sprintf('<a href="%s" title="%s">SluTTY</a>',
-                       'http://www.npjh.com/slutty.html',
-                       'PuTTY fork with light colour scheme',
-               ),
-               qw/000000 9C1D1D 6C9446 AC9A47 335786 8F6496 486768 E0DCDC
-                  2F2F2F CD5757 8FC35B D1C45E 5C81A9 BC95B7 76CBCB EEEEEC /,
-       ],
-       mac2 => [
-               'MacII',
-               qw/FFFFFF FBF305 FF6403 DD0907 F20884 4700A5 0000D3 02ABEA
-                  1FB714 006412 562C05 90713A C0C0C0 808080 404040 000000 /,
-       ],
-       risc => [
-               'RISC',  # v2/3
-               qw/FFFFFF DDDDDD BBBBBB 999999 777777 555555 333333 000000
-                  004499 EEEE00 00CC00 DD0000 EEEEBB 558800 FFBB00 00BBFF /,
-       ],
-       c64 => [
-               'C=64',  # commodore 64/128
-               map {
-                       # 5-bit luma ± 2-bit colour angle
-                       my ($y, $neg, $hue) = split /(-)|\+/;
-
-                       # convert to yuv
-                       my ($u, $v) = (0, 0);
-                       if (defined $hue) {
-                               my $RAD = 3.14159;
-                               $hue *= $RAD / 8;
-                               $hue += $RAD if $neg;
-                               $u = cos $hue;
-                               $v = sin $hue;
-                       }
-
-                       # convert to rgb
-                       $y *= 255 / 32;
-                       $_ = $_ * 127.5 + 128 for $u, $v;
-                       Shiar_Sheet::Colour->newyuv($y, $u, $v)->rgb48;
-               }
-               qw/ 0    32  10+5 20-5 12+2 16-2 8+0  24-0
-                   12+6 8+7 16+5 10   15   24-2 15+0 20 /,
-       ],
-       msx1 => [
-               'MSX',
-               map {
-                       my ($y, @c) = split /;/;
-                       $y *= 255;
-                       $_ = ($_ - .47) / .53 * 127.5 + 128 for @c;
-                       Shiar_Sheet::Colour->newyuv($y, @c)->rgb48;
-               }
-               qw/ 0.00;0.47;0.47 0.00;0.47;0.47 0.53;0.20;0.07 0.67;0.27;0.17
-                   0.40;1.00;0.40 0.53;0.93;0.43 0.47;0.30;0.83 0.73;0.70;0.00
-                   0.53;0.27;0.93 0.67;0.27;0.93 0.73;0.07;0.57 0.80;0.17;0.57
-                   0.47;0.23;0.13 0.53;0.67;0.73 0.80;0.47;0.47 1.00;0.47;0.47 /,
-       ],
-       msx2 => [
-               'MSX2',
-               map { s{([0-7])}{sprintf '%02X', $1 / 7 * 255}egr }
-               qw/ 000 000 161 373 117 237 511 267
-                   711 733 661 663 141 625 555 777 /,
-       ],
-       arnejmp => [
-               sprintf('<a href="%s" title="%s">%s</a>',
-                       'http://androidarts.com/palette/16pal.htm',
-                       "Arne's Japanese Machine Palette v3 (MSX)",
-                       'A:JMP',
-               ),
-               qw/ 000000 191028 46AF45 A1D685 453E78 7664FE 833129 9EC2E8
-                   DC534B E18D79 D6B97B E9D8A1 216C4B D365C8 AFAAB9 F5F4EB /,
-       ],
-       arnegame => [
-               sprintf('<a href="%s" title="%s">%s</a>',
-                       'http://androidarts.com/palette/16pal.htm',
-                       'Generic 16 color game palette v20 by Arne Niklas Jansson',
-                       'Arne',
-               ),
-               qw/ 000000::void     9D9D9D::ash     FFFFFF::blind   BE2633::bloodred
-                   E06F8B::pigmeat  493C2B::oldpoop A46422::newpoop EB8931::blaze
-                   F7E26B::zornskin 2F484E::shade   44891A::leaf    A3CE27::slime
-                   1B2632::night    005784::sea     31A2F2::sky     B2DCEF::cloud /,
-       ],
-);
-

 if ($get{v}) {
        my %reorder = (
                arnegame => [ 0,5,9,12 , 3,6,10,13,1 , 4,7,8,11,14,15,2 ],
 if ($get{v}) {
        my %reorder = (
                arnegame => [ 0,5,9,12 , 3,6,10,13,1 , 4,7,8,11,14,15,2 ],


@@ -202,7 +66,7 @@ if ($get{v}) {
        );
        $reorder{$_} = $reorder{msx2} for qw( msx1 arnejmp );
        while (my ($name, $order) = each %reorder) {
        );
        $reorder{$_} = $reorder{msx2} for qw( msx1 arnejmp );
        while (my ($name, $order) = each %reorder) {

-               for my $pal ( $col{$name}) {
+               for my $pal ( $palettes->{$name}) {

                        $pal = [ map { $pal->[$_ + 1] =~ s/:|$/:$_/r } -1, @{$order} ];
                }
        }
                        $pal = [ map { $pal->[$_ + 1] =~ s/:|$/:$_/r } -1, @{$order} ];
                }
        }


@@ -211,11 +75,14 @@ if ($get{v}) {
 my @termlist = qw( cga xterm tango app html xkcd );
 push @termlist, qw( c64 msx2 mac2 risc arnegame ) if exists $get{v};
 for my $term (@termlist) {
 my @termlist = qw( cga xterm tango app html xkcd );
 push @termlist, qw( c64 msx2 mac2 risc arnegame ) if exists $get{v};
 for my $term (@termlist) {

+       my ($name, @index) = @{ $palettes->{$term} };
+       my $caption = $name // $term;
+

        print '<table>', "\n";
        print '<table>', "\n";

-       printf "<caption>%s</caption>\n", $col{$term}[0] || $term;
-       for my $num (1 .. $#{ $col{$term} }) {
-               my ($rgb, $name) = split /:/, $col{$term}[$num], 3;
-               $name ||= $num - 1;
+       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);
        }
                $name = [ $name, ['#333'] ] if $term eq 'xkcd';
                print '<tr>', colcell($name, $rgb);
        }