X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=ce6b702f647fedf73adfdd59dd68ff4049a019e1;hb=33f9cfb7961501b38c573eede468b011687f46de;hp=d815abc81536be04f1e6495a6decee433f2646fc;hpb=a8de4d32968886ee4265dffad013d474bdbafbf5;p=lyx.git

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index d815abc815..ce6b702f64 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -377,6 +377,41 @@ void makeParagraph(
 	};
 	special_case |= nInsets == parSize && std::all_of(par->insetList().begin(), par->insetList().end(), isLyxCodeSpecialCase);
 
+	// Flex elements (InsetLayout) have their own parameter to control the special case.
+	auto isFlexSpecialCase = [](InsetList::Element inset) {
+		if (inset.inset->lyxCode() != FLEX_CODE)
+			return false;
+
+		// Standard condition: check the parameter.
+		if (inset.inset->getLayout().docbooknotinpara())
+			return true;
+
+		// If the parameter is not set, maybe the flex inset only contains things that should match the standard
+		// condition. In this case, isLyxCodeSpecialCase must also check for bibitems...
+		auto isLyxCodeSpecialCase = [](InsetList::Element inset) {
+			return lyxCodeSpecialCases.find(inset.inset->lyxCode()) != lyxCodeSpecialCases.end() ||
+					inset.inset->lyxCode() == BIBITEM_CODE;
+		};
+		if (InsetText * text = inset.inset->asInsetText()) {
+			for (auto const & par : text->paragraphs()) {
+				size_t nInsets = std::distance(par.insetList().begin(), par.insetList().end());
+				auto parSize = (size_t) par.size();
+
+				if (nInsets == 1 && par.insetList().begin()->inset->lyxCode() == BIBITEM_CODE)
+					return true;
+				if (nInsets != parSize)
+					return false;
+				if (!std::all_of(par.insetList().begin(), par.insetList().end(), isLyxCodeSpecialCase))
+					return false;
+			}
+			return true;
+		}
+
+		// No case matched: give up.
+		return false;
+	};
+	special_case |= nInsets == parSize && std::all_of(par->insetList().begin(), par->insetList().end(), isFlexSpecialCase);
+
 	// 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).
 	bool const open_par = runparams.docbook_make_pars