X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=6ed409c5dda04c69eafadcf2e0f3131bd2fa4abe;hb=ada09a2cdac01dec141c1fd680b0a8c4f77c2237;hp=f8a36d3e43042e3423cd4b7d79692e29ed65c038;hpb=6b2232a29c682d8e62d1d2b963bb1a70bee4330b;p=lyx.git

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index f8a36d3e43..6ed409c5dd 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -30,8 +30,9 @@
 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/lyxalgo.h"
 
-#include <boost/next_prior.hpp>
+#include <iostream>
 
 using namespace std;
 using namespace lyx::support;
@@ -107,15 +108,15 @@ ParagraphList::const_iterator makeParagraph(
 	for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
 		if (par != pbegin)
 			os << '\n';
-		bool const default_or_plain = 
-			(buf.params().documentClass().isDefaultLayout(par->layout()) 
+		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, 
+			par->simpleDocBookOnePar(buf, os, runparams,
 					text.outerFont(distance(paragraphs.begin(), par)));
 		} else {
 			sgml::openTag(buf, os, runparams, *par);
-			par->simpleDocBookOnePar(buf, os, runparams, 
+			par->simpleDocBookOnePar(buf, os, runparams,
 					text.outerFont(distance(paragraphs.begin(), par)));
 			sgml::closeTag(os, *par);
 		}
@@ -137,7 +138,6 @@ ParagraphList::const_iterator makeEnvironment(
 
 	Layout const & defaultstyle = buf.params().documentClass().defaultLayout();
 	Layout const & bstyle = par->layout();
-	string item_tag;
 
 	// Opening outter tag
 	sgml::openTag(buf, os, runparams, *pbegin);
@@ -239,7 +239,7 @@ ParagraphList::const_iterator makeEnvironment(
 	if (bstyle.latextype == LATEX_ENVIRONMENT && bstyle.pass_thru)
 		os << "]]>";
 
-	// Closing outter tag
+	// Closing outer tag
 	sgml::closeTag(os, *pbegin);
 
 	return pend;
@@ -312,7 +312,7 @@ ParagraphList::const_iterator makeCommand(
 	return pend;
 }
 
-} // end anonym namespace
+} // namespace
 
 
 void docbookParagraphs(Text const & text,
@@ -320,15 +320,17 @@ void docbookParagraphs(Text const & text,
 		       odocstream & os,
 		       OutputParams const & runparams)
 {
+	LASSERT(runparams.par_begin <= runparams.par_end,
+		{ os << "<!-- Docbook Output Error -->\n"; return; });
+
 	ParagraphList const & paragraphs = text.paragraphs();
 	ParagraphList::const_iterator par = paragraphs.begin();
 	ParagraphList::const_iterator pend = paragraphs.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);
-		pend = boost::next(paragraphs.begin(), runparams.par_end);
+		par = lyx::next(paragraphs.begin(), runparams.par_begin);
+		pend = lyx::next(paragraphs.begin(), runparams.par_end);
 		// runparams will be passed to nested paragraphs, so
 		// we have to reset the range parameters.
 		const_cast<OutputParams&>(runparams).par_begin = 0;