Bug #496294: don't index endofrangeentries. They're no longer indexed, but they aren...

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index fa741ccf555ee3921aba58681c51980bb974acd6..74dda46dfd0ba6eaea9bb67c5bf7be22c2542fb8 100644 (file)
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -52,8 +52,14 @@
          use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see)"/>
 
 <xsl:template name="generate-index">
-  <xsl:variable name="terms" select="//indexterm[count(.|key('letter',
-                                     translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[1]) = 1]"/>
+  <!-- FIXME: Ignore class='endofrange' terms because they come out wrong -->
+  <xsl:variable name="terms"
+                select="//indexterm[count(.|key('letter',
+                                                translate(substring(&primary;, 1, 1),
+                                                          &lowercase;,
+                                                          &uppercase;))[1]) = 1
+                                    and not(@class = 'endofrange')]"/>
+
   <xsl:variable name="alphabetical"
                 select="$terms[contains(concat(&lowercase;, &uppercase;),
                                         substring(&primary;, 1, 1))]"/>

diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index b065906d482488ed22d81f67cfa97894fe02c65a..d788c8a3918311c594a5d9a088478973a8035393 100644 (file)
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -82,8 +82,13 @@
 <xsl:key name="sections" match="*[@id]" use="@id"/>
 
 <xsl:template name="generate-index">
-  <xsl:variable name="terms" select="//indexterm[count(.|key('letter',
-                                     translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[1]) = 1]"/>
+  <!-- FIXME: Ignore class='endofrange' terms because they come out wrong -->
+  <xsl:variable name="terms"
+                select="//indexterm[count(.|key('letter',
+                                                translate(substring(&primary;, 1, 1),
+                                                          &lowercase;,
+                                                          &uppercase;))[1]) = 1
+                                    and not(@class = 'endofrange')]"/>
 
   <xsl:variable name="alphabetical"
                 select="$terms[contains(concat(&lowercase;, &uppercase;),