[LyX/master] DocBook: ensure that tables do not get wrapped in a paragraph.

Thibaut Cuvelier tcuvelier at lyx.org
Thu Nov 5 01:13:22 UTC 2020


commit 7f8d0fd7b7b191c1fbf43f2dfbf7f693c5e1d21b
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Thu Nov 5 02:03:34 2020 +0100

    DocBook: ensure that tables do not get wrapped in a paragraph.
---
 src/output_docbook.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 2c9c488..58e1b81 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -453,6 +453,10 @@ void makeParagraph(
 	special_case |= nInsets == (size_t) par->size() && std::all_of(par->insetList().begin(), par->insetList().end(), [](InsetList::Element inset) {
 		return inset.inset && inset.inset->asInsetMath() && inset.inset->asInsetMath()->getType() != hullSimple;
 	});
+	// Tables doe not deserve their own paragraphs (DocBook allows them outside paragraphs).
+	special_case |= nInsets == (size_t) par->size() && std::all_of(par->insetList().begin(), par->insetList().end(), [](InsetList::Element inset) {
+		return inset.inset->lyxCode() == TABULAR_CODE;
+	});
 	// Floats cannot be in paragraphs.
 	special_case |= nInsets == (size_t) par->size() && std::all_of(par->insetList().begin(), par->insetList().end(), [](InsetList::Element inset) {
 		return inset.inset->lyxCode() == FLOAT_CODE;


More information about the lyx-cvs mailing list