From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 3 Apr 2001 20:31:37 +0000 (+0000)
Subject: Documentation fixes
X-Git-Tag: release/1.79.1~6^2~6636
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e3220138fdccd5d854cd66c1f45b915068a6a57;p=docbook-dsssl

Documentation fixes
---

diff --git a/xsl/doc/.cvsignore b/xsl/doc/.cvsignore
new file mode 100644
index 000000000..2d19fc766
--- /dev/null
+++ b/xsl/doc/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
new file mode 100644
index 000000000..bb97b82b5
--- /dev/null
+++ b/xsl/doc/Makefile
@@ -0,0 +1,33 @@
+.PHONY : clean
+
+RSTYLE=reference.xsl
+BSTYLE=book.xsl
+VPATH=../docsrc
+SAXVER=-6
+
+all: copyright.html warranty.html reference.html index.html
+	cd common; make
+	cd lib; make
+	cd html; make
+	cd fo; make
+
+copyright.html: copyright.xml $(RSTYLE)
+	xnsgmls -sv -E 5 -c /share/doctypes/catalog $(VPATH)/$<
+	saxon $(SAXVER) $< $(RSTYLE) $@
+
+warranty.html: warranty.xml $(RSTYLE)
+	xnsgmls -sv -E 5 -c /share/doctypes/catalog $(VPATH)/$<
+	saxon $(SAXVER) $< $(RSTYLE) $@
+
+reference.html: reference.xml $(RSTYLE) lib/lib.xml common/common.xml \
+		html/param.xml html/ebnf.xml \
+		fo/param.xml fo/table.xml
+	xnsgmls -sv -E 5 -c /share/doctypes/catalog $(VPATH)/$<
+	saxon $(SAXVER) $< $(RSTYLE) $@
+
+index.html: documentation.xml $(BSTYLE) reference.xml
+	xnsgmls -sv -E 5 -c /share/doctypes/catalog $(VPATH)/$<
+	saxon $(SAXVER) $< $(BSTYLE) $@
+
+clean:
+	rm -f *.html common/*.html lib/*.html html/*.html fo/*.html
diff --git a/xsl/doc/book.xsl b/xsl/doc/book.xsl
new file mode 100644
index 000000000..45f6880a5
--- /dev/null
+++ b/xsl/doc/book.xsl
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:import href="../html/chunk.xsl"/>
+
+<xsl:param name="toc.section.depth" select="'1'"/>
+
+<xsl:param name="html.stylesheet" select="'reference.css'"/>
+
+<xsl:template match="olink[@type='title']">
+  <xsl:variable name="xml"
+                select="document(unparsed-entity-uri(@targetdocent))"/>
+  <xsl:variable name="title" select="($xml/*/title[1]
+                                      |$xml/*/bookinfo/title[1]
+                                      |$xml/*/referenceinfo/title[1])[1]"/>
+  <i>
+    <a href="{@localinfo}">
+      <xsl:apply-templates select="$title/*|$title/text()"/>
+    </a>
+  </i>
+</xsl:template>
+
+<xsl:template match="bookinfo/copyright|reference/copyright"
+              mode="titlepage.mode">
+  <xsl:variable name="years" select="year"/>
+  <xsl:variable name="holders" select="holder"/>
+
+  <p class="{name(.)}">
+    <a href="copyright.html">
+      <xsl:call-template name="gentext.element.name"/>
+    </a>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:call-template name="dingbat">
+      <xsl:with-param name="dingbat">copyright</xsl:with-param>
+    </xsl:call-template>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:apply-templates select="$years" mode="titlepage.mode"/>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:call-template name="gentext.by"/>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
+    <xsl:text>. </xsl:text>
+    <a href="warranty.html">No Warranty</a>
+    <xsl:text>.</xsl:text>
+  </p>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/xsl/doc/common/.cvsignore b/xsl/doc/common/.cvsignore
new file mode 100644
index 000000000..2d19fc766
--- /dev/null
+++ b/xsl/doc/common/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/xsl/doc/common/Makefile b/xsl/doc/common/Makefile
new file mode 100644
index 000000000..84cf60118
--- /dev/null
+++ b/xsl/doc/common/Makefile
@@ -0,0 +1,9 @@
+STYLE=../jrefhtml.xsl
+VPATH=../../docsrc/common
+
+HTMLFILES = common.html
+
+all: $(HTMLFILES)
+
+%.html : %.xml $(STYLE)
+	saxon $< $(STYLE) $@
diff --git a/xsl/doc/fo/.cvsignore b/xsl/doc/fo/.cvsignore
new file mode 100644
index 000000000..2d19fc766
--- /dev/null
+++ b/xsl/doc/fo/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/xsl/doc/fo/Makefile b/xsl/doc/fo/Makefile
new file mode 100644
index 000000000..a90a9372a
--- /dev/null
+++ b/xsl/doc/fo/Makefile
@@ -0,0 +1,9 @@
+STYLE=../jrefhtml.xsl
+VPATH=../../docsrc/fo
+
+HTMLFILES = param.html table.html
+
+all: $(HTMLFILES)
+
+%.html : %.xml $(STYLE)
+	saxon $< $(STYLE) $@
diff --git a/xsl/doc/html/.cvsignore b/xsl/doc/html/.cvsignore
new file mode 100644
index 000000000..2d19fc766
--- /dev/null
+++ b/xsl/doc/html/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/xsl/doc/html/Makefile b/xsl/doc/html/Makefile
new file mode 100644
index 000000000..f9f21b611
--- /dev/null
+++ b/xsl/doc/html/Makefile
@@ -0,0 +1,9 @@
+STYLE=../jrefhtml.xsl
+VPATH=../../docsrc/html
+
+HTMLFILES = param.html ebnf.html
+
+all: $(HTMLFILES)
+
+%.html : %.xml $(STYLE)
+	saxon $< $(STYLE) $@
diff --git a/xsl/doc/jrefhtml.xsl b/xsl/doc/jrefhtml.xsl
new file mode 100644
index 000000000..5123b274e
--- /dev/null
+++ b/xsl/doc/jrefhtml.xsl
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:import href="../docsrc/jrefhtml.xsl"/>
+
+<xsl:param name="html.stylesheet" select="'../reference.css'"/>
+
+<xsl:template match="copyright" mode="titlepage.mode">
+  <xsl:variable name="years" select="year"/>
+  <xsl:variable name="holders" select="holder"/>
+
+  <p class="{name(.)}">
+    <a href="../copyright.html">
+      <xsl:call-template name="gentext.element.name"/>
+    </a>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:call-template name="dingbat">
+      <xsl:with-param name="dingbat">copyright</xsl:with-param>
+    </xsl:call-template>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:apply-templates select="$years" mode="titlepage.mode"/>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:call-template name="gentext.by"/>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
+    <xsl:text>. </xsl:text>
+    <a href="../warranty.html">No Warranty</a>
+    <xsl:text>.</xsl:text>
+  </p>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/xsl/doc/lib/.cvsignore b/xsl/doc/lib/.cvsignore
new file mode 100644
index 000000000..2d19fc766
--- /dev/null
+++ b/xsl/doc/lib/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/xsl/doc/lib/Makefile b/xsl/doc/lib/Makefile
new file mode 100644
index 000000000..7a21c2d91
--- /dev/null
+++ b/xsl/doc/lib/Makefile
@@ -0,0 +1,9 @@
+STYLE=../jrefhtml.xsl
+VPATH=../../docsrc/lib
+
+HTMLFILES = lib.html
+
+all: $(HTMLFILES)
+
+%.html : %.xml $(STYLE)
+	saxon $< $(STYLE) $@
diff --git a/xsl/doc/reference.xsl b/xsl/doc/reference.xsl
new file mode 100644
index 000000000..a5d3e98f7
--- /dev/null
+++ b/xsl/doc/reference.xsl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:import href="../html/docbook.xsl"/>
+
+<xsl:param name="html.stylesheet" select="'reference.css'"/>
+
+<xsl:template match="/legalnotice">
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="olink[@type='title']">
+  <xsl:variable name="xml"
+                select="document(unparsed-entity-uri(@targetdocent))"/>
+  <xsl:variable name="title" select="($xml/*/title[1]
+                                      |$xml/*/bookinfo/title[1]
+                                      |$xml/*/referenceinfo/title[1])[1]"/>
+  <i>
+    <a href="{@localinfo}">
+      <xsl:apply-templates select="$title/*|$title/text()"/>
+    </a>
+  </i>
+</xsl:template>
+
+<xsl:template match="copyright" mode="titlepage.mode">
+  <xsl:variable name="years" select="year"/>
+  <xsl:variable name="holders" select="holder"/>
+
+  <p class="{name(.)}">
+    <a href="copyright.html">
+      <xsl:call-template name="gentext.element.name"/>
+    </a>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:call-template name="dingbat">
+      <xsl:with-param name="dingbat">copyright</xsl:with-param>
+    </xsl:call-template>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:apply-templates select="$years" mode="titlepage.mode"/>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:call-template name="gentext.by"/>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:apply-templates select="$holders" mode="titlepage.mode"/>
+    <xsl:text>. </xsl:text>
+    <a href="warranty.html">No Warranty</a>
+    <xsl:text>.</xsl:text>
+  </p>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 51a77edf0..d2c0821e6 100644
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,6 +1,15 @@
+DIRS=common lib html fo template
+
 all:
