Fix bug #8603: We want unabbreviated TOC entries here.

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index c6a8c2202b4bc28ce5a5e30c1ed70b1e98d4e0bb..9103abda0baf043599f1cd8e9d8b7df146f3d082 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -4286,7 +4286,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 
        d->bibinfo_cache_valid_ = true;
        d->cite_labels_valid_ = true;
-       cbuf.tocBackend().update(true);
+       cbuf.tocBackend().update(utype == OutputUpdate);
        if (scope == UpdateMaster)
                cbuf.structureChanged();
 }

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 4c7cd74e4e6940fd7461ac929637c893b47fcaa4..a239fb9061486e18b6f2fe32c165a95e5602e375 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -107,7 +107,8 @@ void InsetCaption::addToToc(DocIterator const & cpit, bool output_active) const
 
        Toc & toc = buffer().tocBackend().toc(floattype_);
        docstring str = full_label_;
-       text().forToc(str, TOC_ENTRY_LENGTH);
+       int length = output_active ? INT_MAX : TOC_ENTRY_LENGTH;
+       text().forToc(str, length);
        toc.push_back(TocItem(pit, 0, str, output_active));
 
        // Proceed with the rest of the inset.

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index 37566ca67829e6479e966fed4599cb85be63f305..b037c346607841bf98b0926e6911a9d51421a8d4 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -79,7 +79,8 @@ private:
        docstring xhtml(XHTMLStream & os, OutputParams const & runparams) const;
        ///
        void setCustomLabel(docstring const & label);
-       ///
+       /// \param output_active : is the toc being generated for use by the
+       /// output routines?
        void addToToc(DocIterator const & di, bool output_active) const;
        /// 
        virtual bool forcePlainLayout(idx_type = 0) const { return true; }