Docbook fixes from Andreas

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9687 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index d27d6157e1465bfdb47d68dbd917607948c080e6..0f4da9676b42da2ff5e9f3200f445a2a457fe200 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-25  Andreas Vox  <avox@arcor.de>
+
+       * output_docbook.C (makeParagraph): suppress trailing newline
+       after a run of paragraphs
+
 2005-02-28  Johnathan Burchill  <jkerrb@users.sourceforge.net>
 
        * paragraph.C: fix for confused change tracker when pasting

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 0cf481f7e698708cfdd1287d4d2778456b5983a2..d31f87ddac8b599c9a1d22cf9fa6a1078f7a4a03 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-25  Andreas Vox  <avox@arcor.de>
+
+       * insetmarginal.[hC] (docbook): new method, render as <note>
+
+       * insetoptarg.[hC] (docbook, linuxdoc): new, empty, methods
+
 2005-02-23  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * insetcaption.[Ch] (doClone): implement

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 9147236c8b72e5eefffdb926e0550d6547c58045..08fc084e68d4722e0f5252ad3798820902296c3a 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -60,3 +60,13 @@ int InsetMarginal::latex(Buffer const & buf, ostream & os,
        os << "%\n}";
        return i + 2;
 }
+
+int InsetMarginal::docbook(Buffer const & buf, ostream & os,
+                      OutputParams const & runparams) const
+{
+       os << "<note role=\"margin\">";
+       int const i = InsetText::docbook(buf, os, runparams);
+       os << "</note>";
+
+       return i;
+}

diff --git a/src/insets/insetmarginal.h b/src/insets/insetmarginal.h
index 9b841f94426bc71ef8018966b3038fa6c917336e..e7c34f290787e515aa30ac7a496941c6152f0695 100644 (file)
--- a/src/insets/insetmarginal.h
+++ b/src/insets/insetmarginal.h
@@ -29,6 +29,9 @@ public:
        int latex(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
+       int docbook(Buffer const &, std::ostream &,
+                   OutputParams const & runparams) const;
+       ///
        std::string const editMessage() const;
 protected:
        InsetMarginal(InsetMarginal const &);

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 6b889fd726c74141f2e78636ec03fbf3a8b6471c..ab65abf6b036697fe6c317eef08ad5fd70bd1b90 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -70,6 +70,18 @@ int InsetOptArg::latex(Buffer const &, ostream &,
        return 0;
 }
 
+int InsetOptArg::linuxdoc(Buffer const &, ostream &,
+                      OutputParams const &) const
+{
+       return 0;
+}
+
+int InsetOptArg::docbook(Buffer const &, ostream &,
+                      OutputParams const &) const
+{
+       return 0;
+}
+
 
 int InsetOptArg::latexOptional(Buffer const & buf, ostream & os,
                               OutputParams const & runparams) const

diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h
index 90aaf963b16c13b1acd048052f470081a473c4ca..292732b83c9adcd460b521ffaa8a02ce71974aff 100644 (file)
--- a/src/insets/insetoptarg.h
+++ b/src/insets/insetoptarg.h
@@ -32,6 +32,13 @@ public:
        /// Standard LaTeX output -- short-circuited
        int latex(Buffer const &, std::ostream &,
                  OutputParams const &) const;
+       /// Standard DocBook output -- short-circuited
+       int docbook(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
+       /// Standard LinuxDoc output -- short-circuited
+       int linuxdoc(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
+
        /// Outputting the optional parameter of a LaTeX command
        int latexOptional(Buffer const &, std::ostream &,
                          OutputParams const &) const;

diff --git a/src/output_docbook.C b/src/output_docbook.C
index d31597edd2f01d1b3e8c2009c788ac9ff336a082..f398c8b76fa0bfc02e2ee70bf41b7b83a4b970a0 100644 (file)
--- a/src/output_docbook.C
+++ b/src/output_docbook.C
@@ -105,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, runparams, *par);
                        par->simpleDocBookOnePar(buf, os, runparams, outerFont(par - paragraphs.begin(), paragraphs));
                        sgml::closeTag(os, *par);
-                       os << '\n';
                }
        }
        return pend;