From cf48792c873a18f85db6d873652e220ee032784c Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 16 Mar 2009 02:45:55 +0000
Subject: [PATCH] An indexterm primary, secondary, or tertiary element with an
 id or xml:id now outputs that ID, so that index entries can be cross
 referenced to.

---
 xsl/fo/autoidx.xsl | 21 +++++++++++++++++++++
 xsl/fo/xref.xsl    |  4 ++++
 2 files changed, 25 insertions(+)

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index e89858ea8..684f788c2 100644
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -294,6 +294,13 @@
     <xsl:if test="$axf.extensions != 0">
       <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
     </xsl:if>
+
+    <xsl:for-each select="$refs/primary">
+      <xsl:if test="@id or @xml:id">
+        <fo:inline id="{(@id|@xml:id)[1]}"/>
+      </xsl:if>
+    </xsl:for-each>
+
     <xsl:value-of select="primary"/>
 
     <xsl:choose>
@@ -403,6 +410,13 @@
     <xsl:if test="$axf.extensions != 0">
       <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
     </xsl:if>
+
+    <xsl:for-each select="$refs/secondary">
+      <xsl:if test="@id or @xml:id">
+        <fo:inline id="{(@id|@xml:id)[1]}"/>
+      </xsl:if>
+    </xsl:for-each>
+
     <xsl:value-of select="secondary"/>
 
     <xsl:choose>
@@ -522,6 +536,13 @@
     <xsl:if test="$axf.extensions != 0">
       <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
     </xsl:if>
+
+    <xsl:for-each select="$refs/tertiary">
+      <xsl:if test="@id or @xml:id">
+        <fo:inline id="{(@id|@xml:id)[1]}"/>
+      </xsl:if>
+    </xsl:for-each>
+
     <xsl:value-of select="tertiary"/>
 
     <xsl:choose>
diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index 5ad054001..195a50478 100644
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -804,6 +804,10 @@
   <xsl:value-of select="primary"/>
 </xsl:template>
 
+<xsl:template match="primary|secondary|tertiary" mode="xref-to">
+  <xsl:value-of select="."/>
+</xsl:template>
+
 <!-- ==================================================================== -->
 
 <xsl:template match="link" name="link">
-- 
2.40.0