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

diff --git a/src/TextClass.h b/src/TextClass.h
index 3de96d752d..a6b0bbb13d 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -10,8 +10,12 @@
 #ifndef LYXTEXTCLASS_H
 #define LYXTEXTCLASS_H
 
-#include "Layout.h"
-#include "lyxlayout_ptr_fwd.h"
+#include "ColorCode.h"
+#include "FontInfo.h"
+#include "LayoutEnums.h"
+#include "LayoutPtr.h"
+
+#include "support/docstring.h"
 
 #include <boost/shared_ptr.hpp>
 
@@ -23,6 +27,7 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+class Layout;
 class Lexer;
 class Counters;
 class FloatList;
@@ -34,18 +39,23 @@ public:
 	std::string name;
 	std::string lyxtype;
 	docstring labelstring;
+	std::string decoration;
 	std::string latextype;
 	std::string latexname;
 	std::string latexparam;
-	Font font;
-	Font labelfont;
+	FontInfo font;
+	FontInfo labelfont;
+	ColorCode bgcolor;
 	std::string preamble;
+	bool multipar;
+	bool passthru;
+	bool needprotect;
+	bool freespacing;
+	bool keepempty;
+	bool forceltr;
 };
 
 
-/// List of semantically defined character style insets
-typedef std::vector<InsetLayout> CharStyles;
-
 /// List of inset layouts
 typedef std::map<docstring, InsetLayout> InsetLayouts;
 
@@ -61,8 +71,8 @@ public:
 	TextClass(std::string const & = std::string(),
 		     std::string const & = std::string(),
 		     std::string const & = std::string(),
-		     bool = false);
-
+		     bool texClassAvail = false);
+	
 	/// check whether the TeX class is available
 	bool isTeXClassAvailable() const;
 
@@ -71,8 +81,14 @@ public:
 	/// paragraph styles end iterator
 	const_iterator end() const { return layoutlist_.end(); }
 
+	///Enum used with TextClass::read
+	enum ReadType { 
+		BASECLASS, //>This is a base class, i.e., top-level layout file
+		MERGE, //>This is a file included in a layout file
+		MODULE //>This is a layout module
+	};
 	/// Performs the read of the layout file.
-	bool read(support::FileName const & filename, bool merge = false);
+	bool read(support::FileName const & filename, ReadType rt = BASECLASS);
 	///
 	void readOutputType(Lexer &);
 	///
@@ -106,14 +122,10 @@ public:
 	FloatList const & floats() const;
 	/// The Counters present in this document class.
 	Counters & counters() const;
-	/// CharStyles of this doc class
-	CharStyles & charstyles() const { return charstylelist_; };
 	/// Inset layouts of this doc class
 	InsetLayouts & insetlayouts() const { return insetlayoutlist_; };
 	///
 	InsetLayout const & insetlayout(docstring const & name) const;
-	/// Retrieve element of name s:
-	CharStyles::iterator charstyle(std::string const & s) const;
 	///
 	docstring const & defaultLayoutName() const;
 	///
@@ -127,6 +139,11 @@ public:
 	///
 	std::string const & description() const;
 	///
+	bool isModular() const { return modular_; }
+	/// Sets the layout as a modular one. There is never any
+	/// need to reset this.
+	void markAsModular() { modular_ = true; }
+	///
 	std::string const & opt_fontsize() const;
 	///
 	std::string const & opt_pagestyle() const;
@@ -162,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;
@@ -171,7 +188,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;
 
@@ -194,11 +211,14 @@ private:
 	std::string latexname_;
 	/// document class description
 	std::string description_;
-	/// Specific class options
+	/// whether this is a modular layout, i.e., whether it has been
+	/// modified by loading of layout modules.
+	bool modular_;
+	///
 	std::string opt_fontsize_;
 	///
 	std::string opt_pagestyle_;
-	///
+	/// Specific class options
 	std::string options_;
 	///
 	std::string pagestyle_;
@@ -222,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_;
 
@@ -233,14 +253,12 @@ 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_;
 
 	/// Paragraph styles used in this layout
 	LayoutList layoutlist_;
-	/// CharStyles available to this layout
-	mutable CharStyles charstylelist_;
 
 	/// Input layouts available to this layout
 	mutable InsetLayouts insetlayoutlist_;
@@ -267,6 +285,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