#include "output_docbook.h"
#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferparams.h"
+#include "outputparams.h"
#include "counters.h"
#include "debug.h"
-#include "lyxtext.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
+#include "ParagraphList.h"
#include "ParagraphParameters.h"
#include "sgml.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include "support/types.h"
#ifdef HAVE_LOCALE
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);
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();
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)
if(p->params().depth() < par->params().depth())
return p;
- if( style->latexname() != bstyle->latexname() and p->params().depth() == par->params().depth() )
+ if( style->latexname() != bstyle->latexname() && p->params().depth() == par->params().depth() )
return p;
}
return pend;
ParagraphList::const_iterator const & pbegin,
ParagraphList::const_iterator const & pend)
{
+ LyXLayout_ptr const & defaultstyle = buf.params().getLyXTextClass().defaultLayout();
for(ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
- sgml::openTag(buf, os, *par);
- par->simpleDocBookOnePar(buf, os, runparams, outerFont(par - paragraphs.begin(), paragraphs));
- sgml::closeTag(os, *par);
- os << '\n';
+ if (par != pbegin)
+ os << '\n';
+ if (par->layout() == defaultstyle && par->emptyTag()) {
+ 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(std::distance(paragraphs.begin(), par), paragraphs));
+ sgml::closeTag(os, *par);
+ }
}
return pend;
}
string item_tag;
// Opening outter tag
- sgml::openTag(buf, os, *pbegin);
+ sgml::openTag(buf, os, runparams, *pbegin);
os << '\n';
- if (bstyle->latextype == LATEX_ENVIRONMENT and bstyle->innertag() == "CDATA")
+ if (bstyle->latextype == LATEX_ENVIRONMENT && bstyle->pass_thru)
os << "<![CDATA[";
while (par != pend) {
LyXLayout_ptr const & style = par->layout();
ParagraphList::const_iterator send;
- string id = par->getID();
+ string id = par->getID(buf, runparams);
string wrapper = "";
pos_type sep = 0;
// Opening inner tag
switch (bstyle->latextype) {
case LATEX_ENVIRONMENT:
- if (!bstyle->innertag().empty() and bstyle->innertag() != "CDATA") {
+ if (!bstyle->innertag().empty()) {
sgml::openTag(os, bstyle->innertag(), id);
}
break;
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;
}
// Closing inner tag
switch (bstyle->latextype) {
case LATEX_ENVIRONMENT:
- if (!bstyle->innertag().empty() and bstyle->innertag() != "CDATA") {
+ if (!bstyle->innertag().empty()) {
sgml::closeTag(os, bstyle->innertag());
os << '\n';
}
}
}
- if (bstyle->latextype == LATEX_ENVIRONMENT and bstyle->innertag() == "CDATA")
+ if (bstyle->latextype == LATEX_ENVIRONMENT && bstyle->pass_thru)
os << "]]>";
// Closing outter tag
LyXLayout_ptr const & bstyle = par->layout();
//Open outter tag
- sgml::openTag(buf, os, *pbegin);
+ sgml::openTag(buf, os, runparams, *pbegin);
os << '\n';
// Label around sectioning number:
if (!bstyle->labeltag().empty()) {
sgml::openTag(os, bstyle->labeltag());
- os << expandLabel(buf.params().getLyXTextClass(), bstyle, false);
+ os << expandLabel(buf, bstyle, false);
sgml::closeTag(os, bstyle->labeltag());
}
- // Opend inner tag and close inner tags
+ // 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';
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) {
default:
break;
}
+ // makeEnvironment may process more than one paragraphs and bypass pend
+ if (std::distance(lastpar, par) >= std::distance(lastpar, pend))
+ break;
}
}