minimal effort implementation of:

[lyx.git] / src / output_docbook.C

diff --git a/src/output_docbook.C b/src/output_docbook.C
index ddb95b08424e8a5ce41b4920bdf8823e8ea384de..a54fc303f6b73b4b2a8b1abc4169294a751acc45 100644 (file)
--- a/src/output_docbook.C
+++ b/src/output_docbook.C
@@ -16,11 +16,12 @@
 #include "buffer.h"
 #include "buffer_funcs.h"
 #include "bufferparams.h"
+#include "outputparams.h"
 #include "counters.h"
 #include "debug.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
-#include "ParagraphList_fwd.h"
+#include "ParagraphList.h"
 #include "ParagraphParameters.h"
 #include "sgml.h"
 
@@ -47,7 +48,7 @@ namespace {
 ParagraphList::const_iterator searchParagraph(ParagraphList::const_iterator const & par,
                                              ParagraphList::const_iterator const & pend)
 {
-       ParagraphList::const_iterator p = par + 1;
+       ParagraphList::const_iterator p = boost::next(par);
 
        for( ; p != pend && p->layout()->latextype == LATEX_PARAGRAPH; ++p);
 
@@ -59,7 +60,7 @@ ParagraphList::const_iterator searchCommand(ParagraphList::const_iterator const
                                            ParagraphList::const_iterator const & pend)
 {
        LyXLayout_ptr const & bstyle = par->layout();
-       ParagraphList::const_iterator p = par + 1;
+       ParagraphList::const_iterator p = boost::next(par);
 
        for( ; p != pend; ++p) {
                LyXLayout_ptr const & style = p->layout();
@@ -74,7 +75,7 @@ ParagraphList::const_iterator searchEnvironment(ParagraphList::const_iterator co
                                                ParagraphList::const_iterator const & pend)
 {
        LyXLayout_ptr const & bstyle = par->layout();
-       ParagraphList::const_iterator p = par + 1;
+       ParagraphList::const_iterator p = boost::next(par);
        for( ; p != pend; ++p) {
                LyXLayout_ptr const & style = p->layout();
                if( style->latextype == LATEX_COMMAND)
@@ -108,10 +109,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(par - paragraphs.begin(), paragraphs));
+                       par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs));
                } else {
                        sgml::openTag(buf, os, runparams, *par);
-                       par->simpleDocBookOnePar(buf, os, runparams, outerFont(par - paragraphs.begin(), paragraphs));
+                       par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs));
                        sgml::closeTag(os, *par);
                }
        }
@@ -170,7 +171,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(par - paragraphs.begin(), paragraphs), sep);
+                               par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs), sep);
                                sgml::closeTag(os, wrapper);
                                ++par;
                        }
@@ -239,7 +240,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(par - paragraphs.begin(), paragraphs));
+       par->simpleDocBookOnePar(buf, os, runparams,  outerFont(std::distance(paragraphs.begin(), par), paragraphs));
        sgml::closeTag(os, bstyle->innertag());
        os << '\n';
 
@@ -285,8 +286,20 @@ 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);
+       // 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);
+               // runparams will be passed to nested paragraphs, so
+               // we have to reset the range parameters.
+               const_cast<OutputParams&>(runparams).par_begin = 0;
+               const_cast<OutputParams&>(runparams).par_end = 0;
+       }
+       
        while (par != pend) {
                LyXLayout_ptr const & style = par->layout();
+               ParagraphList::const_iterator lastpar = par;
                ParagraphList::const_iterator send;
 
                switch (style->latextype) {
@@ -308,5 +321,8 @@ void docbookParagraphs(ParagraphList const & paragraphs,
                default:
                        break;
                }
+               // makeEnvironment may process more than one paragraphs and bypass pend
+               if (std::distance(lastpar, par) >= std::distance(lastpar, pend))
+                       break;
        }
 }