--- a/macros.xml	Thu Aug 03 06:00:00 2017 -0400
+++ b/macros.xml	Mon Dec 16 05:26:42 2019 -0500
@@ -1,74 +1,58 @@
 <?xml version="1.0"?>
 <macros>
+    <token name="@TOOL_VERSION@">1.10.0</token>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="0.4_1">r-snow</requirement>
-            <requirement type="package" version="1.0.0">bioconductor-ipo</requirement>
-            <requirement type="package" version="1.1_4">r-batch</requirement>
+            <requirement type="package" version="@TOOL_VERSION@">bioconductor-ipo</requirement>
+            <requirement type="package" version="1.1_5">r-batch</requirement>
         </requirements>
     </xml>
-    <xml name="stdio">
-        <stdio>
-            <exit_code range="1" level="fatal" />
-        </stdio>
-    </xml>
 
-    <token name="@COMMAND_SCRIPT@">
-        LANG=C Rscript $__tool_directory__/
-    </token>
-
-    <token name="@COMMAND_LOG_EXIT@">
-        ;
-        return=\$?;
-        mv log.txt $log;
-        cat $log;
-        sh -c "exit \$return"
-    </token>
-
-    <token name="@COMMAND_NSLAVES@">
+    <token name="@COMMAND_NSLAVES@"><![CDATA[
         nSlaves \${GALAXY_SLOTS:-1}
-    </token>
+    ]]></token>
 
     <!-- zipfile load for planemo test -->
 
-    <token name="@COMMAND_FILE_LOAD@">
+    <token name="@ESCAPE_IDENTIFIER@"><![CDATA[re.sub('[^\s\w\-\.]', '_', str($single_file.element_identifier))]]></token>
+    <token name="@COMMAND_FILE_LOAD@"><![CDATA[
+        #import re
         #if $file_load_section.file_load_conditional.file_load_select == "yes":
-            #if $file_load_section.file_load_conditional.input[0].is_of_type("mzxml") or $file_load_section.file_load_conditional.input[0].is_of_type("mzml") or $file_load_section.file_load_conditional.input[0].is_of_type("mzdata") or $file_load_section.file_load_conditional.input[0].is_of_type("netcdf"):
-                #set singlefile_galaxyPath = ','.join( [ str( $single_file ) for $single_file in $file_load_section.file_load_conditional.input ] )
-                #set singlefile_sampleName = ','.join( [ str( $single_file.name ) for $single_file in $file_load_section.file_load_conditional.input ] )
+            #set singlefile_galaxyPath = '|'.join( [ str( $single_file ) for $single_file in $file_load_section.file_load_conditional.input ] )
+            #set singlefile_sampleName = '|'.join( ["%s" % re.sub('[^\s\w\-\.]', '_', str($single_file.element_identifier)) for single_file in $file_load_section.file_load_conditional.input ] )
+
+            singlefile_galaxyPath '$singlefile_galaxyPath' singlefile_sampleName '$singlefile_sampleName'
+        #end if
+    ]]></token>
 
-                singlefile_galaxyPath '$singlefile_galaxyPath' singlefile_sampleName '$singlefile_sampleName'
-            #else
-                zipfile '$file_load_section.file_load_conditional.input'
-            #end if
-        #end if
-    </token>
+    <xml name="input_validator_range_integer">
+      <validator type="regex" message="Should be this format: XX or XX,YY">[0-9]+,?[0-9]*</validator>
+    </xml>
+
+    <xml name="input_validator_range_float">
+        <validator type="regex" message="Should be one combinaison of those format: XX, XX.YY, XX,YY or XX.XX,YY.YY">[0-9]+[\.]?[0-9]*,?[0-9]*[\.]?[0-9]*</validator>
+    </xml>
+
+    <xml name="input_validator_range_float_neg">
+        <validator type="regex" message="Should be one combinaison of those format: XX, XX.YY, XX,YY or -XX,YY or XX.XX,YY.YY">[\-]?[0-9]+[\.]?[0-9]*,?[\-]?[0-9]*[\.]?[0-9]*</validator>
+    </xml>
 
     <xml name="input_file_load">
-        <section name="file_load_section" title="Resubmit your raw dataset or your zip file">
+        <section name="file_load_section" title="Resubmit your raw dataset">
             <conditional name="file_load_conditional">
-                <param name="file_load_select" type="select" label="Resubmit your dataset or your zip file" help="Use only if you get a message which say that your original dataset or zip file have been deleted on the server." >
+                <param name="file_load_select" type="select" label="Resubmit your dataset" help="Use only if you get a message which say that your original dataset have been deleted on the server." >
                     <option value="no" >no need</option>
                     <option value="yes" >yes</option>
                 </param>
                 <when value="no">
                 </when>
                 <when value="yes">
-                    <param name="input" type="data" format="mzxml,mzml,mzdata,netcdf,no_unzip.zip,zip" multiple="true" label="File(s) from your history containing your chromatograms" help="Single file mode for the format: mzxml, mzml, mzdata and netcdf. Zip file mode for the format: no_unzip.zip, zip. See the help section below." />
+                    <param name="input" type="data" format="mzxml,mzml,mzdata,netcdf" multiple="true" label="File(s) from your history containing your chromatograms" help="Single file mode for the format: mzxml, mzml, mzdata and netcdf. Zip file mode for the format: no_unzip.zip, zip. See the help section below." />
                 </when>
             </conditional>
         </section>
     </xml>
 
-    <xml name="test_file_load_zip">
-        <section name="file_load_section">
-            <conditional name="file_load_conditional">
-                <param name="file_load_select" value="yes" />
-                <param name="input" value="faahKO_reduce.zip" ftype="zip" />
-            </conditional>
-        </section>
-    </xml>
-
     <xml name="test_file_load_single">
         <section name="file_load_section">
             <conditional name="file_load_conditional">
@@ -78,7 +62,7 @@
         </section>
     </xml>
 
-    <token name="@HELP_AUTHORS@">
+    <token name="@HELP_AUTHORS@"><![CDATA[
 .. class:: infomark
 
 **Authors**  Gunnar Libiseller, Michaela Dvorzak, Ulrike Kleb, Edgar Gander, Tobias Eisenberg, Frank Madeo, Steffen Neumann, Gert Trausinger, Frank Sinner, Thomas Pieber and Christoph Magnes
@@ -91,7 +75,12 @@
 
 ---------------------------------------------------
 
-    </token>
+    ]]></token>
+    <token name="@HELP_NEWVERSION_1_10_0_0@"><![CDATA[
+**Version 1.10.0+galaxy0 - 03/09/2019**
+
+- NEW: new versions of the IPO wrappers based on IPO-1.10.0
+    ]]></token>
 
 
     <xml name="citation">