-	cd common; make
-	cd lib; make
-	cd html; make
-	cd fo; make
-	cd template; make
+	for i in $(DIRS) __bogus__; do \
+		if [ $$i != __bogus__ ] ; then \
+			echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
+		fi \
+	done
+
+clean:
+	for i in $(DIRS) __bogus__; do \
+		if [ $$i != __bogus__ ] ; then \
+			echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
+		fi \
+	done
diff --git a/xsl/docsrc/common/Makefile b/xsl/docsrc/common/Makefile
index c91756b93..3db2d185f 100644
--- a/xsl/docsrc/common/Makefile
+++ b/xsl/docsrc/common/Makefile
@@ -1,3 +1,6 @@
+XSLT=../../../cvstools/saxon
+XJPARSE=../../../cvstools/xjparse
+
 JSTYLE=../../docsrc/xsl2jref.xsl
 VPATH=../../common
 
@@ -5,6 +8,9 @@ XMLFILES = common.xml
 
 all: $(XMLFILES)
 
+clean:
+	rm -f $(XMLFILES)
+
 %.xml : %.xsl $(JSTYLE) ../../docsrc/legalnotice.xml
-	saxon -6 $< $(JSTYLE) /dev/null output-file=$@
-	xnsgmls -E 5 -sv -c /share/doctypes/catalog $@
+	$(XSLT) $< $(JSTYLE) /dev/null output-file=$@
+	$(XJPARSE) $@
diff --git a/xsl/docsrc/fo/Makefile b/xsl/docsrc/fo/Makefile
index 2b38ace57..b102e5014 100644
--- a/xsl/docsrc/fo/Makefile
+++ b/xsl/docsrc/fo/Makefile
@@ -1,3 +1,6 @@
+XSLT=../../../cvstools/saxon
+XJPARSE=../../../cvstools/xjparse
+
 JSTYLE=../../docsrc/xsl2jref.xsl
 VPATH=../../fo
 
