Initialize recently added forceownlines_ bool

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

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 90e5570555e3f69d98b1ee000980eb9a65d3e21a..b2fbc690000652cf4e6bcd594beb9414565edd7b 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -15,6 +15,7 @@
 
 #include "Buffer.h"
 #include "BufferView.h"
+#include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
@@ -28,7 +29,7 @@
 #include "insets/InsetExternal.h"
 #include "insets/InsetFloat.h"
 #include "insets/InsetGraphics.h"
-#include "insets/InsetInclude.h"
+#include "insets/InsetIndex.h"
 #include "insets/InsetLine.h"
 #include "insets/InsetListings.h"
 #include "insets/InsetNote.h"
@@ -52,23 +53,22 @@ namespace lyx {
 
 // FIXME Would it now be possible to use the InsetCode in 
 // place of the mailer name and recover that information?
-InsetCommand::InsetCommand(Buffer * buf, InsetCommandParams const & p,
-                          string const & mailer_name)
-       : Inset(buf), p_(p), mailer_name_(mailer_name)
+InsetCommand::InsetCommand(Buffer * buf, InsetCommandParams const & p)
+       : Inset(buf), p_(p)
 {}
 
 
 // The sole purpose of this copy constructor is to make sure
 // that the mouse_hover_ map is not copied and remains empty.
 InsetCommand::InsetCommand(InsetCommand const & rhs)
-       : Inset(rhs), p_(rhs.p_), mailer_name_(rhs.mailer_name_)
+       : Inset(rhs), p_(rhs.p_)
 {}
 
 
 InsetCommand::~InsetCommand()
 {
-       if (!mailer_name_.empty())
-               hideDialogs(mailer_name_, this);
+       if (p_.code() != NO_CODE)
+               hideDialogs(insetName(p_.code()), this);
 
        map<BufferView const *, bool>::iterator it = mouse_hover_.begin();
        map<BufferView const *, bool>::iterator end = mouse_hover_.end();
@@ -80,7 +80,7 @@ InsetCommand::~InsetCommand()
 
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       button_.update(screenLabel(), editable() || hasSettings());
+       button_.update(screenLabel(), editable() || clickable(0, 0));
        button_.metrics(mi, dim);
 }
 
@@ -100,13 +100,13 @@ void InsetCommand::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void InsetCommand::setParam(std::string const & name, docstring const & value)
+void InsetCommand::setParam(string const & name, docstring const & value)
 {
        p_[name] = value;
 }
 
 
-docstring const & InsetCommand::getParam(std::string const & name) const
+docstring const & InsetCommand::getParam(string const & name) const
 {
        return p_[name];
 }
@@ -119,15 +119,15 @@ void InsetCommand::setParams(InsetCommandParams const & p)
 }
 
 
-int InsetCommand::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetCommand::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams = runparams_in;
        os << getCommand(runparams);
-       return 0;
 }
 
 
-int InsetCommand::plaintext(odocstream & os, OutputParams const &) const
+int InsetCommand::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
        docstring const str = "[" + buffer().B_("LaTeX Command: ")
                + from_utf8(getCmdName()) + "]";
@@ -147,7 +147,9 @@ void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action()) {
        case LFUN_INSET_MODIFY: {
                if (cmd.getArg(0) == "changetype") {
+                       cur.recordUndo();
                        p_.setCmdName(cmd.getArg(1));
+                       cur.forceBufferUpdate();
                        initView();
                        break;
                }
@@ -155,8 +157,10 @@ void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
                InsetCommand::string2params(to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty())
                        cur.noScreenUpdate();
-               else
+               else {
+                       cur.recordUndo();
                        setParams(p);
+               }
                // FIXME We might also want to check here if this one is in the TOC.
                // But I think most of those are labeled.
                if (isLabeled())
@@ -207,16 +211,16 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-docstring InsetCommand::contextMenu(BufferView const &, int, int) const
+string InsetCommand::contextMenuName() const
 {
-       return from_ascii("context-") + from_ascii(mailer_name_);
+       return "context-" + insetName(p_.code());
 }
 
 
 bool InsetCommand::showInsetDialog(BufferView * bv) const
 {
-       if (!mailer_name_.empty())
-               bv->showDialog(mailer_name_, params2string(p_),
+       if (p_.code() != NO_CODE)
+               bv->showDialog(insetName(p_.code()), params2string(p_),
                        const_cast<InsetCommand *>(this));
        return true;
 }
@@ -262,7 +266,7 @@ bool decodeInsetParam(string const & name, string & data,
        switch (code) {
        case BIBITEM_CODE:
        case BIBTEX_CODE:
-       case INDEX_CODE:
+       case INDEX_PRINT_CODE:
        case LABEL_CODE:
        case LINE_CODE:
        case NOMENCL_CODE:
@@ -314,6 +318,11 @@ bool decodeInsetParam(string const & name, string & data,
                data = InsetFloat::params2string(p);
                break;
        }
+       case INDEX_CODE: {
+               InsetIndexParams p;
+               data = InsetIndex::params2string(p);
+               break;
+       }
        case LISTINGS_CODE: {
                InsetListingsParams p;
                data = InsetListings::params2string(p);
@@ -324,6 +333,11 @@ bool decodeInsetParam(string const & name, string & data,
                data = InsetGraphics::params2string(p, buffer);
                break;
        }
+       case MATH_SPACE_CODE: {
+           InsetSpaceParams p(true);
+               data = InsetSpace::params2string(p);
+               break;
+       }
        case NOTE_CODE: {
                InsetNoteParams p;
                data = InsetNote::params2string(p);