From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 4 Dec 2001 21:11:46 +0000 (+0000)
Subject: Fix chunking parameter errors
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8247897f28a5d3e06a8c0f576b755f2a2688b7bc;p=docbook-dsssl

Fix chunking parameter errors
---

diff --git a/xsl/fo/Makefile b/xsl/fo/Makefile
index bf1e475d4..8f7454bce 100644
--- 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 e9c35e8de..4eea7e7f0 100644
--- 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 618bcf80e..98ab68e60 100644
--- 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 eee202d82..94e80e71f 100644
--- 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 8df3f8aea..1a17c34bb 100644
--- 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 5d1de854a..31597bd6d 100644
--- 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"/>