X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/b7db12d1360aaf34f69ce856cc2bab385f68080e..2eef54d10918562e80526b7fe4061e6925e54815:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 39c8901..1ea1a83 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -13,35 +13,31 @@ Html({
 	stylesheet => [qw'light dark'],
 });
 
-use List::Util 'min';
-
 :>
 <h1>Terminal colours</h1>
 
 <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;
-	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,
+	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;
+
+	my $sample = [ qw(#000 #FFF) ];
+	($name, $sample) = @$name if ref $name eq 'ARRAY';
+
+	my $out = sprintf('<td title="%s" style="%s">%s',
+		join(',', map { int } @$col),
+		"background:$css; color:$inverse; padding:0 1ex",
+		$name,
+	);
+	$out .= sprintf '<td style="%s">%s', "background:$_; color:$css", $minhex
+		for @$sample;
+	return "$out\n";
 }
 
 my %col = (
@@ -82,13 +78,14 @@ my %col = (
 	],
 );
 
-for my $term (qw/html cga xterm tango xkcd/) {
+for my $term (qw/cga xterm tango html 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]);
+		my $name = $col{"-$term"}[$num] || $num;
+		$name = [ $name, ['#333'] ] if $term eq 'xkcd';
+		print '<tr>', colcell($name, $rgb);
 	}
 	print "</table>\n\n";
 }