#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"
#include "support/convert.h"
#include "support/types.h"
-#ifdef HAVE_LOCALE
-#endif
-using lyx::pos_type;
-using lyx::support::subst;
+namespace lyx {
+
+using support::subst;
using std::endl;
using std::ostream;
namespace {
-ParagraphList::const_iterator searchParagraph(ParagraphList::const_iterator const & par,
- ParagraphList::const_iterator const & pend)
+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);
+ for (; p != pend && p->layout()->latextype == LATEX_PARAGRAPH; ++p)
+ ;
return p;
}
-ParagraphList::const_iterator searchCommand(ParagraphList::const_iterator const & par,
- ParagraphList::const_iterator const & pend)
+ParagraphList::const_iterator searchCommand(
+ ParagraphList::const_iterator const & par,
+ 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) {
+ for ( ; p != pend; ++p) {
LyXLayout_ptr const & style = p->layout();
- if( style->latextype == LATEX_COMMAND && style->commanddepth <= bstyle->commanddepth)
+ if (style->latextype == LATEX_COMMAND
+ && style->commanddepth <= bstyle->commanddepth)
return p;
}
return pend;
}
-ParagraphList::const_iterator searchEnvironment(ParagraphList::const_iterator const & par,
- ParagraphList::const_iterator const & pend)
+ParagraphList::const_iterator searchEnvironment(
+ ParagraphList::const_iterator const & par,
+ ParagraphList::const_iterator const & pend)
{
LyXLayout_ptr const & bstyle = par->layout();
- ParagraphList::const_iterator p = par + 1;
- for( ; p != pend; ++p) {
+ ParagraphList::const_iterator p = boost::next(par);
+ for (; p != pend; ++p) {
LyXLayout_ptr const & style = p->layout();
- if( style->latextype == LATEX_COMMAND)
+ if (style->latextype == LATEX_COMMAND)
return p;
- if( style->latextype == LATEX_PARAGRAPH) {
+ if (style->latextype == LATEX_PARAGRAPH) {
if (p->params().depth() > par->params().depth())
continue;
return p;
}
- if(p->params().depth() < par->params().depth())
+ if (p->params().depth() < par->params().depth())
return p;
- if( style->latexname() != bstyle->latexname() && p->params().depth() == par->params().depth() )
+ if (style->latexname() != bstyle->latexname()
+ && p->params().depth() == par->params().depth() )
return p;
}
return pend;
ParagraphList::const_iterator makeParagraph(Buffer const & buf,
- ostream & os,
+ odocstream & os,
OutputParams const & runparams,
ParagraphList const & paragraphs,
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) {
+ LyXLayout_ptr const & defaultstyle =
+ buf.params().getLyXTextClass().defaultLayout();
+ for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
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);
}
}
ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
- ostream & os,
+ odocstream & os,
OutputParams const & runparams,
ParagraphList const & paragraphs,
ParagraphList::const_iterator const & pbegin,
sgml::closeTag(os, bstyle->labeltag());
}
wrapper = defaultstyle->latexname();
- sgml::openTag(os, bstyle->itemtag());
+ // If a sub list (embedded list) appears next with a
+ // different depth, then there is no need to open
+ // another tag at the current depth.
+ if(par->params().depth() == pbegin->params().depth()) {
+ sgml::openTag(os, bstyle->itemtag());
+ }
+ break;
default:
break;
}
switch (style->latextype) {
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT: {
- if(par->params().depth() == pbegin->params().depth()) {
+ 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;
}
}
break;
case LATEX_ITEM_ENVIRONMENT:
- sgml::closeTag(os, bstyle->itemtag());
+ // If a sub list (embedded list) appears next, then
+ // there is no need to close the current tag.
+ // par should have already been incremented to the next
+ // element. So we can compare the depth of the next
+ // element with pbegin.
+ // We need to be careful, that we don't dereference par
+ // when par == pend but at the same time that the
+ // current tag is closed.
+ if((par != pend && par->params().depth() == pbegin->params().depth()) || par == pend) {
+ sgml::closeTag(os, bstyle->itemtag());
+ }
if (!bstyle->labeltag().empty())
sgml::closeTag(os, bstyle->innertag());
break;
ParagraphList::const_iterator makeCommand(Buffer const & buf,
- ostream & os,
+ odocstream & os,
OutputParams const & runparams,
ParagraphList const & paragraphs,
ParagraphList::const_iterator const & pbegin,
// Label around sectioning number:
if (!bstyle->labeltag().empty()) {
sgml::openTag(os, bstyle->labeltag());
- os << expandLabel(buf, bstyle, false);
+ // We don't care about appendix in DOCBOOK.
+ os << par->expandLabel(bstyle, buf.params(), false);
sgml::closeTag(os, bstyle->labeltag());
}
// 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';
void docbookParagraphs(ParagraphList const & paragraphs,
Buffer const & buf,
- ostream & os,
+ odocstream & os,
OutputParams const & runparams)
{
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;
}
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff