color-tools 1.2.0 → 1.3.0

data/Changelog

@@ -1,3 +1,28 @@
+= color-tools Change Log
+
+== color-utils 1.3.0
+* Added new metallic colours suggested by Jim Freeze <jfn@freeze.org>. These
+  are in the namespace Color::Metallic.
+* Colours that were defined in the Color namespace (e.g., Color::Red,
+  Color::AliceBlue) are now defined in Color::RGB (e.g., Color::RGB::Red,
+  Color::RGB::AliceBlue). They are added back to the Color namespace on the
+  first use of the old colours and a warning is printed. In version 1.4, this
+  warning will be printed on every use of the old colours. In version 1.5,
+  the backwards compatible support for colours like Color::Red will be
+  removed completely.
+* Added the Color::CSS module, color/css or Color::CSS that provides a name
+  lookup of Color::RGB-namespaced constants with Color::CSS[name]. Most of
+  these colours (which are mirrored from the Color::RGB default colours) are
+  only "officially" recognised under the CSS3 colour module or SVG.
+* Added the Color::HSL colour space and some helper utilities to Color::RGB
+  for colour manipulation using the HSL value.
+* Controlled internal value replacement to be between 0 and 1 for all
+  colours.
+* Updated Color::Palette::Gimp to more meaningfully deal with duplicate named
+  colours. Named colours now return an array of colours.
+* Indicated the plans for some methods and constants out to color-tools 2.0.
+* Added unit tests and fixed a number of hidden bugs because of them.
+
 == color-utils 1.2.0
 * Changed installer from a custom-written install.rb to setup.rb
   3.3.1-modified.
@@ -12,5 +37,14 @@
 == color-utils 1.0.0
 * Initial release.
 
-$Id: Changelog,v 1.4 2005/07/01 15:54:18 austin Exp $
+#--
+# Colour management with Ruby.
+#
+# Copyright 2005 Austin Ziegler
+#   http://rubyforge.org/ruby-pdf/
+#
+#   Licensed under a MIT-style licence.
+#
+# $Id: Changelog,v 1.8 2005/08/08 02:44:17 austin Exp $
+#++
 # vim: sts=2 sw=2 ts=4 et ai tw=77

data/Install

@@ -3,7 +3,16 @@ Installing this package is as simple as:
 % ruby setup.rb
 
 Alternatively, you can use the RubyGem version of color-tools available as
-color-tools-1.2.0.gem from the usual sources.
+color-tools-1.3.0.gem from the usual sources.
 
-$Id: Install,v 1.4 2005/07/01 15:54:18 austin Exp $
+#--
+# Colour management with Ruby.
+#
+# Copyright 2005 Austin Ziegler
+#   http://rubyforge.org/ruby-pdf/
+#
+#   Licensed under a MIT-style licence.
+#
+# $Id: Install,v 1.6 2005/08/05 23:07:20 austin Exp $
+#++
 # vim: sts=2 sw=2 ts=4 et ai tw=77

data/README

@@ -1,15 +1,38 @@
 = color-tools README
