--- a/flye.xml	Wed Oct 26 13:36:49 2022 +0000
+++ b/flye.xml	Mon Aug 26 13:54:16 2024 +0000
@@ -3,8 +3,9 @@
     <macros>
         <import>macros.xml</import>
     </macros>
+    <expand macro="edam_ontology"/>
+    <expand macro="xrefs"/>
     <expand macro="requirements" />
-    <expand macro="edam_ontology"/>
     <version_command>flye --version</version_command>
     <command detect_errors="exit_code"><![CDATA[
         #for $counter, $input in enumerate($inputs):
@@ -17,7 +18,7 @@
             #elif $input.is_of_type('fasta'):
                 #set $ext = 'fasta'
             #end if
-            ln -s '$input' ./input_${counter}.${ext} &&
+            ln -sf '$input' ./input_${counter}.${ext} &&
         #end for
         flye
         $mode_conditional.mode
@@ -104,7 +105,7 @@
     <outputs>
         <data name="consensus" format="fasta" from_work_dir="out_dir/assembly.fasta" label="${tool.name} on ${on_string}: consensus"/>
         <data name="assembly_graph" format="graph_dot" from_work_dir="out_dir/assembly_graph.gv" label="${tool.name} on ${on_string}: assembly graph"/>
-        <data name="assembly_gfa" format="txt" from_work_dir="out_dir/assembly_graph.gfa" label="${tool.name} on ${on_string}: graphical fragment assembly"/>
+        <data name="assembly_gfa" format="gfa" from_work_dir="out_dir/assembly_graph.gfa" label="${tool.name} on ${on_string}: graphical fragment assembly"/>
         <data name="assembly_info" format="tabular" from_work_dir="out_dir/assembly_info.txt" label="${tool.name} on ${on_string}: assembly info"/>
         <data name="flye_log" format="txt" from_work_dir="out_dir/flye.log" label="${tool.name} on ${on_string}: log">
             <filter>generate_log</filter>
@@ -119,8 +120,12 @@
             <param name="generate_log" value="true"/>
             <output name="assembly_info" file="result1_assembly_info.txt" ftype="tabular" compare="sim_size"/>
             <output name="assembly_graph" file="result1_assembly_graph.dot" ftype="graph_dot" compare="sim_size"/>
-            <output name="assembly_gfa" file="result1_assembly_graph.gfa" ftype="txt" compare="sim_size"/>
-            <output name="consensus" file="result1_assembly.fasta" ftype="fasta" compare="sim_size"/>
+            <output name="assembly_gfa" file="result1_assembly_graph.gfa" ftype="gfa" compare="diff" lines_diff="10"/>
+            <output name="consensus" ftype="fasta">
+                <assert_contents>
+                    <has_line line=">contig_1"/>
+                </assert_contents>
+            </output>
             <output name="flye_log" file="result1.log" ftype="txt" compare="sim_size"/>
         </test>
         <!--Test 02: nano raw-->
@@ -138,7 +143,7 @@
                     <has_size value="803" delta="100"/>
                </assert_contents>
             </output>
-            <output name="assembly_gfa" ftype="txt">
+            <output name="assembly_gfa" ftype="gfa">
                 <assert_contents>
                     <has_size value="35047" delta="100"/>
                </assert_contents>
@@ -170,7 +175,7 @@
                     <has_size value="1840" delta="100"/>
                </assert_contents>
             </output>
-            <output name="assembly_gfa" ftype="txt">
+            <output name="assembly_gfa" ftype="gfa">
                 <assert_contents>
                     <has_size value="420752" delta="100"/>
                </assert_contents>
@@ -198,7 +203,7 @@
                     <has_size value="367" delta="100"/>
                </assert_contents>
             </output>
-            <output name="assembly_gfa" ftype="txt">
+            <output name="assembly_gfa" ftype="gfa">
                 <assert_contents>
                     <has_size value="418729" delta="100"/>
                </assert_contents>
@@ -226,14 +231,14 @@
                     <has_size value="1248" delta="100"/>
                </assert_contents>
             </output>
-            <output name="assembly_gfa" ftype="txt">
+            <output name="assembly_gfa" ftype="gfa">
                 <assert_contents>
-                    <has_size value="420252" delta="100"/>
+                    <has_size value="419414" delta="1000"/>
                </assert_contents>
             </output>
             <output name="consensus" ftype="fasta">
                 <assert_contents>
-                    <has_size value="427129" delta="100"/>
+                    <has_size value="426277" delta="1000"/>
                </assert_contents>
             </output>
         </test>
@@ -252,17 +257,17 @@
             </output>
             <output name="assembly_graph" ftype="graph_dot">
                 <assert_contents>
-                    <has_size value="1273" delta="100"/>
+                    <has_size value="1248" delta="500"/>
                </assert_contents>
             </output>
-            <output name="assembly_gfa" ftype="txt">
+            <output name="assembly_gfa" ftype="gfa">
                 <assert_contents>
-                    <has_size value="420252" delta="100"/>
+                    <has_size value="420254" delta="2000"/>
                </assert_contents>
             </output>
             <output name="consensus" ftype="fasta">
                 <assert_contents>
-                    <has_size value="427129" delta="100"/>
+                    <has_size value="427131" delta="2000"/>
                </assert_contents>
             </output>
         </test>
@@ -277,22 +282,22 @@
             <param name="keep-haplotypes" value="true"/>
             <output name="assembly_info" ftype="tabular">
                 <assert_contents>
-                    <has_size value="286" delta="100"/>
+                    <has_size value="286" delta="200"/>
                </assert_contents>
             </output>
             <output name="assembly_graph" ftype="graph_dot">
                 <assert_contents>
-                    <has_size value="1273" delta="100"/>
+                    <has_size value="1273" delta="500"/>
                </assert_contents>
             </output>
-            <output name="assembly_gfa" ftype="txt">
+            <output name="assembly_gfa" ftype="gfa">
                 <assert_contents>
-                    <has_size value="420252" delta="100"/>
+                    <has_size value="420254" delta="3000"/>
                </assert_contents>
             </output>
             <output name="consensus" ftype="fasta">
                 <assert_contents>
-                    <has_size value="427129" delta="100"/>
+                    <has_size value="427131" delta="3000"/>
                </assert_contents>
             </output>
         </test>
@@ -301,7 +306,7 @@
             <param name="inputs" ftype="fastq.gz" value="ecoli_hifi_01.fastq.gz,ecoli_hifi_02.fastq.gz,ecoli_hifi_03.fastq.gz,ecoli_hifi_04.fastq.gz,ecoli_hifi_05.fastq.gz,ecoli_hifi_06.fastq.gz,ecoli_hifi_07.fastq.gz,ecoli_hifi_08.fastq.gz,ecoli_hifi_09.fastq.gz"/>
             <param name="mode" value="--nano-hq"/>
             <param name="min_overlap" value="1000"/>
-            <param name="scaffolding" value="true"/>
+            <param name="scaffold" value="true"/>
             <output name="assembly_info" ftype="tabular">
                 <assert_contents>
                     <has_size value="286" delta="100"/>
@@ -312,14 +317,14 @@
                     <has_size value="1248" delta="100"/>
                </assert_contents>
             </output>
-            <output name="assembly_gfa" ftype="txt">
+            <output name="assembly_gfa" ftype="gfa">
                 <assert_contents>
-                    <has_size value="420252" delta="100"/>
+                    <has_size value="419414" delta="2000"/>
                </assert_contents>
             </output>
             <output name="consensus" ftype="fasta">
                 <assert_contents>
-                    <has_size value="427129" delta="100"/>
+                    <has_size value="426277" delta="2000"/>
                </assert_contents>
             </output>
         </test>
@@ -339,7 +344,7 @@
                     <has_size value="217" delta="100"/>
                </assert_contents>
             </output>
-            <output name="assembly_gfa" ftype="txt">
+            <output name="assembly_gfa" ftype="gfa">
                 <assert_contents>
                     <has_size value="5110" delta="100"/>
                </assert_contents>
@@ -353,8 +358,6 @@
     </tests>
     <help><![CDATA[
 
-.. class:: infomark
-
 **Purpose**
 
 Flye is a de novo assembler for single molecule sequencing reads, such as those produced by PacBio and Oxford Nanopore Technologies. 
@@ -364,8 +367,6 @@
 
 ----
 
-.. class:: infomark
-
 **Quick usage**
 
 Input reads can be in FASTA or FASTQ format, uncompressed or compressed with gz. Currently, PacBio (raw, corrected, HiFi) and ONT reads 
@@ -380,17 +381,13 @@
 
 ----
 
-.. class:: infomark
-
 **Outputs**
 
 The main output files are:
 
-    ::
-
-        - Final assembly: contains contigs and possibly scaffolds (see below).
-        - Final repeat graph: note that the edge sequences might be different (shorter) than contig sequences, because contigs might include multiple graph edges.
-        - Extra information about contigs (such as length or coverage).
+* Final assembly: contains contigs and possibly scaffolds (see below).
+* Final repeat graph: note that the edge sequences might be different (shorter) than contig sequences, because contigs might include multiple graph edges.
+* Extra information about contigs (such as length or coverage).
 
 Each contig is formed by a single unique graph edge. If possible, unique contigs are extended with the sequence from flanking unresolved repeats on the graph. Thus, 
 a contig fully contains the corresponding graph edge (with the same id), but might be longer then this edge. This is somewhat similar to unitig-contig relation in 
@@ -402,53 +399,42 @@
 
 Extra information about contigs/scaffolds is output into the assembly_info.txt file. It is a tab-delimited table with the columns as follows:
 
-    ::
+*  Contig/scaffold id
+*  Length
+*  Coverage
+*  Is circular, (Y)es or (N)o
+*  Is repetitive, (Y)es or (N)o
+*  Multiplicity (based on coverage)
+*  Alternative group
+*  Graph path (graph path corresponding to this contig/scaffold).
 
-        - Contig/scaffold id
-        - Length
-        - Coverage
-        - Is circular, (Y)es or (N)o
-        - Is repetitive, (Y)es or (N)o
-        - Multiplicity (based on coverage)
-        - Alternative group
-        - Graph path (graph path corresponding to this contig/scaffold).
-
-Scaffold gaps are marked with ?? symbols, and * symbol denotes a terminal graph node. Alternative contigs (representing alternative haplotypes) will have the same alt. 
-group ID. Primary contigs are marked by *.
+Scaffold gaps are marked with `??` symbols, and `*` symbol denotes a terminal graph node. Alternative contigs (representing alternative haplotypes) will have the same alt. 
+group ID. Primary contigs are marked by `*`.
 
 ----
 
-.. class:: infomark
-
 **Algorithm Description**
 
 This is a brief description of the Flye algorithm. Please refer to the manuscript for more detailed information. The draft contig extension is organized as follows:
 
-    ::
-
-        - K-mer counting / erroneous k-mer pre-filtering
-        - Solid k-mer selection (k-mers with sufficient frequency, which are unlikely to be erroneous)
-        - Contig extension. The algorithm starts from a single read and extends it with a next overlapping read (overlaps are dynamically detected using the selected solid k-mers).
+*  K-mer counting / erroneous k-mer pre-filtering
+*  Solid k-mer selection (k-mers with sufficient frequency, which are unlikely to be erroneous)
+*  Contig extension. The algorithm starts from a single read and extends it with a next overlapping read (overlaps are dynamically detected using the selected solid k-mers).
 
 Note that we do not attempt to resolve repeats at this stage, thus the reconstructed contigs might contain misassemblies. Flye then aligns the reads on these draft 
 contigs using minimap2 and calls a consensus. Afterwards, Flye performs repeat analysis as follows:
 
-    ::
-
-        - Repeat graph is constructed from the (possibly misassembled) contigs
-        - In this graph all repeats longer than minimum overlap are collapsed
-        - The algorithm resolves repeats using the read information and graph structure
-        - The unbranching paths in the graph are output as contigs
+*  Repeat graph is constructed from the (possibly misassembled) contigs
+*  In this graph all repeats longer than minimum overlap are collapsed
+*  The algorithm resolves repeats using the read information and graph structure
+*  The unbranching paths in the graph are output as contigs
 
 If enabled, after resolving bridged repeats, Trestle module attempts to resolve simple unbridged repeats (of multiplicity 2) using the heterogeneities between repeat copies. 
 Finally, Flye performs polishing of the resulting assembly to correct the remaining errors:
 
-    ::
-
-        - Alignment of all reads to the current assembly using minimap2
-        - Partition the alignment into mini-alignments (bubbles)
-        - Error correction of each bubble using a maximum likelihood approach
-
+*  Alignment of all reads to the current assembly using minimap2
+*  Partition the alignment into mini-alignments (bubbles)
+*  Error correction of each bubble using a maximum likelihood approach
 
 The polishing steps could be repeated, which might slightly increase quality for some datasets.