X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.h;h=b41608a0a7cef9d1d452f6d77bdaa2392fc6b333;hb=98c966c64594611e469313314abd1e59524adb4a;hp=11834d42bf4b788ede05670b597bb543b0668e66;hpb=c1d014c2610d8b3802101a7a28576b37a2c7d824;p=lyx.git

diff --git a/src/LColor.h b/src/LColor.h
index 11834d42bf..b41608a0a7 100644
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -1,10 +1,10 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
- *	    Copyright 1998-2000 The LyX Team
+ *
+ *	    Copyright 1998-2001 The LyX Team
  *
  *======================================================*/
 
@@ -18,14 +18,13 @@
 #include <map>
 
 #include "LString.h"
-#include <boost/utility.hpp>
 
 /**
-  This is a stateless class. 
+  This is a stateless class.
 
   It has one basic purposes:
   To serve as a color-namespace container (the Color enum).
-  
+
 
   */
 /**
@@ -39,7 +38,7 @@
  * - A real, predefined color, such as black, white, red or green.
  * - A logical color, such as no color, inherit, math
  */
- 
+
 class LColor // : public boost::noncopyable {
 // made copyable for same reasons as LyXRC was made copyable. See there for
 // explanation.
@@ -83,8 +82,6 @@ public:
 		note,
 		/// Background color of notes
 		notebg,
-		/// Frame color for notes
-		noteframe,
 
 
 		/// Color for the depth bars in the margin
@@ -102,10 +99,14 @@ public:
 		/// Special chars text color
 		special,
 
+		/// Graphics inset background color
+		graphicsbg,
 		/// Math inset text color
 		math,
 		/// Math inset background color
 		mathbg,
+		/// Macro math inset background color
+		mathmacrobg,
 		/// Math inset frame color
 		mathframe,
 		/// Math cursor color
@@ -113,16 +114,14 @@ public:
 		/// Math line color
 		mathline,
 
-		/// Footnote marker text
-		// FIXME: this is seemingly mis-used all over the place
-		footnote,
-		/// Footnote line color
-		footnoteframe,
+		/// caption frame color
+		captionframe,
+
+		/// collapsable insets text
+		collapsable,
+		/// collapsable insets frame
+		collapsableframe,
 
-		/// ERT marker text
-		// FIXME: is there any reason this is different from latex ?
-		ert,
-		
 		/// Inset marker background color
 		insetbg,
 		/// Inset marker frame color
@@ -132,10 +131,10 @@ public:
 		error,
 		/// EOL marker color
 		eolmarker,
+		/// Added space colour
+		added_space,
 		/// Appendix line color
 		appendixline,
-		/// VFill line color
-		vfillline,
 		/// Top and bottom line color
 		topline,
 		/// Table line color
@@ -159,7 +158,7 @@ public:
 		/// Color used for bottom background
 		buttonbg,
 
-	        // Logical attributes
+		// Logical attributes
 
 		/// Color is inherited
 		inherit,
@@ -173,19 +172,19 @@ public:
 	void setColor(LColor::color col, string const & x11name);
 	/// set the given LyX color to the color defined by the X11 name given
 	bool setColor(string const & lyxname, string const & x11name);
- 
+
 	/// Get GUI name of color
 	string const getGUIName(LColor::color c) const;
- 
+
 	/// Get X11 name of color
 	string const getX11Name(LColor::color c) const;
- 
+
 	/// Get LaTeX name of color
 	string const getLaTeXName(LColor::color c) const;
- 
+
 	/// Get LyX name of color
 	string const getLyXName(LColor::color c) const;
- 
+
 	/// get the color from the GUI name
 	LColor::color getFromGUIName(string const & guiname) const;
 	/// get the color from the LyX name