Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index db7e1ac3314181d7c8aa3c411cec13d1ae67c161..3a2f5b377d0237480d73f98dd9521f39bb9bd29a 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"
@@ -20,6 +21,7 @@
 #include "LaTeXFeatures.h"
 #include "Layout.h"
 #include "OutputParams.h"
+#include "output_docbook.h"
 #include "ParIterator.h"
 #include "TextClass.h"
 #include "TocBackend.h"
@@ -48,7 +50,7 @@ docstring InsetFoot::layoutName() const
 }
 
 
-void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 {
        BufferParams const & bp = buffer().masterBuffer()->params();
        Counters & cnts = bp.documentClass().counters();
@@ -64,6 +66,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,12 +85,19 @@ 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))
+
+       int val = cnts.value(count);
+       if (cnts.hasCounter(count)) {
                cnts.step(count, utype);
-       custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+               custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+               if (deleted)
+                       // un-step after deleted counter
+                       cnts.set(count, val);
+       } else
+               custom_label_ += ' ' + from_ascii("#");
        setLabel(custom_label_);
 
-       InsetCollapsible::updateBuffer(it, utype);
+       InsetCollapsible::updateBuffer(it, utype, deleted);
        if (utype == OutputUpdate)
                cnts.restoreLastCounter();
 }
@@ -106,19 +123,21 @@ int InsetFoot::plaintext(odocstringstream & os,
 }
 
 
-int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetFoot::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
-       os << "<footnote>";
-       int const i = InsetText::docbook(os, runparams);
-       os << "</footnote>";
-
-       return i;
+       OutputParams rp = runparams;
+       rp.docbook_force_pars = true;
+       rp.docbook_in_par = false;
+       InsetText::docbook(xs, rp);
 }
 
 
 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{"