Make sure $generate.index controls whether the index is processed.

diff --git a/xsl/fo/autotoc.xsl b/xsl/fo/autotoc.xsl
index f359f5edea910b9b0fa85e8d5e5cb53c1d68158b..e89452438fa5fdecfc2b3f416b1aca1c7b33d0cc 100644 (file)
--- a/xsl/fo/autotoc.xsl
+++ b/xsl/fo/autotoc.xsl
@@ -458,11 +458,10 @@
   <xsl:call-template name="toc.line"/>
 </xsl:template>
 
-<xsl:template match="index"
-              mode="toc">
+<xsl:template match="index" mode="toc">
   <xsl:param name="toc-context" select="."/>
 
-  <xsl:if test="* or $generate.index">
+  <xsl:if test="* or $generate.index != 0">
     <xsl:call-template name="toc.line"/>
   </xsl:if>
 </xsl:template>

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index 567dd3ae6bc675f80d7140a796e65ee4fd8a46bc..2f1169d4c309b1e08daf8a084afc4b8a66140faa 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -20,6 +20,7 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
+ <xsl:if test="$generate.index != 0">
   <xsl:choose>
     <xsl:when test="$make.index.markup != 0">
       <fo:block>
@@ -37,6 +38,7 @@
       </fo:block>
     </xsl:otherwise>
   </xsl:choose>
+ </xsl:if>
 </xsl:template>
 
 <xsl:template match="book/index">
@@ -44,6 +46,7 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
+ <xsl:if test="$generate.index != 0">
   <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster">
       <xsl:with-param name="pageclass">
@@ -96,6 +99,7 @@
       </xsl:if>
     </fo:flow>
   </fo:page-sequence>
+ </xsl:if>
 </xsl:template>
 
 <xsl:template match="index/title"></xsl:template>