r8114: finish conversion to xinclude

diff --git a/doc/Makefile b/doc/Makefile
index d13a1e31680b4a4c0da9cbbca96da4e476e5d558..e9c26fb23dca45bd8004cfa7c8c9e681aad4d017 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -29,14 +29,16 @@ ifndef DOCFILE_EXT
 DOCFILE_EXT=${DOCFILE_EXT_DEFAULT}
 endif
 
-DOCFILE=${DOCFILE_BASE}.${DOCFILE_EXT}
-FOFILE=${DOCFILE_BASE}.fo
-PDFFILE=${DOCFILE_BASE}.pdf
-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)
+DOCFILE:=${DOCFILE_BASE}.${DOCFILE_EXT}
+FOFILE:=${DOCFILE_BASE}.fo
+PDFFILE:=${DOCFILE_BASE}.pdf
+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)
+
+CHECK:=xmllint --noout --catalogs --xinclude --postvalid $(DOCFILE) || exit 1
 
 .PHONY: all
 all: html pdf 
@@ -54,15 +56,15 @@ check:
 .PHONY: html
 html: html.tar.gz
 
-html.tar.gz: $(DOCFILES) Makefile
+html.tar.gz: $(DOCFILES) Makefile check
        @rm -rf html
-       @xmlto -o html xhtml $(DOCFILE)
+       @xmlto --skip-validation -o html xhtml $(DOCFILE)
        @GZIP='-9' tar czf html.tar.gz html 
 
 .PHONY: fo
 fo: ${FOFILE}
 
-${FOFILE}: $(DOCFILES) Makefile
+${FOFILE}: $(DOCFILES) Makefile check
        @xmlto fo $(DOCFILE)
 
 .PHONY: pdf

diff --git a/doc/appendix.xml b/doc/appendix.xml
index 5e5c49527be4c1095d3d0f7c7001a3d390e8ad6b..03e05185e27a8e5d88487b0d75ba3f613fea38ec 100644 (file)
--- a/doc/appendix.xml
+++ b/doc/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/catalog.debian b/doc/catalog.debian
deleted file mode 100644 (file)
index 62388c6..0000000
--- a/doc/catalog.debian
+++ /dev/null
@@ -1,3 +0,0 @@
-CATALOG /etc/sgml/docbook.cat  
-CATALOG /etc/sgml/docbook-dsssl.cat  
-DOCUMENT uffi.sgml

diff --git a/doc/catalog.redhat b/doc/catalog.redhat
deleted file mode 100644 (file)
index 4588500..0000000
--- a/doc/catalog.redhat
+++ /dev/null
@@ -1,2 +0,0 @@
-CATALOG /etc/sgml/sgml-docbook-4.1.cat
-DOCUMENT uffi.sgml

diff --git a/doc/dsssl/COPYRIGHT b/doc/dsssl/COPYRIGHT
deleted file mode 100644 (file)
index 871b60b..0000000
--- a/doc/dsssl/COPYRIGHT
+++ /dev/null
@@ -1,5 +0,0 @@
-These stylesheets are written and Copyright (c) 1999-2002 by Pierre
-R. Mai.
-
-He has graciously placed them in the public domain without
-restrictions.