@@ -5,5 +8,9 @@ XMLFILES = param.xml table.xml
 
 all: $(XMLFILES)
 
+clean:
+	rm -f $(XMLFILES)
+
 %.xml : %.xsl $(JSTYLE)
-	saxon -6 $< $(JSTYLE) - output-file=$@
+	$(XSLT) $< $(JSTYLE) /dev/null output-file=$@
+	$(XJPARSE) $@
diff --git a/xsl/docsrc/html/Makefile b/xsl/docsrc/html/Makefile
index f8304a7f0..5acfb3d03 100644
--- a/xsl/docsrc/html/Makefile
+++ b/xsl/docsrc/html/Makefile
@@ -1,3 +1,6 @@
+XSLT=../../../cvstools/saxon
+XJPARSE=../../../cvstools/xjparse
+
 JSTYLE=../../docsrc/xsl2jref.xsl
 VPATH=../../html
 
@@ -5,5 +8,9 @@ XMLFILES = param.xml ebnf.xml
 
 all: $(XMLFILES)
 
+clean:
+	rm -f $(XMLFILES)
+
 %.xml : %.xsl $(JSTYLE)
-	saxon -6 $< $(JSTYLE) /dev/null output-file=$@
+	$(XSLT) $< $(JSTYLE) /dev/null output-file=$@
+	$(XJPARSE) $@
diff --git a/xsl/docsrc/jrefhtml.xsl b/xsl/docsrc/jrefhtml.xsl
index b176fcabb..f1c21981e 100644
--- a/xsl/docsrc/jrefhtml.xsl
+++ b/xsl/docsrc/jrefhtml.xsl
@@ -1,7 +1,5 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                exclude-result-prefixes="lxslt"
                 version='1.0'>
 
 <xsl:import href="../html/docbook.xsl"/>
