X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/5d0b74f716de9889618c99c71d151ab3bf53b76b..b1a88e8b8c215a64c86e605de92ae65de4ce014c:/termcol.inc.pl?ds=sidebyside
diff --git a/termcol.inc.pl b/termcol.inc.pl
index 72aa6a0..b004397 100644
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -1,12 +1,18 @@
-use strict;
-use 5.010;
-use Shiar_Sheet::Colour '1.05';
+use 5.014;
+use utf8;
+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 2c03 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',
@@ -74,15 +80,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(
@@ -269,33 +267,57 @@ 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 => 'PPU (Famicom/NES)',
+ table => [
+ [qw( 717171:00 BABABA:10 FFFFFF:20 FFFFFF:30 )],
+ [qw( 012FB3:01 235CFF:11 5380FF:21 ACC1FF:31 )],
+ [qw( 2B17C2:02 5139FF:12 7562FF:22 BAB1FF:32 )],
+ [qw( 5705AA:03 932AFF:13 AC5AFF:23 D7B1FF:33 )],
+ [qw( 780071:04 C222BA:14 FE69F6:24 FEC0FB:34 )],
+ [qw( 860627:05 D52C57:15 FE6A90:25 FEBECF:35 )],
+ [qw( 7C1800:06 C84300:16 FE853F:26 FECBAD:36 )],
+ [qw( 5F3100:07 A16400:17 F2B403:27 FEE59D:37 )],
+ [qw( 344900:08 698400:18 B9D500:28 E9F596:38 )],
+ [qw( 095B00:09 2F9B00:19 7FEC0F:29 D1FFA3:39 )],
+ [qw( 006100:0A 04A40D:1A 52F55B:2A BCFFC0:3A )],
+ [qw( 005A39:0B 009B6F:1B 40EBBF:2B B7FEEC:3B )],
+ [qw( 004881:0C 0083CE:1C 43BBFF:2C AEE1FF:3C )],
+ [qw( 000000:0D 0C0C0C:1D 5B5B5B:2D C3C3C3:3D )],
+ ],
+ hueorder => [6..12, 1..5, 13, 0],
+ },
+ '2c03' => {
+ name => '2C03â5 PPU (PlayChoice/Famicom)',
table => [
do {
my @rgb = qw(
@@ -310,17 +332,46 @@ 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{$_}++ ? "$_" : $_, map { $_ * 255 / 7 } split // ] }
map { $rgb[$_] }
$_*4 .. $_*4+3
] } 0..13
}
],
+ parent => 'ppu',
+ },
+ shovel => {
+ name => 'Shovel Knight PPU',
+ 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],
},
ansi88 => {
name => 'rxvt 88 colour extension',