X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d5f7d83aec64915f05dc3a18760f934cb16856f0..edbbb5e8918a267fec13c55ebe9dcc556058c020:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 2c16fe9..26a5c70 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,6 +106,12 @@ 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;
@@ -134,6 +138,10 @@ sub coltable {
 		say '<table class="color mapped">';
 		say sprintf '<caption>%s</caption>', $caption;
 		for my $row (@$table) {
+			if (!$row) {
+				say '<tbody>';
+				next;
+			}
 			print '<tr>';
 			print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
 		}