RubyGems - rmagick - Versions diffs - 2.2.2 → 2.3.0 - Mend

rmagick 2.2.2 → 2.3.0

Potentially problematic release.

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

Files changed (55) hide show

data/ChangeLog CHANGED Viewed

@@ -1,3 +1,20 @@
+RMagick 2.3.0
+    o Added Image#encipher, Image#decipher (available with ImageMagick 6.3.8-6)
+    o Added DTX1Compression, DTX1Compression, and DTX1Compression
+      CompressionType enums (available in ImageMagick 6.3.9-4)
+    o Added optional "use hex format" argument to Pixel#to_color
+    o Support :area resource type in Magick.limit_resource
+    o Pixel.from_HSL and Pixel#to_HSL are deprecated. Use Pixel.from_hsla
+      and Pixel#to_hsla instead. The new methods rely on the ImageMagick 6.3.5
+      and later API.
+    o The Image#alpha and alpha= attributes are deprecated. Use alpha() and
+      alpha? instead.
+    o The Image#mask= attribute is deprecated. Use mask() instead.
+    o The use of Ruby older than version 1.8.4 with RMagick is deprecated and
+      will not be supported in a future release.
+    o Fix bug #18271, rvg width and height attributes wrong after a call to
+      viewbox (reported by Greg Jarman)
 RMagick 2.2.2
     o Fix bug #18016, add test for InitializeMagick in libMagickCore to
       extconf.rb

data/README.html CHANGED Viewed

@@ -1,14 +1,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <head>
-    <title>RMagick 2.2.2 README</title>
+    <title>RMagick 2.3.0 README</title>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <meta name="GENERATOR" content="BlueCloth">
   </head>
   <body>
-<h1>RMagick 2.2.2 README</h1>
+<h1>RMagick 2.3.0 README</h1>
-<h2>02/12/08</h2>
+<h2>03/29/08</h2>
 <h2>Table Of Contents</h2>
@@ -40,52 +40,29 @@ ImageMagick image processing library.</p>
 <p><strong>Author:</strong> Tim Hunter</p>
-<p><strong>Email:</strong> <a href="&#109;&#x61;&#105;&#108;&#x74;&#111;:&#x72;&#109;&#x61;&#103;&#105;&#099;&#x6B;&#x40;&#114;&#x75;&#x62;&#121;&#102;&#111;&#114;&#x67;&#x65;&#x2E;&#111;&#114;g">&#x72;&#109;&#x61;&#103;&#105;&#099;&#x6B;&#x40;&#114;&#x75;&#x62;&#121;&#102;&#111;&#114;&#x67;&#x65;&#x2E;&#111;&#114;g</a></p>
+<p><strong>Email:</strong> <a href="&#x6D;&#x61;&#x69;l&#x74;&#111;:&#x72;&#x6D;&#x61;&#x67;&#105;&#x63;k&#x40;&#114;&#117;&#x62;&#121;&#x66;&#x6F;&#x72;&#103;&#101;&#046;&#x6F;&#114;&#x67;">&#x72;&#x6D;&#x61;&#x67;&#105;&#x63;k&#x40;&#114;&#117;&#x62;&#121;&#x66;&#x6F;&#x72;&#103;&#101;&#046;&#x6F;&#114;&#x67;</a></p>
 <p><strong>RubyForge:</strong> <a href="http://rubyforge.org/projects/rmagick/">http://rubyforge.org/projects/rmagick/</a></p>
 <h2 id="new">What's new?</h2>
-<p>RMagick 2.2.2 incorporates all changes and bug fixes from RMagick 1.15.12.
-Additionally,</p>
-<ul>
-<li>The installation procedure is pure Ruby.</li>
-<li>The minimum version of Ruby is 1.8.2.</li>
-<li>The minimum version of ImageMagick is 6.3.0.</li>
-<li>GraphicsMagick is not supported.</li>
-<li>The following GraphicsMagick-only methods are no longer available:
-Image#grayscale_pseudo_class, Image#statistics.</li>
-<li>The following deprecated methods are no longer available:
-Image#random_channel_threshold, Image#channel_threshold, Image#montage=,
-Image#image_type=, Image::Info#tile_info, Image#tile_info=,
-Image::Info#tile, Image::Info#tile=, Image::Info#subimage, Image::Info#subimage=,
-Image::Info#subrange, Image::Info#subrange=, Magick.set_monitor.</li>
-<li>The following methods have been added:
-Image::Info#stroke=, Image::Info#stroke_width= and Image::Info#undercolor=,
-Draw#fill_pattern= and Draw#stroke_pattern=, Image#destroy!, Image#destroyed?,
-Image#check_destroyed, Magick.trace_proc, Image.combine, Image#separate,
-Image#distort, Image#each_pixel.</li>
-<li>Magick::MaxRGB is deprecated (but still available). Use Magick::QuantumRange
-instead.</li>
-<li>RMagick works with the Q32 version of ImageMagick.</li>
-</ul>
-<p>Various other minor bug fixes and upgrades.</p>
+<p>RMagick 2.0.0 incorporates all changes and bug fixes from RMagick 1.15.13.
+See the ChangeLog for additional changes and bug fixes in later releases.</p>
 <h2 id="prereq">Prerequisites</h2>
 <p><strong>O/S:</strong> Linux, Sun Solaris, Cygwin, FreeBSD, OS X.</p>
-<p><strong>Ruby</strong> 1.8.2 or later. You can get Ruby from <a href="http://www.ruby-lang.org">http://www.ruby-lang.org</a>.</p>
+<p><strong>Ruby</strong> 1.8.2 or later. You can get Ruby from <a href="http://www.ruby-lang.org">http://www.ruby-lang.org</a>.
+The use of versions of Ruby older than 1.8.4 is deprecated and may be
+removed in a future release.</p>
 <p><strong>ImageMagick</strong> 6.3.0 or later.  You can get ImageMagick from
 <a href="http://www.imagemagick.org">http://www.imagemagick.org</a>.</p>
 <h2 id="install">Installation</h2>
