X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=a917c6e9f74792d8185b6de18c18b08c4b9d4547;hb=0ed820fa0b8ea11a390c182286c5b34a2686058a;hp=977d893c33ed7526025abd542dd82b7c076dc881;hpb=dba1e40b520f67faeb49759b7cec9ec4f981f9a1;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 977d893c33..a917c6e9f7 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -17,7 +17,6 @@
 #include "support/unique_ptr.h"
 #include "support/strfwd.h"
 #include "support/types.h"
-#include "support/FileNameList.h"
 
 #include <map>
 #include <list>
@@ -39,9 +38,6 @@ class FuncRequest;
 class FuncStatus;
 class Inset;
 class InsetLabel;
-class InsetRef;
-class Font;
-class Format;
 class Lexer;
 class Text;
 class LyXVC;
@@ -52,10 +48,9 @@ class MacroNameSet;
 class MacroSet;
 class OutputParams;
 class otexstream;
-class Paragraph;
-class ParConstIterator;
-class ParIterator;
 class ParagraphList;
+class ParIterator;
+class ParConstIterator;
 class TeXErrors;
 class TexRow;
 class TocBackend;
@@ -70,6 +65,7 @@ class WorkAreaManager;
 namespace support {
 class DocFileName;
 class FileName;
+class FileNameList;
 } // namespace support
 
 namespace graphics {
@@ -82,6 +78,7 @@ class Buffer;
 typedef std::list<Buffer *> ListOfBuffers;
 /// a list of Buffers we cloned
 typedef std::set<Buffer *> CloneList;
+typedef std::shared_ptr<CloneList> CloneList_ptr;
 
 
 /** The buffer object.
@@ -96,8 +93,6 @@ typedef std::set<Buffer *> CloneList;
  * \author Lars Gullik Bjønnes
  */
 
-class MarkAsExporting;
-
 class Buffer {
 public:
 	/// What type of log will \c getLogName() return?
@@ -153,7 +148,7 @@ public:
 
 	/// Constructor
 	explicit Buffer(std::string const & file, bool readonly = false,
-		Buffer const * cloned_buffer = 0);
+		Buffer const * cloned_buffer = nullptr);
 
 	/// Destructor
 	~Buffer();
@@ -231,7 +226,7 @@ private:
 	///
 	typedef std::map<Buffer const *, Buffer *> BufferMap;
 	///
-	void cloneWithChildren(BufferMap &, CloneList *) const;
+	void cloneWithChildren(BufferMap &, CloneList_ptr) const;
 	/// save checksum of the given file.
 	void saveCheckSum() const;
 	/// read a new file
@@ -264,7 +259,7 @@ public:
 	bool autoSave() const;
 	/// save emergency file
 	/// \return a status message towards the user.
-	docstring emergencyWrite();
+	docstring emergencyWrite() const;
 
 //FIXME:The following function should be private
 //private:
@@ -334,9 +329,9 @@ public:
 			     OutputParams const & runparams_in,
 			     OutputWhat output = FullSource) const;
 	///
-	ExportStatus writeDocBookSource(odocstream & os, std::string const & filename,
-			     OutputParams const & runparams_in,
-			     OutputWhat output = FullSource) const;
+	ExportStatus writeDocBookSource(odocstream & os,
+				 OutputParams const & runparams_in,
+				 OutputWhat output = FullSource) const;
 	///
 	ExportStatus makeLyXHTMLFile(support::FileName const & filename,
 			     OutputParams const & runparams_in) const;
@@ -347,7 +342,7 @@ public:
 	/// returns the main language for the buffer (document)
 	Language const * language() const;
 	/// get l10n translated to the buffers language
-	docstring const B_(std::string const & l10n) const;
+	docstring B_(std::string const & l10n) const;
 
 	///
 	int runChktex();
@@ -439,7 +434,7 @@ public:
 	std::string latexName(bool no_path = true) const;
 
 	/// Get the name and type of the log.
-	std::string logName(LogType * type = 0) const;
+	std::string logName(LogType * type = nullptr) const;
 
 	/// Set document's parent Buffer.
 	void setParent(Buffer const *);
@@ -624,7 +619,7 @@ public:
 	mutable UserMacroSet usermacros;
 
 	/// Replace the inset contents for insets which InsetCode is equal
-	/// to the passed \p inset_code.
+	/// to the passed \p inset_code. Handles undo.
 	void changeRefsIfUnique(docstring const & from, docstring const & to);
 
 	/// get source code (latex/docbook) for some paragraphs, or all paragraphs
@@ -737,7 +732,7 @@ public:
 	/// \param output: whether we are preparing for output.
 	void updateBuffer(UpdateScope scope, UpdateType utype) const;
 	///
-	void updateBuffer(ParIterator & parit, UpdateType utype) const;
+	void updateBuffer(ParIterator & parit, UpdateType utype, bool const deleted = false) const;
 
 	/// Spellcheck starting from \p from.
 	/// \p from initial position, will then points to the next misspelled
@@ -775,13 +770,20 @@ public:
 	int charCount(bool with_blanks) const;
 
 	/// FIXME: dummy function for now
-	bool areChangesPresent() const { return true; }
+	bool areChangesPresent() const;
 
 	///
 	void registerBibfiles(docstring_list const & bf) const;
 	///
 	support::FileName getBibfilePath(docstring const & bibid) const;
 
+	/// routines for dealing with possible self-inclusion
+	void pushIncludedBuffer(Buffer const * buf) const;
+	void popIncludedBuffer() const;
+	bool isBufferIncluded(Buffer const * buf) const;
+private:
+	void clearIncludeList() const;
+
 private:
 	friend class MarkAsExporting;
 	/// mark the buffer as busy exporting something, or not