Use normalize-space() in glossterm comparisons (as in html/inline.xsl).

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index b019f9a1553e2911a11dc8f020960903c579462c..229bbfb40613a9b7da990713c4929241626aa407 100644 (file)
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -830,16 +830,17 @@
       <xsl:variable name="term">
         <xsl:choose>
           <xsl:when test="@baseform">
-            <xsl:value-of select="@baseform"/>
+            <xsl:value-of select="normalize-space(@baseform)"/>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="."/>
+            <xsl:value-of select="normalize-space(.)"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
 
       <xsl:variable name="targets"
-                    select="//glossentry[glossterm=$term or glossterm/@baseform=$term]"/>
+                    select="//glossentry[normalize-space(glossterm)=$term
+                           or normalize-space(glossterm/@baseform)=$term]"/>
 
       <xsl:variable name="target" select="$targets[1]"/>