From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 4 Dec 2001 19:44:30 +0000 (+0000)
Subject: Updated parameters and parameter consistency checking
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fa8f9e52d96760b1d99d9ad6c963b83d7e79371;p=docbook-dsssl

Updated parameters and parameter consistency checking
---

diff --git a/xsl/html/Makefile b/xsl/html/Makefile
index 7aec549dc..e9c35e8de 100644
--- a/xsl/html/Makefile
+++ b/xsl/html/Makefile
@@ -1,126 +1,7 @@
 XSLT=../../cvstools/saxon
 XJPARSE=../../cvstools/xjparse
 
-PARAMS=../params/admon.graphics.xml \
-       ../params/admon.graphics.extension.xml \
-       ../params/admon.graphics.path.xml \
-       ../params/admon.style.xml \
-       ../params/annotate.toc.xml \
-       ../params/author.othername.in.middle.xml \
-       ../params/base.dir.xml \
-       ../params/biblioentry.item.separator.xml \
-       ../params/bibliography.collection.xml \
-       ../params/bridgehead.in.toc.xml \
-       ../params/callout.defaultcolumn.xml \
-       ../params/callout.graphics.xml \
-       ../params/callout.graphics.extension.xml \
-       ../params/callout.graphics.number.limit.xml \
-       ../params/callout.graphics.path.xml \
-       ../params/callout.list.table.xml \
-       ../params/callout.unicode.xml \
-       ../params/callout.unicode.font.xml \
-       ../params/callout.unicode.number.limit.xml \
-       ../params/callout.unicode.start.character.xml \
-       ../params/callouts.extension.xml \
-       ../params/chapter.autolabel.xml \
-       ../params/chunk.first.sections.xml \
-       ../params/chunk.sections.xml \
-       ../params/citerefentry.link.xml \
-       ../params/css.decoration.xml \
-       ../params/default.encoding.xml \
-       ../params/default.table.width.xml \
-       ../params/emphasis.propagates.style.xml \
-       ../params/formal.procedures.xml \
-       ../params/funcsynopsis.decoration.xml \
-       ../params/funcsynopsis.style.xml \
-       ../params/function.parens.xml \
-       ../params/generate.appendix.toc.xml \
-       ../params/generate.article.toc.xml \
-       ../params/generate.book.toc.xml \
-       ../params/generate.chapter.toc.xml \
-       ../params/generate.component.toc.xml \
-       ../params/generate.division.toc.xml \
-       ../params/generate.index.xml \
-       ../params/generate.part.toc.xml \
-       ../params/generate.preface.toc.xml \
-       ../params/generate.qandadiv.toc.xml \
-       ../params/generate.qandaset.toc.xml \
-       ../params/generate.reference.toc.xml \
-       ../params/generate.section.toc.xml \
-       ../params/generate.section.toc.level.xml \
-       ../params/generate.set.toc.xml \
-       ../params/glossterm.auto.link.xml \
-       ../params/graphic.default.extension.xml \
-       ../params/html.base.xml \
-       ../params/html.longdesc.xml \
-       ../params/html.longdesc.link.xml \
-       ../params/html.ext.xml \
-       ../params/html.stylesheet.xml \
-       ../params/html.stylesheet.type.xml \
-       ../params/inherit.keywords.xml \
-       ../params/label.from.part.xml \
-       ../params/linenumbering.everyNth.xml \
-       ../params/linenumbering.extension.xml \
-       ../params/linenumbering.separator.xml \
-       ../params/linenumbering.width.xml \
-       ../params/link.mailto.url.xml \
-       ../params/make.single.year.ranges.xml \
-       ../params/make.year.ranges.xml \
-       ../params/nominal.table.width.xml \
-       ../params/part.autolabel.xml \
-       ../params/phrase.propagates.style.xml \
-       ../params/preface.autolabel.xml \
-       ../params/process.empty.source.toc.xml \
-       ../params/process.source.toc.xml \
-       ../params/qanda.defaultlabel.xml \
-       ../params/qanda.inherit.numeration.xml \
-       ../params/qandadiv.autolabel.xml \
-       ../params/refentry.generate.name.xml \
-       ../params/refentry.separator.xml \
-       ../params/refentry.xref.manvolnum.xml \
-       ../params/root.filename.xml \
-       ../params/rootid.xml \
-       ../params/runinhead.default.title.end.punct.xml \
-       ../params/runinhead.title.end.punct.xml \
-       ../params/saxon.callouts.xml \
-       ../params/saxon.character.representation.xml \
-       ../params/saxon.linenumbering.xml \
-       ../params/saxon.tablecolumns.xml \
-       ../params/section.autolabel.xml \
-       ../params/section.label.includes.component.label.xml \
-       ../params/show.comments.xml \
-       ../params/show.revisionflag.xml \
-       ../params/spacing.paras.xml \
-       ../params/stylesheet.result.type.xml \
-       ../params/suppress.navigation.xml \
-       ../params/tablecolumns.extension.xml \
-       ../params/textinsert.extension.xml \
-       ../params/toc.list.type.xml \
-       ../params/toc.section.depth.xml \
-       ../params/ulink.target.xml \
-       ../params/use.extensions.xml \
-       ../params/use.id.as.filename.xml \
-       ../params/use.id.function.xml \
-       ../params/using.chunker.xml \
-       ../params/appendix.autolabel.xml \
-       ../params/olink.fragid.xml \
-       ../params/olink.outline.ext.xml \
-       ../params/olink.pubid.xml \
-       ../params/olink.sysid.xml \
-       ../params/olink.resolver.xml \
-       ../params/refentry.separator.xml \
-       ../params/shade.verbatim.xml \
-       ../params/shade.verbatim.style.xml \
-       ../params/ebnf.table.bgcolor.xml \
-       ../params/ebnf.table.border.xml \
-       ../params/autotoc.label.separator.xml \
-       ../params/chunk.datafile.xml \
-       ../params/saxon.character.representation.xml \
-       ../params/generate.legalnotice.link.xml \
-       ../params/table.borders.with.css.xml \
-       ../params/table.border.thickness.xml \
-       ../params/table.border.style.xml \
-       ../params/table.border.color.xml
+include Makefile.param
 
 all: titlepage.templates.xsl param.xsl
 
