Do not throw exceptions here either. See r22806.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 984eb1ab65863b3f273e7c25ccdf4c60e46f2c8f..2ba097cab8327909e8562318eef24c1bdeff5df7 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -74,9 +74,17 @@ docstring const TocItem::asString() const
 }
 
 
+DocIterator const & TocItem::dit() const
+{
+       return dit_;
+}
+
+
 FuncRequest TocItem::action() const
 {
-       return FuncRequest(LFUN_PARAGRAPH_GOTO, convert<string>(id()));
+       string const arg = convert<string>(dit_.paragraph().id())
+               + ' ' + convert<string>(dit_.pos());
+       return FuncRequest(LFUN_PARAGRAPH_GOTO, arg);
 }
 
 
@@ -102,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();
@@ -132,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(false);
+                       tocstring += inset_par.asString(AS_STR_INSETS);
                        break;
                }
        }
@@ -140,62 +151,21 @@ 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(true);
+                       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();
-
-       BufferParams const & bufparams = buffer_->params();
-       const int min_toclevel = bufparams.documentClass().min_toclevel();
-
-       Toc & toc = tocs_["tableofcontents"];
-       ParConstIterator pit = buffer_->par_iterator_begin();
-       ParConstIterator end = buffer_->par_iterator_end();
-       for (; pit != end; ++pit) {
-
-               // the string that goes to the toc (could be the optarg)
-               docstring tocstring;
-
-               // For each paragraph, traverse its insets and let them add
-               // their toc items
-               InsetList::const_iterator it = pit->insetList().begin();
-               InsetList::const_iterator end = pit->insetList().end();
-               for (; it != end; ++it) {
-                       Inset & inset = *it->inset;
-                       pit.pos() = it->pos;
-                       //lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl;
-                       inset.addToToc(pit);
-                       switch (inset.lyxCode()) {
-                       case OPTARG_CODE: {
-                               if (!tocstring.empty())
-                                       break;
-                               Paragraph const & par =
-                                       *static_cast<InsetOptArg&>(inset).paragraphs().begin();
-                               if (!pit->labelString().empty())
-                                       tocstring = pit->labelString() + ' ';
-                               tocstring += par.asString(false);
-                               break;
-                       }
-                       default:
-                               break;
-                       }
-               }
-
-               /// now the toc entry for the paragraph
-               int const toclevel = pit->layout().toclevel;
-               if (toclevel != Layout::NOT_IN_TOC
-                   && toclevel >= min_toclevel) {
-                       // insert this into the table of contents
-                       if (tocstring.empty())
-                               tocstring = pit->asString(true);
-                       toc.push_back(TocItem(pit, toclevel - min_toclevel,
-                               tocstring));
-               }
+       if (!buffer_->isInternal()) {
+               DocIterator dit;
+               buffer_->inset().addToToc(dit);
        }
 }
 
@@ -206,29 +176,33 @@ TocIterator TocBackend::item(string const & type,
        TocList::const_iterator toclist_it = tocs_.find(type);
        // Is the type supported?
        LASSERT(toclist_it != tocs_.end(), /**/);
+       return toclist_it->second.item(dit);
+}
+
 
-       Toc const & toc_vector = toclist_it->second;
-       TocIterator last = toc_vector.begin();
-       TocIterator it = toc_vector.end();
+TocIterator Toc::item(DocIterator const & dit) const
+{
+       TocIterator last = begin();
+       TocIterator it = end();
        if (it == last)
                return it;
 
        --it;
 
-       ParConstIterator par_it_text(dit);
-       if (par_it_text.inMathed()) {
+       DocIterator dit_text = dit;
+       if (dit_text.inMathed()) {
                // We are only interested in text so remove the math CursorSlice.
-               while (par_it_text.inMathed())
-                       par_it_text.pop_back();
+               while (dit_text.inMathed())
+                       dit_text.pop_back();
        }
 
        for (; it != last; --it) {
                // We verify that we don't compare contents of two
                // different document. This happens when you
                // have parent and child documents.
-               if (&it->dit_[0].inset() != &par_it_text[0].inset())
+               if (&it->dit_[0].inset() != &dit_text[0].inset())
                        continue;
-               if (it->dit_ <= par_it_text)
+               if (it->dit_ <= dit_text)
                        return it;
        }
 
@@ -237,6 +211,20 @@ TocIterator TocBackend::item(string const & type,
 }
 
 
+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);