parametrize SGML document header

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index be33917e45d695c4a6e9972394e81c93441332df..4212724622d345c78cdb8253f0ad729124791f69 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-27  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * layouts/db_stdclass.inc:
+       * layouts/agu_stdclass.inc:
+       * layouts/linuxdoc.layout: parametrize SGML document header
 
 2003-11-25  Martin Vermeer  <martin.vermeer@hut.fi>
 

diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc
index d703636ffa67f76b8b611826c0fb964e50ece844..425cd8c5bd9aec8828653acaea7d995775be377d 100644 (file)
--- a/lib/layouts/agu_stdclass.inc
+++ b/lib/layouts/agu_stdclass.inc
@@ -14,6 +14,9 @@ SecNumDepth             3
 TocDepth                3
 DefaultStyle            Standard
 
+ClassOptions
+       Header              "<!DOCTYPE # PUBLIC &quot;-//AGU//DTD article American Geophysical Union DTD version 3.42//EN&quot; &quot;AGU-Article-3.42.dtd&quot; "
+End
 
 Style Standard
        Margin                Static

diff --git a/lib/layouts/db_stdclass.inc b/lib/layouts/db_stdclass.inc
index 845207050ead8bf4afd5f85b3bec4fd621c0123f..bb62a2fc06eba19c88448f35221da8048f169fa9 100644 (file)
--- a/lib/layouts/db_stdclass.inc
+++ b/lib/layouts/db_stdclass.inc
@@ -13,6 +13,9 @@ SecNumDepth             3
 TocDepth                3
 DefaultStyle            Standard
 
+ClassOptions
+       Header             "<!DOCTYPE #  PUBLIC &quot;-//OASIS//DTD DocBook V4.1//EN&quot;"
+End
 
 Style Standard
        Margin                Static

diff --git a/lib/layouts/linuxdoc.layout b/lib/layouts/linuxdoc.layout
index 3e780fc2bdf937c14e0adf8f5611b86b90545169..adb3bdca636d93ccd659e339e1f846d52da1372f 100644 (file)
--- a/lib/layouts/linuxdoc.layout
+++ b/lib/layouts/linuxdoc.layout
@@ -10,6 +10,11 @@ PageStyle               Plain
 OutputType              linuxdoc
 DefaultStyle            Standard
 
+ClassOptions
+    Header              "<!doctype linuxdoc system"
+End
+
+
 Input stdcounters.inc
 Input stdfloats.inc
 Input numarticle.inc

diff --git a/src/ChangeLog b/src/ChangeLog
index f804ed83aa3347e3b9e00d28eaa60ef86cff27c4..9fcd6b6435d0615d7674901054a59d89bf0ee81d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,14 @@
 
+2003-11-27  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * buffer.C: parametrize SGML document header
+
+2003-11-27  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * converter.[Ch]:
+       * exporter.C: replace bool-valued Pdflatex() by FLAVOR-valued
+       getFlavor().
+
 2003-11-27  Alfredo Braunstein  <abraunst@lyx.org>
 
        * text2.C (setFont): rework using PosIterator (no more recursive)

diff --git a/src/buffer.C b/src/buffer.C
index ce10f735432be8abe1ecbaf78612e02074510c01..528249af2f2e221928251f824e5f6f2b8a955a17 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1059,7 +1059,7 @@ void Buffer::makeLinuxDocFile(string const & fname,
        string top_element = tclass.latexname();
 
        if (!body_only) {
-               ofs << "<!doctype linuxdoc system";
+               ofs << tclass.class_header();
 
                string preamble = params().preamble;
                string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
@@ -1120,8 +1120,7 @@ void Buffer::makeDocBookFile(string const & fname,
        string top_element = tclass.latexname();
 
        if (!only_body) {
-               ofs << "<!DOCTYPE " << top_element
-                   << "  PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
+               ofs << subst(tclass.class_header(), "#", top_element);
 
                string preamble = params().preamble;
                string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
@@ -1146,7 +1145,7 @@ void Buffer::makeDocBookFile(string const & fname,
        }
        sgml::openTag(ofs, 0, false, top);
 
-       ofs << "<!-- DocBook file was created by LyX " << lyx_version
+       ofs << "<!-- SGML/XML file was created by LyX " << lyx_version
            << "\n  See http://www.lyx.org/ for more information -->\n";
 
        params().getLyXTextClass().counters().reset();