InsetInfo: enable inset dissolve

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

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index cff8cec4fe1695e63d4f0399f128ce3fc2d9a2c7..df1344e6267a5537bcc4e972ea4b0afacb83133f 100644 (file)
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -40,36 +40,36 @@ namespace lyx {
 
 
 InsetArgument::InsetArgument(Buffer * buf, string const & name)
-    : InsetCollapsable(buf), name_(name), labelstring_(docstring()),
+    : InsetCollapsible(buf), name_(name), labelstring_(docstring()),
       font_(inherit_font), labelfont_(inherit_font), decoration_(string()),
       pass_thru_context_(false), pass_thru_local_(false), pass_thru_(false),
-      pass_thru_chars_(docstring())
+      pass_thru_chars_(docstring()), is_toc_caption_(false)
 {}
 
 
 void InsetArgument::write(ostream & os) const
 {
        os << "Argument " << name_ << "\n";
-       InsetCollapsable::write(os);
+       InsetCollapsible::write(os);
 }
 
 
 void InsetArgument::read(Lexer & lex)
 {
        lex >> name_;
-       InsetCollapsable::read(lex);
+       InsetCollapsible::read(lex);
 }
 
 
 void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-       Layout::LaTeXArgMap args = it.paragraph().layout().args();
-       pass_thru_context_ = it.paragraph().layout().pass_thru;
-       bool const insetlayout = args.empty();
-       if (insetlayout) {
-               args = it.inset().getLayout().args();
-               pass_thru_context_ = it.inset().getLayout().isPassThru();
-       }
+       bool const insetlayout = !it.paragraph().layout().hasArgs();
+       Layout::LaTeXArgMap const args = insetlayout ?
+               it.inset().getLayout().args() : it.paragraph().layout().args();
+       pass_thru_context_ = insetlayout ?
+               it.inset().getLayout().isPassThru() : it.paragraph().layout().pass_thru;
+       // Record PassThru status in order to act on changes.
+       bool const former_pass_thru = pass_thru_;
 
        // Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them)
        if (name_ == "999") {
@@ -119,11 +119,13 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
                decoration_ = (*lait).second.decoration;
                pass_thru_chars_ = (*lait).second.pass_thru_chars;
                pass_thru_local_ = false;
-               if (lait->second.is_toc_caption)
+               if (lait->second.is_toc_caption) {
+                       is_toc_caption_ = true;
                        // 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:
@@ -139,10 +141,20 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
                }
        } else {
                labelstring_ = _("Unknown Argument");
-               tooltip_ = _("Argument not known in this Layout. Will be supressed in the output.");
+               tooltip_ = _("Argument not known in this Layout. Will be suppressed in the output.");
        }
+
+       if (former_pass_thru != pass_thru_) {
+               // PassThru status changed. We might need to update
+               // the language of the contents
+               Language const * l  = insetlayout
+                       ? it.inset().buffer().language()
+                       : it.buffer()->language();
+               fixParagraphLanguage(l);
+       }
+
        setButtonLabel();
-       InsetCollapsable::updateBuffer(it, utype);
+       InsetCollapsible::updateBuffer(it, utype);
 }
 
 
@@ -189,14 +201,19 @@ void InsetArgument::doDispatch(Cursor & cur, FuncRequest & cmd)
                // 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_)
+               if (pass_thru_ && !pass_thru_local_) {
                        text().dispatch(cur, cmd);
+                       // For the paste operations, check if we have
+                       // non-latex_language, and if so, fix.
+                       if (cmd.action() != LFUN_SELF_INSERT)
+                               fixParagraphLanguage(buffer().params().language);
+               }
                else
-                       InsetCollapsable::doDispatch(cur, cmd);
+                       InsetCollapsible::doDispatch(cur, cmd);
                break;
 
        default:
-               InsetCollapsable::doDispatch(cur, cmd);
+               InsetCollapsible::doDispatch(cur, cmd);
                break;
        }
 }
@@ -236,11 +253,11 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd,
                                flag.setEnabled(false);
                        return true;
                }
-               return InsetCollapsable::getStatus(cur, cmd, flag);
+               return InsetCollapsible::getStatus(cur, cmd, flag);
        }
 
        default:
-               return InsetCollapsable::getStatus(cur, cmd, flag);
+               return InsetCollapsible::getStatus(cur, cmd, flag);
        }
 }
 
@@ -258,7 +275,7 @@ FontInfo InsetArgument::getFont() const
 {
        if (font_ != inherit_font)
                return font_;
-       return InsetCollapsable::getFont();
+       return InsetCollapsible::getFont();
 }
 
 
@@ -266,14 +283,14 @@ FontInfo InsetArgument::getLabelfont() const
 {
        if (labelfont_ != inherit_font)
                return labelfont_;
-       return InsetCollapsable::getLabelfont();
+       return InsetCollapsible::getLabelfont();
 }
 
 
 ColorCode InsetArgument::labelColor() const {
        if (labelfont_.color() != Color_inherit)
                return labelfont_.color();
-       return InsetCollapsable::labelColor();
+       return InsetCollapsible::labelColor();
 }
 
 
@@ -324,4 +341,13 @@ void InsetArgument::addToToc(DocIterator const & dit, bool output_active,
 }
 
 
+void InsetArgument::fixParagraphLanguage(Language const * l)
+{
+       Font font(inherit_font, l);
+       if (pass_thru_)
+               font.setLanguage(latex_language);
+       paragraphs().front().resetFonts(font);
+}
+
+
 } // namespace lyx