X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e476c3bfbcc78e9f667d83e9b35da5d55c7a6b42..5b650c213c6d17e56a58af1297f423846784cb64:/termcol.plp?ds=inline
diff --git a/termcol.plp b/termcol.plp
index a090fc7..281d33c 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -2,7 +2,7 @@
Html({
title => ($Request ? 'terminal colour' : 'colour palettes') . ' cheat sheet',
- version => '1.1',
+ version => '1.2',
description => [!$Request ? "Comparison of various colour palettes." : (
"Index of all terminal/console colour codes,",
"with an example result of various environments.",
@@ -45,7 +45,7 @@ use List::Util qw( min max );
use POSIX qw( ceil );
my $palettes = do 'termcol.inc.pl';
-die "Cannot open palette data: $_\n" for $@ || $! || ();
+Abort("Cannot open palette data", 501, $_) for $@ || $! || ();
sub colcell {
my $name = shift // return "
\n";
@@ -115,6 +115,8 @@ sub coltable {
}
ref $info eq 'HASH' or return;
+ my $order = $get{order} && $get{order}.'order';
+ my $reorder = $info->{$order} // $palettes->{ $info->{parent} }->{$order};
my $caption = $info->{name} // $term;
$caption = sprintf('<%s %s>%s%1$s>',
@@ -134,34 +136,33 @@ sub coltable {
print coltable_hsv(@{$_}) for $info->{rgbmap} || ();
if (my $table = $info->{table}) {
- for my $row (@$table) {
- if (!$row) {
- say ' | ';
- next;
+ $table = [ @{$table}[@{$reorder}] ] if $reorder;
+
+ for my $row (@$table) {
+ if (!$row) {
+ say '';
+ next;
+ }
+ print '';
+ print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
}
- print '
';
- print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
- }
- if (@draw) {
- my $width = scalar @{ $table->[0] };
- my @imgpal = map {
- [ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
- } map { @{$_} } @{$table};
- for (@draw) {
- print "
", img_egapal(\@imgpal, @{$_});
- }
- }
+ if (@draw) {
+ my $width = scalar @{ $table->[0] };
+ my @imgpal = map {
+ [ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
+ } map { @{$_} } @{$table};
+ for (@draw) {
+ print " |
", img_egapal(\@imgpal, @{$_});
+ }
+ }
}
say "\n";
}
if (my $palette = $info->{list}) {
- my $order = $get{order} && $get{order}.'order';
- my $colours = colorder($palette,
- $info->{$order} // $palettes->{ $info->{parent} }->{$order}
- );
+ my $colours = colorder($palette, $reorder);
my $rows = 8;
my $columns = ceil(@{$palette} / $rows);
@@ -174,7 +175,7 @@ sub coltable {
my $num = $row + $col * $rows;
my ($rgb, $name) = split /:/, $colours->[$num], 3;
$name //= $rgb && $num;
- $name = [ $name, [] ] if $term =~ /^msx/ and !$num;
+ $name = [ $name, [] ] if $term =~ /^msx/ and !$name; # no bg for transparency
$name = [ $name, ['#333'] ] if $term eq 'xkcd';
print colcell($name, $rgb);
}
|