From 50227f837fd1d0b8966ce3355ce861e758c229da Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Fri, 22 Apr 2005 15:48:16 +0000
Subject: [PATCH] use Simplified 1.1 and DocBook 4.4

---
 slides/schema/dtd/Makefile          | 32 ++---------------------------
 slides/schema/dtd/slides-custom.dtd |  4 ++--
 slides/schema/dtd/slides-full.dtd   |  4 ++--
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/slides/schema/dtd/Makefile b/slides/schema/dtd/Makefile
index 32f79bf6a..0a0efc839 100644
--- a/slides/schema/dtd/Makefile
+++ b/slides/schema/dtd/Makefile
@@ -1,39 +1,11 @@
 include ../../../cvstools/Makefile.incl
 
-VERSION=
-
 all: slides.dtd
 
 slides.dtd: slides-custom.dtd slides.mod
 	$(FLATTEN) $< > $@
 
-doc: slides.dtd
-ifeq ($(VERSION),)
-	@echo You must specify the VERSION
-else
-	dtdparse --title "Slides XML V$(VERSION) DTD" \
-                 --output slides.xml \
-                 --decl /usr/lib/sgml/declaration/xml.dcl \
-                 --public "-//Norman Walsh//DTD Slides XML V$(VERSION)//EN" \
-                 --system "http://docbook.sourceforge.net/release/slides/$(VERSION)/schema/dtd/slides.dtd" \
-                 --nounexpanded slides.dtd
-	dtdformat --html --noentities --nonotations slides.xml
-endif
-
-doc-full: slides-full.dtd
-ifeq ($(VERSION),)
-	@echo You must specify the VERSION
-else
-	dtdparse --title "Slides Full XML V$(VERSION) DTD" \
-                 --output slides-full.xml \
-                 --decl /usr/lib/sgml/declaration/xml.dcl \
-                 --public "-//Norman Walsh//DTD Slides Full XML V$(VERSION)//EN" \
-                 --system "http://docbook.sourceforge.net/release/slides/$(VERSION)/schema/dtd/slides-full.dtd" \
-                 --catalog /sourceforge/docbook/catalog \
-                 --nounexpanded slides-full.dtd
-	dtdformat --html --noentities --nonotations slides-full.xml
-endif
-
 clean:
-	rm -rf slides slides.xml
 
+realclean: clean
+	rm -f slides.dtd
diff --git a/slides/schema/dtd/slides-custom.dtd b/slides/schema/dtd/slides-custom.dtd
index fdcaff687..460e1ec70 100644
--- a/slides/schema/dtd/slides-custom.dtd
+++ b/slides/schema/dtd/slides-custom.dtd
@@ -72,8 +72,8 @@
 <!ENTITY % local.component.mix "|speakernotes">
 
 <!ENTITY % sdocbook.dtd 
-      PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1b1//EN"
-      "http://docbook.org/xml/simple/1.1b1/sdocbook-custom.dtd">
+      PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN"
+      "http://docbook.org/xml/simple/1.1/sdocbook-custom.dtd">
 %sdocbook.dtd;
 
 <!-- ====================================================================== -->
diff --git a/slides/schema/dtd/slides-full.dtd b/slides/schema/dtd/slides-full.dtd
index 40e43fa56..8a38bee1f 100644
--- a/slides/schema/dtd/slides-full.dtd
+++ b/slides/schema/dtd/slides-full.dtd
@@ -24,8 +24,8 @@
 <!ENTITY % local.component.mix "|speakernotes">
 
 <!-- In this version, we use full DocBook -->
-<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.3CR2//EN"
-  "http://docbook.org/xml/4.3CR2/docbookx.dtd">
+<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://docbook.org/xml/4.4/docbookx.dtd">
 %docbook.dtd;
 
 <!ENTITY % slides.mod SYSTEM "slides.mod">
-- 
2.40.0