RubyGems - rmagick - Versions diffs - 1.15.17 → 2.0.0 - Mend

rmagick 1.15.17 → 2.0.0

Potentially problematic release.

This version of rmagick might be problematic. Click here for more details.

Files changed (108) hide show

data/ChangeLog +78 -25
data/README.html +117 -188
data/README.txt +116 -181
data/build_tarball.rake +205 -0
data/doc/comtasks.html +2 -2
data/doc/constants.html +118 -44
data/doc/draw.html +57 -99
data/doc/ex/adaptive_threshold.rb +1 -10
data/doc/ex/add_noise.rb +4 -5
data/doc/ex/axes.rb +1 -1
data/doc/ex/bilevel_channel.rb +2 -13
data/doc/ex/bounding_box.rb +3 -4
data/doc/ex/channel.rb +6 -7
data/doc/ex/clip_path.rb +11 -5
data/doc/ex/color_histogram.rb +8 -20
data/doc/ex/composite_layers.rb +53 -0
data/doc/ex/fill_pattern.rb +26 -0
data/doc/ex/get_multiline_type_metrics.rb +26 -37
data/doc/ex/get_type_metrics.rb +25 -25
data/doc/ex/images/notimplemented.gif +0 -0
data/doc/ex/level.rb +1 -1
data/doc/ex/matte_floodfill.rb +5 -6
data/doc/ex/matte_replace.rb +5 -6
data/doc/ex/negate_channel.rb +0 -10
data/doc/ex/opacity.rb +3 -5
data/doc/ex/polaroid.rb +4 -1
data/doc/ex/posterize.rb +1 -12
data/doc/ex/preview.rb +1 -8
data/doc/ex/radial_blur.rb +1 -11
data/doc/ex/raise.rb +1 -4
data/doc/ex/random_threshold_channel.rb +4 -9
data/doc/ex/sepiatone.rb +2 -9
data/doc/ex/shadow.rb +12 -18
data/doc/ex/sketch.rb +2 -9
data/doc/ex/smile.rb +7 -7
data/doc/ex/splice.rb +3 -10
data/doc/ex/stegano.rb +5 -0
data/doc/ex/threshold.rb +2 -2
data/doc/ex/transpose.rb +1 -8
data/doc/ex/transverse.rb +1 -8
data/doc/ex/trim.rb +1 -2
data/doc/ex/viewex.rb +4 -5
data/doc/ex/vignette.rb +1 -8
data/doc/ex/watermark.rb +1 -0
data/doc/ex/wet_floor.rb +8 -14
data/doc/ilist.html +301 -110
data/doc/image1.html +362 -258
data/doc/image2.html +429 -286
data/doc/image3.html +418 -192
data/doc/imageattrs.html +100 -39
data/doc/imusage.html +26 -21
data/doc/index.html +52 -93
data/doc/info.html +160 -64
data/doc/magick.html +37 -71
data/doc/optequiv.html +155 -61
data/doc/rvg.html +3 -3
data/doc/rvgclip.html +2 -2
data/doc/rvggroup.html +2 -2
data/doc/rvgimage.html +3 -3
data/doc/rvgpattern.html +3 -3
data/doc/rvgshape.html +2 -2
data/doc/rvgstyle.html +2 -2
data/doc/rvgtext.html +2 -2
data/doc/rvgtspan.html +4 -4
data/doc/rvgtut.html +4 -4
data/doc/rvguse.html +3 -3
data/doc/rvgxform.html +2 -2
data/doc/struct.html +26 -29
data/doc/usage.html +99 -48
data/examples/crop_with_gravity.rb +46 -0
data/examples/demo.rb +2 -2
data/examples/histogram.rb +11 -11
data/examples/identify.rb +45 -45
data/examples/spinner.rb +3 -2
data/ext/RMagick/MANIFEST +7 -8
data/ext/RMagick/extconf.rb +242 -0
data/ext/RMagick/rmagick.h +136 -222
data/ext/RMagick/rmdraw.c +226 -229
data/ext/RMagick/rmfill.c +69 -118
data/ext/RMagick/rmilist.c +234 -94
data/ext/RMagick/rmimage.c +1719 -2564
data/ext/RMagick/rminfo.c +433 -619
data/ext/RMagick/rmmain.c +249 -487
data/ext/RMagick/rmutil.c +344 -563
data/lib/RMagick.rb +414 -358
data/lib/rvg/clippath.rb +2 -2
data/lib/rvg/container.rb +2 -2
data/lib/rvg/describable.rb +2 -2
data/lib/rvg/embellishable.rb +2 -2
data/lib/rvg/misc.rb +3 -3
data/lib/rvg/paint.rb +2 -7
data/lib/rvg/pathdata.rb +2 -2
data/lib/rvg/rvg.rb +2 -2
data/lib/rvg/stretchable.rb +2 -14
data/lib/rvg/stylable.rb +2 -2
data/lib/rvg/text.rb +2 -2
data/lib/rvg/transformable.rb +2 -2
data/lib/rvg/units.rb +2 -2
data/{metaconfig.in → metaconfig} +0 -1
data/post-setup.rb +1 -1
data/rmagick.gemspec +6 -9
metadata +41 -49
data/Makefile.in +0 -42
data/configure +0 -12358
data/configure.ac +0 -791
data/ext/RMagick/extconf.rb.in +0 -25
data/ext/RMagick/rmagick_config.h.in +0 -285
data/gem_extconf.rb +0 -42

