From ae7f581fe5cc21dbfa83191c434b4a24da49ead8 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Mon, 7 Jan 2002 14:35:26 +0000
Subject: [PATCH] Refactored so that slides-full could be implemented; based on
 Simplified DocBook V1.0b2

---
 slides/slides-custom.dtd | 82 ++++++----------------------------------
 slides/slides-full.dtd   | 35 +++++++++++++++++
 slides/slides.mod        | 78 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+), 71 deletions(-)
 create mode 100644 slides/slides-full.dtd
 create mode 100644 slides/slides.mod

diff --git a/slides/slides-custom.dtd b/slides/slides-custom.dtd
index fd376d3c2..95f5df69a 100644
--- a/slides/slides-custom.dtd
+++ b/slides/slides-custom.dtd
@@ -1,9 +1,9 @@
 <!-- ====================================================================== -->
-<!-- Slides XML V1.1 DTD
-     Copyright (C) 1999, 2000 Norman Walsh
-     http://nwalsh.com/docbook/slides
+<!-- Slides XML V2.0 DTD
+     Copyright (C) 1999, 2000, 2001, 2002 Norman Walsh
+     http://sourceforge.net/projects/docbook/
 
-     See COPYRIGHT for more information
+     $Id$
 
      Please direct all questions and comments about this DTD to
      Norman Walsh, <ndw@nwalsh.com>.
@@ -12,8 +12,8 @@
 
      <?xml version='1.0'?>
      <!DOCTYPE slides
-       PUBLIC "-//Norman Walsh//DTD Slides XML V1.1//EN"
-       "slides.dtd">
+       PUBLIC "-//Norman Walsh//DTD Slides XML V2.0//EN"
+       "http://docbook.sourceforge.net/release/slides/2.0/slides.dtd">
                                                                             -->
 <!-- ====================================================================== -->
 
@@ -65,7 +65,8 @@
 <!ENTITY % local.divcomponent.mix "|speakernotes">
 <!ENTITY % local.component.mix "|speakernotes">
 
-<!ENTITY % sdocbook.dtd SYSTEM "../docbook/simple/sdocbook-custom.dtd">
+<!ENTITY % sdocbook.dtd PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0b2//EN"
+      "http://www.oasis-open.org/docbook/xml/simple/1.0b2/sdocbook-custom.dtd">
 %sdocbook.dtd;
 
 <!-- ====================================================================== -->
@@ -97,69 +98,8 @@
 
 <!-- ====================================================================== -->
 
-<!ELEMENT slides (slidesinfo, speakernotes?, (foil+|section+))>
-<!ATTLIST slides
-		%label.attrib;
-		%status.attrib;
-		%common.attrib;
-		%role.attrib;
->
-
-<!ELEMENT slidesinfo ((mediaobject
-		       | legalnotice
-                       | subjectset | keywordset
-                       | %bibliocomponent.mix;)+)>
-
-<!ATTLIST slidesinfo
-		%common.attrib;
-		%role.attrib;
->
-
-<!ELEMENT section (sectioninfo?, title, subtitle?, titleabbrev?,
-                   speakernotes?,
-                   foil+)>
-<!ATTLIST section
-		%label.attrib;
-		%status.attrib;
-		%common.attrib;
-		%role.attrib;
->
-
-<!ELEMENT sectioninfo ((mediaobject
-		       | legalnotice
-                       | subjectset | keywordset
-                       | %bibliocomponent.mix;)+)>
-
-<!ATTLIST sectioninfo
-		%common.attrib;
-		%role.attrib;
->
-
-<!ELEMENT foil (foilinfo?, title, subtitle?, titleabbrev?,
-                (%divcomponent.mix;)+)>
-
-<!ATTLIST foil
-		%label.attrib;
-		%status.attrib;
-		%common.attrib;
-		%role.attrib;
->
-
-<!ELEMENT foilinfo ((mediaobject
-		         | legalnotice
-                         | subjectset | keywordset
-                         | %bibliocomponent.mix;)+)>
-
-<!ATTLIST foilinfo
-		%common.attrib;
-		%role.attrib;
->
-
-<!ELEMENT speakernotes (%divcomponent.mix;)*>
-<!ATTLIST speakernotes
-		%common.attrib;
-		%role.attrib;
->
+<!ENTITY % slides.mod SYSTEM "slides.mod">
+%slides.mod;
 
