X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=8e4940a4fc884f9a794d40eaf50562badc03861f;hb=bd3d6369c294ce2980953e7702981d0daee53cea;hp=79953e3339f78006ea986100873d31cd0b8704cc;hpb=20d5148dca2f706a453b83fb413d99016e809496;p=lyx.git

diff --git a/src/Color.cpp b/src/Color.cpp
index 79953e3339..8e4940a4fc 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -19,6 +19,7 @@
 #include "Color.h"
 #include "ColorSet.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -84,6 +85,28 @@ RGBColor rgbFromHexName(string const & x11hexname)
 	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 
+	int red = color.r;
+	int green = color.g;
+	int blue = color.b;
+	// 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
+	if (red != 0)
+		++red;
+	if (green != 0)
+		++green;
+	if (blue != 0)
+		++blue;
+	string output;
+	output = convert<string>(float(red) / 256) + ", "
+			 + convert<string>(float(green) / 256) + ", "
+			 + convert<string>(float(blue) / 256);
+	return output;
+}
+
 
 Color::Color(ColorCode base_color) : baseColor(base_color), 
 	mergeColor(Color_ignore)
@@ -131,6 +154,7 @@ 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" },
@@ -158,6 +182,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" },
@@ -188,7 +213,6 @@ 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_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" },
@@ -206,7 +230,6 @@ 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" },
@@ -216,7 +239,10 @@ ColorSet::ColorSet()
 	{ Color_buttonframe, N_("frame of button"), "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_ignore, N_("ignore"), "ignore", "black", "ignore" },
 	{ Color_ignore, 0, 0, 0, 0 }
 	};