pimpl not needed here

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 4fcc1e8ea604d5de6d70c5a503b2a2cfa90f0b28..a6b0bbb13d786fa7f1b7b9f0aef1a2c4db2dace2 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -11,7 +11,7 @@
 #define LYXTEXTCLASS_H
 
 #include "ColorCode.h"
-#include "Font.h"
+#include "FontInfo.h"
 #include "LayoutEnums.h"
 #include "LayoutPtr.h"
 
@@ -43,8 +43,8 @@ public:
        std::string latextype;
        std::string latexname;
        std::string latexparam;
-       Font font;
-       Font labelfont;
+       FontInfo font;
+       FontInfo labelfont;
        ColorCode bgcolor;
        std::string preamble;
        bool multipar;
@@ -52,6 +52,7 @@ public:
        bool needprotect;
        bool freespacing;
        bool keepempty;
+       bool forceltr;
 };
 
 
@@ -178,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;
@@ -241,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_;