Applied fix from Jeff Beal that

fixed the bug that put secondary page numbers on primary entries.
Same with tertiary page numbers on secondary entries.

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index f4a720dae99f554f2deebdbfbb8ef78ef17cdb3f..371fd8b4ef29980ffcac327ee7cc1bfc0320a8b5 100644 (file)
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -155,7 +155,8 @@
     <xsl:value-of select="primary"/>
 
     <xsl:variable name="page-number-citations">
-      <xsl:for-each select="$refs[not(see) and not(seealso)]">
+      <xsl:for-each select="$refs[not(see) and not(seealso)
+                            and not(secondary)]">
         <xsl:apply-templates select="." mode="reference">
           <xsl:with-param name="scope" select="$scope"/>
         </xsl:apply-templates>
@@ -207,7 +208,8 @@
     <xsl:value-of select="secondary"/>
 
     <xsl:variable name="page-number-citations">
-      <xsl:for-each select="$refs[not(see) and not(seealso)]">
+      <xsl:for-each select="$refs[not(see) and not(seealso)
+                            and not(tertiary)]">
         <xsl:apply-templates select="." mode="reference">
           <xsl:with-param name="scope" select="$scope"/>
         </xsl:apply-templates>