void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
{
- Layout::LaTeXArgMap args;
- bool const insetlayout = &it.inset() && it.paragraph().layout().latexargs().empty()
- && it.paragraph().layout().itemargs().empty();
+ Layout::LaTeXArgMap args = it.paragraph().layout().args();
+ pass_thru_ = it.paragraph().layout().pass_thru;
+ bool const insetlayout = &it.inset() && args.empty();
if (insetlayout) {
- args = it.inset().getLayout().latexargs();
+ args = it.inset().getLayout().args();
pass_thru_ = it.inset().getLayout().isPassThru();
- } else {
- args = it.paragraph().layout().latexargs();
- Layout::LaTeXArgMap itemargs = it.paragraph().layout().itemargs();
- if (!itemargs.empty())
- args.insert(itemargs.begin(), itemargs.end());
- pass_thru_ = it.paragraph().layout().pass_thru;
}
// Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them)
void InsetArgument::latexArgument(otexstream & os,
OutputParams const & runparams_in, docstring const & ldelim,
- docstring const & rdelim) const
+ docstring const & rdelim, docstring const & presetarg) const
{
TexRow texrow;
odocstringstream ss;
OutputParams runparams = runparams_in;
InsetText::latex(ots, runparams);
docstring str = ss.str();
+ docstring const sep = str.empty() ? docstring() : from_ascii(", ");
+ if (!presetarg.empty())
+ str = presetarg + sep + str;
if (ldelim != "{" && support::contains(str, rdelim))
str = '{' + str + '}';
os << ldelim << str << rdelim;