-color-tools is a Ruby library to provide RGB, CMYK, and other colour
-support to applications that require it. It provides 148 named RGB colours
-that are commonly supported and used in HTML, colour manipulation
-operations, and a monochromatic contrasting palette generator. Version 1.2
-introduces two new colour spaces: GrayScale (also known as GreyScale) and
-YIQ (NTSC).
-
-The GreyScale colour space has been added primarily to add new colour
-space support for PDF::Writer (PDF documents support CMYK, RGB, and Grey
-device colour spaces). The YIQ colour space has been promoted to a full
-colour class to make future colour management of this class easier.
+color-tools is a Ruby library to provide RGB, CMYK, and other colourspace
+support to applications that require it. It also provides 152 named RGB
+colours. It offers 152 named RGB colours (184 with spelling variations)
+that are commonly supported and used in HTML, SVG, and X11 applications. A
+technique for generating a monochromatic contrasting palette is also
+included.
+
+Version 1.3 offers significant enhancements over color-tools 1.2, and a
+plan for an incompatible change to the library.
+
+* Colours that were defined in the Color namespace (e.g., Color::Red,
+  Color::AliceBlue) are now defined in Color::RGB (e.g., Color::RGB::Red,
+  Color::RGB::AliceBlue). They are added back to the Color namespace on
+  the first use of the old colours and a warning is printed. In version
+  1.4, this warning will be printed on every use of the old colours. In
+  version 1.5, the backwards compatible support for colours like
+  Color::Red will be removed completely.
+
+* A CSS colour name module has been added. It is based on the Color::RGB
+  predefined colours. It is called with "Color::CSS[color]". The provided
+  colour name will be looked up ignoring case so that "DarkSalmon" and
+  "darksalmon" (and :darksalmon) are the same value. This makes it easier
+  on web or SVG developers who wish to be able to manipulate a colour
+  based on a CSS colour name.
+
+* A new predefined colour namespace has been added for RGB metallic
+  colours (Color::Metallic, in color/rgb/metallic), suggested by Jim
+  Freeze <jfn@freeze.org>.
+
+* A new colour space, Color::HSL (hue, saturation, and luminosity) has
+  been added with some helper methods to Color::RGB for colour
+  manipulation.
+
+* Added unit tests and fixed various little bugs.
 
 == Copyright
 Copyright 2005 by Austin Ziegler
@@ -46,5 +69,14 @@ DEALINGS IN THE SOFTWARE.
 [2] http://slayeroffice.com/tools/color_palette/
 [3] http://www.barelyfitz.com/projects/csscolor/
 
-$Id: README,v 1.5 2005/07/01 15:54:18 austin Exp $
+#--
+# Colour management with Ruby.
+#
+# Copyright 2005 Austin Ziegler
+#   http://rubyforge.org/ruby-pdf/
+#
+#   Licensed under a MIT-style licence.
+#
+# $Id: README,v 1.9 2005/08/08 02:44:17 austin Exp $
+#++
 # vim: sts=2 sw=2 ts=4 et ai tw=74

data/Rakefile

@@ -1,5 +1,14 @@
 #! /usr/bin/env rake
-# $Id: Rakefile,v 1.5 2005/07/01 15:54:18 austin Exp $
+#--
+# Colour management with Ruby.
+#
+# Copyright 2005 Austin Ziegler
+#   http://rubyforge.org/ruby-pdf/
+#
+#   Licensed under a MIT-style licence.
+#
+# $Id: Rakefile,v 1.7 2005/08/08 02:53:16 austin Exp $
+#++
 # vim: sts=2 sw=2 ts=4 et ai tw=77
 
 $LOAD_PATH.unshift('lib')
@@ -36,7 +45,7 @@ task :test do |t|
 
   $LOAD_PATH.unshift('tests')
   $stderr.puts "Checking for test cases:" if t.verbose
-  Dir['tests/tc_*.rb'].each do |testcase|
+  Dir['tests/test_*.rb'].each do |testcase|
     $stderr.puts "\t#{testcase}" if t.verbose
     load testcase
   end

data/lib/color.rb

@@ -1,3 +1,14 @@
+#--
+# Colour management with Ruby.
+#
+# Copyright 2005 Austin Ziegler
+#   http://rubyforge.org/ruby-pdf/
+#
+#   Licensed under a MIT-style licence.
+#
+# $Id: color.rb,v 1.8 2005/08/08 02:44:17 austin Exp $
+#++
+
 # = Colour Management with Ruby
 #
 # == Copyright
@@ -35,9 +46,8 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
-
 module Color
-  COLOR_TOOLS_VERSION = '1.2.0'
+  COLOR_TOOLS_VERSION = '1.3.0'
 
   class RGB; end
   class CMYK; end
@@ -48,163 +58,30 @@ end
 require 'color/rgb'
 require 'color/cmyk'
 require 'color/grayscale'
+require 'color/hsl'
 require 'color/yiq'