-<!-- End of Slides XML V1.1 DTD ........................................... -->
+<!-- End of Slides XML V2.0 DTD ........................................... -->
 <!-- ...................................................................... -->
diff --git a/slides/slides-full.dtd b/slides/slides-full.dtd
new file mode 100644
index 000000000..f04959bfb
--- /dev/null
+++ b/slides/slides-full.dtd
@@ -0,0 +1,35 @@
+<!-- ====================================================================== -->
+<!-- Slides Full XML V2.0 DTD
+     Copyright (C) 1999, 2000, 2001, 2002 Norman Walsh
+     http://sourceforge.net/projects/docbook/
+
+     This version of Slides is based on "full" DocBook rather than
+     the Simplified DocBook XML DTD.
+
+     $Id$
+
+     Please direct all questions and comments about this DTD to
+     Norman Walsh, <ndw@nwalsh.com>.
+
+     Common declaration:
+
+     <?xml version='1.0'?>
+     <!DOCTYPE slides
+       PUBLIC "-//Norman Walsh//DTD Slides Full XML V2.0//EN"
+       "http://docbook.sourceforge.net/release/slides/2.0/slides-full.dtd">
+                                                                            -->
+<!-- ====================================================================== -->
+
+<!ENTITY % section.element "IGNORE">
+<!ENTITY % section.attlist "IGNORE">
+
+<!ENTITY % sectioninfo.element "IGNORE">
+<!ENTITY % sectioninfo.attlist "IGNORE">
+
+<!-- In this version, we use full DocBook -->
+<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+%docbook.dtd;
+
+<!ENTITY % slides.mod SYSTEM "slides.mod">
+%slides.mod;
diff --git a/slides/slides.mod b/slides/slides.mod
new file mode 100644
index 000000000..17972b619
--- /dev/null
+++ b/slides/slides.mod
@@ -0,0 +1,78 @@
+<!-- ====================================================================== -->
+<!-- Slides Module V2.0
+     Copyright (C) 1999, 2000, 2001, 2002 Norman Walsh
+     http://sourceforge.net/projects/docbook/
+
+     $Id$
+
+     Please direct all questions and comments about this DTD to
+     Norman Walsh, <ndw@nwalsh.com>.
+                                                                            -->
+<!-- ====================================================================== -->
+
+<!ELEMENT slides (slidesinfo, speakernotes?, (foil+|section+))>
+<!ATTLIST slides
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%role.attrib;
+>
+
+<!ELEMENT slidesinfo ((mediaobject
+		       | legalnotice
+                       | subjectset | keywordset
+                       | %bibliocomponent.mix;)+)>
+
+<!ATTLIST slidesinfo
+		%common.attrib;
+		%role.attrib;
+>
+
+<!ELEMENT section (sectioninfo?, title, subtitle?, titleabbrev?,
+                   speakernotes?,
+                   foil+)>
+<!ATTLIST section
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%role.attrib;
+>
+
+<!ELEMENT sectioninfo ((mediaobject
+		       | legalnotice
+                       | subjectset | keywordset
+                       | %bibliocomponent.mix;)+)>
+
+<!ATTLIST sectioninfo
+		%common.attrib;
+		%role.attrib;
+>
+
+<!ELEMENT foil (foilinfo?, title, subtitle?, titleabbrev?,
+                (%divcomponent.mix;)+)>
+
+<!ATTLIST foil
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%role.attrib;
+>
+
+<!ELEMENT foilinfo ((mediaobject
+		         | legalnotice
+                         | subjectset | keywordset
+                         | %bibliocomponent.mix;)+)>
+
+<!ATTLIST foilinfo
+		%common.attrib;
+		%role.attrib;
+>
+
+<!ELEMENT speakernotes (%divcomponent.mix;)*>
+<!ATTLIST speakernotes
+		%common.attrib;
+		%role.attrib;
+>
+
+<!-- End of Slides Module V2.0 ............................................ -->
+<!-- ...................................................................... -->
-- 
2.50.1