Revert "Don't asssert on (too) deeply nested items"

[features.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index f65d31d654d06070f95b34b73a247cf70133e34d..7f40351a90a214c1a61d0b85d00431e3ccf567b8 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -259,7 +259,7 @@ public:
        bool autoSave() const;
        /// save emergency file
        /// \return a status message towards the user.
-       docstring emergencyWrite();
+       docstring emergencyWrite() const;
 
 //FIXME:The following function should be private
 //private:
@@ -521,8 +521,8 @@ public:
        void invalidateCiteLabels() const;
        ///
        bool citeLabelsValid() const;
-       ///
-       void getLabelList(std::vector<docstring> &) const;
+       /// two strings: plain label name and label as gui string
+       void getLabelList(std::vector<std::pair<docstring, docstring>> &) const;
 
        /// This removes the .aux and .bbl files from the temp dir.
        void removeBiblioTempFiles() const;
@@ -567,6 +567,8 @@ public:
        ParIterator par_iterator_end();
        ///
        ParConstIterator par_iterator_end() const;
+       /// Is document empty ?
+       bool empty() const;
 
        // Position of the child buffer where it appears first in the master.
        DocIterator firstChildPosition(Buffer const * child);
@@ -726,13 +728,17 @@ public:
        /// Updates screen labels and some other information associated with
        /// insets and paragraphs. Actually, it's more like a general "recurse
        /// through the Buffer" routine, that visits all the insets and paragraphs.
-       void updateBuffer() const { updateBuffer(UpdateMaster, InternalUpdate); }
+       void updateBuffer() const;
        /// \param scope: whether to start with the master document or just
        /// do this one.
        /// \param output: whether we are preparing for output.
        void updateBuffer(UpdateScope scope, UpdateType utype) const;
        ///
        void updateBuffer(ParIterator & parit, UpdateType utype, bool const deleted = false) const;
+       /// Forces an updateBuffer() call
+       void forceUpdate() const;
+       /// Do we need to call updateBuffer()?
+       bool needUpdate() const;
 
        /// Spellcheck starting from \p from.
        /// \p from initial position, will then points to the next misspelled
@@ -742,6 +748,8 @@ public:
        /// \return progress if a new word was found.
        int spellCheck(DocIterator & from, DocIterator & to,
                WordLangTuple & word_lang, docstring_list & suggestions) const;
+       /// Marks the whole buffer to be checked (again)
+       void requestSpellcheck();
        ///
        void checkChildBuffers();
        ///
@@ -769,13 +777,17 @@ public:
        int wordCount() const;
        int charCount(bool with_blanks) const;
 
-       /// FIXME: dummy function for now
+       ///
        bool areChangesPresent() const;
 
        ///
        void registerBibfiles(docstring_list const & bf) const;
        ///
        support::FileName getBibfilePath(docstring const & bibid) const;
+       /// Return the list with all bibfiles in use (including bibfiles
+       /// of loaded child documents).
+       docstring_list const &
+               getBibfiles(UpdateScope scope = UpdateMaster) const;
 
        /// routines for dealing with possible self-inclusion
        void pushIncludedBuffer(Buffer const * buf) const;
@@ -799,10 +811,6 @@ private:
        /// last time we loaded the cache. Note that this does NOT update the
        /// cached information.
        void checkIfBibInfoCacheIsValid() const;
-       /// Return the list with all bibfiles in use (including bibfiles
-       /// of loaded child documents).
-       docstring_list const &
-               getBibfiles(UpdateScope scope = UpdateMaster) const;
        ///
        void collectChildren(ListOfBuffers & children, bool grand_children) const;