anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not use \tablefootnote in minipages

Browse Source 
Minipages provide their own working \footnote's

Should also go to 2.3.x.
This commit is contained in:
Juergen Spitzmueller 2018-04-04 10:53:40 +02:00
parent d9ebf6e2c7
commit 37404df686
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/insets/InsetFoot.cpp
View File

@ -12,6 +12,7 @@
#include <config.h> #include <config.h>
#include "InsetFoot.h" #include "InsetFoot.h"
#include "InsetBox.h"
#include "Buffer.h" #include "Buffer.h"
#include "BufferParams.h" #include "BufferParams.h"
@ -64,6 +65,14 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
intable = true; intable = true;
if (it.innerInsetOfType(FLOAT_CODE) != 0) if (it.innerInsetOfType(FLOAT_CODE) != 0)
infloattable_ = intable; 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<InsetBox*>(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) { for (size_type sl = 0 ; sl < it.depth() ; ++sl) {
if (it[sl].text() && it[sl].paragraph().layout().intitle) { if (it[sl].text() && it[sl].paragraph().layout().intitle) {
intitle_ = true; intitle_ = true;