keyboard: compare combining accents

[sheet.git] / termcol.inc.pl

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 520dbe2636a3cbe18bc78a085151bda89318628f..88c12453ae8fe5939ad669bdfe8fa1eb3eceac42 100644 (file)
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -1,14 +1,15 @@
 use 5.014;
+use utf8;
 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 shiar32 ppu shovel 64 )],
+       legacy  => [qw( c64 msx mac2 risc arnegame db16 cpc cpcboy shiar32 ppu 2c03 shovel 64 )],
 
        xcolors => sub {
-               my $pals = do 'termcol-xcolor.inc.pl' or die $! || $@;
+               my $pals = do 'data/termcol-xcolor.inc.pl' or die $! || $@;
                $_[0]->{$_} = $pals->{$_} for keys %{$pals};
                return 'xcolor';
        },
@@ -222,10 +223,10 @@ use Shiar_Sheet::Colour 1.05;
                )],
                parent => 'cga',
        },
-       dawnbringer => {
+       db16 => {
                href => 'http://pixeljoint.com/forum/forum_posts.asp?TID=12795',
-               title => "Dawnbringer's 16 color palette v1.0",
-               name => 'Dawnbringer',
+               title => "DawnBringer's 16 color palette v1.0",
+               name => 'DawnBringer16',
                list => [qw(
                        140C1C 442434 30346D 4E4A4E 854C30 346524 D04648 757161
                        597DCE D27D2C 8595A1 6DAA2C D2AA99 6DC2CA DAD45E DEEED6
@@ -233,6 +234,17 @@ use Shiar_Sheet::Colour 1.05;
                ansiorder => [ 0,1,5,4,2,12,10,7 , 3,6,11,14,8,9,13,15 ],
                hueorder => [ 6,9,14,11,13,8,2,1 , 12,4,7,5,15,10,3,0 ],
        },
+       db32 => {
+               href => 'http://pixeljoint.com/forum/forum_posts.asp?TID=16247',
+               title => "DawnBringer's 32 color palette v1.0",
+               name => 'DawnBringer32',
+               list => [qw(
+                       000000 222034 45283C 663931 8F563B DF7126 D9A066 EEC39A
+                       FBF236 99E550 6ABE30 37946E 4B692F 524B24 323C39 3F3F74
+                       306082 5B6EE1 639BFF 5FCDE4 CBDBFC FFFFFF 9BADB7 847E87
+                       696A6A 595652 76428A AC3232 D95763 D77BBA 8F974A 8A6F30
+               )],
+       },
        solarized => {
                href => 'http://ethanschoonover.com/solarized',
                list => [qw(
@@ -297,6 +309,26 @@ use Shiar_Sheet::Colour 1.05;
 
        ppu => {
                name => '<abbr title="Picture Processing Unit">PPU</abbr> (Famicom/NES)',
+               table => [
+                       [qw( 717171:00 BABABA:10 FFFFFF:20 FFFFFF:<s>30</s> )],
+                       [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(
@@ -323,9 +355,31 @@ use Shiar_Sheet::Colour 1.05;
                                ] } 0..13
                        }
                ],
+               parent => 'ppu',
+       },
+       neslike => {
+               name => '0xDB NESLike',
+               table => [
+                       [qw( 3F3F3F:00 7F7F7F:10 F9F9F9:20 FFFFFF:30 )],
+                       [qw( 2B34AD:01 6B74ED:11 ABB4FF:21 EAF3FF:31 )],
+                       [qw( 591DAB:02 995DEB:12 D99CFF:22 FFDCFF:32 )],
+                       [qw( 810F8C:03 C04FCC:13 FF8EFF:23 FFCEFF:33 )],
+                       [qw( 960E59:04 D64E98:14 FF8DD8:24 FFCDFF:34 )],
+                       [qw( 951A1E:05 D45A5E:15 FF9A9E:25 FFD9DD:35 )],
+                       [qw( 7C3000:06 BC702C:16 FCB06C:26 FFEFAC:36 )],
+                       [qw( 534A00:07 938A11:17 D3CA51:27 FFFF90:37 )],
+                       [qw( 256200:08 65A113:18 A5E153:28 E4FF92:38 )],
+                       [qw( 096C00:09 49AC25:19 89EC65:29 C9FFA4:39 )],
+                       [qw( 007213:0A 2DB153:1A 6CF193:2A ACFFD2:3A )],
+                       [qw( 006A4D:0B 26AA8D:1B 66E9CD:2B A6FFFF:3B )],
+                       [qw( 005683:0C 3896C3:1C 77D6FF:2C B7FFFF:3C )],
+                       [qw( 000000:<s>0D</s> 000000:1D 333333:2D 8C8C8C:3D )],
+               ],
+               parent => 'ppu',
+               hueorder => [6..12, 1..5, 13, 0],
        },
        shovel => {
-               name => 'NES for Shovel Knight',
+               name => 'Shovel Knight PPU',
                table => [
                        [qw( 7C7C7C:00 BCBCBC:10 F8F8F8:20 FCFCFC:30 )],
                        [qw( 0000FC:01 0078F8:11 3CBCFC:21 A4E4FC:31 )],
@@ -344,6 +398,7 @@ use Shiar_Sheet::Colour 1.05;
                        [qw( 22123B:0S 360900:1S 824E00:2S 9E9E5C:3S )],
                ],
                parent => 'ppu',
+               hueorder => [6..12, 1..5, 13, 0, 14],
        },
 
        64 => {