anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DocBook: fix handling of footnotes.

Browse Source 
A <para> was missing inside starting at 441c6a93.
This commit is contained in:
Thibaut Cuvelier 2021-05-24 23:36:23 +02:00
parent 33b7088719
commit 39a9e370c7
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/OutputParams.h
View File

@ -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;

2
src/insets/InsetFoot.cpp
View File

@ -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);
}

2
src/insets/InsetText.cpp
View File

@ -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;