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

diff --git a/src/Color.cpp b/src/Color.cpp
index 290c50a0b2..5eda83442e 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
@@ -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" },
@@ -278,7 +292,7 @@ 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"},