X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=a64aff64632b347a04cbb3be625c0cd19015cc99;hb=8c73b3d2ce356e2720186f8cf5208614d124fdcf;hp=699dae557d020701a92c8dea56138f4558c463df;hpb=8a947f63da25582224d20b29fadba6128f271555;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index 699dae557d..a64aff6463 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -7,12 +7,18 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef LYXTEXTCLASS_H
-#define LYXTEXTCLASS_H
+#ifndef TEXTCLASS_H
+#define TEXTCLASS_H
 
-#include "Color.h"
-#include "Layout.h"
-#include "lyxlayout_ptr_fwd.h"
+#include "ColorCode.h"
+#include "FontInfo.h"
+#include "LayoutEnums.h"
+#include "LayoutPtr.h"
+
+#include "insets/InsetLayout.h"
+
+#include "support/docstring.h"
+#include "support/types.h"
 
 #include <boost/shared_ptr.hpp>
 
@@ -24,31 +30,11 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+class Layout;
 class Lexer;
 class Counters;
 class FloatList;
 
-
-///
-class InsetLayout {
-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;
-	Color::color bgcolor;
-	std::string preamble;
-};
-
-
-/// List of semantically defined character style insets
-typedef std::vector<InsetLayout> CharStyles;
-
 /// List of inset layouts
 typedef std::map<docstring, InsetLayout> InsetLayouts;
 
@@ -115,8 +101,6 @@ 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_; };
 	///
@@ -153,17 +137,12 @@ public:
 
 	/// is this feature already provided by the class?
 	bool provides(std::string const & p) const;
+	/// features required by the class?
+	std::set<std::string> const & requires() const { return requires_; }
 
 	///
 	unsigned int columns() const;
 	///
-	enum PageSides {
-		///
-		OneSide,
-		///
-		TwoSides
-	};
-	///
 	PageSides sides() const;
 	///
 	int secnumdepth() const;
@@ -174,7 +153,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;
@@ -183,7 +162,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;
 
@@ -197,9 +176,9 @@ public:
 	bool hasTocLevels() const;
 private:
 	///
-	bool delete_layout(docstring const &);
+	bool deleteLayout(docstring const &);
 	///
-	bool do_readStyle(Lexer &, Layout &);
+	bool readStyle(Lexer &, Layout &);
 	/// Layout file name
 	std::string name_;
 	/// document class name
@@ -225,6 +204,8 @@ private:
 	docstring preamble_;
 	/// latex packages loaded by document class.
 	std::set<std::string> provides_;
+	/// latex packages requested by document class.
+	std::set<std::string> requires_;
 	///
 	unsigned int columns_;
 	///
@@ -237,10 +218,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_;
 
@@ -248,14 +229,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_;
@@ -280,8 +259,7 @@ private:
 
 
 /// convert page sides option to text 1 or 2
-std::ostream & operator<<(std::ostream & os, TextClass::PageSides p);
-
+std::ostream & operator<<(std::ostream & os, PageSides p);
 
 } // namespace lyx