Classical HTML index is suppressed in a cleaner way as suggested by David Cramer

diff --git a/xsl/htmlhelp/htmlhelp-common.xsl b/xsl/htmlhelp/htmlhelp-common.xsl
index 6e504225aabaf7a7e52528c084daadcd123a6e15..aff2297ce54594711c8347aba9975e7ce88d554a 100644 (file)
--- a/xsl/htmlhelp/htmlhelp-common.xsl
+++ b/xsl/htmlhelp/htmlhelp-common.xsl
@@ -14,8 +14,12 @@
 <!-- ==================================================================== -->
 <!-- Customizations of standard HTML stylesheet parameters -->
 
+<!-- no navigation on pages by default, HTML Help provides its own navigation controls -->
 <xsl:param name="suppress.navigation" select="1"/>
 
+<!-- no separate HTML page with index, index is built inside CHM index pane -->
+<xsl:param name="generate.index" select="0"/>
+
 <!-- ==================================================================== -->
 
 <xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/>
@@ -870,12 +874,6 @@ Enhanced decompilation=</xsl:text>
 
 <!-- ==================================================================== -->
 
-<!-- no separate HTML page with index -->
-<xsl:template match="index"/>   
-<xsl:template match="setindex"/>   
-<xsl:template match="index" mode="toc"/>
-<xsl:template match="setindex" mode="toc"/>
-
 <xsl:template match="indexterm">
   <xsl:choose>
     <xsl:when test="$htmlhelp.use.hhk = 0">