X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f24787532d73d83838e5ba0fd95e6d648c7696d7..cf4725793daaff890b295b5269d224dfd33b52c0:/termcol.plp
diff --git a/termcol.plp b/termcol.plp
index 7e408e6..3f8befc 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -20,16 +20,6 @@ my @draw = map { [$_, s/\W+\z//] } grep { $_ } split m(/),
my @termlist;
push @termlist, split /\W+/, $ENV{PATH_INFO} || 'default';
-my %termgroup = (
- default => [qw( ansi xkcd ansi88 )],
- more => [qw( ansi mirc legacy ansi256 )],
- msx => [qw( msx1 msx2 arnejmp )],
- ansi => [qw( cga xterm tango app html cgarne )],
- legacy => [qw( c64 msx2 mac2 risc arnegame cpc )],
-);
-@{$_} = map { $termgroup{$_} ? @{ $termgroup{$_} } : $_ } @{$_}
- for values %termgroup, \@termlist;
-
:>
Terminal colours
@@ -38,7 +28,7 @@ my %termgroup = (
as implemented by various systems and programs.
<:
print
- "@termlist" ne "@{ $termgroup{default} }" ? 'Additional palettes are included as specified.' :
+ "@termlist" ne 'default' ? 'Additional palettes are included as specified.' :
'Also see 8-bit legacy hardware palettes.';
:>
@@ -52,6 +42,8 @@ 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";
@@ -106,9 +98,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%1$s>',
$info->{href} ? 'a' : 'span',
@@ -132,14 +131,18 @@ for my $term (@termlist) {
printf "%s\n", $caption;
for my $row (@$table) {
print ' | ';
- print colcell(@$_) for @$row;
+ print colcell(ref $_ ? @$_ : $_ ? reverse split /:/ : undef) for @$row;
}
+ if (@draw) {
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 "
", img_egapal(\@imgpal, @{$_});
}
+ }
print "\n\n";
}
@@ -250,6 +253,7 @@ sub coltable_hsv {
return $out;
}
+coltable($_) for @termlist;
:>
|