updated catalogs

diff --git a/slides/catalog b/slides/catalog
new file mode 100644 (file)
index 0000000..5331cb5
--- /dev/null
+++ b/slides/catalog
@@ -0,0 +1,57 @@
+--  SGML Catalog file for DocBook Slides --
+OVERRIDE YES
+
+PUBLIC "-//Norman Walsh//DTD Slides V3.4//EN" "schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.4/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides Full V3.4//EN" "schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.4/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
+SYSTEM "http://docbook.sourceforge.net/release/slides/current/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
+
+-- the following are for older versions of the Slides DTD; the DTD is --
+-- backward compatible, so we just remap the older URIs to the local URI --
+-- of the current version; otherwise, users would need to manually change --
+-- the URIs in all their existing Slides document instances --
+
+PUBLIC "-//Norman Walsh//DTD Slides V3.3.1//EN" "schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.3.1/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides Full V3.3.1//EN" "schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.3.1/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides V3.3.0//EN" "schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.3.0/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides Full V3.3.0//EN" "schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.3.0/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides V3.1.0//EN" "schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.1.0/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides Full V3.1.0//EN" "schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.1.0/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides V3.0//EN" "schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.0/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides Full V3.0//EN" "schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.0/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides V3.0b1//EN" "schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.0b1/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides Full V3.0b1//EN" "schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/3.0b1/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides V/2.1/EN" "schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/2.1/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides Full V2.1//EN" "schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/2.1/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides V2.1b1//EN" "schema/dtd/slides.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/2.1b1/schema/slides.dtd" "schema/dtd/slides.dtd"/>
+
+PUBLIC "-//Norman Walsh//DTD Slides Full V2.1b1//EN" "schema/dtd/slides-full.dtd"
+SYSTEM "http://docbook.sourceforge.net/release/slides/2.1b1/schema/slides-full.dtd" "schema/dtd/slides-full.dtd"/>

diff --git a/slides/catalog.xml b/slides/catalog.xml
index 17567d209df562d90eb04ee4f44d483c593bab95..5cc4214cf55cd6d42365eb8d4cc81b4e8078297b 100644 (file)
--- a/slides/catalog.xml
+++ b/slides/catalog.xml
@@ -1,165 +1,38 @@
 <?xml version="1.0"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
