#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 {
-
-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;
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;
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;
ParagraphList::const_iterator const & pbegin,
ParagraphList::const_iterator const & pend)
{
- Layout_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);
}
}
ParagraphList::const_iterator const & pend) {
ParagraphList::const_iterator par = pbegin;
- Layout_ptr const & defaultstyle = buf.params().getLyXTextClass().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
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 = "";
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;
}
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);
// 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) {
- Layout_ptr const & style = par->layout();
+ LayoutPtr const & style = par->layout();
ParagraphList::const_iterator send;
switch (style->latextype) {
const_cast<OutputParams&>(runparams).par_begin = 0;
const_cast<OutputParams&>(runparams).par_end = 0;
}
-
+
while (par != pend) {
- Layout_ptr const & style = par->layout();
+ LayoutPtr const & style = par->layout();
ParagraphList::const_iterator lastpar = par;
ParagraphList::const_iterator send;
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;
}
}