@@ -4,9 +4,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
+  "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 1.15.17: class Image (attribute methods)</title>
+  <title>RMagick 2.0.0: class Image (attribute methods)</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -25,7 +25,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 1.15.17 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.0.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="ilist.html">Prev</a> | <a href=
@@ -45,6 +45,8 @@
     <div>
       <div class="toccol">
         <ul>
+          <li><a href="#alpha">alpha</a></li>
           <li><a href="#background_color">background_color</a></li>
           <li><a href="#base_columns">base_columns</a></li>
@@ -185,6 +187,50 @@
   <h2 class="methods">attribute methods</h2>
+  <div class="sig">
+    <h3 id="alpha">alpha</h3>
+    <p><span class="arg">image</span>.alpha = <span class=
+    "arg">anAlphaChannelType</span></p>
+  </div>
+  <div class="desc">
+    <h4>Description</h4>
+    <p>Set a flag to indicate whether or not to use alpha channel
+    data. Set-only.</p>
+    <h4>Arguments</h4>
+    <p>One of the following values of the AlphaChannelType
+    enumeration:</p>
+    <dl>
+      <dt>ActivateAlphaChannel</dt>
+      <dd>Use alpha channel data. Equivalent to <code>img.matte =
+      true</code>.</dd>
+      <dt>DeactivateAlphaChannel</dt>
+      <dd>Do not use alpha channel data. Equivalent to
+      <code>img.matte = false</code>.</dd>
+      <dt>ResetAlphaChannel</dt>
+      <dd>Set the alpha channel to fully opaque.</dd>
+      <dt>SetAlphaChannel</dt>
+      <dd>Sets the alpha channel to the intensity of the
+      image.</dd>
+    </dl>
+    <h4>See also</h4>
+    <p><a href="#matte">matte</a></p>
+  </div>
   <div class="sig">
     <h3 id="background_color">background_color</h3>
@@ -468,9 +514,9 @@
     <h3 id="colorspace">colorspace</h3>
     <p><span class="arg">image.</span>colorspace -&gt;
-    <em>aColorspace</em><br />
+    <em>aColorspaceType</em><br />
     <span class="arg">image.</span>colorspace = <span class=
-    "arg">aColorspace</span></p>
+    "arg">aColorspaceType</span></p>
   </div>
   <div class="desc">
@@ -485,12 +531,12 @@
     <h4>Arguments</h4>
