Update ImageMagick documentation
diff --git a/www/gradient.html b/www/gradient.html
index dc5ba44..abd73e2 100644
--- a/www/gradient.html
+++ b/www/gradient.html
@@ -42,7 +42,7 @@
<a class="magick-nav-item " href="../index.html">Home</a>
<a class="magick-nav-item " href="binary-releases.html">Download</a>
<a class="magick-nav-item " href="command-line-tools.html">Tools</a>
- <a class="magick-nav-item " href="command-line-options.html">Options</a>
+ <a class="magick-nav-item " href="command-line-processing.html">Command-line</a>
<a class="magick-nav-item " href="resources.html">Resources</a>
<a class="magick-nav-item " href="api.html">Develop</a>
<a class="magick-nav-item " href="http://nextgen.imagemagick.org/script/search.php">Search</a>
@@ -53,55 +53,52 @@
<div class="container">
<div class="magick-header">
-<p class="lead magick-description">An image gradient creates a gradual blend of one color whose shape is linear, circular, or elliptical.</p>
+<p class="lead magick-description">An image gradient creates a gradual blend between two colors formed into a shape that is linear, circular, or ellipical.</p>
-<p>For a linear gradient, use a filename of:</p>
+<p>For a linear gradient, the operator is either:</p>
<pre>
gradient:
-gradient:<var>color1</var>-<var>color2</var>
+gradient:color1-color2
</pre>
-<p> For a radial gradient, use a filename of:</p>
+<p> The for a radial gradient, the operator is either:</p>
<pre>
radial-gradient:
-radial-gradient:<var>color1</var>-<var>color2</var>
+radial-gradient:color1-color2
</pre>
-<p>Where <var>color1</var> is the from color and <var>color2</var> is the to color as described in more detail below. The default is white for <var>color1</var> and black for <var>color2</var>, i.e., <code>white-black</code>.</p>
+<p> In the above, color1 is the fromColor and color2 is the toColor, as described in more detail below. The default is white for color1 and black for color2, i.e., white-black.</p>
-<p>The default for a linear gradient starts with <var>color1</var> at the top of the image and <var>color2</var> at the bottom of the image. Similarly, the default for a radial gradient starts with <var>color1</var> at the center of the image and <var>color2</var> at the boundary of the image.</p>
+<p>The default for a linear gradient has color1 at the top of the image and color2 at the bottom of the image. Similarly, the default for a radial gradient has color1 at the center of the image and color2 at the boundary of the image.</p>
-<p>Gradient colors may be any valid <a href="http://www.imagemagick.org/www/color.html">color</a> accepted by ImageMagick. The named colors of <code>black</code>, <code>white</code>, or <code>gray<var>XX</var></code> are non-linear gray gradients; whereas <code>gray<var>XX[%]</var></code> is a linear gray gradient. For Unix systems, enclose <code>rgb(a)</code> and hex colors in quotes. Use double quotes, if using variables for the values.</p>
+<p>Gradient colors may be any valid color defined per <a href="http://www.imagemagick.org/www/color.html" target="_blank">http://www.imagemagick.org/www/color.html</a>. The named colors of black/white/grayXX are non-linear gray gradients; whereas gray(XX[%]) is a linear gray gradient. For Unix systems, enclose rgb(a) and hex colors in quotes. Use double quotes, if using variables for the values.</p>
-<p>Here is an example black to white linear gradient:</p>
+<p>Here is an example linear gradient:</p>
<pre>
-convert -size 256x256 gradient: linear.png
+convert -size 256x256 gradient: linear_gradient.png
+convert -size 256x256 gradient:white-black linear_gradient.png
</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/linear_gradient.png" width="256" height="256"></p>
-<p>If you want a black to white radial gradient, try:</p>
+<p>If you want a radial gradient, try:</p>
<pre>
-convert -size 256x256 radial-gradient: radial.png
+convert -size 256x256 radial-gradient: radial_gradient.png
+convert -size 256x256 radial-gradient:white-black radial_gradient.png
</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/radial_gradient.png" width="256" height="256"></p>
-<p>As of IM 6.9.2.5, gradients have been modified to be more flexible through the use of <a href="command-line-options.html#define">-define</a>:</p>
+<p>As of IM 6.9.2.5, gradients have been enhanced through the use of several -defines.</p>
<table class="table table-condensed table-striped">
<tr>
- <td><code>-define gradient:bounding-box=<var>width</var>x<var>height</var>+<var>x</var>+<var>y</var></code></td>
- <td>Limits the gradient to a larger or smaller region than the image
- dimensions. If the region defined by the bounding box is smaller than the
- image, color1 is the color of the background.</td>
- </tr>
-
- <tr>
- <td><code>-define gradient:vector="<var>x1</var>,<var>y1</var> <var>x2</var>,<var>y2</var>"</code></td>
+ <td><code>-define gradient:vector=<var>x1</var>,<var>y1</var>, <var>x2</var>,<var>y2</var></code> <code></td>
<td>Specifies the direction of the linear gradient going from vector1
- (x1,y1) to vector2 (x2,y2). Color1 (from-color) is located at vector
- position x1,y1 and color2 (to-color) is located at vector position
+ (x1,y1) to vector2 (x2,y2). Color1 (fromColor) will be located at vector
+ position x1,y1 and color2 (toColor) will be located at vector position
x2,y2.</td>
</tr>
@@ -114,34 +111,41 @@
<tr>
<td><code>-define gradient:radii=<var>x</var>,<var>y</var></code></td>
<td>Specifies the x and y radii of the gradient. If the x radius and the y
- radius are equal, the shape of the radial gradient is a circle. If
- they differ, the shape is an ellipse. The default values are the
+ radius are equal, the shape of the radial gradient will be a circle. If
+ they differ, then the shape will be an ellipse. The default values are the
maximum of the half width and half height of the image.</td>
</tr>
<tr>
- <td><code>-define gradient:angle=<var>angle</var></code></td>
- <td>For a linear gradient, this define specifies the direction in degrees of the gradient
- going from color1 to color2 in a clockwise positive manner relative to the
- positive x axis (east). For a radial gradient, this define specifies the rotation
- of the gradient in a clockwise positive manner from its normal X-Y
+ <td><code>-define gradient:angle=<var>angle in degrees</var></code></td>
+ <td>For a linear gradient, this specifies the direction of the gradient
+ going from color1 to color2 in a clockwise positive manner relative to
+ north (up). For a radial gradient, this specifies the rotation of the
+ gradient in a clockwise positive manner from its normal X-Y
orientation.</td>
</tr>
+
+ <tr>
+ <td><code>-define gradient:bounding-box=<var>width</var>x<var>height</var>+<var>x</var>+<var>y</var></code></td>
+ <td>Limits the gradient to a larger or smaller region than the image
+ dimensions. If the region defined by the bounding box is smaller than the
+ image, then color1 will be the color of the background.</td>
+ </tr>
</table>
-<p>We also support a two convenience defines for setting the linear gradient direction and the radial gradient shape.</p>
+<p>We also support two convenience defines for setting the linear gradient direction and the radial gradient shape.</p>
<table class="table table-condensed table-striped">
<tr>
<td><code>-define gradient:direction=<em>{NorthWest, North, Northeast, West, East, SouthWest, South, SouthEast}</em></code></td>
- <td>Specify the direction of the linear gradient towards the
+ <td>Specifies the direction of the linear gradient towards the
top/bottom/left/right or diagonal corners.</td>
</tr>
<tr>
<td><code>-define gradient:extent=<em>{Circle, Diagonal, Ellipse, Maximum, Minimum}</code></td>
- <td>Specify the shape of an image centered radial gradient. Circle and
+ <td>Specifies the shape of an image centered radial gradient. Circle and
Maximum draw a circular radial gradient even for rectangular shaped images
of radius equal to the larger of the half-width and half-height of the
image. The Circle and Maximum options are both equivalent to the default
@@ -155,43 +159,62 @@
</tr>
</table>
-<h3>Examples</h3>
+<p>Examples</p>
-<p>The default linear gradient can be generated in any of the following ways (or by reversing the direction and swapping <var>color1</var> and <var>color2</var>):</p>
+<p>The default linear gradient may also be generated in any of the following ways (or by reversing the direction and swapping color1 and color2):</p>
<pre>
-convert -size 256x128 -gradient:white-black default_linear_gradient.png
-convert -size 256x128 -define gradient:direction=north -gradient:black-white default_linear_gradient.png
-convert -size 256x128 -define gradient:angle=-90 -gradient:black-white default_linear_gradient.png
+convert -size 256x128 -define gradient:direction=north gradient:black-white linear_gradient_default.png
+convert -size 256x128 -define gradient:angle=0 gradient:black-white linear_gradient_default.png
</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/linear_gradient_default.png" width="256" height="128"></p>
-<p>The equivalent of</p>
+<p>The equivalent of </p>
<pre>
-convert -size 128x256 -gradient: -rotate 90 east_linear_gradient.png
+convert -size 128x256 gradient: -rotate 90 linear_gradient_east.png
</pre>
-<p>can be generated by either of the following (or by reversing the direction and swapping <var>color1</var> and <var>color2</var>):</p>
+<p>can be generate by either of the following (or by reversing the direction and swapping color1 and color2):</p>
<pre>
-convert -size 256x128 -define gradient:direction=east gradient:black-white east_linear_gradient.png
-convert -size 256x128 -define gradient:angle=0 gradient:black-white east_linear_gradient.png
+convert -size 256x128 -define gradient:direction=east gradient:black-white linear_gradient_east.png
+convert -size 256x128 -define gradient:angle=90 gradient:black-white linear_gradient_east.png
</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/linear_gradient_east.png" width="256" height="128"></p>
-<p>Examples of radial gradients going from black in the center to white at the boundary for the cases of <code>maximum</code>, <code>circle</code>, <code>default</code>, <code>minimum</code>, <code>diagonal</code>, <code>ellipse</code> and 45 degree rotated ellipse, respectively, follow:</p>
+<p>Examples of radial gradients going from black in the center to white at the boundary for the cases of "maximum/circle/default", "minimum", "diagonal", "ellipse" and 45 degree rotated ellipse, respectively, follow below.</p>
<pre>
-convert -size 256x128 gradient:black-white maximum_radial_gradient.png
-convert -size 256x128 -define gradient:radii=128,128 gradient:black-white maximum_radial_gradient.png
-convert -size 256x128 -define gradient:extent=minimum gradient:black-white minimum_radial_gradient.png
-convert -size 256x128 -define gradient:radii=64,64 gradient:black-white minimum_radial_gradient.png
-convert -size 256x128 -define gradient:extent=diagonal gradient:black-white diagonal_radial_gradient.png
-convert -size 256x128 -define gradient:extent=ellipse gradient:black-white ellipse_radial_gradient.png
-convert -size 256x128 -define gradient:radii=128,64 gradient:black-white ellipse_radial_gradient.png
-convert -size 256x256 -define gradient:radii=128x64 -define gradient:angle=45 gradient:black-white ellipse_radial_gradient.png
+convert -size 256x128 radial-gradient:black-white radial_gradient_maximum.png
+convert -size 256x128 -define gradient:radii=128,128 radial-gradient:black-white radial_gradient_maximum.png
</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/radial_gradient_maximum.png" width="256" height="128"></p>
+
+<pre>
+convert -size 256x128 -define gradient:extent=minimum radial-gradient:black-white radial_gradient_minimum.png
+convert -size 256x128 -define gradient:radii=64,64 radial-gradient:black-white radial_gradient_minimum.png
+</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/radial_gradient_minimum.png" width="256" height="128"></p>
+
+<pre>
+convert -size 256x128 -define gradient:extent=diagonal radial-gradient:black-white radial_gradient_diagonal.png
+</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/radial_gradient_diagonal.png" width="256" height="128"></p>
+
+<pre>
+convert -size 256x128 -define gradient:extent=ellipse radial-gradient:black-white radial_gradient_ellipse.png
+convert -size 256x128 -define gradient:radii=128,64 radial-gradient:black-white radial_gradient_ellipse.png
+</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/radial_gradient_ellipse.png" width="256" height="128"></p>
+
+<pre>
+convert -size 256x256 -define gradient:radii=128,64 -define gradient:angle=45 radial-gradient:black-white radial_gradient_ellipse_angle45.png
+</pre>
+<p><img src="http://nextgen.imagemagick.org/images/gradients/radial_gradient_ellipse_angle45.png" width="256" height="256"></p>
+
</div>
<footer class="magick-footer">