X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=5fb887302e703008ffc408c928a69c0b5188595e;hb=2455bc258f3b62c29ec4a41cb88070ff8518e842;hp=56e031fd59bb3a54f445b8c8fc907a59d86c4fbb;hpb=9e5eebc14cd06f58000a4bd1903f157b65a3ab19;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 56e031fd59..5fb887302e 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -19,7 +19,7 @@
 #include "Spacing.h"
 #include "support/docstring.h"
 
-#include <vector>
+#include <set>
 #include <string>
 
 namespace lyx {
@@ -51,7 +51,11 @@ class Layout {
 public:
 	///
 	Layout();
+	/// is this layout a default layout created for an unknown layout
+	bool isUnknown() const { return unknown_; }
+	void setUnknown(bool unknown) { unknown_ = unknown; }
 	/// Reads a layout definition from file
+	/// \return true on success.
 	bool read(Lexer &, TextClass const &);
 	///
 	void readAlign(Lexer &);
@@ -82,9 +86,11 @@ public:
 	///
 	docstring const & endlabelstring() const { return endlabelstring_; }
 	///
+	docstring const & category() const { return category_; }
+	///
 	docstring const & preamble() const { return preamble_; }
 	///
-	std::vector<std::string> const & requires() const { return requires_; }
+	std::set<std::string> const & requires() const { return requires_; }
 	///
 	std::string const & latexparam() const { return latexparam_; }
 	///
@@ -97,6 +103,32 @@ public:
 	docstring const & labelstring_appendix() const {
 		return labelstring_appendix_;
 	}
+	///
+	bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
+	///
+	bool isCommand() const { return latextype == LATEX_COMMAND; }
+	///
+	bool isEnvironment() const {
+		return latextype == LATEX_ENVIRONMENT
+			|| latextype == LATEX_BIB_ENVIRONMENT
+			|| latextype == LATEX_ITEM_ENVIRONMENT
+			|| latextype == LATEX_LIST_ENVIRONMENT;
+	}
+
+	///
+	bool operator==(Layout const &) const;
+	///
+	bool operator!=(Layout const & rhs) const 
+		{ return !(*this == rhs); }
+
+	////////////////////////////////////////////////////////////////
+	// members
+	////////////////////////////////////////////////////////////////
+	/** Is this layout the default layout for an unknown layout? If
+	 * so, its name will be displayed as xxx (unknown).
+	 */
+	bool unknown_;
+
 	/** Default font for this layout/environment.
 	    The main font for this kind of environment. If an attribute has
 	    INHERITED_*, it means that the value is specified by
@@ -170,14 +202,6 @@ public:
 	bool free_spacing;
 	///
 	bool pass_thru;
-	/**
-	 * Whether this layout was declared with "Environment xxx" as opposed
-	 * to "Style xxx". This is part of some unfinished generic environment
-	 * handling (see also InsetEnvironment) started by Andre. No layout
-	 * that is shipped with LyX has this flag set.
-	 * Don't confuse this with isEnvironment()!
-	 */
-	bool is_environment;
 	/// show this in toc
 	int toclevel;
 	/// special value of toclevel for non-section layouts
@@ -194,17 +218,6 @@ public:
 	bool needprotect;
 	/// true when empty paragraphs should be kept.
 	bool keepempty;
-	///
-	bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
-	///
-	bool isCommand() const { return latextype == LATEX_COMMAND; }
-	///
-	bool isEnvironment() const {
-		return latextype == LATEX_ENVIRONMENT
-			|| latextype == LATEX_BIB_ENVIRONMENT
-			|| latextype == LATEX_ITEM_ENVIRONMENT
-			|| latextype == LATEX_LIST_ENVIRONMENT;
-	}
 	/// Type of LaTeX object
 	LatexType latextype;
 	/// Does this object belong in the title part of the document?
@@ -221,10 +234,12 @@ public:
 	/// until it has proper support for the caption inset (JMarc)
 	static Layout * forCaption();
 
-private:
 	/// Name of the layout/paragraph environment
 	docstring name_;
+	/// LaTeX name for environment
+	std::string latexname_;
 
+private:
 	/** Name of an layout that has replaced this layout.
 	    This is used to rename a layout, while keeping backward
 	    compatibility
@@ -237,8 +252,6 @@ private:
 	 */
 	docstring depends_on_;
 
-	/// LaTeX name for environment
-	std::string latexname_;
 	/// Label string. "Abstract", "Reference", "Caption"...
 	docstring labelstring_;
 	///
@@ -253,10 +266,14 @@ private:
 	std::string labeltag_;
 	/// Internal tag to surround the item text in a list)
 	std::string itemtag_;
+	/// This is the `category' for this layout. The following are
+	/// recommended basic categories: FrontMatter, BackMatter, MainText,
+	/// Section, Starred, List, Theorem.
+	docstring category_;
 	/// Macro definitions needed for this layout
 	docstring preamble_;
 	/// Packages needed for this layout
-	std::vector<std::string> requires_;
+	std::set<std::string> requires_;
 };
 
 } // namespace lyx