X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=99cfce1fe12eb160331cac29c9fb74336498e939;hb=36edbffe2f71d050a09d5231c8428dd7575573fa;hp=9f40e74bd36bb1c9567d0dc3b546befc488fd766;hpb=83fded8feae6d3a7f4c11689ccef41de979b569a;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 9f40e74bd3..99cfce1fe1 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -70,7 +70,6 @@ class WorkAreaManager;
 namespace support {
 class DocFileName;
 class FileName;
-class FileNamePairList;
 } // namespace support
 
 namespace graphics {
@@ -159,9 +158,9 @@ public:
 	/// Destructor
 	~Buffer();
 
-	/// Clones the entire structure of which this Buffer is part, starting
-	/// with the master and cloning all the children, too.
-	Buffer * cloneFromMaster() const;
+	/// Clones the entire structure of which this Buffer is part, 
+	/// cloning all the children, too.
+	Buffer * cloneWithChildren() const;
 	/// Just clones this single Buffer. For autosave.
 	Buffer * cloneBufferOnly() const;
 	///
@@ -417,7 +416,7 @@ public:
 	 *  output in the respective BibTeX/Biblatex macro
 	 */
 	std::vector<docstring> const prepareBibFilePaths(OutputParams const &,
-				    support::FileNamePairList const bibfilelist,
+				    const docstring_list & bibfilelist,
 				    bool const extension = true) const;
 
 	/** Returns the path where a local layout file lives.
@@ -501,11 +500,13 @@ public:
 	/// Calling this method invalidates the cache and so requires a
 	/// re-read.
 	void invalidateBibinfoCache() const;
+	/// Clear the bibfiles cache
+	void clearBibFileCache() 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.
 	/// Note that this operates on the master document.
-	void reloadBibInfoCache() const;
+	void reloadBibInfoCache(bool const force = false) const;
 	/// \return the bibliography information for this buffer's master,
 	/// or just for it, if it isn't a child.
 	BiblioInfo const & masterBibInfo() const;
@@ -697,18 +698,28 @@ public:
 	///
 	bool isExporting() const;
 
-	///
+	/// A collection of InsetRef insets and their position in the buffer
 	typedef std::vector<std::pair<Inset *, ParIterator> > References;
-	///
+	/// Get all InsetRef insets and their positions associated with
+	/// the InsetLabel with the label string \p label
 	References const & references(docstring const & label) const;
-	///
+	/// Add an InsetRef at position \p it to the Insetlabel
+	/// with the label string \p label
 	void addReference(docstring const & label, Inset * inset, ParIterator it);
-	///
+	/// Clear the whole reference cache
 	void clearReferenceCache() const;
-	///
-	void setInsetLabel(docstring const & label, InsetLabel const * il);
-	///
-	InsetLabel const * insetLabel(docstring const & label) const;
+	/// Set the InsetLabel for a given \p label string. \p active
+	/// determines whether this is an active label (see @ref activeLabel)
+	void setInsetLabel(docstring const & label, InsetLabel const * il,
+			   bool const active);
+	/// \return the InsetLabel associated with this \p label string
+	/// If \p active is true we only return active labels
+	/// (see @ref activeLabel)
+	InsetLabel const * insetLabel(docstring const & label,
+				      bool const active = false) const;
+	/// \return true if this \param label is an active label.
+	/// Inactive labels are currently deleted labels (in ct mode)
+	bool activeLabel(docstring const & label) const;
 
 	/// return a list of all used branches (also in children)
 	void getUsedBranches(std::list<docstring> &, bool const from_master = false) const;
@@ -765,7 +776,9 @@ public:
 	bool areChangesPresent() const;
 	void updateChangesPresent() const;
 	///
-	void registerBibfiles(support::FileNamePairList const & bf) const;
+	void registerBibfiles(docstring_list const & bf) const;
+	///
+	support::FileName getBibfilePath(docstring const & bibid) const;
 
 private:
 	friend class MarkAsExporting;
@@ -784,7 +797,7 @@ private:
 	void checkIfBibInfoCacheIsValid() const;
 	/// Return the list with all bibfiles in use (including bibfiles
 	/// of loaded child documents).
-	support::FileNamePairList const &
+	docstring_list const &
 		getBibfiles(UpdateScope scope = UpdateMaster) const;
 	///
 	void collectChildren(ListOfBuffers & children, bool grand_children) const;