X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=d9933ce34e342e0611bb6a8b3974c5e875ec7401;hb=1b6ce0e827d58258e84ba2bf0754c6b273b123db;hp=290c50a0b2aa6c41c77f2b8215ca0878bd6cc387;hpb=cfd6767ec1a4776cd9a8d90e0cc4f532afe2001d;p=lyx.git

diff --git a/src/Color.cpp b/src/Color.cpp
index 290c50a0b2..d9933ce34e 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -78,17 +78,19 @@ 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;
@@ -150,7 +152,7 @@ RGBColor const RGBColorFromLaTeX(string const & color)
 }
 
 
-Color::Color(ColorCode base_color) : baseColor(base_color), 
+Color::Color(ColorCode base_color) : baseColor(base_color),
 	mergeColor(Color_ignore)
 {}
 
@@ -161,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;
 }
@@ -201,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" },
@@ -236,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" },
@@ -255,8 +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_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" },
@@ -278,13 +292,13 @@ ColorSet::ColorSet()
 	{ 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 }
 	};