git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
browser: omit superfluous usage class
[sheet.git]
/
termcol.plp
diff --git
a/termcol.plp
b/termcol.plp
index 8f8878bf498535442122a16eb28284432786b016..571b2968b9a8d837ddf000d7aae2d34d5bcb9f5e 100644
(file)
--- a/
termcol.plp
+++ b/
termcol.plp
@@
-2,7
+2,7
@@
Html({
title => 'terminal colour cheat sheet',
Html({
title => 'terminal colour cheat sheet',
- version => '1.
0
',
+ version => '1.
1
',
description => [
"Index of all terminal/console colour codes,",
"with an example result of various environments.",
description => [
"Index of all terminal/console colour codes,",
"with an example result of various environments.",
@@
-18,7
+18,7
@@
my @draw = map { [$_, s/\W+\z//] } grep { $_ } split m(/),
$get{img} // exists $get{img} && 'indi.png';
my @termlist;
$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>
:>
<h1>Terminal colours</h1>
@@
-35,13
+35,14
@@
print
<div class="section">
<:
<div class="section">
<:
-use 5.010;
-use Shiar_Sheet::Colour '1.04';
+use Shiar_Sheet::Colour 1.04;
use List::Util qw( min max );
use POSIX qw( ceil );
my $palettes = do 'termcol.inc.pl';
die "Cannot open palette data: $_\n" for $@ || $! || ();
use List::Util qw( min max );
use POSIX qw( ceil );
my $palettes = do 'termcol.inc.pl';
die "Cannot open palette data: $_\n" for $@ || $! || ();
+my $more = do 'termcol-xcolor.inc.pl' || {};
+$palettes = {%$palettes, %$more};
sub colcell {
my $name = shift // return "<td>\n";
sub colcell {
my $name = shift // return "<td>\n";
@@
-104,7
+105,7
@@
sub coltable {
coltable($_) for @{$info};
}
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>',
my $caption = $info->{name} // $term;
$caption = sprintf('<%s %s>%s</%1$s>',
@@
-118,26
+119,30
@@
sub coltable {
) if $info->{href} or $info->{title};
if (my $mapinfo = $info->{rgbmap}) {
) 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 coltable_hsv(@{$mapinfo});
-
print "</table>\n
\n";
+
say "</table>
\n";
}
if (my $table = $info->{table}) {
}
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>';
for my $row (@$table) {
print '<tr>';
- print colcell(
@$_
) for @$row;
+ print colcell(
ref $_ ? @$_ : $_ ? reverse split /:/ : undef
) for @$row;
}
}
+ if (@draw) {
my $width = scalar @{ $table->[0] };
my $width = scalar @{ $table->[0] };
- my @imgpal = map { [ @{$_}[1 .. 3] ] } map { @{$_} } @{$table};
+ my @imgpal = map {
+ [ ref $_ ? @{$_}[1 .. 3] : map {hex} /(..)(..)(..)/ ]
+ } map { @{$_} } @{$table};
for (@draw) {
print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
}
for (@draw) {
print "<tr><td colspan=$width>", img_egapal(\@imgpal, @{$_});
}
- print "</table>\n\n";
+ }
+ say "</table>\n";
}
if (my $palette = $info->{list}) {
}
if (my $palette = $info->{list}) {
@@
-149,8
+154,8
@@
sub coltable {
my $rows = 8;
my $columns = ceil(@{$palette} / $rows);
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) {
for my $row (0 .. $rows - 1) {
print '<tr>';
for my $col (0 .. $columns - 1) {
@@
-169,7
+174,7
@@
sub coltable {
);
print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
}
);
print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
}
-
print "</table>\n
\n";
+
say "</table>
\n";
}
}
}
}