diff --git a/doc/dsssl/html/docbook.dsl b/doc/dsssl/html/docbook.dsl
deleted file mode 100644 (file)
index e0f1668..0000000
--- a/doc/dsssl/html/docbook.dsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY docbook PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
-]>
-
- <style-sheet>
- <style-specification use="docbook">
- <style-specification-body>
-(element envar ($mono-seq$))
-(element symbol ($mono-seq$))
-(element type ($mono-seq$))
-(element errortype ($mono-seq$))
-(element returnvalue ($italic-mono-seq$))
-(define (book-titlepage-recto-elements)
-  (list (normalize "title")
-        (normalize "subtitle")
-        (normalize "graphic")
-        (normalize "corpauthor")
-        (normalize "authorgroup")
-        (normalize "author")
-        (normalize "editor")
-       (normalize "printhistory")
-        (normalize "copyright")
-        (normalize "abstract")
-        (normalize "legalnotice")))
-(define %use-id-as-filename% #t)
-(define use-output-dir #t)
-</style-specification-body>
-</style-specification>
-<external-specification id="docbook" document="docbook">
-</style-sheet>

diff --git a/doc/dsssl/print/docbook.dsl b/doc/dsssl/print/docbook.dsl
deleted file mode 100644 (file)
index a114d93..0000000
--- a/doc/dsssl/print/docbook.dsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY docbook PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>
-]>
-
-<style-sheet>
-<style-specification use="docbook">
-<style-specification-body>
-(element envar ($mono-seq$))
-(element symbol ($mono-seq$))
-(element type ($mono-seq$))
-(element errortype ($mono-seq$))
-(element returnvalue ($italic-mono-seq$))
-(define (book-titlepage-verso-elements)
-  (list (normalize "title")
-        (normalize "subtitle")
-        (normalize "corpauthor")
-        (normalize "authorgroup")
-        (normalize "author")
-        (normalize "editor")
-        (normalize "edition")
-        (normalize "pubdate")
-       (normalize "printhistory")
-        (normalize "copyright")
-        (normalize "abstract")
-        (normalize "legalnotice")
-        (normalize "revhistory")))
-</style-specification-body>
-</style-specification>
-<external-specification id="docbook" document="docbook">
-</style-sheet>

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

diff --git a/doc/intro.xml b/doc/intro.xml
index cdabd655579b101ca966c07572c73d111d94666b..104e0d33f8c98504766f2321d882f81c9bf30f66 100644 (file)
--- a/doc/intro.xml
+++ b/doc/intro.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/notes.xml b/doc/notes.xml
index 1ebbb1a5c641b7eafe8b467ddf3da58423a7fed7..c196c1faa7cf1eaacfb1e50a35d3994eeb1112ec 100644 (file)
--- a/doc/notes.xml
+++ b/doc/notes.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/preface.xml b/doc/preface.xml
index 373e1197555d4b01f844a3516bc13d9fd9a543d0..1dcc6fde3f83c61e5b9bd5c71abeefa3fd3616e4 100644 (file)
--- a/doc/preface.xml
+++ b/doc/preface.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/ref_aggregate.xml b/doc/ref_aggregate.xml
index 401c28186400a71b62b417ed648a0d84a8efccb4..6d5666f7d1437cca67e1ca3bffa78065d241024e 100644 (file)
--- a/doc/ref_aggregate.xml
+++ b/doc/ref_aggregate.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/ref_declare.xml b/doc/ref_declare.xml
index 49b6c7b40dfcebef79c4bf8aa232c4769a04b0af..756ed870e481660fd44d4f15f8c83526aa23aa9d 100644 (file)
--- a/doc/ref_declare.xml
+++ b/doc/ref_declare.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/ref_func_libr.xml b/doc/ref_func_libr.xml
index 358abe6b01dc15b50ce57e184a20b6a47f7ed673..859d4d7081ecb8d63716f70f8db5cfc22544ebf2 100644 (file)
--- a/doc/ref_func_libr.xml
+++ b/doc/ref_func_libr.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/ref_object.xml b/doc/ref_object.xml
index d5dfdee8edb69a1528868253535ba7d308357a3e..ef6b1215dc2b1c0a6132e6b8c6726e076d798c37 100644 (file)
--- a/doc/ref_object.xml
+++ b/doc/ref_object.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/ref_primitive.xml b/doc/ref_primitive.xml
index 106c01857f0b28fbaac745ecc3ea03511d5e4baf..2f4395529d03249d69a19a2d6bec6d5c642b1d0f 100644 (file)
--- a/doc/ref_primitive.xml
+++ b/doc/ref_primitive.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/ref_string.xml b/doc/ref_string.xml
index cad60e27829c192c0b2b21be570e3030c7ec9d86..60537a8b1ccc075ce4916f28f83742874b2df7b2 100644 (file)
--- a/doc/ref_string.xml
+++ b/doc/ref_string.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">

diff --git a/doc/uffi.xml b/doc/uffi.xml
index 0ab0a915f120023d4f1d0aabb6eddfdcae080306..c5d2757f12afe061e2d53ab5eff4fd017517a8af 100644 (file)
--- a/doc/uffi.xml
+++ b/doc/uffi.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' ?>   <!-- Mode: Docbook --> 
+<?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" [
 <!ENTITY % myents SYSTEM "entities.xml">