* GuiDocument.cpp:

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index a7277259cc0699915aa15613150a9a61679db434..535d507c63a6ab635fedbbd8f4829a581462cbfa 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -27,7 +27,6 @@
 #include "TextClass.h"
 
 #include "support/lassert.h"
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/lstrings.h"
 
@@ -157,7 +156,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                        if (!bstyle.labeltag().empty()) {
                                sgml::openTag(os, bstyle.innertag(), id);
                                sgml::openTag(os, bstyle.labeltag());
-                               sep = par->firstWord(os, runparams) + 1;
+                               sep = par->firstWordDocBook(os, runparams) + 1;
                                sgml::closeTag(os, bstyle.labeltag());
                        }
                        wrapper = defaultstyle.latexname();
@@ -191,7 +190,12 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                        send = searchParagraph(par, pend);
                        par = makeParagraph(buf, os, runparams, paragraphs, par,send);
                        break;
-               default:
+               case LATEX_LIST_ENVIRONMENT:
+               case LATEX_BIB_ENVIRONMENT:
+               case LATEX_COMMAND:
+                       // FIXME This means that we are just skipping any paragraph that
+                       // isn't implemented above, and this includes lists.
+                       ++par;
                        break;
                }