From fe1306ac6518d62060e55ea961321b702d4ff470 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Matox?= <jamatos@lyx.org>
Date: Wed, 24 Oct 2001 13:08:52 +0000
Subject: [PATCH] Docbook supported version is now 4.1 (only 3 lines changed
 for that). Removed unused function.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2932 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ChangeLog                |  5 +++++
 lib/layouts/db_lyxmacros.inc |  2 +-
 lib/layouts/db_stdtitle.inc  |  2 +-
 src/ChangeLog                |  6 ++++++
 src/buffer.C                 | 28 +---------------------------
 src/buffer.h                 |  4 ----
 6 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0f903b23d6..8930dc83bd 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-24  José Matos  <jamatos@fep.up.pt>
+
+	* layouts/db_lyxmacros.inc:
+	* layouts/db_stdtitle.inc: moved docbook supported version to v4.1.
+	
 2001-10-24  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* examples/it_splash.lyx: update from Claudio Coco
diff --git a/lib/layouts/db_lyxmacros.inc b/lib/layouts/db_lyxmacros.inc
index a4d19f50d4..ef3cc0811d 100644
--- a/lib/layouts/db_lyxmacros.inc
+++ b/lib/layouts/db_lyxmacros.inc
@@ -19,7 +19,7 @@ End
 # Comment style definition
 Style Comment
   LatexType		Paragraph
-  LatexName		comment
+  LatexName		remark
 End
 
 Style LyX-Code
diff --git a/lib/layouts/db_stdtitle.inc b/lib/layouts/db_stdtitle.inc
index bc2133491d..4c2d9bdc16 100644
--- a/lib/layouts/db_stdtitle.inc
+++ b/lib/layouts/db_stdtitle.inc
@@ -10,7 +10,7 @@ Input stdtitle.inc
 # Title style definition
 Style Title
   LatexType		Command
-  LatexName		artheader
+  LatexName		articleinfo
   LatexParam		"2|"
 End
 
diff --git a/src/ChangeLog b/src/ChangeLog
index e92ab5b0d6..310fad902f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-24  José Matos  <jamatos@fep.up.pt>
+
+	* buffer.h (docbookHandleCaption):
+	* buffer.C (docbookHandleCaption): removed unused function.
+	(makeDocBookFile): moved docbook supported version to v4.1.
+
 2001-10-24  José Matos  <jamatos@fep.up.pt>
 
 	* tabular.h:
diff --git a/src/buffer.C b/src/buffer.C
index fca885ff86..114cb02e32 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2720,30 +2720,6 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
 }
 
 
-void Buffer::docbookHandleCaption(ostream & os, string & inner_tag,
-				  Paragraph::depth_type depth, int desc_on,
-				  Paragraph * & par)
-{
-	Paragraph * tpar = par;
-	while (tpar
-	       && (tpar->layout != textclasslist.NumberOfLayout(params.textclass,
-								"Caption").second))
-		tpar = tpar->next();
-
-	if (tpar &&
-	    tpar->layout == textclasslist.NumberOfLayout(params.textclass,
-							 "Caption").second) {
-		sgmlOpenTag(os, depth + 1, inner_tag);
-		string extra_par;
-		simpleDocBookOnePar(os, extra_par, tpar,
-				    desc_on, depth + 2);
-		sgmlCloseTag(os, depth+1, inner_tag);
-		if (!extra_par.empty())
-			os << extra_par;
-	}
-}
-
-
 // checks, if newcol chars should be put into this line
 // writes newline, if necessary.
 namespace {
@@ -2799,8 +2775,6 @@ void reset(PAR_TAG & p1, PAR_TAG const & p2)
 } // namespace anon
 
 
-
-
 // Handle internal paragraph parsing -- layout already processed.
 void Buffer::simpleLinuxDocOnePar(ostream & os,
 				  Paragraph * par, 
@@ -3028,7 +3002,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 
 	if (!only_body) {
 		ofs << "<!DOCTYPE " << top_element
-		    << "  PUBLIC \"-//OASIS//DTD DocBook V3.1//EN\"";
+		    << "  PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
 
 		string preamble = params.preamble;
 		preamble += features.getIncludedFiles(fname);
diff --git a/src/buffer.h b/src/buffer.h
index 5460dec970..a5acfada54 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -327,10 +327,6 @@ public:
 	/// Used when typesetting to place errorboxes.
 	TexRow texrow;
 private:
-        ///
-	void docbookHandleCaption(std::ostream & os, string & inner_tag,
-				  Paragraph::depth_type depth, int desc_on,
-				  Paragraph * & par);
 	/// Open SGML/XML tag.
         void sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth,
 			 string const & latexname) const;
-- 
2.39.2