X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=9f40e74bd36bb1c9567d0dc3b546befc488fd766;hb=0a8ec32a3bbcefc5ce7d7772fec82b85ba58f2d1;hp=0bfe18f40f799b230ca01ecb2c489c7397ca34e1;hpb=88a0666d6c039decfbd0da0dee6c9b4ba4923806;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 0bfe18f40f..9f40e74bd3 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -133,6 +133,7 @@ public:
 		// export
 		ExportSuccess,
 		ExportCancel,
+		ExportKilled,
 		ExportError,
 		ExportNoPathToFormat,
 		ExportTexPathHasSpaces,
@@ -297,7 +298,7 @@ public:
 	};
 
 	/// Just a wrapper for writeLaTeXSource, first creating the ofstream.
-	bool makeLaTeXFile(support::FileName const & filename,
+	ExportStatus makeLaTeXFile(support::FileName const & filename,
 			   std::string const & original_path,
 			   OutputParams const &,
 			   OutputWhat output = FullSource) const;
@@ -323,23 +324,23 @@ public:
 	    ofs.close();
 	    \endcode
 	 */
-	void writeLaTeXSource(otexstream & os,
+	ExportStatus writeLaTeXSource(otexstream & os,
 			   std::string const & original_path,
 			   OutputParams const &,
 			   OutputWhat output = FullSource) const;
 	///
-	void makeDocBookFile(support::FileName const & filename,
+	ExportStatus makeDocBookFile(support::FileName const & filename,
 			     OutputParams const & runparams_in,
 			     OutputWhat output = FullSource) const;
 	///
-	void writeDocBookSource(odocstream & os, std::string const & filename,
+	ExportStatus writeDocBookSource(odocstream & os, std::string const & filename,
 			     OutputParams const & runparams_in,
 			     OutputWhat output = FullSource) const;
 	///
-	void makeLyXHTMLFile(support::FileName const & filename,
+	ExportStatus makeLyXHTMLFile(support::FileName const & filename,
 			     OutputParams const & runparams_in) const;
 	///
-	void writeLyXHTMLSource(odocstream & os,
+	ExportStatus writeLyXHTMLSource(odocstream & os,
 			     OutputParams const & runparams_in,
 			     OutputWhat output = FullSource) const;
 	/// returns the main language for the buffer (document)
@@ -493,25 +494,13 @@ public:
 	*/
 	void validate(LaTeXFeatures &) const;
 
-	/// Reference information is cached in the Buffer, so we do not
+	/// Bibliography information is cached in the Buffer, so we do not
 	/// have to check or read things over and over.
-	///
-	/// There are two caches.
-	///
-	/// One is a cache of the BibTeX files from which reference info is
-	/// being gathered. This cache is PER BUFFER, and the cache for the
-	/// master essentially includes the cache for its children. This gets
-	/// invalidated when an InsetBibtex is created, deleted, or modified.
-	///
-	/// The other is a cache of the reference information itself. This
-	/// exists only in the master buffer, and when it needs to be updated,
+	/// The cache exists only in the master buffer. When it is updated,
 	/// the children add their information to the master's cache.
-
 	/// Calling this method invalidates the cache and so requires a
 	/// re-read.
 	void invalidateBibinfoCache() const;
-	/// This invalidates the cache of files we need to check.
-	void invalidateBibfileCache() const;
 	/// Updates the cached bibliography information, checking first to see
 	/// whether the cache is valid. If so, we do nothing. If not, then we
 	/// reload all the BibTeX info.
@@ -520,6 +509,8 @@ public:
 	/// \return the bibliography information for this buffer's master,
 	/// or just for it, if it isn't a child.
 	BiblioInfo const & masterBibInfo() const;
+	/// \return this buffer's bibliography information
+	BiblioInfo const & bibInfo() const;
 	/// collect bibliography info from the various insets in this buffer.
 	void collectBibKeys(support::FileNameList &) const;
 	/// add some BiblioInfo to our cache
@@ -529,6 +520,8 @@ public:
 	///
 	void makeCitationLabels() const;
 	///
+	void invalidateCiteLabels() const;
+	///
 	bool citeLabelsValid() const;
 	///
 	void getLabelList(std::vector<docstring> &) const;
@@ -771,6 +764,8 @@ public:
 	void setChangesPresent(bool) const;
 	bool areChangesPresent() const;
 	void updateChangesPresent() const;
+	///
+	void registerBibfiles(support::FileNamePairList const & bf) const;
 
 private:
 	friend class MarkAsExporting;
@@ -787,13 +782,10 @@ private:
 	/// last time we loaded the cache. Note that this does NOT update the
 	/// cached information.
 	void checkIfBibInfoCacheIsValid() const;
-	/// Update the list of all bibfiles in use (including bibfiles
-	/// of loaded child documents).
-	void updateBibfilesCache(UpdateScope scope = UpdateMaster) const;
 	/// Return the list with all bibfiles in use (including bibfiles
 	/// of loaded child documents).
 	support::FileNamePairList const &
-		getBibfilesCache(UpdateScope scope = UpdateMaster) const;
+		getBibfiles(UpdateScope scope = UpdateMaster) const;
 	///
 	void collectChildren(ListOfBuffers & children, bool grand_children) const;