Fix text direction issue for InsetInfo in RTL context

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index db7e1ac3314181d7c8aa3c411cec13d1ae67c161..3331184887aa52ea0b6dc128b378ac0fff3bbf81 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -12,6 +12,7 @@
 #include <config.h>
 
 #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<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) {
                if (it[sl].text() && it[sl].paragraph().layout().intitle) {
                        intitle_ = true;
@@ -75,9 +84,14 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
        InsetLayout const & il = getLayout();
        docstring const & count = il.counter();
        custom_label_ = translateIfPossible(il.labelstring());
-       if (cnts.hasCounter(count))
-               cnts.step(count, utype);
-       custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+
+       Paragraph const & par = it.paragraph();
+       if (!par.isDeleted(it.pos())) {
+               if (cnts.hasCounter(count))
+                       cnts.step(count, utype);
+               custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+       } else
+               custom_label_ += ' ' + from_ascii("#");
        setLabel(custom_label_);
 
        InsetCollapsible::updateBuffer(it, utype);
@@ -118,7 +132,10 @@ int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
 
 void InsetFoot::validate(LaTeXFeatures & features) const
 {
-       if (!features.saveNoteEnv().empty()) {
+       // Use footnote package to provide footnotes in tables
+       // unless an alternative approach is built in the class.
+       if (!features.saveNoteEnv().empty()
+           && !features.isProvided("footnote-alternative")) {
                features.require("footnote");
                features.addPreambleSnippet(
                        from_ascii("\\makesavenoteenv{"