termcol: named function to parse table data

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 8d707ecdf700bf727ee3c9f27630904a3310c9f1..0000143f7e6f79d027ebb61db23761d25ba6fa67 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -24,7 +24,7 @@ my %termgroup = (
        default => [qw( ansi xkcd ansi88 )],
        more    => [qw( ansi mirc legacy ansi256 )],
        msx     => [qw( msx1 msx2 arnejmp )],
-       ansi    => [qw( cga xterm tango app html )],
+       ansi    => [qw( cga xterm tango app html cgarne )],
        legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
 );
 @{$_} = map { $termgroup{$_} ? @{ $termgroup{$_} } : $_ } @{$_}
@@ -106,9 +106,11 @@ sub img_egapal {
        } || $@;
 }
 
-for my $term (@termlist) {
+sub coltable {
+       my ($term) = @_;
        my $info = $palettes->{$term};
        ref $info eq 'HASH' or next;
+
        my $caption = $info->{name} // $term;
        $caption = sprintf('<%s %s>%s</%1$s>',
                $info->{href} ? 'a' : 'span',
@@ -127,13 +129,30 @@ for my $term (@termlist) {
                print "</table>\n\n";
        }
 
-       if (my $colours = $info->{list}) {
-               if (my $reorder = $info->{ansiorder} and $get{v}) {
-                       $colours = [ map { $colours->[$_] =~ s/:|$/:$_/r } @{$reorder} ];
+       if (my $table = $info->{table}) {
+               print '<table class="color mapped">'."\n";
+               printf "<caption>%s</caption>\n", $caption;
+               for my $row (@$table) {
+                       print '<tr>';
+                       print colcell(@$_) for @$row;
+               }
+
+               my $width = scalar @{ $table->[0] };
+               my @imgpal = map { [ @{$_}[1 .. 3] ] } map { @{$_} } @{$table};
+               for (@draw) {
+                       print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
                }
+               print "</table>\n\n";
+       }
+
+       if (my $palette = $info->{list}) {
+               my $order = $get{order} && $get{order}.'order';
+               my $colours = colorder($palette,
+                       $info->{$order} // $palettes->{ $info->{parent} }->{$order}
+               );
 
                my $rows = 8;
-               my $columns = ceil(@{$colours} / $rows);
+               my $columns = ceil(@{$palette} / $rows);
 
                print '<table class=color>', "\n";
                printf "<caption>%s</caption>\n", $caption;
@@ -149,11 +168,23 @@ for my $term (@termlist) {
                        }
                }
 
-               print "<tr><td colspan=$columns>", img_egapal(\@{$colours}, @{$_}) for @draw;
+               for (@draw) {
+                       my $imgpal = colorder($palette,
+                               $info->{ansiorder} // $palettes->{ $info->{parent} }->{ansiorder}
+                       );
+                       print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
+               }
                print "</table>\n\n";
        }
 }
 
+sub colorder {
+       my ($palette, $reorder) = @_;
+       return [ map { $palette->[$_] =~ s/:(?![^:])|$/:$_/r } @{$reorder} ]
+               if $reorder;
+       return $palette;
+}
+
 sub coltable_hsv {
        my ($dim, $rgbval, $greyramp) = @_;
 
@@ -179,8 +210,9 @@ sub coltable_hsv {
                                        }
 
                                        $h = 1;  # greyscale hue
-                                       $s = 1;  # lowest saturation for other hues
-                                       $v = $s = $vmax if !$v;  # black at full saturation
+                                       $s = $smax - $v + 1;  # spread brightness over saturation groups
+                                       $v &&= $smax  # highest saturation
+                                               or $v = $s = 1;  # black at initial column
                                }
 
                                $h *= $hmax;
@@ -197,7 +229,7 @@ sub coltable_hsv {
        my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
        for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
                $out .= '<tr>';
-               $out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
+               $out .= colcell(@$_) for map { $_->[$h] } map { reverse @{$_} } @colmap;
        }
 
        if (@greymap) {
@@ -220,6 +252,7 @@ sub coltable_hsv {
        return $out;
 }
 
+coltable($_) for @termlist;
 :></div>
 <hr>