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());
int InsetCommand::latex(Buffer const *, ostream & os,
- bool /*fragile*/, bool/*fs*/) const
+ LatexRunParams const &) const
{
os << getCommand();
return 0;
dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
{
- dispatch_result result = UNDISPATCHED;
-
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
InsetCommandParams p;
InsetCommandMailer::string2params(cmd.argument, p);
if (p.getCmdName().empty())
- break;
+ return UNDISPATCHED;
setParams(p);
- cmd.view()->updateInset(this, true);
- result = DISPATCHED;
+ cmd.view()->updateInset(this);
+ return DISPATCHED;
}
- break;
- case LFUN_INSET_DIALOG_UPDATE: {
- InsetCommandMailer mailer(cmd.argument, *this);
- mailer.updateDialog(cmd.view());
- }
- break;
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetCommandMailer(cmd.argument, *this).updateDialog(cmd.view());
+ return DISPATCHED;
case LFUN_MOUSE_RELEASE:
- edit(cmd.view(), cmd.x, cmd.y, cmd.button());
- break;
+ return localDispatch(FuncRequest(cmd.view(), LFUN_INSET_EDIT));
default:
- break;
+ return UNDISPATCHED;
}
- return result;
}
+
InsetCommandMailer::InsetCommandMailer(string const & name,
InsetCommand & inset)
: name_(name), inset_(inset)
params.setContents(string());
params.setOptions(string());
- istringstream data(in);
+ if (in.empty())
+ return;
+
+ istringstream data(STRCONV(in));
LyXLex lex(0,0);
lex.setStream(data);
}
-string const
-InsetCommandMailer::params2string(string const & name,
+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());
}