termcol: include and mark duplicate colours in ppu

[sheet.git] / termcol.inc.pl

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 56e93e2a62a99b738bfb8a88da87e0294c2b1380..32427759de296675b374ed873e12c62ac6db441d 100644 (file)
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -1,12 +1,17 @@
-use strict;
-use 5.010;
+use 5.014;
 use Shiar_Sheet::Colour 1.05;
 
 +{
-       default => [qw( ansi ansi88 )],
-       more    => [qw( ansi mirc legacy ansi256 )],
+       default => [qw( ansi ansi88 ansi256 )],
+       more    => [qw( ansi mirc pastel slutty solarized ansi88 ansi256 )],
        ansi    => [qw( cga putty xterm tango app html cgarne )],
-       legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
+       legacy  => [qw( c64 msx mac2 risc arnegame dawnbringer cpc cpcboy shiar32 ppu 64 )],
+
+       xcolors => sub {
+               my $pals = do 'termcol-xcolor.inc.pl' or die $! || $@;
+               $_[0]->{$_} = $pals->{$_} for keys %{$pals};
+               return 'xcolor';
+       },
 
        html => {
                title => 'HTML keywords (inherited by CSS≥2.1 and SVG), mostly identical to X11',
@@ -268,21 +273,24 @@ use Shiar_Sheet::Colour 1.05;
                ],
                parent => 'cpc',
        },
-       shiar => {
+       shiar32 => {
                name => 'Shiar32',
                table => [
-                       [qw( 761F28:2A CC2222:3A CC8B7B:4A 000000:0 )],
-                       [qw( 4C3C2B:1B CB4B16:3B EB8931:5B 444444:1 )],
-                       [qw( 5E581A:2C B58900:3C C0C070:4C 686868:2 )],
-                       [qw(         0 859900:3D         0 B0B0B0:3 )],
-                       [qw( 1B661B:2E 4E9A06:3E 8BBB7B:4E CCCCCC:4 )],
-                       [qw(         0 37A76F:3F         0 FFFFFF:5 )],
+                       [qw( 761F28:2A CC2222:3A CC8B7B:4A )],
+                       [qw( 4C3C2B:1B CB4B16:3B EB8931:5B )],
+                       [qw( 5E581A:2C B58900:3C C0C070:4C )],
+                       [qw(         0 859900:3D         0 )],
+                       [qw( 1B661B:2E 4E9A06:3E 8BBB7B:4E )],
+                       [qw(         0 37A76F:3F         0 )],
                        [qw( 2F484E:1G 06989A:3G 31E2C2:5G )],
                        [qw(         0 0088CC:3H         0 )],
                        [qw( 00337C:2I 3465A4:3I 6899AA:4I )],
                        [qw(         0 6C71C4:3J         0 )],
                        [qw( 362747:1K 75507B:3K F06FCB:5K )],
                        [qw(         0 D33662:3L         0 )],
+                       undef,
+                       [qw( 000000:0  686868:2  CCCCCC:4  )],
+                       [qw( 444444:1  B0B0B0:3  FFFFFF:5  )],
                ],
                parent => 'cpc',
        },
@@ -302,12 +310,13 @@ use Shiar_Sheet::Colour 1.05;
                                        320 430 660 773
                                        120 140 360 572
                                        031 040 070 473
-                                       000 053 000 276
+                                       040 053 276 276
                                        022 044 077 467
                                        111 222 444 666
                                );
+                               my %dup;
                                map { [
-                                       map { [ $_, map { $_ * 255 / 7 } split // ] }
+                                       map { [ $dup{$_}++ ? "<s>$_</s>" : $_, map { $_ * 255 / 7 } split // ] }
                                        map { $rgb[$_] }
                                        $_*4 .. $_*4+3
                                ] } 0..13