Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 4c27323235cd92982a37637ae735009ba8dd4f26..605286ca20f76482f8bae5190d12b7870e29eea9 100644 (file)
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -24,6 +24,9 @@
 #include "Lexer.h"
 #include "OutputParams.h"
 #include "ParIterator.h"
+#include "TexRow.h"
+#include "texstream.h"
+#include "TocBackend.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
@@ -39,7 +42,8 @@ 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_context_(false), pass_thru_local_(false), pass_thru_(false),
+      pass_thru_chars_(docstring())
 {}
 
 
@@ -60,11 +64,11 @@ void InsetArgument::read(Lexer & lex)
 void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        Layout::LaTeXArgMap args = it.paragraph().layout().args();
-       pass_thru_ = it.paragraph().layout().pass_thru;
+       pass_thru_context_ = it.paragraph().layout().pass_thru;
        bool const insetlayout = args.empty();
        if (insetlayout) {
                args = it.inset().getLayout().args();
-               pass_thru_ = it.inset().getLayout().isPassThru();
+               pass_thru_context_ = it.inset().getLayout().isPassThru();
        }
 
        // Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them)
@@ -103,6 +107,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
                }
        }
        Layout::LaTeXArgMap::const_iterator const lait = args.find(name_);
+       caption_of_toc_ = string();
        if (lait != args.end()) {
                docstring label = translateIfPossible((*lait).second.labelstring);
                docstring striplabel;
@@ -112,6 +117,26 @@ 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;
+               pass_thru_local_ = false;
+               if (lait->second.is_toc_caption)
+                       // 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:
+                               pass_thru_ = pass_thru_context_;
+                               break;
+                       case PT_TRUE:
+                               pass_thru_ = true;
+                               pass_thru_local_ = true;
+                               break;
+                       case PT_FALSE:
+                               pass_thru_ = false;
+                               break;
+               }
        } else {
                labelstring_ = _("Unknown Argument");
                tooltip_ = _("Argument not known in this Layout. Will be supressed in the output.");
@@ -148,7 +173,7 @@ 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;
@@ -158,16 +183,13 @@ void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd)
        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_)
+       case LFUN_SELF_INSERT:
+               // With (only) inherited pass_thru, call Text::dispatch()
+               // directly to avoid call for fixParagraphsFont() and/or
+               // forcing to latex_language in InsetText::dispatch(),
+               // since this does not play nicely with inherited pass_thru
+               // (see #8471).
+               if (pass_thru_ && !pass_thru_local_)
                        text().dispatch(cur, cmd);
                else
                        InsetCollapsable::doDispatch(cur, cmd);
@@ -231,7 +253,10 @@ 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";
 }
 
 
@@ -239,7 +264,7 @@ FontInfo InsetArgument::getFont() const
 {
        if (font_ != inherit_font)
                return font_;
-       return getLayout().font();
+       return InsetCollapsable::getFont();
 }
 
 
@@ -247,7 +272,14 @@ FontInfo InsetArgument::getLabelfont() const
 {
        if (labelfont_ != inherit_font)
                return labelfont_;
-       return getLayout().labelfont();
+       return InsetCollapsable::getLabelfont();
+}
+
+
+ColorCode InsetArgument::labelColor() const {
+       if (labelfont_.color() != Color_inherit)
+               return labelfont_.color();
+       return InsetCollapsable::labelColor();
 }
 
 
@@ -264,18 +296,38 @@ void InsetArgument::latexArgument(otexstream & os,
                OutputParams const & runparams_in, docstring const & ldelim,
                docstring const & rdelim, docstring const & presetarg) const
 {
-       TexRow texrow;
-       odocstringstream ss;
-       otexstream ots(ss, texrow);
+       otexstringstream ots;
        OutputParams runparams = runparams_in;
+       if (!pass_thru_chars_.empty())
+               runparams.pass_thru_chars += pass_thru_chars_;
+       runparams.pass_thru = isPassThru();
        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;
+       TexString ts = ots.release();
+       bool const add_braces = ldelim != "{" && support::contains(ts.str, rdelim);
+       os << ldelim;
+       if (add_braces)
+               os << '{';
+       os << presetarg;
+       if (!presetarg.empty() && !ts.str.empty())
+               os << ", ";
+       os << move(ts);
+       if (add_braces)
+               os << '}';
+       os << rdelim;
+}
+
+
+
+void InsetArgument::addToToc(DocIterator const & dit, bool output_active,
+                             UpdateType utype) const
+{
+       if (!caption_of_toc_.empty()) {
+               docstring str;
+               text().forOutliner(str, TOC_ENTRY_LENGTH);
+               buffer().tocBackend().builder(caption_of_toc_).argumentItem(str);
+       }
+       // Proceed with the rest of the inset.
+       InsetText::addToToc(dit, output_active, utype);
 }