X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=50b273352fc70530e33ac41dca94633e90a1d1a8;hb=6780a3040958c937d6441c32f333c5ee55f64e3c;hp=386625e18d2906896a943d84cf5777c5edf29378;hpb=183b188ebe3489aebb372c00818afaab870cf4b8;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 386625e18d..50b273352f 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -134,7 +134,10 @@ public:
 		ExportTexPathHasSpaces,
 		ExportConverterError,
 		// preview
+		// Implies ExportSuccess.
 		PreviewSuccess,
+		// The exported file exists but there was an error when opening
+		// it in a viewer.
 		PreviewError
 	};
 
@@ -230,13 +233,14 @@ public:
 	/// read a new document from a string
 	bool readString(std::string const &);
 	/// Reloads the LyX file
-	/// \param clearUndo if false, leave alone the undo stack.
-	ReadStatus reload(bool clearUndo = true);
+	ReadStatus reload();
 //FIXME: The following function should be private
 //private:
 	/// read the header, returns number of unknown tokens
 	int readHeader(Lexer & lex);
 
+	double fontScalingFactor() const;
+
 private:
 	///
 	typedef std::map<Buffer const *, Buffer *> BufferMap;
@@ -399,6 +403,18 @@ public:
 	/// It is always an absolute path.
 	std::string filePath() const;
 
+	/** Returns the path where a local layout file lives.
+	 *  An empty string is returned for standard system and user layouts.
+	 *  If possible, it is always relative to the buffer path.
+	 */
+	std::string layoutPos() const;
+
+	/** Set the path to a local layout file.
+	 *  This must be an absolute path but, if possible, it is always
+	 *  stored as relative to the buffer path.
+	 */
+	void setLayoutPos(std::string const & path);
+
 	/** A transformed version of the file name, adequate for LaTeX.
 	    \param no_path optional if \c true then the path is stripped.
 	*/
@@ -511,6 +527,8 @@ public:
 	///
 	BufferParams & params();
 	BufferParams const & params() const;
+	///
+	BufferParams const & masterParams() const;
 
 	/** The list of paragraphs.
 	    This is a linked list of paragraph, this list holds the
@@ -593,7 +611,7 @@ public:
 
 	/// get source code (latex/docbook) for some paragraphs, or all paragraphs
 	/// including preamble
-	void getSourceCode(odocstream & os, std::string const format,
+	void getSourceCode(odocstream & os, std::string const & format,
 			   pit_type par_begin, pit_type par_end, OutputWhat output,
 			   bool master) const;
 
@@ -639,21 +657,22 @@ public:
 
 	///
 	ExportStatus doExport(std::string const & target, bool put_in_tempdir) const;
-	///
-	ExportStatus doExport(std::string const & target, bool put_in_tempdir,
-		std::string & result_file) const;
-	///
+	/// Export buffer to format \p format and open the result in a suitable viewer.
+	/// Note: This has nothing to do with preview of graphics or math formulas.
 	ExportStatus preview(std::string const & format) const;
+	/// true if there was a previous preview this session of this buffer and
+	/// there was an error on the previous preview of this buffer.
+	bool lastPreviewError() const;
 
 private:
+	///
+	ExportStatus doExport(std::string const & target, bool put_in_tempdir,
+		std::string & result_file) const;
 	/// target is a format name optionally followed by a space
 	/// and a destination file-name
 	ExportStatus doExport(std::string const & target, bool put_in_tempdir,
 		bool includeall, std::string & result_file) const;
 	///
-	ExportStatus doExport(std::string const & target, bool put_in_tempdir,
-		bool includeall) const;
-	///
 	ExportStatus preview(std::string const & format, bool includeall = false) const;
 	///
 	void setMathFlavor(OutputParams & op) const;
@@ -706,6 +725,15 @@ public:
 	///
 	void checkMasterBuffer();
 
+	/// If the document is being saved to a new location and the named file
+	/// exists at the old location, return its updated path relative to the
+	/// new buffer path if possible, otherwise return its absolute path.
+	/// In all other cases, this is a no-op and name is returned unchanged.
+	/// If a non-empty ext is given, the existence of name.ext is checked
+	/// but the returned path will not contain this extension.
+	std::string includedFilePath(std::string const & name,
+				std::string const & ext = empty_string()) const;
+
 	/// compute statistics between \p from and \p to
 	/// \p from initial position
 	/// \p to points to the end position