fix bug #133 Citation linking to abbrev should ignore whitespace

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 927811c4620f5d01e61976f4d890b5731058f592..7a9016591849c0847549bc2396c9064498056956 100644 (file)
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -1227,7 +1227,7 @@
 
 <xsl:template match="d:citation">
   <!-- todo: integrate with bibliography collection -->
-  <xsl:variable name="targets" select="(//d:biblioentry | //d:bibliomixed)[d:abbrev = string(current())]"/>
+  <xsl:variable name="targets" select="(//d:biblioentry | //d:bibliomixed)[normalize-space(d:abbrev) = normalize-space(string(current()))]"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <xsl:choose>
@@ -1264,7 +1264,7 @@
 </xsl:template>
 
 <xsl:template match="d:citebiblioid">
-  <xsl:variable name="targets" select="//*[d:biblioid = string(current())]"/>
+  <xsl:variable name="targets" select="//*[normalize-space(d:biblioid) = normalize-space(string(current()))]"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <xsl:choose>

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index 36dd7347696da20801a53ae6cc3d95a3ceb1b010..81c5c1b77a297cf935fe556c77a68cf573697df6 100644 (file)
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -1343,7 +1343,7 @@
 
 <xsl:template match="d:citation">
   <!-- todo: integrate with bibliography collection -->
-  <xsl:variable name="targets" select="(//d:biblioentry | //d:bibliomixed)[d:abbrev = string(current())]"/>
+  <xsl:variable name="targets" select="(//d:biblioentry | //d:bibliomixed)[normalize-space(d:abbrev) = normalize-space(string(current()))]"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <xsl:choose>
@@ -1381,7 +1381,7 @@
 </xsl:template>
 
 <xsl:template match="d:citebiblioid">
-  <xsl:variable name="targets" select="//*[d:biblioid = string(current())]"/>
+  <xsl:variable name="targets" select="//*[normalize-space(d:biblioid) = normalize-space(string(current()))]"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <xsl:choose>