-    <p>A <a href="constants.html#ColorspaceType">Colorspace</a>
+    <p>A <a href="constants.html#ColorspaceType">ColorspaceType</a>
     constant.</p>
     <h4>Returns</h4>
-    <p>A <a href="constants.html#ColorspaceType">Colorspace</a>
+    <p>A <a href="constants.html#ColorspaceType">ColorspaceType</a>
     constant.</p>
   </div>
@@ -778,11 +824,11 @@
     <h4>Arguments</h4>
-    <p>A <a href="constants.html#FilterTypes">FilterType</a>
+    <p>A <a href="constants.html#FilterTypes">FilterTypes</a>
     constant.</p>
     <h4>Returns</h4>A <a href=
-    "constants.html#FilterTypes">FilterType</a> constant.
+    "constants.html#FilterTypes">FilterTypes</a> constant.
   </div>
   <div class="sig">
@@ -836,9 +882,9 @@
     <p>The argument may be a floating-point numeric value or a
     string in the form "NN%". In the second case, the argument is
     computed as a percentage of <a href=
-    "constants.html#Miscellaneous_constants">MaxRGB</a>. For
+    "constants.html#Miscellaneous_constants">QuantumRange</a>. For
     example, a value of '5%' sets <code>fuzz</code> to
-    0.05*MaxRGB.</p>
+    0.05*QuantumRange.</p>
     <h4>Returns</h4>
@@ -899,7 +945,7 @@
     <p>The image type classification. For example, GrayscaleType.
     Don't confuse this attribute with the <a href=
-    "#format">format</a>, that is "GIF" or "JPG".</p>
+    "#format">format</a>, that is "GIF" or "JPG". Get-only.</p>
     <h4>Returns</h4>
@@ -1043,6 +1089,9 @@
     <p>If <code>true</code>, honor the opacity values in the image
     pixels. See <a href="struct.html#Pixel">Pixel</a>.</p>
+    <p>This attribute is deprecated in ImageMagick 6.3.5 and later.
+    Use <a href="#alpha">alpha</a> instead.</p>
   </div>
   <div class="sig">
@@ -1114,9 +1163,7 @@
     <p>If the monitor proc returns <code>nil</code> or
     <code>false</code> the operation will be immediately
     terminated. To stop monitoring, set <code>monitor</code> to
-    <code>nil</code>. Available in ImageMagick 6.1.0 and later,
-    this attribute supercedes <a href=
-    "magick.html#set_monitor">Magick.set_monitor</a>. Set-only.</p>
+    <code>nil</code>. Set-only.</p>
     <h4>Argument</h4>
@@ -1172,8 +1219,7 @@ blur_image is 100% complete.
     <h3 id="montage">montage</h3>
     <p><span class="arg">image.</span>montage -&gt;
-    <em>aString</em><br />
-    <span class="arg">image.</span>montage = <code>nil</code></p>
+    <em>aString</em><br /></p>
   </div>
   <div class="desc">
@@ -1183,12 +1229,8 @@ blur_image is 100% complete.
     montage. Only valid for</span> [images produced by <a href=
     "ilist.html#montage">montage</a>.] <span class="imquote">The
     string is in the form of a <a href=
-    "imusage.html#geometry">geometry</a> string.</span></p>
-    <h4>Arguments</h4>
-    <p>To release the montage string, set this attribute to
-    <code>nil</code>.</p>
+    "imusage.html#geometry">geometry</a> string.</span>
+    Get-only.</p>
   </div>
   <div class="sig">
@@ -1275,8 +1317,8 @@ blur_image is 100% complete.
     are blended with the supplied transparency value.</span>
     Set-only.</p>
-    <h4>Arguments</h4>A number between 0 and MaxRGB. Higher numbers
-    increase transparency.
+    <h4>Arguments</h4>A number between 0 and QuantumRange. Higher
+    numbers increase transparency.
   </div>
   <div class="sig">
@@ -1298,8 +1340,6 @@ blur_image is 100% complete.
     <p>An <a href=
     "constants.html#OrientationType">OrientationType</a> value.</p>
