termcol: code cleanup (mostly break wide lines)

diff --git a/termcol.plp b/termcol.plp
index 2674fc99236ea00e4386da234e4a0bd8136022e4..24f95506489c76cb874be4a05a1b04e28124c05d 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -48,7 +48,7 @@ sub colcell {
 }
 
 my %col = (
 }
 
 my %col = (

-       -name => [
+       -html => [

                qw/black maroon green olive  navy purple  cyan silver
                   gray  red    lime  yellow blue fuchsia aqua white/,
                qw/reset bold dim italic underline blink fastblink
                qw/black maroon green olive  navy purple  cyan silver
                   gray  red    lime  yellow blue fuchsia aqua white/,
                qw/reset bold dim italic underline blink fastblink


@@ -83,7 +83,7 @@ for my $term (qw/html cga xterm tango/) {
        for my $num (0 .. 15) {
                my $rgb = $col{$term}[$num + 2];
                print '<tr>',
        for my $num (0 .. 15) {
                my $rgb = $col{$term}[$num + 2];
                print '<tr>',

-                       colcell($term eq 'html' ? $col{-name}[$num] : $num, $rgb, $col{$term}[0]);
+                       colcell($col{"-$term"}[$num] || $num, $rgb, $col{$term}[0]);

        }
        print "</table></li>\n\n";
 }
        }
        print "</table></li>\n\n";
 }


@@ -97,17 +97,18 @@ for my $r (0 .. 3) {
        for my $g (0 .. 3) {
                print '<tr>';
                for my $b (0 .. 3) {
        for my $g (0 .. 3) {
                print '<tr>';
                for my $b (0 .. 3) {

-                       print colcell($r*4*4 + $g*4 + $b + 16, map {(0, 139, 205, 255)[$_]} $r, $g, $b);
+                       my $index = $r*4*4 + $g*4 + $b + 16;
+                       print colcell($index, map {(0, 139, 205, 255)[$_]} $r, $g, $b);

                }
        }
        print "</table>\n";
 }
 print "\n";
 
                }
        }
        print "</table>\n";
 }
 print "\n";
 

-print '<li><table><tr>', map { colcell(80, ($_) x 3) } 46, 92, 115, 139, 162, 185, 208, 231;
+print '<li><table><tr>';
+print colcell(80, ($_) x 3) for 46, 92, 115, 139, 162, 185, 208, 231;

 print "</table>\n\n";
 print "</table>\n\n";

-:></li>
-</ul>
+:></ul>

 
 <hr>
 <h2>256-colour space</h2><ul>
 
 <hr>
 <h2>256-colour space</h2><ul>


@@ -117,18 +118,21 @@ for my $r (0 .. 5) {
        for my $g (0 .. 5) {
                print '<tr>';
                for my $b (0 .. 5) {
        for my $g (0 .. 5) {
                print '<tr>';
                for my $b (0 .. 5) {

-                       print colcell($r*6*6 + $g*6 + $b + 16, map { $_ && $_*40 + 55 } $r, $g, $b);
+                       my $index = $r*6*6 + $g*6 + $b + 16;
+                       print colcell($index, map { $_ && $_*40 + 55 } $r, $g, $b);

                }
        }
        print "</table>\n";
 }
 print "\n";
 
                }
        }
        print "</table>\n";
 }
 print "\n";
 

-print '<li><table><tr>', (map { colcell(232+$_, ($_*10 + 8) x 3) } $_ .. $_+11), "</table>\n"
-       for 0, 12;
+for my $row (0, 12) {
+       print '<li><table><tr>';
+       print colcell(232+$_, ($_*10 + 8) x 3) for $row .. $row+11;
+       print "</table>\n";
+}

 print "\n";
 print "\n";

-:></li>
-</ul>
+:></ul>

 
 <hr>
 
 
 <hr>