termcol: greyscale row format like cpc for shiar32

[sheet.git] / termcol.inc.pl

diff --git a/termcol.inc.pl b/termcol.inc.pl
index f1813ca299470354d1b9bd37bb9a48ef6eee8be0..0aa22410d34425e32ba635a42e6427be3f12a39f 100644 (file)
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -1,12 +1,11 @@
-use strict;
-use 5.010;
+use 5.014;
 use Shiar_Sheet::Colour 1.05;
 
 +{
-       default => [qw( ansi xkcd ansi88 )],
-       more    => [qw( ansi mirc legacy ansi256 )],
-       ansi    => [qw( cga xterm tango app html cgarne )],
-       legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
+       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 msx mac2 risc arnegame dawnbringer cpc cpcboy shiar32 ppu 64 )],
 
        html => {
                title => 'HTML keywords (inherited by CSS≥2.1 and SVG), mostly identical to X11',
@@ -74,15 +73,7 @@ use Shiar_Sheet::Colour 1.05;
                )],
                parent => 'cga',
        },
-       iterm => {
-               name => 'iTerm',
-               title => 'iTerm v2.2.1',
-               list => [qw(
-                       000000 BB0000 00BB00 BBBB00 0000BB BB00BB 00BBBB BBBBBB
-                       555555 FF5555 55FF55 FFFF55 5555FF FF55FF 55FFFF FFFFFF
-               )],
-               parent => 'cga',
-       },
+       iterm => ['putty'], # identical in v2.2.1
        pastel => {
                name => 'iTerm Pastel',
                list => [qw(
@@ -276,21 +267,23 @@ 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 )],
+                       [qw( 000000:0  686868:2  CCCCCC:4  )],
+                       [qw( 444444:1  B0B0B0:3  FFFFFF:5  )],
                ],
                parent => 'cpc',
        },
@@ -322,6 +315,10 @@ use Shiar_Sheet::Colour 1.05;
                        }
                ],
        },
+       64 => {
+               name => '6-bit (Sega Master System, EGA, FAP80)',
+               rgbmap => [4],
+       },
        ansi88 => {
                name => 'rxvt 88 colour extension',
                rgbmap => [