X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dab3a79e2d478b8b02bd2efc34a0fe7d5d968c2c..998b07a3af8a02fce9a73544b848c40ce7fdb197:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index be514c3..b5f08b2 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -16,12 +16,23 @@ Html({
 :>
 <h1>Terminal colours</h1>
 
+<p>
+<span title="ECMA-48">ANSI</span> (VT100, ISO-6429) 16-colour text palette
+as implemented by various systems and programs.
+<:
+print
+	!exists $get{v} ? 'Also see <a href="?v">8-bit legacy hardware</a> palettes.' :
+	'Also included are 8-bit legacy hardware palettes.';
+:>
+</p>
+
 <div class="section">
 <:
-use Shiar_Sheet::Colour '1.01';
+use Shiar_Sheet::Colour '1.03';
+use List::Util qw( min max );
 
 sub colcell {
-	my $name = shift;
+	my $name = shift or return "<td colspan=3>\n";
 	my $col = Shiar_Sheet::Colour->new(@_);
 	my $minhex = $col->rgb24;
 	my $css     = '#' . $col->rgb48;
@@ -158,11 +169,20 @@ my %col = (
 		qw/ 000 000 161 373 117 237 511 267
 		    711 733 661 663 141 625 555 777 /,
 	],
-	game => [
+	arnejmp => [
+		sprintf('<a href="%s" title="%s">%s</a>',
+			'http://androidarts.com/palette/16pal.htm',
+			"Arne's Japanese Machine Palette v3 (MSX)",
+			'A:JMP',
+		),
+		qw/ 000000 191028 46AF45 A1D685 453E78 7664FE 833129 9EC2E8
+		    DC534B E18D79 D6B97B E9D8A1 216C4B D365C8 AFAAB9 F5F4EB /,
+	],
+	arnegame => [
 		sprintf('<a href="%s" title="%s">%s</a>',
 			'http://androidarts.com/palette/16pal.htm',
-			'Generic 16 color game palette by Arne Niklas Jansson',
-			'game',
+			'Generic 16 color game palette v20 by Arne Niklas Jansson',
+			'Arne',
 		),
 		qw/ 000000::void     9D9D9D::ash     FFFFFF::blind   BE2633::bloodred
 		    E06F8B::pigmeat  493C2B::oldpoop A46422::newpoop EB8931::blaze
@@ -171,8 +191,25 @@ my %col = (
 	],
 );
 
+if ($get{v}) {
+	my %reorder = (
+		arnegame => [ 0,5,9,12 , 3,6,10,13,1 , 4,7,8,11,14,15,2 ],
+		arnegame => [ 0,3,10,6,12,9,13,1 , 5,7,11,8,14,4,15,2 ],
+		c64 => [ 0,2,5,9,6,4,3,15 , 11,10,13,7,14,8,12,1 ],
+		msx2 => [ 0,6,2,10,4,13,7,14 , 1,8,3,11,5,9,12,15 ],
+		risc => [ 7,11,13,14,8,12,15,1, 6,5,10,9,4,3,2,0],
+		mac2 => [ 15,3,9,11,6,5,7,12 , 14,2,8,1,13,4,10,0 ],
+	);
+	$reorder{$_} = $reorder{msx2} for qw( msx1 arnejmp );
+	while (my ($name, $order) = each %reorder) {
+		for my $pal ( $col{$name}) {
+			$pal = [ map { $pal->[$_ + 1] =~ s/:|$/:$_/r } -1, @{$order} ];
+		}
+	}
+}
+
 my @termlist = qw( cga xterm tango app html xkcd );
-push @termlist, qw( c64 msx2 mac2 risc game ) if exists $get{v};
+push @termlist, qw( c64 msx2 mac2 risc arnegame ) if exists $get{v};
 for my $term (@termlist) {
 	print '<table>', "\n";
 	printf "<caption>%s</caption>\n", $col{$term}[0] || $term;
@@ -215,23 +252,51 @@ print "</table>\n\n";
 <div class="section">
 <h2>256-colour space</h2>
 <:
+my @colmap;  # saturation => value => hue => [name, r,g,b]
+my %greymap;  # name => value
+$greymap{232 + $_} = $_*10 + 8 for 0 .. 23;
+
 for my $r (0 .. 5) {
-	print '<table>';
 	for my $g (0 .. 5) {
-		print '<tr>';
 		for my $b (0 .. 5) {
 			my $index = $r*6*6 + $g*6 + $b + 16;
-			print colcell($index, map { $_ && $_*40 + 55 } $r, $g, $b);
+			my @rgb = map { $_ && $_*40 + 55 } $r, $g, $b;
+
+			my $h = Shiar_Sheet::Colour->new(@rgb)->hue * 33;
+			my $v = int(max(@rgb) / 255 * 5);
+			my $s = abs(min(@rgb) - max(@rgb)) / 255 * 7;
+
+			if (!$s) {
+				$greymap{$index} = $rgb[0];
+				next;
+			}
+
+			$v = 5 - $v;
+			$s = 7 - $s - $v;
+			$s-- if $s;
+
+			$colmap[$s][$v][$h] = [$index, @rgb];
 		}
 	}
+}
+
+{
+	print '<table class=mapped>';
+	printf '<colgroup span=%d>', 3 * @{$_} for @colmap;
+	for my $h (grep { $colmap[0][0][$_] } 0 .. $#{ $colmap[0][0] }) {
+		print '<tr>';
+		print colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
+	}
 	print "</table>\n";
 }
 print "\n";
 
 	print '<table>';
-for my $row (0, 12) {
-	print '<tr>';
-	print colcell(232+$_, ($_*10 + 8) x 3) for $row .. $row+11;
+my $col = 0;
+my $colbreak = keys(%greymap) / 2;  # split into 2 rows
+for my $num (sort { $greymap{$a} <=> $greymap{$b} } keys %greymap) {
+	print '<tr>' unless $col++ % $colbreak;
+	print colcell($num, ($greymap{$num}) x 3);
 }
 	print "</table>\n";
 print "\n";