DocBook: fix handling of footnotes.

A <para> was missing inside starting at 441c6a93.

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 48ad61e7d9e7f0efb72c09f12d207dfb96a13ae1..2191a83fde7e04ecc37cddd3787dcb5199820685 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -366,6 +366,9 @@ public:
        /// Are we already in a paragraph?
        bool docbook_in_par = false;
 
+       /// Is this element's allowMultiPar useable or not?
+       bool docbook_consider_allow_multi_par = true;
+
        /// Does the present context even permit paragraphs?
        bool docbook_make_pars = true;
 

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index eebbeb4f46d4343d1fad4ec33d58b02b3413ef13..6de5e1353472ec0f1ab8f258957afb83427f9fa1 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -127,6 +127,8 @@ void InsetFoot::docbook(XMLStream & xs, OutputParams const & runparams) const
        OutputParams rp = runparams;
        rp.docbook_force_pars = true;
        rp.docbook_in_par = false;
+       rp.docbook_consider_allow_multi_par = false;
+       rp.docbook_make_pars = true;
        InsetText::docbook(xs, rp);
 }
 

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 819c87d6a6bef5511f1ed8693e22719b85abd532..95d55b765b1c187d52bc0127d228c852e785019e 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -711,7 +711,7 @@ void InsetText::docbook(XMLStream & xs, OutputParams const & rp, XHTMLOptions op
        // No need for labels that are generated from counters. They should be handled by the external DocBook processor.
 
        // With respect to XHTML, paragraphs are still allowed here.
-       if (!allowMultiPar())
+       if (runparams.docbook_consider_allow_multi_par && !allowMultiPar())
                runparams.docbook_make_pars = false;
        if (il.isPassThru())
                runparams.pass_thru = true;