listerrors.lyx : Update a link.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index fd588e97930e231ed13b28cce970781c7e41f0be..a66b307d5d9e3e7595a42d71847fc904d8f2cc4c 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -25,7 +25,7 @@
 #include "ParIterator.h"
 #include "TextClass.h"
 
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
@@ -44,8 +44,8 @@ namespace lyx {
 //
 ///////////////////////////////////////////////////////////////////////////
 
-TocItem::TocItem(DocIterator const & dit, int d, docstring const & s)
-       : dit_(dit), depth_(d), str_(s)
+TocItem::TocItem(DocIterator const & dit, int d, docstring const & s,
+       docstring const & t) : dit_(dit), depth_(d), str_(s), tooltip_(t)
 {
 }
 
@@ -68,12 +68,24 @@ docstring const & TocItem::str() const
 }
 
 
+docstring const & TocItem::tooltip() const
+{
+       return tooltip_;
+}
+
+
 docstring const TocItem::asString() const
 {
        return docstring(4 * depth_, ' ') + str_;
 }
 
 
+DocIterator const & TocItem::dit() const
+{
+       return dit_;
+}
+
+
 FuncRequest TocItem::action() const
 {
        string const arg = convert<string>(dit_.paragraph().id())
@@ -104,13 +116,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();
@@ -127,14 +142,14 @@ void TocBackend::updateItem(DocIterator const & dit)
        InsetList::const_iterator end = par.insetList().end();
        for (; it != end; ++it) {
                Inset & inset = *it->inset;
-               if (inset.lyxCode() == OPTARG_CODE) {
+               if (inset.lyxCode() == ARG_CODE) {
                        if (!tocstring.empty())
                                break;
                        Paragraph const & inset_par =
-                               *static_cast<InsetOptArg&>(inset).paragraphs().begin();
+                               *static_cast<InsetArgument&>(inset).paragraphs().begin();
                        if (!par.labelString().empty())
                                tocstring = par.labelString() + ' ';
-                       tocstring += inset_par.asString();
+                       tocstring += inset_par.asString(AS_STR_INSETS);
                        break;
                }
        }
@@ -142,17 +157,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 +217,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);