stdmenus.inc: comment out two non-working menu entries

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 8646bc504869b86d6148f5111883ad58eff3a294..1964147977395f25256dee7d668aa3c30eb1ee5a 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -40,9 +40,8 @@ namespace lyx {
 //
 ///////////////////////////////////////////////////////////////////////////
 
-TocItem::TocItem(ParConstIterator const & par_it, int d,
-               docstring const & s)
-               : par_it_(par_it), depth_(d), str_(s)
+TocItem::TocItem(ParConstIterator const & par_it, int d, docstring const & s)
+       : par_it_(par_it), depth_(d), str_(s)
 {
 }
 
@@ -93,6 +92,12 @@ Toc const & TocBackend::toc(string const & type) const
 }
 
 
+Toc & TocBackend::toc(string const & type)
+{
+       return tocs_[type];
+}
+
+
 void TocBackend::updateItem(ParConstIterator const & par_it)
 {
        if (toc("tableofcontents").empty()) {
@@ -103,7 +108,7 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
        }
 
        BufferParams const & bufparams = buffer_->params();
-       const int min_toclevel = bufparams.getTextClass().min_toclevel();
+       const int min_toclevel = bufparams.documentClass().min_toclevel();
 
        TocIterator toc_item = item("tableofcontents", par_it);
 
@@ -120,18 +125,17 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
                                break;
                        Paragraph const & par =
                                *static_cast<InsetOptArg&>(inset).paragraphs().begin();
-                       if (!toc_item->par_it_->getLabelstring().empty())
-                               tocstring = toc_item->par_it_->getLabelstring() + ' ';
-                       tocstring += par.asString(*buffer_, false);
+                       if (!toc_item->par_it_->labelString().empty())
+                               tocstring = toc_item->par_it_->labelString() + ' ';
+                       tocstring += par.asString(false);
                        break;
                }
        }
 
-       int const toclevel = toc_item->par_it_->layout()->toclevel;
-       if (toclevel != Layout::NOT_IN_TOC
-           && toclevel >= min_toclevel
+       int const toclevel = toc_item->par_it_->layout().toclevel;
+       if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
                && tocstring.empty())
-                       tocstring = toc_item->par_it_->asString(*buffer_, true);
+                       tocstring = toc_item->par_it_->asString(true);
 
        const_cast<TocItem &>(*toc_item).str_ = tocstring;
 }
@@ -142,7 +146,7 @@ void TocBackend::update()
        tocs_.clear();
 
        BufferParams const & bufparams = buffer_->params();
-       const int min_toclevel = bufparams.getTextClass().min_toclevel();
+       const int min_toclevel = bufparams.documentClass().min_toclevel();
 
        Toc & toc = tocs_["tableofcontents"];
        ParConstIterator pit = buffer_->par_iterator_begin();
@@ -158,16 +162,17 @@ void TocBackend::update()
                InsetList::const_iterator end = pit->insetList().end();
                for (; it != end; ++it) {
                        Inset & inset = *it->inset;
-                       inset.addToToc(tocs_, *buffer_, pit);
+                       //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->getLabelstring().empty())
-                                       tocstring = pit->getLabelstring() + ' ';
-                               tocstring += par.asString(*buffer_, false);
+                               if (!pit->labelString().empty())
+                                       tocstring = pit->labelString() + ' ';
+                               tocstring += par.asString(false);
                                break;
                        }
                        default:
@@ -176,12 +181,12 @@ void TocBackend::update()
                }
 
                /// now the toc entry for the paragraph
-               int const toclevel = pit->layout()->toclevel;
+               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(*buffer_, true);
+                               tocstring = pit->asString(true);
                        toc.push_back(TocItem(pit, toclevel - min_toclevel,
                                tocstring));
                }
@@ -189,7 +194,7 @@ void TocBackend::update()
 }
 
 
-TocIterator const TocBackend::item(string const & type,
+TocIterator TocBackend::item(string const & type,
                ParConstIterator const & par_it) const
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
@@ -205,12 +210,11 @@ TocIterator const TocBackend::item(string const & type,
        --it;
 
        ParConstIterator par_it_text = par_it;
-       if (par_it_text.inMathed())
-               // It would be better to do
-               //   par_it_text.backwardInset();
-               // but this method does not exist.
+       if (par_it_text.inMathed()) {
+               // We are only interested in text so remove the math CursorSlice.
                while (par_it_text.inMathed())
-                       par_it_text.backwardPos();
+                       par_it_text.pop_back();
+       }
 
        for (; it != last; --it) {
                // We verify that we don't compare contents of two