@@ -129,9 +10,11 @@ xml: param.xml
 html: param.html
 
 param.html: param.xml
+	../../cvstools/paramchk -m Makefile.param $<
 	$(XSLT) $< ../docsrc/lrefentry.xsl $@
 
 param.xml: param.xweb $(PARAMS)
+	../../cvstools/paramchk -m Makefile.param $<
 	$(XSLT) $< ../../litprog/wdocbook.xsl $@
 
 param.xsl: param.xweb $(PARAMS)
@@ -139,3 +22,7 @@ param.xsl: param.xweb $(PARAMS)
 
 titlepage.templates.xsl: titlepage.templates.xml ../template/titlepage.xsl
 	$(XSLT) $< ../template/titlepage.xsl $@
+
+Makefile.param:
+	../../cvstools/paramchk -m $@ param.xweb
+	make
diff --git a/xsl/html/Makefile.param b/xsl/html/Makefile.param
new file mode 100644
index 000000000..618bcf80e
--- /dev/null
+++ b/xsl/html/Makefile.param
@@ -0,0 +1,131 @@
+PARAMS=../params/admon.graphics.xml \
+       ../params/admon.graphics.extension.xml \
+       ../params/admon.graphics.path.xml \
+       ../params/admon.style.xml \
+       ../params/annotate.toc.xml \
+       ../params/appendix.autolabel.xml \
+       ../params/author.othername.in.middle.xml \
+       ../params/autotoc.label.separator.xml \
+       ../params/base.dir.xml \
+       ../params/biblioentry.item.separator.xml \
+       ../params/bibliography.collection.xml \
+       ../params/bridgehead.in.toc.xml \
+       ../params/callout.defaultcolumn.xml \
+       ../params/callout.graphics.xml \
+       ../params/callout.graphics.extension.xml \
+       ../params/callout.graphics.number.limit.xml \
+       ../params/callout.graphics.path.xml \
+       ../params/callout.list.table.xml \
+       ../params/callout.unicode.xml \
+       ../params/callout.unicode.font.xml \
+       ../params/callout.unicode.number.limit.xml \
+       ../params/callout.unicode.start.character.xml \
+       ../params/callouts.extension.xml \
+       ../params/chapter.autolabel.xml \
+       ../params/chunk.datafile.xml \
+       ../params/chunk.first.sections.xml \
+       ../params/chunk.sections.xml \
+       ../params/citerefentry.link.xml \
+       ../params/css.decoration.xml \
+       ../params/default.encoding.xml \
+       ../params/default.table.width.xml \
+       ../params/ebnf.table.bgcolor.xml \
+       ../params/ebnf.table.border.xml \
+       ../params/emphasis.propagates.style.xml \
+       ../params/formal.procedures.xml \
+       ../params/funcsynopsis.decoration.xml \
+       ../params/funcsynopsis.style.xml \
+       ../params/function.parens.xml \
+       ../params/generate.appendix.toc.xml \
+       ../params/generate.article.toc.xml \
+       ../params/generate.book.toc.xml \
+       ../params/generate.chapter.toc.xml \
+       ../params/generate.component.toc.xml \
+       ../params/generate.division.toc.xml \
+       ../params/generate.index.xml \
+       ../params/generate.legalnotice.link.xml \
+       ../params/generate.part.toc.xml \
+       ../params/generate.preface.toc.xml \
+       ../params/generate.qandadiv.toc.xml \
+       ../params/generate.qandaset.toc.xml \
+       ../params/generate.reference.toc.xml \
+       ../params/generate.section.toc.xml \
+       ../params/generate.section.toc.level.xml \
+       ../params/generate.set.toc.xml \
+       ../params/glossterm.auto.link.xml \
+       ../params/graphic.default.extension.xml \
+       ../params/html.base.xml \
+       ../params/html.ext.xml \
+       ../params/html.longdesc.xml \
+       ../params/html.longdesc.link.xml \
+       ../params/html.stylesheet.xml \
+       ../params/html.stylesheet.type.xml \
+       ../params/htmlhelp.alias.file.xml \
+       ../params/htmlhelp.autolabel.xml \
+       ../params/htmlhelp.chm.xml \
+       ../params/htmlhelp.encoding.xml \
+       ../params/htmlhelp.enumerate.images.xml \
+       ../params/htmlhelp.force.map.and.alias.xml \
+       ../params/htmlhelp.hhc.xml \
+       ../params/htmlhelp.hhc.section.depth.xml \
+       ../params/htmlhelp.hhp.xml \
+       ../params/htmlhelp.hhp.tail.xml \
+       ../params/htmlhelp.map.file.xml \
+       ../params/inherit.keywords.xml \
+       ../params/label.from.part.xml \
+       ../params/linenumbering.everyNth.xml \
+       ../params/linenumbering.extension.xml \
+       ../params/linenumbering.separator.xml \
+       ../params/linenumbering.width.xml \
+       ../params/link.mailto.url.xml \
+       ../params/make.single.year.ranges.xml \
+       ../params/make.year.ranges.xml \
+       ../params/navig.graphics.xml \
+       ../params/navig.graphics.extension.xml \
+       ../params/navig.graphics.path.xml \
+       ../params/navig.showtitles.xml \
+       ../params/nominal.table.width.xml \
+       ../params/olink.fragid.xml \
+       ../params/olink.outline.ext.xml \
+       ../params/olink.pubid.xml \
+       ../params/olink.resolver.xml \
+       ../params/olink.sysid.xml \
+       ../params/part.autolabel.xml \
+       ../params/phrase.propagates.style.xml \
+       ../params/preface.autolabel.xml \
+       ../params/process.empty.source.toc.xml \
+       ../params/process.source.toc.xml \
+       ../params/punct.honorific.xml \
+       ../params/qanda.defaultlabel.xml \
+       ../params/qanda.inherit.numeration.xml \
+       ../params/qandadiv.autolabel.xml \
+       ../params/refentry.generate.name.xml \
+       ../params/refentry.separator.xml \
+       ../params/refentry.xref.manvolnum.xml \
+       ../params/root.filename.xml \
+       ../params/rootid.xml \
+       ../params/runinhead.default.title.end.punct.xml \
+       ../params/runinhead.title.end.punct.xml \
+       ../params/saxon.character.representation.xml \
+       ../params/section.autolabel.xml \
+       ../params/section.label.includes.component.label.xml \
+       ../params/segmentedlist.as.table.xml \
+       ../params/shade.verbatim.xml \
+       ../params/shade.verbatim.style.xml \
+       ../params/show.comments.xml \
+       ../params/show.revisionflag.xml \
+       ../params/spacing.paras.xml \
+       ../params/stylesheet.result.type.xml \
+       ../params/suppress.navigation.xml \
+       ../params/table.border.color.xml \
+       ../params/table.border.style.xml \
+       ../params/table.border.thickness.xml \
+       ../params/table.borders.with.css.xml \
+       ../params/tablecolumns.extension.xml \
+       ../params/textinsert.extension.xml \
+       ../params/toc.list.type.xml \
+       ../params/toc.section.depth.xml \
+       ../params/ulink.target.xml \
+       ../params/use.extensions.xml \
+       ../params/use.id.as.filename.xml \
+       ../params/using.chunker.xml
diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 03eb45369..8df3f8aea 100644
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -3,7 +3,9 @@
 <!ENTITY admon.graphics.path SYSTEM "../params/admon.graphics.path.xml">
 <!ENTITY admon.style SYSTEM "../params/admon.style.xml">
 <!ENTITY annotate.toc SYSTEM "../params/annotate.toc.xml">
