Update of documentation in the source related to bug 4135 and the function callback...

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 9f42fa532aeebd859f4b6300ba3c4878c48abc6d..03f3a7433f56de8eabf1e9b61dd52af6a88e2132 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -26,12 +26,9 @@
 
 #include "support/convert.h"
 
-
-namespace lyx {
-
-using std::vector;
 using std::string;
 
+namespace lyx {
 
 ///////////////////////////////////////////////////////////////////////////
 // TocItem implementation
@@ -40,38 +37,6 @@ TocItem::TocItem(ParConstIterator const & par_it, int d,
                docstring const & s)
                : par_it_(par_it), depth_(d), str_(s)
 {
-/*
-       if (!uid_.empty())
-               return;
-
-       size_t pos = s.find(" ");
-       if (pos == string::npos) {
-               // Non labelled item
-               uid_ = s;
-               return;
-       }
-
-       string s2 = s.substr(0, pos);
-
-       if (s2 == "Chapter" || s2 == "Part") {
-               size_t pos2 = s.find(" ", pos + 1);
-               if (pos2 == string::npos) {
-                       // Unnumbered Chapter?? This should not happen.
-                       uid_ = s.substr(pos + 1);
-                       return;
-               }
-               // Chapter or Part
-               uid_ = s.substr(pos2 + 1);
-               return;
-       }
-       // Numbered Item.
-       uid_ = s.substr(pos + 1);
-       */
-}
-
-bool const TocItem::isValid() const
-{
-       return depth_ != -1;
 }
 
 
@@ -105,9 +70,6 @@ FuncRequest TocItem::action() const
 }
 
 
-
-
-
 ///////////////////////////////////////////////////////////////////////////
 // TocBackend implementation
 
@@ -124,11 +86,10 @@ Toc const & TocBackend::toc(std::string const & type) const
 void TocBackend::updateItem(ParConstIterator const & par_it)
 {
        if (toc("tableofcontents").empty()) {
-               // TODO should not happen, 
+               // FIXME: should not happen, 
                // a call to TocBackend::update() is missing somewhere
-               LYXERR(Debug::INFO)
-                               << "TocBackend.cpp: TocBackend::updateItem"
-                               << "called but the TOC is empty" << std::endl;
+               lyxerr << "TocBackend::updateItem called but the TOC is empty!"
+                       << std::endl;
                return;
        }
 
@@ -148,7 +109,7 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
                if (inset.lyxCode() == Inset::OPTARG_CODE) {
                        if (!tocstring.empty())
                                break;
-                       Paragraph const & par = 
+                       Paragraph const & par =
                                *static_cast<InsetOptArg&>(inset).paragraphs().begin();
                        if (!toc_item->par_it_->getLabelstring().empty())
                                tocstring = toc_item->par_it_->getLabelstring() + ' ';
@@ -188,12 +149,12 @@ void TocBackend::update()
                InsetList::const_iterator end = pit->insetlist.end();
                for (; it != end; ++it) {
                        Inset & inset = *it->inset;
-                       inset.addToToc(tocs_, *buffer_);
+                       inset.addToToc(tocs_, *buffer_, pit);
                        switch (inset.lyxCode()) {
                        case Inset::OPTARG_CODE: {
                                if (!tocstring.empty())
                                        break;
-                               Paragraph const & par = 
+                               Paragraph const & par =
                                        *static_cast<InsetOptArg&>(inset).paragraphs().begin();
                                if (!pit->getLabelstring().empty())
                                        tocstring = pit->getLabelstring() + ' ';
@@ -212,15 +173,15 @@ void TocBackend::update()
                        // insert this into the table of contents
                        if (tocstring.empty())
                                tocstring = pit->asString(*buffer_, true);
-                       toc.push_back(
-                               TocItem(pit, toclevel - min_toclevel, tocstring));
+                       toc.push_back(TocItem(pit, toclevel - min_toclevel,
+                               tocstring));
                }
        }
 }
 
 
-TocIterator const TocBackend::item(
-       std::string const & type, ParConstIterator const & par_it) const
+TocIterator const TocBackend::item(std::string const & type,
+               ParConstIterator const & par_it) const
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
        // Is the type supported?
@@ -242,9 +203,15 @@ TocIterator const TocBackend::item(
                while (par_it_text.inMathed())
                        par_it_text.backwardPos();
 
-       for (; it != last; --it)
+       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->par_it_[0].inset() != &par_it_text[0].inset())
+                       continue;
                if (it->par_it_ <= par_it_text)
                        return it;
+       }
 
        // We are before the first Toc Item:
        return last;