X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=fd17ac14f0a40ab611bd22a3d3413db1c07eea51;hb=dc7c7ca03eca25cf7a6395c155b70dac1594e481;hp=c9f82068b3f7efe724048b1c69e458cf7bf6a8e6;hpb=2653011613afaa86a1c964661f1dd815ebfefa7b;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index c9f82068b3..fd17ac14f0 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -133,8 +133,8 @@ public:
 	 * FIXME: replace this method with support/FileMonitor.
 	 */
 	enum CheckMethod {
-		checksum_method,  ///< Use file checksum
-		timestamp_method, ///< Use timestamp, and checksum if timestamp has changed
+		checksum_method, ///< Use file checksum
+		timestamp_method ///< Use timestamp, and checksum if timestamp has changed
 	};
 
 	///
@@ -183,9 +183,9 @@ public:
 	/// Renames and saves the buffer
 	bool saveAs(support::FileName const & fn);
 
-	/// Write document to stream. Returns \c false if unsuccesful.
+	/// Write document to stream. Returns \c false if unsuccessful.
 	bool write(std::ostream &) const;
-	/// Write file. Returns \c false if unsuccesful.
+	/// Write file. Returns \c false if unsuccessful.
 	bool writeFile(support::FileName const &) const;
 
 	/// \name Functions involved in reading files/strings.
@@ -280,19 +280,21 @@ public:
 	    method with a string stream if the output is supposed to go to a
 	    file. \code
 	    ofdocstream ofs;
+	    otexstream os(ofs, texrow);
 	    ofs.open("test.tex");
-	    writeLaTeXSource(ofs, ...);
+	    writeLaTeXSource(os, ...);
 	    ofs.close();
 	    \endcode is NOT equivalent to \code
 	    odocstringstream oss;
-	    writeLaTeXSource(oss, ...);
+	    otexstream os(oss, texrow);
+	    writeLaTeXSource(os, ...);
 	    ofdocstream ofs;
 	    ofs.open("test.tex");
 	    ofs << oss.str();
 	    ofs.close();
 	    \endcode
 	 */
-	void writeLaTeXSource(odocstream & os,
+	void writeLaTeXSource(otexstream & os,
 			   std::string const & original_path,
 			   OutputParams const &,
 			   bool output_preamble = true,
@@ -544,7 +546,7 @@ public:
 
 	/// Collect user macro names at loading time
 	typedef std::set<docstring> UserMacroSet;
-	UserMacroSet usermacros;
+	mutable UserMacroSet usermacros;
 
 	/// Replace the inset contents for insets which InsetCode is equal
 	/// to the passed \p inset_code.
@@ -553,8 +555,8 @@ public:
 
 	/// get source code (latex/docbook) for some paragraphs, or all paragraphs
 	/// including preamble
-	void getSourceCode(odocstream & os, pit_type par_begin, pit_type par_end,
-		bool full_source);
+	void getSourceCode(odocstream & os, std::string const format,
+			   pit_type par_begin, pit_type par_end, bool full_source) const;
 
 	/// Access to error list.
 	/// This method is used only for GUI visualisation of Buffer related
@@ -602,8 +604,9 @@ public:
 	std::string bufferFormat() const;
 	/// return the default output format of the current backend
 	std::string getDefaultOutputFormat() const;
-	/// return the default output flavor
-	OutputParams::FLAVOR getDefaultOutputFlavor();
+	/// return the output flavor of \p format or the default
+	OutputParams::FLAVOR getOutputFlavor(
+		  std::string const format = std::string()) const;
 
 	///
 	bool doExport(std::string const & format, bool put_in_tempdir,
@@ -669,7 +672,7 @@ private:
 	/// A cache for the default flavors
 	typedef std::map<std::string, OutputParams::FLAVOR> DefaultFlavorCache;
 	///
-	DefaultFlavorCache default_flavors_;
+	mutable DefaultFlavorCache default_flavors_;
 	///
 	void getLanguages(std::set<Language const *> &) const;
 	/// Checks whether any of the referenced bibfiles have changed since the