Merge branch 'master' of https://gitlab.utc.fr/crozatst/hdoc

hdoc_to_opale/xsl/moveRessourceFiles.xsl

@@ -5,14 +5,14 @@
     >
 
     <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-    
+
     <xsl:param name="filename"/>
 
     <!-- This template matches the root and create a ANT project, the root of any ANT buildfile. -->
     <xsl:template match="h:html">
         <project name="moveRessourceFiles" basedir="." default="moveRessourceFiles">
             <property file="global.properties"/>
-            <property name="filename" location="{$filename}"/>
+            <property name="filename2" location="{$filename}"/>
             <target name="moveRessourceFiles">
                 <xsl:apply-templates select="./*"/>
             </target>
@@ -32,16 +32,16 @@
 
     <!-- Targeted markups. -->
     <xsl:template match="h:img">
-        <copy tofile="${{filename}}/decompressedOpale/res/{./@src}" file="${{filename}}/decompressedHdoc/{./@src}"/>
+        <copy tofile="${{filename2}}/decompressedOpale/res/{./@src}" file="${{filename2}}/decompressedHdoc/{./@src}"/>
     </xsl:template>
     <xsl:template match="h:audio">
-        <copy tofile="${{filename}}/decompressedOpale/res/{./@src}" file="${{filename}}/decompressedHdoc/{./@src}"/>
+        <copy tofile="${{filename2}}/decompressedOpale/res/{./@src}" file="${{filename2}}/decompressedHdoc/{./@src}"/>
     </xsl:template>
     <xsl:template match="h:video">
-        <copy tofile="${{filename}}/decompressedOpale/res/{./@src}" file="${{filename}}/decompressedHdoc/{./@src}"/>
+        <copy tofile="${{filename2}}/decompressedOpale/res/{./@src}" file="${{filename2}}/decompressedHdoc/{./@src}"/>
     </xsl:template>
     <xsl:template match="h:object">
-        <copy tofile="${{filename}}/decompressedOpale/res/{./@data}" file="${{filename}}/decompressedHdoc/{./@data}"/>
+        <copy tofile="${{filename2}}/decompressedOpale/res/{./@data}" file="${{filename2}}/decompressedHdoc/{./@data}"/>
     </xsl:template>
 
     <!-- These markups are matched in order to minimize "apply-templates" side-effects (i.e. their contents are not relevant for this transformation). -->

hdoc_to_opale/xsl/prepareCourseUcCopies.xsl

@@ -18,7 +18,7 @@
       <property name="lib" location="${{basedir}}/lib"/>
       <property name="log" location="${{basedir}}/log"/>
       <property name="schema" location="${{basedir}}/schema"/>
-      <property name="filename" location="{$filename}"/>
+      <property name="filename" location="${$filename}"/>
       <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
         <classpath>
           <pathelement location="../${lib}/jing.jar"/>

hdoc_to_opale/xsl/transformation0.xsl

@@ -36,7 +36,7 @@
                 style="${{xsl}}/moveRessourceFiles.xsl"
                 processor="org.apache.tools.ant.taskdefs.optional.TraXLiaison"
             >
-              <param name="filename" expression="${{tmp}}/${{filename}}"/>
+              <param name="filename" expression="${{tmp}}\${{filename}}"/>
             </xslt>
             <chmod file="${{tmp}}/${{filename}}/moveRessourceFiles.xml" perm="777"/>
             <xslt