Fix chunking parameter errors

diff --git a/xsl/fo/Makefile b/xsl/fo/Makefile
index bf1e475d4fb621286164f81425a74fa2250f8320..8f7454bce6a99508fc05e821365c6b465039a99e 100644 (file)
--- a/xsl/fo/Makefile
+++ b/xsl/fo/Makefile
@@ -6,6 +6,7 @@ include Makefile.param
 all: titlepage.templates.xsl param.xsl
 
 param.html: param.xml
+       ../../cvstools/paramchk -m Makefile.param $<
        $(XSLT) $< ../docsrc/lrefentry.xsl $@
 
 param.xml: param.xweb $(PARAMS)

diff --git a/xsl/html/Makefile b/xsl/html/Makefile
index e9c35e8de85e30dbcfa0e63e6ac4c52abf5cc394..4eea7e7f0796e06a1fe61f90a664d3d45b5351db 100644 (file)
--- a/xsl/html/Makefile
+++ b/xsl/html/Makefile
@@ -18,6 +18,7 @@ param.xml: param.xweb $(PARAMS)
        $(XSLT) $< ../../litprog/wdocbook.xsl $@
 
 param.xsl: param.xweb $(PARAMS)
+       ../../cvstools/paramchk -m Makefile.param $<
        $(XSLT) $< ../../litprog/xtangle.xsl $@
 
 titlepage.templates.xsl: titlepage.templates.xml ../template/titlepage.xsl

diff --git a/xsl/html/Makefile.param b/xsl/html/Makefile.param
index 618bcf80e0cf22666d0a69c4d8fbf77d9ed37d80..98ab68e60db358594ceb6dc43dfa4486b93200e1 100644 (file)
--- a/xsl/html/Makefile.param
+++ b/xsl/html/Makefile.param
@@ -24,7 +24,7 @@ PARAMS=../params/admon.graphics.xml \
        ../params/chapter.autolabel.xml \
        ../params/chunk.datafile.xml \
        ../params/chunk.first.sections.xml \
-       ../params/chunk.sections.xml \
+       ../params/chunk.section.depth.xml \
        ../params/citerefentry.link.xml \
        ../params/css.decoration.xml \
        ../params/default.encoding.xml \

diff --git a/xsl/html/chunk.xsl b/xsl/html/chunk.xsl
index eee202d8262ad54fa6c3cc1e9414b91670146f5a..94e80e71ff1d4e99184db79588e7a53e5f95bd85 100644 (file)
--- a/xsl/html/chunk.xsl
+++ b/xsl/html/chunk.xsl
@@ -1096,20 +1096,13 @@
   <xsl:call-template name="process-chunk-element"/>
 </xsl:template>
 
-<xsl:template match="sect1[$chunk.section.depth &gt; 0]
-                     |sect2[$chunk.section.depth &gt; 1]
-                     |sect3[$chunk.section.depth &gt; 2]
-                     |sect4[$chunk.section.depth &gt; 3]
-                     |sect5[$chunk.section.depth &gt; 4]
-                     |section[$chunk.section.depth &gt; count(ancestor::section)]
-                     |/section">
-
+<xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
   <xsl:variable name="ischunk">
     <xsl:call-template name="chunk"/>
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test=". = /section">
+    <xsl:when test="not(parent::*)">
       <xsl:call-template name="process-chunk-element"/>
     </xsl:when>
     <xsl:when test="$ischunk = 0">

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 8df3f8aea32dd6bc64aa1f0d1e953a5f76c6dd89..1a17c34bbfb44b45b3575507fbd1b47e9bfd48a2 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -24,7 +24,7 @@
 <!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 chunk.section.depth SYSTEM "../params/chunk.section.depth.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">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 5d1de854a04fd8f9b5d9cbe0ecc2d532ec2400de..31597bd6d29109830f210e766c961f9125c85217 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -296,7 +296,7 @@ around all these parameters.</para>
 <src:fragref linkend="chapter.autolabel.frag"/>
 <src:fragref linkend="chunk.datafile.frag"/>
 <src:fragref linkend="chunk.first.sections.frag"/>
-<src:fragref linkend="chunk.sections.frag"/>
+<src:fragref linkend="chunk.section.depth.frag"/>
 <src:fragref linkend="citerefentry.link.frag"/>
 <src:fragref linkend="css.decoration.frag"/>
 <src:fragref linkend="default.encoding.frag"/>