# HG changeset patch
# User bgruening
# Date 1426369373 14400
# Node ID 8ff10e226c3765336f07fe8db0dbf8d49a9ee64e
# Parent  7ff9146333d34cf3d9528ba1730b3cfe6c549ce9
Uploaded

diff -r 7ff9146333d3 -r 8ff10e226c37 convert.xml
--- a/convert.xml	Mon Nov 18 16:11:17 2013 -0500
+++ b/convert.xml	Sat Mar 14 17:42:53 2015 -0400
@@ -4,11 +4,13 @@
         <requirement type="package" version="1.3.18">graphicsmagick</requirement>
     </requirements>
     <command>
+<![CDATA[
         ln -s '${input}' input.${input.ext};
         #set $trans_options = str($transformations).replace(',', ' ')
 
         convert $trans_options input.${input.ext} temp.${output_format};
         mv temp.${output_format} '${output}';
+]]>
     </command>
 
     <inputs>
@@ -28,7 +30,7 @@
                 <option value="svg">svg</option>
                 <option value="eps">eps</option>
                 <option value="tiff">tiff</option>
-            </param>
+        </param>
     </inputs>
     <outputs>
         <data format="png" name="output">
@@ -53,6 +55,7 @@
 
   </tests>
     <help>
+<![CDATA[
 
 **What it does**
 
@@ -67,5 +70,6 @@
 
 .. image:: $PATH_TO_IMAGES/donald.png
 
+]]>
     </help>
 </tool>
diff -r 7ff9146333d3 -r 8ff10e226c37 montage.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/montage.xml	Sat Mar 14 17:42:53 2015 -0400
@@ -0,0 +1,38 @@
+<tool id="graphicsmagick_image_montage" name="Image Montage" version="0.1.0">
+    <description></description>
+    <requirements>
+        <requirement type="package" version="1.3.18">graphicsmagick</requirement>
+    </requirements>
+    <command>
+<![CDATA[
+        ln -s '${input_existing}' input_existing.jpg
+        &&
+        ln -s '${input_new}' input_new.jpg
+        &&
+        montage input_existing.jpg input_new.jpg -geometry +0+0 -background none -tile 1x2 temp.jpg
+        &&
+        mv temp.jpg '${output}'
+]]>
+    </command>
+
+    <inputs>
+        <param format="jpg" name="input_existing" type="data" label="Existing Image" />
+        <param format="jpg" name="input_new" type="data" label="New Image" />
+    </inputs>
+    <outputs>
+        <data format="jpg" name="output">
+        </data>
+    </outputs>
+    <tests>
+  </tests>
+    <help>
+<![CDATA[
+
+**What it does**
+
+Stick Images together
+
+
+]]>
+    </help>
+</tool>
diff -r 7ff9146333d3 -r 8ff10e226c37 tool_dependencies.xml
--- a/tool_dependencies.xml	Mon Nov 18 16:11:17 2013 -0500
+++ b/tool_dependencies.xml	Sat Mar 14 17:42:53 2015 -0400
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="graphicsmagick" version="1.3.18">
-        <repository changeset_revision="2fd4eb971ba5" name="package_graphicsmagick_1_3" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="bff3f66adff2" name="package_graphicsmagick_1_3" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
 </tool_dependency>