+require 'color/rgb/metallic'
+
+  # We load EVERYTHING if we're being run under ZenTest.
+if defined? $ZENTEST and $ZENTEST
+  require 'color/css'
+  require 'color/palette/gimp'
+  require 'color/palette/monocontrast'
+end
 
 module Color
-  Black                 = Color::RGB.new
-  Navy                  = Color::RGB.new(0x00, 0x00, 0x80)
-  DarkBlue              = Color::RGB.new(0x00, 0x00, 0x8b)
-  MediumBlue            = Color::RGB.new(0x00, 0x00, 0xcd)
-  Blue                  = Color::RGB.new(0x00, 0x00, 0xff)
-  DarkGreen             = Color::RGB.new(0x00, 0x64, 0x00)
-  Green                 = Color::RGB.new(0x00, 0x80, 0x00)
-  Teal                  = Color::RGB.new(0x00, 0x80, 0x80)
-  DarkCyan              = Color::RGB.new(0x00, 0x8b, 0x8b)
-  DeepSkyBlue           = Color::RGB.new(0x00, 0xbf, 0xbf)
-  DarkTurquoise         = Color::RGB.new(0x00, 0xce, 0xd1)
-  MediumSpringGreen     = Color::RGB.new(0x00, 0xfa, 0x9a)
-  Lime                  = Color::RGB.new(0x00, 0xff, 0x00)
-  SpringGreen           = Color::RGB.new(0x00, 0xff, 0x7f)
-  Aqua                  = Color::RGB.new(0x00, 0xff, 0xff)
-  Cyan                  = Color::RGB.new(0x00, 0xff, 0xff)
-  MidnightBlue          = Color::RGB.new(0x19, 0x19, 0x70)
-  DodgerBlue            = Color::RGB.new(0x1e, 0x90, 0xff)
-  LightSeaGreen         = Color::RGB.new(0x20, 0xb2, 0xaa)
-  ForestGreen           = Color::RGB.new(0x22, 0x8b, 0x22)
-  SeaGreen              = Color::RGB.new(0x2e, 0x8b, 0x57)
-  DarkSlateGray         = Color::RGB.new(0x2f, 0x4f, 0x4f)
-  DarkSlateGrey         = DarkSlateGray
-  LimeGreen             = Color::RGB.new(0x32, 0xcd, 0x32)
-  MediumSeaGreen        = Color::RGB.new(0x3c, 0xb3, 0x71)
-  Turquoise             = Color::RGB.new(0x40, 0xe0, 0xd0)
-  RoyalBlue             = Color::RGB.new(0x41, 0x69, 0xe1)
-  SteelBlue             = Color::RGB.new(0x46, 0x82, 0xb4)
-  DarkSlateBlue         = Color::RGB.new(0x48, 0x3d, 0x8b)
-  MediumTurquoise       = Color::RGB.new(0x48, 0xd1, 0xcc)
-  Indigo                = Color::RGB.new(0x4b, 0x00, 0x82)
-  DarkoliveGreen        = Color::RGB.new(0x55, 0x6b, 0x2f)
-  CadetBlue             = Color::RGB.new(0x5f, 0x9e, 0xa0)
-  CornflowerBlue        = Color::RGB.new(0x64, 0x95, 0xed)
-  MediumAquamarine      = Color::RGB.new(0x66, 0xcd, 0xaa)
-  DimGray               = Color::RGB.new(0x69, 0x69, 0x69)
-  DimGrey               = DimGray
-  SlateBlue             = Color::RGB.new(0x6a, 0x5a, 0xcd)
-  Olivedrab             = Color::RGB.new(0x6b, 0x8e, 0x23)
-  SlateGray             = Color::RGB.new(0x70, 0x80, 0x90)
-  SlateGrey             = SlateGray
-  LightSlateGray        = Color::RGB.new(0x77, 0x88, 0x99)
-  LightSlateGrey        = LightSlateGray
-  MediumSlateBlue       = Color::RGB.new(0x7b, 0x68, 0xee)
-  LawnGreen             = Color::RGB.new(0x7c, 0xfc, 0x00)
-  Chartreuse            = Color::RGB.new(0x7f, 0xff, 0x00)
-  Aquamarine            = Color::RGB.new(0x7f, 0xff, 0xd4)
-  Maroon                = Color::RGB.new(0x80, 0x00, 0x00)
-  Purple                = Color::RGB.new(0x80, 0x00, 0x80)
-  Olive                 = Color::RGB.new(0x80, 0x80, 0x00)
-  Gray                  = Color::RGB.new(0x80, 0x80, 0x80)
-  Grey                  = Gray
-  SkyBlue               = Color::RGB.new(0x87, 0xce, 0xeb)
-  LightSkyBlue          = Color::RGB.new(0x87, 0xce, 0xfa)
-  BlueViolet            = Color::RGB.new(0x8a, 0x2b, 0xe2)
-  DarkRed               = Color::RGB.new(0x8b, 0x00, 0x00)
-  DarkMagenta           = Color::RGB.new(0x8b, 0x00, 0x8b)
-  SaddleBrown           = Color::RGB.new(0x8b, 0x45, 0x13)
-  DarkSeaGreen          = Color::RGB.new(0x8f, 0xbc, 0x8f)
-  LightGreen            = Color::RGB.new(0x90, 0xee, 0x90)
-  MediumPurple          = Color::RGB.new(0x93, 0x70, 0xdb)
-  DarkViolet            = Color::RGB.new(0x94, 0x00, 0xd3)
-  PaleGreen             = Color::RGB.new(0x98, 0xfb, 0x98)
-  DarkOrchid            = Color::RGB.new(0x99, 0x32, 0xcc)
-  YellowGreen           = Color::RGB.new(0x9a, 0xcd, 0x32)
-  Sienna                = Color::RGB.new(0xa0, 0x52, 0x2d)
-  Brown                 = Color::RGB.new(0xa5, 0x2a, 0x2a)
-  DarkGray              = Color::RGB.new(0xa9, 0xa9, 0xa9)
-  DarkGrey              = DarkGray
-  LightBlue             = Color::RGB.new(0xad, 0xd8, 0xe6)
-  GreenYellow           = Color::RGB.new(0xad, 0xff, 0x2f)
-  PaleTurquoise         = Color::RGB.new(0xaf, 0xee, 0xee)
-  LightsteelBlue        = Color::RGB.new(0xb0, 0xc4, 0xde)
-  PowderBlue            = Color::RGB.new(0xb0, 0xe0, 0xe6)
-  Firebrick             = Color::RGB.new(0xb2, 0x22, 0x22)
-  DarkGoldenrod         = Color::RGB.new(0xb8, 0x86, 0x0b)
-  MediumOrchid          = Color::RGB.new(0xba, 0x55, 0xd3)
-  RosyBrown             = Color::RGB.new(0xbc, 0x8f, 0x8f)
-  DarkKhaki             = Color::RGB.new(0xbd, 0xb7, 0x6b)
-  Silver                = Color::RGB.new(0xc0, 0xc0, 0xc0)
-  MediumVioletRed       = Color::RGB.new(0xc7, 0x15, 0x85)
-  IndianRed             = Color::RGB.new(0xcd, 0x5c, 0x5c)
-  Peru                  = Color::RGB.new(0xcd, 0x85, 0x3f)
-  Chocolate             = Color::RGB.new(0xd2, 0x69, 0x1e)
-  Tan                   = Color::RGB.new(0xd2, 0xb4, 0x8c)
-  LightGray             = Color::RGB.new(0xd3, 0xd3, 0xd3)
-  LightGrey             = LightGray
-  Thistle               = Color::RGB.new(0xd8, 0xbf, 0xd8)
-  Orchid                = Color::RGB.new(0xda, 0x70, 0xd6)
-  Goldenrod             = Color::RGB.new(0xda, 0xa5, 0x20)
-  PaleVioletRed         = Color::RGB.new(0xdb, 0x70, 0x93)
-  Crimson               = Color::RGB.new(0xdc, 0x14, 0x3c)
-  Gainsboro             = Color::RGB.new(0xdc, 0xdc, 0xdc)
-  Plum                  = Color::RGB.new(0xdd, 0xa0, 0xdd)
-  Burlywood             = Color::RGB.new(0xde, 0xb8, 0x87)
-  LightCyan             = Color::RGB.new(0xe0, 0xff, 0xff)
-  Lavender              = Color::RGB.new(0xe6, 0xe6, 0xfa)
-  Darksalmon            = Color::RGB.new(0xe9, 0x96, 0x7a)
-  Violet                = Color::RGB.new(0xee, 0x82, 0xee)
-  PaleGoldenrod         = Color::RGB.new(0xee, 0xe8, 0xaa)
-  LightCoral            = Color::RGB.new(0xf0, 0x80, 0x80)
-  Khaki                 = Color::RGB.new(0xf0, 0xe6, 0x8c)
-  AliceBlue             = Color::RGB.new(0xf0, 0xf8, 0xff)
-  Honeydew              = Color::RGB.new(0xf0, 0xff, 0xf0)
-  Azure                 = Color::RGB.new(0xf0, 0xff, 0xff)
-  SandyBrown            = Color::RGB.new(0xf4, 0xa4, 0x60)
-  Wheat                 = Color::RGB.new(0xf5, 0xde, 0xb3)
-  Beige                 = Color::RGB.new(0xf5, 0xf5, 0xdc)
-  WhiteSmoke            = Color::RGB.new(0xf5, 0xf5, 0xf5)
-  MintCream             = Color::RGB.new(0xf5, 0xff, 0xfa)
-  GhostWhite            = Color::RGB.new(0xf8, 0xf8, 0xff)
-  Salmon                = Color::RGB.new(0xfa, 0x80, 0x72)
-  AntiqueWhite          = Color::RGB.new(0xfa, 0xeb, 0xd7)
-  Linen                 = Color::RGB.new(0xfa, 0xf0, 0xe6)
-  LightGoldenrodYellow  = Color::RGB.new(0xfa, 0xfa, 0xd2)
-  OldLace               = Color::RGB.new(0xfd, 0xf5, 0xe6)
-  Red                   = Color::RGB.new(0xff, 0x00, 0x00)
-  Fuchsia               = Color::RGB.new(0xff, 0x00, 0xff)
-  Magenta               = Color::RGB.new(0xff, 0x00, 0xff)
-  DeepPink              = Color::RGB.new(0xff, 0x14, 0x93)
-  OrangeRed             = Color::RGB.new(0xff, 0x45, 0x00)
-  Tomato                = Color::RGB.new(0xff, 0x63, 0x47)
-  HotPink               = Color::RGB.new(0xff, 0x69, 0xb4)
-  Coral                 = Color::RGB.new(0xff, 0x7f, 0x50)
-  Darkorange            = Color::RGB.new(0xff, 0x8c, 0x00)
-  Lightsalmon           = Color::RGB.new(0xff, 0xa0, 0x7a)
-  Orange                = Color::RGB.new(0xff, 0xa5, 0x00)
-  LightPink             = Color::RGB.new(0xff, 0xb6, 0xc1)
-  Pink                  = Color::RGB.new(0xff, 0xc0, 0xcb)
-  Gold                  = Color::RGB.new(0xff, 0xd7, 0x00)
-  Peachpuff             = Color::RGB.new(0xff, 0xda, 0xb9)
-  NavajoWhite           = Color::RGB.new(0xff, 0xde, 0xad)
-  Moccasin              = Color::RGB.new(0xff, 0xe4, 0xb5)
-  Bisque                = Color::RGB.new(0xff, 0xe4, 0xc4)
-  MistyRose             = Color::RGB.new(0xff, 0xe4, 0xe1)
-  BlanchedAlmond        = Color::RGB.new(0xff, 0xeb, 0xcd)
-  PapayaWhip            = Color::RGB.new(0xff, 0xef, 0xd5)
-  LavenderBlush         = Color::RGB.new(0xff, 0xf0, 0xf5)
-  Seashell              = Color::RGB.new(0xff, 0xf5, 0xee)
-  Cornsilk              = Color::RGB.new(0xff, 0xf8, 0xdc)
-  LemonChiffon          = Color::RGB.new(0xff, 0xfa, 0xcd)
-  FloralWhite           = Color::RGB.new(0xff, 0xfa, 0xf0)
-  Snow                  = Color::RGB.new(0xff, 0xfa, 0xfa)
-  Yellow                = Color::RGB.new(0xff, 0xff, 0x00)
-  LightYellow           = Color::RGB.new(0xff, 0xff, 0xe0)
-  Ivory                 = Color::RGB.new(0xff, 0xff, 0xf0)
-  White                 = Color::RGB.new(0xff, 0xff, 0xff)
-  Gray10 = Grey10       = Color::RGB.from_percentage(10, 10, 10)
-  Gray20 = Grey20       = Color::RGB.from_percentage(20, 20, 20)
-  Gray30 = Grey30       = Color::RGB.from_percentage(30, 30, 30)
-  Gray40 = Grey40       = Color::RGB.from_percentage(40, 40, 40)
-  Gray50 = Grey50       = Color::RGB.from_percentage(50, 50, 50)
-  Gray60 = Grey60       = Color::RGB.from_percentage(60, 60, 60)
-  Gray70 = Grey70       = Color::RGB.from_percentage(70, 70, 70)
-  Gray80 = Grey80       = Color::RGB.from_percentage(80, 80, 80)
-  Gray90 = Grey90       = Color::RGB.from_percentage(90, 90, 90)
+  def self.const_missing(name) #:nodoc:
+    if Color::RGB.const_defined?(name)
+      warn "These colour constants have been deprecated. Use Color::RGB::#{name} instead."
+      Color::RGB::constants.each do |const|
+        next if const == "PDF_FORMAT_STR"
+        next if const == "Metallic"
+        const_set(const, Color::RGB.const_get(const))
+      end
+      class << Color; remove_method :const_missing; end
+      Color.const_get(name)
+    else
+      super
+    end
+  end
 end

