X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8665c16469dd75189e709b0bd95a179e553e06a0..aac1632fef6174c77b381724e07d907ad24f9217:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 3880a62..8e61fe0 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -115,6 +115,8 @@ sub coltable {
 	}
 
 	ref $info eq 'HASH' or return;
+	my $order = $get{order} && $get{order}.'order';
+	my $reorder = $info->{$order} // $palettes->{ $info->{parent} }->{$order};
 
 	my $caption = $info->{name} // $term;
 	$caption = sprintf('<%s %s>%s</%1$s>',
@@ -134,6 +136,8 @@ sub coltable {
 		print coltable_hsv(@{$_}) for $info->{rgbmap} || ();
 
 		if (my $table = $info->{table}) {
+			$table = [ @{$table}[@{$reorder}] ] if $reorder;
+
 			for my $row (@$table) {
 				if (!$row) {
 					say '<tbody>';
@@ -158,10 +162,7 @@ sub coltable {
 	}
 
 	if (my $palette = $info->{list}) {
-		my $order = $get{order} && $get{order}.'order';
-		my $colours = colorder($palette,
-			$info->{$order} // $palettes->{ $info->{parent} }->{$order}
-		);
+		my $colours = colorder($palette, $reorder);
 
 		my $rows = 8;
 		my $columns = ceil(@{$palette} / $rows);
@@ -174,7 +175,7 @@ sub coltable {
 				my $num = $row + $col * $rows;
 				my ($rgb, $name) = split /:/, $colours->[$num], 3;
 				$name //= $rgb && $num;
-				$name = [ $name, [] ] if $term =~ /^msx/ and !$num;
+				$name = [ $name, [] ] if $term =~ /^msx/ and !$name;  # no bg for transparency
 				$name = [ $name, ['#333'] ] if $term eq 'xkcd';
 				print colcell($name, $rgb);
 			}