pimpl not needed here

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index d8aa0f17ef4802dd980e77ea5312ffd779c5b0b3..a6b0bbb13d786fa7f1b7b9f0aef1a2c4db2dace2 100644 (file)
--- 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,15 +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 passthru;
        bool needprotect;
        bool freespacing;
        bool keepempty;
+       bool forceltr;
 };
 
 
@@ -176,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;
@@ -239,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_;