termcol: separate gameboy table rows in cpcboy

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 38696cef1002f56ed29c3d1977e5098fe3403477..520dbe2636a3cbe18bc78a085151bda89318628f 100644 (file)
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -266,10 +266,11 @@ 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',
        },
@@ -288,7 +289,6 @@ use Shiar_Sheet::Colour 1.05;
                        [qw(         0 6C71C4:3J         0 )],
                        [qw( 362747:1K 75507B:3K F06FCB:5K )],
                        [qw(         0 D33662:3L         0 )],
-                       undef,
                        [qw( 000000:0  686868:2  CCCCCC:4  )],
                        [qw( 444444:1  B0B0B0:3  FFFFFF:5  )],
                ],

diff --git a/termcol.plp b/termcol.plp
index 26a5c70e4343d71a343484ee7a91f3a1e6c30624..a090fc7ffe7a36ee3583b570abf1863d92cf338d 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -127,16 +127,13 @@ sub coltable {
                $caption,
        ) if $info->{href} or $info->{title};
 
-       if (my $mapinfo = $info->{rgbmap}) {
+       if ($info->{table} or $info->{rgbmap}) {
                say '<table class="color mapped">';
                say sprintf '<caption>%s</caption>', $caption;
-               print coltable_hsv(@{$mapinfo});
-               say "</table>\n";
-       }
 
-       if (my $table = $info->{table}) {
-               say '<table class="color mapped">';
-               say sprintf '<caption>%s</caption>', $caption;
+               print coltable_hsv(@{$_}) for $info->{rgbmap} || ();
+
+               if (my $table = $info->{table}) {
                for my $row (@$table) {
                        if (!$row) {
                                say '<tbody>';
@@ -155,6 +152,8 @@ sub coltable {
                        print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
                }
        }
+               }
+
                say "</table>\n";
        }