X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/4f3782455010e83df98953a4fa4f146577b9a888..87b84f183ea2518e7cf0505bcfee8a444983442b:/termcol.inc.pl

diff --git a/termcol.inc.pl b/termcol.inc.pl
index 2eb367f..9152f6b 100644
--- a/termcol.inc.pl
+++ b/termcol.inc.pl
@@ -1,8 +1,13 @@
 use strict;
 use 5.010;
-use Shiar_Sheet::Colour '1.02';
+use Shiar_Sheet::Colour '1.05';
 
 +{
+	default => [qw( ansi xkcd ansi88 )],
+	more    => [qw( ansi mirc legacy ansi256 )],
+	ansi    => [qw( cga xterm tango app html cgarne )],
+	legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
+
 	html => {
 		title => 'HTML keywords (inherited by CSS≥2.1 and SVG), mostly identical to X11',
 		href => 'http://www.w3.org/TR/css3-color/#html4',
@@ -149,8 +154,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
@@ -159,12 +164,13 @@ use Shiar_Sheet::Colour '1.02';
 		ansiorder => [ 0,2,5,9,6,4,3,15 , 11,10,13,7,14,8,12,1 ],
 		hueorder => [ 2,8,7,5,3,6,4,9 , 10,13,14,0,11,12,15,1 ],
 	},
+
+	msx => [qw( msx1 msx2 arnejmp )],
 	msx1 => {
 		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
@@ -194,6 +200,7 @@ use Shiar_Sheet::Colour '1.02';
 		)],
 		parent => 'msx1',
 	},
+
 	arnegame => {
 		href => 'http://androidarts.com/palette/16pal.htm',
 		title => 'Generic 16 color game palette v20 by Arne Niklas Jansson',
@@ -229,6 +236,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',