X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/4f444f02fce7e747c016158000f01f63c1c39039..d04b40e629676a9b8fdd015d4b432e121925749b:/termcol.plp?ds=sidebyside
diff --git a/termcol.plp b/termcol.plp
index a040eed..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;
+
:>
Terminal colours
@@ -22,8 +35,8 @@ Html({
as implemented by various systems and programs.
<:
print
- !exists $get{v} ? 'Also see 8-bit legacy hardware palettes.' :
- 'Also included are 8-bit legacy hardware palettes.';
+ "@termlist" ne "@{ $termgroup{default} }" ? 'Additional palettes are included as specified.' :
+ 'Also see 8-bit legacy hardware palettes.';
:>
@@ -36,7 +49,7 @@ my $palettes = do 'termcol.inc.pl';
die "Cannot open palette data: $_\n" for $@ || $! || ();
sub colcell {
- my $name = shift // return "\n";
+ my $name = shift // return " | \n";
my $col = Shiar_Sheet::Colour->new(@_);
my $minhex = $col->rgb24;
my $css = '#' . $col->rgb48;
@@ -47,36 +60,15 @@ sub colcell {
my $out = sprintf(' | %s',
join(',', map { int } @$col),
- "background:$css; color:$inverse; padding:0 1ex",
+ "background:$css; color:$inverse",
$name,
);
- $out .= sprintf ' | %s ', "background:$_; color:$css", $minhex
- for @$sample;
+ $out .= sprintf('%s',
+ "background:$_; color:$css", $minhex
+ ) for @$sample;
return "$out\n";
}
-if ($get{v}) {
- my %reorder = (
- arnegame => [ 0,5,9,12 , 3,6,10,13,1 , 4,7,8,11,14,15,2 ],
- arnegame => [ 0,3,10,6,12,9,13,1 , 5,7,11,8,14,4,15,2 ],
- c64 => [ 0,2,5,9,6,4,3,15 , 11,10,13,7,14,8,12,1 ],
- msx2 => [ 0,6,2,10,4,13,7,14 , 1,8,3,11,5,9,12,15 ],
- risc => [ 7,11,13,14,8,12,15,1, 6,5,10,9,4,3,2,0],
- mac2 => [ 15,3,9,11,6,5,7,12 , 14,2,8,1,13,4,10,0 ],
- );
- $reorder{$_} = $reorder{msx2} for qw( msx1 arnejmp );
- while (my ($name, $order) = each %reorder) {
- for my $pal ( $palettes->{$name}) {
- $pal = [ map { $pal->[$_ + 1] =~ s/:|$/:$_/r } -1, @{$order} ];
- }
- }
-}
-
-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;
@@ -92,18 +84,23 @@ for my $term (@termlist) {
) if $info->{href} or $info->{title};
if (my $mapinfo = $info->{rgbmap}) {
- print ''."\n";
+ print ''."\n";
printf "%s\n", $caption;
print coltable_hsv(@{$mapinfo});
print " \n\n";
}
if (my $colours = $info->{list}) {
- print '', "\n";
+ if (my $reorder = $info->{ansiorder} and $get{v}) {
+ $colours = [ map { $colours->[$_] =~ s/:|$/:$_/r } @{$reorder} ];
+ }
+
+ 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);
}
@@ -118,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]
@@ -134,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;
@@ -148,22 +150,26 @@ sub coltable_hsv {
}
my $out = '';
- $out .= sprintf '', 3 * @{$_} for @colmap;
+ $out .= sprintf '', scalar @{$_} for @colmap;
my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
$out .= ' ';
$out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
}
- $offset += $dim ** 3;
- $greymap{$offset++} = $_ for @{$greyramp};
+ if ($greyramp) {
+ $offset += $dim ** 3;
+ $greymap{$offset++} = $_ for @{$greyramp};
+ }
- $out .= ' ';
- my $col = 0;
- my $colbreak = scalar map { @$_ } @colmap; # same width as hue rows
- for my $num (sort { $greymap{$a} <=> $greymap{$b} } keys %greymap) {
- $out .= '' unless $col++ % $colbreak;
- $out .= colcell($num, ($greymap{$num}) x 3);
+ 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) {
+ $out .= '' unless $col++ % $colbreak;
+ $out .= colcell($num, ($greymap{$num}) x 3);
+ }
}
return $out;
|