X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/b7db12d1360aaf34f69ce856cc2bab385f68080e..83596eca2ea1782932a4af42727ece9af8067f13:/termcol.plp
diff --git a/termcol.plp b/termcol.plp
index 39c8901..8918a8c 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -13,35 +13,27 @@ Html({
stylesheet => [qw'light dark'],
});
-use List::Util 'min';
-
:>
Terminal colours
<:
-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 {
- 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 '
%s | %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 = (
@@ -87,8 +79,7 @@ for my $term (qw/html cga xterm tango xkcd/) {
print "$term\n";
for my $num (0 .. 15) {
my $rgb = $col{$term}[$num + 2];
- print ' | ',
- colcell($col{"-$term"}[$num] || $num, $rgb, $col{$term}[0]);
+ print '
', colcell($col{"-$term"}[$num] || $num, $rgb);
}
print "\n\n";
}