X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=f1bd1f5e795ee7d85513c1217fda43971d8f875a;hb=5b84f11f80d1ec160dbfa312bc2358cfd7abec72;hp=4037e5a1e60861b711e6728fa3ace1c6f50f6168;hpb=4115d2487f57f58774ee2846aa2b35818c0bc1b9;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 4037e5a1e6..f1bd1f5e79 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -302,8 +302,8 @@ public:
 			   OutputParams const &,
 			   OutputWhat output = FullSource) const;
 	/** Export the buffer to LaTeX.
-	    If \p os is a file stream, and params().inputenc is "auto" or
-	    "default", and the buffer contains text in different languages
+	    If \p os is a file stream, and params().inputenc is "auto-legacy" or
+	    "auto-legacy-plain", and the buffer contains text in different languages
 	    with more than one encoding, then this method will change the
 	    encoding associated to \p os. Therefore you must not call this
 	    method with a string stream if the output is supposed to go to a
@@ -413,9 +413,9 @@ public:
 					std::string const &, bool nice) const;
 
 	/** Returns a vector of bibliography (*.bib) file paths suitable for the
-	 *  output in the respective BibTeX/Biblatex macro
+	 *  output in the respective BibTeX/Biblatex macro and potential individual encoding
 	 */
-	std::vector<docstring> const prepareBibFilePaths(OutputParams const &,
+	std::vector<std::pair<docstring, std::string>> const prepareBibFilePaths(OutputParams const &,
 				    const docstring_list & bibfilelist,
 				    bool const extension = true) const;
 
@@ -698,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;