#include "output_docbook.h"
#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferparams.h"
#include "counters.h"
#include "debug.h"
-#include "lyxtext.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
+#include "ParagraphList_fwd.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
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;
{
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));
} else {
sgml::openTag(buf, os, runparams, *par);
par->simpleDocBookOnePar(buf, os, runparams, outerFont(par - paragraphs.begin(), paragraphs));
sgml::closeTag(os, *par);
- os << '\n';
}
}
return pend;
// Opening outter tag
sgml::openTag(buf, os, runparams, *pbegin);
os << '\n';
- if (bstyle->latextype == LATEX_ENVIRONMENT and bstyle->pass_thru)
+ if (bstyle->latextype == LATEX_ENVIRONMENT && bstyle->pass_thru)
os << "<![CDATA[";
while (par != pend) {
}
}
- if (bstyle->latextype == LATEX_ENVIRONMENT and bstyle->pass_thru)
+ if (bstyle->latextype == LATEX_ENVIRONMENT && bstyle->pass_thru)
os << "]]>";
// Closing outter tag
// 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));
sgml::closeTag(os, bstyle->innertag());