Author: rgheck
Date: Sun Jan 22 15:37:13 2012
New Revision: 40652
URL: http://www.lyx.org/trac/changeset/40652
Log:
Backport Vincent's fix for #7004.
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/output_docbook.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/output_docbook.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/output_docbook.cpp Sun Jan 22
15:23:43 2012 (r40651)
+++ lyx-devel/branches/BRANCH_2_0_X/src/output_docbook.cpp Sun Jan 22
15:37:13 2012 (r40652)
@@ -106,8 +106,10 @@
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 {
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Sun Jan 22 15:23:43 2012
(r40651)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Sun Jan 22 15:37:13 2012
(r40652)
@@ -151,6 +151,8 @@
- 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
