Stupid bug fix.

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

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 9a41978d9b31f476794af4f91a83d99d221306f4..11c3a26fd083cdc63beecc73c2ff47ad18cbb9bd 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -11,69 +11,140 @@
 
 #include "InsetIndex.h"
 
+#include "Buffer.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "MetricsInfo.h"
 #include "sgml.h"
+#include "TocBackend.h"
+
+#include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
+/////////////////////////////////////////////////////////////////////
+//
+// InsetIndex
+//
+///////////////////////////////////////////////////////////////////////
 
-InsetIndex::InsetIndex(BufferParams const & bp)
-       : InsetCollapsable(bp)
+
+InsetIndex::InsetIndex(Buffer const & buf)
+       : InsetCollapsable(buf)
 {}
 
 
-InsetIndex::InsetIndex(InsetIndex const & in)
-       : InsetCollapsable(in)
-{}
+int InsetIndex::latex(odocstream & os,
+                     OutputParams const & runparams) const
+{
+       os << "\\index";
+       os << '{';
+       int i = 7;
+       odocstringstream ods;
+       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 << '@';
+                       i += ppart.size() + 1;
+               }
+               docstring const tpart = *it;
+               os << tpart;
+               i += tpart.size();
+               if (it2 < levels_plain.end())
+                       ++it2;
+       }
+       os << '}';
+       i += 1;
+       return i;
+}
 
 
-int InsetIndex::docbook(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+int InsetIndex::docbook(odocstream & os, OutputParams const & runparams) const
 {
        os << "<indexterm><primary>";
-       int const i = InsetText::docbook(buf, os, runparams);
+       int const i = InsetText::docbook(os, runparams);
        os << "</primary></indexterm>";
        return i;
 }
 
 
-Inset * InsetIndex::clone() const
+void InsetIndex::write(ostream & os) const
 {
-       return new InsetIndex(*this);
+       os << to_utf8(name()) << "\n";
+       InsetCollapsable::write(os);
 }
 
 
-void InsetIndex::write(Buffer const & buf, ostream & os) const
+void InsetIndex::addToToc(DocIterator const & cpit)
 {
-       os << to_utf8(name()) << "\n";
-       InsetCollapsable::write(buf, os);
+       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);
 }
 
 
+/////////////////////////////////////////////////////////////////////
+//
+// InsetPrintIndex
+//
+///////////////////////////////////////////////////////////////////////
+
 InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
        : InsetCommand(p, string())
 {}
 
 
-CommandInfo const * InsetPrintIndex::findInfo(string const & /* cmdName */)
+ParamInfo const & InsetPrintIndex::findInfo(string const & /* cmdName */)
 {
-       static const char * const paramnames[] = {"name", ""};
-       static const bool isoptional[] = {false};
-       static const CommandInfo info = {1, paramnames, isoptional};
-       return &info;
+       static ParamInfo param_info_;
+       if (param_info_.empty())
+               param_info_.add("name", ParamInfo::LATEX_REQUIRED);
+       return param_info_;
 }
 
 
-docstring const InsetPrintIndex::getScreenLabel(Buffer const &) const
+docstring InsetPrintIndex::screenLabel() const
 {
        return _("Index");
 }
@@ -90,5 +161,4 @@ InsetCode InsetPrintIndex::lyxCode() const
        return INDEX_PRINT_CODE;
 }
 
-
 } // namespace lyx