adjust

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index d9a13e84c49baa9a35b6e7ec175acc65b7595e0e..4f50311df3caa7791d2a8dc5712eb0e916191fca 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -11,7 +11,8 @@
 #define LYXTEXTCLASS_H
 
 #include "Color.h"
-#include "Layout.h"
+#include "Font.h"
+#include "LayoutEnums.h"
 #include "lyxlayout_ptr_fwd.h"
 
 #include <boost/shared_ptr.hpp>
@@ -24,6 +25,7 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+class Layout;
 class Lexer;
 class Counters;
 class FloatList;
@@ -43,6 +45,7 @@ public:
        Font labelfont;
        Color::color bgcolor;
        std::string preamble;
+       bool multipar;
 };
 
 
@@ -178,7 +181,7 @@ public:
        docstring const & rightmargin() const;
 
        /// The type of command used to produce a title
-       LYX_TITLE_LATEX_TYPES titletype() const;
+       TitleLatexType titletype() const;
        /// The name of the title command
        std::string const & titlename() const;
 
@@ -243,7 +246,7 @@ private:
        docstring rightmargin_;
 
        /// The type of command used to produce a title
-       LYX_TITLE_LATEX_TYPES titletype_;
+       TitleLatexType titletype_;
        /// The name of the title command
        std::string titlename_;
 
@@ -275,6 +278,12 @@ private:
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, TextClass::PageSides p);
 
+/** Shared pointer for possibly modular layout. Needed so that paste,
+ *  for example, will still be able to retain the pointer, even when
+ *  the buffer itself is closed.
+ */
+typedef boost::shared_ptr<TextClass> TextClassPtr;
+
 
 } // namespace lyx