groovy from stdin

diff --git a/help/html/features/clarguments.html b/help/html/features/clarguments.html
index 10917b4..8d6a4d8 100644 (file)
--- a/help/html/features/clarguments.html
+++ b/help/html/features/clarguments.html
@@ -108,7 +108,7 @@
                <td>
                <div align="center">-groovy FILE</div>
                <td>
-               <div align="left">Execute groovy script in FILE, after all other
+               <div align="left">Execute groovy script in FILE (where FILE may be 'STDIN' to read from the standard input) after all other
                arguments have been processed</div>
                </td>
        </tr>

diff --git a/help/html/features/groovy.html b/help/html/features/groovy.html
index 1a0b83c..3e7b0f4 100644 (file)
--- a/help/html/features/groovy.html
+++ b/help/html/features/groovy.html
@@ -7,14 +7,28 @@ language for the Java platform</em>&quot;. The groovy scripting language makes i
 extremely easy to programmatically interact with Java programs, in much the same \r
 way that Javascript is used to generate and interact with applets and other \r
 objects on the page.</p>\r
-<p><em>Opening the Groovy Console</em><br>If groovy is available, then the \r
+<p><strong><em>Getting Groovy...</em></strong><br>\r
+Jalview Groovy support is only possible if the core groovy \r
+jars which include the GroovyShell are present on the CLASSPATH \r
+when Jalview is started.</p><p>The jars are obtained from the \r
+<em>embedded</em> directory within the <a \r
+href="http://dist.codehaus.org/groovy/distributions">groovy \r
+distribution</a>. The easiest way of adding them to the \r
+Jalview classpath is to download and build jalview from \r
+it's source distribution, and then add the groovy-all-*.jar \r
+to the lib directory whose path is given in the java.ext.dirs property.</p>\r
+<p><strong>Opening Jalview's Groovy Console</strong><br>If groovy is available, then the \r
 <strong>Tools&#8594;Groovy Console...</strong> menu entry will be available \r
 from the Jalview Desktop's drop-down menu. Selecting this will open the\r
 <a href="http://groovy.codehaus.org/Groovy+Console">Groovy Console</a> which \r
 allows you to interactively execute Groovy scripts within the Jalview run-time environment.</p>\r
-<p><em>Executing groovy scripts on Jalview startup</em><br>\r
-The -groovy &lt;script&gt; option on the <a href="commandline.html"/>Jalview command line</a>command line option will </p>\r
-<p>There is as yet no properly defined scripting interface to Jalview, but all the\r
+<p><strong>Executing groovy scripts on Jalview startup</strong><br>\r
+The -groovy &lt;script&gt; option on the <a href="commandline.html"/>\r
+Jalview command line</a> will execute the contents of \r
+&lt;script&gt;. &lt;script&gt; may be a file, or alternatively if it is &quot;STDIN&quot; \r
+then the standard input will be used.</p>\r
+<p><strong>Access to Jalview's functions from Groovy Scripts</strong><br>\r
+There is as yet no properly defined scripting interface to Jalview, but all the\r
 public methods of the jalview class hierarchy can be called from Groovy scripts. \r
 The access point for this is the <strong>Jalview</strong> object defined in\r
 the groovy environent which corresponds to the <pre>jalview.gui.Desktop</pre> object which\r
@@ -30,16 +44,6 @@ def seq = alignment.getSequenceAt(0);
 </li>\r
 </ul>\r
 </p>\r
-<p><strong>Getting Groovy...<br></strong>\r
-Jalview Groovy support is only possible if the core groovy \r
-jars which include the GroovyShell are present on the CLASSPATH \r
-when Jalview is started. <p>The jars are obtained from the \r
-<em>embedded</em> directory within the <a \r
-href="http://dist.codehaus.org/groovy/distributions">groovy \r
-distribution</a>. The easiest way of adding them to the \r
-Jalview classpath is to download and build jalview from \r
-it's source distribution, and then add the groovy-all-*.jar \r
-to the lib directory whose path is given in the java.ext.dirs property.</p>\r
 \r
 <p>&nbsp;</p>\r
 </body>\r