X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIndex.cpp;h=a328d27de635c885b6d978e1fccf0ec81a763e16;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=cb2704f2f91f508a60cdc026c9bc5ad892054e9a;hpb=94e992c5ed71c8b3fbb131e6269f9a1a6cd6ab16;p=lyx.git

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index cb2704f2f9..a328d27de6 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -28,6 +28,7 @@
 #include "output_latex.h"
 #include "output_xhtml.h"
 #include "sgml.h"
+#include "texstream.h"
 #include "TextClass.h"
 #include "TocBackend.h"
 
@@ -74,9 +75,10 @@ void InsetIndex::latex(otexstream & os, OutputParams const & runparams_in) const
 	}
 
 	// get contents of InsetText as LaTeX and plaintext
-	TexRow texrow;
 	odocstringstream ourlatex;
-	otexstream ots(ourlatex, texrow);
+	// FIXME: do Tex/Row correspondence (I don't currently understand what is
+	// being generated from latexstr below)
+	otexstream ots(ourlatex);
 	InsetText::latex(ots, runparams);
 	odocstringstream ourplain;
 	InsetText::plaintext(ourplain, runparams);
@@ -348,7 +350,8 @@ void InsetIndex::string2params(string const & in, InsetIndexParams & params)
 }
 
 
-void InsetIndex::addToToc(DocIterator const & cpit, bool output_active) const
+void InsetIndex::addToToc(DocIterator const & cpit, bool output_active,
+						  UpdateType utype) const
 {
 	DocIterator pit = cpit;
 	pit.push_back(CursorSlice(const_cast<InsetIndex &>(*this)));
@@ -358,9 +361,11 @@ void InsetIndex::addToToc(DocIterator const & cpit, bool output_active) const
 		type += ":" + to_utf8(params_.index);
 	// this is unlikely to be terribly long
 	text().forOutliner(str, INT_MAX);
-	buffer().tocBackend().toc(type)->push_back(TocItem(pit, 0, str, output_active));
+	TocBuilder & b = buffer().tocBackend().builder(type);
+	b.pushItem(pit, str, output_active);
 	// Proceed with the rest of the inset.
-	InsetCollapsable::addToToc(cpit, output_active);
+	InsetCollapsable::addToToc(cpit, output_active, utype);
+	b.pop();
 }
 
 
@@ -559,7 +564,7 @@ void InsetPrintIndex::latex(otexstream & os, OutputParams const & runparams_in)
 {
 	if (!buffer().masterBuffer()->params().use_indices) {
 		if (getParam("type") == from_ascii("idx"))
-			os << "\\printindex{}";
+			os << "\\printindex" << termcmd;
 		return;
 	}
 	OutputParams runparams = runparams_in;