X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FBuffer.h;h=d483de9a0839bccdc891456a46e144bc53e0f3e1;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=7acf1f30428790a587f746b60869c09f72c9e3e9;hpb=489dca71cd99bbc78780fa40311a2eb042c0320e;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 7acf1f3042..d483de9a08 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -13,7 +13,6 @@
 #define BUFFER_H
 
 #include "OutputEnums.h"
-#include "OutputParams.h"
 
 #include "support/unique_ptr.h"
 #include "support/strfwd.h"
@@ -51,6 +50,7 @@ class MacroData;
 class MacroNameSet;
 class MacroSet;
 class OutputParams;
+class otexstream;
 class Paragraph;
 class ParConstIterator;
 class ParIterator;
@@ -69,11 +69,12 @@ class WorkAreaManager;
 namespace support {
 class DocFileName;
 class FileName;
-class FileNameList;
+class FileNamePairList;
 }
 
 namespace graphics {
 class PreviewLoader;
+class Cache;
 }
 
 
@@ -143,24 +144,6 @@ public:
 		PreviewError
 	};
 
-	/// Method to check if a file is externally modified, used by
-	/// isExternallyModified()
-	/**
-	 * timestamp is fast but inaccurate. For example, the granularity
-	 * 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
-	 * frequently used, or used for a large file on a slow (network) file
-	 * system.
-	 *
-	 * FIXME: replace this method with support/FileMonitor.
-	 */
-	enum CheckMethod {
-		checksum_method, ///< Use file checksum
-		timestamp_method ///< Use timestamp, and checksum if timestamp has changed
-	};
-
 	///
 	enum UpdateScope {
 		UpdateMaster,
@@ -248,7 +231,7 @@ private:
 	typedef std::map<Buffer const *, Buffer *> BufferMap;
 	///
 	void cloneWithChildren(BufferMap &, CloneList *) const;
-	/// save timestamp and checksum of the given file.
+	/// save checksum of the given file.
 	void saveCheckSum() const;
 	/// read a new file
 	ReadStatus readFile(support::FileName const & fn);
@@ -325,13 +308,13 @@ public:
 	    method with a string stream if the output is supposed to go to a
 	    file. \code
 	    ofdocstream ofs;
-	    otexstream os(ofs, texrow);
+	    otexstream os(ofs);
 	    ofs.open("test.tex");
 	    writeLaTeXSource(os, ...);
 	    ofs.close();
 	    \endcode is NOT equivalent to \code
 	    odocstringstream oss;
-	    otexstream os(oss, texrow);
+	    otexstream os(oss);
 	    writeLaTeXSource(os, ...);
 	    ofdocstream ofs;
 	    ofs.open("test.tex");
@@ -370,8 +353,15 @@ public:
 	///
 	bool isDepClean(std::string const & name) const;
 
-	/// whether or not disk file has been externally modified
-	bool isExternallyModified(CheckMethod method) const;
+	/// Whether or not disk file has been externally modified. Uses a checksum
+	/// which is accurate but slow, which can be a problem when it is frequently
+	/// used, or used for a large file on a slow (network) file system.
+	bool isChecksumModified() const;
+
+	/// Flag set by the FileSystemWatcher.
+	/// Fast but (not so) inaccurate, can be cleared by the user.
+	bool notifiesExternalModification() const;
+	void clearExternalModification() const;
 
 	/// mark the main lyx file as not needing saving
 	void markClean() const;
@@ -416,6 +406,18 @@ public:
 	 */
 	support::DocFileName getReferencedFileName(std::string const & fn) const;
 
+	/// Format a file name for LaTeX output (absolute or relative or filename only,
+	/// depending on file and context)
+	std::string const prepareFileNameForLaTeX(std::string const &,
+					std::string const &, bool nice) const;
+
+	/** Returns a vector of bibliography (*.bib) file paths suitable for the
+	 *  output in the respective BibTeX/Biblatex macro
+	 */
+	std::vector<docstring> const prepareBibFilePaths(OutputParams const &,
+				    support::FileNamePairList const bibfilelist,
+				    bool const extension = true) 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.
@@ -469,9 +471,13 @@ public:
 	/// thing from whichever Buffer it is called.
 	ListOfBuffers allRelatives() const;
 
-	/// Is buffer read-only?
+	/// Is buffer read-only? True if it has either the read-only flag or the
+	/// externally modified flag.
 	bool isReadonly() const;
 
+	/// Does the buffer have the read-only flag?
+	bool hasReadonlyFlag() const;
+
 	/// Set buffer read-only flag
 	void setReadonly(bool flag = true);
 
@@ -587,6 +593,8 @@ public:
 	void updatePreviews() const;
 	/// Remove any previewed LaTeX snippets associated with this buffer
 	void removePreviews() const;
+	///
+	graphics::Cache & graphicsCache() const;
 
 	/// Our main text (inside the top InsetText)
 	Text & text() const;
@@ -787,7 +795,7 @@ private:
 	void updateBibfilesCache(UpdateScope scope = UpdateMaster) const;
 	/// Return the list with all bibfiles in use (including bibfiles
 	/// of loaded child documents).
-	support::FileNameList const &
+	support::FileNamePairList const &
 		getBibfilesCache(UpdateScope scope = UpdateMaster) const;
 	///
 	void collectChildren(ListOfBuffers & children, bool grand_children) const;