X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=3ed3a95c40597c230a888752e06c3a10557e1976;hb=a7f8fb8c5fe8f99b30e3d507dc20d455c65a4b27;hp=8bf1417d8b811abf801073f6d22d4c27f1b18b0b;hpb=8995a8387a03361b6a7ff44b447a90a6187b1a14;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 8bf1417d8b..3ed3a95c40 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -84,7 +84,7 @@ typedef std::set<Buffer *> CloneList;
 
 
 /** The buffer object.
- * This is the buffer object. It contains all the informations about
+ * This is the buffer object. It contains all the information about
  * a document loaded into LyX.
  * The buffer object owns the Text (wrapped in an InsetText), which
  * contains the individual paragraphs of the document.
@@ -141,7 +141,7 @@ public:
 	/// isExternallyModified()
 	/**
 	 * timestamp is fast but inaccurate. For example, the granularity
-	 * of timestamp on a FAT filesystem is 2 second. Also, various operations
+	 * of timestamp on a FAT filesystem is 2 seconds. Also, various operations
 	 * may touch the timestamp of a file even when its content is unchanged.
 	 *
 	 * checksum is accurate but slow, which can be a problem when it is
@@ -225,7 +225,8 @@ public:
 	/// read a new document from a string
 	bool readString(std::string const &);
 	/// Reloads the LyX file
-	ReadStatus reload();
+	/// \param clearUndo if false, leave alone the undo stack.
+	ReadStatus reload(bool clearUndo = true);
 //FIXME: The following function should be private
 //private:
 	/// read the header, returns number of unknown tokens
@@ -245,8 +246,7 @@ private:
 	/// \return \c true if file is not completely read.
 	bool readDocument(Lexer &);
 	/// Try to extract the file from a version control container
-	/// before reading if the file cannot be found. This is only
-	/// implemented for RCS.
+	/// before reading if the file cannot be found.
 	/// \sa LyXVC::file_not_found_hook
 	ReadStatus extractFromVC();
 	/// Reads the first tag of a LyX File and
@@ -379,6 +379,8 @@ public:
 	/// automatically saved, nor it needs to trigger any "do you want to save ?" question.
 	bool isInternal() const;
 
+	void setInternal(bool flag);
+
 	/// Mark this buffer as dirty.
 	void markDirty();
 
@@ -586,7 +588,8 @@ public:
 	/// get source code (latex/docbook) for some paragraphs, or all paragraphs
 	/// including preamble
 	void getSourceCode(odocstream & os, std::string const format,
-			   pit_type par_begin, pit_type par_end, OutputWhat output) const;
+			   pit_type par_begin, pit_type par_end, OutputWhat output,
+			   bool master) const;
 
 	/// Access to error list.
 	/// This method is used only for GUI visualisation of Buffer related
@@ -689,6 +692,8 @@ public:
 		WordLangTuple & word_lang, docstring_list & suggestions) const;
 	///
 	void checkChildBuffers();
+	///
+	void checkMasterBuffer();
 
 	/// compute statistics between \p from and \p to
 	/// \p from initial position