From 242d9470a64711dfb1d0acecc2b078f95b10e871 Mon Sep 17 00:00:00 2001
From: bobstayton <bobs@sagehill.net>
Date: Fri, 22 Feb 2019 14:08:55 -0800
Subject: [PATCH] fix bug #133 Citation linking to abbrev should ignore
 whitespace

---
 xsl/fo/inline.xsl   | 4 ++--
 xsl/html/inline.xsl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 927811c46..7a9016591 100644
--- 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 36dd73476..81c5c1b77 100644
--- 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>
-- 
2.50.1