Bug fix: don't generate duplicate IDs on glossentrys

diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index 5cd838d9106d75a0c50f5f861eba52f7df0a4f6e..8697efaa355bf7e51dc64b9c95758b7b6153c2c7 100644 (file)
--- a/xsl/fo/glossary.xsl
+++ b/xsl/fo/glossary.xsl
@@ -185,8 +185,16 @@ GlossEntry ::=
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fo:list-item id="{$id}"
-                xsl:use-attribute-sets="normal.para.spacing">
+  <fo:list-item xsl:use-attribute-sets="normal.para.spacing">
+    <xsl:call-template name="anchor">
+      <xsl:with-param name="conditional">
+        <xsl:choose>
+          <xsl:when test="$glossterm.auto.link != 0
+                          or $glossary.collection != ''">0</xsl:when>
+          <xsl:otherwise>1</xsl:otherwise>
+        </xsl:choose>
+      </xsl:with-param>
+    </xsl:call-template>
     <xsl:apply-templates/>
   </fo:list-item>
 </xsl:template>
@@ -199,23 +207,6 @@ GlossEntry ::=
   </fo:list-item-label>
 </xsl:template>
 
-<xsl:template match="glossentry/glossterm[1]" priority="2">
-  <fo:list-item-label end-indent="label-end()">
-    <fo:block>
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="node" select=".."/>
-        <xsl:with-param name="conditional">
-          <xsl:choose>
-            <xsl:when test="$glossterm.auto.link != 0">0</xsl:when>
-            <xsl:otherwise>1</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:list-item-label>
-</xsl:template>
-
 <xsl:template match="glossentry/acronym">
 </xsl:template>