termcol: scalar colour shorthand

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 3d807a242c7272253672a941db9d0d5ca1655955..3f8befcbd42f3dc3abd5574ce0bcb437ac7343da 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -131,14 +131,18 @@ sub coltable {
                printf "<caption>%s</caption>\n", $caption;
                for my $row (@$table) {
                        print '<tr>';
-                       print colcell(@$_) for @$row;
+                       print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
                }
 
+       if (@draw) {
                my $width = scalar @{ $table->[0] };
-               my @imgpal = map { [ @{$_}[1 .. 3] ] } map { @{$_} } @{$table};
+               my @imgpal = map {
+                       [ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
+               } map { @{$_} } @{$table};
                for (@draw) {
                        print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
                }
+       }
                print "</table>\n\n";
        }