-<p>The installation procedure for RMagick 2.2.2 is different from that used
-in earlier releases. Before installing RMagick, you must install ImageMagick.
+<p>Before installing RMagick, you must install ImageMagick.
 Complete and up-to-date instructions for installing ImageMagick on Linux,
 *BSD, and other *nix-type O/S's are available
 at <a href="http://rmagick.rubyforge.org/install-linux.html">http://rmagick.rubyforge.org/install-linux.html</a>, steps 0, 1, 2.
@@ -94,7 +71,7 @@ on OS X are available at <a href="http://rmagick.rubyforge.org/install-osx.html"
 steps 1 and 2. After installing
 ImageMagick, use the instructions in the next section to install RMagick.</p>
-<h2 id="install">Installing RMagick 2.2.2</h2>
+<h2 id="install">Installing RMagick 2.3.0</h2>
 <p>This release of RMagick uses Minero Aoki's setup.rb script for installation.
 See the next section for configuration options. Usually you do not need to
@@ -102,17 +79,15 @@ specify any of these options. You can get more information about setup.rb from
 his web site <a href="http://i.loveruby.net">http://i.loveruby.net</a></p>
 <p>I assume you've already decompressed the tarball, or you wouldn't be reading
-this. If you have not decompressed the tarball, do so with this command:</p>
-<pre><code>tar xvzf RMagick-2.2.2-tar.gz
-</code></pre>
-<p>or</p>
+this. If you have not decompressed the tarball, do so with one of these commands,
+depending on which tarball you have:</p>
-<pre><code>tar xvjf RMagick-2.2.2-tar.bz2
+<pre><code>tar xvzf RMagick-2.3.0-tar.gz              (gzipped tarball)
+tar xvjf RMagick-2.3.0-tar.bz2             (bzipped tarball)
+7z e RMagick-x.y.z.tar.lzma -so | tar xv    (7zipped tarball)
 </code></pre>
