Removed reference to index HTML pages from manifest if the output format is HTML...

diff --git a/xsl/html/manifest.xsl b/xsl/html/manifest.xsl
index 48f3924a3354ab5a6ac9cadc20bd28be0e9d6a97..a546a0ea6b2b7a8ceef8767e1d5a2a9dd6da4c24 100644 (file)
--- a/xsl/html/manifest.xsl
+++ b/xsl/html/manifest.xsl
@@ -42,7 +42,6 @@
                      |section
                      |book/glossary|article/glossary|part/glossary
                      |book/bibliography|article/bibliography|part/bibliography
-                     |book/index|article/index|part/index
                      |colophon"
               mode="enumerate-files">
   <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
@@ -62,6 +61,27 @@
   <xsl:apply-templates select="*" mode="enumerate-files"/>
 </xsl:template>
 
+<xsl:template match="book/index|article/index|part/index"
+              mode="enumerate-files">
+  <xsl:if test="$htmlhelp.output != 1">
+    <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
+    <xsl:if test="$ischunk='1'">
+      <xsl:call-template name="make-relative-filename">
+        <xsl:with-param name="base.dir">
+          <xsl:if test="$manifest.in.base.dir = 0">
+            <xsl:value-of select="$base.dir"/>
+          </xsl:if>
+        </xsl:with-param>
+        <xsl:with-param name="base.name">
+          <xsl:apply-templates mode="chunk-filename" select="."/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>&#10;</xsl:text>
+    </xsl:if>
+    <xsl:apply-templates select="*" mode="enumerate-files"/>
+  </xsl:if>
+</xsl:template>
+
 <xsl:template match="legalnotice" mode="enumerate-files">
   <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
   <xsl:if test="$generate.legalnotice.link != 0">

diff --git a/xsl/htmlhelp/htmlhelp-common.xsl b/xsl/htmlhelp/htmlhelp-common.xsl
index c1e3e26e2db82c5c3c9546bc753eb895f1228f7d..6e504225aabaf7a7e52528c084daadcd123a6e15 100644 (file)
--- a/xsl/htmlhelp/htmlhelp-common.xsl
+++ b/xsl/htmlhelp/htmlhelp-common.xsl
@@ -20,6 +20,9 @@
 
 <xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/>
 
+<!-- Set up HTML Help flag -->
+<xsl:variable name="htmlhelp.output" select="1"/>
+
 <xsl:variable name="raw.help.title">
   <xsl:choose>
     <xsl:when test="$htmlhelp.title = ''">