+<!ENTITY appendix.autolabel SYSTEM "../params/appendix.autolabel.xml">
 <!ENTITY author.othername.in.middle SYSTEM "../params/author.othername.in.middle.xml">
+<!ENTITY autotoc.label.separator SYSTEM "../params/autotoc.label.separator.xml">
 <!ENTITY base.dir SYSTEM "../params/base.dir.xml">
 <!ENTITY biblioentry.item.separator SYSTEM "../params/biblioentry.item.separator.xml">
 <!ENTITY bibliography.collection SYSTEM "../params/bibliography.collection.xml">
@@ -20,12 +22,15 @@
 <!ENTITY callout.unicode.start.character SYSTEM "../params/callout.unicode.start.character.xml">
 <!ENTITY callouts.extension SYSTEM "../params/callouts.extension.xml">
 <!ENTITY chapter.autolabel SYSTEM "../params/chapter.autolabel.xml">
+<!ENTITY chunk.datafile SYSTEM "../params/chunk.datafile.xml">
 <!ENTITY chunk.first.sections SYSTEM "../params/chunk.first.sections.xml">
 <!ENTITY chunk.sections SYSTEM "../params/chunk.sections.xml">
 <!ENTITY citerefentry.link SYSTEM "../params/citerefentry.link.xml">
 <!ENTITY css.decoration SYSTEM "../params/css.decoration.xml">
 <!ENTITY default.encoding SYSTEM "../params/default.encoding.xml">
 <!ENTITY default.table.width SYSTEM "../params/default.table.width.xml">
