termcol: named function to parse table data

[sheet.git] / termcol.inc.pl

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 2eb367f0ed48debea4ff844013c1df93e27c47ef..d4741edae96e012b7e6f4617b74768d1681b2d0e 100644 (file)
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -1,6 +1,6 @@
 use strict;
 use 5.010;
-use Shiar_Sheet::Colour '1.02';
+use Shiar_Sheet::Colour '1.05';
 
 +{
        html => {
@@ -149,8 +149,8 @@ use Shiar_Sheet::Colour '1.02';
                        }
 
                        # convert to rgb
-                       $y *= 255 / 32;
-                       $_ = $_ * 127.5 + 128 for $u, $v;
+                       $y /= 32;
+                       $_ /= 2 for $u, $v;
                        Shiar_Sheet::Colour->newyuv($y, $u, $v)->rgb48;
                } qw(
                        0    32  10+5 20-5 12+2 16-2 8+0  24-0
@@ -163,8 +163,7 @@ use Shiar_Sheet::Colour '1.02';
                name => 'MSX',
                list => [ map {
                        my ($y, @c) = split /;/;
-                       $y *= 255;
-                       $_ = ($_ - .47) / .53 * 127.5 + 128 for @c;
+                       $_ = ($_ - .47) / .53 / 2 for @c;
                        Shiar_Sheet::Colour->newyuv($y, @c)->rgb48;
                } qw(
                        0.00;0.47;0.47 0.00;0.47;0.47 0.53;0.20;0.07 0.67;0.27;0.17
@@ -229,6 +228,16 @@ use Shiar_Sheet::Colour '1.02';
                ansiorder => [ 0,1,5,4,2,12,10,7 , 3,6,11,14,8,9,13,15 ],
                hueorder => [ 6,9,14,11,13,8,2,1 , 12,4,7,5,15,10,3,0 ],
        },
+       solarized => {
+               href => 'http://ethanschoonover.com/solarized',
+               list => [qw(
+                       002b36:base03 073642:base02 586e75:base01 657b83:base00
+                       839496:base0  93a1a1:base1  eee8d5:base2  fdf6e3:base3
+                       b58900:yellow cb4b16:orange dc322f:red    d33682:magenta
+                       6c71c4:violet 268bd2:blue   2aa198:cyan   859900:green
+               )],
+               ansiorder => [ 1,10,15,8,13,11,14,6 , 0,9,2,3,4,12,5,7 ],
+       },
 
        cpc => {
                name => 'Amstrad CPC',