data/lib/color/cmyk.rb

@@ -3,27 +3,41 @@
 #
 # Copyright 2005 Austin Ziegler
 #   http://rubyforge.org/ruby-pdf/
+#
+#   Licensed under a MIT-style licence.
+#
+# $Id: cmyk.rb,v 1.5 2005/08/08 02:44:17 austin Exp $
 #++
 
-  # An CMYK colour object.
+  # An CMYK colour object. CMYK (cyan, magenta, yellow, and black) colours
+  # are based on additive percentages of ink. A CMYK colour of (0.3, 0, 0.8,
+  # 0.3) would be mixed from 30% cyan, 0% magenta, 80% yellow, and 30%
+  # black.
 class Color::CMYK
+    # The format of a DeviceCMYK colour for PDF. In color-tools 2.0 this
+    # will be removed from this package and added back as a modification by
+    # the PDF::Writer package.
   PDF_FORMAT_STR = "%.3f %.3f %.3f %.3f %s"
 
     # Compares the other colour to this one. The other colour will be
     # converted to CMYK before comparison, so the comparison between a CMYK
     # colour and a non-CMYK colour will be approximate and based on the
     # other colour's #to_cmyk conversion. If there is no #to_cmyk
-    # conversion, this will raise an exception.
+    # conversion, this will raise an exception. This will report that two
+    # CMYK colours are equivalent if all component values are within 1e-4
+    # (0.0001) of each other.
   def ==(other)
     other = other.to_cmyk
     other.kind_of?(Color::CMYK) and