+<!ENTITY ebnf.table.bgcolor SYSTEM "../params/ebnf.table.bgcolor.xml">
+<!ENTITY ebnf.table.border SYSTEM "../params/ebnf.table.border.xml">
 <!ENTITY emphasis.propagates.style SYSTEM "../params/emphasis.propagates.style.xml">
 <!ENTITY formal.procedures SYSTEM "../params/formal.procedures.xml">
 <!ENTITY funcsynopsis.decoration SYSTEM "../params/funcsynopsis.decoration.xml">
@@ -38,6 +43,7 @@
 <!ENTITY generate.component.toc SYSTEM "../params/generate.component.toc.xml">
 <!ENTITY generate.division.toc SYSTEM "../params/generate.division.toc.xml">
 <!ENTITY generate.index SYSTEM "../params/generate.index.xml">
+<!ENTITY generate.legalnotice.link SYSTEM "../params/generate.legalnotice.link.xml">
 <!ENTITY generate.part.toc SYSTEM "../params/generate.part.toc.xml">
 <!ENTITY generate.preface.toc SYSTEM "../params/generate.preface.toc.xml">
 <!ENTITY generate.qandadiv.toc SYSTEM "../params/generate.qandadiv.toc.xml">
@@ -49,11 +55,22 @@
 <!ENTITY glossterm.auto.link SYSTEM "../params/glossterm.auto.link.xml">
 <!ENTITY graphic.default.extension SYSTEM "../params/graphic.default.extension.xml">
 <!ENTITY html.base SYSTEM "../params/html.base.xml">
