Correct the mess introduced in r33250.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index fd588e97930e231ed13b28cce970781c7e41f0be..90ba1ed0afd50951d7c55c0c3000329d4d8d1fec 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -74,6 +74,12 @@ docstring const TocItem::asString() const
 }
 
 
+DocIterator const & TocItem::dit() const
+{
+       return dit_;
+}
+
+
 FuncRequest TocItem::action() const
 {
        string const arg = convert<string>(dit_.paragraph().id())
@@ -104,13 +110,16 @@ Toc & TocBackend::toc(string const & type)
 }
 
 
-void TocBackend::updateItem(DocIterator const & dit)
+bool TocBackend::updateItem(DocIterator const & dit)
 {
+       if (dit.paragraph().layout().toclevel == Layout::NOT_IN_TOC)
+               return false;
+
        if (toc("tableofcontents").empty()) {
                // FIXME: should not happen, 
                // a call to TocBackend::update() is missing somewhere
                LYXERR0("TocBackend::updateItem called but the TOC is empty!");
-               return;
+               return false;
        }
 
        BufferParams const & bufparams = buffer_->params();
@@ -134,7 +143,7 @@ void TocBackend::updateItem(DocIterator const & dit)
                                *static_cast<InsetOptArg&>(inset).paragraphs().begin();
                        if (!par.labelString().empty())
                                tocstring = par.labelString() + ' ';
-                       tocstring += inset_par.asString();
+                       tocstring += inset_par.asString(AS_STR_INSETS);
                        break;
                }
        }
@@ -142,17 +151,22 @@ void TocBackend::updateItem(DocIterator const & dit)
        int const toclevel = par.layout().toclevel;
        if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
                && tocstring.empty())
-                       tocstring = par.asString(AS_STR_LABEL);
+                       tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);
 
        const_cast<TocItem &>(*toc_item).str_ = tocstring;
+
+       buffer_->updateTocItem("tableofcontents", dit);
+       return true;
 }
 
 
 void TocBackend::update()
 {
        tocs_.clear();
-       DocIterator dit;
-       buffer_->inset().addToToc(dit);
+       if (! buffer_->isInternal()) {
+               DocIterator dit;
+               buffer_->inset().addToToc(dit);
+       }
 }
 
 
@@ -197,6 +211,20 @@ TocIterator Toc::item(DocIterator const & dit) const
 }
 
 
+Toc::iterator Toc::item(int depth, docstring const & str)
+{
+       if (empty())
+               return end();
+       iterator it = begin();
+       iterator itend = end();
+       for (; it != itend; ++it) {
+               if (it->depth() == depth && it->str() == str)
+                       break;
+       }
+       return it;
+}
+
+
 void TocBackend::writePlaintextTocList(string const & type, odocstream & os) const
 {
        TocList::const_iterator cit = tocs_.find(type);