X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/40affe00ed4dbe9612e6c53c35444b7ecae7b079..e2353e5d392441ba821a672341cb7218e48d61de:/termcol.plp diff --git a/termcol.plp b/termcol.plp index b3bb7b5..3289deb 100644 --- a/termcol.plp +++ b/termcol.plp @@ -127,8 +127,21 @@ for my $term (@termlist) { print "\n\n"; } + if (my $table = $info->{table}) { + print ''."\n"; + printf "\n", $caption; + for my $row (@$table) { + print ''; + print colcell(@$_) for @$row; + } + print "
%s
\n\n"; + } + if (my $palette = $info->{list}) { - my $colours = colorder($palette, $get{v} && $info->{ansiorder}); + my $order = $get{order} && $get{order}.'order'; + my $colours = colorder($palette, + $info->{$order} // $palettes->{ $info->{parent} }->{$order} + ); my $rows = 8; my $columns = ceil(@{$palette} / $rows); @@ -148,7 +161,9 @@ for my $term (@termlist) { } for (@draw) { - my $imgpal = colorder($palette, $info->{ansiorder}); + my $imgpal = colorder($palette, + $info->{ansiorder} // $palettes->{ $info->{parent} }->{ansiorder} + ); print "", img_egapal($imgpal, @{$_}); } print "\n\n"; @@ -157,7 +172,7 @@ for my $term (@termlist) { sub colorder { my ($palette, $reorder) = @_; - return [ map { $palette->[$_] =~ s/:|$/:$_/r } @{$reorder} ]; + return [ map { $palette->[$_] =~ s/:(?![^:])|$/:$_/r } @{$reorder} ] if $reorder; return $palette; }