+<!ENTITY html.ext SYSTEM "../params/html.ext.xml">
 <!ENTITY html.longdesc SYSTEM "../params/html.longdesc.xml">
 <!ENTITY html.longdesc.link SYSTEM "../params/html.longdesc.link.xml">
-<!ENTITY html.ext SYSTEM "../params/html.ext.xml">
 <!ENTITY html.stylesheet SYSTEM "../params/html.stylesheet.xml">
 <!ENTITY html.stylesheet.type SYSTEM "../params/html.stylesheet.type.xml">
+<!ENTITY htmlhelp.alias.file SYSTEM "../params/htmlhelp.alias.file.xml">
+<!ENTITY htmlhelp.autolabel SYSTEM "../params/htmlhelp.autolabel.xml">
+<!ENTITY htmlhelp.chm SYSTEM "../params/htmlhelp.chm.xml">
+<!ENTITY htmlhelp.encoding SYSTEM "../params/htmlhelp.encoding.xml">
+<!ENTITY htmlhelp.enumerate.images SYSTEM "../params/htmlhelp.enumerate.images.xml">
+<!ENTITY htmlhelp.force.map.and.alias SYSTEM "../params/htmlhelp.force.map.and.alias.xml">
+<!ENTITY htmlhelp.hhc SYSTEM "../params/htmlhelp.hhc.xml">
+<!ENTITY htmlhelp.hhc.section.depth SYSTEM "../params/htmlhelp.hhc.section.depth.xml">
+<!ENTITY htmlhelp.hhp SYSTEM "../params/htmlhelp.hhp.xml">
+<!ENTITY htmlhelp.hhp.tail SYSTEM "../params/htmlhelp.hhp.tail.xml">
+<!ENTITY htmlhelp.map.file SYSTEM "../params/htmlhelp.map.file.xml">
 <!ENTITY inherit.keywords SYSTEM "../params/inherit.keywords.xml">
 <!ENTITY label.from.part SYSTEM "../params/label.from.part.xml">
 <!ENTITY linenumbering.everyNth SYSTEM "../params/linenumbering.everyNth.xml">
@@ -68,6 +85,11 @@
 <!ENTITY navig.graphics.path SYSTEM "../params/navig.graphics.path.xml">
 <!ENTITY navig.showtitles SYSTEM "../params/navig.showtitles.xml">
 <!ENTITY nominal.table.width SYSTEM "../params/nominal.table.width.xml">
+<!ENTITY olink.fragid SYSTEM "../params/olink.fragid.xml">
+<!ENTITY olink.outline.ext SYSTEM "../params/olink.outline.ext.xml">
+<!ENTITY olink.pubid SYSTEM "../params/olink.pubid.xml">
+<!ENTITY olink.resolver SYSTEM "../params/olink.resolver.xml">
+<!ENTITY olink.sysid SYSTEM "../params/olink.sysid.xml">
 <!ENTITY part.autolabel SYSTEM "../params/part.autolabel.xml">
 <!ENTITY phrase.propagates.style SYSTEM "../params/phrase.propagates.style.xml">
 <!ENTITY preface.autolabel SYSTEM "../params/preface.autolabel.xml">
@@ -84,18 +106,21 @@
 <!ENTITY rootid SYSTEM "../params/rootid.xml">
 <!ENTITY runinhead.default.title.end.punct SYSTEM "../params/runinhead.default.title.end.punct.xml">
 <!ENTITY runinhead.title.end.punct SYSTEM "../params/runinhead.title.end.punct.xml">
-<!ENTITY saxon.callouts SYSTEM "../params/saxon.callouts.xml">
 <!ENTITY saxon.character.representation SYSTEM "../params/saxon.character.representation.xml">
-<!ENTITY saxon.linenumbering SYSTEM "../params/saxon.linenumbering.xml">
-<!ENTITY saxon.tablecolumns SYSTEM "../params/saxon.tablecolumns.xml">
 <!ENTITY section.autolabel SYSTEM "../params/section.autolabel.xml">
 <!ENTITY section.label.includes.component.label SYSTEM "../params/section.label.includes.component.label.xml">
 <!ENTITY segmentedlist.as.table SYSTEM "../params/segmentedlist.as.table.xml">
