From ab1a05a80cedc351e81167067805f1e6763e36d8 Mon Sep 17 00:00:00 2001
From: David Maus <maus@hab.de>
Date: Fri, 7 Sep 2018 08:46:15 +0200
Subject: [PATCH] Use fn:resolve-uri() to resolve URIs of subordinate documents

---
 .../code/iso_schematron_skeleton_for_saxon.xsl   | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/trunk/schematron/code/iso_schematron_skeleton_for_saxon.xsl b/trunk/schematron/code/iso_schematron_skeleton_for_saxon.xsl
index d18f216..a26199c 100644
--- a/trunk/schematron/code/iso_schematron_skeleton_for_saxon.xsl
+++ b/trunk/schematron/code/iso_schematron_skeleton_for_saxon.xsl
@@ -1438,19 +1438,9 @@ which require a preprocess.
  		    		as="xs:string*"  /> 
  		    	
 				<axsl:for-each  select="$thePath">  
-					<axsl:choose>
-						<axsl:when test="starts-with( ., 'http:') or starts-with(., 'file:' )
-						   or starts-with(., '/')"><!-- try as absolute path -->
-		  					<axsl:for-each select="document(.)"> 
-		    					<xsl:call-template name="handle-pattern"  />
-							</axsl:for-each>
-						</axsl:when>
-						<axsl:otherwise><!-- is relative path -->
-		  					<axsl:for-each select="document(concat( $document-uri , '/../', .))"> 
-		    					<xsl:call-template name="handle-pattern"  />
-							</axsl:for-each>
-						</axsl:otherwise>
-				  </axsl:choose>		
+				  <axsl:for-each select="document(resolve-uri(., $document-uri))">
+				    <xsl:call-template name="handle-pattern"/>
+				  </axsl:for-each>
 				</axsl:for-each>
 			</xsl:otherwise>
 		</xsl:choose>