From fd2f0647917e0911e2e8e3593db667a64b8e356d Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 23 Jan 2003 14:11:26 +0000
Subject: [PATCH] Updated

---
 slides/Makefile            | 6 ++----
 slides/tests/catalog.xml   | 4 ++++
 slides/tests/dbgentext.xml | 2 +-
 slides/tests/minimal.xml   | 4 ++--
 slides/tests/test-full.xml | 2 +-
 slides/tests/test.xml      | 2 +-
 slides/tests/testcust.xml  | 2 +-
 slides/tests/testfull.xml  | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 slides/tests/catalog.xml

diff --git a/slides/Makefile b/slides/Makefile
index 0bb4e57f2..aa1150b90 100644
--- a/slides/Makefile
+++ b/slides/Makefile
@@ -3,10 +3,8 @@ ZIPVER=
 DIFFVER=
 NEXTVER=
 
-all: slides.dtd
-
-slides.dtd: slides-custom.dtd slides.mod
-	$(FLATTEN) $< > $@
+all:
+	make -C schema
 
 check:
 	$(XJPARSE) tests/test.xml
diff --git a/slides/tests/catalog.xml b/slides/tests/catalog.xml
new file mode 100644
index 000000000..957356117
--- /dev/null
+++ b/slides/tests/catalog.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <nextCatalog catalog="../catalog.xml" />
+</catalog>
diff --git a/slides/tests/dbgentext.xml b/slides/tests/dbgentext.xml
index 6a697c792..69234f829 100644
--- a/slides/tests/dbgentext.xml
+++ b/slides/tests/dbgentext.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../slides.dtd">
+<!DOCTYPE slides SYSTEM "../schema/dtd/slides.dtd">
 <?dbhtml graphics-dir="../graphics" css-stylesheet-dir="../browser"?>
 <?dbhtml script-dir="../browser"?>
 <slides>
diff --git a/slides/tests/minimal.xml b/slides/tests/minimal.xml
index cc11b8442..d7e83acd3 100644
--- a/slides/tests/minimal.xml
+++ b/slides/tests/minimal.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides PUBLIC "-//Norman Walsh//DTD Slides XML V3.0b1//EN"
-                 "http://docbook.sourceforge.net/release/slides/3.0b1/slides.dtd">
+<!DOCTYPE slides PUBLIC "-//Norman Walsh//DTD Slides XML V3.1.0//EN"
+                 "http://docbook.sourceforge.net/release/slides/3.0.1/schema/dtd/slides.dtd">
 <slides>
 <slidesinfo>
 <title>Presentation Title</title>
diff --git a/slides/tests/test-full.xml b/slides/tests/test-full.xml
index 118fe9693..e57eee699 100644
--- a/slides/tests/test-full.xml
+++ b/slides/tests/test-full.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../slides-full.dtd">
+<!DOCTYPE slides SYSTEM "../schema/dtd/slides-full.dtd">
 <slides>
 <slidesinfo>
   <title>Test Slides Title</title>
diff --git a/slides/tests/test.xml b/slides/tests/test.xml
index 24823d9bf..3b168a1af 100644
--- a/slides/tests/test.xml
+++ b/slides/tests/test.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../slides.dtd">
+<!DOCTYPE slides SYSTEM "../schema/dtd/slides.dtd">
 <?dbhtml graphics-dir="../graphics"?>
 <?dbhtml css-stylesheet="../browser/slides.css"?>
 <?dbhtml script-dir="../browser"?>
diff --git a/slides/tests/testcust.xml b/slides/tests/testcust.xml
index 77f563a8a..0b14f3dab 100644
--- a/slides/tests/testcust.xml
+++ b/slides/tests/testcust.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../slides-custom.dtd">
+<!DOCTYPE slides SYSTEM "../schema/dtd/slides-custom.dtd">
 <?dbhtml graphics-dir="../graphics"?>
 <?dbhtml css-stylesheet="../browser/slides.css"?>
 <?dbhtml script-dir="../browser"?>
diff --git a/slides/tests/testfull.xml b/slides/tests/testfull.xml
index 1c5276a5c..cb806ddc6 100644
--- a/slides/tests/testfull.xml
+++ b/slides/tests/testfull.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../slides-full.dtd">
+<!DOCTYPE slides SYSTEM "../schema/dtd/slides-full.dtd">
 <?dbhtml graphics-dir="../graphics"?>
 <?dbhtml css-stylesheet="../browser/slides.css"?>
 <?dbhtml script-dir="../browser"?>
-- 
2.40.0