+<!ENTITY shade.verbatim SYSTEM "../params/shade.verbatim.xml">
+<!ENTITY shade.verbatim.style SYSTEM "../params/shade.verbatim.style.xml">
 <!ENTITY show.comments SYSTEM "../params/show.comments.xml">
 <!ENTITY show.revisionflag SYSTEM "../params/show.revisionflag.xml">
 <!ENTITY spacing.paras SYSTEM "../params/spacing.paras.xml">
 <!ENTITY stylesheet.result.type SYSTEM "../params/stylesheet.result.type.xml">
 <!ENTITY suppress.navigation SYSTEM "../params/suppress.navigation.xml">
+<!ENTITY table.border.color SYSTEM "../params/table.border.color.xml">
+<!ENTITY table.border.style SYSTEM "../params/table.border.style.xml">
+<!ENTITY table.border.thickness SYSTEM "../params/table.border.thickness.xml">
+<!ENTITY table.borders.with.css SYSTEM "../params/table.borders.with.css.xml">
 <!ENTITY tablecolumns.extension SYSTEM "../params/tablecolumns.extension.xml">
 <!ENTITY textinsert.extension SYSTEM "../params/textinsert.extension.xml">
 <!ENTITY toc.list.type SYSTEM "../params/toc.list.type.xml">
@@ -103,37 +128,4 @@
 <!ENTITY ulink.target SYSTEM "../params/ulink.target.xml">
 <!ENTITY use.extensions SYSTEM "../params/use.extensions.xml">
 <!ENTITY use.id.as.filename SYSTEM "../params/use.id.as.filename.xml">
-<!ENTITY use.id.function SYSTEM "../params/use.id.function.xml">
 <!ENTITY using.chunker SYSTEM "../params/using.chunker.xml">
-<!ENTITY appendix.autolabel SYSTEM "../params/appendix.autolabel.xml">
-<!ENTITY olink.fragid SYSTEM "../params/olink.fragid.xml">
-<!ENTITY olink.outline.ext SYSTEM "../params/olink.outline.ext.xml">
-<!ENTITY olink.pubid SYSTEM "../params/olink.pubid.xml">
-<!ENTITY olink.sysid SYSTEM "../params/olink.sysid.xml">
-<!ENTITY olink.resolver SYSTEM "../params/olink.resolver.xml">
-<!ENTITY refentry.separator SYSTEM "../params/refentry.separator.xml">
-<!ENTITY shade.verbatim SYSTEM "../params/shade.verbatim.xml">
-<!ENTITY shade.verbatim.style SYSTEM "../params/shade.verbatim.style.xml">
-<!ENTITY ebnf.table.bgcolor SYSTEM "../params/ebnf.table.bgcolor.xml">
-<!ENTITY ebnf.table.border SYSTEM "../params/ebnf.table.border.xml">
-<!ENTITY autotoc.label.separator SYSTEM "../params/autotoc.label.separator.xml">
-<!ENTITY chunk.datafile SYSTEM "../params/chunk.datafile.xml">
-<!ENTITY saxon.character.representation SYSTEM "../params/saxon.character.representation.xml">
-<!ENTITY generate.legalnotice.link SYSTEM "../params/generate.legalnotice.link.xml">
-
-<!ENTITY table.borders.with.css SYSTEM "../params/table.borders.with.css.xml">
-<!ENTITY table.border.thickness SYSTEM "../params/table.border.thickness.xml">
-<!ENTITY table.border.style SYSTEM "../params/table.border.style.xml">
-<!ENTITY table.border.color SYSTEM "../params/table.border.color.xml">
-
-<!ENTITY htmlhelp.encoding SYSTEM "../params/htmlhelp.encoding.xml">
-<!ENTITY htmlhelp.autolabel SYSTEM "../params/htmlhelp.autolabel.xml">
-<!ENTITY htmlhelp.chm SYSTEM "../params/htmlhelp.chm.xml">
-<!ENTITY htmlhelp.hhp SYSTEM "../params/htmlhelp.hhp.xml">
-<!ENTITY htmlhelp.hhc SYSTEM "../params/htmlhelp.hhc.xml">
-<!ENTITY htmlhelp.hhp.tail SYSTEM "../params/htmlhelp.hhp.tail.xml">
-<!ENTITY htmlhelp.enumerate.images SYSTEM "../params/htmlhelp.enumerate.images.xml">
-<!ENTITY htmlhelp.force.map.and.alias SYSTEM "../params/htmlhelp.force.map.and.alias.xml">
-<!ENTITY htmlhelp.map.file SYSTEM "../params/htmlhelp.map.file.xml">
-<!ENTITY htmlhelp.alias.file SYSTEM "../params/htmlhelp.alias.file.xml">
-<!ENTITY htmlhelp.hhc.section.depth SYSTEM "../params/htmlhelp.hhc.section.depth.xml">
diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index a2443eb56..5d1de854a 100644
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -112,9 +112,6 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 </reference>
 
 <reference><title>Extensions</title>
