X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d5f7d83aec64915f05dc3a18760f934cb16856f0..a3f9b6de6bde0cd3f32faee7e4c982f6e7d42aaf:/termcol.inc.pl

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 6f256c5..3c3b365 100644
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -5,7 +5,13 @@ use Shiar_Sheet::Colour 1.05;
 	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 shiar ppu 64 )],
+	legacy  => [qw( c64 msx mac2 risc arnegame dawnbringer cpc cpcboy shiar32 ppu shovel 64 )],
+
+	xcolors => sub {
+		my $pals = do 'data/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',
@@ -260,31 +266,35 @@ use Shiar_Sheet::Colour 1.05;
 					54BF47 37C79F 35CFE4  8DD836 B8D1B5 97E9D1  EDD446 EBE4A4 FFFFFF
 				)]->[$index]
 			},
-			[ # gameboy ramp
-				map { [ 27 + (state $index)++, map { hex } /(..)/g ] }
-				qw( F2EFE7 BAC375 859550 485D48 293941 )
-			],
+		],
+		table => [
+			# gameboy ramp
+			[qw( 293941:31       :   F2EFE7:27 )],
+			[qw( 485D48:30 859550:29 BAC375:28 )],
 		],
 		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',
 	},
+
 	ppu => {
 		name => '<abbr title="Picture Processing Unit">PPU</abbr> (Famicom/NES)',
 		table => [
@@ -301,18 +311,43 @@ 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
 			}
 		],
+		hueorder => [6..12, 1..5, 13, 0],
 	},
+	shovel => {
+		name => 'NES for Shovel Knight',
+		table => [
+			[qw( 7C7C7C:00 BCBCBC:10 F8F8F8:20 FCFCFC:30 )],
+			[qw( 0000FC:01 0078F8:11 3CBCFC:21 A4E4FC:31 )],
+			[qw( 0000BC:02 0058F8:12 6888FC:22 B8B8F8:32 )],
+			[qw( 4428BC:03 6844FC:13 9878F8:23 D8B8F8:33 )],
+			[qw( 940084:04 D800CC:14 F878F8:24 F8B8F8:34 )],
+			[qw( A80020:05 E40058:15 F85898:25 F8A4C0:35 )],
+			[qw( A81000:06 F83800:16 F87858:26 F0D0B0:36 )],
+			[qw( 881400:07 E45C10:17 FCA044:27 FCE0A8:37 )],
+			[qw( 503000:08 AC7C00:18 F8B800:28 F8D878:38 )],
+			[qw( 007800:09 00B800:19 B8F818:29 D8F878:39 )],
+			[qw( 006800:0A 00A800:1A 58D854:2A B8F8B8:3A )],
+			[qw( 005800:0B 00A844:1B 58F898:2B B8F8D8:3B )],
+			[qw( 004058:0C 008888:1C 00E8D8:2C 00FCFC:3C )],
+			[qw( 000000:0D 080808:1D 787878:2D D8D8D8:3D )],
+			[qw( 22123B:0S 360900:1S 824E00:2S 9E9E5C:3S )],
+		],
+		parent => 'ppu',
+		hueorder => [6..12, 1..5, 13, 0, 14],
+	},
+
 	64 => {
 		name => '6-bit (Sega Master System, EGA, FAP80)',
 		rgbmap => [4],