X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=091e319cb1d02830ae3bd62ce5cfdfbb38f6d530;hb=af16acb0b4c5379ac87fe0c9fae384af1babdc3a;hp=d84ca372b62d2cb74ea7ec37440a7e081672ad42;hpb=32b0e8cbdbb8f3b970243961d8a57ed4a9fde2e3;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index d84ca372b6..091e319cb1 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -75,6 +75,8 @@ public:
 	void readSpacing(Lexer &);
 	///
 	void readArgument(Lexer &);
+	/// Write a layout definition in utf8 encoding
+	void write(std::ostream &) const;
 	///
 	docstring const & name() const { return name_; }
 	///
@@ -87,8 +89,6 @@ public:
 	std::string const & latexname() const { return latexname_; }
 	///
 	std::string const & itemcommand() const { return itemcommand_; }
-	///
-	void setLatexName(std::string const & n) { latexname_ = n; }
 	/// The arguments of this layout
 	struct latexarg {
 		docstring labelstring;
@@ -96,6 +96,7 @@ public:
 		bool mandatory;
 		docstring ldelim;
 		docstring rdelim;
+		docstring defaultarg;
 		docstring presetarg;
 		docstring tooltip;
 		std::string requires;
@@ -103,17 +104,24 @@ public:
 		FontInfo font;
 		FontInfo labelfont;
 		bool autoinsert;
+		bool insertcotext;
+		docstring pass_thru_chars;
 	};
 	///
 	typedef std::map<std::string, latexarg> LaTeXArgMap;
 	///
-	LaTeXArgMap args() const;
-	///
 	LaTeXArgMap const & latexargs() const { return latexargs_; }
 	///
 	LaTeXArgMap const & postcommandargs() const { return postcommandargs_; }
 	///
 	LaTeXArgMap const & itemargs() const { return itemargs_; }
+	/// Returns latexargs() + postcommandargs() + itemargs().
+	/// But note that it returns a *copy*, not a reference, so do not do
+	/// anything like:
+	///   Layout::LaTeXArgMap::iterator it = args().begin();
+	///   Layout::LaTeXArgMap::iterator en = args().end();
+	/// Those are iterators for different containers.
+	LaTeXArgMap args() const;
 	///
 	int optArgs() const;
 	///
@@ -182,10 +190,7 @@ public:
 	}
 	/// Is this the kind of layout in which adjacent paragraphs
 	/// are handled as one group?
-	bool isParagraphGroup() const {
-	return latextype == LATEX_ENVIRONMENT
-		|| latextype == LATEX_BIB_ENVIRONMENT;
-	}
+	bool isParagraphGroup() const {	return par_group_; }
 	///
 	bool labelIsInline() const {
 		return labeltype == LABEL_STATIC
@@ -274,9 +279,13 @@ public:
 	///
 	bool nextnoindent;
 	///
+	ToggleIndentation toggle_indent;
+	///
 	bool free_spacing;
 	///
 	bool pass_thru;
+	/// Individual chars to be passed verbatim
+	docstring pass_thru_chars;
 	///
 	bool parbreak_is_newline;
 	/// show this in toc
@@ -309,9 +318,23 @@ public:
 
 	/// Is this spellchecked?
 	bool spellcheck;
+	/**
+	 * Should this layout definition always be written to the document preamble?
+	 * Possible values are:
+	 *   0: Do not enforce local layout
+	 * >=1: Enforce local layout with version forcelocal
+	 *  -1: Enforce local layout with infinite version
+	 * On reading, the forced local layout is only used if its version
+	 * number is greater than the version number of the same layout in the
+	 * document class. Otherwise, it is ignored.
+	 */
+	int forcelocal;
 
 
 private:
+	/// Reads a layout definition from file
+	/// \return true on success.
+	bool readIgnoreForcelocal(Lexer &, TextClass const &);
 	/// generates the default CSS for this layout
 	void makeDefaultCSS() const;
 	///
@@ -418,7 +441,7 @@ private:
 	mutable std::string defaultcssclass_;
 	/// This is the `category' for this layout. The following are
 	/// recommended basic categories: FrontMatter, BackMatter, MainText,
-	/// Section, Starred, List, Theorem.
+	/// Sectioning, Starred, List, Reasoning.
 	docstring category_;
 	/// Macro definitions needed for this layout
 	docstring preamble_;
@@ -426,6 +449,8 @@ private:
 	docstring langpreamble_;
 	/// Language and babel dependent macro definitions needed for this layout
 	docstring babelpreamble_;
+	/// Are adjacent paragraphs handled as one group?
+	bool par_group_;
 	/// Packages needed for this layout
 	std::set<std::string> requires_;
 	///