Merge branch 'features/JAL-1605_html-svg-export' into develop

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index ff1b180..17c2472 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -22,6 +22,7 @@ package jalview.bin;
 
 import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
+import jalview.io.HtmlSvgOutput;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.ws.jws2.Jws2Discoverer;
@@ -484,6 +485,14 @@ public class Jalview
             System.out.println("Creating SVG image: " + file);
             continue;
           }
+          else if (format.equalsIgnoreCase("html"))
+          {
+            File imageFile = new java.io.File(file);
+            imageName = imageFile.getName();
+            new HtmlSvgOutput(new java.io.File(file), af.alignPanel);
+            System.out.println("Creating HTML image: " + file);
+            continue;
+          }
           else if (format.equalsIgnoreCase("imgMap"))
           {
             af.createImageMap(new java.io.File(file), imageName);
@@ -615,6 +624,8 @@ public class Jalview
                     + "-blc FILE\tCreate alignment file FILE in BLC format.\n"
                     + "-jalview FILE\tCreate alignment file FILE in Jalview format.\n"
                     + "-png FILE\tCreate PNG image FILE from alignment.\n"
+                    + "-svg FILE\tCreate SVG image FILE from alignment.\n"
+                    + "-html FILE\tCreate HTML file from alignment.\n"
                     + "-imgMap FILE\tCreate HTML file FILE with image map of PNG image.\n"
                     + "-eps FILE\tCreate EPS file FILE from alignment.\n"
                     + "-questionnaire URL\tQueries the given URL for information about any Jalview user questionnaires.\n"