X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=90ba1ed0afd50951d7c55c0c3000329d4d8d1fec;hb=489b80aef4d7904d667aeb06a32f2cc4ecbb75fa;hp=2da31fca17f278015c03bc2e0757ceda2983be08;hpb=5ce39aa8b5afb1fa88c39797cea6d4e5da5dafe3;p=lyx.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 2da31fca17..90ba1ed0af 100644
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -74,6 +74,12 @@ docstring const TocItem::asString() const
 }
 
 
+DocIterator const & TocItem::dit() const
+{
+	return dit_;
+}
+
+
 FuncRequest TocItem::action() const
 {
 	string const arg = convert<string>(dit_.paragraph().id())
@@ -137,7 +143,7 @@ bool TocBackend::updateItem(DocIterator const & dit)
 				*static_cast<InsetOptArg&>(inset).paragraphs().begin();
 			if (!par.labelString().empty())
 				tocstring = par.labelString() + ' ';
-			tocstring += inset_par.asString();
+			tocstring += inset_par.asString(AS_STR_INSETS);
 			break;
 		}
 	}
@@ -145,7 +151,7 @@ bool TocBackend::updateItem(DocIterator const & dit)
 	int const toclevel = par.layout().toclevel;
 	if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
 		&& tocstring.empty())
-			tocstring = par.asString(AS_STR_LABEL);
+			tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);
 
 	const_cast<TocItem &>(*toc_item).str_ = tocstring;
 
@@ -157,8 +163,10 @@ bool TocBackend::updateItem(DocIterator const & dit)
 void TocBackend::update()
 {
 	tocs_.clear();
-	DocIterator dit;
-	buffer_->inset().addToToc(dit);
+	if (! buffer_->isInternal()) {
+		DocIterator dit;
+		buffer_->inset().addToToc(dit);
+	}
 }
 
 
@@ -203,13 +211,13 @@ TocIterator Toc::item(DocIterator const & dit) const
 }
 
 
-TocIterator Toc::item(int depth, docstring const & str) const
+Toc::iterator Toc::item(int depth, docstring const & str)
 {
 	if (empty())
 		return end();
-	TocIterator it = begin();
-	TocIterator itend = end();
-	for (; it != itend; --it) {
+	iterator it = begin();
+	iterator itend = end();
+	for (; it != itend; ++it) {
 		if (it->depth() == depth && it->str() == str)
 			break;
 	}