X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/eff606238ed93a22da0b9e8e587db629ef334e7b..d04b40e629676a9b8fdd015d4b432e121925749b:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index acfe2be..0b3d236 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -14,6 +14,19 @@ Html({
 	stylesheet => [qw'light dark'],
 });
 
+my @termlist;
+push @termlist, split /\W+/, $ENV{PATH_INFO} || 'default';
+
+my %termgroup = (
+	default => [qw( ansi xkcd ansi88 )],
+	more    => [qw( ansi 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;
+
 :>
 <h1>Terminal colours</h1>
 
@@ -22,8 +35,8 @@ Html({
 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.';
+	"@termlist" ne "@{ $termgroup{default} }" ? 'Additional palettes are included as specified.' :
+	'Also see <a href="/termcol/more">8-bit legacy hardware</a> palettes.';
 :>
 </p>
 
@@ -36,7 +49,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;
@@ -47,19 +60,15 @@ 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";
 }
 
-my @termlist = qw( cga xterm tango app html xkcd );
-push @termlist, qw( c64 msx2 mac2 risc arnegame cpc ) if exists $get{v};
-push @termlist, qw( ansi88 );
-push @termlist, qw( ansi256 ) if $ENV{PATH_INFO} =~ /256/;
-
 for my $term (@termlist) {
 	my $info = $palettes->{$term};
 	ref $info eq 'HASH' or next;
@@ -75,7 +84,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";
@@ -86,7 +95,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;
@@ -106,7 +115,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]
@@ -122,9 +130,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;
@@ -136,22 +150,26 @@ 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};
+	}
 
-	$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 (%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}) x 3);
+		}
 	}
 
 	return $out;