X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=05cf8aac8174305def8e76a12bc896c983745327;hb=b8f04ae29ad0e484ae010dd2364f61164cffca56;hp=3ed3a95c40597c230a888752e06c3a10557e1976;hpb=aafd52f44167d5510be1ddcb974daa9dae486933;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 3ed3a95c40..05cf8aac81 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -15,8 +15,6 @@
 #include "OutputEnums.h"
 #include "OutputParams.h"
 
-#include "insets/InsetCode.h"
-
 #include "support/strfwd.h"
 #include "support/types.h"
 
@@ -94,6 +92,9 @@ typedef std::set<Buffer *> CloneList;
  * minimal, probably not.
  * \author Lars Gullik Bjønnes
  */
+
+class MarkAsExporting;
+
 class Buffer {
 public:
 	/// What type of log will \c getLogName() return?
@@ -133,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
 	};
 
@@ -222,16 +226,21 @@ public:
 	/// emergency or autosave files, one should use \c loadLyXFile.
 	/// /sa loadLyXFile
 	ReadStatus loadThisLyXFile(support::FileName const & fn);
+	/// import a new document from a string
+	bool importString(std::string const &, docstring const &, ErrorList &);
+	/// import a new file
+	bool importFile(std::string const &, support::FileName const &, ErrorList &);
 	/// 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;
@@ -390,7 +399,7 @@ public:
 	/// Returns the buffer's filename. It is always an absolute path.
 	std::string absFileName() const;
 
-	/// Returns the the path where the buffer lives.
+	/// Returns the path where the buffer lives.
 	/// It is always an absolute path.
 	std::string filePath() const;
 
@@ -486,6 +495,8 @@ public:
 	/// add a single piece of bibliography info to our cache
 	void addBibTeXInfo(docstring const & key, BibTeXInfo const & bi) const;
 	///
+	void makeCitationLabels() const;
+	///
 	bool citeLabelsValid() const;
 	///
 	void getLabelList(std::vector<docstring> &) const;
@@ -504,6 +515,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
@@ -582,12 +595,11 @@ public:
 
 	/// Replace the inset contents for insets which InsetCode is equal
 	/// to the passed \p inset_code.
-	void changeRefsIfUnique(docstring const & from, docstring const & to,
-		InsetCode code);
+	void changeRefsIfUnique(docstring const & from, docstring const & to);
 
 	/// 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;
 
@@ -633,21 +645,19 @@ 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;
 
 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;
@@ -658,10 +668,15 @@ public:
 
 	///
 	typedef std::vector<std::pair<Inset *, ParIterator> > References;
-	References & references(docstring const & label);
+	///
 	References const & references(docstring const & label) const;
+	///
+	void addReference(docstring const & label, Inset * inset, ParIterator it);
+	///
 	void clearReferenceCache() const;
+	///
 	void setInsetLabel(docstring const & label, InsetLabel const * il);
+	///
 	InsetLabel const * insetLabel(docstring const & label) const;
 
 	/// return a list of all used branches (also in children)
@@ -706,11 +721,12 @@ public:
 	int charCount(bool with_blanks) const;
 
 private:
-	class MarkAsExporting;
 	friend class MarkAsExporting;
 	/// mark the buffer as busy exporting something, or not
 	void setExportStatus(bool e) const;
 
+	///
+	References & getReferenceCache(docstring const & label);
 	/// Change name of buffer. Updates "read-only" flag.
 	void setFileName(support::FileName const & fname);
 	///
@@ -740,6 +756,25 @@ private:
 };
 
 
+/// Helper class, to guarantee that the export status
+/// gets reset properly. To use, simply create a local variable:
+///    MarkAsExporting mex(bufptr);
+/// and leave the rest to us.
+class MarkAsExporting {
+public:
+	MarkAsExporting(Buffer const * buf) : buf_(buf)
+	{
+		buf_->setExportStatus(true);
+	}
+	~MarkAsExporting()
+	{
+		buf_->setExportStatus(false);
+	}
+private:
+	Buffer const * const buf_;
+};
+
+
 } // namespace lyx
 
 #endif