From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 1 Feb 2012 04:58:33 +0000 (+0000)
Subject: Add 'strippath' and 'getdir' templates that lib.xsl now requires.
X-Git-Tag: release/1.79.1~6^2~547
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c5f078fd193ff7e87729dfb01a70773322a9f36;p=docbook-dsssl

Add 'strippath' and 'getdir' templates that lib.xsl now requires.
Fixed bug 3481384 to remove extraneous "fsfunc" introduced in 1.76.1
html/synop.xsl because attribute copying was not handled correctly.
---

diff --git a/xsl/xhtml/html2xhtml.xsl b/xsl/xhtml/html2xhtml.xsl
index 2d89f56ed..6dd23e1ea 100644
--- a/xsl/xhtml/html2xhtml.xsl
+++ b/xsl/xhtml/html2xhtml.xsl
@@ -212,4 +212,45 @@
   <xsl:copy/>
 </xsl:template>
 
+<xsl:template match="@*">
+  <xsl:copy-of select="."/>
+</xsl:template>
+
+<xsl:template name="strippath">
+  <xsl:param name="filename" select="''"/>
+  <xsl:choose>
+    <!-- Leading .. are not eliminated -->
+    <xsl:when test="starts-with($filename, '../')">
+      <xsl:value-of select="'../'"/>
+      <xsl:call-template name="strippath">
+        <xsl:with-param name="filename" select="substring-after($filename, '../')"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="contains($filename, '/../')">
+      <xsl:call-template name="strippath">
+        <xsl:with-param name="filename">
+          <xsl:call-template name="getdir">
+            <xsl:with-param name="filename" select="substring-before($filename, '/../')"/>
+          </xsl:call-template>
+          <xsl:value-of select="substring-after($filename, '/../')"/>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$filename"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="getdir">
+  <xsl:param name="filename" select="''"/>
+  <xsl:if test="contains($filename, '/')">
+    <xsl:value-of select="substring-before($filename, '/')"/>
+    <xsl:text>/</xsl:text>
+    <xsl:call-template name="getdir">
+      <xsl:with-param name="filename" select="substring-after($filename, '/')"/>
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
 </xsl:stylesheet>