From 6810a181d0bab5e197279cefcfe8ad10ee91cfbe Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Wed, 4 Apr 2018 10:53:40 +0200 Subject: [PATCH] Do not use \tablefootnote in minipages Minipages provide their own working \footnote's Should also go to 2.3.x. (cherry picked from commit 37404df686dc42c5eb88fbd51103016e175cad09) --- src/insets/InsetFoot.cpp | 9 +++++++++ status.23x | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp index 1c3862635e..29890d1365 100644 --- a/src/insets/InsetFoot.cpp +++ b/src/insets/InsetFoot.cpp @@ -12,6 +12,7 @@ #include #include "InsetFoot.h" +#include "InsetBox.h" #include "Buffer.h" #include "BufferParams.h" @@ -64,6 +65,14 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype) intable = true; if (it.innerInsetOfType(FLOAT_CODE) != 0) infloattable_ = intable; + // If we are in a table in a float, but the table is also in a minipage, + // we do not use tablefootnote, since minipages provide their own footnotes. + if (intable && infloattable_ && it.innerInsetOfType(BOX_CODE) != 0) { + InsetBoxParams const & boxp = + static_cast(it.innerInsetOfType(BOX_CODE))->params(); + if (boxp.inner_box && !boxp.use_parbox && !boxp.use_makebox) + infloattable_ = false; + } for (size_type sl = 0 ; sl < it.depth() ; ++sl) { if (it[sl].text() && it[sl].paragraph().layout().intitle) { intitle_ = true; diff --git a/status.23x b/status.23x index 29c08ebfff..b4f6abcdde 100644 --- a/status.23x +++ b/status.23x @@ -47,6 +47,8 @@ What's new - Fix output of citation commands in child documents (bug 11083). +- Use normal footnote (rather than \tablefootnote) for tables in minipages. + * LYX2LYX -- 2.39.5