Fix layout bug. Pasting text into a cell tried to set Standard layout, because

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

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index d56fa4a5b13ed1f06eb76b2fc525a6c49704baee..00da6df8be4b1103639d29f3b837612c8f62fd46 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -20,6 +20,7 @@
 #include "sgml.h"
 #include "TocBackend.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -44,35 +45,88 @@ InsetIndex::InsetIndex(Buffer const & buf)
 
 
 int InsetIndex::latex(odocstream & os,
-                         OutputParams const & runparams) const
+                     OutputParams const & runparams) const
 {
        os << "\\index";
        os << '{';
-       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(), '@')) {
-               odocstringstream odss;
-               if (InsetText::plaintext(odss, runparams) > 0) {
+       int i = 7;
+
+       // get contents of InsetText as LaTeX and plaintext
+       odocstringstream ourlatex;
+       InsetText::latex(ourlatex, runparams);
+       odocstringstream ourplain;
+       InsetText::plaintext(ourplain, runparams);
+       docstring latexstr = ourlatex.str();
+       docstring plainstr = ourplain.str();
+
+       // this will get what follows | if anything does
+       docstring cmd;
+
+       // check for the | separator
+       // FIXME This would go wrong on an escaped "|", but
+       // how far do we want to go here?
+       size_t pos = latexstr.find(from_ascii("|"));
+       if (pos != docstring::npos) {
+               // put the bit after "|" into cmd...
+               cmd = latexstr.substr(pos + 1);
+               // ...and erase that stuff from latexstr
+               latexstr = latexstr.erase(pos);
+               // ...and similarly from plainstr
+               size_t ppos = plainstr.find(from_ascii("|"));
+               if (ppos < plainstr.size())
+                       plainstr.erase(ppos);
+               else
+                       LYXERR0("The `|' separator was not found in the plaintext version!");
+       }
+
+       // Separate the entires and subentries, i.e., split on "!"
+       // FIXME This would do the wrong thing with escaped ! characters
+       std::vector<docstring> const levels =
+               getVectorFromString(latexstr, from_ascii("!"), true);
+       std::vector<docstring> const levels_plain =
+               getVectorFromString(plainstr, 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();
+       bool first = true;
+       for (; it != end; ++it) {
+               // write the separator except the first time
+               if (!first) {
+                       os << '!';
+                       i += 1;
+               } else
+                       first = 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(*it, '\\') && !contains(*it, '@')) {
+                       // Plaintext might return nothing (e.g. for ERTs)
+                       docstring const spart = 
+                               (it2 < levels_plain.end() && !(*it2).empty()) ? *it2 : *it;
                        // remove remaining \'s for the sorting part
-                       os << subst(odss.str(), from_ascii("\\"), docstring());
+                       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;
+       }
+       // write the bit that followed "|"
+       if (!cmd.empty()) {
+               os << "|" << cmd;
+               i += cmd.size() + 1;
        }
-       // 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;
 }