* GuiDocument.cpp:

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 2b8d6a0384b467213b12014f4bdc9fc53662e189..535d507c63a6ab635fedbbd8f4829a581462cbfa 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -3,8 +3,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
- * \author José Matos
+ * \author Lars Gullik Bjønnes
+ * \author José Matos
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -26,7 +26,7 @@
 #include "sgml.h"
 #include "TextClass.h"
 
-#include "support/convert.h"
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/lstrings.h"
 
@@ -156,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();
@@ -190,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;
                }
 
@@ -302,7 +307,7 @@ void docbookParagraphs(ParagraphList const & paragraphs,
        ParagraphList::const_iterator par = paragraphs.begin();
        ParagraphList::const_iterator pend = paragraphs.end();
 
-       BOOST_ASSERT(runparams.par_begin <= runparams.par_end);
+       LASSERT(runparams.par_begin <= runparams.par_end, /**/);
        // if only part of the paragraphs will be outputed
        if (runparams.par_begin !=  runparams.par_end) {
                par = boost::next(paragraphs.begin(), runparams.par_begin);