X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/40affe00ed4dbe9612e6c53c35444b7ecae7b079..4f3782455010e83df98953a4fa4f146577b9a888:/termcol.plp
diff --git a/termcol.plp b/termcol.plp
index b3bb7b5..850ff83 100644
--- 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{$_} } : $_ } @{$_}
@@ -127,8 +127,21 @@ for my $term (@termlist) {
print "\n\n";
}
+ if (my $table = $info->{table}) {
+ print '
'."\n";
+ printf "%s\n", $caption;
+ for my $row (@$table) {
+ print '';
+ print colcell(@$_) for @$row;
+ }
+ print "
\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;
}
|