Prep for the V3.3.0 release based on 4.3CR1

diff --git a/slides/schema/dtd/Makefile b/slides/schema/dtd/Makefile
index ad67f5d9268244e1974c42cb935ce86c8c8bec43..9c6670cbc4bde3154e213e340e64e95a427d9d7e 100644 (file)
--- a/slides/schema/dtd/Makefile
+++ b/slides/schema/dtd/Makefile
@@ -1,6 +1,25 @@
 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
+
+clean:
+       rm -rf slides slides.xml
+

diff --git a/slides/schema/dtd/slides-custom.dtd b/slides/schema/dtd/slides-custom.dtd
index 2b74dfbff9cbf59e5d5787de728358aeb96354d9..4765edc685988a450dba0bd84df40e97bbe9b1cd 100644 (file)
--- a/slides/schema/dtd/slides-custom.dtd
+++ b/slides/schema/dtd/slides-custom.dtd
@@ -1,5 +1,5 @@
 <!-- ====================================================================== -->
-<!-- Slides XML V3.1.0 DTD
+<!-- Slides XML V3.3.0 DTD
      Copyright (C) 1999, 2000, 2001, 2002, 2003 Norman Walsh
      http://sourceforge.net/projects/docbook/
 
@@ -12,8 +12,8 @@
 
      <?xml version='1.0'?>
      <!DOCTYPE slides
-       PUBLIC "-//Norman Walsh//DTD Slides XML V3.1.0//EN"
-       "http://docbook.sourceforge.net/release/slides/3.1.0/schema/dtd/slides.dtd">
+       PUBLIC "-//Norman Walsh//DTD Slides XML V3.3.0//EN"
+       "http://docbook.sourceforge.net/release/slides/3.3.0/schema/dtd/slides.dtd">
                                                                             -->
 <!-- ====================================================================== -->
 
@@ -71,8 +71,8 @@
 <!ENTITY % local.component.mix "|speakernotes">
 
 <!ENTITY % sdocbook.dtd 
-      PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN"
-      "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd">
+      PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1CR1//EN"
+      "http://docbook.org/xml/simple/1.1CR1/sdocbook-custom.dtd">
 %sdocbook.dtd;
 
 <!-- ====================================================================== -->
@@ -104,8 +104,10 @@
 
 <!-- ====================================================================== -->
 
+<!ENTITY % only-in-full-nav-class "">
+
 <!ENTITY % slides.mod SYSTEM "slides.mod">
 %slides.mod;
 
-<!-- End of Slides XML V3.1.0 DTD ......................................... -->
+<!-- End of Slides XML V3.3.0 DTD ......................................... -->
 <!-- ...................................................................... -->

diff --git a/slides/schema/dtd/slides-full.dtd b/slides/schema/dtd/slides-full.dtd
index baa2fd62ca58ec128f9e2b32b56201ec3166c9dc..794f59f6068c0239133f440aed58f6dc67c66712 100644 (file)
--- a/slides/schema/dtd/slides-full.dtd
+++ b/slides/schema/dtd/slides-full.dtd
@@ -1,5 +1,5 @@
 <!-- ====================================================================== -->
-<!-- Slides Full XML V3.1.0 DTD
+<!-- Slides Full XML V3.3.0 DTD
      Copyright (C) 1999, 2000, 2001, 2002, 2003 Norman Walsh
      http://sourceforge.net/projects/docbook/
 
@@ -15,8 +15,8 @@
 
      <?xml version='1.0'?>
      <!DOCTYPE slides
-       PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.1.0//EN"
-       "http://docbook.sourceforge.net/release/slides/3.1.0/schema/dtd/slides-full.dtd">
+       PUBLIC "-//Norman Walsh//DTD Slides Full XML V3.3.0//EN"
+       "http://docbook.sourceforge.net/release/slides/3.3.0/schema/dtd/slides-full.dtd">
                                                                             -->
 <!-- ====================================================================== -->
 
@@ -24,12 +24,12 @@
 <!ENTITY % local.component.mix "|speakernotes">
 
 <!-- In this version, we use full DocBook -->
-<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.3CR1//EN"
+  "http://docbook.org/xml/4.3CR1/docbookx.dtd">
 %docbook.dtd;
 
 <!ENTITY % slides.mod SYSTEM "slides.mod">
 %slides.mod;
 
-<!-- End of Slides Full XML V3.1.0 DTD .................................... -->
+<!-- End of Slides Full XML V3.3.0 DTD .................................... -->
 <!-- ...................................................................... -->

diff --git a/slides/schema/dtd/slides.mod b/slides/schema/dtd/slides.mod
index 787e93b49e863b4fab2d18bee3e57d360eb8cb26..204dfeb8fd4c7094f8d35798123b96517c93594c 100644 (file)
--- a/slides/schema/dtd/slides.mod
+++ b/slides/schema/dtd/slides.mod
@@ -1,5 +1,5 @@
 <!-- ====================================================================== -->
-<!-- Slides Module V3.1.0
+<!-- Slides Module V3.3.0
      Copyright (C) 1999, 2000, 2001, 2002, 2003 Norman Walsh
      http://sourceforge.net/projects/docbook/
 
@@ -10,6 +10,8 @@
                                                                             -->
 <!-- ====================================================================== -->
 
+<!ENTITY % only-in-full-nav-class "|%nav.class;">
+
 <!ELEMENT slides (slidesinfo, speakernotes?, foil*, foilgroup*)>
 
 <!ATTLIST slides
@@ -30,7 +32,7 @@
 >
 
 <!ELEMENT foilgroup (foilgroupinfo?, title, subtitle?, titleabbrev?,
-                   (%divcomponent.mix;)*,
+                   (%divcomponent.mix;%only-in-full-nav.class;)*,
                    foil+)>
 <!ATTLIST foilgroup
                %label.attrib;
@@ -50,7 +52,7 @@
 >
 
 <!ELEMENT foil (foilinfo?, title, subtitle?, titleabbrev?,
-                (%divcomponent.mix;)+)>
+                (%divcomponent.mix;%only-in-full-nav.class;)+)>
 
 <!ATTLIST foil
                %label.attrib;
@@ -75,5 +77,5 @@
                %role.attrib;
 >
 
-<!-- End of Slides Module V3.1.0 .......................................... -->
+<!-- End of Slides Module V3.3.0 .......................................... -->
 <!-- ...................................................................... -->