Squash some warnings.

[lyx.git] / src / insets / InsetArgument.cpp

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index e4acd6b2367e4c0f0595cf5b31d0ad99cb80f2ff..b65257af978295346dee8a39cd2258a51e1b2392 100644 (file)
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -39,7 +39,7 @@ namespace lyx {
 InsetArgument::InsetArgument(Buffer * buf, string const & name)
     : InsetCollapsable(buf), name_(name), labelstring_(docstring()),
       font_(inherit_font), labelfont_(inherit_font), decoration_(string()),
-      pass_thru_(false)
+      pass_thru_(false), pass_thru_chars_(docstring())
 {}
 
 
@@ -49,28 +49,24 @@ void InsetArgument::write(ostream & os) const
        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()
-             && it.paragraph().layout().itemargs().empty();
+       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().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)
        if (name_ == "999") {
                unsigned int const req = insetlayout ? it.inset().getLayout().requiredArgs()
@@ -116,6 +112,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
                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.");
@@ -124,11 +121,13 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
        InsetCollapsable::updateBuffer(it, utype);
 }
 
+
 void InsetArgument::setButtonLabel()
 {
        setLabel(labelstring_);
 }
 
+
 docstring InsetArgument::toolTip(BufferView const & bv, int, int) const
 {
        if (isOpen(bv))
@@ -136,6 +135,7 @@ docstring InsetArgument::toolTip(BufferView const & bv, int, int) const
        return toolTipText(tooltip_ + from_ascii(":\n"));
 }
 
+
 void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action()) {
@@ -149,12 +149,31 @@ void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd)
                        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;
@@ -177,7 +196,7 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd,
                                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
@@ -210,11 +229,16 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd,
        }
 }
 
+
 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)
@@ -222,6 +246,7 @@ FontInfo InsetArgument::getFont() const
        return getLayout().font();
 }
 
+
 FontInfo InsetArgument::getLabelfont() const
 {
        if (labelfont_ != inherit_font)
@@ -229,20 +254,6 @@ FontInfo InsetArgument::getLabelfont() const
        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
 {
@@ -252,16 +263,22 @@ 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 (!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;