case LFUN_MARGINALNOTE_INSERT:
return new InsetMarginal(buf);
- case LFUN_ARGUMENT_INSERT:
- return new InsetArgument(buf);
+ case LFUN_ARGUMENT_INSERT: {
+ string arg = cmd.getArg(0);
+ if (arg.empty()) {
+ LYXERR0("argument-insert needs an argument!");
+ return 0;
+ }
+ return new InsetArgument(buf, arg);
+ }
case LFUN_FLOAT_INSERT: {
string argument = to_utf8(cmd.argument());
return new InsetTabular(buf, r, c);
}
- case LFUN_CAPTION_INSERT:
- return new InsetCaption(buf);
+ case LFUN_CAPTION_INSERT: {
+ string arg = cmd.getArg(0);
+ if (arg.empty())
+ arg = "Standard";
+ return new InsetCaption(buf, arg);
+ }
case LFUN_INDEX_PRINT: {
InsetCommandParams icp(INDEX_PRINT_CODE);
}
inset->setBuffer(*buf);
} else {
- // FIXME This branch should be made to use inset codes as the preceding
- // branch does. Unfortunately, that will take some doing. It requires
- // converting the representation of the insets in LyX files so that they
- // use the inset names listed in Inset.cpp. Then, as above, the inset names
- // can be translated to inset codes using insetCode(). And the insets'
- // write() routines should use insetName() rather than hardcoding it.
+ // FIXME This branch should be made to use inset codes
+ // as the preceding branch does. Unfortunately, that
+ // will take some doing. It requires converting the
+ // representation of the insets in LyX files so that
+ // they use the inset names listed in Inset.cpp. Then,
+ // as above, the inset names can be translated to
+ // inset codes using insetCode(). And the insets'
+ // write() routines should use insetName() rather than
+ // hardcoding it.
if (tmptok == "Quotes") {
inset.reset(new InsetQuotes(buf));
} else if (tmptok == "External") {
} else if (tmptok == "Newline") {
inset.reset(new InsetNewline);
} else if (tmptok == "Argument") {
- inset.reset(new InsetArgument(buf));
+ inset.reset(new InsetArgument(buf, tmptok));
} else if (tmptok == "Float") {
inset.reset(new InsetFloat(buf, string()));
} else if (tmptok == "Wrap") {
string tmptok = lex.getString();
inset.reset(new InsetWrap(buf, tmptok));
} else if (tmptok == "Caption") {
- inset.reset(new InsetCaption(buf));
+ lex.eatLine();
+ string s = lex.getString();
+ inset.reset(new InsetCaption(buf, s));
} else if (tmptok == "Index") {
inset.reset(new InsetIndex(buf, InsetIndexParams()));
} else if (tmptok == "FloatList") {