Always use automatic indexing

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index 9a998cc1a12ecb1d3a3df1116d3a689f1f7a83f5..8c7331161406f224ecd5c7f95d1517a0ddf4b8ea 100644 (file)
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -37,8 +37,6 @@
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
 
-<xsl:import href="docbook.xsl"/>
-
 <!-- ==================================================================== -->
 <!-- Derived from Jeni Tennison's work in the HTML case -->
 

diff --git a/xsl/fo/docbook.xsl b/xsl/fo/docbook.xsl
index bc7aa8b90dd0a590dad7fe4dfdd5c756c9857fdc..2029640bb8e058df95f08f70a10c6a471afee4ee 100644 (file)
--- a/xsl/fo/docbook.xsl
+++ b/xsl/fo/docbook.xsl
@@ -32,6 +32,7 @@
 <xsl:include href="../common/subtitles.xsl"/>
 <xsl:include href="../common/gentext.xsl"/>
 <xsl:include href="autotoc.xsl"/>
+<xsl:include href="autoidx.xsl"/>
 <xsl:include href="lists.xsl"/>
 <xsl:include href="callout.xsl"/>
 <xsl:include href="verbatim.xsl"/>

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index f6095712e33036bd58d1fabcf220768b1bd18116..70054a84f82debcf7d174f282a216cdb5e7b89c5 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -112,8 +112,4 @@
 <xsl:template match="indexentry">
 </xsl:template>
 
-<xsl:template name="generate-index">
-  <!-- nop: use autoidx.xsl to get automatic indexing -->
-</xsl:template>
-
 </xsl:stylesheet>