X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/bac74b5934f22cc3d0e971d26fe0275f7f5db7b3..29b407ddf91b653e6e8380f73e221628a392376f:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index fbf7fe4..571b296 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -18,7 +18,7 @@ my @draw = map { [$_, s/\W+\z//] } grep { $_ } split m(/),
 	$get{img} // exists $get{img} && 'indi.png';
 
 my @termlist;
-push @termlist, split /\W+/, $ENV{PATH_INFO} || 'default';
+push @termlist, split /\W+/, $Request || 'default';
 
 :>
 <h1>Terminal colours</h1>
@@ -41,7 +41,7 @@ use POSIX qw( ceil );
 
 my $palettes = do 'termcol.inc.pl';
 die "Cannot open palette data: $_\n" for $@ || $! || ();
-my $more = do 'termcol-xcolor.inc.pl';
+my $more = do 'termcol-xcolor.inc.pl' || {};
 $palettes = {%$palettes, %$more};
 
 sub colcell {
@@ -105,7 +105,7 @@ sub coltable {
 		coltable($_) for @{$info};
 	}
 
-	ref $info eq 'HASH' or next;
+	ref $info eq 'HASH' or return;
 
 	my $caption = $info->{name} // $term;
 	$caption = sprintf('<%s %s>%s</%1$s>',
@@ -119,15 +119,15 @@ sub coltable {
 	) if $info->{href} or $info->{title};
 
 	if (my $mapinfo = $info->{rgbmap}) {
-		print '<table class="color mapped">'."\n";
-		printf "<caption>%s</caption>\n", $caption;
+		say '<table class="color mapped">';
+		say sprintf '<caption>%s</caption>', $caption;
 		print coltable_hsv(@{$mapinfo});
-		print "</table>\n\n";
+		say "</table>\n";
 	}
 
 	if (my $table = $info->{table}) {
-		print '<table class="color mapped">'."\n";
-		printf "<caption>%s</caption>\n", $caption;
+		say '<table class="color mapped">';
+		say sprintf '<caption>%s</caption>', $caption;
 		for my $row (@$table) {
 			print '<tr>';
 			print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
@@ -142,7 +142,7 @@ sub coltable {
 			print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
 		}
 	}
-		print "</table>\n\n";
+		say "</table>\n";
 	}
 
 	if (my $palette = $info->{list}) {
@@ -154,8 +154,8 @@ sub coltable {
 		my $rows = 8;
 		my $columns = ceil(@{$palette} / $rows);
 
-		print '<table class=color>', "\n";
-		printf "<caption>%s</caption>\n", $caption;
+		say '<table class=color>';
+		say sprintf '<caption>%s</caption>', $caption;
 		for my $row (0 .. $rows - 1) {
 			print '<tr>';
 			for my $col (0 .. $columns - 1) {
@@ -174,7 +174,7 @@ sub coltable {
 			);
 			print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
 		}
-		print "</table>\n\n";
+		say "</table>\n";
 	}
 }