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 5b1152754ce49cab7b9dfaf68b3bcd1a3c2c3812..3a2f5b377d0237480d73f98dd9521f39bb9bd29a 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -21,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"
@@ -85,11 +86,13 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype, bool cons
        docstring const & count = il.counter();
        custom_label_ = translateIfPossible(il.labelstring());
 
-       Paragraph const & par = it.paragraph();
-       if (!par.isDeleted(it.pos())) {
-               if (cnts.hasCounter(count))
-                       cnts.step(count, utype);
+       int val = cnts.value(count);
+       if (cnts.hasCounter(count)) {
+               cnts.step(count, utype);
                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_);
@@ -120,13 +123,12 @@ 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);
 }