Merge branch 'master' into biblatex2

[lyx.git] / src / insets / InsetIndex.cpp

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 5c8a9dd78f77a1a615c28a8c441fa4fd9a0087ba..a328d27de635c885b6d978e1fccf0ec81a763e16 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -76,6 +76,8 @@ void InsetIndex::latex(otexstream & os, OutputParams const & runparams_in) const
 
        // get contents of InsetText as LaTeX and plaintext
        odocstringstream ourlatex;
+       // 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;
@@ -359,9 +361,11 @@ void InsetIndex::addToToc(DocIterator const & cpit, bool output_active,
                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, utype);
+       b.pop();
 }
 
 
@@ -560,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;