# HG changeset patch
# User mingchen0919
# Date 1522616528 14400
# Node ID 9f61c75f17b710f158b7f863d499985fd639c3c4
# Parent  3e6452f224b27a5af632e5c2a0dfadfc68ccbd01
planemo upload

diff -r 3e6452f224b2 -r 9f61c75f17b7 elastic_tool.xml
--- a/elastic_tool.xml	Sun Apr 01 16:50:18 2018 -0400
+++ b/elastic_tool.xml	Sun Apr 01 17:02:08 2018 -0400
@@ -4,7 +4,7 @@
     </macros>
     <expand macro="tool_description"/>
     <requirements>
-        <expand macro="elastic_tool_requirements"/>
+        <expand macro="tool_requirements"/>
     </requirements>
     <stdio>
         <regex match="XXX" source="stderr" level="warning"
@@ -130,25 +130,6 @@
         <data format="txt" name="tool_log" label="${tool.name} log ${on_string}"/>
     </outputs>
     <citations>
-        <citation type="bibtex"><![CDATA[
-            @article{allaire2016rmarkdown,
-            title={rmarkdown: Dynamic Documents for R, 2016},
-            author={Allaire, J and Cheng, Joe and Xie, Yihui and McPherson, Jonathan and Chang, Winston and Allen, Jeff
-            and Wickham, Hadley and Atkins, Aron and Hyndman, Rob},
-            journal={R package version 0.9},
-            volume={6},
-            year={2016}
-            }
-        ]]></citation>
-        <citation type="bibtex"><![CDATA[
-            @book{xie2015elastic,
-            title={Dynamic Documents with R and knitr},
-            author={Xie, Yihui},
-            volume={29},
-            year={2015},
-            publisher={CRC Press}
-            }
-        ]]></citation>
-        <expand macro="citations"/>
+        <expand macro="tool_citations"/>
     </citations>
 </tool>
diff -r 3e6452f224b2 -r 9f61c75f17b7 elastic_tool_macros.xml
--- a/elastic_tool_macros.xml	Sun Apr 01 16:50:18 2018 -0400
+++ b/elastic_tool_macros.xml	Sun Apr 01 17:02:08 2018 -0400
@@ -25,7 +25,25 @@
     </xml>
 
     <!--tool citations-->
-    <xml name="citations">
-        <citation type="doi"></citation>
+    <xml name="tool_citations">
+        <citation type="bibtex"><![CDATA[
+            @article{allaire2016rmarkdown,
+            title={rmarkdown: Dynamic Documents for R, 2016},
+            author={Allaire, J and Cheng, Joe and Xie, Yihui and McPherson, Jonathan and Chang, Winston and Allen, Jeff
+            and Wickham, Hadley and Atkins, Aron and Hyndman, Rob},
+            journal={R package version 0.9},
+            volume={6},
+            year={2016}
+            }
+        ]]></citation>
+        <citation type="bibtex"><![CDATA[
+            @book{xie2015elastic,
+            title={Dynamic Documents with R and knitr},
+            author={Xie, Yihui},
+            volume={29},
+            year={2015},
+            publisher={CRC Press}
+            }
+        ]]></citation>
     </xml>
 </macros>