termcol: reorder arne to match ansi better

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 96f9b75a472ed08704f37103638a9ec0d6031ba9..c2e66b9603cb9c5221ea4f0b1c623224f0efe066 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -18,7 +18,7 @@ Html({
 
 <div class="section">
 <:
-use Shiar_Sheet::Colour;
+use Shiar_Sheet::Colour '1.01';
 
 sub colcell {
        my $name = shift;
@@ -105,13 +105,87 @@ my %col = (
                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 /,
+       ],
+       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 /,
+       ],
 );
 
-for my $term (qw/cga xterm tango app html xkcd/) {
+if ($get{v}) {
+       # reorder by brightness
+       $col{arnegame} = [
+               map { $col{arnegame}[$_ + 1] }
+               qw/ -1  0 5 9 12  3 6 10 13 1  4 7 8 11 14 15 2 /
+       ];
+}
+
+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) {
        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], 2;
+               my ($rgb, $name) = split /:/, $col{$term}[$num], 3;
                $name ||= $num - 1;
                $name = [ $name, ['#333'] ] if $term eq 'xkcd';
                print '<tr>', colcell($name, $rgb);