X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=89880831b2b84a2f6408d3cccd5abd4b2cdbb500;hb=8c73b3d2ce356e2720186f8cf5208614d124fdcf;hp=602a82726be3e5a7f573854307c0fa9d7c08102e;hpb=cd72af583f2bae976a782c98da1c90d9026618a6;p=lyx.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 602a82726b..89880831b2 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);
@@ -95,8 +97,7 @@ 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;
 	}
 
@@ -109,11 +110,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 =
@@ -152,13 +153,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);
 			switch (inset.lyxCode()) {
-			case Inset::OPTARG_CODE: {
+			case OPTARG_CODE: {
 				if (!tocstring.empty())
 					break;
 				Paragraph const & par =
@@ -187,7 +188,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 +204,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 +232,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");
 	}
 }