-    (@c == other.c) and
-    (@m == other.m) and
-    (@y == other.y) and
-    (@k == other.k)
+    ((@c - other.c).abs <= 1e-4) and
+    ((@m - other.m).abs <= 1e-4) and
+    ((@y - other.y).abs <= 1e-4) and
+    ((@k - other.k).abs <= 1e-4)
   end
 
-    # Creates a CMYK colour object from fractional values 0 .. 1.
+    # Creates a CMYK colour object from fractional values 0..1.
+    #
+    #   Color::CMYK.from_fraction(0.3, 0, 0.8, 0.3)
   def self.from_fraction(c = 0, m = 0, y = 0, k = 0)
     colour = Color::CMYK.new
     colour.c = c
@@ -33,7 +47,10 @@ class Color::CMYK
     colour
   end
 
-    # Creates a CMYK colour object from percentages.
+    # Creates a CMYK colour object from percentages. Internally, the colour
+    # is managed as fractional values 0..1.
+    #
+    #   Color::CMYK.from_fraction(30, 0, 80, 30)
   def initialize(c = 0, m = 0, y = 0, k = 0)
     @c = c / 100.0
     @m = m / 100.0
@@ -41,18 +58,20 @@ class Color::CMYK
     @k = k / 100.0
   end
 
-    # Present the colour as a DeviceCMYK fill colour string for PDF.
+    # Present the colour as a DeviceCMYK fill colour string for PDF. This
+    # will be removed from the default package in color-tools 2.0.
   def pdf_fill
     PDF_FORMAT_STR % [ @c, @m, @y, @k, "k" ]
   end
 
