From 9a9bb77968735c6ace9b7e82c5115c793848176a Mon Sep 17 00:00:00 2001
From: anp <anp@kelis.fr>
Date: Thu, 27 Jul 2017 17:05:37 +0200
Subject: [PATCH] =?UTF-8?q?debug=20syntaxe=20compatible=20multi-os=20(resu?=
 =?UTF-8?q?lt-document/@href=20n=C3=A9cessite=20une=20syntaxe=20URL...=20e?=
 =?UTF-8?q?t=20cette=20syntaxe=20diff=C3=A9re,=20pour=20un=20fichier=20sur?=
 =?UTF-8?q?=20le=20fileSystem,=20en=20tre=20lin=20et=20mac)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xsl/scbib2opale.xsl          | 6 +++---
 xsl/scbib2optim-fragment.xsl | 4 ++--
 xsl/scbib2optim.xsl          | 6 +++---
 zoterotei2scenari.ant        | 9 +++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/xsl/scbib2opale.xsl b/xsl/scbib2opale.xsl
index 244a316..4595579 100644
--- a/xsl/scbib2opale.xsl
+++ b/xsl/scbib2opale.xsl
@@ -9,15 +9,15 @@ Jun 14, 2015
     xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"
     xmlns:op="utc.fr:ics/opale3" xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive">
     
-    <xsl:param name="pOutputPath">/tmp</xsl:param>
+    <xsl:param name="pOutputUrl">file:///tmp</xsl:param>
     
     <xsl:template match="bib">
         <xsl:apply-templates select="ref"/>
-        <message>Output set to <xsl:value-of select="$pOutputPath"/></message>
+        <message>Output set to <xsl:value-of select="$pOutputUrl"/></message>
     </xsl:template>
     
     <xsl:template match="ref">
-        <xsl:result-document href="file://{$pOutputPath}/{ref-id}.ref" encoding="UTF-8" method="xml" >
+        <xsl:result-document href="{$pOutputUrl}/{ref-id}.ref" encoding="UTF-8" method="xml" >
             <sc:item>
                 <op:bib>
                    <op:bibM>
diff --git a/xsl/scbib2optim-fragment.xsl b/xsl/scbib2optim-fragment.xsl
index a33edbb..3b978a4 100644
--- a/xsl/scbib2optim-fragment.xsl
+++ b/xsl/scbib2optim-fragment.xsl
@@ -9,7 +9,7 @@ Aug 31, 2015
     xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"
     xmlns:of="scpf.org:office" xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive">
     
-    <xsl:param name="pOutputPath">/tmp</xsl:param>
+	<xsl:param name="pOutputUrl">file:///tmp</xsl:param>
     
     <xsl:template name="section">
     	<xsl:param name="title"/>    
@@ -99,7 +99,7 @@ Aug 31, 2015
     </xsl:template>
     
     <xsl:template match="ref">
-        <xsl:result-document href="file://{$pOutputPath}/{ref-id}.fragment" encoding="UTF-8" method="xml" >
+        <xsl:result-document href="{$pOutputUrl}/{ref-id}.fragment" encoding="UTF-8" method="xml" >
            	<sc:item xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
 				<of:fragment xmlns:of="scpf.org:office" xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive">
 					<sp:info>
diff --git a/xsl/scbib2optim.xsl b/xsl/scbib2optim.xsl
index 4b45a6b..c68ad64 100644
--- a/xsl/scbib2optim.xsl
+++ b/xsl/scbib2optim.xsl
@@ -9,15 +9,15 @@ Sep 03, 2015
     xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"
     xmlns:of="scpf.org:office" xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive">
     
-    <xsl:param name="pOutputPath">/tmp</xsl:param>
+    <xsl:param name="pOutputUrl">file:///tmp</xsl:param>
     
     <xsl:template match="bib">
         <xsl:apply-templates select="ref"/>
-        <message>Output set to <xsl:value-of select="$pOutputPath"/></message>
+        <message>Output set to <xsl:value-of select="$pOutputUrl"/></message>
     </xsl:template>
     
     <xsl:template match="ref">
-        <xsl:result-document href="file://{$pOutputPath}/{ref-id}.refs" encoding="UTF-8" method="xml" >
+        <xsl:result-document href="{$pOutputUrl}/{ref-id}.refs" encoding="UTF-8" method="xml" >
             <sc:item>
                 <of:def>
                    <of:defM>
diff --git a/zoterotei2scenari.ant b/zoterotei2scenari.ant
index 3419595..8728b1c 100644
--- a/zoterotei2scenari.ant
+++ b/zoterotei2scenari.ant
@@ -25,16 +25,17 @@ Aug 31, 2015
     
     <xslt classpath="${lib}/saxon9he.jar" basedir="${in}" includes="*.xml" destdir="${tmp}" extension=".xml" style="${xsl}/zoterotei2scbib.xsl"/>
     
+    <makeurl file="${out}" property="out.url"/>
+    
     <xslt classpath="${lib}/saxon9he.jar" basedir="${tmp}" destdir="${log}/optim1" extension=".xml" style="${xsl}/scbib2optim.xsl" failonerror="false">
-        <param name="pOutputPath" expression="${out}/zotero-optim-1"/>    	
+        <param name="pOutputUrl" expression="${out.url}/zotero-optim-1"/>
     </xslt>
-    
 	<xslt classpath="${lib}/saxon9he.jar" basedir="${tmp}" destdir="${out}/zotero-optim-2" extension=".section" style="${xsl}/scbib2optim-fragment.xsl" failonerror="false">
-	    <param name="pOutputPath" expression="${out}/zotero-optim-2/co"/>
+	    <param name="pOutputUrl" expression="${out.url}/zotero-optim-2/co"/>
 	</xslt>
 	    	
     <xslt classpath="${lib}/saxon9he.jar" basedir="${tmp}" destdir="${log}/opale" extension=".xml" style="${xsl}/scbib2opale.xsl" failonerror="false"> 
-        <param name="pOutputPath" expression="${out}/zotero-opale"/>
+        <param name="pOutputUrl" expression="${out.url}/zotero-opale"/>
     </xslt>
     
 </project>
-- 
GitLab