X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=d5e781a388ba948405cafcc7e1e826e6e0e17c0a;hb=fc2658eff011adb08192cf897416698c34aab268;hp=fd1f9b1889dd7799010c8b3641af985886940ef6;hpb=cd72af583f2bae976a782c98da1c90d9026618a6;p=lyx.git

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index fd1f9b1889..d5e781a388 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -17,7 +17,7 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "Counters.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Layout.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
@@ -25,31 +25,26 @@
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
 #include "sgml.h"
+#include "TextClass.h"
 
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/convert.h"
 #include "support/types.h"
 
+#include <boost/next_prior.hpp>
 
-namespace lyx {
-
-using support::subst;
+using namespace std;
+using namespace lyx::support;
 
-using std::endl;
-using std::ostream;
-using std::vector;
-using std::string;
+namespace lyx {
 
 namespace {
 
 ParagraphList::const_iterator searchParagraph(
-	ParagraphList::const_iterator const & par,
+	ParagraphList::const_iterator p,
   ParagraphList::const_iterator const & pend)
 {
-	ParagraphList::const_iterator p = boost::next(par);
-
-	for (; p != pend && p->layout()->latextype == LATEX_PARAGRAPH; ++p)
+	for (++p; p != pend && p->layout()->latextype == LATEX_PARAGRAPH; ++p)
 		;
 
 	return p;
@@ -57,13 +52,12 @@ ParagraphList::const_iterator searchParagraph(
 
 
 ParagraphList::const_iterator searchCommand(
-		ParagraphList::const_iterator const & par,
+		ParagraphList::const_iterator p,
 		ParagraphList::const_iterator const & pend)
 {
-	LayoutPtr const & bstyle = par->layout();
-	ParagraphList::const_iterator p = boost::next(par);
+	LayoutPtr const & bstyle = p->layout();
 
-	for ( ; p != pend; ++p) {
+	for (++p; p != pend; ++p) {
 		LayoutPtr const & style = p->layout();
 		if (style->latextype == LATEX_COMMAND
 				&& style->commanddepth <= bstyle->commanddepth)
@@ -74,27 +68,27 @@ ParagraphList::const_iterator searchCommand(
 
 
 ParagraphList::const_iterator searchEnvironment(
-		ParagraphList::const_iterator const & par,
+		ParagraphList::const_iterator p,
 		ParagraphList::const_iterator const & pend)
 {
-	LayoutPtr const & bstyle = par->layout();
-	ParagraphList::const_iterator p = boost::next(par);
-	for (; p != pend; ++p) {
+	LayoutPtr const & bstyle = p->layout();
+	size_t const depth = p->params().depth();
+	for (++p; p != pend; ++p) {
 		LayoutPtr const & style = p->layout();
 		if (style->latextype == LATEX_COMMAND)
 			return p;
 
 		if (style->latextype == LATEX_PARAGRAPH) {
-			if (p->params().depth() > par->params().depth())
+			if (p->params().depth() > depth)
 				continue;
 			return p;
 		}
 
-		if (p->params().depth() < par->params().depth())
+		if (p->params().depth() < depth)
 			return p;
 
 		if (style->latexname() != bstyle->latexname()
-				&& p->params().depth() == par->params().depth() )
+				&& p->params().depth() == depth)
 			return p;
 	}
 	return pend;
@@ -114,10 +108,10 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
 		if (par != pbegin)
 			os << '\n';
 		if (par->layout() == defaultstyle && par->emptyTag()) {
-			par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs));
+			par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs));
 		} else {
 			sgml::openTag(buf, os, runparams, *par);
-			par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs));
+			par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs));
 			sgml::closeTag(os, *par);
 		}
 	}
@@ -182,7 +176,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
 		case LATEX_ITEM_ENVIRONMENT: {
 			if (par->params().depth() == pbegin->params().depth()) {
 				sgml::openTag(os, wrapper);
-				par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs), sep);
+				par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs), sep);
 				sgml::closeTag(os, wrapper);
 				++par;
 			}
@@ -262,7 +256,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
 
 	// Opend inner tag and	close inner tags
 	sgml::openTag(os, bstyle->innertag());
-	par->simpleDocBookOnePar(buf, os, runparams,  outerFont(std::distance(paragraphs.begin(), par), paragraphs));
+	par->simpleDocBookOnePar(buf, os, runparams,  outerFont(distance(paragraphs.begin(), par), paragraphs));
 	sgml::closeTag(os, bstyle->innertag());
 	os << '\n';
 
@@ -344,7 +338,7 @@ void docbookParagraphs(ParagraphList const & paragraphs,
 			break;
 		}
 		// makeEnvironment may process more than one paragraphs and bypass pend
-		if (std::distance(lastpar, par) >= std::distance(lastpar, pend))
+		if (distance(lastpar, par) >= distance(lastpar, pend))
 			break;
 	}
 }