Use XT again (neither Saxon nor Xalan work)

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 8b42cf38ff7c81ee3f7cc8224795be89d04c3e58..87e6b8efe7ccb4e3f3111cb8b48e474b6068ca4d 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -1,12 +1,13 @@
-XSLT=../../cvstools/saxon
-XJPARSE=../../cvstools/xjparse
+include ../../cvstools/Makefile.incl
+XSLT=xt
+XSLTOPT=
+PROCOPT=
 
 .PHONY : clean
 
 RSTYLE=reference.xsl
 BSTYLE=book.xsl
 VPATH=../docsrc
-SAXVER=-6
 
 DIRS=common lib html fo
 
@@ -19,21 +20,21 @@ all: copyright.html warranty.html reference.html index.html
 
 copyright.html: copyright.xml $(RSTYLE)
        $(XJPARSE) $(VPATH)/$<
-       $(XSLT) $(SAXVER) $< $(RSTYLE) $@
+       $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
 
 warranty.html: warranty.xml $(RSTYLE)
        $(XJPARSE) $(VPATH)/$<
-       $(XSLT) $(SAXVER) $< $(RSTYLE) $@
+       $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
 
 reference.html: reference.xml $(RSTYLE) lib/lib.xml common/common.xml \
                html/param.xml html/ebnf.xml \
                fo/param.xml fo/table.xml
        $(XJPARSE) $(VPATH)/$<
-       $(XSLT) $(SAXVER) $< $(RSTYLE) $@
+       $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
 
 index.html: documentation.xml $(BSTYLE) reference.xml
        $(XJPARSE) $(VPATH)/$<
-       $(XSLT) $(SAXVER) $< $(BSTYLE) $@
+       $(XSLT) $(PROCOPT) $< $(BSTYLE) $@ $(XSLTOPT)
 
 clean:
        rm -f *.html

diff --git a/xsl/doc/book.xsl b/xsl/doc/book.xsl
index 45f6880a5766c0c28793e8d3082c70dff7f185d3..22deb838948d40a3c6ef825e293bb4b6d460e0a2 100644 (file)
--- a/xsl/doc/book.xsl
+++ b/xsl/doc/book.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-<xsl:import href="../html/chunk.xsl"/>
+<xsl:import href="../html/xtchunk.xsl"/>
 
 <xsl:param name="toc.section.depth" select="'1'"/>
 

diff --git a/xsl/doc/common/Makefile b/xsl/doc/common/Makefile
index 84cf60118b88a795c836bc195729595a9e533182..a7749ac0005dbf9c0bda0c699a325442dac5e6b2 100644 (file)
--- a/xsl/doc/common/Makefile
+++ b/xsl/doc/common/Makefile
@@ -1,3 +1,6 @@
+include ../../../cvstools/Makefile.incl
+XSLT=xt
+
 STYLE=../jrefhtml.xsl
 VPATH=../../docsrc/common
 
@@ -6,4 +9,7 @@ HTMLFILES = common.html
 all: $(HTMLFILES)
 
 %.html : %.xml $(STYLE)
-       saxon $< $(STYLE) $@
+       $(XSLT) $< $(STYLE) $@
+
+clean:
+       rm -f $(HTMLFILES)

diff --git a/xsl/doc/fo/Makefile b/xsl/doc/fo/Makefile
index a90a9372a437b1cba2c60013e1cba36d30018c0d..1059c0f6553b6a697a807dc06420be37f0621c03 100644 (file)
--- a/xsl/doc/fo/Makefile
+++ b/xsl/doc/fo/Makefile
@@ -1,3 +1,6 @@
+include ../../../cvstools/Makefile.incl
+XSLT=xt
+
 STYLE=../jrefhtml.xsl
 VPATH=../../docsrc/fo
 
@@ -6,4 +9,7 @@ HTMLFILES = param.html table.html
 all: $(HTMLFILES)
 
 %.html : %.xml $(STYLE)
-       saxon $< $(STYLE) $@
+       $(XSLT) $< $(STYLE) $@
+
+clean:
+       rm -f $(HTMLFILES)

diff --git a/xsl/doc/html/Makefile b/xsl/doc/html/Makefile
index f9f21b6116b1cda72296da57e057e97a5cc85ae4..7080b2c96bb2cb0fbc369d22982b7b9171928934 100644 (file)
--- a/xsl/doc/html/Makefile
+++ b/xsl/doc/html/Makefile
@@ -1,3 +1,6 @@
+include ../../../cvstools/Makefile.incl
+XSLT=xt
+
 STYLE=../jrefhtml.xsl
 VPATH=../../docsrc/html
 
@@ -6,4 +9,7 @@ HTMLFILES = param.html ebnf.html
 all: $(HTMLFILES)
 
 %.html : %.xml $(STYLE)
-       saxon $< $(STYLE) $@
+       $(XSLT) $< $(STYLE) $@
+
+clean:
+       rm -f $(HTMLFILES)

diff --git a/xsl/doc/lib/Makefile b/xsl/doc/lib/Makefile
index 7a21c2d912826b618ce6afdd187aaf8c0f75a278..3822c26da4bf43db93580c0a07a83a9a1ff27c86 100644 (file)
--- a/xsl/doc/lib/Makefile
+++ b/xsl/doc/lib/Makefile
@@ -1,3 +1,6 @@
+include ../../../cvstools/Makefile.incl
+XSLT=xt
+
 STYLE=../jrefhtml.xsl
 VPATH=../../docsrc/lib
 
@@ -6,4 +9,7 @@ HTMLFILES = lib.html
 all: $(HTMLFILES)
 
 %.html : %.xml $(STYLE)
-       saxon $< $(STYLE) $@
+       $(XSLT) $< $(STYLE) $@
+
+clean:
+       rm -f $(HTMLFILES)

diff --git a/xsl/doc/reference.xsl b/xsl/doc/reference.xsl
index a5d3e98f7b6db2a01127b04fdfbba5b4a2869deb..c7283dfec954d2751977f3377b28c91cc94edf6f 100644 (file)
--- a/xsl/doc/reference.xsl
+++ b/xsl/doc/reference.xsl
@@ -12,7 +12,7 @@
 
 <xsl:template match="olink[@type='title']">
   <xsl:variable name="xml"
-                select="document(unparsed-entity-uri(@targetdocent))"/>
+                select="document(unparsed-entity-uri(@targetdocent),.)"/>
   <xsl:variable name="title" select="($xml/*/title[1]
                                       |$xml/*/bookinfo/title[1]
                                       |$xml/*/referenceinfo/title[1])[1]"/>