From 9ef3f928a5f0de6e36619f59ad25c0a74f65e898 Mon Sep 17 00:00:00 2001
From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Thu, 27 Nov 2003 16:52:07 +0000
Subject: [PATCH] parametrize SGML document header

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8142 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ChangeLog                |  5 +++++
 lib/layouts/agu_stdclass.inc |  3 +++
 lib/layouts/db_stdclass.inc  |  3 +++
 lib/layouts/linuxdoc.layout  |  5 +++++
 src/ChangeLog                | 10 ++++++++++
 src/buffer.C                 |  7 +++----
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index be33917e45..4212724622 100644
--- 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 d703636ffa..425cd8c5bd 100644
--- 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 845207050e..bb62a2fc06 100644
--- 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 3e780fc2bd..adb3bdca63 100644
--- 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 f804ed83aa..9fcd6b6435 100644
--- 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 ce10f73543..528249af2f 100644
--- 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();