Retab certain fastx tools, remove duplicate macro imports

Author: mvdbeek

tool_collections/fastx_toolkit/fasta_clipping_histogram/fasta_clipping_histogram.xml

@@ -4,9 +4,6 @@
     <macros>
         <import>fastx_macros.xml</import>
     </macros>
-    <macros>
-        <import>fastx_macros.xml</import>
-    </macros>
     <command><![CDATA[
         command -v perl5.22.0 &&
         perl5.22.0 `command -v fasta_clipping_histogram.pl` '$input' '$outfile' ||

tool_collections/fastx_toolkit/fastq_quality_boxplot/fastq_quality_boxplot.xml

@@ -1,25 +1,25 @@
 <tool id="cshl_fastq_quality_boxplot" name="Draw quality score boxplot" version="@VERSION@">
-	<description></description>
+    <description></description>
     <expand macro="requirements" />
     <macros>
         <import>fastx_macros.xml</import>
     </macros>
-	<command>
-		fastq_quality_boxplot_graph.sh -t '$input.name' -i '$input' -o '$output'
-	</command>
-	<inputs>
-		<param format="txt" name="input" type="data" label="Statistics report file"  help="output of 'FASTQ Statistics' tool" />
-	</inputs>
-
-	<outputs>
-		<data format="png" name="output" metadata_source="input" />
-	</outputs>
-	<tests>
-		<test>
-			<param name="input" value="fastq_stats1.out" ftype="txt"></param>
-			<output name="output" file="quality_boxplot_out.png"></output>
-		</test>
-	</tests>
+    <command>
+        fastq_quality_boxplot_graph.sh -t '$input.name' -i '$input' -o '$output'
+    </command>
+    <inputs>
+        <param format="txt" name="input" type="data" label="Statistics report file"  help="output of 'FASTQ Statistics' tool" />
+    </inputs>
+
+    <outputs>
+        <data format="png" name="output" metadata_source="input" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="input" value="fastq_stats1.out" ftype="txt"></param>
+            <output name="output" file="quality_boxplot_out.png"></output>
+        </test>
+    </tests>
 <help>
 
 **What it does**

tool_collections/fastx_toolkit/fastx_nucleotides_distribution/fastx_nucleotides_distribution.xml

@@ -1,25 +1,22 @@
 <tool id="cshl_fastx_nucleotides_distribution" version="@VERSION@" name="Draw nucleotides distribution chart">
-	<description></description>
+    <description></description>
     <expand macro="requirements" />
     <macros>
         <import>fastx_macros.xml</import>
     </macros>
-    <macros>
-        <import>fastx_macros.xml</import>
-    </macros>
-	<command detect_errors="aggressive">fastx_nucleotide_distribution_graph.sh -t '$input.name' -i $input -o $output</command>
-	<inputs>
-		<param format="txt" name="input" type="data" label="Statistics Text File" help="output of 'FASTX Statistics' tool" />
-	</inputs>
-	<outputs>
-		<data format="png" name="output" metadata_source="input" />
-	</outputs>
-	<tests>
-		<test>
-			<param name="input" value="fastq_stats1.out" ftype="txt" />
-			<output name="output" file="fastx_nt_distribution.png" compare="sim_size"/>
-		</test>
-	</tests>
+    <command detect_errors="aggressive">fastx_nucleotide_distribution_graph.sh -t '$input.name' -i '$input' -o '$output'</command>
+    <inputs>
+        <param format="txt" name="input" type="data" label="Statistics Text File" help="output of 'FASTX Statistics' tool" />
+    </inputs>
+    <outputs>
+        <data format="png" name="output" metadata_source="input" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="input" value="fastq_stats1.out" ftype="txt" />
+            <output name="output" file="fastx_nt_distribution.png" compare="sim_size"/>
+        </test>
+    </tests>
 <help>
 
 **What it does**