From 07e3ec42a2c3ff09e1eb4d3decbc82753dc980f5 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 17 Jun 2005 12:50:02 +0000 Subject: [PATCH] Incorporated slides and website stylesheets into the build. Note: This currently only affects the "distrib" (doc) build. So if you don't need to build distrib/doc, you won't be affected by this change. If you DO need to build distrib/doc, it will break unless you use the xsl/Makefile from the "build" branch instead of from the head. This build alters the distrib build such that: - an xsl/slides directory is created by copying over the contents of the slides/xsl - an xsl/website directory is created by copying over the contents of the website/xsl directory - the reference.html part of the doc build now adds the slides and website param reference doc This is an experiment. If we decide to go ahead with it in the release build, and everything is found to be OK when it gets out to users and they test it, then the next step would be to ask SF admin to move the website/xsl and slides/xsl CVS directory into xsl/ to create xsl/slides and xsl/website, and they would be maintained in the xsl/ CVS going forward. --- xsl/doc/Makefile | 4 +- xsl/doc/common/Makefile | 3 +- xsl/doc/fo/Makefile | 12 ++-- xsl/doc/html/Makefile | 9 +-- xsl/doc/lib/Makefile | 3 +- xsl/doc/manpages/Makefile | 7 +- xsl/doc/pi/Makefile | 5 +- xsl/doc/slides/html/.cvsignore | 1 + xsl/doc/slides/html/Makefile | 19 +++++ xsl/doc/template/Makefile | 3 +- xsl/doc/tools/Makefile | 3 +- xsl/doc/website/.cvsignore | 1 + xsl/doc/website/Makefile | 19 +++++ xsl/docsrc/Makefile | 2 +- xsl/docsrc/documentation.xml | 1 - xsl/docsrc/fo/Makefile | 9 ++- xsl/docsrc/html/Makefile | 9 ++- xsl/docsrc/manpages/Makefile | 9 ++- xsl/docsrc/reference.xml | 114 +++++++++++++++--------------- xsl/docsrc/slides/html/.cvsignore | 1 + xsl/docsrc/slides/html/Makefile | 19 +++++ xsl/docsrc/website/.cvsignore | 1 + xsl/docsrc/website/Makefile | 19 +++++ 23 files changed, 178 insertions(+), 95 deletions(-) create mode 100644 xsl/doc/slides/html/.cvsignore create mode 100644 xsl/doc/slides/html/Makefile create mode 100644 xsl/doc/website/.cvsignore create mode 100644 xsl/doc/website/Makefile create mode 100644 xsl/docsrc/slides/html/.cvsignore create mode 100644 xsl/docsrc/slides/html/Makefile create mode 100644 xsl/docsrc/website/.cvsignore create mode 100644 xsl/docsrc/website/Makefile diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile index 0164322b1..d11c216da 100644 --- a/xsl/doc/Makefile +++ b/xsl/doc/Makefile @@ -9,7 +9,7 @@ CRSTYLE=creference.xsl BSTYLE=book.xsl VPATH=../docsrc -DIRS=common lib html fo manpages tools template pi +DIRS=common lib html fo manpages slides/html website tools template pi all: copyright.html warranty.html reference.html index.html for i in $(DIRS) __bogus__; do \ @@ -31,7 +31,7 @@ reference.html: reference.xml $(RSTYLE) $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT) index.html: documentation.xml $(BSTYLE) reference.xml \ - publishing.xml extensions.xml templates.xml html/param.xml \ + publishing.xml extensions.xml templates.xml \ tools/profiling.xml htmlhelp.xml $(XJPARSE) $(VPATH)/$< $(XSLT) $(PROCOPT) $< $(BSTYLE) $(XSLTOPT) diff --git a/xsl/doc/common/Makefile b/xsl/doc/common/Makefile index dc2dd4029..eea93a7a2 100644 --- a/xsl/doc/common/Makefile +++ b/xsl/doc/common/Makefile @@ -2,13 +2,14 @@ include ../../../cvstools/Makefile.incl STYLE=../jrefhtml.xsl VPATH=../../docsrc/common +XSLTOPT= HTMLFILES = common.html all: $(HTMLFILES) %.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) clean: rm -f $(HTMLFILES) diff --git a/xsl/doc/fo/Makefile b/xsl/doc/fo/Makefile index e7f1531a3..4a1e60b67 100644 --- a/xsl/doc/fo/Makefile +++ b/xsl/doc/fo/Makefile @@ -2,18 +2,18 @@ include ../../../cvstools/Makefile.incl STYLE=../jrefhtml.xsl VPATH=../../docsrc/fo +XSLTOPT= HTMLFILES = param.html table.html -PARAMFILES = $(foreach file,$(basename $(shell find ../../params/*.xml)),$(file).html) all: $(HTMLFILES) %.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) -param.html: param.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl +param.html: docparam.xml + $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) + touch param.html clean: - rm -f $(HTMLFILES) - rm -f $(PARAMFILES) + $(RM) $(HTMLFILES) diff --git a/xsl/doc/html/Makefile b/xsl/doc/html/Makefile index 39862a762..4e46d4966 100644 --- a/xsl/doc/html/Makefile +++ b/xsl/doc/html/Makefile @@ -2,17 +2,18 @@ include ../../../cvstools/Makefile.incl STYLE=../jrefhtml.xsl VPATH=../../docsrc/html +XSLTOPT= HTMLFILES = param.html all: $(HTMLFILES) %.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) -param.html: param.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl +param.html: docparam.xml + $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) touch param.html clean: - rm -f *.html + $(RM) $(HTMLFILES) diff --git a/xsl/doc/lib/Makefile b/xsl/doc/lib/Makefile index 8a24c7b8d..6e07a245c 100644 --- a/xsl/doc/lib/Makefile +++ b/xsl/doc/lib/Makefile @@ -2,13 +2,14 @@ include ../../../cvstools/Makefile.incl STYLE=../../docsrc/lrefentry.xsl VPATH=../../lib +XSLTOPT= HTMLFILES = lib.html all: $(HTMLFILES) %.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) clean: rm -f $(HTMLFILES) diff --git a/xsl/doc/manpages/Makefile b/xsl/doc/manpages/Makefile index 7097eb45d..af54c24f5 100644 --- a/xsl/doc/manpages/Makefile +++ b/xsl/doc/manpages/Makefile @@ -2,16 +2,17 @@ include ../../../cvstools/Makefile.incl STYLE=../jrefhtml.xsl VPATH=../../docsrc/manpages +XSLTOPT= HTMLFILES = param.html all: $(HTMLFILES) %.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) -param.html: param.xml - $(XSLT) $< ../../docsrc/clrefentry.xsl +param.html: docparam.xml + $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) touch param.html clean: diff --git a/xsl/doc/pi/Makefile b/xsl/doc/pi/Makefile index a2edeb0b0..8315cdb2d 100644 --- a/xsl/doc/pi/Makefile +++ b/xsl/doc/pi/Makefile @@ -2,16 +2,17 @@ include ../../../cvstools/Makefile.incl STYLE=../jrefhtml.xsl VPATH=../../docsrc/pi +XSLTOPT= HTMLFILES = pi.html all: $(HTMLFILES) %.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) pi.html: pi.xml - $(XSLT) $< ../../docsrc/pirefentry.xsl + $(XSLT) $< ../../docsrc/pirefentry.xsl $(XSLTOPT) touch pi.html clean: diff --git a/xsl/doc/slides/html/.cvsignore b/xsl/doc/slides/html/.cvsignore new file mode 100644 index 000000000..2d19fc766 --- /dev/null +++ b/xsl/doc/slides/html/.cvsignore @@ -0,0 +1 @@ +*.html diff --git a/xsl/doc/slides/html/Makefile b/xsl/doc/slides/html/Makefile new file mode 100644 index 000000000..8cfa4b152 --- /dev/null +++ b/xsl/doc/slides/html/Makefile @@ -0,0 +1,19 @@ +include ../../../../cvstools/Makefile.incl + +STYLE=../../jrefhtml.xsl +VPATH=../../../docsrc/slides/html/ +XSLTOPT= + +HTMLFILES = param.html + +all: $(HTMLFILES) + +%.html : %.xml $(STYLE) + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) + +param.html: docparam.xml + $(XSLT) $< ../../../docsrc/clrefentry.xsl $(XSLTOPT) + touch param.html + +clean: + $(RM) $(HTMLFILES) diff --git a/xsl/doc/template/Makefile b/xsl/doc/template/Makefile index 396762db4..dad6b22f5 100644 --- a/xsl/doc/template/Makefile +++ b/xsl/doc/template/Makefile @@ -2,13 +2,14 @@ include ../../../cvstools/Makefile.incl STYLE=../jrefhtml.xsl VPATH=../../docsrc/template +XSLTOPT= HTMLFILES = titlepage.html all: $(HTMLFILES) %.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) clean: rm -f $(HTMLFILES) diff --git a/xsl/doc/tools/Makefile b/xsl/doc/tools/Makefile index b968fbca5..3563cb668 100644 --- a/xsl/doc/tools/Makefile +++ b/xsl/doc/tools/Makefile @@ -2,13 +2,14 @@ include ../../../cvstools/Makefile.incl STYLE=../../html/docbook.xsl VPATH=../../docsrc/tools +XSLTOPT= HTMLFILES = profiling.html all: profile-chain.png $(HTMLFILES) %.html : %.xml $(STYLE) - $(XSLT) $< $(STYLE) $@ + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) profile-chain.png: $(VPATH) cp $(VPATH)/profile-chain.png . diff --git a/xsl/doc/website/.cvsignore b/xsl/doc/website/.cvsignore new file mode 100644 index 000000000..2d19fc766 --- /dev/null +++ b/xsl/doc/website/.cvsignore @@ -0,0 +1 @@ +*.html diff --git a/xsl/doc/website/Makefile b/xsl/doc/website/Makefile new file mode 100644 index 000000000..247b9ee02 --- /dev/null +++ b/xsl/doc/website/Makefile @@ -0,0 +1,19 @@ +include ../../../cvstools/Makefile.incl + +STYLE=../jrefhtml.xsl +VPATH=../../docsrc/website +XSLTOPT= + +HTMLFILES = param.html + +all: $(HTMLFILES) + +%.html : %.xml $(STYLE) + $(XSLT) $< $(STYLE) $@ $(XSLTOPT) + +param.html: docparam.xml + $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT) + touch param.html + +clean: + $(RM) $(HTMLFILES) diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile index bbad8bb3d..33804771a 100644 --- a/xsl/docsrc/Makefile +++ b/xsl/docsrc/Makefile @@ -1,4 +1,4 @@ -DIRS=common html fo manpages template tools pi +DIRS=common html fo manpages slides/html website template tools pi all: xsl-params.xsl for i in $(DIRS) __bogus__; do \ diff --git a/xsl/docsrc/documentation.xml b/xsl/docsrc/documentation.xml index 352d5cbfa..f8dc84d94 100644 --- a/xsl/docsrc/documentation.xml +++ b/xsl/docsrc/documentation.xml @@ -5,7 +5,6 @@ - ]> diff --git a/xsl/docsrc/fo/Makefile b/xsl/docsrc/fo/Makefile index c0a4ae3dd..822619e9e 100644 --- a/xsl/docsrc/fo/Makefile +++ b/xsl/docsrc/fo/Makefile @@ -1,10 +1,9 @@ -XSLT=../../../cvstools/saxon -XJPARSE=../../../cvstools/xjparse +include ../../../cvstools/Makefile.incl JSTYLE=../../docsrc/xsl2jref.xsl VPATH=../../fo -XMLFILES = param.xml table.xml +XMLFILES = docparam.xml table.xml all: $(XMLFILES) @@ -15,6 +14,6 @@ clean: $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ $(XJPARSE) $@ -param.xml: ../../fo/param.xsl +docparam.xml: ../../fo/param.xsl $(MAKE) -C ../../fo param.xml - cp ../../fo/param.xml . + cp ../../fo/param.xml docparam.xml diff --git a/xsl/docsrc/html/Makefile b/xsl/docsrc/html/Makefile index c6c809a1d..ecd9bf1ee 100644 --- a/xsl/docsrc/html/Makefile +++ b/xsl/docsrc/html/Makefile @@ -1,10 +1,9 @@ -XSLT=../../../cvstools/saxon -XJPARSE=../../../cvstools/xjparse +include ../../../cvstools/Makefile.incl JSTYLE=../../docsrc/xsl2jref.xsl VPATH=../../html -XMLFILES = param.xml +XMLFILES = docparam.xml all: $(XMLFILES) @@ -15,6 +14,6 @@ clean: $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ $(XJPARSE) $@ -param.xml: ../../html/param.xsl +docparam.xml: ../../html/param.xsl $(MAKE) -C ../../html param.xml - cp ../../html/param.xml . + cp ../../html/param.xml docparam.xml diff --git a/xsl/docsrc/manpages/Makefile b/xsl/docsrc/manpages/Makefile index c191c83a6..0f1ae7b9e 100644 --- a/xsl/docsrc/manpages/Makefile +++ b/xsl/docsrc/manpages/Makefile @@ -1,10 +1,9 @@ -XSLT=../../../cvstools/saxon -XJPARSE=../../../cvstools/xjparse +include ../../../cvstools/Makefile.incl JSTYLE=../../docsrc/xsl2jref.xsl VPATH=../../manpages -XMLFILES = param.xml +XMLFILES = docparam.xml all: $(XMLFILES) @@ -15,6 +14,6 @@ clean: $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ $(XJPARSE) $@ -param.xml: ../../manpages/param.xsl +docparam.xml: ../../manpages/param.xsl $(MAKE) -C ../../manpages param.xml - cp ../../manpages/param.xml . + cp ../../manpages/param.xml docparam.xml diff --git a/xsl/docsrc/reference.xml b/xsl/docsrc/reference.xml index b6081cc8b..74ff0bcc9 100644 --- a/xsl/docsrc/reference.xml +++ b/xsl/docsrc/reference.xml @@ -1,66 +1,66 @@ - - - + + - + + + ]> - - -DocBook XSL Stylesheet Reference Documentation - -$Id$ - -Walsh -Norman -19992000 -Norman Walsh - - +
+ + DocBook XSL Stylesheet Reference Documentation + + $Id$ + + Walsh + Norman + 19992005 + Norman Walsh + + -Preface + This is reference documentation for the DocBook XSL + stylesheets. It is divided into two sections: documentation for + users and documentation for developers. -This constitutes only the most rudimentary beginnings of -documentation for these stylesheets. + + User documentation + + + + + + + + + + + -At present, the only documentation available is the set -of references generated from the stylesheet sources: - - - - - - - - - - - - - - - - -The reference to the template system is also available, -but at this point it's probably even less useful than the preceding -references. - - - - - - - - + + Developer documentation + + + + + + + + + +
diff --git a/xsl/docsrc/slides/html/.cvsignore b/xsl/docsrc/slides/html/.cvsignore new file mode 100644 index 000000000..6722cd96e --- /dev/null +++ b/xsl/docsrc/slides/html/.cvsignore @@ -0,0 +1 @@ +*.xml diff --git a/xsl/docsrc/slides/html/Makefile b/xsl/docsrc/slides/html/Makefile new file mode 100644 index 000000000..a7b2ae72e --- /dev/null +++ b/xsl/docsrc/slides/html/Makefile @@ -0,0 +1,19 @@ +include ../../../../cvstools/Makefile.incl + +JSTYLE=../../../docsrc/xsl2jref.xsl +VPATH=../../../slides/html + +XMLFILES = docparam.xml + +all: $(XMLFILES) + +clean: + $(RM) $(XMLFILES) + +%.xml : %.xsl $(JSTYLE) + $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ + $(XJPARSE) $@ + +docparam.xml: ../../../slides/html/param.xsl + $(MAKE) -C ../../../slides/html param.xml + cp ../../../slides/html/param.xml docparam.xml diff --git a/xsl/docsrc/website/.cvsignore b/xsl/docsrc/website/.cvsignore new file mode 100644 index 000000000..6722cd96e --- /dev/null +++ b/xsl/docsrc/website/.cvsignore @@ -0,0 +1 @@ +*.xml diff --git a/xsl/docsrc/website/Makefile b/xsl/docsrc/website/Makefile new file mode 100644 index 000000000..698f69757 --- /dev/null +++ b/xsl/docsrc/website/Makefile @@ -0,0 +1,19 @@ +include ../../../cvstools/Makefile.incl + +JSTYLE=../../docsrc/xsl2jref.xsl +VPATH=../../../website/xsl + +XMLFILES = docparam.xml + +all: $(XMLFILES) + +clean: + $(RM) $(XMLFILES) + +%.xml : %.xsl $(JSTYLE) + $(XSLT) $< $(JSTYLE) /dev/null output-file=$@ + $(XJPARSE) $@ + +docparam.xml: ../../../website/xsl/param.xsl + $(MAKE) -C ../../../website/xsl param.xml + cp ../../../website/xsl/param.xml docparam.xml -- 2.40.0