anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DocBook: don't use a surrounding <para> for rendered insets.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2021-10-07 00:07:21 +02:00
parent e93e50bf56
commit 5c735ce880
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/output_docbook.cpp
View File

@ -360,11 +360,13 @@ void makeParagraph(
// Plain layouts must be ignored. // Plain layouts must be ignored.
special_case |= buf.params().documentClass().isPlainLayout(par->layout()) && !runparams.docbook_force_pars; special_case |= buf.params().documentClass().isPlainLayout(par->layout()) && !runparams.docbook_force_pars;
// Equations do not deserve their own paragraph (DocBook allows them outside paragraphs). // Equations do not deserve their own paragraph (DocBook allows them outside paragraphs).
// Exception: any case that generates an <inlineequation> must still get a paragraph to be valid. // Exception: any case that generates an <inlineequation> must still get a paragraph to be valid.
special_case |= nInsets == parSize && std::all_of(par->insetList().begin(), par->insetList().end(), [](InsetList::Element inset) { auto isEquationSpecialCase = [](InsetList::Element inset) {
return inset.inset && inset.inset->asInsetMath() && inset.inset->asInsetMath()->getType() != hullSimple; return inset.inset && inset.inset->asInsetMath() && inset.inset->asInsetMath()->getType() != hullSimple;
}); };
special_case |= nInsets == parSize && std::all_of(par->insetList().begin(), par->insetList().end(), isEquationSpecialCase);
// Things that should not get into their own paragraph. (Only valid for DocBook.) // Things that should not get into their own paragraph. (Only valid for DocBook.)
static std::set<InsetCode> lyxCodeSpecialCases = { static std::set<InsetCode> lyxCodeSpecialCases = {
@ -420,6 +422,12 @@ void makeParagraph(
}; };
special_case |= nInsets == parSize && std::all_of(par->insetList().begin(), par->insetList().end(), isFlexSpecialCase); special_case |= nInsets == parSize && std::all_of(par->insetList().begin(), par->insetList().end(), isFlexSpecialCase);
// If the insets should be rendered as images, enter the special case.
auto isRenderedAsImageSpecialCase = [](InsetList::Element inset) {
return inset.inset && inset.inset->getLayout().docbookrenderasimage();
};
special_case |= nInsets == parSize && std::all_of(par->insetList().begin(), par->insetList().end(), isRenderedAsImageSpecialCase);
// Open a paragraph if it is allowed, we are not already within a paragraph, and the insets in the paragraph do // Open a paragraph if it is allowed, we are not already within a paragraph, and the insets in the paragraph do
// not forbid paragraphs (aka special cases). // not forbid paragraphs (aka special cases).
bool const open_par = runparams.docbook_make_pars bool const open_par = runparams.docbook_make_pars