-<p>Change to the RMagick-2.2.2 directory. If you are not using any
+<p>Change to the RMagick-2.3.0 directory. If you are not using any
 configuration options (usually you don't need to) enter the command</p>
 <pre><code>ruby setup.rb
@@ -179,9 +154,9 @@ the problem. Also see <a href="http://rmagick.rubyforge.org/install-faq.html#lib
 <p>When make is running the examples, if you get a message like this:</p>
-<pre><code>/home/you/RMagick-2.2.2/lib/RMagick.rb:11:in `require': libMagick.so.0:
+<pre><code>/home/you/RMagick-2.3.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
   cannot open shared object file: No such file or directory -
-  /home/you/RMagick-2.2.2/ext/RMagick/RMagick.so (LoadError)
+  /home/you/RMagick-2.3.0/ext/RMagick/RMagick.so (LoadError)
 </code></pre>
 <p>you probably do not have the directory in which the ImageMagick library
@@ -201,7 +176,7 @@ systems, see the documentation for the dynamic loading facility.</p>
 <p>When make is running the examples, if you get a message like this:</p>
-<pre><code>hook /home/me/src/RMagick-2.2.2/./post-setup.rb failed:
+<pre><code>hook /home/me/src/RMagick-2.3.0/./post-setup.rb failed:
 No such file or directory - "/tmp/rmagick6872.6"
 </code></pre>
@@ -251,7 +226,7 @@ getting help for ImageMagick is available at the ImageMagick web site
 <h2 id="license">License</h2>
 <blockquote>
-    <p>Copyright � 2002-2007 by Timothy P. Hunter</p>
+    <p>Copyright � 2002-2008 by Timothy P. Hunter</p>
     <p>Permission is hereby granted, free of charge, to any person obtaining a
      copy of this software and associated documentation files (the "Software"),

data/README.txt CHANGED Viewed

@@ -1,6 +1,6 @@
-RMagick 2.2.2 README
+RMagick 2.3.0 README
 ================================
-02/12/08
+03/29/08
 --------
 Table Of Contents
@@ -35,44 +35,23 @@ __Email:__ <rmagick@rubyforge.org>
 __RubyForge:__ <http://rubyforge.org/projects/rmagick/>
 <h2 id="new">What's new?</h2>
-RMagick 2.2.2 incorporates all changes and bug fixes from RMagick 1.15.12.
-Additionally,
-* The installation procedure is pure Ruby.
-* The minimum version of Ruby is 1.8.2.
-* The minimum version of ImageMagick is 6.3.0.
-* GraphicsMagick is not supported.
-* The following GraphicsMagick-only methods are no longer available:
-Image#grayscale\_pseudo\_class, Image#statistics.
-* The following deprecated methods are no longer available:
-Image#random\_channel\_threshold, Image#channel\_threshold, Image#montage=,
-Image#image\_type=, Image::Info#tile\_info, Image#tile\_info=,
-Image::Info#tile, Image::Info#tile=, Image::Info#subimage, Image::Info#subimage=,
-Image::Info#subrange, Image::Info#subrange=, Magick.set_monitor.
-* The following methods have been added:
-Image::Info#stroke=, Image::Info#stroke\_width= and Image::Info#undercolor=,
-Draw#fill_pattern= and Draw#stroke\_pattern=, Image#destroy!, Image#destroyed?,
-Image#check\_destroyed, Magick.trace\_proc, Image.combine, Image#separate,
-Image#distort, Image#each\_pixel.
-* Magick::MaxRGB is deprecated (but still available). Use Magick::QuantumRange
-instead.
-* RMagick works with the Q32 version of ImageMagick.
-Various other minor bug fixes and upgrades.
+RMagick 2.0.0 incorporates all changes and bug fixes from RMagick 1.15.13.
+See the ChangeLog for additional changes and bug fixes in later releases.
 <h2 id="prereq">Prerequisites</h2>
 __O/S:__ Linux, Sun Solaris, Cygwin, FreeBSD, OS X.
 __Ruby__ 1.8.2 or later. You can get Ruby from <http://www.ruby-lang.org>.
+The use of versions of Ruby older than 1.8.4 is deprecated and may be
+removed in a future release.
 __ImageMagick__ 6.3.0 or later.  You can get ImageMagick from
 <http://www.imagemagick.org>.
 <h2 id="install">Installation</h2>
-The installation procedure for RMagick 2.2.2 is different from that used
-in earlier releases. Before installing RMagick, you must install ImageMagick.
+Before installing RMagick, you must install ImageMagick.
 Complete and up-to-date instructions for installing ImageMagick on Linux,
 *BSD, and other *nix-type O/S's are available
 at <http://rmagick.rubyforge.org/install-linux.html>, steps 0, 1, 2.
@@ -81,7 +60,7 @@ on OS X are available at <http://rmagick.rubyforge.org/install-osx.html>,
 steps 1 and 2. After installing
 ImageMagick, use the instructions in the next section to install RMagick.
-<h2 id="install">Installing RMagick 2.2.2</h2>
+<h2 id="install">Installing RMagick 2.3.0</h2>
 This release of RMagick uses Minero Aoki's setup.rb script for installation.
 See the next section for configuration options. Usually you do not need to
@@ -89,15 +68,14 @@ specify any of these options. You can get more information about setup.rb from
 his web site <http://i.loveruby.net>
 I assume you've already decompressed the tarball, or you wouldn't be reading
-this. If you have not decompressed the tarball, do so with this command:
+this. If you have not decompressed the tarball, do so with one of these commands,
+depending on which tarball you have:
-    tar xvzf RMagick-2.2.2-tar.gz
+    tar xvzf RMagick-2.3.0-tar.gz              (gzipped tarball)
+    tar xvjf RMagick-2.3.0-tar.bz2             (bzipped tarball)
+    7z e RMagick-x.y.z.tar.lzma -so | tar xv    (7zipped tarball)
-or
-    tar xvjf RMagick-2.2.2-tar.bz2
-Change to the RMagick-2.2.2 directory. If you are not using any
+Change to the RMagick-2.3.0 directory. If you are not using any
 configuration options (usually you don't need to) enter the command
     ruby setup.rb
@@ -151,9 +129,9 @@ the problem. Also see <http://rmagick.rubyforge.org/install-faq.html#libmagick>.
 #### Cannot open shared object file
 When make is running the examples, if you get a message like this:
-    /home/you/RMagick-2.2.2/lib/RMagick.rb:11:in `require': libMagick.so.0:
+    /home/you/RMagick-2.3.0/lib/RMagick.rb:11:in `require': libMagick.so.0:
       cannot open shared object file: No such file or directory -
-      /home/you/RMagick-2.2.2/ext/RMagick/RMagick.so (LoadError)
+      /home/you/RMagick-2.3.0/ext/RMagick/RMagick.so (LoadError)
 you probably do not have the directory in which the ImageMagick library
 is installed in your load path.  An easy way to fix this is to define
@@ -170,7 +148,7 @@ systems, see the documentation for the dynamic loading facility.
 #### No such file or directory - "/tmp/rmagick6872.6"
 When make is running the examples, if you get a message like this:
-    hook /home/me/src/RMagick-2.2.2/./post-setup.rb failed:
+    hook /home/me/src/RMagick-2.3.0/./post-setup.rb failed:
     No such file or directory - "/tmp/rmagick6872.6"
 you probably do not have a temporary directory environment variable set. Set
@@ -214,7 +192,7 @@ Thanks to
 <h2 id="license">License</h2>
-   >  Copyright � 2002-2007 by Timothy P. Hunter
+   >  Copyright � 2002-2008 by Timothy P. Hunter
    >
    >  Permission is hereby granted, free of charge, to any person obtaining a
    >  copy of this software and associated documentation files (the "Software"),

data/build_tarball.rake CHANGED Viewed

@@ -185,8 +185,16 @@ task :collateral => ["README.html", :gemspec, :extconf, :doc]
 GEM = Dist_Directory.downcase + ".gem"
 task :default => [:export, :collateral, :fix_files, :manifest] do
-  sh "tar cvfz #{Release}.tar.gz #{Dist_Directory}"
-  sh "tar cvfj #{Release}.tar.bz2 #{Dist_Directory}"
+  sh "tar czf #{Release}.tar.gz #{Dist_Directory}"
+  sh "tar cjf #{Release}.tar.bz2 #{Dist_Directory}"
+  sh "tar c #{Release} | 7z a -t7z -m0=lzma -mx=9 -mfb=64 -ms=on -si#{Release}.tar #{Release}.tar.lzma"
+  # Extract with
+  #   7z e RMagick-x.y.z.tar.lzma -so | tar xv
+  #sh "tar cf  #{Release}.tar #{Dist_Directory}"
+  #sh "7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on #{Release}.tar.lzma #{Release}.tar"
+  #rm_rf Release+".tar", :verbose => true
   Dir.chdir(Dist_Directory) do
     sh "gem build rmagick.gemspec"
     mv GEM, "../", :verbose => true
@@ -200,6 +208,7 @@ task :clean do
   rm_rf Dist_Directory, :verbose => true
   rm_rf Release+".tar.gz", :verbose => true
   rm_rf Release+".tar.bz2", :verbose => true
+  rm_rf Release+".tar.lzma", :verbose => true
   rm_rf GEM, :verbose => true
 end

data/doc/comtasks.html CHANGED Viewed

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.2.2: Common Tasks</title>
+  <title>RMagick 2.3.0: Common Tasks</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -31,7 +31,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.2.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="optequiv.html">Prev</a> | <a href=
@@ -108,7 +108,7 @@ ARGV.each { |file|
   <h2 id="convert">Converting an image to another format</h2>
   <p>Converting an image to another format is as simple as writing
-  the image to a file. &times;Magick uses the output filename
+  the image to a file. ImageMagick uses the output filename
   suffix (".jpg" for JPEG, ".gif" for GIF, for example) or prefix
   ("ps:" for PostScript, for example) to determine the format of
   the output image.</p>
@@ -175,7 +175,7 @@ thumb = img.resize_to_fill(75, 75)
   method can help.</p>
   <p>The <code>change_geometry</code> method accepts an
-  &times;Magick <a href="imusage.html#geometry">geometry string</a>
+  ImageMagick <a href="imusage.html#geometry">geometry string</a>
   argument and a block. The geometry string specifies how to change
   the image's size: one or two numbers to specify the new size and
   optional flags to describe any constraints. The
@@ -252,7 +252,7 @@ thumb = img.resize_to_fit(75, 75)
   compress an image using ZipCompression, more compression usually
   takes longer.</p>
-  <p>For more information, see the &times;Magick documentation for
+  <p>For more information, see the ImageMagick documentation for
   the <code>-quality</code> option to the utility commands.</p>
   <pre class="example">
 img.write("myimage.jpg") { self.quality = 50 }

data/doc/constants.html CHANGED Viewed

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.2.2: Constants</title>
+  <title>RMagick 2.3.0: Constants</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -61,7 +61,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.2.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="info.html">Prev</a> | <a href=
@@ -155,7 +155,7 @@
     <dd>An extended form of the <code>Version</code> constant with
     the format shown here:<br />
-    <code>This is RMagick 2.0.0 ($Date: 2008/01/07 00:03:59 $)
+    <code>This is RMagick 2.0.0 ($Date: 2008/03/16 15:21:45 $)
     Copyright (C) 2008 by Timothy P. Hunter<br />
     Built with ImageMagick 6.3.7 01/05/08 Q16
     http://www.imagemagick.org<br />
@@ -228,16 +228,32 @@
   <dl>
     <dt>UndefinedAlign</dt>
+    <dd>No alignment specified. Equivalent to LeftAlign.</dd>
     <dt>LeftAlign</dt>
+    <dd>Align the leftmost part of the text to the starting
+    point.</dd>
     <dt>CenterAlign</dt>
+    <dd>Center the text around the starting point.</dd>
     <dt>RightAlign</dt>
+    <dd>Align the rightmost part of the text to the starting
+    point.</dd>
   </dl>
   <h3 class="const" id="ChannelType">ChannelType</h3>
-  <p>Specify an image channel. See <a href=
+  <p>Specify an image channel. A channel is a color component of a
+  pixel. In the RGB colorspace the channels are red, green, and
+  blue. There may also be an alpha (transparency/opacity) channel.
+  In the CMYK colorspace the channels area cyan, magenta, yellow,
+  and black. In the HSL colorspace the channels are hue,
+  saturation, and lightness. In the Gray colorspace the only
+  channel is gray. See <a href=
   "image1.html#channel">Image#channel</a> and <a href=
   "info.html#channel">Image::Info#channel=</a>.</p>
@@ -262,6 +278,10 @@
     <dt>AllChannels</dt>
+    <dd>In the RGB colorspace, the red, blue, green, and alpha
+    channels. In the CMYK colorspace, the cyan, magenta, yellow,
+    and black channels.</dd>
     <dt>GrayChannel</dt>
     <dt>AlphaChannel</dt>
@@ -333,32 +353,61 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dd>No colorspace has been specified.</dd>
-    <dt>RGBColorspace</dt>
+    <dt>CMYColorspace</dt>
-    <dd class="imquote">Red-Green-Blue colorspace</dd>
+    <dt>CMYKColorspace</dt>
+    <dd class="imquote">Cyan-Magenta-Yellow-Black colorspace. CYMK
+    is a subtractive color system used by printers and
+    photographers for the rendering of colors with ink or emulsion,
+    normally on a white surface.</dd>
     <dt>GRAYColorspace</dt>
     <dd>Full-range grayscale</dd>
+    <dt>HSBColorspace</dt>
+    <dt>HSLColorspace</dt>
+    <dd>Hue, saturation, luminosity</dd>
+    <dt>HWBColorspace</dt>
+    <dd>Hue, whiteness, blackness</dd>
+    <dt>LABColorspace</dt>
+    <dt>LogColorspace</dt>
+    <dt>OHTAColorspace</dt>
+    <dt>RGBColorspace</dt>
+    <dd class="imquote">Red-Green-Blue colorspace</dd>
+    <dt>SRGBColorspace</dt>
+    <dd>Kodak PhotoCD sRGB. In ImageMagick, this constant is named
+    sRGBColorspace, but since Ruby constants must start with an
+    uppercase letter, I had to change it.</dd>
     <dt>TransparentColorspace</dt>
     <dd class="imquote">The Transparent color space behaves
     uniquely in that it preserves the matte channel of the image if
     it exists.</dd>
-    <dt>OHTAColorspace</dt>
     <dt>XYZColorspace</dt>
     <dd>CIE XYZ</dd>
+    <dt>YCbCrColorspace</dt>
     <dt>YCCColorspace</dt>
     <dd>Kodak PhotoCD PhotoYCC</dd>
-    <dt>YCbCrColorspace</dt>
     <dt>YIQColorspace</dt>
     <dt>YPbPrColorspace</dt>
@@ -368,33 +417,6 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dd class="imquote">Y-signal, U-signal, and V-signal
     colorspace. YUV is most widely used to encode color for use in
     television transmission.</dd>
-    <dt>CMYKColorspace</dt>
-    <dd class="imquote">Cyan-Magenta-Yellow-Black colorspace. CYMK
-    is a subtractive color system used by printers and
-    photographers for the rendering of colors with ink or emulsion,
-    normally on a white surface.</dd>
-    <dt>SRGBColorspace</dt>
-    <dd>Kodak PhotoCD sRGB. In ImageMagick, this constant is named
-    sRGBColorspace, but since Ruby constants must start with an
-    uppercase letter, I had to change it.</dd>
-    <dt>HSLColorspace</dt>
-    <dd>Hue, saturation, luminosity</dd>
-    <dt>HWBColorspace</dt>
-    <dd>Hue, whiteness, blackness</dd>
-    <dt>HSBColorspace</dt>
-    <dt>LogColorspace</dt>
-    <dt>LABColorspace</dt>
   </dl>
   <p>The colorspaces in this group are typically associated with
@@ -458,26 +480,11 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dd>No composite operator has been specified.</dd>
-    <dt>OverCompositeOp</dt>
-    <dd><span class="imquote">The result is the union of the the
-    two image shapes with <code>composite image</code> obscuring
-    <code>image</code> in the region of overlap.</span> The matte
-    channel of the composite image is respected, so that if the
-    composite pixel is part or all transparent, the corresponding
-    image pixel will show through.</dd>
-    <dt>InCompositeOp</dt>
-    <dd class="imquote">The result is simply <code>composite
-    image</code> cut by the shape of <code>image</code>. None of
-    the image data of <code>image</code> is included in the
-    result.</dd>
-    <dt>OutCompositeOp</dt>
+    <dt>AddCompositeOp</dt>
-    <dd class="imquote">The resulting image is <code>composite
-    image</code> with the shape of <code>image</code> cut out.</dd>
+    <dd class="imquote">The result of <code>composite image</code>
+    + <code>image</code>, with overflow wrapping around (mod
+    256).</dd>
     <dt>AtopCompositeOp</dt>
@@ -488,77 +495,66 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <code>composite image</code> outside of <code>image</code>'s
     shape does not appear in the result.</dd>
-    <dt>XorCompositeOp</dt>
-    <dd class="imquote">The result is the image data from both
-    <code>composite image</code> and <code>image</code> that is
-    outside the overlap region. The overlap region will be
-    blank.</dd>
-    <dt>PlusCompositeOp</dt>
+    <dt>BumpmapCompositeOp</dt>
-    <dd class="imquote">The result is just the sum of the image
-    data. Output values are cropped to 255 (no overflow). This
-    operation is independent of the matte channels.</dd>
+    <dd class="imquote">The result <code>image</code> shaded by
+    <code>composite image</code>.</dd>
-    <dt>MinusCompositeOp</dt>
+    <dt>ChangeMaskCompositeOp</dt>
-    <dd class="imquote">The result of composite image - image, with
-    overflow cropped to zero. The matte chanel is ignored (set to
-    255, full coverage).</dd>
+    <dd class="imquote">Replace any destination pixel that is the
+    similar to the source image's pixel (as defined by the current
+    fuzz factor), with transparency.</dd>
-    <dt>AddCompositeOp</dt>
+    <dt>ClearCompositeOp</dt>
-    <dd class="imquote">The result of <code>composite image</code>
-    + <code>image</code>, with overflow wrapping around (mod
-    256).</dd>
+    <dd>Make the target image transparent. The composite image is
+    ignored.</dd>
-    <dt>SubtractCompositeOp</dt>
+    <dt>ColorBurnCompositeOp</dt>
-    <dd class="imquote">The result of <code>composite image</code>
-    - <code>image</code>, with underflow wrapping around (mod 256).
-    The add and subtract operators can be used to perform
-    reversable transformations.</dd>
+    <dd class="imquote">Darkens the destination color to reflect
+    the source color. Painting with white produces no change.</dd>
-    <dt>DifferenceCompositeOp</dt>
+    <dt>ColorDodgeCompositeOp</dt>
-    <dd class="imquote">The result of abs(<code>composite
-    image</code> - <code>image</code>). This is useful for
-    comparing two very similar images.</dd>
+    <dd class="imquote">Brightens the destination color to reflect
+    the source color. Painting with black produces no change.</dd>
-    <dt>MultiplyCompositeOp</dt>
+    <dt>ColorizeCompositeOp</dt>
-    <dd class="imquote">Multiplies the color of each target image
-    pixel by the color of the corresponding composite image pixel.
-    The result color is always darker.</dd>
+    <dd class="imquote">Each pixel in the result image is the
+    combination of the brightness of the target image and the
+    saturation and hue of the composite image. This is the
+    <em>opposite</em> of LuminizeCompositeOp.</dd>
-    <dt>BumpmapCompositeOp</dt>
+    <dt>CopyCompositeOp</dt>
-    <dd class="imquote">The result <code>image</code> shaded by
-    <code>composite image</code>.</dd>
+    <dd>Replace the target image with the composite image.</dd>
-    <dt>ReplaceCompositeOp</dt>
+    <dt>CopyBlackCompositeOp</dt>
-    <dd class="imquote">The resulting image is image replaced with
-    composite image. Here the matte information is ignored.</dd>
+    <dd>Copy the black channel from the composite image to the
+    target image.</dd>
-    <dt>CopyCompositeOp</dt>
+    <dt>CopyBlueCompositeOp</dt>
-    <dd>Replace the target image with the composite image.</dd>
+    <dd>Copy the blue channel from the composite image to the
+    target image.</dd>
-    <dt>CopyRedCompositeOp</dt>
+    <dt>CopyCyanCompositeOp</dt>
-    <dd>Copy the red channel from the composite image to the target
-    image.</dd>
+    <dd>Copy the cyan channel from the composite image to the
+    target image.</dd>
     <dt>CopyGreenCompositeOp</dt>
     <dd>Copy the green channel from the composite image to the
     target image.</dd>
-    <dt>CopyBlueCompositeOp</dt>
+    <dt>CopyMagentaCompositeOp</dt>
-    <dd>Copy the blue channel from the composite image to the
+    <dd>Copy the magenta channel from the composite image to the
     target image.</dd>
     <dt>CopyOpacityCompositeOp</dt>
@@ -570,128 +566,193 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     pixel's opacity to the intensity of the corresponding pixel in
     the composite image.</dd>
-    <dt>ClearCompositeOp</dt>
+    <dt>CopyRedCompositeOp</dt>
-    <dd>Make the target image transparent. The composite image is
-    ignored.</dd>
+    <dd>Copy the red channel from the composite image to the target
+    image.</dd>
-    <dt>DissolveCompositeOp</dt>
+    <dt>CopyYellowCompositeOp</dt>
-    <dd>The operator used in the <a href=
-    "image1.html#dissolve">dissolve</a> method.</dd>
+    <dd>Copy the yellow channel from the composite image to the
+    target image.</dd>
+    <dt>DarkenCompositeOp</dt>
+    <dd>Replace target image pixels with darker pixels from the
+    composite image.</dd>
+    <dt>DifferenceCompositeOp</dt>
+    <dd class="imquote">The result of abs(<code>composite
+    image</code> - <code>image</code>). This is useful for
+    comparing two very similar images.</dd>
     <dt>DisplaceCompositeOp</dt>
     <dd>Displace target image pixels as defined by a displacement
     map. The operator used by the <a href=
-    "image1.html#displace">Image#displace</a> method.</dd>
+    "image1.html#displace">displace</a> method.</dd>
-    <dt>ModulateCompositeOp</dt>
+    <dt>DissolveCompositeOp</dt>
-    <dd>Used by the <a href="image3.html#watermark">watermark</a>
-    method.</dd>
+    <dd>The operator used in the <a href=
+    "image1.html#dissolve">dissolve</a> method.</dd>
-    <dt>ThresholdCompositeOp</dt>
+    <dt>DivideCompositeOp</dt>
     <dd>?</dd>
-    <dt>NoCompositeOp</dt>
+    <dt>DstCompositeOp</dt>
-    <dd>No composite operator has been specified.</dd>
+    <dd class="imquote">The destination is left untouched.</dd>
-    <dt>DarkenCompositeOp</dt>
+    <dt>DstAtopCompositeOp</dt>
-    <dd>Replace target image pixels with darker pixels from the
-    composite image.</dd>
+    <dd class="imquote">The part of the destination lying inside of
+    the source is composited over the source and replaces the
+    destination.</dd>
-    <dt>LightenCompositeOp</dt>
+    <dt>DstInCompositeOp</dt>
-    <dd>Replace target image pixels with lighter pixels from the
-    composite image.</dd>
+    <dd class="imquote">The part of the destination lying inside of
+    the source replaces the destination.</dd>
+    <dt>DstOutCompositeOp</dt>
+    <dd class="imquote">The part of the destination lying outside
+    of the source replaces the destination.</dd>
+    <dt>DstOverCompositeOp</dt>
+    <dd class="imquote">The destination is composited over the
+    source and the result replaces the destination.</dd>
+    <dt>ExclusionCompositeOp</dt>
+    <dd class="imquote">Produces an effect similar to that of
+    'difference', but appears as lower contrast. Painting with
+    white inverts the destination color. Painting with black
+    produces no change.</dd>
+    <dt>HardLightCompositeOp</dt>
+    <dd class="imquote">Multiplies or screens the colors, dependent
+    on the source color value. If the source color is lighter than
+    0.5, the destination is lightened as if it were screened. If
+    the source color is darker than 0.5, the destination is
+    darkened, as if it were multiplied. The degree of lightening or
+    darkening is proportional to the difference between the source
+    color and 0.5. If it is equal to 0.5 the destination is
+    unchanged. Painting with pure black or white produces black or
+    white.</dd>
     <dt>HueCompositeOp</dt>
-    <dd>Each pixel in the result image is the combination of the
-    hue of the target image and the saturation and brightness of
-    the composite image.</dd>
+    <dd class="imquote">Each pixel in the result image is the
+    combination of the hue of the target image and the saturation
+    and brightness of the composite image.</dd>
-    <dt>SaturateCompositeOp</dt>
+    <dt>InCompositeOp</dt>
-    <dd>Each pixel in the result image is the combination of the
-    saturation of the target image and the hue and brightness of
-    the composite image.</dd>
+    <dd class="imquote">The result is simply <code>composite
+    image</code> cut by the shape of <code>image</code>. None of
+    the image data of <code>image</code> is included in the
+    result.</dd>
-    <dt>ColorizeCompositeOp</dt>
+    <dt>LightenCompositeOp</dt>
-    <dd>Each pixel in the result image is the combination of the
-    brightness of the target image and the saturation and hue of
-    the composite image. This is the <em>opposite</em> of
-    LuminizeCompositeOp.</dd>
+    <dd>Replace target image pixels with lighter pixels from the
+    composite image.</dd>
+    <dt>LinearLightCompositeOp</dt>
+    <dd class="imquote">Increase contrast slightly with an impact
+    on the foreground's tonal values.</dd>
     <dt>LuminizeCompositeOp</dt>
-    <dd>Each pixel in the result image is the combination of the
-    brightness of the composite image and the saturation and hue of
-    the target image. This is the <em>opposite</em> of
-    ColorizeCompositeOp.</dd>
+    <dd class="imquote">Each pixel in the result image is the
+    combination of the brightness of the composite image and the
+    saturation and hue of the target image. This is the
+    <em>opposite</em> of ColorizeCompositeOp.</dd>
-    <dt>ScreenCompositeOp</dt>
+    <dt>MinusCompositeOp</dt>
-    <dd>Multiplies the inverse of each image's color
-    information.</dd>
+    <dd class="imquote">The result of composite image - image, with
+    overflow cropped to zero. The matte chanel is ignored (set to
+    255, full coverage).</dd>
-    <dt>OverlayCompositeOp</dt>
+    <dt>ModulateCompositeOp</dt>
-    <dd class="imquote">Multiplies or screens the colors, dependent
-    on the destination color. Source colors overlay the destination
-    whilst preserving its highlights and shadows. The destination
-    color is not replaced, but is mixed with the source color to
-    reflect the lightness or darkness of the destination.</dd>
+    <dd>Used by the <a href="image3.html#watermark">watermark</a>
+    method.</dd>
-    <dt>CopyCyanCompositeOp</dt>
+    <dt>MultiplyCompositeOp</dt>
-    <dd>Copy the cyan channel from the composite image to the
-    target image.</dd>
+    <dd class="imquote">Multiplies the color of each target image
+    pixel by the color of the corresponding composite image pixel.
+    The result color is always darker.</dd>
-    <dt>CopyMagentaCompositeOp</dt>
+    <dt>NoCompositeOp</dt>
-    <dd>Copy the magenta channel from the composite image to the
-    target image.</dd>
+    <dd>No composite operator has been specified.</dd>
-    <dt>CopyYellowCompositeOp</dt>
+    <dt>OutCompositeOp</dt>
-    <dd>Copy the yellow channel from the composite image to the
-    target image.</dd>
+    <dd class="imquote">The resulting image is <code>composite
+    image</code> with the shape of <code>image</code> cut out.</dd>
-    <dt>CopyBlackCompositeOp</dt>
+    <dt>OverCompositeOp</dt>
-    <dd>Copy the black channel from the composite image to the
-    target image.</dd>
+    <dd><span class="imquote">The result is the union of the the
+    two image shapes with <code>composite image</code> obscuring
+    <code>image</code> in the region of overlap.</span> The matte
+    channel of the composite image is respected, so that if the
+    composite pixel is part or all transparent, the corresponding
+    image pixel will show through.</dd>
-    <dt>DstAtopCompositeOp</dt>
+    <dt>OverlayCompositeOp</dt>
-    <dd class="imquote">The part of the destination lying inside of
-    the source is composited over the source and replaces the
-    destination.</dd>
+    <dd class="imquote">Multiplies or screens the colors, dependent
+    on the destination color. Source colors overlay the destination
+    whilst preserving its highlights and shadows. The destination
+    color is not replaced, but is mixed with the source color to
+    reflect the lightness or darkness of the destination.</dd>
-    <dt>DstCompositeOp</dt>
+    <dt>PlusCompositeOp</dt>
-    <dd class="imquote">The destination is left untouched.</dd>
+    <dd class="imquote">The result is just the sum of the image
+    data. Output values are cropped to 255 (no overflow). This
+    operation is independent of the matte channels.</dd>
-    <dt>DstInCompositeOp</dt>
+    <dt>ReplaceCompositeOp</dt>
-    <dd class="imquote">The part of the destination lying inside of
-    the source replaces the destination.</dd>
+    <dd class="imquote">The resulting image is image replaced with
+    composite image. Here the matte information is ignored.</dd>
-    <dt>DstOutCompositeOp</dt>
+    <dt>SaturateCompositeOp</dt>
-    <dd class="imquote">The part of the destination lying outside
-    of the source replaces the destination.</dd>
+    <dd>Each pixel in the result image is the combination of the
+    saturation of the target image and the hue and brightness of
+    the composite image.</dd>
-    <dt>DstOverCompositeOp</dt>
+    <dt>ScreenCompositeOp</dt>
-    <dd class="imquote">The destination is composited over the
-    source and the result replaces the destination.</dd>
+    <dd>Multiplies the inverse of each image's color
+    information.</dd>
+    <dt>SoftLightCompositeOp</dt>
+    <dd class="imquote">Darkens or lightens the colors, dependent
+    on the source color value. If the source color is lighter than
+    0.5, the destination is lightened. If the source color is
+    darker than 0.5, the destination is darkened, as if it were
+    burned in. The degree of darkening or lightening is
+    proportional to the difference between the source color and
+    0.5. If it is equal to 0.5, the destination is unchanged.
+    Painting with pure black or white produces a distinctly darker
+    or lighter area, but does not result in pure black or
+    white.</dd>
     <dt>SrcAtopCompositeOp</dt>
@@ -718,53 +779,23 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dd class="imquote">The source is composited over the
     destination.</dd>
-    <dt>ColorDodgeCompositeOp</dt>
-    <dd class="imquote">Brightens the destination color to reflect
-    the source color. Painting with black produces no change.</dd>
-    <dt>ExclusionCompositeOp</dt>
-    <dd class="imquote">Produces an effect similar to that of
-    'difference', but appears as lower contrast. Painting with
-    white inverts the destination color. Painting with black
-    produces no change.</dd>
-    <dt>HardLightCompositeOp</dt>
-    <dd class="imquote">Multiplies or screens the colors, dependent
-    on the source color value. If the source color is lighter than
-    0.5, the destination is lightened as if it were screened. If
-    the source color is darker than 0.5, the destination is
-    darkened, as if it were multiplied. The degree of lightening or
-    darkening is proportional to the difference between the source
-    color and 0.5. If it is equal to 0.5 the destination is
-    unchanged. Painting with pure black or white produces black or
-    white.</dd>
-    <dt>SoftLightCompositeOp</dt>
+    <dt>SubtractCompositeOp</dt>
-    <dd class="imquote">Darkens or lightens the colors, dependent
-    on the source color value. If the source color is lighter than
-    0.5, the destination is lightened. If the source color is
-    darker than 0.5, the destination is darkened, as if it were
-    burned in. The degree of darkening or lightening is
-    proportional to the difference between the source color and
-    0.5. If it is equal to 0.5, the destination is unchanged.
-    Painting with pure black or white produces a distinctly darker
-    or lighter area, but does not result in pure black or
-    white.</dd>
+    <dd class="imquote">The result of <code>composite image</code>
+    - <code>image</code>, with underflow wrapping around (mod 256).
+    The add and subtract operators can be used to perform
+    reversable transformations.</dd>
-    <dt>ChangeMaskCompositeOp</dt>
+    <dt>ThresholdCompositeOp</dt>
-    <dd class="imquote">Replace any destination pixel that is the
-    simular to the source images pixel (as defined by the current
-    fuzz factor), with transparency.</dd>
+    <dd>?</dd>
-    <dt>LinearLightCompositeOp</dt>
+    <dt>XorCompositeOp</dt>
-    <dd class="imquote">Increase contrast slightly with an impact
-    on the foreground's tonal values.</dd>
+    <dd class="imquote">The result is the image data from both
+    <code>composite image</code> and <code>image</code> that is
+    outside the overlap region. The overlap region will be
+    blank.</dd>
   </dl>
   <h3 class="const" id="CompressionType">CompressionType</h3>
@@ -772,8 +803,8 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
   <p><span class="imquote">Express the desired compression type
   when encoding an image. Be aware that most image types only
   support a sub-set of the available compression types. If the
-  compression type specified is incompatable with the image,
-  ImageMagick selects a compression type compatable with the image
+  compression type specified is incompatible with the image,
+  ImageMagick selects a compression type compatible with the image
   type.</span> See <a href=
   "imageattrs.html#compression">compression</a>.</p>
@@ -896,7 +927,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
   <p><span class="imquote">Used to adjust the filter algorithm used
   when resizing images. Different filters experience varying
-  degrees of success with various images and can take sigificantly
+  degrees of success with various images and can take significantly
   different amounts of processing time. ImageMagick uses the
   LanczosFilter by default since this filter has been shown to
   provide the best results for most images in a reasonable amount
@@ -909,47 +940,47 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
   <dl>
     <dt>UndefinedFilter</dt>
-    <dt>PointFilter</dt>
+    <dt>Bartlett</dt>
-    <dt>BoxFilter</dt>
+    <dt>BesselFilter</dt>
-    <dt>TriangleFilter</dt>
+    <dt>BlackmanFilter</dt>
-    <dt>HermiteFilter</dt>
+    <dt>Bohman</dt>
-    <dt>HanningFilter</dt>
+    <dt>BoxFilter</dt>
-    <dt>HammingFilter</dt>
+    <dt>CatromFilter</dt>
-    <dt>BlackmanFilter</dt>
+    <dt>CubicFilter</dt>
     <dt>GaussianFilter</dt>
-    <dt>QuadraticFilter</dt>
+    <dt>HammingFilter</dt>
-    <dt>CubicFilter</dt>
+    <dt>HanningFilter</dt>
-    <dt>CatromFilter</dt>
+    <dt>HermiteFilter</dt>
-    <dt>MitchellFilter</dt>
+    <dt>KaiserFilter</dt>
-    <dt>LanczosFilter</dt>
+    <dt>LagrangianFilter</dt>
-    <dt>BesselFilter</dt>
+    <dt>LanczosFilter</dt>
-    <dt>SincFilter</dt>
+    <dt>MitchellFilter</dt>
-    <dt>KaiserFilter</dt>
+    <dt>ParzenFilter</dt>
-    <dt>WelshFilter</dt>
+    <dt>PointFilter</dt>
-    <dt>ParzenFilter</dt>
+    <dt>QuadraticFilter</dt>
-    <dt>LagrangianFilter</dt>
+    <dt>SincFilter</dt>
-    <dt>Bohman</dt>
+    <dt>TriangleFilter</dt>
-    <dt>Bartlett</dt>
+    <dt>WelshFilter</dt>
   </dl>
   <h3 class="const" id="GravityType">GravityType</h3>
@@ -974,7 +1005,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dt>NorthGravity</dt>
-    <dd class="imquote">Postiion object at top-center of
+    <dd class="imquote">Position object at top-center of
     region</dd>
     <dt>NorthEastGravity</dt>
@@ -1044,7 +1075,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dd class="imquote">Truecolor image</dd>
-    <dt>TrueColorMatteTypeType</dt>
+    <dt>TrueColorMatteType</dt>
     <dd class="imquote">Truecolor image with opacity</dd>
@@ -1316,7 +1347,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
     <dt>PixelsPerInchResolution</dt>
     <dd class="imquote">Density specifications are specified in
-    units of pixels per inch (english units).</dd>
+    units of pixels per inch (English units).</dd>
     <dt>PixelsPerCentimeterResolution</dt>
@@ -1414,7 +1445,7 @@ ruby -rRMagick -e"Magick::ColorspaceType.values {|cs| puts cs}"
   <dl>
     <dt>AnyWeight</dt>
-    <dd>No weight specfied.</dd>
+    <dd>No weight specified.</dd>
     <dt>NormalWeight</dt>