InsetArgument::InsetArgument(Buffer * buf, string const & name)
- : InsetCollapsable(buf), name_(name), labelstring_(docstring()),
+ : InsetCollapsible(buf), name_(name), labelstring_(docstring()),
font_(inherit_font), labelfont_(inherit_font), decoration_(string()),
pass_thru_context_(false), pass_thru_local_(false), pass_thru_(false),
- pass_thru_chars_(docstring())
+ free_spacing_(false), pass_thru_chars_(docstring()), is_toc_caption_(false),
+ newline_cmd_(string())
{}
void InsetArgument::write(ostream & os) const
{
os << "Argument " << name_ << "\n";
- InsetCollapsable::write(os);
+ InsetCollapsible::write(os);
}
void InsetArgument::read(Lexer & lex)
{
lex >> name_;
- InsetCollapsable::read(lex);
+ InsetCollapsible::read(lex);
}
-void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
{
bool const insetlayout = !it.paragraph().layout().hasArgs();
Layout::LaTeXArgMap const args = insetlayout ?
labelfont_ = (*lait).second.labelfont;
decoration_ = (*lait).second.decoration;
pass_thru_chars_ = (*lait).second.pass_thru_chars;
+ newline_cmd_ = (*lait).second.newlinecmd;
+ free_spacing_ = (*lait).second.free_spacing;
pass_thru_local_ = false;
- if (lait->second.is_toc_caption)
+ if (lait->second.is_toc_caption) {
+ is_toc_caption_ = true;
// empty if AddToToc is not set
caption_of_toc_ = insetlayout
? it.inset().getLayout().tocType()
: it.paragraph().layout().tocType();
+ }
switch ((*lait).second.passthru) {
case PT_INHERITED:
}
setButtonLabel();
- InsetCollapsable::updateBuffer(it, utype);
+ InsetCollapsible::updateBuffer(it, utype, deleted);
}
fixParagraphLanguage(buffer().params().language);
}
else
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
default:
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCollapsible::doDispatch(cur, cmd);
break;
}
}
flag.setEnabled(false);
return true;
}
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
}
default:
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCollapsible::getStatus(cur, cmd, flag);
}
}
{
if (font_ != inherit_font)
return font_;
- return InsetCollapsable::getFont();
+ return InsetCollapsible::getFont();
}
{
if (labelfont_ != inherit_font)
return labelfont_;
- return InsetCollapsable::getLabelfont();
+ return InsetCollapsible::getLabelfont();
}
ColorCode InsetArgument::labelColor() const {
if (labelfont_.color() != Color_inherit)
return labelfont_.color();
- return InsetCollapsable::labelColor();
+ return InsetCollapsible::labelColor();
}
OutputParams runparams = runparams_in;
if (!pass_thru_chars_.empty())
runparams.pass_thru_chars += pass_thru_chars_;
+ if (!newline_cmd_.empty())
+ runparams.newlinecmd = newline_cmd_;
runparams.pass_thru = isPassThru();
InsetText::latex(ots, runparams);
TexString ts = ots.release();
- bool const add_braces = ldelim != "{" && support::contains(ts.str, rdelim);
+ bool const add_braces = !ldelim.empty() && ldelim != "{"
+ && support::contains(ts.str, rdelim);
os << ldelim;
if (add_braces)
os << '{';