From: Richard Heck <rgheck@comcast.net>
Date: Sun, 22 Jan 2012 14:37:13 +0000 (+0000)
Subject: Backport Vincent's fix for #7004.
X-Git-Tag: 2.0.3~59
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=441e7f6c0302ca80295a2678c83de3efeb029600;p=features.git

Backport Vincent's fix for #7004.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40652 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index b6f7d33dae..2547fb65b4 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -106,8 +106,10 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
 	for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
 		if (par != pbegin)
 			os << '\n';
-		if (buf.params().documentClass().isDefaultLayout(par->layout()) 
-		    && par->emptyTag()) {
+		bool const default_or_plain = 
+			(buf.params().documentClass().isDefaultLayout(par->layout()) 
+				|| buf.params().documentClass().isPlainLayout(par->layout()));
+		if (default_or_plain && par->emptyTag()) {
 			par->simpleDocBookOnePar(buf, os, runparams, 
 					text.outerFont(distance(paragraphs.begin(), par)));
 		} else {
diff --git a/status.20x b/status.20x
index 4a75bfd2fc..b64c35854e 100644
--- a/status.20x
+++ b/status.20x
@@ -151,6 +151,8 @@ What's new
 - Fix marvosym/bbding package clash caused by using 0x271d "LATIN CROSS"
   unicode symbol (part of bug 7811).
 
+- Fix error when exporting DocBOok tables (bug 7004).
+
 
 * TEX2LYX