Merge remote-tracking branch 'lyxit/vfr/docbook-fix-7004'

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40089 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2011-10-30 11:44:22 +00:00
parent 098184ba6a
commit db3aadf424

View File

@ -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 {