-<!--  XML Catalog file for Slides. If you are already using
-      an XML catalog, you can just include this one by adding
-      an entry like this to your XML catalog file, editing the
-      path to match the location of your Slides installation:
-
-    <nextCatalog catalog="/usr/share/xml/slides-3.3.0/catalog.xml" />
--->
-
-<!-- Slides DTD locations -->
-
-<group xml:base="schema/dtd/"
-       id="slides-dtd"
-       prefer="public">
-
-  <public
-    publicId="-//Norman Walsh//DTD Slides V3.3.0//EN"
-    uri="slides.dtd"/>
-    <!-- this could be the slides-custom.dtd instead -->
-
-  <public
-    publicId="-//Norman Walsh//DTD Slides Custom V3.3.0//EN"
-    uri="slides-custom.dtd"/>
-
-  <public
-    publicId="-//Norman Walsh//DTD slides Full V3.3.0//EN"
-    uri="slides-full.dtd"/>
-</group>
-
-<!-- Slides RelaxNG locations -->
-
-<group xml:base="schema/rng/"
-       id="slides-relaxng"
-       prefer="public">
-
-  <uri
-      name="slides.rng"
-      uri="slides.rng"/>
-
-  <uri
-      name="full/slides-full.rng"
-      uri="full/slides-full.rng"/>
-</group>
-
-<!-- Slides XSL locations -->
-
-<group xml:base="xsl/"
-       id="slides-xsl">
-
-    <uri
-      name="fo/plain.xsl"
-      uri="fo/plain.xsl"/>
-
-    <uri
-      name="fo/plain-titlepage.xsl"
-      uri="fo/plain-titlepage.xsl"/>
-
-    <uri
-      name="html/param.xsl"
-      uri="html/param.xsl"/>
-
-    <uri
-      name="html/default.xsl"
-      uri="html/default.xsl"/>
-
-    <uri
-      name="html/frames.xsl"
-      uri="html/frames.xsl"/>
-
-    <uri
-      name="html/graphics.xsl"
-      uri="html/graphics.xsl"/>
-
-    <uri
-      name="html/jscript.xsl"
-      uri="html/jscript.xsl"/>
-
-    <uri
-      name="html/plain.xsl"
-      uri="html/plain.xsl"/>
-
-    <uri
-      name="html/slides-common.xsl"
-      uri="html/slides-common.xsl"/>
-
-    <uri
-      name="html/tables.xsl"
-      uri="html/tables.xsl"/>
-
-    <uri
-      name="html/vslides.xsl"
-      uri="html/vslides.xsl"/>
-
-    <uri
-      name="html/w3c.xsl"
-      uri="html/w3c.xsl"/>
-
-    <uri
-      name="xhtml/html2xhtml.xsl"
-      uri="xhtml/html2xhtml.xsl"/>
-
-    <uri
-      name="xhtml/default.xsl"
-      uri="xhtml/default.xsl"/>
-
-    <uri
-      name="xhtml/frames.xsl"
-      uri="xhtml/frames.xsl"/>
-
-    <uri
-      name="xhtml/graphics.xsl"
-      uri="xhtml/graphics.xsl"/>
-
-    <uri
-      name="xhtml/jscript.xsl"
-      uri="xhtml/jscript.xsl"/>
-
-    <uri
-      name="xhtml/param.xsl"
-      uri="xhtml/param.xsl"/>
-
-    <uri
-      name="xhtml/plain.xsl"
-      uri="xhtml/plain.xsl"/>
-
-    <uri
-      name="xhtml/slides-common.xsl"
-      uri="xhtml/slides-common.xsl"/>
-
-    <uri
-      name="xhtml/tables.xsl"
-      uri="xhtml/tables.xsl"/>
-
-    <uri
-      name="xhtml/vslides.xsl"
-      uri="xhtml/vslides.xsl"/>
-
-    <uri
-      name="xhtml/w3c.xsl"
-      uri="xhtml/w3c.xsl"/>
-</group>
-
-<!-- You can also put entries like these into your
-     main catalog.xml file to map web URLs to local
-     paths to avoid pulling docbook files over the web.
-     Change the '/usr/share/xml' path to match the
-     location on your local system.
--->
-
-<!-- Map web references to DocBook XSL -->
-<!--
-  <rewriteURI
-    uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
-    rewritePrefix="/usr/share/xml/docbook-xsl-1.59.1/"/>
--->
-
-<!-- Map web references to DocBook 4.2 DTD -->
-<!--
-   <nextCatalog catalog="/usr/share/xml/docbook42/catalog.xml" />
-
--->
+<!--  XML Catalog file for DocBook Website -->
+
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/current/schema/"
+            rewritePrefix="schema/"/>
+
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.4/schema/"
+            rewritePrefix="schema/"/>
+
+<rewriteURI uriStartString="http://docbook.sourceforge.net/release/slides/current/xsl/"
+            rewritePrefix="xsl/"/>
+
+<rewriteURI uriStartString="http://docbook.sourceforge.net/release/slides/3.4.0/xsl/"
+            rewritePrefix="xsl/"/>
+
+<!-- the following are for older versions of Website DTD; the DTD is -->
+<!-- backward compatible, so we just remap the older URIs to the local URI -->
+<!-- of the current version; otherwise, users would need to manually change -->
+<!-- the URIs in all their existing Website document instances -->
+
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.3.1/schema/"
+            rewritePrefix="schema/"/>
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.3.0/schema/"
+            rewritePrefix="schema/"/>
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.1.0/schema/"
+            rewritePrefix="schema/"/>
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.0/"
+            rewritePrefix="schema/"/>
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/3.0b1/"
+            rewritePrefix="schema/"/>
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/2.1/"
+            rewritePrefix="schema/"/>
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/slides/2.1b1/"
+            rewritePrefix="schema/"/>
 
 </catalog>