From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Wed, 2 May 2012 13:34:56 +0000 (+0200)
Subject: Fix bug #7914: Freeze on docbook export of lists and bibliography
X-Git-Tag: 2.1.0beta1~1917
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=fa9bd04ea48bc7a3101bedcf8bab9b5e00d009bc;p=features.git

Fix bug #7914: Freeze on docbook export of lists and bibliography

The LATEX_LIST_ENVIRONMENT and LATEX_BIB_ENVIRONMENT type paragraphs are
not yet implemented in DocBook export. However, we need to actively skip
these paragraphs in order not to end up in an endless loop.
---

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 9dfa256eb8..432b2e7109 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -295,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;
 		}
 	}
@@ -349,7 +353,11 @@ void docbookParagraphs(Text const & text,
 			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;
 		}
 		// makeEnvironment may process more than one paragraphs and bypass pend