Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator...

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

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index e46e6cea8016168a921ddad2c26523f53ba7f0a1..9733467679e0d8c2ba355f15abc659ca76f6e8f9 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -20,76 +20,112 @@
 #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(BufferParams const & bp)
-       : InsetCollapsable(bp)
-{}
+/////////////////////////////////////////////////////////////////////
+//
+// InsetIndex
+//
+///////////////////////////////////////////////////////////////////////
 
 
-InsetIndex::InsetIndex(InsetIndex const & in)
-       : InsetCollapsable(in)
+InsetIndex::InsetIndex(Buffer const & buf)
+       : InsetCollapsable(buf)
 {}
 
 
-int InsetIndex::docbook(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+int InsetIndex::latex(odocstream & os,
+                         OutputParams const & runparams) const
 {
-       os << "<indexterm><primary>";
-       int const i = InsetText::docbook(buf, os, runparams);
-       os << "</primary></indexterm>";
+       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) {
+                       // remove remaining \'s for the sorting part
+                       os << subst(odss.str(), from_ascii("\\"), docstring());
+                       os << '@';
+                       sorted = true;
+               }
+       }
+       // 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 << '}';
        return i;
 }
 
 
-Inset * InsetIndex::clone() const
+int InsetIndex::docbook(odocstream & os, OutputParams const & runparams) const
 {
-       return new InsetIndex(*this);
+       os << "<indexterm><primary>";
+       int const i = InsetText::docbook(os, runparams);
+       os << "</primary></indexterm>";
+       return i;
 }
 
 
-void InsetIndex::write(Buffer const & buf, ostream & os) const
+void InsetIndex::write(ostream & os) const
 {
        os << to_utf8(name()) << "\n";
-       InsetCollapsable::write(buf, os);
+       InsetCollapsable::write(os);
 }
 
 
-void InsetIndex::addToToc(Buffer const & buf,
-       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 = buf.tocBackend().toc("index");
+       Toc & toc = buffer().tocBackend().toc("index");
        docstring str;
        str = getNewLabel(str);
        toc.push_back(TocItem(pit, 0, str));
 }
 
 
+/////////////////////////////////////////////////////////////////////
+//
+// 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");
 }