From f3aad398fdafb52850e84329bbb435cbf1783593 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 9 Sep 2004 17:52:18 +0000
Subject: [PATCH] Fixed bug in xml:base resolution not recursing through the
 ancestors.

---
 xsl/common/common.xsl | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index c448461d1..c3f2b0594 100644
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -1661,8 +1661,10 @@ node location.</para>
   <xsl:variable name="srcurl">
     <xsl:call-template name="strippath">
       <xsl:with-param name="filename">
-        <xsl:call-template name="getdir">
-          <xsl:with-param name="filename" select="$filename/ancestor-or-self::*[@xml:base != ''][1]/@xml:base"/>
+        <xsl:call-template name="xml.base.dirs">
+          <xsl:with-param name="base.elem" 
+                          select="$filename/ancestor-or-self::*
+                                   [@xml:base != ''][1]"/>
         </xsl:call-template>
         <xsl:value-of select="$filename"/>
       </xsl:with-param>
@@ -1701,6 +1703,24 @@ node location.</para>
 
 <!-- ===================================== -->
 
+<xsl:template name="xml.base.dirs">
+  <xsl:param name="base.elem" select="NONODE"/>
+
+  <!-- Recursively resolve xml:base attributes -->
+  <xsl:if test="$base.elem/ancestor::*[@xml:base != '']">
+    <xsl:call-template name="xml.base.dirs">
+      <xsl:with-param name="base.elem" 
+                      select="$base.elem/ancestor::*[@xml:base != ''][1]"/>
+    </xsl:call-template>
+  </xsl:if>
+  <xsl:call-template name="getdir">
+    <xsl:with-param name="filename" select="$base.elem/@xml:base"/>
+  </xsl:call-template>
+
+</xsl:template>
+
+<!-- ===================================== -->
+
 <xsl:template name="strippath">
   <xsl:param name="filename" select="''"/>
   <xsl:choose>
-- 
2.40.0