termcol: colour class to facilitate calculation and formatting

diff --git a/Shiar_Sheet/Colour.pm b/Shiar_Sheet/Colour.pm
new file mode 100644 (file)
index 0000000..1812789
--- /dev/null
+++ b/Shiar_Sheet/Colour.pm
@@ -0,0 +1,34 @@
+package Shiar_Sheet::Colour;
+
+use strict;
+use warnings;
+use List::Util 'min';
+
+our $VERSION = '1.00';
+
+sub new {
+       my $class = shift;
+       my @rgb = @_ >= 3 ? @_ : (map {hex} $_[0] =~ /(..)/g);
+       bless \@rgb, $class;
+}
+
+sub luminance {
+       # perceived brightness (using ITU-R recommendation 601 luma co-efficients)
+       my ($r, $g, $b) = @{ $_[0] };
+       return $r*.299 + $g*.587 + $b*.114;
+}
+
+sub rgb24 {
+       my $str = '';
+       $str .= sprintf '%X', min($_ / 17 + .5, 15) for @{ $_[0] };
+       return $str;
+}
+
+sub rgb48 {
+       my $str = '';
+       $str .= sprintf '%02X', $_ for @{ $_[0] };
+       return $str;
+}
+
+1;
+

diff --git a/termcol.plp b/termcol.plp
index 39c89013d27a10b5e8e2688138b9ca6114c63382..8918a8c9b553da5bb0c5af2e2c8fa14a04b21dff 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -13,35 +13,27 @@ Html({
        stylesheet => [qw'light dark'],
 });
 
        stylesheet => [qw'light dark'],
 });
 

-use List::Util 'min';
-

 :>
 <h1>Terminal colours</h1>
 
 <div class="section">
 <:
 :>
 <h1>Terminal colours</h1>
 
 <div class="section">
 <:

-sub luminance {
-       # perceived brightness (using ITU-R recommendation 601 luma co-efficients)
-       my ($r, $g, $b) = @_;
-       return $r*.299 + $g*.587 + $b*.114;
-}
+use Shiar_Sheet::Colour;

 
 sub colcell {
 
 sub colcell {

-       my $id = shift;
-       my @rgb = @_ >= 3 ? @_ : (map {hex} $_[0] =~ /(..)/g);
-       my $rgb24 = '';
-       $rgb24 .= sprintf '%X', min($_ / 17 + .5, 15) for @rgb[0..2];
-       my $rgb48 = '';
-       $rgb48 .= sprintf '%02X', $_ for @rgb[0..2];
-       my $inverse = sprintf('%X', luminance(@rgb)/255 < .3 ? 12 : 0) x 3;
+       my $name = shift;
+       my $col = Shiar_Sheet::Colour->new(@_);
+       my $minhex = $col->rgb24;
+       my $css     = '#' . $col->rgb48;
+       my $inverse = '#' . sprintf('%X', $col->luminance/255 < .3 ? 12 : 0) x 3;

        return sprintf '<td title="%s" style="%s">%s<td style="%s">%s<td style="%s">%s'."\n",
        return sprintf '<td title="%s" style="%s">%s<td style="%s">%s<td style="%s">%s'."\n",

-               join(',', map { int } @rgb[0..2]),
-               "background:#$rgb48; color:#$inverse; padding:0 1ex",
-               $id,
-               "background:#000; color:#$rgb48",
-               $rgb24,
-               "background:#FFF; color:#$rgb48",
-               $rgb24,
+               join(',', map { int } @$col),
+               "background:$css; color:$inverse; padding:0 1ex",
+               $name,
+               "background:#000; color:$css",
+               $minhex,
+               "background:#FFF; color:$css",
+               $minhex,

 }
 
 my %col = (
 }
 
 my %col = (


@@ -87,8 +79,7 @@ for my $term (qw/html cga xterm tango xkcd/) {
        print "<caption>$term</caption>\n";
        for my $num (0 .. 15) {
                my $rgb = $col{$term}[$num + 2];
        print "<caption>$term</caption>\n";
        for my $num (0 .. 15) {
                my $rgb = $col{$term}[$num + 2];

-               print '<tr>',
-                       colcell($col{"-$term"}[$num] || $num, $rgb, $col{$term}[0]);
+               print '<tr>', colcell($col{"-$term"}[$num] || $num, $rgb);

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