r8120: convert to use local xsl sheets, debian catalog

diff --git a/doc/Makefile b/doc/Makefile
index 9a7e131e0e6801774234a1efb5bc4d2dafb7afa3..55a743f798c5026d9aa19f2248f393ff0f674275 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -15,9 +15,9 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ##############################################################################
 
-
-DOCFILE_BASE_DEFAULT=uffi
-DOCFILE_EXT_DEFAULT=xml
+OS:=debian
+DOCFILE_BASE_DEFAULT:=uffi
+DOCFILE_EXT_DEFAULT:=xml
 
 # Standard docfile processing
 
@@ -36,9 +36,10 @@ PSFILE:=${DOCFILE_BASE}.ps
 DVIFILE:=${DOCFILE_BASE}.dvi
 TXTFILE:=${DOCFILE_BASE}.txt
 TMPFILES:=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
-DOCFILES:=$(shell echo *.xml)
+DOCFILES:=$(shell echo *.xml *.xsl)
 
-CHECK:=xmllint --noout --catalogs --xinclude --postvalid $(DOCFILE) || exit 1
+CATALOG:=`pwd`/catalog-${OS}.xml
+CHECK:=XML_CATALOG_FILES="$(CATALOG)" xmllint --noout --xinclude --postvalid $(DOCFILE) || exit 1
 
 .PHONY: all
 all: html pdf 
@@ -56,16 +57,17 @@ check:
 .PHONY: html
 html: html.tar.gz
 
-html.tar.gz: $(DOCFILES) Makefile check
+html.tar.gz: $(DOCFILES) Makefile 
        @rm -rf html
-       @xmlto --skip-validation -o html xhtml $(DOCFILE)
+       @mkdir html
+       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output html/ html.xsl $(DOCFILE)
        @GZIP='-9' tar czf html.tar.gz html 
 
 .PHONY: fo
 fo: ${FOFILE}
 
-${FOFILE}: $(DOCFILES) Makefile check
-       @xmlto --skip-validation fo $(DOCFILE)
+${FOFILE}: $(DOCFILES) Makefile 
+       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output $(FOFILE) fo.xsl $(DOCFILE)
 
 .PHONY: pdf
 pdf: ${PDFFILE}

diff --git a/doc/appendix.xml b/doc/appendix.xml
index 03e05185e27a8e5d88487b0d75ba3f613fea38ec..a8635ceccbde2aa3d04fc7f32a216e0cd1175e55 100644 (file)
--- a/doc/appendix.xml
+++ b/doc/appendix.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>
 
 <appendix id="installation">
   <title>Installation</title>
-  <sect1>
+  <sect1 id="download">
     <title>Download &uffi;</title>
     <para>
 You need to download the &uffi; package from its web
@@ -21,8 +21,8 @@ the file <filename>defsystem.lisp</filename> from the CVS
 <ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/cclan/asdf/asdf.lisp"><citetitle>tree</citetitle></ulink>.
     </para>
   </sect1>
-  <sect1>
-    <title>Installation</title>
+  <sect1 id="loading">
+    <title>Loading</title>
     <para>
       After downloading and installing &asdf;, simply
       <function>push</function> the

diff --git a/doc/bookinfo.xml b/doc/bookinfo.xml
index fbad7ee5255085dad05923fb8bfd0164d054af95..86a33b456dc14faf0a7d39a3b13b0486495eae9a 100644 (file)
--- a/doc/bookinfo.xml
+++ b/doc/bookinfo.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/catalog-debian.xml b/doc/catalog-debian.xml
new file mode 100644 (file)
index 0000000..eb1075e
--- /dev/null
+++ b/doc/catalog-debian.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<!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.2/"
+        rewritePrefix="dtd/xml/4.2/" />
+    <!-- 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" />
+
+    <!-- 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" />
+
+    <!-- To resolve short stylesheet references -->
+    <uri
+        name="docbook.xsl"
+        uri="stylesheet/xsl/nwalsh/html/docbook.xsl" />
+    <uri 
+        name="chunk.xsl"
+        uri="stylesheet/xsl/nwalsh/html/chunk.xsl" />
+    <uri
+        name="fo-docbook.xsl"
+        uri="stylesheet/xsl/nwalsh/fo/docbook.xsl" />
+
+  </group>
+
+</catalog>

diff --git a/doc/fo.xsl b/doc/fo.xsl
new file mode 100644 (file)
index 0000000..df29efd
--- /dev/null
+++ b/doc/fo.xsl
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:import href="fo-docbook.xsl"/>
+
+</xsl:stylesheet>
+

diff --git a/doc/glossary.xml b/doc/glossary.xml
index f539c33b7c582b4f4c88b7f4ede13aaa532cbed2..972f473b5b6d3e5223101635fd49043a9c3a9eb1 100644 (file)
--- a/doc/glossary.xml
+++ b/doc/glossary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>   <!-- -*- Mode: DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/html.tar.gz b/doc/html.tar.gz
index e829ff922c5620ca18c110caae29f93cd13cef58..e7cb49ce42899a7d5c1cda60c06615bd762a24e0 100644 (file)
Binary files a/doc/html.tar.gz and b/doc/html.tar.gz differ

