From: Kevin M. Rosenberg Date: Tue, 11 Nov 2003 05:28:20 +0000 (+0000) Subject: r8114: finish conversion to xinclude X-Git-Tag: v1.6.1~166 X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=6be0cb84dd1fc6a0ae9410f7ccdc34ac21ae4377 r8114: finish conversion to xinclude --- diff --git a/doc/Makefile b/doc/Makefile index d13a1e3..e9c26fb 100644 --- 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 5e5c495..03e0518 100644 --- a/doc/appendix.xml +++ b/doc/appendix.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/catalog.debian b/doc/catalog.debian deleted file mode 100644 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 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 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 index e0f1668..0000000 --- a/doc/dsssl/html/docbook.dsl +++ /dev/null @@ -1,30 +0,0 @@ - -]> - - - - -(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) - - - - diff --git a/doc/dsssl/print/docbook.dsl b/doc/dsssl/print/docbook.dsl deleted file mode 100644 index a114d93..0000000 --- a/doc/dsssl/print/docbook.dsl +++ /dev/null @@ -1,30 +0,0 @@ - -]> - - - - -(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"))) - - - - diff --git a/doc/html.tar.gz b/doc/html.tar.gz index 72c3406..cd77aa0 100644 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 cdabd65..104e0d3 100644 --- a/doc/intro.xml +++ b/doc/intro.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/notes.xml b/doc/notes.xml index 1ebbb1a..c196c1f 100644 --- a/doc/notes.xml +++ b/doc/notes.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/preface.xml b/doc/preface.xml index 373e119..1dcc6fd 100644 --- a/doc/preface.xml +++ b/doc/preface.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/ref_aggregate.xml b/doc/ref_aggregate.xml index 401c281..6d5666f 100644 --- a/doc/ref_aggregate.xml +++ b/doc/ref_aggregate.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/ref_declare.xml b/doc/ref_declare.xml index 49b6c7b..756ed87 100644 --- a/doc/ref_declare.xml +++ b/doc/ref_declare.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/ref_func_libr.xml b/doc/ref_func_libr.xml index 358abe6..859d4d7 100644 --- a/doc/ref_func_libr.xml +++ b/doc/ref_func_libr.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/ref_object.xml b/doc/ref_object.xml index d5dfdee..ef6b121 100644 --- a/doc/ref_object.xml +++ b/doc/ref_object.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/ref_primitive.xml b/doc/ref_primitive.xml index 106c018..2f43955 100644 --- a/doc/ref_primitive.xml +++ b/doc/ref_primitive.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/ref_string.xml b/doc/ref_string.xml index cad60e2..60537a8 100644 --- a/doc/ref_string.xml +++ b/doc/ref_string.xml @@ -1,4 +1,4 @@ - + diff --git a/doc/uffi.xml b/doc/uffi.xml index 0ab0a91..c5d2757 100644 --- a/doc/uffi.xml +++ b/doc/uffi.xml @@ -1,4 +1,4 @@ - +