X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/40affe00ed4dbe9612e6c53c35444b7ecae7b079..v1.8-92-gbcdcb87204:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index b3bb7b5..0000143 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{$_} } : $_ } @{$_}
@@ -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,8 +129,27 @@ for my $term (@termlist) {
 		print "</table>\n\n";
 	}
 
+	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 $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 +169,9 @@ for my $term (@termlist) {
 		}
 
 		for (@draw) {
-			my $imgpal = colorder($palette, $info->{ansiorder});
+			my $imgpal = colorder($palette,
+				$info->{ansiorder} // $palettes->{ $info->{parent} }->{ansiorder}
+			);
 			print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
 		}
 		print "</table>\n\n";
@@ -157,7 +180,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;
 }
@@ -229,6 +252,7 @@ sub coltable_hsv {
 	return $out;
 }
 
+coltable($_) for @termlist;
 :></div>
 <hr>