@@ -23,8 +21,6 @@
 
 <!-- ==================================================================== -->
 
-<xsl:template match="lxslt:component"/>
-
 <xsl:param name="part.autolabel" select="0"/>
 
 <xsl:template match="refentry">
diff --git a/xsl/docsrc/lib/Makefile b/xsl/docsrc/lib/Makefile
index e4c522c90..228c46c9f 100644
--- a/xsl/docsrc/lib/Makefile
+++ b/xsl/docsrc/lib/Makefile
@@ -1,3 +1,6 @@
+XSLT=../../../cvstools/saxon
+XJPARSE=../../../cvstools/xjparse
+
 JSTYLE=../../docsrc/xsl2jref.xsl
 VPATH=../../lib
 
@@ -5,5 +8,9 @@ XMLFILES = lib.xml
 
 all: $(XMLFILES)
 
+clean:
+	rm -f $(XMLFILES)
+
 %.xml : %.xsl $(JSTYLE)
-	saxon -6 $< $(JSTYLE) /dev/null output-file=$@
+	$(XSLT) $< $(JSTYLE) /dev/null output-file=$@
+	$(XJPARSE) $@
diff --git a/xsl/docsrc/template/Makefile b/xsl/docsrc/template/Makefile
index 30b891eb6..1c45f23df 100644
--- a/xsl/docsrc/template/Makefile
+++ b/xsl/docsrc/template/Makefile
@@ -1,3 +1,6 @@
+XSLT=../../../cvstools/saxon
+XJPARSE=../../../cvstools/xjparse
+
 JSTYLE=../../docsrc/xsl2jref.xsl
 VPATH=../../template
 
@@ -5,6 +8,9 @@ XMLFILES = titlepage.xml
 
 all: $(XMLFILES)
 
+clean:
+	rm -f $(XMLFILES)
+
 %.xml : %.xsl $(JSTYLE)
