Added inset-select-all to emacs bindings

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

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 533c4239956bbb5170ce4603221cb3f0f0f2376d..4c27323235cd92982a37637ae735009ba8dd4f26 100644 (file)
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -49,24 +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();
+       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();
-               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()
@@ -102,8 +102,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
                        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;
@@ -121,11 +120,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))
@@ -133,6 +134,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()) {
@@ -152,6 +154,25 @@ void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd)
                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;
@@ -174,13 +195,12 @@ 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
                                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();
@@ -208,11 +228,13 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd,
        }
 }
 
+
 string InsetArgument::contextMenuName() const
 {
        return "context-argument";
 }
 
+
 FontInfo InsetArgument::getFont() const
 {
        if (font_ != inherit_font)
@@ -220,6 +242,7 @@ FontInfo InsetArgument::getFont() const
        return getLayout().font();
 }
 
+
 FontInfo InsetArgument::getLabelfont() const
 {
        if (labelfont_ != inherit_font)
@@ -227,20 +250,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
 {
@@ -250,9 +259,10 @@ 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;
@@ -260,6 +270,9 @@ void InsetArgument::latexArgument(otexstream & os,
        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;