Author: vfr
Date: Sun Oct 30 12:44:22 2011
New Revision: 40089
URL: http://www.lyx.org/trac/changeset/40089
Log:
Merge remote-tracking branch 'lyxit/vfr/docbook-fix-7004'
Modified:
lyx-devel/trunk/src/output_docbook.cpp
Modified: lyx-devel/trunk/src/output_docbook.cpp
==============================================================================
--- lyx-devel/trunk/src/output_docbook.cpp Sun Oct 30 12:43:45 2011
(r40088)
+++ lyx-devel/trunk/src/output_docbook.cpp Sun Oct 30 12:44:22 2011
(r40089)
@@ -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 {