-    <h4>Magick API</h4>Available in ImageMagick 6.0.0.
     <h4>Notes</h4>See <a href=
     "http://jpegclub.org/exif_orientation.html">http://jpegclub.org/exif_orientation.html</a>
     for more information about the Exif Orientation Tag.
@@ -1403,7 +1443,7 @@ blur_image is 100% complete.
     <h4>Description</h4>
     <p>The image depth to the nearest Quantum (8, 16, or 32).
-    Get-only. Available in ImageMagick 6.0.0.</p>
+    Get-only.</p>
   </div>
   <div class="sig">
@@ -1482,7 +1522,7 @@ blur_image is 100% complete.
     <p><span class="arg">image.</span>ticks_per_second -&gt;
     <em>aNumeric</em><br />
-    <span class="arg">image.</span>ticks_per_second = <span class=
+    <span class="arg">iamge.</span>ticks_per_second = <span class=
     "arg">aNumeric</span></p>
   </div>
@@ -1497,13 +1537,6 @@ blur_image is 100% complete.
     <h4>Returns</h4>
     <p>The current number of ticks per second</p>
-    <h4>Notes</h4>
-    <p>Available in ImageMagick 6.2.4 and later. Prior to this
-    release the number of ticks per second was fixed at 100. The
-    GIF image format only accepts 100 ticks per second regardless
-    of the value of this attribute.</p>
   </div>
   <div class="sig">
@@ -1600,11 +1633,39 @@ blur_image is 100% complete.
       <dd>The area surrounding the image is transparent
       blackness.</dd>
+      <dt>BlackVirtualPixelMethod</dt>
+      <dd class="imquote">The area surrounding the image is
+      black.</dd>
+      <dt>GrayVirtualPixelMethod</dt>
+      <dd class="imquote">The area surrounding the image is
+      gray.</dd>
+      <dt>WhiteVirtualPixelMethod</dt>
+      <dd class="imquote">The area surrounding the image is
+      white.</dd>
+      <dt>RandomVirtualPixelMethod</dt>
+      <dd class="imquote">Choose a random pixel from the
+      image.</dd>
+      <dt>DitherVirtualPixelMethod</dt>
+      <dd class="imquote">use a dithered pattern to choose a pixel
+      in a 32x32 neighborhood.</dd>
     </dl>
-    <p><code>BackgroundVirtualPixelMethod</code> and
-    <code>TransparentVirtualPixelMethod</code> are available only
-    in ImageMagick 6.2.4 and later.</p>
+    <p>Some of these values are not supported by older versions of
+    ImageMagick. To see what values are available, enter the
+    following code in irb:</p>
+    <pre>
+Magick::VirtualPixelMethod.values {|v| puts v}
+</pre>
     <h4>Returns</h4>

data/doc/imusage.html CHANGED

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
-  <title>RMagick 1.15.17: ImageMagick/GraphicsMagick Conventions</title>
+  <title>RMagick 2.0.0: ImageMagick Conventions</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -69,7 +69,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 1.15.17 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.0.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="usage.html">Prev</a> | <a href=
@@ -77,7 +77,7 @@
     "optequiv.html">Next</a>&nbsp;&raquo;
   </div>
-  <h1>RMagick: ImageMagick/GraphicsMagick Conventions</h1>
+  <h1>RMagick: ImageMagick Conventions</h1>
   <div id="toc">
     <h2>Table of Contents</h2>
@@ -101,12 +101,12 @@
   <h2 id="formats">Image formats and filenames</h2>
-  <p>&times;Magick supports over 90 major <a href=
+  <p>ImageMagick supports over 90 major <a href=
   "http://www.imagemagick.org/script/formats.php">image
   formats</a>.</p>
-  <p>&times;Magick determines the format (GIF, PNG, JPEG, etc.) of
-  an image file either from its magic number, the filename suffix
+  <p>ImageMagick determines the format (GIF, PNG, JPEG, etc.) of an
+  image file either from its magic number, the filename suffix
   (.gif, .png, .jpg) or from a prefix attached to the filename. For
   example, <code>ps:mydoc</code> indicates that <code>mydoc</code>
   is a Postscript file. <span class="imquote">The magic number
