0.8.6.24:

	* doc/*: Revert to Docbook 4.1 DOCTYPE for compatibility with
	older systems such as Debian Woody. Add catalog for Darwin's
	fink and for partially for Redhat.

 	Need to add OS detection for fink in Makefile and stylesheet
	location for RedHat in catalog-redhat.xml

diff --git a/doc/beyond-ansi.xml b/doc/beyond-ansi.xml
index cf6098a..c05dcee 100644 (file)
--- a/doc/beyond-ansi.xml
+++ b/doc/beyond-ansi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+"http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.inc">
 %myents;
 ]>

diff --git a/doc/catalog-debian.xml b/doc/catalog-debian.xml
index 86e7032..d940a02 100644 (file)
--- a/doc/catalog-debian.xml
+++ b/doc/catalog-debian.xml
@@ -10,22 +10,22 @@
 
     <!-- Resolve DTD URL system ID to local file -->
     <rewriteSystem
-        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/"
-        rewritePrefix="dtd/xml/4.2/" />
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="dtd/xml/4.1/" />
     <!-- Resolve stylesheet URL to local file -->
     <rewriteURI
         uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
         rewritePrefix="stylesheet/xsl/nwalsh/" />
 
     <!-- Resolve DTD PUBLIC identifiers -->
-    <nextCatalog  catalog="dtd/xml/4.2/catalog.xml" />
+    <nextCatalog  catalog="dtd/xml/4.1/catalog.xml" />
 
     <!-- To resolve simple DTD SYSTEM identifiers. -->
     <!-- Note: this does not work with Java resolver -->
     <!--   classes in Saxon or Xalan -->
     <system
          systemId="docbook.dtd"
-         uri="dtd/xml/4.2/xml/docbookx.dtd" />
+         uri="dtd/xml/4.1/xml/docbookx.dtd" />
 
     <!-- To resolve short stylesheet references -->
     <uri

diff --git a/doc/catalog-fink.xml b/doc/catalog-fink.xml
new file mode 100644 (file)
index 0000000..666557f
--- /dev/null
+++ b/doc/catalog-fink.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///sw/share/xml/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="dtd/docbookx/4.1/" />
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="xsl/docbook-xsl/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="dtd/docbookx/catalog" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="dtd/docbookx/4.1/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="xsl/docbok-xsl/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="xsl/docbook-xsl/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="xsl/docbook-xsl/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/doc/catalog-redhat.xml b/doc/catalog-redhat.xml
new file mode 100644 (file)
index 0000000..c056845
--- /dev/null
+++ b/doc/catalog-redhat.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE catalog
+   PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+   "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  <!-- The directory DTD and stylesheet files are installed under -->
+  <group  xml:base="file:///usr/share/sgml/docbook/" >
+
+    <!-- Resolve DTD URL system ID to local file -->
+    <rewriteSystem
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="xml-dtd-4.1/" />
+
+    <!-- FIXME: Need to verify the location of the XSL files on RedHat -->
+    <!-- Resolve stylesheet URL to local file -->
+    <rewriteURI
+        uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+        rewritePrefix="stylesheet/xsl/nwalsh/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="dtd/xml/4.1/catalog.xml" />
+
+    <!-- To resolve simple DTD SYSTEM identifiers. -->
+    <!-- Note: this does not work with Java resolver -->
+    <!--   classes in Saxon or Xalan -->
+    <system
+         systemId="docbook.dtd"
+         uri="xml-dtd-4.1/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="stylesheet/xsl/nwalsh/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="stylesheet/xsl/nwalsh/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="stylesheet/xsl/nwalsh/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/doc/catalog-suse.xml b/doc/catalog-suse.xml
index 7520e88..b6ef3c2 100644 (file)
--- a/doc/catalog-suse.xml
+++ b/doc/catalog-suse.xml
@@ -10,22 +10,22 @@
 
     <!-- Resolve DTD URL system ID to local file -->
     <rewriteSystem
-        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/"
-        rewritePrefix="db42xml/" />
+        systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/"
+        rewritePrefix="db41xml/" />
     <!-- Resolve stylesheet URL to local file -->
     <rewriteURI
         uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
         rewritePrefix="docbook/docbook-xsl/" />
 
     <!-- Resolve DTD PUBLIC identifiers -->
-    <nextCatalog  catalog="db42xml/catalog.xml" />
+    <nextCatalog  catalog="db41xml/catalog.xml" />
 
     <!-- To resolve simple DTD SYSTEM identifiers. -->
     <!-- Note: this does not work with Java resolver -->
     <!--   classes in Saxon or Xalan -->
     <system
          systemId="docbook.dtd"
-         uri="db42xml/docbookx.dtd" />
+         uri="db41xml/docbookx.dtd" />
 
     <!-- To resolve short stylesheet references -->
     <uri

diff --git a/doc/compiler.xml b/doc/compiler.xml
index e0fde82..cac86ea 100644 (file)
--- a/doc/compiler.xml
+++ b/doc/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.inc">
 %myents;
 ]>

diff --git a/doc/efficiency.xml b/doc/efficiency.xml
index d495489..097de86 100644 (file)
--- a/doc/efficiency.xml
+++ b/doc/efficiency.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.inc">
 %myents;
 ]>

diff --git a/doc/ffi.xml b/doc/ffi.xml
index 2efc11c..a111930 100644 (file)
--- a/doc/ffi.xml
+++ b/doc/ffi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+"http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.inc">
 %myents;
 ]>

diff --git a/doc/intro.xml b/doc/intro.xml
index 79daa99..5cb56ae 100644 (file)
--- a/doc/intro.xml
+++ b/doc/intro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+"http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.inc">
 %myents;
 ]>

diff --git a/doc/user-manual.xml b/doc/user-manual.xml
index 59d2ee2..fdba331 100644 (file)
--- a/doc/user-manual.xml
+++ b/doc/user-manual.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+"http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.inc">
 %myents;
 ]>

diff --git a/version.lisp-expr b/version.lisp-expr
index 5da45c8..29693c7 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.6.23"
+"0.8.6.24"