Enable the external inset to handle unknown templates gracefully.

[lyx.git] / src / insets / insetcommand.C

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index fb8e64aa90750c9cf4362ba0c85cd67da22223e9..9b2e873ee470ddc7c84728cdfaddc728e083bb2c 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -19,16 +19,24 @@
 
 #include "frontends/Painter.h"
 
+#include "support/lstrings.h"
+
 #include "Lsstream.h"
 
 using std::ostream;
 
 
-InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
+InsetCommand::InsetCommand(InsetCommandParams const & p)
        : p_(p.getCmdName(), p.getContents(), p.getOptions())
 {}
 
 
+InsetCommand::InsetCommand(InsetCommand const & ic)
+       : p_(ic.p_)
+{
+}
+
+
 void InsetCommand::setParams(InsetCommandParams const & p)
 {
        p_.setCmdName(p.getCmdName());
@@ -38,7 +46,7 @@ void InsetCommand::setParams(InsetCommandParams const & p)
 
 
 int InsetCommand::latex(Buffer const *, ostream & os,
-                       bool /*fragile*/, bool/*fs*/) const
+                       LatexRunParams const &) const
 {
        os << getCommand();
        return 0;
@@ -65,18 +73,32 @@ int InsetCommand::docbook(Buffer const *, ostream &, bool) const
 
 dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
 {
-       InsetCommandParams p;
-       InsetCommandMailer::string2params(cmd.argument, p);
-       if (p.getCmdName().empty())
+       switch (cmd.action) {
+       case LFUN_INSET_MODIFY: {
+               InsetCommandParams p;
+               InsetCommandMailer::string2params(cmd.argument, p);
+               if (p.getCmdName().empty())
+                       return UNDISPATCHED;
+
+               setParams(p);
+               cmd.view()->updateInset(this);
+               return DISPATCHED;
+       }
+
+       case LFUN_INSET_DIALOG_UPDATE:
+               InsetCommandMailer(cmd.argument, *this).updateDialog(cmd.view());
+               return DISPATCHED;
+
+       case LFUN_MOUSE_RELEASE:
+               return localDispatch(FuncRequest(cmd.view(), LFUN_INSET_EDIT));
+
+       default:
                return UNDISPATCHED;
+       }
 
-       setParams(p);
-       if (view())
-               view()->updateInset(this, true);
-
-       return DISPATCHED;
 }
 
+
 InsetCommandMailer::InsetCommandMailer(string const & name,
                                       InsetCommand & inset)
        : name_(name), inset_(inset)
@@ -85,7 +107,7 @@ InsetCommandMailer::InsetCommandMailer(string const & name,
 
 string const InsetCommandMailer::inset2string() const
 {
-       return params2string(inset_.params());
+       return params2string(name(), inset_.params());
 }
 
 
@@ -99,20 +121,35 @@ void InsetCommandMailer::string2params(string const & in,
        if (in.empty())
                return;
 
-       istringstream data(in);
+       istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);
 
-       params.read(lex);
+       if (lex.isOK()) {
+               lex.next();
+               string const name = lex.getString();
+       }
+
+       // This is part of the inset proper that is usually swallowed
+       // by Buffer::readInset
+       if (lex.isOK()) {
+               lex.next();
+               string const token = lex.getString();
+               if (token != "LatexCommand")
+                       return;
+       }
+       if (lex.isOK()) {
+               params.read(lex);
+       }
 }
 
 
-string const
-InsetCommandMailer::params2string(InsetCommandParams const & params)
+string const InsetCommandMailer::params2string(string const & name,
+                                 InsetCommandParams const & params)
 {
        ostringstream data;
+       data << name << ' ';
        params.write(data);
        data << "\\end_inset\n";
-
-       return data.str();
+       return STRCONV(data.str());
 }