X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=d5e781a388ba948405cafcc7e1e826e6e0e17c0a;hb=fc2658eff011adb08192cf897416698c34aab268;hp=10d15e1a13aa16dfae36204a0a3be673414bb3c5;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp index 10d15e1a13..d5e781a388 100644 --- a/src/output_docbook.cpp +++ b/src/output_docbook.cpp @@ -16,41 +16,35 @@ #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 -namespace lyx { - -using support::subst; +using namespace std; +using namespace lyx::support; -using std::endl; -using std::ostream; -using std::vector; -using std::string; +namespace lyx { 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 +52,13 @@ ParagraphList::const_iterator searchParagraph( ParagraphList::const_iterator searchCommand( - ParagraphList::const_iterator const & par, + ParagraphList::const_iterator p, ParagraphList::const_iterator const & pend) { - LyXLayout_ptr const & bstyle = par->layout(); - ParagraphList::const_iterator p = boost::next(par); + LayoutPtr const & bstyle = p->layout(); - for ( ; p != pend; ++p) { - LyXLayout_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 +68,27 @@ ParagraphList::const_iterator searchCommand( ParagraphList::const_iterator searchEnvironment( - ParagraphList::const_iterator const & par, + ParagraphList::const_iterator p, ParagraphList::const_iterator const & pend) { - LyXLayout_ptr const & bstyle = par->layout(); - ParagraphList::const_iterator p = boost::next(par); - for (; p != pend; ++p) { - LyXLayout_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,16 +102,16 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf, ParagraphList::const_iterator const & pbegin, ParagraphList::const_iterator const & pend) { - LyXLayout_ptr const & defaultstyle = - buf.params().getLyXTextClass().defaultLayout(); + LayoutPtr const & defaultstyle = + buf.params().getTextClass().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(std::distance(paragraphs.begin(), par), paragraphs)); + par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs)); } else { sgml::openTag(buf, os, runparams, *par); - par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs)); + par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs)); sgml::closeTag(os, *par); } } @@ -134,8 +127,8 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf, ParagraphList::const_iterator const & pend) { ParagraphList::const_iterator par = pbegin; - LyXLayout_ptr const & defaultstyle = buf.params().getLyXTextClass().defaultLayout(); - LyXLayout_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 +138,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf, os << "layout(); + LayoutPtr const & style = par->layout(); ParagraphList::const_iterator send; string id = par->getID(buf, runparams); string wrapper = ""; @@ -183,7 +176,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(std::distance(paragraphs.begin(), par), paragraphs), sep); + par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs), sep); sgml::closeTag(os, wrapper); ++par; } @@ -247,7 +240,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf, ParagraphList::const_iterator const & pend) { ParagraphList::const_iterator par = pbegin; - LyXLayout_ptr const & bstyle = par->layout(); + LayoutPtr const & bstyle = par->layout(); //Open outter tag sgml::openTag(buf, os, runparams, *pbegin); @@ -263,13 +256,13 @@ 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(std::distance(paragraphs.begin(), par), paragraphs)); + par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs)); sgml::closeTag(os, bstyle->innertag()); os << '\n'; ++par; while (par != pend) { - LyXLayout_ptr const & style = par->layout(); + LayoutPtr const & style = par->layout(); ParagraphList::const_iterator send; switch (style->latextype) { @@ -319,9 +312,9 @@ void docbookParagraphs(ParagraphList const & paragraphs, const_cast(runparams).par_begin = 0; const_cast(runparams).par_end = 0; } - + while (par != pend) { - LyXLayout_ptr const & style = par->layout(); + LayoutPtr const & style = par->layout(); ParagraphList::const_iterator lastpar = par; ParagraphList::const_iterator send; @@ -345,7 +338,7 @@ void docbookParagraphs(ParagraphList const & paragraphs, break; } // makeEnvironment may process more than one paragraphs and bypass pend - if (std::distance(lastpar, par) >= std::distance(lastpar, pend)) + if (distance(lastpar, par) >= distance(lastpar, pend)) break; } }