"Inter-word Space"

[lyx.git] / src / LColor.h

diff --git a/src/LColor.h b/src/LColor.h
index b41608a0a7cef9d1d452f6d77bdaa2392fc6b333..43405264c94b5ed4924062c21450a77516fbb34b 100644 (file)
--- 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,6 +71,8 @@ public:
                selection,
                /// Text color in LaTeX mode
                latex,
+               /// The color used for previews
+               preview,
 
                /// Text color for notes
                note,
@@ -109,8 +105,6 @@ public:
                mathmacrobg,
                /// Math inset frame color
                mathframe,
-               /// Math cursor color
-               mathcursor,
                /// Math line color
                mathline,
 
@@ -133,8 +127,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 +168,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 +197,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