--- a/deepTools_macros.xml	Sat Dec 14 03:29:29 2013 -0500
+++ b/deepTools_macros.xml	Sat Dec 14 07:00:55 2013 -0500
@@ -172,13 +172,7 @@
             </param>
             <when value="no" />
             <when value="yes">
-                <param name="outFileFormat" type="select" label="Image file format">
-                    <option value="png" selected="true">png</option>
-                    <option value="pdf">pdf</option>
-                    <option value="svg">svg</option>
-                    <option value="eps">eps</option>
-                    <option value="emf">emf</option>
-                </param>
+                <yield />
                 <param name="saveData" type="boolean" label="Save the data underlying data for the average profile"/>
                 <param name="saveMatrix" type="boolean" label="Save the the matrix of values underlying the heatmap"/>
                 <param name="saveSortedRegions" type="boolean" label="Save the regions after skipping zeros or min/max threshold values" help="The order of the regions in the file follows the sorting order selected. This is useful, for example, to generate other heatmaps keeping the sorting of the first heatmap."/>
@@ -186,7 +180,17 @@
         </conditional>
     </macro>
 
-    <macro name="output_graphic_outputs">
+    <macro name="input_image_file_format">
+        <param name="outFileFormat" type="select" label="Image file format">
+            <option value="png" selected="true">png</option>
+            <option value="pdf">pdf</option>
+            <option value="svg">svg</option>
+            <option value="eps">eps</option>
+            <option value="emf">emf</option>
+        </param>
+    </macro>
+
+    <macro name="output_image_file_format">
         <data format="png" name="outFileName" label="${tool.name} image">
             <change_format>
                 <when input="output.outFileFormat" value="pdf" format="pdf" />
@@ -195,6 +199,10 @@
                 <when input="output.outFileFormat" value="emf" format="emf" />
             </change_format>
         </data>
+    </macro>
+
+    <macro name="output_graphic_outputs">
+        <yield />
         <data format="tabular" name="outFileNameData" label="${tool.name} on ${on_string}: averages per matrix column">
             <filter>
             ((