X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=d9933ce34e342e0611bb6a8b3974c5e875ec7401;hb=79cf3f5ec1088e7de988e889247ec300d42fb70b;hp=f2b5965e18d8cbdfb90235e475004b96d629b4c4;hpb=bb69584112dd31dacb39b387781a9d00af9c7a57;p=lyx.git

diff --git a/src/Color.cpp b/src/Color.cpp
index f2b5965e18..d9933ce34e 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -78,37 +78,81 @@ 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
-	// "red, green, blue" where the colors are a number in the range 0-1 
+	// "red, green, blue" where the colors are a number in the range 0-1
 	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;
 }
 
 
-Color::Color(ColorCode base_color) : baseColor(base_color), 
+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)
 {}
 
@@ -119,7 +163,7 @@ bool Color::operator==(Color const & color) const
 }
 
 
-bool Color::operator!=(Color const & color) const	
+bool Color::operator!=(Color const & color) const
 {
 	return baseColor != color.baseColor;
 }
@@ -154,15 +198,27 @@ ColorSet::ColorSet()
 	char const * grey80 = "#cccccc";
 	//char const * grey90 = "#e5e5e5";
 	//  ColorCode, gui, latex, x11, lyx
+	// Warning: several of these entries are overridden in GuiApplication constructor
 	static ColorEntry const items[] = {
 	{ 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" },
@@ -181,6 +237,7 @@ ColorSet::ColorSet()
 	{ Color_commentlabel, N_("comment label"), "comment", "magenta", "comment" },
 	{ Color_commentbg, N_("comment background"), "commentbg", "linen", "commentbg" },
 	{ Color_greyedoutlabel, N_("greyedout inset label"), "greyedout", "#ff0080", "greyedout" },
+	{ Color_greyedouttext, N_("greyedout inset text"), "greyedouttext", grey80, "greyedouttext" },
 	{ Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" },
 	{ Color_phantomtext, N_("phantom inset text"), "phantomtext", "#7f7f7f", "phantomtext" },
 	{ Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
@@ -192,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" },
@@ -211,9 +269,8 @@ ColorSet::ColorSet()
 	{ Color_mathmacroblend, N_("math macro blended out"), "mathmacroblend", "black", "mathmacroblend" },
 	{ Color_mathmacrooldarg, N_("math macro old parameter"), "mathmacrooldarg", grey80, "mathmacrooldarg" },
 	{ Color_mathmacronewarg, N_("math macro new parameter"), "mathmacronewarg", "black", "mathmacronewarg" },
-	{ Color_captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" },
-	{ Color_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" },
-	{ Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" },
+	{ Color_collapsible, N_("collapsible inset text"), "collapsible", "DarkRed", "collapsible" },
+	{ Color_collapsibleframe, N_("collapsible inset frame"), "collapsibleframe", "IndianRed", "collapsibleframe" },
 	{ Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" },
 	{ Color_insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },
 	{ Color_error, N_("LaTeX error"), "error", "Red", "error" },
@@ -229,20 +286,19 @@ ColorSet::ColorSet()
 	{ Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
 	{ Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" },
 	{ Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
-	{ Color_topline, N_("top/bottom line"), "topline", "Brown", "topline" },
 	{ Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" },
 	{ Color_tabularonoffline, N_("table on/off line"), "tabularonoffline",
 	     "LightSteelBlue", "tabularonoffline" },
 	{ Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" },
 	{ Color_newpage, N_("new page"), "newpage", "Blue", "newpage" },
 	{ Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" },
-	{ Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
+	{ Color_buttonframe, N_("button frame"), "buttonframe", "#dcd2c8", "buttonframe" },
 	{ Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" },
 	{ Color_buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" },
 	{ Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", grey80, "paragraphmarker"},
 	{ Color_previewframe, N_("preview frame"), "previewframe", "black", "previewframe"},
 	{ Color_inherit, N_("inherit"), "inherit", "black", "inherit" },
-	{ Color_regexpframe, N_("regexp frame"), "green", "green", "green" },
+	{ Color_regexpframe, N_("regexp frame"), "regexpframe", "green", "regexpframe" },
 	{ Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
 	{ Color_ignore, 0, 0, 0, 0 }
 	};