<:
-use 5.010;
-use Shiar_Sheet::Colour '1.03';
+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 $@ || $! || ();
+my $more = do 'termcol-xcolor.inc.pl';
+$palettes = {%$palettes, %$more};
sub colcell {
my $name = shift // return "
\n";
@@ -73,15 +66,17 @@ sub colcell {
}
sub img_egapal {
- my ($palette) = @_;
+ my ($palette, $imgfile, $reindex) = @_;
return eval {
require Imager;
require MIME::Base64;
my @imgpal = map { Imager::Color->new(ref $_ ? @$_ : $_) } @{$palette};
- state $reindex = $imgfile =~ s/!$//;
- state $img = Imager->new(file => "data/palimage/$imgfile")
+ state $imgcache = {};
+ my $img = $imgcache->{$imgfile}
+ //= Imager->new(file => "data/palimage/$imgfile")
or die Imager->errstr.$/;
+
do {
if ($reindex) {
$img->to_paletted({
@@ -102,9 +97,16 @@ sub img_egapal {
} || $@;
}
-for my $term (@termlist) {
+sub coltable {
+ my ($term) = @_;
my $info = $palettes->{$term};
+
+ if (ref $info eq 'ARRAY') {
+ coltable($_) for @{$info};
+ }
+
ref $info eq 'HASH' or next;
+
my $caption = $info->{name} // $term;
$caption = sprintf('<%s %s>%s',
$info->{href} ? 'a' : 'span',
@@ -123,26 +125,66 @@ for my $term (@termlist) {
print "\n\n";
}
- if (my $colours = $info->{list}) {
- if (my $reorder = $info->{ansiorder} and $get{v}) {
- $colours = [ map { $colours->[$_] =~ s/:|$/:$_/r } @{$reorder} ];
+ if (my $table = $info->{table}) {
+ print ''."\n";
+ printf "%s\n", $caption;
+ for my $row (@$table) {
+ 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, @{$_});
+ }
+ }
+ print " | \n\n";
+ }
+
+ if (my $palette = $info->{list}) {
+ my $order = $get{order} && $get{order}.'order';
+ my $colours = colorder($palette,
+ $info->{$order} // $palettes->{ $info->{parent} }->{$order}
+ );
+
+ my $rows = 8;
+ my $columns = ceil(@{$palette} / $rows);
+
print '', "\n";
printf "%s\n", $caption;
- for my $num (0 .. $#{$colours}) {
- my ($rgb, $name) = split /:/, $colours->[$num], 3;
- $name ||= $num;
- $name = [ $name, [] ] if $term =~ /^msx/ and !$num;
- $name = [ $name, ['#333'] ] if $term eq 'xkcd';
- print '', colcell($name, $rgb);
+ for my $row (0 .. $rows - 1) {
+ print ' ';
+ for my $col (0 .. $columns - 1) {
+ my $num = $row + $col * $rows;
+ my ($rgb, $name) = split /:/, $colours->[$num], 3;
+ $name //= $rgb && $num;
+ $name = [ $name, [] ] if $term =~ /^msx/ and !$num;
+ $name = [ $name, ['#333'] ] if $term eq 'xkcd';
+ print colcell($name, $rgb);
+ }
}
- print ' | ', img_egapal(\@{$colours}) if $imgfile;
+ for (@draw) {
+ my $imgpal = colorder($palette,
+ $info->{ansiorder} // $palettes->{ $info->{parent} }->{ansiorder}
+ );
+ print " | | ", img_egapal($imgpal, @{$_});
+ }
print " | \n\n";
}
}
+sub colorder {
+ my ($palette, $reorder) = @_;
+ return [ map { $palette->[$_] =~ s/:(?![^:])|$/:$_/r } @{$reorder} ]
+ if $reorder;
+ return $palette;
+}
+
sub coltable_hsv {
my ($dim, $rgbval, $greyramp) = @_;
@@ -151,31 +193,29 @@ sub coltable_hsv {
my $smax = $dim - 1;
$rgbval ||= sub { join('', @_), map { int $_ * 255 / $vmax } @_ };
- my %greymap; # name => value
+ my @greymap = @{$greyramp || []}; # [name, r, g=l, b]
my @colmap; # saturation => value => hue => [name, r,g,b]
- my $offset = 16 * ($dim > 3);
for my $r (0 .. $dim - 1) {
for my $g (0 .. $dim - 1) {
for my $b (0 .. $dim - 1) {
my @rgb = ($r, $g, $b);
- my $h = Shiar_Sheet::Colour->new(@rgb)->hue * $hmax;
- my $v = max(@rgb);
- my $s = abs(min(@rgb) - max(@rgb));
+ my ($h, $s, $v) = Shiar_Sheet::Colour->new(@rgb)->hsv;
if (!$s) {
- if ($greyramp) {
- my ($index, $l) = $rgbval->(@rgb);
- $greymap{$index} = $l;
+ if (@greymap) {
+ push @greymap, [ $rgbval->(@rgb) ];
next;
}
- $h = $hmax; # greyscale hue
- $s = 1; # lowest saturation for other hues
- $v = $s = $vmax if !$v; # black at full saturation
+ $h = 1; # greyscale hue
+ $s = $smax - $v + 1; # spread brightness over saturation groups
+ $v &&= $smax # highest saturation
+ or $v = $s = 1; # black at initial column
}
+ $h *= $hmax;
$v = $vmax - $v;
$s = $smax - $s - $v;
@@ -189,34 +229,30 @@ sub coltable_hsv {
my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
$out .= ' | ';
- $out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
- }
-
- if ($greyramp) {
- $offset += $dim ** 3;
- $greymap{$offset++} = $_ for @{$greyramp};
+ $out .= colcell(@$_) for map { $_->[$h] } map { reverse @{$_} } @colmap;
}
- if (%greymap) {
+ if (@greymap) {
$out .= '
';
my $col = 0;
my $colbreak = scalar map { @$_ } @colmap; # same width as hue rows
- for my $num (sort { $greymap{$a} <=> $greymap{$b} } keys %greymap) {
+ for my $cell (sort { $a->[1] <=> $b->[1] || $a->[0] <=> $b->[0] } @greymap) {
$out .= '' unless $col++ % $colbreak;
- $out .= colcell($num, ($greymap{$num}));
+ $out .= colcell(@{$cell});
}
}
- if ($imgfile) {
- my @palette = map { [ @{$_}[1 .. 3] ] } map {@$_} map {@$_} @colmap;
- my $imgdata = img_egapal(\@palette);
+ if (@draw) {
+ my @palette = map { [ @{$_}[1 .. 3] ] } @greymap, map {@$_} map {@$_} @colmap;
my $tablespan = scalar map { @$_ } @colmap;
+ my $imgdata = img_egapal(\@palette, @{ $draw[0] });
$out .= "
$imgdata";
}
return $out;
}
+coltable($_) for @termlist;
:>
|