From 6691ab9e618b285cffcd85a6792c30e588529939 Mon Sep 17 00:00:00 2001
From: Robert D Anderson <robander@us.ibm.com>
Date: Wed, 20 Feb 2019 09:09:10 -0600
Subject: [PATCH] Fix for spaces in file/dir name #3214

Signed-off-by: Robert D Anderson <robander@us.ibm.com>
---
 src/main/plugins/org.dita.html5/xsl/functions.xsl |  5 +++++
 src/main/plugins/org.dita.html5/xsl/nav.xsl       |  2 +-
 .../plugins/org.dita.html5/xsl/functions.xspec    | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/plugins/org.dita.html5/xsl/functions.xsl b/src/main/plugins/org.dita.html5/xsl/functions.xsl
index d3b8ec1461..baaba78b15 100644
--- a/src/main/plugins/org.dita.html5/xsl/functions.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/functions.xsl
@@ -172,5 +172,10 @@ See the accompanying LICENSE file for applicable license.
       $table/@keycol and xs:integer($table/@keycol) eq count($entry/preceding-sibling::*) + 1
     "/>
   </xsl:function>
+  
+  <xsl:function name="dita-ot:normalize-href" as="xs:string?">
+    <xsl:param name="href" as="xs:string"/>
+    <xsl:value-of select="replace(translate($href, '\', '/'), ' ', '%20')"/>
+  </xsl:function>
 
 </xsl:stylesheet>
diff --git a/src/main/plugins/org.dita.html5/xsl/nav.xsl b/src/main/plugins/org.dita.html5/xsl/nav.xsl
index d580a2d80e..267190eb38 100644
--- a/src/main/plugins/org.dita.html5/xsl/nav.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/nav.xsl
@@ -54,7 +54,7 @@ See the accompanying LICENSE file for applicable license.
     </xsl:if>
   </xsl:template>
   
-  <xsl:variable name="current-file" select="translate(if ($FILEDIR = '.') then $FILENAME else concat($FILEDIR, '/', $FILENAME), '\', '/')" as="xs:string?"/>
+  <xsl:variable name="current-file" select="dita-ot:normalize-href(if ($FILEDIR = '.') then $FILENAME else concat($FILEDIR, '/', $FILENAME))" as="xs:string?"/>
   <xsl:variable name="current-topicrefs" select="$input.map//*[contains(@class, ' map/topicref ')][dita-ot:get-path($PATH2PROJ, .) = $current-file]" as="element()*"/>
   <xsl:variable name="current-topicref" select="$current-topicrefs[1]" as="element()?"/>
   
diff --git a/src/test/xsl/plugins/org.dita.html5/xsl/functions.xspec b/src/test/xsl/plugins/org.dita.html5/xsl/functions.xspec
index 72a1fc5af6..001d2f7341 100644
--- a/src/test/xsl/plugins/org.dita.html5/xsl/functions.xspec
+++ b/src/test/xsl/plugins/org.dita.html5/xsl/functions.xspec
@@ -385,5 +385,20 @@
       <x:expect label="return false()" select="false()"/>
     </x:scenario>
   </x:scenario>
+  
+  <x:scenario label="Normalize path with space and backslash">
+    <x:call function="dita-ot:normalize-href">
+      <x:param name="href" select="'foo bar\this that.dita'"/>
+    </x:call>
+    
+    <x:expect label="path normalized with / and %20" select="'foo%20bar/this%20that.dita'"/>
+  </x:scenario>
+  <x:scenario label="Normalize path that doesn't need normalization">
+    <x:call function="dita-ot:normalize-href">
+      <x:param name="href" select="'foo%20bar/this%20that.dita'"/>
+    </x:call>
+    
+    <x:expect label="path not modified" select="'foo%20bar/this%20that.dita'"/>
+  </x:scenario>
 
 </x:description>