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 b6f7d33daeee42456238fce033bb8124544cec4b..2547fb65b4a71f6b4486b7d3b9f65bd42d2ba563 100644 (file)
--- 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 4a75bfd2fc0f3b2e26024119e9a17aca251b5b62..b64c35854e48fa07063fd864cf37e710c9fd9398 100644 (file)
--- 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