\\subfloat captions are moving arguments

Therefore insets should be protected in these captions.

Fixes bug: #9346.

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index beb5e0b5571e1b2d63508eafef0d52f2fcb0a9b8..9bd5bccaf9695a15762d2149cdc2fc338c460456 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -337,8 +337,9 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
                if (runparams_in.moving_arg)
                        os << "\\protect";
                os << "\\subfloat";
-       
+
                OutputParams rp = runparams_in;
+               rp.moving_arg = true;
                docstring const caption = getCaption(rp);
                if (!caption.empty()) {
                        os << caption;
@@ -347,7 +348,7 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
                rp.inFloat = OutputParams::SUBFLOAT;
                InsetText::latex(os, rp);
                os << "}";
-       
+
                return;
        }
        OutputParams runparams(runparams_in);

diff --git a/status.21x b/status.21x
index e5c5923998b06e5a39d61a128a97d6a556fe8ac5..03ea97d8654ca0b5228d29fb531319270031712e 100644 (file)
--- a/status.21x
+++ b/status.21x
@@ -103,6 +103,8 @@ What's new
 - Fix crash on exporting a recursive math macro (bug 9140). Recursive macros
   are invalid, so typesetting will still fail with "TeX capacity exceeded".
 
+- Protect insets when needed in subfloat captions (bug 9346).
+
 
 * LYX2LYX