-	saxon -6 $< $(JSTYLE) /dev/null output-file=$@
-	xnsgmls -E 5 -sv -c /share/doctypes/catalog $@
+	$(XSLT) $< $(JSTYLE) /dev/null output-file=$@
+	$(XJPARSE) $@
diff --git a/xsl/docsrc/xsl2jref.xsl b/xsl/docsrc/xsl2jref.xsl
index 7fe10463a..297d57a0c 100644
--- a/xsl/docsrc/xsl2jref.xsl
+++ b/xsl/docsrc/xsl2jref.xsl
@@ -4,14 +4,11 @@
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'
-                xmlns:docbook="http://www.oasis-open.org/docbook/xml/4.0"
                 xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:xt="http://www.jclark.com/xt"
-                xmlns:saxon="http://icl.com/saxon"
                 xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect"
-                exclude-result-prefixes="doc docbook xsl"
-                extension-element-prefixes="xt saxon xalanredirect lxslt">
+                exclude-result-prefixes="doc xsl lxslt">
+
+<xsl:include href="../html/chunker.xsl"/>
 
 <xsl:output
      method="xml"
@@ -38,6 +35,12 @@
 
 <!-- ==================================================================== -->
 
+<xsl:template match="lxslt:*">
+  <!-- nop -->
+</xsl:template>
+
+<!-- ==================================================================== -->
+
 <xsl:template match="/">
   <xsl:choose>
     <xsl:when test="$output-file = ''">
@@ -46,22 +49,14 @@
       </xsl:message>
     </xsl:when>
     <xsl:when test="/xsl:stylesheet/doc:*">
-      <xt:document method="xml" href="{$output-file}">
-        <xsl:apply-templates/>
-        <xsl:fallback>
-          <xalanredirect:write file="{$output-file}">
-            <xsl:apply-templates/>
-            <xsl:fallback>
-              <saxon:output method="xml" file="{$output-file}">
-                <xsl:apply-templates/>
-                <xsl:fallback>
-                  <xsl:apply-templates/>
-                </xsl:fallback>
-              </saxon:output>
-            </xsl:fallback>
-          </xalanredirect:write>
-        </xsl:fallback>
-      </xt:document>
+      <xsl:call-template name="write.chunk">
+        <xsl:with-param name="filename" select="$output-file"/>
+        <xsl:with-param name="method" select="'xml'"/>
+        <xsl:with-param name="encoding" select="'utf-8'"/>
+        <xsl:with-param name="content">
+          <xsl:apply-templates/>
+        </xsl:with-param>
+      </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
       <!-- nop -->
@@ -105,7 +100,10 @@
 </xsl:template>
 
 <xsl:template match="xsl:include">
+  <!-- nop -->
+<!--
   <xsl:apply-templates select="document(@href)/*"/>
+-->
 </xsl:template>
 
 <xsl:template match="@*" mode="copy">
@@ -302,7 +300,7 @@
 </xsl:template>
 
 <xsl:template match="doc:attribute-set">
-  <xsl:variable name="name" select="@mode"/>
+  <xsl:variable name="name" select="@name"/>
 
   <refentry id="attrset.{$name}">
     <refnamediv>
diff --git a/xsl/fo/param.xsl b/xsl/fo/param.xsl
index 9db4d1d16..22aec224e 100644
--- a/xsl/fo/param.xsl
+++ b/xsl/fo/param.xsl
@@ -343,7 +343,7 @@ callouts should not be used.
 <xsl:param name="callout.unicode.start.character" select="10102"
            doc:type='integer'/>
 
-<doc:param name="callout.graphics.number.limit" xmlns="">
+<doc:param name="callout.unicode.start.character" xmlns="">
 <refpurpose>Number of the largest callout graphic</refpurpose>
 <refdescription>
 <para>If <parameter>callout.graphics</parameter>
@@ -362,7 +362,7 @@ be used.
 <xsl:param name="callout.unicode.number.limit" select="'10'"
            doc:type='integer'/>
 
-<doc:param name="callout.graphics.number.limit" xmlns="">
+<doc:param name="callout.unicode.number.limit" xmlns="">
 <refpurpose>Number of the largest callout graphic</refpurpose>
 <refdescription>
 <para>If <parameter>callout.graphics</parameter>
