#7379 avoid the wrap spell check question when buffer is empty

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

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index bb86b4695700a9233bdc6b2d27d4332e524d3adf..fe50bf4fea7ccd5b050cbfe7fb2991a8e045c2e7 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -16,6 +16,7 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "ColorSet.h"
+#include "Cursor.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
 #include "FuncRequest.h"
@@ -23,10 +24,10 @@
 #include "IndicesList.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
-#include "MetricsInfo.h"
 #include "output_latex.h"
 #include "output_xhtml.h"
 #include "sgml.h"
+#include "TextClass.h"
 #include "TocBackend.h"
 
 #include "support/debug.h"
@@ -37,6 +38,7 @@
 #include "frontends/alert.h"
 
 #include <ostream>
+#include <algorithm>
 
 using namespace std;
 using namespace lyx::support;
@@ -55,8 +57,7 @@ InsetIndex::InsetIndex(Buffer * buf, InsetIndexParams const & params)
 {}
 
 
-int InsetIndex::latex(odocstream & os,
-                     OutputParams const & runparams_in) const
+void InsetIndex::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams(runparams_in);
        runparams.inIndexEntry = true;
@@ -70,11 +71,12 @@ int InsetIndex::latex(odocstream & os,
                os << "\\index";
                os << '{';
        }
-       int i = 0;
 
        // get contents of InsetText as LaTeX and plaintext
+       TexRow texrow;
        odocstringstream ourlatex;
-       InsetText::latex(ourlatex, runparams);
+       otexstream ots(ourlatex, texrow);
+       InsetText::latex(ots, runparams);
        odocstringstream ourplain;
        InsetText::plaintext(ourplain, runparams);
        docstring latexstr = ourlatex.str();
@@ -160,10 +162,10 @@ int InsetIndex::latex(odocstream & os,
                        ++it2;
        }
        // write the bit that followed "|"
-       if (!cmd.empty())
+       if (!cmd.empty()) {
                os << "|" << cmd;
+       }
        os << '}';
-       return i;
 }
 
 
@@ -197,16 +199,21 @@ bool InsetIndex::showInsetDialog(BufferView * bv) const
 
 void InsetIndex::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                if (cmd.getArg(0) == "changetype") {
+                       cur.recordUndoInset(ATOMIC_UNDO, this);
                        params_.index = from_utf8(cmd.getArg(1));
                        break;
                }
                InsetIndexParams params;
                InsetIndex::string2params(to_utf8(cmd.argument()), params);
+               cur.recordUndoInset(ATOMIC_UNDO, this);
                params_.index = params.index;
+               // what we really want here is a TOC update, but that means
+               // a full buffer update
+               cur.forceBufferUpdate();
                break;
        }
 
@@ -224,7 +231,7 @@ void InsetIndex::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetIndex::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "changetype") {
@@ -279,11 +286,7 @@ docstring InsetIndex::toolTip(BufferView const &, int, int) const
                tip += ")";
        }
        tip += ": ";
-       OutputParams rp(&buffer().params().encoding());
-       odocstringstream ods;
-       InsetText::plaintext(ods, rp);
-       tip += ods.str();
-       return wrapParas(tip);
+       return toolTipText(tip);
 }
 
 
@@ -349,12 +352,13 @@ void InsetIndex::string2params(string const & in, InsetIndexParams & params)
 }
 
 
-void InsetIndex::addToToc(DocIterator const & cpit)
+void InsetIndex::addToToc(DocIterator const & cpit) const
 {
        DocIterator pit = cpit;
-       pit.push_back(CursorSlice(*this));
-       docstring const item = text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
-       buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, item));
+       pit.push_back(CursorSlice(const_cast<InsetIndex &>(*this)));
+       docstring str;
+       text().forToc(str, TOC_ENTRY_LENGTH);
+       buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, str));
        // Proceed with the rest of the inset.
        InsetCollapsable::addToToc(cpit);
 }
@@ -366,10 +370,11 @@ void InsetIndex::validate(LaTeXFeatures & features) const
            && !params_.index.empty()
            && params_.index != "idx")
                features.require("splitidx");
+       InsetCollapsable::validate(features);
 }
 
 
-docstring InsetIndex::contextMenu(BufferView const &, int, int) const
+docstring InsetIndex::contextMenuName() const
 {
        return from_ascii("context-index");
 }
@@ -417,7 +422,7 @@ void InsetIndexParams::read(Lexer & lex)
 ///////////////////////////////////////////////////////////////////////
 
 InsetPrintIndex::InsetPrintIndex(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "index_print")
+       : InsetCommand(buf, p)
 {}
 
 
@@ -445,7 +450,7 @@ docstring InsetPrintIndex::screenLabel() const
        Index const * index = indiceslist.findShortcut(getParam("type"));
        if (!index && !printall)
                return _("Unknown index type!");
