X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/16b530ef1bda793f687168797b982d2c504efc81..87b84f183ea2518e7cf0505bcfee8a444983442b:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 92bc4f8..8f8878b 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -20,16 +20,6 @@ my @draw = map { [$_, s/\W+\z//] } grep { $_ } split m(/),
 my @termlist;
 push @termlist, split /\W+/, $ENV{PATH_INFO} || 'default';
 
-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 )],
-	legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
-);
-@{$_} = map { $termgroup{$_} ? @{ $termgroup{$_} } : $_ } @{$_}
-	for values %termgroup, \@termlist;
-
 :>
 <h1>Terminal colours</h1>
 
@@ -38,7 +28,7 @@ my %termgroup = (
 as implemented by various systems and programs.
 <:
 print
-	"@termlist" ne "@{ $termgroup{default} }" ? 'Additional palettes are included as specified.' :
+	"@termlist" ne 'default' ? 'Additional palettes are included as specified.' :
 	'Also see <a href="/termcol/more">8-bit legacy hardware</a> palettes.';
 :>
 </p>
@@ -106,9 +96,16 @@ sub img_egapal {
 	} || $@;
 }
 
-for my $term (@termlist) {
+sub coltable {
+	my ($term) = @_;
 	my $info = $palettes->{$term};
+
+	if (ref $info eq 'ARRAY') {
+		coltable($_) for @{$info};
+	}
+
 	ref $info eq 'HASH' or next;
+
 	my $caption = $info->{name} // $term;
 	$caption = sprintf('<%s %s>%s</%1$s>',
 		$info->{href} ? 'a' : 'span',
@@ -127,8 +124,24 @@ 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 $order = $get{v} && 'ansiorder';
+		my $order = $get{order} && $get{order}.'order';
 		my $colours = colorder($palette,
 			$info->{$order} // $palettes->{ $info->{parent} }->{$order}
 		);
@@ -162,7 +175,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;
 }
@@ -234,6 +247,7 @@ sub coltable_hsv {
 	return $out;
 }
 
+coltable($_) for @termlist;
 :></div>
 <hr>