X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=f08c9fbf53807a10e7d025fc20b62f4531169f1e;hb=355395174bf50e1a3b8514e8eebec978c496d6ba;hp=8e4940a4fc884f9a794d40eaf50562badc03861f;hpb=5f08562026b6298023e86861d8b09b82bf38b966;p=lyx.git

diff --git a/src/Color.cpp b/src/Color.cpp
index 8e4940a4fc..f08c9fbf53 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -78,13 +78,15 @@ string const X11hexname(RGBColor const & col)
 RGBColor rgbFromHexName(string const & x11hexname)
 {
 	RGBColor c;
-	LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#', /**/);
+	LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#',
+		return c);
 	c.r = hexstrToInt(x11hexname.substr(1, 2));
 	c.g = hexstrToInt(x11hexname.substr(3, 2));
 	c.b = hexstrToInt(x11hexname.substr(5, 2));
 	return c;
 }
 
+
 string const outputLaTeXColor(RGBColor const & color)
 {
 	// this routine returns a LaTeX readable color string in the form
@@ -92,22 +94,64 @@ string const outputLaTeXColor(RGBColor const & color)
 	int red = color.r;
 	int green = color.g;
 	int blue = color.b;
+#ifdef USE_CORRECT_RGB_CONVERSION
+	int const scale = 255;
+#else
 	// the color values are given in the range of 0-255, so to get
 	// an output of "0.5" for the value 127 we need to do the following
+	// FIXME: This is wrong, since it creates a nonlinear mapping:
+	//        There is a gap between 0/256 and 2/256!
+	//        0.5 cannot be represented in 8bit hex RGB, it would be 127.5.
 	if (red != 0)
 		++red;
 	if (green != 0)
 		++green;
 	if (blue != 0)
 		++blue;
+	int const scale = 256;
+#endif
 	string output;
-	output = convert<string>(float(red) / 256) + ", "
-			 + convert<string>(float(green) / 256) + ", "
-			 + convert<string>(float(blue) / 256);
+	output = convert<string>(float(red) / scale) + ", "
+			 + convert<string>(float(green) / scale) + ", "
+			 + convert<string>(float(blue) / scale);
 	return output;
 }
 
 
+RGBColor const RGBColorFromLaTeX(string const & color)
+{
+	vector<string> rgb = getVectorFromString(color);
+	while (rgb.size() < 3)
+		rgb.push_back("0");
+	RGBColor c;
+	for (int i = 0; i < 3; ++i) {
+		rgb[i] = trim(rgb[i]);
+		if (!isStrDbl(rgb[i]))
+			return c;
+	}
+#ifdef USE_CORRECT_RGB_CONVERSION
+	int const scale = 255;
+#else
+	// FIXME: This is wrong, since it creates a nonlinear mapping:
+	//        Both 0/256 and 1/256 are mapped to 0!
+	//        The wrong code exists only to match outputLaTeXColor().
+	int const scale = 256;
+#endif
+	c.r = static_cast<unsigned int>(scale * convert<double>(rgb[0]) + 0.5);
+	c.g = static_cast<unsigned int>(scale * convert<double>(rgb[1]) + 0.5);
+	c.b = static_cast<unsigned int>(scale * convert<double>(rgb[2]) + 0.5);
+#ifndef USE_CORRECT_RGB_CONVERSION
+	if (c.r != 0)
+		c.r--;
+	if (c.g != 0)
+		c.g--;
+	if (c.b != 0)
+		c.b--;
+#endif
+	return c;
+}
+
+
 Color::Color(ColorCode base_color) : baseColor(base_color), 
 	mergeColor(Color_ignore)
 {}
@@ -159,11 +203,22 @@ ColorSet::ColorSet()
 	{ Color_none, N_("none"), "none", "black", "none" },
 	{ Color_black, N_("black"), "black", "black", "black" },
 	{ Color_white, N_("white"), "white", "white", "white" },
-	{ Color_red, N_("red"), "red", "red", "red" },
-	{ Color_green, N_("green"), "green", "green", "green" },
 	{ Color_blue, N_("blue"), "blue", "blue", "blue" },
+	{ Color_brown, N_("brown"), "brown", "brown", "brown" },
 	{ Color_cyan, N_("cyan"), "cyan", "cyan", "cyan" },
+	{ Color_darkgray, N_("darkgray"), "darkgray", "darkgray", "darkgray" },
+	{ Color_gray, N_("gray"), "gray", "gray", "gray" },
+	{ Color_green, N_("green"), "green", "green", "green" },
+	{ Color_lightgray, N_("lightgray"), "lightgray", "lightgray", "lightgray" },
+	{ Color_lime, N_("lime"), "lime", "lime", "lime" },
 	{ Color_magenta, N_("magenta"), "magenta", "magenta", "magenta" },
+	{ Color_olive, N_("olive"), "olive", "olive", "olive" },
+	{ Color_orange, N_("orange"), "orange", "orange", "orange" },
+	{ Color_pink, N_("pink"), "pink", "pink", "pink" },
+	{ Color_purple, N_("purple"), "purple", "purple", "purple" },
+	{ Color_red, N_("red"), "red", "red", "red" },
+	{ Color_teal, N_("teal"), "teal", "teal", "teal" },
+	{ Color_violet, N_("violet"), "violet", "violet", "violet" },
 	{ Color_yellow, N_("yellow"), "yellow", "yellow", "yellow" },
 	{ Color_cursor, N_("cursor"), "cursor", "black", "cursor" },
 	{ Color_background, N_("background"), "background", "linen", "background" },
@@ -194,6 +249,7 @@ ColorSet::ColorSet()
 	{ Color_urllabel, N_("URL label"), "urllabel", "blue", "urllabel" },
 	{ Color_urltext, N_("URL text"), "urltext", "blue", "urltext" },
 	{ Color_depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
+	{ Color_scroll, N_("scroll indicator"), "scroll", "IndianRed", "scroll" },
 	{ Color_language, N_("language"), "language", "Blue", "language" },
 	{ Color_command, N_("command inset"), "command", "black", "command" },
 	{ Color_commandbg, N_("command inset background"), "commandbg", "azure", "commandbg" },