-       docstring res = printall ? _("All indices") : index->index();
+       docstring res = printall ? _("All indexes") : index->index();
        if (!multind)
                res += " (" + _("non-active") + ")";
        else if (contains(getCmdName(), "printsubindex"))
@@ -463,7 +468,7 @@ bool InsetPrintIndex::isCompatibleCommand(string const & s)
 
 void InsetPrintIndex::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                if (cmd.argument() == from_ascii("toggle-subindex")) {
@@ -472,6 +477,7 @@ void InsetPrintIndex::doDispatch(Cursor & cur, FuncRequest & cmd)
                                cmd = subst(cmd, "printindex", "printsubindex");
                        else
                                cmd = subst(cmd, "printsubindex", "printindex");
+                       cur.recordUndo();
                        setCmdName(cmd);
                        break;
                } else if (cmd.argument() == from_ascii("check-printindex*")) {
@@ -479,16 +485,16 @@ void InsetPrintIndex::doDispatch(Cursor & cur, FuncRequest & cmd)
                        if (suffixIs(cmd, '*'))
                                break;
                        cmd += '*';
+                       cur.recordUndo();
                        setParam("type", docstring());
                        setCmdName(cmd);
                        break;
                }
                InsetCommandParams p(INDEX_PRINT_CODE);
                // FIXME UNICODE
-               InsetCommand::string2params("index_print",
-                       to_utf8(cmd.argument()), p);
+               InsetCommand::string2params(to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
-                       cur.noUpdate();
+                       cur.noScreenUpdate();
                        break;
                }
                setParams(p);
@@ -505,7 +511,7 @@ void InsetPrintIndex::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetPrintIndex::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                if (cmd.argument() == from_ascii("toggle-subindex")) {
@@ -519,8 +525,7 @@ bool InsetPrintIndex::getStatus(Cursor & cur, FuncRequest const & cmd,
                } if (cmd.getArg(0) == "index_print"
                    && cmd.getArg(1) == "CommandInset") {
                        InsetCommandParams p(INDEX_PRINT_CODE);
-                       InsetCommand::string2params("index_print",
-                               to_utf8(cmd.argument()), p);
+                       InsetCommand::string2params(to_utf8(cmd.argument()), p);
                        if (suffixIs(p.getCmdName(), '*')) {
                                status.setEnabled(true);
                                status.setOnOff(false);
@@ -548,16 +553,15 @@ bool InsetPrintIndex::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-int InsetPrintIndex::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetPrintIndex::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        if (!buffer().masterBuffer()->params().use_indices) {
                if (getParam("type") == from_ascii("idx"))
                        os << "\\printindex{}";
-               return 0;
+               return;
        }
        OutputParams runparams = runparams_in;
        os << getCommand(runparams);
-       return 0;
 }
 
 
@@ -569,7 +573,7 @@ void InsetPrintIndex::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetPrintIndex::contextMenu(BufferView const &, int, int) const
+docstring InsetPrintIndex::contextMenuName() const
 {
        return buffer().masterBuffer()->params().use_indices ?
                from_ascii("context-indexprint") : docstring();
@@ -788,7 +792,7 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const
                        if (level == 3) {
                                // another subsubentry
                                xs << html::StartTag("li", "class='subsubentry'") 
-                                  << XHTMLStream::NextRaw() << subsub;
+                                  << XHTMLStream::ESCAPE_NONE << subsub;
                        } else if (level == 2) {
                                // there are two ways we can be here: 
                                // (i) we can actually be inside a sub-entry already and be about
@@ -802,13 +806,13 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const
                                // have a sub-sub-entry.
                                if (eit->sub != last.sub)
                                        xs << html::StartTag("li", "class='subentry'") 
-                                          << XHTMLStream::NextRaw() << sub;
+                                          << XHTMLStream::ESCAPE_NONE << sub;
                                if (!subsub.empty()) {
                                        // it's actually a subsubentry, so we need to start that list
                                        xs.cr();
                                        xs << html::StartTag("ul", "class='subsubentry'") 
                                           << html::StartTag("li", "class='subsubentry'") 
-                                          << XHTMLStream::NextRaw() << subsub;
+                                          << XHTMLStream::ESCAPE_NONE << subsub;
                                        level = 3;
                                } 
                        } else {
@@ -829,14 +833,14 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const
                                        xs.cr();
                                        xs << html::StartTag("ul", "class='subentry'") 
                                           << html::StartTag("li", "class='subentry'") 
-                                          << XHTMLStream::NextRaw() << sub;
+                                          << XHTMLStream::ESCAPE_NONE << sub;
                                        level = 2;
                                        if (!subsub.empty()) {
                                                // and a sub-sub-entry
                                                xs.cr();
                                                xs << html::StartTag("ul", "class='subsubentry'") 
                                                   << html::StartTag("li", "class='subsubentry'") 
-                                                  << XHTMLStream::NextRaw() << subsub;
+                                                  << XHTMLStream::ESCAPE_NONE << subsub;
                                                level = 3;
                                        }
                                }