X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/40affe00ed4dbe9612e6c53c35444b7ecae7b079..a6f73126160100b236ab93b76bf1af5f080c94f0:/termcol.plp?ds=sidebyside

diff --git a/termcol.plp b/termcol.plp
index b3bb7b5..b79f841 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -128,7 +128,10 @@ for my $term (@termlist) {
 	}
 
 	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 +151,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 +162,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;
 }