@@ -120,7 +120,7 @@
   or a suffix corresponding to the format you want.</p>
   <p><em>Note:</em> Keep in mind that files in some formats may
-  only be read by &times;Magick, not written.</p>
+  only be read by ImageMagick, not written.</p>
   <h2 id="frames">Selecting frames from a multi-frame image
   file</h2>
@@ -128,7 +128,7 @@
   <p>When reading a multi-frame image file such as an AVI you can
   specify the subset of frames by adding a list of frame number(s)
   to the end of the file name enclosed in square brackets. For
-  example, "my_movie.avi[0]" tells &times;Magick to read only the
+  example, "my_movie.avi[0]" tells ImageMagick to read only the
   first frame. In general,</p>
   <dl>
@@ -233,7 +233,7 @@
       <td>cmyk(c,m,y,k)</td>
       <td>CMYK functional notation. c, m, y, and k are either 4
-      integers 0-MaxRGB or 4 percentages 0%-100%.</td>
+      integers 0-QuantumRange or 4 percentages 0%-100%.</td>
     </tr>
     <tr class="evenrow">
@@ -246,7 +246,7 @@
       <td>rgb(r,g,b)</td>
       <td>SVG functional notation. r, g, and b are either 3
-      integers 0-MaxRGB or 3 percentages 0%-100%.</td>
+      integers 0-QuantumRange or 3 percentages 0%-100%.</td>
     </tr>
     <tr class="evenrow">
@@ -261,8 +261,7 @@
       <td>Hue, saturation, lightness. The <em>hue</em> value (h)
       should be a number in the range 0 &lt;= n &lt; 360. The
       <em>saturation</em> (s) and <em>lightness</em> (l) values
-      should be numbers in the range 0 &lt;= n &lt;= 100.
-      <em>(Available in ImageMagick 6.2.6)</em></td>
+      should be numbers in the range 0 &lt;= n &lt;= 100.</td>
     </tr>
     <tr class="evenrow">
@@ -274,7 +273,7 @@
   </table>
   <p>The alpha channel is the opacity of the image, which can range
-  from 0 (Magick::OpaqueOpacity) to MaxRGB
+  from 0 (Magick::OpaqueOpacity) to QuantumRange
   (Magick::TransparentOpacity).</p>
   <p>A <code>Pixel</code> object contains the numeric
@@ -344,7 +343,7 @@
     it is resized to 480x480.</p>
   </div>
-  <p>The x and y offsets, if present, can be preceded with either
+  <p>The x and y offsets, if present, can be preceeded with either
   a + or - sign. The + causes x and y to be measured from the left
   or top edges, respectively. Conversely, - measures from the right
   or bottom edges. Offsets are always measured in pixels.</p>
@@ -359,7 +358,7 @@
   <h2 id="classtype">DirectClass and PseudoClass</h2>
-  <p>&times;Magick classifies all images into two <em>classes</em>,
+  <p>ImageMagick classifies all images into two <em>classes</em>,
   PseudoClass and DirectClass.</p>
   <div class="imquote">
@@ -384,10 +383,10 @@
   <h2 id="builtin_formats">Built-in image formats</h2>
