X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=4c5bdb00f363610aa42a7e845bbdd00b3582d9d1;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=a93e9f324cc5792a7f6a5bccb70d67ddc8cef9f2;hpb=f7b1c86393d890d5d473279d88e26bb78f8c1275;p=lyx.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index a93e9f324c..4c5bdb00f3 100644
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -16,18 +16,21 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
+#include "InsetList.h"
 #include "Layout.h"
 #include "LyXAction.h"
 #include "Paragraph.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 {
 
@@ -37,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)
 {
 }
 
@@ -80,7 +82,7 @@ FuncRequest TocItem::action() const
 //
 ///////////////////////////////////////////////////////////////////////////
 
-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);
@@ -90,18 +92,23 @@ 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;
 	}
 
 	BufferParams const & bufparams = buffer_->params();
-	const int min_toclevel = bufparams.getTextClass().min_toclevel();
+	const int min_toclevel = bufparams.textClass().min_toclevel();
 
 	TocIterator toc_item = item("tableofcontents", par_it);
 
@@ -109,8 +116,8 @@ 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() == OPTARG_CODE) {
@@ -118,8 +125,8 @@ 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() + ' ';
+			if (!toc_item->par_it_->labelString().empty())
+				tocstring = toc_item->par_it_->labelString() + ' ';
 			tocstring += par.asString(*buffer_, false);
 			break;
 		}
@@ -140,7 +147,7 @@ void TocBackend::update()
 	tocs_.clear();
 
 	BufferParams const & bufparams = buffer_->params();
-	const int min_toclevel = bufparams.getTextClass().min_toclevel();
+	const int min_toclevel = bufparams.textClass().min_toclevel();
 
 	Toc & toc = tocs_["tableofcontents"];
 	ParConstIterator pit = buffer_->par_iterator_begin();
@@ -152,19 +159,19 @@ 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 OPTARG_CODE: {
 				if (!tocstring.empty())
 					break;
 				Paragraph const & par =
 					*static_cast<InsetOptArg&>(inset).paragraphs().begin();
-				if (!pit->getLabelstring().empty())
-					tocstring = pit->getLabelstring() + ' ';
+				if (!pit->labelString().empty())
+					tocstring = pit->labelString() + ' ';
 				tocstring += par.asString(*buffer_, false);
 				break;
 			}
@@ -187,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);
@@ -203,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
@@ -232,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");
 	}
 }