0.8.6.26:

	* doc/Makefile: Add OS detection of redhat9
	* doc/catalog-redhat9.xml: Unfortunately, RedHat adds local
	version numbers to their DTD pathnames, so every version of RedHat
	will likely need different catalogs.

diff --git a/doc/Makefile b/doc/Makefile
index 41a4320..a73e2f7 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -19,8 +19,8 @@ ifeq ($(SYSTEM),Linux)
     ifneq ($(shell expr "`cat /etc/issue`" : '.*SuSE.*'),0)
       OS=suse
     else   
-      ifneq ($(shell expr "`cat /etc/issue`" : '.*RedHat.*'),0)
-        OS=redhat
+      ifneq ($(shell expr "`cat /etc/issue`" : 'Red Hat Linux release 9'),0)
+        OS=redhat9
       endif
     endif
   endif

diff --git a/doc/catalog-redhat.xml b/doc/catalog-redhat.xml
deleted file mode 100644 (file)
index c056845..0000000
--- a/doc/catalog-redhat.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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-redhat9.xml b/doc/catalog-redhat9.xml
new file mode 100644 (file)
index 0000000..9e1152d
--- /dev/null
+++ b/doc/catalog-redhat9.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.2-1.0-17/" />
+
+    <!-- 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="xsl-stylesheets/" />
+
+    <!-- Resolve DTD PUBLIC identifiers -->
+    <nextCatalog  catalog="xmlcatalog" />
+
+    <!-- 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.2-1.0-17/docbookx.dtd" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook_html.xsl"
+        uri="xsl-stylesheets/xhtml/docbook.xsl" />
+    <uri 
+        name="docbook_chunk.xsl"
+        uri="xsl-stylesheets/xhtml/chunk.xsl" />
+    <uri
+        name="docbook_fo.xsl"
+        uri="xsl-stylesheets/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/version.lisp-expr b/version.lisp-expr
index 109bd8f..a6841e7 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.25"
+"0.8.6.26"