X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.h;h=16935ac1fb3a6d1d378a7ea8383e352296fa8821;hb=15271fce0705ea5611647b5b3d1e993362ff5284;hp=685d0ac518b77cce27cac2bdc784c7b74d238a1a;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/LColor.h b/src/LColor.h
index 685d0ac518..16935ac1fb 100644
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -18,8 +18,7 @@
 #include <map>
 
 #include "LString.h"
-
-using std::map;
+#include <boost/utility.hpp>
 
 /**
   This is a stateless class. 
@@ -33,8 +32,10 @@ using std::map;
   - A logical color, such as no color, inherit, math
 
   */
-
-class LColor {
+class LColor //: public noncopyable {
+// made copyable for same reasons as LyXRC was made copyable. See there for
+// explanation.
+{
 public:
 	/// Names of colors, including all logical colors
 	enum color {
@@ -57,8 +58,10 @@ public:
 		///
 		yellow,
 
-		/// Needed interface colors
+		// Needed interface colors
 
+		/// Cursor color
+		cursor,
 		/// Background color
 		background,
 		/// Foreground color
@@ -78,6 +81,11 @@ public:
 		noteframe,
 
 
+		/// Color for the depth bars in the margin
+		depthbar,
+		/// Color for marking foreign language words
+		language,
+
 		/// Text color for command insets
 		command,
 		/// Background color for command insets
@@ -138,6 +146,10 @@ public:
 		topline,
 		/// Table line color
 		tableline,
+		/// Table line color
+		tabularline,
+		/// Table line color
+		tabularonoffline,
 		/// Bottom area color
 		bottomarea,
 		/// Page break color
@@ -154,7 +166,7 @@ public:
 		/// Color used for bottom background
 		buttonbg,
 
-	        /// Logical attributes
+	        // Logical attributes
 
 		/// Color is inherited
 		inherit,
@@ -166,17 +178,19 @@ public:
 	LColor();
 	///
 	void setColor(LColor::color col, string const & x11name);
+	///
+	bool setColor(string const & lyxname, string const & x11name);
 	/// Get GUI name of color
-	string getGUIName(LColor::color c) const;
+	string const getGUIName(LColor::color c) const;
 
 	/// Get X11 name of color
-	string getX11Name(LColor::color c) const;
+	string const getX11Name(LColor::color c) const;
 
 	/// Get LaTeX name of color
-	string getLaTeXName(LColor::color c) const;
+	string const getLaTeXName(LColor::color c) const;
 
 	/// Get LyX name of color
-	string getLyXName(LColor::color c) const;
+	string const getLyXName(LColor::color c) const;
 	///
 	LColor::color getFromGUIName(string const & guiname) const;
 	///
@@ -184,9 +198,13 @@ public:
 private:
 	///
 	struct information {
+		///
 		string guiname;
+		///
 		string latexname;
+		///
 		string x11name;
+		///
 		string lyxname;
 	};
 
@@ -196,12 +214,14 @@ private:
 		  string const & lyx);
 
 	///
-	//typedef map<LColor::color, information, less<LColor::color> > InfoTab;
-	typedef map<LColor::color, information> InfoTab;
-
+	typedef std::map<LColor::color, information> InfoTab;
+	///
 	InfoTab infotab;
 };
 
+///
 extern LColor lcolor;
+///
+extern LColor system_lcolor;
 
 #endif