X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=432b2e710903c2222ddbefd48b0f45a64591c58e;hb=e903d0158e1d92c0d9c17656af10df9fa9a3d723;hp=f413f2831b790bffdd0f532c4fadc0a095d2593a;hpb=b18bfcf3cc3a6dc91d607f28b269344db6ce3106;p=lyx.git

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index f413f2831b..432b2e7109 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -17,6 +17,7 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "Counters.h"
+#include "Font.h"
 #include "Layout.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
@@ -105,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 {
@@ -292,7 +295,11 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
 			send = searchParagraph(par, pend);
 			par = makeParagraph(buf, os, runparams, text, par,send);
 			break;
-		default:
+		case LATEX_BIB_ENVIRONMENT:
+		case LATEX_LIST_ENVIRONMENT:
+			// FIXME This means that we are just skipping any paragraph that
+			// isn't implemented above.
+			++par;
 			break;
 		}
 	}
@@ -333,20 +340,24 @@ void docbookParagraphs(Text const & text,
 		switch (style.latextype) {
 		case LATEX_COMMAND: {
 			send = searchCommand(par, pend);
-			par = makeCommand(buf, os, runparams, text, par,send);
+			par = makeCommand(buf, os, runparams, text, par, send);
 			break;
 		}
 		case LATEX_ENVIRONMENT:
 		case LATEX_ITEM_ENVIRONMENT: {
 			send = searchEnvironment(par, pend);
-			par = makeEnvironment(buf, os, runparams, text, par,send);
+			par = makeEnvironment(buf, os, runparams, text, par, send);
 			break;
 		}
 		case LATEX_PARAGRAPH:
 			send = searchParagraph(par, pend);
-			par = makeParagraph(buf, os, runparams, text, par,send);
+			par = makeParagraph(buf, os, runparams, text, par, send);
 			break;
-		default:
+		case LATEX_BIB_ENVIRONMENT:
+		case LATEX_LIST_ENVIRONMENT:
+			// FIXME This means that we are just skipping any paragraph that
+			// isn't implemented above.
+			++par;
 			break;
 		}
 		// makeEnvironment may process more than one paragraphs and bypass pend