* docstream: factorize out some code and introduce odocfstream::reset()

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 00cfe1b5398ef9d70beb9ba4281070ab83ce7a3b..ba4bc9b09e01a1596f0c33621af5d8da9d6c3237 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -16,22 +16,24 @@
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
-#include "OutputParams.h"
 #include "Counters.h"
-#include "debug.h"
+#include "support/debug.h"
+#include "Layout.h"
+#include "OutputParams.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
 #include "sgml.h"
-
-#include "insets/InsetCommand.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 {
 
@@ -45,12 +47,10 @@ using std::string;
 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;
@@ -58,13 +58,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)
@@ -75,27 +74,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;