X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/9a4d89685edcb4399aa500d38de84b0101ad09b2..83596eca2ea1782932a4af42727ece9af8067f13:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index ad6ae77..8918a8c 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -13,35 +13,27 @@ Html({
 	stylesheet => [qw'light dark'],
 });
 
-use List::Util 'min';
-
 :>
 <h1>Terminal colours</h1>
 
-<section>
+<div class="section">
 <:
-sub luminance {
-	# perceived brightness (using ITU-R recommendation 601 luma co-efficients)
-	my ($r, $g, $b) = @_;
-	return $r*.299 + $g*.587 + $b*.114;
-}
+use Shiar_Sheet::Colour;
 
 sub colcell {
-	my $id = shift;
-	my @rgb = @_ >= 3 ? @_ : (map {hex} $_[0] =~ /(..)/g);
-	my $rgb24 = '';
-	$rgb24 .= sprintf '%X', min($_ / 17 + .5, 15) for @rgb[0..2];
-	my $rgb48 = '';
-	$rgb48 .= sprintf '%02X', $_ for @rgb[0..2];
-	my $inverse = sprintf('%X', luminance(@rgb)/255 < .3 ? 12 : 0) x 3;
+	my $name = shift;
+	my $col = Shiar_Sheet::Colour->new(@_);
+	my $minhex = $col->rgb24;
+	my $css     = '#' . $col->rgb48;
+	my $inverse = '#' . sprintf('%X', $col->luminance/255 < .3 ? 12 : 0) x 3;
 	return sprintf '<td title="%s" style="%s">%s<td style="%s">%s<td style="%s">%s'."\n",
-		join(',', map { int } @rgb[0..2]),
-		"background:#$rgb48; color:#$inverse; padding:0 1ex",
-		$id,
-		"background:#000; color:#$rgb48",
-		$rgb24,
-		"background:#FFF; color:#$rgb48",
-		$rgb24,
+		join(',', map { int } @$col),
+		"background:$css; color:$inverse; padding:0 1ex",
+		$name,
+		"background:#000; color:$css",
+		$minhex,
+		"background:#FFF; color:$css",
+		$minhex,
 }
 
 my %col = (
@@ -71,23 +63,31 @@ my %col = (
 		qw/2E3436 CC0000 4E9A06 C4A000 3465A4 75507B 06989A D3D7CF
 		   555753 EF2929 8AE234 FCE94F 729FCF AD7FA8 34E2E2 EEEEEC/,
 	],
+	-xkcd => [
+		qw/black  maroon green  olive  navy   purple teal   silver
+		   grey   red    lime   yellow blue  fuchsia cyan   white/,
+	],
+	xkcd => [
+		0,0,
+		qw/000000 650021 15b01a 6e750e 01153e 7e1e9c 029386 c5c9c7
+		   929591 e50000 aaff32 ffff14 0343df ed0dd9 00ffff ffffff/,
+	],
 );
 
-for my $term (qw/html cga xterm tango/) {
+for my $term (qw/html cga xterm tango xkcd/) {
 	print '<table>', "\n";
 	print "<caption>$term</caption>\n";
 	for my $num (0 .. 15) {
 		my $rgb = $col{$term}[$num + 2];
-		print '<tr>',
-			colcell($col{"-$term"}[$num] || $num, $rgb, $col{$term}[0]);
+		print '<tr>', colcell($col{"-$term"}[$num] || $num, $rgb);
 	}
 	print "</table>\n\n";
 }
-:></section>
+:></div>
 
 <hr>
 
-<section>
+<div class="section">
 <h2>88-colour space</h2>
 <:
 for my $r (0 .. 3) {
@@ -107,11 +107,11 @@ print '<table><tr>';
 print colcell(80+$_, (($_ + 2 + ($_>0)) * 255/11) x 3) for 0 .. 7;
 print "</table>\n\n";
 
-:></section>
+:></div>
 <: if ($ENV{PATH_INFO} =~ /256/) { :>
 <hr>
 
-<section>
+<div class="section">
 <h2>256-colour space</h2>
 <:
 for my $r (0 .. 5) {
@@ -134,7 +134,7 @@ for my $row (0, 12) {
 }
 print "\n";
 
-:></section>
+:></div>
 <: } :>
 <hr>