termcol: declare ansi reordering in data include

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index a040eed1aa161c9661052319977c687889eb01bb..c58670c19e2c98556862f41f87d7bef2b5eb71fa 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -55,23 +55,6 @@ sub colcell {
        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 );
@@ -99,6 +82,10 @@ for my $term (@termlist) {
        }
 
        if (my $colours = $info->{list}) {
+               if (my $reorder = $info->{ansiorder} and $get{v}) {
+                       $colours = [ map { $colours->[$_] =~ s/:|$/:$_/r } @{$reorder} ];
+               }
+
                print '<table>', "\n";
                printf "<caption>%s</caption>\n", $caption;
                for my $num (0 .. $#{$colours}) {