-    # Present the colour as a DeviceCMYK stroke colour string for PDF.
+    # Present the colour as a DeviceCMYK stroke colour string for PDF. This
+    # will be removed from the default package in color-tools 2.0.
   def pdf_stroke
     PDF_FORMAT_STR % [ @c, @m, @y, @k, "K" ]
   end
 
     # Present the colour as an RGB HTML/CSS colour string. Note that this
-    # will perform a #to_rgb 
+    # will perform a #to_rgb operation using the default conversion formula.
   def html
     to_rgb.html
   end
@@ -88,6 +107,9 @@ class Color::CMYK
     # Because of this subtlety, both methods are now offered for conversion
     # in color-tools 1.2 or later. The Adobe method is not used by default;
     # to enable it, pass +true+ to #to_rgb.
+    #
+    # Future versions of color-tools may offer other conversion mechanisms
+    # that offer greater colour fidelity.
   def to_rgb(use_adobe_method = false)
     if use_adobe_method
       r = 1.0 - [1.0, @c + @k].min
@@ -117,7 +139,7 @@ class Color::CMYK
     m = 0.587 * @m.to_f
     y = 0.114 * @y.to_f
     g = 1.0 - [1.0, c + m + y + @k].min
-    Color::Grayscale.from_fraction(g)
+    Color::GrayScale.from_fraction(g)
   end
   alias to_greyscale to_grayscale
 
