X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/70888ead921575f20a2692dfcb18d171e1b269e0..16fb9fc2233f3a3c0b61aee034da4c49979e30c2:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 32a7356..04157ef 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -14,6 +14,8 @@ Html({
 	stylesheet => [qw'light dark'],
 });
 
+my $imgfile = exists $get{img} && 'indi.png';
+
 my @termlist;
 push @termlist, split /\W+/, $ENV{PATH_INFO} || 'default';
 
@@ -42,6 +44,7 @@ print
 
 <div class="section">
 <:
+use 5.010;
 use Shiar_Sheet::Colour '1.03';
 use List::Util qw( min max );
 
@@ -49,7 +52,7 @@ my $palettes = do 'termcol.inc.pl';
 die "Cannot open palette data: $_\n" for $@ || $! || ();
 
 sub colcell {
-	my $name = shift // return "<td colspan=3>\n";
+	my $name = shift // return "<td>\n";
 	my $col = Shiar_Sheet::Colour->new(@_);
 	my $minhex = $col->rgb24;
 	my $css     = '#' . $col->rgb48;
@@ -60,14 +63,37 @@ sub colcell {
 
 	my $out = sprintf('<td title="%s" style="%s">%s',
 		join(',', map { int } @$col),
-		"background:$css; color:$inverse; padding:0 1ex",
+		"background:$css; color:$inverse",
 		$name,
 	);
-	$out .= sprintf '<td style="%s"><code>%s</code>', "background:$_; color:$css", $minhex
-		for @$sample;
+	$out .= sprintf('<samp style="%s"><small>%s</small></samp>',
+		"background:$_; color:$css", $minhex
+	) for @$sample;
 	return "$out\n";
 }
 
+sub img_egapal {
+	my ($palette) = @_;
+	return eval {
+		require MIME::Base64;
+		require Digest::CRC;
+
+		local $/;
+		open my $img, '<:bytes', "data/$imgfile" or die "$!\n";
+		my $imgdata = readline $img;
+
+		my $offset = 0x29 - 4;
+		my $len = 16 * 3;
+		my $chunklen = $len + 4;
+		substr($imgdata, $offset+4, $len) = pack 'H*', join '', @{$palette};
+		my ($p, $crc) = unpack "x${offset}a${chunklen}N", $imgdata;
+		substr($imgdata, $offset+4+$len, 4) = pack 'N', Digest::CRC::crc32($p);
+
+		return sprintf '<img src="data:image/png;base64,%s">',
+			MIME::Base64::encode_base64($imgdata);
+	} || $@;
+}
+
 for my $term (@termlist) {
 	my $info = $palettes->{$term};
 	ref $info eq 'HASH' or next;
@@ -83,7 +109,7 @@ for my $term (@termlist) {
 	) if $info->{href} or $info->{title};
 
 	if (my $mapinfo = $info->{rgbmap}) {
-		print '<table class="mapped">'."\n";
+		print '<table class="color mapped">'."\n";
 		printf "<caption>%s</caption>\n", $caption;
 		print coltable_hsv(@{$mapinfo});
 		print "</table>\n\n";
@@ -94,7 +120,7 @@ for my $term (@termlist) {
 			$colours = [ map { $colours->[$_] =~ s/:|$/:$_/r } @{$reorder} ];
 		}
 
-		print '<table>', "\n";
+		print '<table class=color>', "\n";
 		printf "<caption>%s</caption>\n", $caption;
 		for my $num (0 .. $#{$colours}) {
 			my ($rgb, $name) = split /:/, $colours->[$num], 3;
@@ -103,6 +129,8 @@ for my $term (@termlist) {
 			$name = [ $name, ['#333'] ] if $term eq 'xkcd';
 			print '<tr>', colcell($name, $rgb);
 		}
+
+		print '<tr><td>', img_egapal(\@{$colours}) if $imgfile;
 		print "</table>\n\n";
 	}
 }
@@ -114,7 +142,6 @@ sub coltable_hsv {
 	my $vmax = $dim - 1;
 	my $smax = $dim - 1;
 	$rgbval ||= sub { join('', @_), map { int $_ * 255 / $vmax } @_ };
-	$greyramp ||= [];
 
 	my %greymap;  # name => value
 	my @colmap;  # saturation => value => hue => [name, r,g,b]
@@ -130,9 +157,15 @@ sub coltable_hsv {
 				my $s = abs(min(@rgb) - max(@rgb));
 
 				if (!$s) {
-					my ($index, $l) = $rgbval->(@rgb);
-					$greymap{$index} = $l;
-					next;
+					if ($greyramp) {
+						my ($index, $l) = $rgbval->(@rgb);
+						$greymap{$index} = $l;
+						next;
+					}
+
+					$h = $hmax;  # greyscale hue
+					$s = 1;  # lowest saturation for other hues
+					$v = $s = $vmax if !$v;  # black at full saturation
 				}
 
 				$v = $vmax - $v;
@@ -144,22 +177,33 @@ sub coltable_hsv {
 	}
 
 	my $out = '';
-	$out .= sprintf '<colgroup span=%d>', 3 * @{$_} for @colmap;
+	$out .= sprintf '<colgroup span=%d>', scalar @{$_} for @colmap;
 	my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
 	for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
 		$out .= '<tr>';
 		$out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
 	}
 
-	$offset += $dim ** 3;
-	$greymap{$offset++} = $_ for @{$greyramp};
+	if ($greyramp) {
+		$offset += $dim ** 3;
+		$greymap{$offset++} = $_ for @{$greyramp};
+	}
+
+	if (%greymap) {
+		$out .= '<tbody>';
+		my $col = 0;
+		my $colbreak = scalar map { @$_ } @colmap;  # same width as hue rows
+		for my $num (sort { $greymap{$a} <=> $greymap{$b} } keys %greymap) {
+			$out .= '<tr>' unless $col++ % $colbreak;
+			$out .= colcell($num, ($greymap{$num}));
+		}
+	}
 
-	$out .= '<tbody>';
-	my $col = 0;
-	my $colbreak = scalar map { @$_ } @colmap;  # same width as hue rows
-	for my $num (sort { $greymap{$a} <=> $greymap{$b} } keys %greymap) {
-		$out .= '<tr>' unless $col++ % $colbreak;
-		$out .= colcell($num, ($greymap{$num}) x 3);
+	if ($imgfile) {
+		my @palette = map { [ @{$_}[1 .. 3] ] } map {@$_} map {@$_} @colmap;
+		my $imgdata = img_egapal(\@palette);
+		my $tablespan = scalar map { @$_ } @colmap;
+		$out .= "<tr><td colspan=$tablespan>$imgdata";
 	}
 
 	return $out;