-&saxon.callouts;
-&saxon.linenumbering;
-&saxon.tablecolumns;
 &linenumbering.everyNth;
 &linenumbering.extension;
 &linenumbering.separator;
@@ -225,7 +222,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &html.ext;
 &root.filename;
 &base.dir;
-&chunk.sections;
+&chunk.section.depth;
 &chunk.first.sections;
 &saxon.character.representation;
 &default.encoding;
@@ -273,8 +270,8 @@ around all these parameters.</para>
 
      ******************************************************************** -->
 
-<src:fragref linkend="admon.graphics.frag"/>
 <src:fragref linkend="admon.graphics.extension.frag"/>
+<src:fragref linkend="admon.graphics.frag"/>
 <src:fragref linkend="admon.graphics.path.frag"/>
 <src:fragref linkend="admon.style.frag"/>
 <src:fragref linkend="annotate.toc.frag"/>
@@ -286,22 +283,18 @@ around all these parameters.</para>
 <src:fragref linkend="bibliography.collection.frag"/>
 <src:fragref linkend="bridgehead.in.toc.frag"/>
 <src:fragref linkend="callout.defaultcolumn.frag"/>
-<src:fragref linkend="callout.graphics.frag"/>
 <src:fragref linkend="callout.graphics.extension.frag"/>
+<src:fragref linkend="callout.graphics.frag"/>
 <src:fragref linkend="callout.graphics.number.limit.frag"/>
 <src:fragref linkend="callout.graphics.path.frag"/>
 <src:fragref linkend="callout.list.table.frag"/>
-<src:fragref linkend="callout.unicode.frag"/>
 <src:fragref linkend="callout.unicode.font.frag"/>
+<src:fragref linkend="callout.unicode.frag"/>
 <src:fragref linkend="callout.unicode.number.limit.frag"/>
 <src:fragref linkend="callout.unicode.start.character.frag"/>
 <src:fragref linkend="callouts.extension.frag"/>
 <src:fragref linkend="chapter.autolabel.frag"/>
 <src:fragref linkend="chunk.datafile.frag"/>
-<src:fragref linkend="navig.graphics.frag"/>
-<src:fragref linkend="navig.graphics.extension.frag"/>
-<src:fragref linkend="navig.graphics.path.frag"/>
-<src:fragref linkend="navig.showtitles.frag"/>
 <src:fragref linkend="chunk.first.sections.frag"/>
 <src:fragref linkend="chunk.sections.frag"/>
 <src:fragref linkend="citerefentry.link.frag"/>
@@ -339,6 +332,17 @@ around all these parameters.</para>
 <src:fragref linkend="html.longdesc.link.frag"/>
 <src:fragref linkend="html.stylesheet.frag"/>
 <src:fragref linkend="html.stylesheet.type.frag"/>
+<src:fragref linkend="htmlhelp.alias.file.frag"/>
+<src:fragref linkend="htmlhelp.autolabel.frag"/>
+<src:fragref linkend="htmlhelp.chm.frag"/>
+<src:fragref linkend="htmlhelp.encoding.frag"/>
+<src:fragref linkend="htmlhelp.enumerate.images.frag"/>
+<src:fragref linkend="htmlhelp.force.map.and.alias.frag"/>
+<src:fragref linkend="htmlhelp.hhc.frag"/>
+<src:fragref linkend="htmlhelp.hhc.section.depth.frag"/>
+<src:fragref linkend="htmlhelp.hhp.frag"/>
+<src:fragref linkend="htmlhelp.hhp.tail.frag"/>
+<src:fragref linkend="htmlhelp.map.file.frag"/>
 <src:fragref linkend="inherit.keywords.frag"/>
 <src:fragref linkend="label.from.part.frag"/>
 <src:fragref linkend="linenumbering.everyNth.frag"/>
