#include "InsetArgument.h"
+#include "Buffer.h"
+#include "BufferParams.h"
#include "Cursor.h"
#include "FuncStatus.h"
#include "FuncRequest.h"
#include "InsetList.h"
+#include "Language.h"
#include "Layout.h"
#include "Lexer.h"
#include "OutputParams.h"
InsetArgument::InsetArgument(Buffer * buf, string const & name)
: InsetCollapsable(buf), name_(name), labelstring_(docstring()),
- font_(inherit_font), labelfont_(inherit_font), decoration_(string())
+ font_(inherit_font), labelfont_(inherit_font), decoration_(string()),
+ pass_thru_(false), pass_thru_chars_(docstring())
{}
InsetCollapsable::write(os);
}
+
void InsetArgument::read(Lexer & lex)
{
lex >> name_;
InsetCollapsable::read(lex);
}
+
void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
{
- Layout::LaTeXArgMap args;
- bool const insetlayout = &it.inset() && it.paragraph().layout().latexargs().empty();
- if (insetlayout)
- args = it.inset().getLayout().latexargs();
- else
- args = it.paragraph().layout().latexargs();
+ Layout::LaTeXArgMap args = it.paragraph().layout().args();
+ pass_thru_ = it.paragraph().layout().pass_thru;
+ bool const insetlayout = args.empty();
+ if (insetlayout) {
+ args = it.inset().getLayout().args();
+ pass_thru_ = it.inset().getLayout().isPassThru();
+ }
// Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them)
if (name_ == "999") {
- unsigned int const req = insetlayout ? it.inset().getLayout().numRequiredArgs()
+ unsigned int const req = insetlayout ? it.inset().getLayout().requiredArgs()
: it.paragraph().layout().requiredArgs();
- unsigned int const opts = insetlayout ? it.inset().getLayout().numOptArgs()
+ unsigned int const opts = insetlayout ? it.inset().getLayout().optArgs()
: it.paragraph().layout().optArgs();
unsigned int nr = 0;
unsigned int ours = 0;
name_ = convert<string>(ours);
}
}
- Layout::LaTeXArgMap::const_iterator const lait =
- args.find(convert<unsigned int>(name_));
+ Layout::LaTeXArgMap::const_iterator const lait = args.find(name_);
if (lait != args.end()) {
docstring label = translateIfPossible((*lait).second.labelstring);
docstring striplabel;
font_ = (*lait).second.font;
labelfont_ = (*lait).second.labelfont;
decoration_ = (*lait).second.decoration;
+ pass_thru_chars_ = (*lait).second.pass_thru_chars;
} else {
labelstring_ = _("Unknown Argument");
tooltip_ = _("Argument not known in this Layout. Will be supressed in the output.");
InsetCollapsable::updateBuffer(it, utype);
}
+
void InsetArgument::setButtonLabel()
{
setLabel(labelstring_);
}
+
docstring InsetArgument::toolTip(BufferView const & bv, int, int) const
{
if (isOpen(bv))
return toolTipText(tooltip_ + from_ascii(":\n"));
}
+
void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd)
{
switch (cmd.action()) {
cur.undispatched();
return;
}
- cur.recordUndoInset(ATOMIC_UNDO, this);
+ cur.recordUndoInset(this);
name_ = cmd.getArg(1);
cur.forceBufferUpdate();
break;
}
+ case LFUN_PASTE:
+ case LFUN_CLIPBOARD_PASTE:
+ case LFUN_SELECTION_PASTE:
+ case LFUN_PRIMARY_SELECTION_PASTE:
+ // Do not call InsetCollapsable::doDispatch(cur, cmd)
+ // with (inherited) pass_thru to avoid call for
+ // fixParagraphsFont(), which does not play nicely with
+ // inherited pass_thru (see #8471).
+ // FIXME: Once we have implemented genuine pass_thru
+ // option for InsetArgument (not inherited pass_thru),
+ // we should probably directly call
+ // InsetCollapsable::doDispatch(cur, cmd) for that
+ // case as well
+ if (pass_thru_)
+ text().dispatch(cur, cmd);
+ else
+ InsetCollapsable::doDispatch(cur, cmd);
+ break;
+
default:
InsetCollapsable::doDispatch(cur, cmd);
break;
return true;
}
Layout::LaTeXArgMap args;
- bool const insetlayout = &cur.inset() && cur.paragraph().layout().latexargs().empty();
+ bool const insetlayout = cur.paragraph().layout().latexargs().empty();
if (insetlayout)
args = cur.inset().getLayout().latexargs();
else
args = cur.paragraph().layout().latexargs();
- Layout::LaTeXArgMap::const_iterator const lait =
- args.find(convert<unsigned int>(type));
+ Layout::LaTeXArgMap::const_iterator const lait = args.find(type);
if (lait != args.end()) {
flag.setEnabled(true);
InsetList::const_iterator it = cur.paragraph().insetList().begin();
}
}
+
string InsetArgument::contextMenuName() const
{
- return "context-argument";
+ if (decoration() == InsetLayout::CONGLOMERATE)
+ return "context-argument-conglomerate";
+ else
+ return "context-argument";
}
+
FontInfo InsetArgument::getFont() const
{
if (font_ != inherit_font)
return getLayout().font();
}
+
FontInfo InsetArgument::getLabelfont() const
{
if (labelfont_ != inherit_font)
return getLayout().labelfont();
}
-namespace {
-
-InsetLayout::InsetDecoration translateDecoration(std::string const & str)
-{
- if (support::compare_ascii_no_case(str, "classic") == 0)
- return InsetLayout::CLASSIC;
- if (support::compare_ascii_no_case(str, "minimalistic") == 0)
- return InsetLayout::MINIMALISTIC;
- if (support::compare_ascii_no_case(str, "conglomerate") == 0)
- return InsetLayout::CONGLOMERATE;
- return InsetLayout::DEFAULT;
-}
-
-}// namespace anon
InsetLayout::InsetDecoration InsetArgument::decoration() const
{
return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec;
}
+
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;
otexstream ots(ss, texrow);
OutputParams runparams = runparams_in;
- if (getLayout().isPassThru())
- runparams.pass_thru = true;
+ if (!pass_thru_chars_.empty())
+ runparams.pass_thru_chars += pass_thru_chars_;
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;
projects / lyx.git / blobdiff