Stupid bug fix.

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

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index da82e7e64a178d2764aafd957a3cd8c4604354cd..11c3a26fd083cdc63beecc73c2ff47ad18cbb9bd 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -44,32 +44,52 @@ InsetIndex::InsetIndex(Buffer const & buf)
 
 
 int InsetIndex::latex(odocstream & os,
-                         OutputParams const & runparams) const
+                     OutputParams const & runparams) const
 {
        os << "\\index";
        os << '{';
+       int i = 7;
        odocstringstream ods;
-       int i = InsetText::latex(ods, runparams);
-       bool sorted = false;
-       // correctly sort macros and formatted strings
-       // if we do find a command, prepend a plain text
-       // version of the content to get sorting right,
-       // e.g. \index{LyX@\LyX}, \index{text@\textbf{text}}
-       // Don't do that if the user entered '@' himself, though.
-       if (contains(ods.str(), '\\') && !contains(ods.str(), '@')) {
-               if (InsetText::plaintext(os, runparams) > 0) {
+       InsetText::latex(ods, runparams);
+       odocstringstream ods2;
+       InsetText::plaintext(ods2, runparams);
+       std::vector<docstring> const levels =
+               getVectorFromString(ods.str(), from_ascii("!"), true);
+       std::vector<docstring> const levels_plain =
+               getVectorFromString(ods2.str(), from_ascii("!"), true);
+       vector<docstring>::const_iterator it = levels.begin();
+       vector<docstring>::const_iterator end = levels.end();
+       vector<docstring>::const_iterator it2 = levels_plain.begin();
+       for (; it != end; ++it) {
+               if (it > levels.begin()) {
+                       os << '!';
+                       i += 1;
+               }
+               // correctly sort macros and formatted strings
+               // if we do find a command, prepend a plain text
+               // version of the content to get sorting right,
+               // e.g. \index{LyX@\LyX}, \index{text@\textbf{text}}
+               // Don't do that if the user entered '@' himself, though.
+               if (contains(*it, '\\') && !contains(*it, '@')) {
+                       // Plaintext might return nothing (e.g. for ERTs)
+                       docstring spart =
+                               (it2 < levels_plain.end()
+                                && !(*it2).empty()) ? *it2 : *it;
+                       // remove remaining \'s for the sorting part
+                       docstring const ppart =
+                               subst(spart, from_ascii("\\"), docstring());
+                       os << ppart;
                        os << '@';
-                       sorted = true;
+                       i += ppart.size() + 1;
                }
+               docstring const tpart = *it;
+               os << tpart;
+               i += tpart.size();
+               if (it2 < levels_plain.end())
+                       ++it2;
        }
-       // if a hierarchy tag '!' is used, ommit this in the post-@ part.
-       if (sorted && contains(ods.str(), '!')) {
-               string dummy;
-               // FIXME unicode
-               os << from_utf8(rsplit(to_utf8(ods.str()), dummy, '!'));
-       } else
-               i = InsetText::latex(os, runparams);
        os << '}';
+       i += 1;
        return i;
 }
 
@@ -90,15 +110,17 @@ void InsetIndex::write(ostream & os) const
 }
 
 
-void InsetIndex::addToToc(ParConstIterator const & cpit) const
+void InsetIndex::addToToc(DocIterator const & cpit)
 {
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(*this));
 
        Toc & toc = buffer().tocBackend().toc("index");
        docstring str;
        str = getNewLabel(str);
        toc.push_back(TocItem(pit, 0, str));
+       // Proceed with the rest of the inset.
+       InsetCollapsable::addToToc(cpit);
 }