whitespace

This commit is contained in:
Georg Baum 2014-12-26 22:08:07 +01:00
parent 0c90821138
commit cb7ace9143

View File

@ -49,12 +49,14 @@ void InsetArgument::write(ostream & os) const
InsetCollapsable::write(os); InsetCollapsable::write(os);
} }
void InsetArgument::read(Lexer & lex) void InsetArgument::read(Lexer & lex)
{ {
lex >> name_; lex >> name_;
InsetCollapsable::read(lex); InsetCollapsable::read(lex);
} }
void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
{ {
Layout::LaTeXArgMap args = it.paragraph().layout().args(); Layout::LaTeXArgMap args = it.paragraph().layout().args();
@ -64,7 +66,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
args = it.inset().getLayout().args(); args = it.inset().getLayout().args();
pass_thru_ = it.inset().getLayout().isPassThru(); pass_thru_ = it.inset().getLayout().isPassThru();
} }
// Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them) // Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them)
if (name_ == "999") { if (name_ == "999") {
unsigned int const req = insetlayout ? it.inset().getLayout().requiredArgs() unsigned int const req = insetlayout ? it.inset().getLayout().requiredArgs()
@ -118,11 +120,13 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
InsetCollapsable::updateBuffer(it, utype); InsetCollapsable::updateBuffer(it, utype);
} }
void InsetArgument::setButtonLabel() void InsetArgument::setButtonLabel()
{ {
setLabel(labelstring_); setLabel(labelstring_);
} }
docstring InsetArgument::toolTip(BufferView const & bv, int, int) const docstring InsetArgument::toolTip(BufferView const & bv, int, int) const
{ {
if (isOpen(bv)) if (isOpen(bv))
@ -130,6 +134,7 @@ docstring InsetArgument::toolTip(BufferView const & bv, int, int) const
return toolTipText(tooltip_ + from_ascii(":\n")); return toolTipText(tooltip_ + from_ascii(":\n"));
} }
void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd) void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd)
{ {
switch (cmd.action()) { switch (cmd.action()) {
@ -157,7 +162,7 @@ void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd)
// with (inherited) pass_thru to avoid call for // with (inherited) pass_thru to avoid call for
// fixParagraphsFont(), which does not play nicely with // fixParagraphsFont(), which does not play nicely with
// inherited pass_thru (see #8471). // inherited pass_thru (see #8471).
// FIXME: Once we have implemented genuine pass_thru // FIXME: Once we have implemented genuine pass_thru
// option for InsetArgument (not inherited pass_thru), // option for InsetArgument (not inherited pass_thru),
// we should probably directly call // we should probably directly call
// InsetCollapsable::doDispatch(cur, cmd) for that // InsetCollapsable::doDispatch(cur, cmd) for that
@ -223,11 +228,13 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd,
} }
} }
string InsetArgument::contextMenuName() const string InsetArgument::contextMenuName() const
{ {
return "context-argument"; return "context-argument";
} }
FontInfo InsetArgument::getFont() const FontInfo InsetArgument::getFont() const
{ {
if (font_ != inherit_font) if (font_ != inherit_font)
@ -235,6 +242,7 @@ FontInfo InsetArgument::getFont() const
return getLayout().font(); return getLayout().font();
} }
FontInfo InsetArgument::getLabelfont() const FontInfo InsetArgument::getLabelfont() const
{ {
if (labelfont_ != inherit_font) if (labelfont_ != inherit_font)
@ -242,6 +250,7 @@ FontInfo InsetArgument::getLabelfont() const
return getLayout().labelfont(); return getLayout().labelfont();
} }
InsetLayout::InsetDecoration InsetArgument::decoration() const InsetLayout::InsetDecoration InsetArgument::decoration() const
{ {
InsetLayout::InsetDecoration dec = getLayout().decoration(); InsetLayout::InsetDecoration dec = getLayout().decoration();
@ -250,6 +259,7 @@ InsetLayout::InsetDecoration InsetArgument::decoration() const
return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec; return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec;
} }
void InsetArgument::latexArgument(otexstream & os, void InsetArgument::latexArgument(otexstream & os,
OutputParams const & runparams_in, docstring const & ldelim, OutputParams const & runparams_in, docstring const & ldelim,
docstring const & rdelim, docstring const & presetarg) const docstring const & rdelim, docstring const & presetarg) const