X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/881b5ab9f702bbdeb2526f93d2512cfa12e405bf..f1ad2d8f64690870d6bb4977b04202083797d6a2:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index bd9fd53..8e61fe0 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -46,8 +46,6 @@ use POSIX qw( ceil );
 
 my $palettes = do 'termcol.inc.pl';
 die "Cannot open palette data: $_\n" for $@ || $! || ();
-my $more = do 'termcol-xcolor.inc.pl' || {};
-$palettes = {%$palettes, %$more};
 
 sub colcell {
 	my $name = shift // return "<td>\n";
@@ -108,9 +106,17 @@ sub coltable {
 
 	if (ref $info eq 'ARRAY') {
 		coltable($_) for @{$info};
+		return;
+	}
+
+	if (ref $info eq 'CODE') {
+		coltable($_) for $info->($palettes);
+		return;
 	}
 
 	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>',
@@ -123,42 +129,40 @@ sub coltable {
 		$caption,
 	) if $info->{href} or $info->{title};
 
-	if (my $mapinfo = $info->{rgbmap}) {
+	if ($info->{table} or $info->{rgbmap}) {
 		say '<table class="color mapped">';
 		say sprintf '<caption>%s</caption>', $caption;
-		print coltable_hsv(@{$mapinfo});
-		say "</table>\n";
-	}
 
-	if (my $table = $info->{table}) {
-		say '<table class="color mapped">';
-		say sprintf '<caption>%s</caption>', $caption;
-		for my $row (@$table) {
-			if (!$row) {
-				say '<tbody>';
-				next;
+		print coltable_hsv(@{$_}) for $info->{rgbmap} || ();
+
+		if (my $table = $info->{table}) {
+			$table = [ @{$table}[@{$reorder}] ] if $reorder;
+
+			for my $row (@$table) {
+				if (!$row) {
+					say '<tbody>';
+					next;
+				}
+				print '<tr>';
+				print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
 			}
-			print '<tr>';
-			print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
-		}
 
-	if (@draw) {
-		my $width = scalar @{ $table->[0] };
-		my @imgpal = map {
-			[ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
-		} map { @{$_} } @{$table};
-		for (@draw) {
-			print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
+			if (@draw) {
+				my $width = scalar @{ $table->[0] };
+				my @imgpal = map {
+					[ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
+				} map { @{$_} } @{$table};
+				for (@draw) {
+					print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
+				}
+			}
 		}
-	}
+
 		say "</table>\n";
 	}
 
 	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);
@@ -171,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);
 			}