X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.h;h=c1e99e950ac16365e17eb464d41934cabd917eec;hb=1db7ad00fe02ca4ebba56a5e02c2b9856dc538db;hp=04816c5b7f5ae3ff0bb73ea35d3a0f8eaaa4cc47;hpb=808ff6650c731d20005ace719287841366dfb504;p=lyx.git

diff --git a/src/TextClass.h b/src/TextClass.h
index 04816c5b7f..c1e99e950a 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -153,19 +153,23 @@ public:
 	/// return values for read()
 	enum ReturnValues {
 		OK,
+		OK_OLDFORMAT,
 		ERROR,
 		FORMAT_MISMATCH
 	};
 
 	/// Performs the read of the layout file.
 	/// \return true on success.
+	// FIXME Should return ReturnValues....
 	bool read(support::FileName const & filename, ReadType rt = BASECLASS);
 	///
-	bool read(std::string const & str, ReadType rt = BASECLASS);
+	ReturnValues read(std::string const & str, ReadType rt = MODULE);
 	///
 	ReturnValues read(Lexer & lex, ReadType rt = BASECLASS);
 	/// validates the layout information passed in str
-	static bool validate(std::string const & str);
+	static ReturnValues validate(std::string const & str);
+	///
+	static std::string convert(std::string const & str);
 
 	///////////////////////////////////////////////////////////////////
 	// loading
@@ -331,7 +335,7 @@ private:
 	///
 	void readCharStyle(Lexer &, std::string const &);
 	///
-	void readFloat(Lexer &);
+	bool readFloat(Lexer &);
 	///
 	void readCiteFormat(Lexer &);
 };
@@ -373,7 +377,8 @@ public:
 	/// a plain inset layout for use as a default
 	static InsetLayout const & plainInsetLayout() { return plain_insetlayout_; }
 	/// add a new layout \c name if it does not exist in layoutlist_
-	void addLayoutIfNeeded(docstring const & name) const;
+	/// \return whether we had to add one.
+	bool addLayoutIfNeeded(docstring const & name) const;
 
 	///////////////////////////////////////////////////////////////////
 	// accessors
@@ -480,6 +485,9 @@ private:
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, PageSides p);
 
+/// current format of layout files
+extern int const LAYOUT_FORMAT;
+
 
 } // namespace lyx