@@ -348,6 +352,10 @@ around all these parameters.</para>
 <src:fragref linkend="link.mailto.url.frag"/>
 <src:fragref linkend="make.single.year.ranges.frag"/>
 <src:fragref linkend="make.year.ranges.frag"/>
+<src:fragref linkend="navig.graphics.extension.frag"/>
+<src:fragref linkend="navig.graphics.frag"/>
+<src:fragref linkend="navig.graphics.path.frag"/>
+<src:fragref linkend="navig.showtitles.frag"/>
 <src:fragref linkend="nominal.table.width.frag"/>
 <src:fragref linkend="olink.fragid.frag"/>
 <src:fragref linkend="olink.outline.ext.frag"/>
@@ -359,6 +367,7 @@ around all these parameters.</para>
 <src:fragref linkend="preface.autolabel.frag"/>
 <src:fragref linkend="process.empty.source.toc.frag"/>
 <src:fragref linkend="process.source.toc.frag"/>
+<src:fragref linkend="punct.honorific.frag"/>
 <src:fragref linkend="qanda.defaultlabel.frag"/>
 <src:fragref linkend="qanda.inherit.numeration.frag"/>
 <src:fragref linkend="qandadiv.autolabel.frag"/>
@@ -369,21 +378,21 @@ around all these parameters.</para>
 <src:fragref linkend="rootid.frag"/>
 <src:fragref linkend="runinhead.default.title.end.punct.frag"/>
 <src:fragref linkend="runinhead.title.end.punct.frag"/>
-<src:fragref linkend="saxon.callouts.frag"/>
 <src:fragref linkend="saxon.character.representation.frag"/>
-<src:fragref linkend="saxon.linenumbering.frag"/>
-<src:fragref linkend="saxon.tablecolumns.frag"/>
 <src:fragref linkend="section.autolabel.frag"/>
 <src:fragref linkend="section.label.includes.component.label.frag"/>
 <src:fragref linkend="segmentedlist.as.table.frag"/>
 <src:fragref linkend="shade.verbatim.frag"/>
 <src:fragref linkend="shade.verbatim.style.frag"/>
-<src:fragref linkend="punct.honorific.frag"/>
 <src:fragref linkend="show.comments.frag"/>
 <src:fragref linkend="show.revisionflag.frag"/>
 <src:fragref linkend="spacing.paras.frag"/>
 <src:fragref linkend="stylesheet.result.type.frag"/>
 <src:fragref linkend="suppress.navigation.frag"/>
+<src:fragref linkend="table.border.color.frag"/>
+<src:fragref linkend="table.border.style.frag"/>
+<src:fragref linkend="table.border.thickness.frag"/>
+<src:fragref linkend="table.borders.with.css.frag"/>
 <src:fragref linkend="tablecolumns.extension.frag"/>
 <src:fragref linkend="textinsert.extension.frag"/>
 <src:fragref linkend="toc.list.type.frag"/>
@@ -392,21 +401,7 @@ around all these parameters.</para>
 <src:fragref linkend="use.extensions.frag"/>
 <src:fragref linkend="use.id.as.filename.frag"/>
 <src:fragref linkend="using.chunker.frag"/>
-<src:fragref linkend="table.borders.with.css.frag"/>
-<src:fragref linkend="table.border.thickness.frag"/>
-<src:fragref linkend="table.border.style.frag"/>
-<src:fragref linkend="table.border.color.frag"/>
-<src:fragref linkend="htmlhelp.encoding.frag"/>
-<src:fragref linkend="htmlhelp.autolabel.frag"/>
-<src:fragref linkend="htmlhelp.chm.frag"/>
-<src:fragref linkend="htmlhelp.hhp.frag"/>
-<src:fragref linkend="htmlhelp.hhc.frag"/>
-<src:fragref linkend="htmlhelp.hhp.tail.frag"/>
-<src:fragref linkend="htmlhelp.enumerate.images.frag"/>
-<src:fragref linkend="htmlhelp.force.map.and.alias.frag"/>
-<src:fragref linkend="htmlhelp.map.file.frag"/>
-<src:fragref linkend="htmlhelp.alias.file.frag"/>
-<src:fragref linkend="htmlhelp.hhc.section.depth.frag"/>
+
 </xsl:stylesheet>
 </src:fragment>