This is the first of a series of commits that will make InsetLayout a real class.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 07fbc1fe51d55613e300c54401552eee2cab4935..adc4d89b236b4c704750396c32805829f947535d 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -18,24 +18,30 @@
 #include "BufferParams.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
+#include "InsetList.h"
+#include "Layout.h"
 #include "LyXAction.h"
 #include "Paragraph.h"
-#include "debug.h"
+#include "TextClass.h"
 
 #include "insets/InsetOptArg.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstream.h"
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 
 ///////////////////////////////////////////////////////////////////////////
+//
 // TocItem implementation
+//
+///////////////////////////////////////////////////////////////////////////
 
-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)
 {
 }
 
@@ -71,9 +77,12 @@ FuncRequest TocItem::action() const
 
 
 ///////////////////////////////////////////////////////////////////////////
+//
 // TocBackend implementation
+//
+///////////////////////////////////////////////////////////////////////////
 
-Toc const & TocBackend::toc(std::string const & type) const
+Toc const & TocBackend::toc(string const & type) const
 {
        // Is the type already supported?
        TocList::const_iterator it = tocs_.find(type);
@@ -83,13 +92,18 @@ Toc const & TocBackend::toc(std::string const & type) const
 }
 
 
+Toc & TocBackend::toc(string const & type)
+{
+       return tocs_[type];
+}
+
+
 void TocBackend::updateItem(ParConstIterator const & par_it)
 {
        if (toc("tableofcontents").empty()) {
                // FIXME: should not happen, 
                // a call to TocBackend::update() is missing somewhere
-               lyxerr << "TocBackend::updateItem called but the TOC is empty!"
-                       << std::endl;
+               LYXERR0("TocBackend::updateItem called but the TOC is empty!");
                return;
        }
 
@@ -102,11 +116,11 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
 
        // For each paragraph, traverse its insets and let them add
        // their toc items
-       InsetList::const_iterator it = toc_item->par_it_->insetlist.begin();
-       InsetList::const_iterator end = toc_item->par_it_->insetlist.end();
+       InsetList::const_iterator it = toc_item->par_it_->insetList().begin();
+       InsetList::const_iterator end = toc_item->par_it_->insetList().end();
        for (; it != end; ++it) {
                Inset & inset = *it->inset;
-               if (inset.lyxCode() == Inset::OPTARG_CODE) {
+               if (inset.lyxCode() == OPTARG_CODE) {
                        if (!tocstring.empty())
                                break;
                        Paragraph const & par =
@@ -145,13 +159,13 @@ void TocBackend::update()
 
                // 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();
+               InsetList::const_iterator it = pit->insetList().begin();
+               InsetList::const_iterator end = pit->insetList().end();
                for (; it != end; ++it) {
                        Inset & inset = *it->inset;
-                       inset.addToToc(tocs_, *buffer_, pit);
+                       inset.addToToc(*buffer_, pit);
                        switch (inset.lyxCode()) {
-                       case Inset::OPTARG_CODE: {
+                       case OPTARG_CODE: {
                                if (!tocstring.empty())
                                        break;
                                Paragraph const & par =
@@ -180,7 +194,7 @@ void TocBackend::update()
 }
 
 
-TocIterator const TocBackend::item(std::string const & type,
+TocIterator TocBackend::item(string const & type,
                ParConstIterator const & par_it) const
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
@@ -196,12 +210,11 @@ TocIterator const TocBackend::item(std::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
@@ -225,7 +238,7 @@ void TocBackend::writePlaintextTocList(string const & type, odocstream & os) con
                TocIterator ccit = cit->second.begin();
                TocIterator end = cit->second.end();
                for (; ccit != end; ++ccit)
-                       os << ccit->asString() << '\n';
+                       os << ccit->asString() << from_utf8("\n");
        }
 }