Baseform attribute is taken into account when autogenerating links for glossterms.

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index cea850508fdc7867a21550caab6a0dbad5b93d1c..47033d9e99e80348c875c81466b79ef80b6fb163 100644 (file)
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -648,7 +648,18 @@
     </xsl:when>
 
     <xsl:when test="$glossterm.auto.link != 0">
-      <xsl:variable name="targets" select="//glossentry[glossterm=string(current())]"/>
+      <xsl:variable name="term">
+        <xsl:choose>
+          <xsl:when test="@baseform">
+            <xsl:value-of select="@baseform"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="."/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="targets" 
+                    select="//glossentry[glossterm=$term or glossterm/@baseform=$term]"/>
       <xsl:variable name="target" select="$targets[1]"/>
 
       <xsl:choose>