* 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 83f2e4029504db517b872baa5b1e4b9f4e7a61e0..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,14 +58,13 @@ ParagraphList::const_iterator searchParagraph(
 
 
 ParagraphList::const_iterator searchCommand(
-               ParagraphList::const_iterator const & par,
+               ParagraphList::const_iterator p,
                ParagraphList::const_iterator const & pend)
 {
-       Layout_ptr const & bstyle = par->layout();
-       ParagraphList::const_iterator p = boost::next(par);
+       LayoutPtr const & bstyle = p->layout();
 
-       for ( ; p != pend; ++p) {
-               Layout_ptr const & style = p->layout();
+       for (++p; p != pend; ++p) {
+               LayoutPtr const & style = p->layout();
                if (style->latextype == LATEX_COMMAND
                                && style->commanddepth <= bstyle->commanddepth)
                        return p;
@@ -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)
 {
-       Layout_ptr const & bstyle = par->layout();
-       ParagraphList::const_iterator p = boost::next(par);
-       for (; p != pend; ++p) {
-               Layout_ptr const & style = p->layout();
+       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;
@@ -109,7 +108,7 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
                                            ParagraphList::const_iterator const & pbegin,
                                            ParagraphList::const_iterator const & pend)
 {
-       Layout_ptr const & defaultstyle =
+       LayoutPtr const & defaultstyle =
                buf.params().getTextClass().defaultLayout();
        for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
                if (par != pbegin)
@@ -134,8 +133,8 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                                              ParagraphList::const_iterator const & pend) {
        ParagraphList::const_iterator par = pbegin;
 
-       Layout_ptr const & defaultstyle = buf.params().getTextClass().defaultLayout();
-       Layout_ptr const & bstyle = par->layout();
+       LayoutPtr const & defaultstyle = buf.params().getTextClass().defaultLayout();
+       LayoutPtr const & bstyle = par->layout();
        string item_tag;
 
        // Opening outter tag
@@ -145,7 +144,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                os << "<![CDATA[";
 
        while (par != pend) {
-               Layout_ptr const & style = par->layout();
+               LayoutPtr const & style = par->layout();
                ParagraphList::const_iterator send;
                string id = par->getID(buf, runparams);
                string wrapper = "";
@@ -247,7 +246,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
                                          ParagraphList::const_iterator const & pend)
 {
        ParagraphList::const_iterator par = pbegin;
-       Layout_ptr const & bstyle = par->layout();
+       LayoutPtr const & bstyle = par->layout();
 
        //Open outter tag
        sgml::openTag(buf, os, runparams, *pbegin);
@@ -269,7 +268,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
 
        ++par;
        while (par != pend) {
-               Layout_ptr const & style = par->layout();
+               LayoutPtr const & style = par->layout();
                ParagraphList::const_iterator send;
 
                switch (style->latextype) {
@@ -321,7 +320,7 @@ void docbookParagraphs(ParagraphList const & paragraphs,
        }
 
        while (par != pend) {
-               Layout_ptr const & style = par->layout();
+               LayoutPtr const & style = par->layout();
                ParagraphList::const_iterator lastpar = par;
                ParagraphList::const_iterator send;