X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.h;h=8b7f669e1ee0fe9058585ba48f3fe830c65a9da9;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=b41608a0a7cef9d1d452f6d77bdaa2392fc6b333;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/LColor.h b/src/LColor.h
index b41608a0a7..8b7f669e1e 100644
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -11,12 +11,6 @@
 #ifndef LCOLOR_H
 #define LCOLOR_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include <map>
-
 #include "LString.h"
 
 /**
@@ -39,7 +33,7 @@
  * - A logical color, such as no color, inherit, math
  */
 
-class LColor // : public boost::noncopyable {
+class LColor 
 // made copyable for same reasons as LyXRC was made copyable. See there for
 // explanation.
 {
@@ -77,11 +71,21 @@ public:
 		selection,
 		/// Text color in LaTeX mode
 		latex,
+		/// The color used for previews
+		preview,
 
 		/// Text color for notes
 		note,
 		/// Background color of notes
 		notebg,
+		/// Text color for comments
+		comment,
+		/// Background color of comments
+		commentbg,
+		/// Text color for greyedout inset
+		greyedout,
+		/// Background color of greyedout inset
+		greyedoutbg,
 
 
 		/// Color for the depth bars in the margin
@@ -109,8 +113,6 @@ public:
 		mathmacrobg,
 		/// Math inset frame color
 		mathframe,
-		/// Math cursor color
-		mathcursor,
 		/// Math line color
 		mathline,
 
@@ -133,8 +135,14 @@ public:
 		eolmarker,
 		/// Added space colour
 		added_space,
-		/// Appendix line color
-		appendixline,
+		/// Appendix marker color
+		appendix,
+		/// changebar color
+		changebar,
+		/// strike-out color
+		strikeout,
+		/// added text color
+		newtext,
 		/// Top and bottom line color
 		topline,
 		/// Table line color
@@ -168,6 +176,12 @@ public:
 
 	///
 	LColor();
+	///
+	LColor(LColor const &);
+	///
+	~LColor();
+	///
+	void operator=(LColor const &);
 	/// set the given LyX color to the color defined by the X11 name given
 	void setColor(LColor::color col, string const & x11name);
 	/// set the given LyX color to the color defined by the X11 name given
@@ -191,26 +205,9 @@ public:
 	LColor::color getFromLyXName(string const & lyxname) const;
 private:
 	///
-	struct information {
-		/// the name as it appears in the GUI
-		string guiname;
-		/// the name used in LaTeX
-		string latexname;
-		/// the name for X11
-		string x11name;
-		/// the name for LyX
-		string lyxname;
-	};
-
-	/// initialise a color entry
-	void fill(LColor::color col, string const & gui,
-		  string const & latex, string const & x11,
-		  string const & lyx);
-
+	struct Pimpl;
 	///
-	typedef std::map<LColor::color, information> InfoTab;
-	/// the table of color information
-	InfoTab infotab;
+	Pimpl * pimpl_;
 };
 
 /// the current color definitions