1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
|
Import schema files locally and correct DTD version
--- docbook-website-2.5.0.0.orig/catalog.xml
+++ docbook-website-2.5.0.0/catalog.xml
@@ -1,20 +1,20 @@
<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs 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">
-<!-- XML Catalog file for Website. 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 Website installation:
-
- <nextCatalog catalog="/usr/share/xml/website-2.4.0/catalog.xml" />
--->
-
<!-- Rewrite rules for the whole tree -->
-<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.4.1/schema/"
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/website/2.5.0/schema/"
+ rewritePrefix="schema/"/>
+
+<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.5.0/schema/"
rewritePrefix="schema/"/>
-<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.4.1/xsl/"
+<rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/website/2.5.0/xsl/"
+ rewritePrefix="xsl/"/>
+
+<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.5.0/xsl/"
rewritePrefix="xsl/"/>
<!-- Website DTD locations -->
@@ -24,44 +24,44 @@
prefer="public">
<public
- publicId="-//Norman Walsh//DTD Website V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website V2.5.0//EN"
uri="website.dtd"/>
<!-- this could be the website-custom.dtd instead -->
<public
- publicId="-//Norman Walsh//DTD Website Custom V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website Custom V2.5.0//EN"
uri="website-custom.dtd"/>
<public
- publicId="-//Norman Walsh//DTD Website Full V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website Full V2.5.0//EN"
uri="website-full.dtd"/>
<public
- publicId="-//Norman Walsh//DTD Website Autolayout V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website Autolayout V2.5.0//EN"
uri="autolayout.dtd"/>
<public
- publicId="-//Norman Walsh//DTD Website Layout V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website Layout V2.5.0//EN"
uri="layout.dtd"/>
<public
- publicId="-//Norman Walsh//DTD Website Module V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website Module V2.5.0//EN"
uri="website.mod"/>
<public
- publicId="-//Norman Walsh//DTD Website Extensions Module V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website Extensions Module V2.5.0//EN"
uri="extensions.mod"/>
<public
- publicId="-//Norman Walsh//DTD Website Namespaces Module V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website Namespaces Module V2.5.0//EN"
uri="namespaces.mod"/>
<public
- publicId="-//Norman Walsh//DTD Website RDDL Module V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website RDDL Module V2.5.0//EN"
uri="rddl.mod"/>
<public
- publicId="-//Norman Walsh//DTD Website Forms Module V2.4.0//EN"
+ publicId="-//Norman Walsh//DTD Website Forms Module V2.5.0//EN"
uri="forms.mod"/>
</group>
@@ -124,6 +124,10 @@
</group>
+ <rewriteURI
+ uriStartString="http://docbook.sourceforge.net/release/xsl/current/"
+ rewritePrefix="file:///usr/share/sgml/docbook/stylesheet/xsl/nwalsh/"/>
+
<!-- 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.
--- docbook-website-2.5.0.0.orig/xsl/autolayout.xsl
+++ docbook-website-2.5.0.0/xsl/autolayout.xsl
@@ -3,8 +3,8 @@
version="1.0">
<xsl:output method="xml" indent="no"
- doctype-public="-//Norman Walsh//DTD Website Autolayout V2.4.1//EN"
- doctype-system="http://docbook.sourceforge.net/release/website/2.4.1/schema/dtd/autolayout.dtd"
+ doctype-public="-//Norman Walsh//DTD Website Autolayout V2.5.0//EN"
+ doctype-system="http://docbook.sourceforge.net/release/website/2.5.0/schema/dtd/autolayout.dtd"
/>
<xsl:strip-space elements="toc tocentry layout copyright"/>
--- docbook-website-2.5.0.0.orig/xsl/chunk-tabular.xsl
+++ docbook-website-2.5.0.0/xsl/chunk-tabular.xsl
@@ -6,7 +6,9 @@
version="1.0">
<xsl:import href="tabular.xsl"/>
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunker.xsl"/>
+<!-- won;t work until xml catalogs are implemented -->
+<!-- <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunker.xsl"/> -->
+<xsl:import href="file:///usr/share/xml/docbook/stylesheet/nwalsh/html/chunker.xsl"/>
<xsl:include href="chunk-common.xsl"/>
</xsl:stylesheet>
--- docbook-website-2.5.0.0.orig/xsl/chunk-website.xsl
+++ docbook-website-2.5.0.0/xsl/chunk-website.xsl
@@ -6,7 +6,9 @@
version="1.0">
<xsl:import href="website.xsl"/>
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunker.xsl"/>
+<!-- alas, must wait until xml catalogs are working -->
+<!-- <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunker.xsl"/> -->
+<xsl:import href="file:///usr/share/xml/docbook/stylesheet/nwalsh/html/chunker.xsl"/>
<xsl:include href="chunk-common.xsl"/>
</xsl:stylesheet>
--- docbook-website-2.5.0.0.orig/xsl/website-common.xsl
+++ docbook-website-2.5.0.0/xsl/website-common.xsl
@@ -17,7 +17,10 @@
<!-- ==================================================================== -->
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+<!-- must wait until xml catalogs are working...-->
+<!-- <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/> -->
+
+<xsl:import href="file:///usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"/>
<xsl:import href="xbel.xsl"/>
<xsl:include href="VERSION"/>
<xsl:include href="param.xsl"/>
|