X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/bcdcb872044a3146c38f3c17bb601130f170aff4..bac74b5934f22cc3d0e971d26fe0275f7f5db7b3:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 0000143..fbf7fe4 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'terminal colour cheat sheet',
-	version => '1.0',
+	version => '1.1',
 	description => [
 		"Index of all terminal/console colour codes,",
 		"with an example result of various environments.",
@@ -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 cgarne )],
-	legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
-);
-@{$_} = map { $termgroup{$_} ? @{ $termgroup{$_} } : $_ } @{$_}
-	for values %termgroup, \@termlist;
-
 :>
 <h1>Terminal colours</h1>
 
@@ -38,20 +28,21 @@ 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>
 
 <div class="section">
 <:
-use 5.010;
-use Shiar_Sheet::Colour '1.04';
+use Shiar_Sheet::Colour 1.04;
 use List::Util qw( min max );
 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";
@@ -109,6 +100,11 @@ sub img_egapal {
 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;
@@ -134,14 +130,18 @@ sub coltable {
 		printf "<caption>%s</caption>\n", $caption;
 		for my $row (@$table) {
 			print '<tr>';
-			print colcell(@$_) for @$row;
+			print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
 		}
 
+	if (@draw) {
 		my $width = scalar @{ $table->[0] };
-		my @imgpal = map { [ @{$_}[1 .. 3] ] } map { @{$_} } @{$table};
+		my @imgpal = map {
+			[ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
+		} map { @{$_} } @{$table};
 		for (@draw) {
 			print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
 		}
+	}
 		print "</table>\n\n";
 	}