X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=a6b0bbb13d786fa7f1b7b9f0aef1a2c4db2dace2;hb=09df753df4c24470617c64d25eae6df2db85dfed;hp=e3a4a66fb37d57400a68b4f997e5ee0e16d91279;hpb=b99433e73b1cb96553cd8558c7c2a5da72bb1f4f;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index e3a4a66fb3..a6b0bbb13d 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -10,11 +10,13 @@
 #ifndef LYXTEXTCLASS_H
 #define LYXTEXTCLASS_H
 
-#include "Color.h"
-#include "Font.h"
+#include "ColorCode.h"
+#include "FontInfo.h"
 #include "LayoutEnums.h"
 #include "LayoutPtr.h"
 
+#include "support/docstring.h"
+
 #include <boost/shared_ptr.hpp>
 
 #include <vector>
@@ -41,12 +43,16 @@ public:
 	std::string latextype;
 	std::string latexname;
 	std::string latexparam;
-	Font font;
-	Font labelfont;
-	Color::color bgcolor;
+	FontInfo font;
+	FontInfo labelfont;
+	ColorCode bgcolor;
 	std::string preamble;
 	bool multipar;
-	bool verbatim;
+	bool passthru;
+	bool needprotect;
+	bool freespacing;
+	bool keepempty;
+	bool forceltr;
 };
 
 
@@ -173,7 +179,7 @@ public:
 	OutputType outputType() const;
 
 	///
-	Font const & defaultfont() const;
+	FontInfo const & defaultfont() const;
 
 	/// Text that dictates how wide the left margin is on the screen
 	docstring const & leftmargin() const;
@@ -236,10 +242,10 @@ private:
 	OutputType outputType_;
 	/** Base font. The paragraph and layout fonts are resolved against
 	    this font. This has to be fully instantiated. Attributes
-	    Font::INHERIT, Font::IGNORE, and Font::TOGGLE are
+	    FONT_INHERIT, FONT_IGNORE, and FONT_TOGGLE are
 	    extremely illegal.
 	*/
-	Font defaultfont_;
+	FontInfo defaultfont_;
 	/// Text that dictates how wide the left margin is on the screen
 	docstring leftmargin_;