X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=913546fd744c37e3f993b13390e1f01f017cb871;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=88cb9a4edba234c22d0181581d905a1926bdd1b1;hpb=41060c9723f6bf5ee5e1e888961338a62bb0302e;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 88cb9a4edb..913546fd74 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;
@@ -310,9 +310,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;
 	///