Updated

diff --git a/slides/Makefile b/slides/Makefile
index 0bb4e57f2325ebaa54310025d978ff2b4bf5a1f9..aa1150b901a7a9a4c3e66e494d8a9fd1ecc8299e 100644 (file)
--- 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 (file)
index 0000000..9573561
--- /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 6a697c79206864084cc707823fe6f08078bf6304..69234f82997017a8004ba805ec096aeb325c3982 100644 (file)
--- 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 cc11b8442d7f7a8cf6be215dfe03a6fce145bacd..d7e83acd39cb3c956acc3ed6a14476b123fe2b4d 100644 (file)
--- 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 118fe96937c186006bc07a797fb6539b1851604f..e57eee6990613bff84507054ab6087943ac0f9da 100644 (file)
--- 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 24823d9bfa933054996e0df706d21a821e8b1f3f..3b168a1af9f245d36a2bb5c5a6e854e8a1fc68e9 100644 (file)
--- 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 77f563a8aab6dc250cfb59ae9bcd9de9a4e1609c..0b14f3dab64c487a3685f55d41ba13b12604ab71 100644 (file)
--- 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 1c5276a5cd47e31f0627ec56fd477315890b47f0..cb806ddc66d4be47ce0a9e4122df700f3e25c79f 100644 (file)
--- 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"?>