-  <p>Some of the image formats that &times;Magick supports are
-  special-purpose formats that are built-in to &times;Magick
-  itself. That is, even though you can "read" images in these
-  formats, they do not correspond to any real image files.</p>
+  <p>Some of the image formats that ImageMagick supports are
+  special-purpose formats that are built-in to ImageMagick itself.
+  That is, even though you can "read" images in these formats, they
+  do not correspond to any real image files.</p>
   <p>These are the built-in formats that I know something about.
   (There are more but I've never used them.) When the format is
@@ -411,7 +410,7 @@ i = Image.read("gradient:red-blue") { self.size = "100x200" }
     string. Ex: "caption:My caption text".</p>
     <p>If you specify only the width in the <code>size</code>
-    argument, &times;Magick will wrap the text and compute the
+    argument, ImageMagick will wrap the text and compute the
     necessary height. In addition to <code>size</code> (which is
     required) you can use the following <a href=
     "info.html">optional arguments</a>:</p>
@@ -432,6 +431,12 @@ i = Image.read("gradient:red-blue") { self.size = "100x200" }
       <li>gravity</li>
       <li>pointsize</li>
+      <li>stroke</li>
+      <li>stroke_width</li>
+      <li>undercolor</li>
     </ul>
     <h4>gradient<sup>*</sup></h4>
@@ -451,7 +456,7 @@ i = Image.read("gradient:red-blue") { self.size = "100x200" }
     <h4>logo</h4>
-    <p>The &times;Magick logo. Ex: <code>"logo:"</code>.</p>
+    <p>The ImageMagick logo. Ex: <code>"logo:"</code>.</p>
     <h4>netscape</h4>

data/doc/index.html CHANGED

@@ -4,10 +4,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org" />
+  "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 1.15.17 User's Guide and
-  Reference</title>
+  <title>RMagick 2.0.0 User's Guide and Reference</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -106,8 +105,7 @@
   </div>
   <p id="magick">Ruby+ImageMagick<span class="tm">TM</span><br />
-  Ruby+GraphicsMagick<br />
-  Version 1.15.17</p>
+  Version 2.0.0</p>
   <h1>User's Guide and Reference</h1>
@@ -123,7 +121,7 @@
         <ul>
           <li><a href="usage.html">How to Use RMagick</a></li>
-          <li><a href="imusage.html">ImageMagick and GraphicsMagick
+          <li><a href="imusage.html">ImageMagick
           Conventions</a></li>
           <li><a href="optequiv.html">Magick Command Options and
@@ -154,14 +152,14 @@
               <li><a href="imageattrs.html">Image (attribute
               methods)</a></li>
-              <li><a href="image1.html">Image (class and instance
-              methods, part 1)</a></li>
+              <li><a href="image1.html">Image (class methods and
+              instance methods a-d)</a></li>
-              <li><a href="image2.html">Image (instance methods,
-              part 2)</a></li>
+              <li><a href="image2.html">Image (instance methods
+              e-o)</a></li>
-              <li><a href="image3.html">Image (instance methods,
-              part 3)</a></li>
+              <li><a href="image3.html">Image (instance methods
+              p-w)</a></li>
               <li><a href="draw.html">Draw</a></li>
             </ul>
@@ -242,9 +240,8 @@
   <h3>What is RMagick?</h3>
   <p>RMagick is a binding from Ruby to the ImageMagick <span class=
-  "tm">TM</span> and GraphicsMagick image manipulation libraries.
-  Here's how the <a href=
-  "http://www.imagemagick.org/index.html">ImageMagick home page</a>
+  "tm">TM</span> image manipulation library. Here's how the
+  <a href="http://www.imagemagick.org">ImageMagick home page</a>
   describes ImageMagick:</p>
   <div class="imquote">
@@ -258,28 +255,8 @@
     added to images and stretched and rotated.</p>
   </div>
-  <p>GraphicsMagick is a branch from ImageMagick 5.5.2 and provides
-  a nearly identical API. The <a href=
-  "http://www.graphicsmagick.org">GraphicsMagick web site</a> says
-  this about GraphicsMagick:</p>
-  <div class="imquote">
-    <p><em>GraphicsMagick</em> is the Swiss army knife of image
-    processing. It provides a robust collection of tools and
-    libraries which support reading, writing, and manipulating an
-    image in over 88 major formats including important formats like
-    DPX, GIF, JPEG, JPEG-2000, PNG, PDF, SVG, and TIFF.
-    GraphicsMagick supports huge images on systems that support
-    large files, and has been tested with gigapixel-size images.
-    GraphicsMagick can create new images on the fly, making it
-    suitable for building dynamic Web applications. GraphicsMagick
-    may be used to resize, rotate, sharpen, color reduce, or add
-    special effects to an image and save the result in the same or
-    differing image format</p>
-  </div>
-  <p>Both libraries offer a full range of image processing tools
-  that provide the capability to:</p>
+  <p>ImageMagick offers a full range of image processing tools that
+  provide the capability to:</p>
   <div class="imquote">
     <ul>
@@ -307,21 +284,21 @@
     </ul>
   </div>
-  <p>RMagick is a complete interface to ImageMagick and
-  GraphicsMagick. Version 1.0.0 was released in February, 2003.
-  Within its four major classes and 30 minor classes RMagick
-  defines over 600 methods and 225 constants. RMagick exploits Ruby
-  idioms such as blocks and iterators, Struct classes, symbols, ?-
-  and !-suffixed methods, and exceptions.</p>
+  <p>RMagick is a complete interface to ImageMagick. Version 1.0.0
+  was released in February, 2003. Within its four major classes and
+  30 minor classes RMagick defines over 600 methods and 225
+  constants. RMagick exploits Ruby idioms such as blocks and
+  iterators, Struct classes, symbols, ?- and !-suffixed methods,
+  and exceptions.</p>
   <h3>About this document</h3>
-  <p>This document describes Version 1.15.17 of RMagick.
-  It is divided into 4 parts. The first is this page. The second
-  part is a user's guide covering both RMagick and
-  ImageMagick/GraphicsMagick usage and conventions. The third part
-  is a reference guide to the ImageList, Image, and Draw classes.
-  This guide includes many examples.</p>
+  <p>This document describes Version 2.0.0 of RMagick. It is
+  divided into 4 parts. The first is this page. The second part is
+  a user's guide covering both RMagick and ImageMagick usage and
+  conventions. The third part is a reference guide to the
+  ImageList, Image, and Draw classes. This guide includes many
+  examples.</p>
   <p>The fourth part covers Ruby Vector Graphics (RVG). RVG is a
   facade for Draw that provides a high-level API for scalable
@@ -359,22 +336,14 @@
   statement to add the constants and methods to the Object
   namespace.</p>
-  <p><b>References to ImageMagick and GraphicsMagick</b>&nbsp;
-  &nbsp;GraphicsMagick is a fork of ImageMagick and shares most of
-  its APIs. When describing a feature, API, convention, component,
-  or other element that is shared by both, I use the string
-  <b>&times;Magick</b>. For example, "&times;Magick supports over
-  89 major image formats" means that both ImageMagick and
-  GraphicsMagick support over 89 formats.</p>
-  <p><b>&times;Magick documentation&nbsp;&nbsp;</b><span class=
+  <p><b>ImageMagick documentation&nbsp;&nbsp;</b><span class=
   "imquote">Text that looks like this</span> is quoted from the
-  &times;Magick documentation.</p>
+  ImageMagick documentation.</p>
   <p><b>Example programs and images&nbsp;&nbsp;</b> All of the
   example images on these pages were created by RMagick. Click the
-  image to see the program code. (You may need to configure your
-  browser to allow JavaScript and pop up windows.) All example
+  image to see the progam code. (You may need to configure your
+  browser to allow JavaScript and popup windows.) All example
   images show the result of applying the method. Many example
   images show the "before" image as well. When the image is
   accompanied by this symbol <img style="display:inline" src=
@@ -389,56 +358,49 @@
   Tracker</a> or the <a href=
   "http://rubyforge.org/projects/rmagick">Feature Request
   Tracker</a> on RubyForge, or email me at <code>rmagick at
-  rubyforge.org</code>.</p>
+  rubyforge dot org</code>.</p>
   <h3><a name="bugs" id="bugs">Reporting bugs</a></h3>
   <p>Please report problems with RMagick installation and usage to
   the <a href="http://rubyforge.org/projects/rmagick/">Bug
   Tracker</a> at RubyForge, or email me at <code>rmagick at
-  rubyforge.org</code>.</p>
+  rubyforge dot org</code>.</p>
-  <p>For quickest results, include the RMagick, &times;Magick and
+  <p>For quickest results, include the RMagick, ImageMagick and
   Ruby version numbers, along with a thorough description of the
   problem. RMagick will tell you both its version number and
-  &times;Magick's version number. Simply bring up irb and run this
-  command: <code>ruby -r RMagick -e "puts
-  Magick::Long_version"</code></p>
+  ImageMagick's version number. Simply bring up irb and run this
+  command:</p>
   <pre class="example" id="version">
-This is RMagick 1.15.0 ($Date: 2008/02/17 14:30:15 $) Copyright (C) 2007 by Timothy P. Hunter
-Built with ImageMagick 6.3.1 01/13/07 Q16 http://www.imagemagick.org
-Built for ruby 1.8.5 (2006-08-25) [i686-linux]
+$ ruby -rRMagick -e "puts Magick::Long_version"
+This is RMagick 2.0.0 ($Date: 2007/12/27 14:11:48 $) Copyright (C) 2007 by Timothy P. Hunter
+Built with ImageMagick 6.3.7 12/20/07 Q16 http://www.imagemagick.org
+Built for ruby 1.8.6
 Web page: http://rmagick.rubyforge.org
 Email: rmagick@rubyforge.org
 </pre>
+  <p>(Using RubyGems?&nbsp;&nbsp;If you haven't added
+  <code>rubygems</code> to your RUBYOPT environment variable you
+  may need to use this command instead: <code>ruby -rubygems -r
+  RMagick -e "puts Magick::Long_version"</code>.)</p>
   <p>It will help a lot if you supply a small Ruby program that
-  reproduces the problem. (Don't forget to include any input image
-  files!).</p>
+  reproduces the problem. Don't forget to include any input image
+  files!</p>
-  <p>Please remember I can't help with Ruby or &times;Magick
+  <p>Please remember I can't help with Ruby or ImageMagick
   installation and configuration problems. For help with Ruby, post
   your questions to <code>comp.lang.ruby</code>. For help with
-  ImageMagick or GraphicsMagick, join the ImageMagick or
-  GraphicsMagick mailing list. See the instructions at <a href=
-  "http://www.imagemagick.org/script/mailing-list.php">http://www.imagemagick.org/script/mailing-list.php</a>
-  or <a href=
-  "http://sourceforge.net/projects/graphicsmagick/">http://sourceforge.net/projects/graphicsmagick/</a>.</p>
+  ImageMagick, you can post to the <a href=
+  "http://www.imagemagick.org/discourse-server/">ImageMagick
+  Discourse Server</a>.</p>
   <p>I'm not an image processing guru, either, so I probably won't
   be able to help with questions about specific image formats and
-  transformations. I will be glad, however, to translate between
-  the RMagick API and the &times;Magick C API to help you compose a
-  question to the &times;Magick developers.</p>
-  <h3>Contributions</h3>
-  <p>If you have a script or an image using RMagick that you're
-  particularly proud of, let me know. I'd like to collect your
-  contributions, along with other users' contributions, and put
-  them in a <code>contrib</code> directory to distribute with
-  RMagick. I'm particularly interested in getting examples for the
-  RMagick methods that currently have no examples.</p>
+  transformations. I will be glad, however, to intermediate between
+  RMagick users and the ImageMagick developers.</p>
   <h3><a name="copyrights" id="copyrights">Copyright
   Notices</a></h3>
@@ -448,9 +410,6 @@ Email: rmagick@rubyforge.org
     <li>ImageMagick &copy; 1999-2007 ImageMagick Studio.</li>
-    <li>GraphicsMagick &copy; 2002, 2003, 2004, 2005 GraphicsMagick
-    Group.</li>
     <li>Ruby is copyrighted free software by Yukihiro
     Matsumoto.</li>
   </ul>