Fix bug 886 and others not reported related with the document paper size.

[lyx.git] / src / output_docbook.C

diff --git a/src/output_docbook.C b/src/output_docbook.C
index 47c8eefd4754e875b74256ac78b2047bdd8aae91..ddb95b08424e8a5ce41b4920bdf8823e8ea384de 100644 (file)
--- a/src/output_docbook.C
+++ b/src/output_docbook.C
@@ -14,12 +14,13 @@
 #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"
 
@@ -27,7 +28,7 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/types.h"
 
 #ifdef HAVE_LOCALE
@@ -88,7 +89,7 @@ ParagraphList::const_iterator searchEnvironment(ParagraphList::const_iterator co
                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;
@@ -104,13 +105,14 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
 {
        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, *par);
+                       sgml::openTag(buf, os, runparams, *par);
                        par->simpleDocBookOnePar(buf, os, runparams, outerFont(par - paragraphs.begin(), paragraphs));
                        sgml::closeTag(os, *par);
-                       os << '\n';
                }
        }
        return pend;
@@ -130,22 +132,22 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
        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;
@@ -189,7 +191,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                // 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';
                        }
@@ -204,7 +206,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                }
        }
 
-       if (bstyle->latextype == LATEX_ENVIRONMENT and bstyle->innertag() == "CDATA")
+       if (bstyle->latextype == LATEX_ENVIRONMENT && bstyle->pass_thru)
                os << "]]>";
 
        // Closing outter tag
@@ -225,17 +227,17 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
        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));
        sgml::closeTag(os, bstyle->innertag());