From: bobstayton <bobs@sagehill.net>
Date: Mon, 9 Jul 2018 21:24:49 +0000 (-0700)
Subject: fix issue #15 whitespace in glossterms with autolink
X-Git-Tag: snapshot/2018-09-28-172~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebbd76787589a28b44cdeda2c28ea9c90ce25aeb;p=docbook-dsssl

fix issue #15 whitespace in glossterms with autolink
---

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index d9dfa31ac..218e7f8fc 100644
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -883,12 +883,16 @@
                     and $glossary.collection != ''">
       <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:when test="@baseform">
+            <xsl:value-of select="normalize-space(@baseform)"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="normalize-space(.)"/>
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
       <xsl:variable name="cterm"
-           select="(document($glossary.collection,.)//d:glossentry[d:glossterm=$term])[1]"/>
+           select="(document($glossary.collection,.)//d:glossentry[normalize-space(d:glossterm)=$term])[1]"/>
 
       <xsl:choose>
         <xsl:when test="not($cterm)">
@@ -936,7 +940,7 @@
         <xsl:when test="count($targets)=0">
           <xsl:message>
             <xsl:text>Error: no glossentry for glossterm: </xsl:text>
-            <xsl:value-of select="."/>
+            <xsl:value-of select="normalize-space(.)"/>
             <xsl:text>.</xsl:text>
           </xsl:message>
           <xsl:call-template name="inline.italicseq"/>