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

diff --git a/termcol.plp b/termcol.plp
index 92bc4f8..c510cd2 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -1,14 +1,15 @@
 <(common.inc.plp)><:
 
 Html({
-	title => 'terminal colour cheat sheet',
-	version => '1.0',
-	description => [
+	title => ($Request ? 'terminal colour' : 'colour palettes') . ' cheat sheet',
+	version => '1.2',
+	description => [!$Request ? "Comparison of various colour palettes." : (
 		"Index of all terminal/console colour codes,",
 		"with an example result of various environments.",
-	],
+	)],
 	keywords => [qw'
-		color code terminal console escape table xterm rxvt
+		color colour code terminal console escape table xterm rxvt
+		ansi vt100 8bit 4bit cga ega vga rgb hsv game emulator display
 	'],
 	data => ['termcol.inc.pl'],
 	stylesheet => [qw'light dark'],
@@ -18,35 +19,28 @@ my @draw = map { [$_, s/\W+\z//] } grep { $_ } split m(/),
 	$get{img} // exists $get{img} && 'indi.png';
 
 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;
+push @termlist, split /\W+/, $Request || 'default';
 
-:>
-<h1>Terminal colours</h1>
+say "<h1>$_</h1>\n" for $Request ? 'Colour palettes' : 'Terminal colours';
 
-<p>
-<span title="ECMA-48">ANSI</span> (VT100, ISO-6429) 16-colour text palette
-as implemented by various systems and programs.
-<:
-print
-	"@termlist" ne "@{ $termgroup{default} }" ? 'Additional palettes are included as specified.' :
-	'Also see <a href="/termcol/more">8-bit legacy hardware</a> palettes.';
+say '<p>';
+if ("@termlist" eq 'default') {
+	say '<span title="ECMA-48">ANSI</span> (VT100, ISO-6429) 16-colour text palette';
+	say 'as implemented by various systems and programs.';
+	say 'Also see <a href="/termcol/legacy">8-bit legacy hardware</a> palettes.';
+}
+elsif ("@termlist" eq 'legacy') {
+	say 'Colour palettes of various 8-bit legacy systems and retro games.';
+	say 'Also see <a href="/termcol">ANSI console</a> palettes.';
+}
+else {
+	say 'Comparison of requested colour 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 );
 
@@ -106,9 +100,24 @@ sub img_egapal {
 	} || $@;
 }
 
-for my $term (@termlist) {
+sub coltable {
+	my ($term) = @_;
 	my $info = $palettes->{$term};
-	ref $info eq 'HASH' or next;
+
+	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>',
 		$info->{href} ? 'a' : 'span',
@@ -120,31 +129,53 @@ for my $term (@termlist) {
 		$caption,
 	) if $info->{href} or $info->{title};
 
-	if (my $mapinfo = $info->{rgbmap}) {
-		print '<table class="color mapped">'."\n";
-		printf "<caption>%s</caption>\n", $caption;
-		print coltable_hsv(@{$mapinfo});
-		print "</table>\n\n";
+	if ($info->{table} or $info->{rgbmap}) {
+		say '<table class="color mapped">';
+		say sprintf '<caption>%s</caption>', $caption;
+
+		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;
+			}
+
+			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{v} && 'ansiorder';
-		my $colours = colorder($palette,
-			$info->{$order} // $palettes->{ $info->{parent} }->{$order}
-		);
+		my $colours = colorder($palette, $reorder);
 
 		my $rows = 8;
 		my $columns = ceil(@{$palette} / $rows);
 
-		print '<table class=color>', "\n";
-		printf "<caption>%s</caption>\n", $caption;
+		say '<table class=color>';
+		say sprintf '<caption>%s</caption>', $caption;
 		for my $row (0 .. $rows - 1) {
 			print '<tr>';
 			for my $col (0 .. $columns - 1) {
 				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);
 			}
@@ -156,13 +187,13 @@ for my $term (@termlist) {
 			);
 			print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
 		}
-		print "</table>\n\n";
+		say "</table>\n";
 	}
 }
 
 sub colorder {
 	my ($palette, $reorder) = @_;
-	return [ map { $palette->[$_] =~ s/:|$/:$_/r } @{$reorder} ];
+	return [ map { $palette->[$_] =~ s/:(?![^:])|$/:$_/r } @{$reorder} ]
 		if $reorder;
 	return $palette;
 }
@@ -234,6 +265,7 @@ sub coltable_hsv {
 	return $out;
 }
 
+coltable($_) for @termlist;
 :></div>
 <hr>