--- a/macros.xml	Tue Jun 27 17:37:28 2023 +0000
+++ b/macros.xml	Thu Aug 10 06:53:23 2023 +0000
@@ -11,13 +11,22 @@
     </token>
     <token name="@FQQUAL@">
         <![CDATA[
-            #if 'fastqsanger' in $input.ext:
+            #if $input.is_of_type('fastqsanger', 'fastqsanger.gz', 'fastqsanger.bz2'):
                 -Q 33
-            #elif 'fastqsolexa' in $input.ext or 'fastqillumina' in $input.ext:
+            #elif $input.is_of_type('fastqsolexa', 'fastqsolexa.gz', 'fastqsolexa.bz2', 'fastqillumina', 'fastqillumina.gz', 'fastqillumina.bz2'):
                 -Q 64
             #end if
         ]]>
     </token>
+    <token name="@GZIP@">
+        <![CDATA[
+            #if $input.is_of_type('fasta.gz', 'fastqsanger.gz', 'fastqsolexa.gz', 'fastqillumina.gz'):
+                | gzip -c
+            #elif $input.is_of_type('fastqsanger.bz2', 'fastqsolexa.bz2', 'fastqillumina.bz2'):
+                | bzip2 -c
+            #end if
+        ]]>
+    </token>
     <xml name="requirements">
         <requirements>
             <requirement type="package" version="@VERSION@">fastx_toolkit</requirement>
@@ -25,6 +34,7 @@
         </requirements>
     </xml>
     <token name="@VERSION@">0.0.14</token>
+    <token name="@VERSION_SUFFIX@">2</token>
     <token name="@SANGER@">fastqsanger,fastqsanger.gz,fastqsanger.bz2</token>
     <token name="@SOLEXA@">fastqsolexa,fastqsolexa.gz,fastqsolexa.bz2</token>
     <token name="@ILLUMINA@">fastqillumina,fastqillumina.gz,fastqillumina.bz2</token>
@@ -42,7 +52,13 @@
             </citation>
         </citations>
     </xml>
+    <xml name="fasta_input">
+        <param name="input" type="data" format="@FASTAS@" label="Input FASTA file" />
+    </xml>
     <xml name="fastq_input">
         <param name="input" type="data" format="@FASTQS@" label="Input FASTQ file" />
     </xml>
+    <xml name="fastx_input">
+        <param name="input" type="data" format="@FASTAS@,@FASTQS@" label="Input file in FASTA or FASTQ format" />
+    </xml>
 </macros>