X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=99cfce1fe12eb160331cac29c9fb74336498e939;hb=36edbffe2f71d050a09d5231c8428dd7575573fa;hp=d111c2ba3d3b0049c5066f52d2788ac1e2c09a8e;hpb=d3ee87eea282ca6e8f0a78bc6a0e27b4f0942624;p=lyx.git diff --git a/src/Buffer.h b/src/Buffer.h index d111c2ba3d..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 { @@ -133,6 +132,7 @@ public: // export ExportSuccess, ExportCancel, + ExportKilled, ExportError, ExportNoPathToFormat, ExportTexPathHasSpaces, @@ -158,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; /// @@ -297,7 +297,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 +323,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) @@ -416,7 +416,7 @@ public: * output in the respective BibTeX/Biblatex macro */ std::vector 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. @@ -500,14 +500,18 @@ 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; + /// \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 @@ -694,18 +698,28 @@ public: /// bool isExporting() const; - /// + /// A collection of InsetRef insets and their position in the buffer typedef std::vector > 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 &, bool const from_master = false) const; @@ -762,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; @@ -781,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;