diff --git a/doc/html.xsl b/doc/html.xsl
new file mode 100644 (file)
index 0000000..eddc7c1
--- /dev/null
+++ b/doc/html.xsl
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:import href="chunk.xsl"/>
+<xsl:param name="use.id.as.filename" select="1"/>
+
+</xsl:stylesheet>
+

diff --git a/doc/intro.xml b/doc/intro.xml
index be722e84f3603f8f4cdd525dadbd505e85acf68c..8478b8ce34704af298350e70eefe82836f0ba94a 100644 (file)
--- a/doc/intro.xml
+++ b/doc/intro.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>
 
 <chapter id="introduction">
   <title>Introduction</title>
-  <sect1>
+  <sect1 id="purpose">
     <title>Purpose</title>
     <para> This reference guide describes
       &uffi;, a package that provides a cross-implementation
@@ -15,7 +15,7 @@
     </para>
   </sect1>
   
-  <sect1>
+  <sect1 id="background">
     <title>Background
     </title>
     <para>
@@ -41,7 +41,7 @@ particular C-library.
     </para>
   </sect1>
 
-  <sect1>
+  <sect1 id="supported-impl">
     <title>Supported Implementations</title> 
     <para>The primary tested and supported platforms for &uffi; are: 
     </para>
@@ -61,7 +61,7 @@ FreeBSD 4.5, Solaris v2.8, and Microsoft Windows XP.</para></listitem>
     </itemizedlist>
   </sect1>
 
-    <sect1>
+    <sect1 id="design">
       <title>Design</title>
       <sect2>
        <title>Overview</title>

diff --git a/doc/notes.xml b/doc/notes.xml
index c196c1faa7cf1eaacfb1e50a35d3994eeb1112ec..06c89b3bf20bc096cda4cf35165b4fd86912a106 100644 (file)
--- a/doc/notes.xml
+++ b/doc/notes.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>
@@ -8,7 +8,7 @@
 <chapter id="notes">
   <title>Programming Notes</title>
 
-  <sect1>
+  <sect1 id="impl-specific">
     <title>Implementation Specific Notes</title> 
     <para>
     </para>
@@ -29,7 +29,7 @@
       </sect2>
   </sect1>
 
-  <sect1>
+  <sect1 id="object-represen">
     <title>Foreign Object Representation and Access</title>
     <para> There are two main approaches used to represent foreign
     objects: an integer that represents an address in memory, and a
@@ -46,7 +46,7 @@
     </para>
   </sect1>
 
-  <sect1>
+  <sect1 id="optimizing">
     <title>Optimizing Code Using UFFI</title>
     <sect2>
       <title>Background</title>

diff --git a/doc/preface.xml b/doc/preface.xml
index 1dcc6fde3f83c61e5b9bd5c71abeefa3fd3616e4..2806c5838772368f75cb0a3ce4683b2e5350b01a 100644 (file)
--- a/doc/preface.xml
+++ b/doc/preface.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/ref_aggregate.xml b/doc/ref_aggregate.xml
index 6d5666f7d1437cca67e1ca3bffa78065d241024e..08169f8d0192ee1d640181b5775f154cbdade1cf 100644 (file)
--- a/doc/ref_aggregate.xml
+++ b/doc/ref_aggregate.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/ref_declare.xml b/doc/ref_declare.xml
index 5352722ea45584b0d90e18eb0c34d61597ee0e73..7043e33fb28773edf5bb93e5aedc8f224aa6e6a1 100644 (file)
--- a/doc/ref_declare.xml
+++ b/doc/ref_declare.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/ref_func_libr.xml b/doc/ref_func_libr.xml
index 859d4d7081ecb8d63716f70f8db5cfc22544ebf2..b0da4ccd127833c9fa248720a5b1e2fccb1c9fbf 100644 (file)
--- a/doc/ref_func_libr.xml
+++ b/doc/ref_func_libr.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/ref_object.xml b/doc/ref_object.xml
index ef6b1215dc2b1c0a6132e6b8c6726e076d798c37..f6bd71a9987bb70c481888fd933d531016015325 100644 (file)
--- a/doc/ref_object.xml
+++ b/doc/ref_object.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/ref_primitive.xml b/doc/ref_primitive.xml
index ca9d77e306d0698da4e80205cc7fdcba73150ebf..01b1c953b297b1312888f4f07c15385843d1af2e 100644 (file)
--- a/doc/ref_primitive.xml
+++ b/doc/ref_primitive.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/ref_string.xml b/doc/ref_string.xml
index 60537a8b1ccc075ce4916f28f83742874b2df7b2..c9535329638045825537b2610f2b46514ab99a0f 100644 (file)
--- a/doc/ref_string.xml
+++ b/doc/ref_string.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>

diff --git a/doc/uffi.xml b/doc/uffi.xml
index c5d2757f12afe061e2d53ab5eff4fd017517a8af..081f9665b54bed1bcf945ff8d5640b6815ebf709 100644 (file)
--- a/doc/uffi.xml
+++ b/doc/uffi.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' ?>   <!-- -*- DocBook -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-               "file:///usr/share/sgml/docbook/dtd/xml/4.2/docbookx.dtd" [
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % myents SYSTEM "entities.xml">
 %myents;
 ]>