@@ -125,14 +147,36 @@ class Color::CMYK
     self
   end
 
-    # Returns the YIQ (NTSC) colour approximation of the CMYK value. This is
-    # done by first con
+    # Converts to RGB then YIQ.
   def to_yiq
-    y = (@r * 0.299) + (@g *  0.587) + (@b *  0.114)
-    i = (@r * 0.596) + (@g * -0.275) + (@b * -0.321)
-    q = (@r * 0.212) + (@g * -0.523) + (@b *  0.311)
-    Color::YIQ.from_fraction(y, i, q)
+    to_rgb.to_yiq
+  end
+
+    # Converts to RGB then HSL.
+  def to_hsl
+    to_rgb.to_hsl
   end
 
   attr_accessor :c, :m, :y, :k
+  remove_method :c=, :m=, :y=, :k= ;
+  def c=(cc) #:nodoc:
+    cc = 1.0 if cc > 1
+    cc = 0.0 if cc < 0
+    @c = cc
+  end
+  def m=(mm) #:nodoc:
+    mm = 1.0 if mm > 1
+    mm = 0.0 if mm < 0
+    @m = mm
+  end
+  def y=(yy) #:nodoc:
+    yy = 1.0 if yy > 1
+    yy = 0.0 if yy < 0
+    @y = yy
+  end
+  def k=(kk) #:nodoc:
+    kk = 1.0 if kk > 1
+    kk = 0.0 if kk < 0
+    @k = kk
+  end
 end