X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/87b84f183ea2518e7cf0505bcfee8a444983442b..a8a1b6ccabca261ce3335b1f233cf0146bd0fab1:/termcol.inc.pl

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 9152f6b..b575944 100644
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -1,11 +1,10 @@
-use strict;
-use 5.010;
-use Shiar_Sheet::Colour '1.05';
+use 5.014;
+use Shiar_Sheet::Colour 1.05;
 
 +{
-	default => [qw( ansi xkcd ansi88 )],
+	default => [qw( ansi ansi88 )],
 	more    => [qw( ansi mirc legacy ansi256 )],
-	ansi    => [qw( cga xterm tango app html cgarne )],
+	ansi    => [qw( cga putty xterm tango app html cgarne )],
 	legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
 
 	html => {
@@ -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(
@@ -206,10 +197,10 @@ use Shiar_Sheet::Colour '1.05';
 		title => 'Generic 16 color game palette v20 by Arne Niklas Jansson',
 		name => 'Arne',
 		list => [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
+			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
 		)],
 		hueorder => [ 3,7,8,11,10,9,13,14 , 4,6,5,15,12,0,1,2 ],
 		ansiorder => [ 0,3,10,6,13,12,9,1 , 5,7,11,8,14,4,15,2 ],
@@ -266,7 +257,7 @@ use Shiar_Sheet::Colour '1.05';
 				map { map { hex } /(..)/g } [qw(
 					000000 1B1B76 3636D8  761F28 623870 953EA7  CC3636 CE4B7A E3669A
 					1B761B 197F96 1986F2  8C6E1A 8E8E8E 9C9EE7  E48E2A EAA597 FE80FE
-					8DD836 B8D1B5 97E9D1  54BF47 37C79F 35CFE4  EDD446 EBE4A4 FFFFFF
+					54BF47 37C79F 35CFE4  8DD836 B8D1B5 97E9D1  EDD446 EBE4A4 FFFFFF
 				)]->[$index]
 			},
 			[ # gameboy ramp
@@ -276,6 +267,24 @@ use Shiar_Sheet::Colour '1.05';
 		],
 		parent => 'cpc',
 	},
+	shiar => {
+		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( 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 )],
+		],
+		parent => 'cpc',
+	},
 	ppu => {
 		name => '<abbr title="Picture Processing Unit">PPU</abbr> (Famicom/NES)',
 		table => [
@@ -304,6 +313,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 => [