Fix wrong painting of lines right of multicol

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

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 1dc8b4c1f970cf89382c7be828a223ad8dbbc7be..57c0d07a3a496e100ab7bacebfe0b42a4aa6c285 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -22,6 +22,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "IndicesList.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "output_latex.h"
@@ -37,8 +38,8 @@
 
 #include "frontends/alert.h"
 
-#include <ostream>
 #include <algorithm>
+#include <ostream>
 
 using namespace std;
 using namespace lyx::support;
@@ -65,7 +66,7 @@ void InsetIndex::latex(otexstream & os, OutputParams const & runparams_in) const
        if (buffer().masterBuffer()->params().use_indices && !params_.index.empty()
            && params_.index != "idx") {
                os << "\\sindex[";
-        os << escape(params_.index);
+               os << escape(params_.index);
                os << "]{";
        } else {
                os << "\\index";
@@ -347,15 +348,15 @@ void InsetIndex::string2params(string const & in, InsetIndexParams & params)
 }
 
 
-void InsetIndex::addToToc(DocIterator const & cpit) const
+void InsetIndex::addToToc(DocIterator const & cpit, bool output_active) const
 {
        DocIterator pit = cpit;
        pit.push_back(CursorSlice(const_cast<InsetIndex &>(*this)));
        docstring str;
        text().forToc(str, 0);
-       buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, str));
+       buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, str, output_active));
        // Proceed with the rest of the inset.
-       InsetCollapsable::addToToc(cpit);
+       InsetCollapsable::addToToc(cpit, output_active);
 }
 
 
@@ -688,17 +689,24 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const
        if (toc.empty())
                return docstring();
 
-       // Collection the index entries in a form we can use them.
+       // Collect the index entries in a form we can use them.
        Toc::const_iterator it = toc.begin();
        Toc::const_iterator const en = toc.end();
        vector<IndexEntry> entries;
        for (; it != en; ++it)
-               entries.push_back(IndexEntry(it->str(), it->dit()));
+               if (it->isOutput())
+                       entries.push_back(IndexEntry(it->str(), it->dit()));
+
+       if (entries.empty())
+               // not very likely that all the index entries are in notes or
+               // whatever, but....
+               return docstring();
+
        stable_sort(entries.begin(), entries.end());
 
        Layout const & lay = bp.documentClass().htmlTOCLayout();
        string const & tocclass = lay.defaultCSSClass();
-       string const tocattr = "class='tochead " + tocclass + "'";
+       string const tocattr = "class='index " + tocclass + "'";
 
        // we'll use our own stream, because we are going to defer everything.
        // that's how we deal with the fact that we're probably inside a standard
@@ -706,9 +714,10 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const
        odocstringstream ods;
        XHTMLStream xs(ods);
 
-       xs << html::StartTag("div", "class='index'");
+       xs << html::StartTag("div", tocattr);
        xs << html::StartTag(lay.htmltag(), lay.htmlattr()) 
-                << _("Index") 
+                << translateIfPossible(from_ascii("Index"),
+                                 op.local_font->language()->lang())
                 << html::EndTag(lay.htmltag());
        xs << html::StartTag("ul", "class='main'");
        Font const dummy;