From e5b7dec73efee0d4b1dc3fa34f5fc3d42e08a840 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Fri, 25 Oct 2013 18:01:39 +0000
Subject: [PATCH] Fix invalid href generated if $insert.olink.pdf.frag=0 and
 $fop1.extensions=1.

---
 xsl/fo/xref.xsl | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index 7d2faa021..f4332b11c 100644
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -1244,9 +1244,17 @@
         <xsl:when test="$href != ''">
           <xsl:choose>
             <xsl:when test="$fop1.extensions != 0">
-              <xsl:variable name="mybeg" select="substring-before($href,'#')"/>
-              <xsl:variable name="myend" select="substring-after($href,'#')"/>
-              <fo:basic-link external-destination="url({concat($mybeg,'#dest=',$myend)})"
+              <xsl:variable name="href.mangled">
+                <xsl:choose>
+                  <xsl:when test="contains($href, '#')">
+                    <xsl:value-of select="concat(substring-before($href,'#'), '#dest=', substring-after($href,'#'))"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="$href"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:variable>
+              <fo:basic-link external-destination="{$href.mangled}"
                              xsl:use-attribute-sets="olink.properties">
                 <xsl:copy-of select="$hottext"/>
               </fo:basic-link>
-- 
2.40.0