From: Thibaut Cuvelier <tcuvelier@lyx.org>
Date: Mon, 24 May 2021 21:36:23 +0000 (+0200)
Subject: DocBook: fix handling of footnotes.
X-Git-Tag: 2.4-beta2~1280
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=39a9e370c71562c9b42690262698c1fc87c46b56;p=lyx.git

DocBook: fix handling of footnotes.

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

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 48ad61e7d9..2191a83fde 100644
--- 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 eebbeb4f46..6de5e13534 100644
--- 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 819c87d6a6..95d55b765b 100644
--- 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;