diff --git a/xsl/html/param.xsl b/xsl/html/param.xsl
index 5f16be9d1..acaa6f71a 100644
--- a/xsl/html/param.xsl
+++ b/xsl/html/param.xsl
@@ -723,7 +723,7 @@ have, surprise, line numbers.
 <!-- ==================================================================== -->
 <xsl:param name="linenumbering.extension" select="'1'" doc:type='boolean'/>
 
-<doc:param name="saxon.linenumbering" xmlns="">
+<doc:param name="linenumbering.extension" xmlns="">
 <refpurpose>Enable the line numbering extension</refpurpose>
 <refdescription>
 <para>If true, verbatim environments (elements that have the
@@ -863,7 +863,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="tablecolumns.extension" select="'1'" doc:type='boolean'/>
 
-<doc:param name="saxon.tablecolumns" xmlns="">
+<doc:param name="tablecolumns.extension" xmlns="">
 <refpurpose>Enable the table columns extension function</refpurpose>
 <refdescription>
 <para>The table columns extension function adjusts the widths of table
@@ -876,7 +876,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.set.toc" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.set.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -887,7 +887,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.book.toc" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.book.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -898,7 +898,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.part.toc" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.part.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -909,7 +909,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.reference.toc" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.reference.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -920,7 +920,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.preface.toc" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.preface.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -931,7 +931,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.chapter.toc" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.chapter.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -942,7 +942,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.appendix.toc" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.appendix.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -953,7 +953,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.article.toc" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.article.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -964,7 +964,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.section.toc" select='0' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.section.toc" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -975,7 +975,7 @@ in the CALS table.
 <!-- ==================================================================== -->
 <xsl:param name="generate.index" select='1' doc:type='boolean'/>
 
-<doc:param name="" xmlns="">
+<doc:param name="generate.index" xmlns="">
 <refpurpose>FIXME:</refpurpose>
 <refdescription>
 <para>FIXME:
@@ -998,7 +998,7 @@ in the CALS table.
 <xsl:param name="callout.unicode.start.character" select="10102"
            doc:type='integer'/>
 
-<doc:param name="callout.graphics.number.limit" xmlns="">
+<doc:param name="callout.unicode.start.character" xmlns="">
 <refpurpose>Number of the largest callout graphic</refpurpose>
 <refdescription>
 <para>If <parameter>callout.graphics</parameter>
@@ -1017,7 +1017,7 @@ be used.
 <xsl:param name="callout.unicode.number.limit" select="'10'"
            doc:type='integer'/>
 
-<doc:param name="callout.graphics.number.limit" xmlns="">
+<doc:param name="callout.unicode.number.limit" xmlns="">
 <refpurpose>Number of the largest callout graphic</refpurpose>
 <refdescription>
 <para>If <parameter>callout.graphics</parameter>
diff --git a/xsl/lib/lib.xsl b/xsl/lib/lib.xsl
index 7aa690b47..178fae16d 100644
--- a/xsl/lib/lib.xsl
+++ b/xsl/lib/lib.xsl
@@ -95,8 +95,8 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 <refpurpose>Substitute one text string for another in a string</refpurpose>
 <refdescription>
 <para>The <function>string.subst</function> template replaces all
-occurances of <param>target</param> in <param>string</param>
-with <param>replacement</param> and returns the result.
+occurances of <parameter>target</parameter> in <parameter>string</parameter>
+with <parameter>replacement</parameter> and returns the result.
 </para>
 </refdescription>
 </doc:template>
@@ -198,7 +198,7 @@ unqualified length ("20" for "20pt") from a dimension.
 <refdescription>
 <para>The <function>length-spec</function> template returns the
 qualified length from a dimension. If an unqualified length is given,
-the <param>default.units</param> will be added to it.
+the <parameter>default.units</parameter> will be added to it.
 </para>
 </refdescription>
 </doc:template>