color-tools 1.1.0 → 1.2.0

data/Changelog

@@ -1,6 +1,16 @@
+== color-utils 1.2.0
+* Changed installer from a custom-written install.rb to setup.rb
+  3.3.1-modified.
+* Added Color::GreyScale (or Color::GrayScale).
+* Added Color::YIQ. This colour definition is incomplete; it does not have
+  conversions from YIQ to other colour spaces.
+
 == color-utils 1.1.0
 * Added color/palette/gimp to support the reading and use of GIMP color
   palettes.
 
 == color-utils 1.0.0
 * Initial release.
+
+$Id: Changelog,v 1.4 2005/07/01 15:54:18 austin Exp $
+# vim: sts=2 sw=2 ts=4 et ai tw=77

data/Install

@@ -1,6 +1,9 @@
 Installing this package is as simple as:
 
-% ruby install.rb
+% ruby setup.rb
 
 Alternatively, you can use the RubyGem version of color-tools available as
-color-tools-1.1.0.gem from the usual sources.
+color-tools-1.2.0.gem from the usual sources.
+
+$Id: Install,v 1.4 2005/07/01 15:54:18 austin Exp $
+# vim: sts=2 sw=2 ts=4 et ai tw=77

data/README

@@ -1,17 +1,19 @@
 = color-tools README
-color-tools is a Ruby library to provide RGB and CMYK 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. With version 1.1, the
-ability to read and use GIMP colour palette definition files has been
-added.
+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.
 
 == Copyright
 Copyright 2005 by Austin Ziegler
 
-Color::RGB and Color::CMYK were originally developed for the Ruby PDF
-project and PDF::Writer and represent wholly unique code.
-
 Color::Palette was developed based on techniques described by Andy
 "Malarkey" Clarke[1], implemented in JavaScript by Steve G. Chipman at
 SlayerOffice[2] and by Patrick Fitzgerald of BarelyFitz[3] in PHP.
@@ -29,17 +31,20 @@ conditions:
   products derived from this software without specific prior written
   permission.
 
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER 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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.
 
 [1] http://www.stuffandnonsense.co.uk/archives/creating_colour_palettes.html 
 [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 $
+# vim: sts=2 sw=2 ts=4 et ai tw=74

data/Rakefile

@@ -1,4 +1,7 @@
 #! /usr/bin/env rake
+# $Id: Rakefile,v 1.5 2005/07/01 15:54:18 austin Exp $
+# vim: sts=2 sw=2 ts=4 et ai tw=77
+
 $LOAD_PATH.unshift('lib')
 
 require 'rubygems'
@@ -75,7 +78,7 @@ file TARDIST => [ :test ] do |t|
           else
             mode = 0644
           end
-          data = File.read(dd)
+          data = File.open(dd, "rb") { |ff| ff.read }
           { :name => ddnew, :mode => mode, :data => data, :size => data.size,
             :mtime => mtime }
         end

data/lib/color.rb

@@ -36,12 +36,21 @@
 # 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'
+
+  class RGB; end
+  class CMYK; end
+  class GrayScale; end
+  class YIQ; end
+end
+
 require 'color/rgb'
 require 'color/cmyk'
+require 'color/grayscale'
+require 'color/yiq'
 
 module Color
-  COLOR_TOOLS_VERSION = '1.1.0'
-
   Black                 = Color::RGB.new
   Navy                  = Color::RGB.new(0x00, 0x00, 0x80)
   DarkBlue              = Color::RGB.new(0x00, 0x00, 0x8b)

data/lib/color/cmyk.rb

@@ -5,69 +5,134 @@
 #   http://rubyforge.org/ruby-pdf/
 #++
 
-require 'color/rgb'
+  # An CMYK colour object.
+class Color::CMYK
+  PDF_FORMAT_STR = "%.3f %.3f %.3f %.3f %s"
 
-module Color
-    # An CMYK colour object.
-  class CMYK
-    PDF_FORMAT_STR = "%.3f %.3f %.3f %.3f %s"
-
-    def ==(other)
-      other = other.to_cmyk if other.kind_of?(Color::RGB)
-      other.kind_of?(Color::CMYK) and
-      (@c == other.c) and
-      (@m == other.m) and
-      (@y == other.y) and
-      (@k == other.k)
-    end
+    # 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.
+  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)
+  end
 
-      # Creates a CMYK colour object from fractional values 0 .. 1.
-    def self.from_fraction(c = 0, m = 0, y = 0, k = 0)
-      colour = Color::CMYK.new
-      colour.instance_variable_set(:@c, c)
-      colour.instance_variable_set(:@m, m)
-      colour.instance_variable_set(:@y, y)
-      colour.instance_variable_set(:@k, k)
-      colour
-    end
+    # Creates a CMYK colour object from fractional values 0 .. 1.
+  def self.from_fraction(c = 0, m = 0, y = 0, k = 0)
+    colour = Color::CMYK.new
+    colour.c = c
+    colour.m = m
+    colour.y = y
+    colour.k = k
+    colour
+  end
 
-      # Creates a CMYK colour object from percentages.
-    def initialize(c = 0, m = 0, y = 0, k = 0)
-      @c = c / 100.0
-      @m = m / 100.0
-      @y = y / 100.0
-      @k = k / 100.0
-    end
+    # Creates a CMYK colour object from percentages.
+  def initialize(c = 0, m = 0, y = 0, k = 0)
+    @c = c / 100.0
+    @m = m / 100.0
+    @y = y / 100.0
+    @k = k / 100.0
+  end
 
-      # Present the colour as a fill colour string for PDF.
-    def pdf_fill
-      PDF_FORMAT_STR % [ @c, @m, @y, @k, "k" ]
-    end
+    # Present the colour as a DeviceCMYK fill colour string for PDF.
+  def pdf_fill
+    PDF_FORMAT_STR % [ @c, @m, @y, @k, "k" ]
+  end
 
-      # Present the colour as a stroke colour string for PDF.
-    def pdf_stroke
-      PDF_FORMAT_STR % [ @c, @m, @y, @k, "K" ]
-    end
+    # Present the colour as a DeviceCMYK stroke colour string for PDF.
+  def pdf_stroke
+    PDF_FORMAT_STR % [ @c, @m, @y, @k, "K" ]
+  end
 
-      # Present the colour as an HTML/CSS colour string.
-    def html
-      to_rgb.html
-    end
+    # Present the colour as an RGB HTML/CSS colour string. Note that this
+    # will perform a #to_rgb 
+  def html
+    to_rgb.html
+  end
 
-      # Convert the CMYK colour to RGB. Note that colour experts strongly
-      # suggest that this is a *bad* idea, as CMYK represents percentages of
-      # inks, not mixed colour intensities like RGB.
-    def to_rgb
+    # Converts the CMYK colour to RGB. Most colour experts strongly suggest
+    # that this is not a good idea (some even suggesting that it's a very
+    # bad idea). CMYK represents additive percentages of inks on white
+    # paper, whereas RGB represents mixed colour intensities on a black
+    # screen.
+    #
+    # However, the colour conversion can be done, and there are two
+    # different methods for the conversion that provide slightly different
+    # results. Adobe PDF conversions are done with the first form.
+    #
+    #     # Adobe PDF Display Formula
+    #   r = 1.0 - min(1.0, c + k)
+    #   g = 1.0 - min(1.0, m + k)
+    #   b = 1.0 - min(1.0, y + k)
+    #
+    #     # Other
+    #   r = 1.0 - (c * (1.0 - k) + k)
+    #   g = 1.0 - (m * (1.0 - k) + k)
+    #   b = 1.0 - (y * (1.0 - k) + k)
+    #
+    # If we have a CMYK colour of [33% 66% 83% 25%], the first method will
+    # give an approximate RGB colour of (107, 23, 0) or #6b1700. The second
+    # method will give an approximate RGB colour of (128, 65, 33) or
+    # #804121. Which is correct? Although the colours may seem to be
+    # drastically different in the RGB colour space, they are very similar
+    # colours, differing mostly in intensity. The first is a darker,
+    # slightly redder brown; the second is a lighter brown.
+    #
+    # 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.
+  def to_rgb(use_adobe_method = false)
+    if use_adobe_method
+      r = 1.0 - [1.0, @c + @k].min
+      g = 1.0 - [1.0, @m + @k].min
+      b = 1.0 - [1.0, @y + @k].min
+    else
       r = 1.0 - (@c.to_f * (1.0 - @k.to_f) + @k.to_f)
       g = 1.0 - (@m.to_f * (1.0 - @k.to_f) + @k.to_f)
       b = 1.0 - (@y.to_f * (1.0 - @k.to_f) + @k.to_f)
-      Color::RGB.from_fraction(r, g, b)
     end
+    Color::RGB.from_fraction(r, g, b)
+  end
 
-    def to_cmyk
-      self.dup
-    end
+    # Converts the CMYK colour to a single greyscale value. There are
+    # undoubtedly multiple methods for this conversion, but only a minor
+    # variant of the Adobe conversion method will be used:
+    #
+    #   g = 1.0 - min(1.0, 0.299 * c + 0.587 * m + 0.114 * y + k)
+    #
+    # This treats the CMY values similarly to YIQ (NTSC) values and then
+    # adds the level of black. This is a variant of the Adobe version
+    # because it uses the more precise YIQ (NTSC) conversion values for Y
+    # (intensity) rather than the approximates provided by Adobe (0.3, 0.59,
+    # and 0.11).
+  def to_grayscale
+    c = 0.299 * @c.to_f
+    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)
+  end
+  alias to_greyscale to_grayscale
+
+  def to_cmyk
+    self
+  end
 
-    attr_accessor :c, :m, :y, :k
+    # Returns the YIQ (NTSC) colour approximation of the CMYK value. This is
+    # done by first con
+  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)
   end
+
+  attr_accessor :c, :m, :y, :k
 end

data/lib/color/grayscale.rb

@@ -0,0 +1,105 @@
+#--
+# Colour management with Ruby.
+#
+# Copyright 2005 Austin Ziegler
+#   http://rubyforge.org/ruby-pdf/
+#++
+
+  # A colour object representing shades of grey. Used primarily in PDF
+  # document creation.
+class Color::GrayScale
+    # The format required to present the colour to a PDF document.
+  PDF_FORMAT_STR  = "%.3f %s"
+
+    # Creates a greyscale colour object from fractional values 0 .. 1.
+  def self.from_fraction(g = 0)
+    color = Color::GrayScale.new
+    color.g = g
+    color
+  end
+
+    # Creates a greyscale colour object from percentages 0 .. 100.
+  def initialize(g = 0)
+    @g = g / 100.0
+  end
+
+    # Compares the other colour to this one. The other colour will be
+    # converted to GreyScale before comparison, so the comparison between a
+    # GreyScale colour and a non-GreyScale colour will be approximate and
+    # based on the other colour's #to_greyscale conversion. If there is no
+    # #to_greyscale conversion, this will raise an exception.
+  def ==(other)
+    other = other.to_grayscale
+    other.kind_of?(Color::GrayScale) and (@g == other.g)
+  end
+
+    # Present the colour as a fill colour string for PDF.
+  def pdf_fill
+    PDF_FORMAT_STR % [ @g, "g" ]
+  end
+
+    # Present the colour as a stroke colour string for PDF.
+  def pdf_stroke
+    PDF_FORMAT_STR % [ @g, "G" ]
+  end
+
+  def to_255
+    [(@g * 255).round, 255].min
+  end
+  private :to_255
+
+    # Present the colour as an HTML/CSS colour string.
+  def html
+    gs = "%02x" % @g.to_255
+    "##{gs * 3}"
+  end
+
+    # Convert the greyscale colour to CMYK.
+  def to_cmyk
+    k = 1.0 - @g.to_f
+    Color::CMYK.from_Fraction(0, 0, 0, k)
+  end
+
+    # Convert the greyscale colour to RGB.
+  def to_rgb(ignored = true)
+    g = @g.to_255
+    Color::RGB.new(g, g, g)
+  end
+
+  def to_grayscale
+    self
+  end
+  alias to_greyscale to_grayscale
+
+    # Lightens the greyscale colour by the stated percent.
+  def lighten_by(percent)
+    g = [@g + (@g * (percent / 100.0)), 1.0].min
+    Color::Grayscale.from_fraction(g)
+  end
+
+    # Darken the RGB hue by the stated percent.
+  def darken_by(percent)
+    g = [@g - (@g * (percent / 100.0)), 1.0].max
+    Color::GrayScale.from_fraction(g)
+  end
+
+    # Returns the YIQ (NTSC) colour encoding of the greyscale value. This
+    # is an approximation, as the values for I and Q are calculated by
+    # treating the greyscale value as an RGB value. The Y (intensity or
+    # brightness) value is the same as the greyscale value.
+  def to_yiq
+    y = @g
+    i = (@g * 0.596) + (@g * -0.275) + (@g * -0.321)
+    q = (@g * 0.212) + (@g * -0.523) + (@g *  0.311)
+    Color::YIQ.from_fraction(y, i, q)
+  end
+
+    # Returns the brightness value for this greyscale value; this is the
+    # greyscale value.
+  def brightness
+    @g
+  end
+
+  attr_accessor :g
+end
+Color::GreyScale = Color::GrayScale

data/lib/color/rgb.rb

@@ -5,151 +5,171 @@
 #   http://rubyforge.org/ruby-pdf/
 #++
 
-require 'color/cmyk'
-
-module Color
-    # An RGB colour object.
-  class RGB
-      # The format required to present the colour to a PDF document.
-    PDF_FORMAT_STR  = "%.3f %.3f %.3f %s"
-
-    class << self
-        # Creates an RGB colour object from percentages 0 .. 100.
-      def from_percentage(r = 0, g = 0, b = 0)
-        from_fraction(r / 100.0, g / 100.0, b / 100.0)
-      end
-
-        # Creates an RGB colour object from fractional values 0 .. 1.
-      def from_fraction(r = 0.0, g = 0.0, b = 0.0)
-        colour = Color::RGB.new
-        colour.instance_variable_set(:@r, r)
-        colour.instance_variable_set(:@g, g)
-        colour.instance_variable_set(:@b, b)
-        colour
-      end
-
-        # Creates an RGB colour object from an HTML colour descriptor (e.g.,
-        # <tt>"fed"</tt> or <tt>"#cabbed;"</tt>.
-      def from_html(html_colour)
-        html_colour = html_colour.gsub(%r{[#;]}, '')
-        case html_colour.size 
-        when 3
-          colours = html_colour.scan(%r{[0-9A-Fa-f]}).map { |el| (el * 2).to_i(16) }
-        when 6
-          colours = html_colour.scan(%r<[0-9A-Fa-f]{2}>).map { |el| el.to_i(16) }
-        else
-          raise ArgumentError
-        end
-
-        Color::RGB.new(*colours)
-      end
+  # An RGB colour object.
+class Color::RGB
+    # The format required to present the colour to a PDF document.
+  PDF_FORMAT_STR  = "%.3f %.3f %.3f %s"
+
+  class << self
+      # Creates an RGB colour object from percentages 0 .. 100.
+    def from_percentage(r = 0, g = 0, b = 0)
+      from_fraction(r / 100.0, g / 100.0, b / 100.0)
     end
 
-    def ==(other)
-      other = other.to_rgb
-      other.kind_of?(Color::RGB) and
-      (@r == other.r) and
-      (@g == other.g) and
-      (@b == other.b)
+      # Creates an RGB colour object from fractional values 0 .. 1.
+    def from_fraction(r = 0.0, g = 0.0, b = 0.0)
+      colour = Color::RGB.new
+      colour.r = r
+      colour.g = g
+      colour.b = b
+      colour
     end
 
-      # Creates an RGB colour object from the standard range 0 .. 255.
-    def initialize(r = 0, g = 0, b = 0)
-      @r = r / 255.0
-      @g = g / 255.0
-      @b = b / 255.0
-    end
+      # Creates an RGB colour object from an HTML colour descriptor (e.g.,
+      # <tt>"fed"</tt> or <tt>"#cabbed;"</tt>.
+    def from_html(html_colour)
+      html_colour = html_colour.gsub(%r{[#;]}, '')
+      case html_colour.size 
+      when 3
+        colours = html_colour.scan(%r{[0-9A-Fa-f]}).map { |el| (el * 2).to_i(16) }
+      when 6
+        colours = html_colour.scan(%r<[0-9A-Fa-f]{2}>).map { |el| el.to_i(16) }
+      else
+        raise ArgumentError
+      end
 
-      # Present the colour as a fill colour string for PDF.
-    def pdf_fill
-      PDF_FORMAT_STR % [ @r, @g, @b, "rg" ]
+      Color::RGB.new(*colours)
     end
+  end
 
-      # Present the colour as a stroke colour string for PDF.
-    def pdf_stroke
-      PDF_FORMAT_STR % [ @r, @g, @b, "RG" ]
-    end
+  def ==(other)
+    other = other.to_rgb
+    other.kind_of?(Color::RGB) and
+    (@r == other.r) and
+    (@g == other.g) and
+    (@b == other.b)
+  end
 
-      # Present the colour as an HTML/CSS colour string.
-    def html
-      r = (@r * 255).round
-      r = 255 if r > 255
+    # Creates an RGB colour object from the standard range 0 .. 255.
+  def initialize(r = 0, g = 0, b = 0)
+    @r = r / 255.0
+    @g = g / 255.0
+    @b = b / 255.0
+  end
 
-      g = (@g * 255).round
-      g = 255 if g > 255
+    # Present the colour as a fill colour string for PDF.
+  def pdf_fill
+    PDF_FORMAT_STR % [ @r, @g, @b, "rg" ]
+  end
 
-      b = (@b * 255).round
-      b = 255 if b > 255
+    # Present the colour as a stroke colour string for PDF.
+  def pdf_stroke
+    PDF_FORMAT_STR % [ @r, @g, @b, "RG" ]
+  end
 
-      "#%02x%02x%02x" % [ r, g, b ]
-    end
+    # Present the colour as an HTML/CSS colour string.
+  def html
+    r = (@r * 255).round
+    r = 255 if r > 255
 
-      # Convert the RGB colour to CMYK. Note that colour experts strongly
-      # suggest that this is a *bad* idea, as CMYK represents percentages of
-      # inks, not mixed colour intensities like RGB.
-    def to_cmyk
-      c = 1.0 - @r.to_f
-      m = 1.0 - @g.to_f
-      y = 1.0 - @b.to_f
+    g = (@g * 255).round
+    g = 255 if g > 255
 
-      k = 1.0
-      k = c if c < k
-      k = m if m < k
-      k = y if y < k
+    b = (@b * 255).round
+    b = 255 if b > 255
 
-      c = (c.to_f - k.to_f) / (1.0 - k.to_f)
-      m = (m.to_f - k.to_f) / (1.0 - k.to_f)
-      y = (y.to_f - k.to_f) / (1.0 - k.to_f)
+    "#%02x%02x%02x" % [ r, g, b ]
+  end
 
-      Color::CMYK.new(c, m, y, k)
-    end
+    # Converts the RGB colour to CMYK. Most colour experts strongly suggest
+    # that this is not a good idea (some even suggesting that it's a very
+    # bad idea). CMYK represents additive percentages of inks on white
+    # paper, whereas RGB represents mixed colour intensities on a black
+    # screen.
+    #
+    # However, the colour conversion can be done. The basic method is
+    # multi-step:
+    #
+    # 1. Convert the R, G, and B components to C, M, and Y components.
+    #     c = 1.0 � r
+    #     m = 1.0 � g
+    #     y = 1.0 � b
+    # 2. Compute the minimum amount of black (K) required to smooth the
+    #    colour in inks.
+    #     k = min(c, m, y)
+    # 3. Perform undercolour removal on the C, M, and Y components of the
+    #    colours because less of each colour is needed for each bit of
+    #    black. Also, regenerate the black (K) based on the undercolour
+    #    removal so that the colour is more accurately represented in ink.
+    #     c = min(1.0, max(0.0, c � UCR(k)))
+    #     m = min(1.0, max(0.0, m � UCR(k)))
+    #     y = min(1.0, max(0.0, y � UCR(k)))
+    #     k = min(1.0, max(0.0, BG(k)))
+    #
+    # The undercolour removal function and the black generation functions
+    # return a value based on the brightness of the RGB colour.
+  def to_cmyk
+    c = 1.0 - @r.to_f
+    m = 1.0 - @g.to_f
+    y = 1.0 - @b.to_f
+
+    k = [c, m, y].min
+    k = k - (k * brightness)
+
+    c = [1.0, [0.0, c - k].max].min
+    m = [1.0, [0.0, m - k].max].min
+    y = [1.0, [0.0, y - k].max].min
+    k = [1.0, [0.0, k].max].min
+
+    Color::CMYK.from_fraction(c, m, y, k)
+  end
 
-    def to_rgb
-      self.dup
-    end
+  def to_rgb(ignored = nil)
+    self
+  end
 
-      # Lighten the RGB hue by the stated percent.
-    def lighten_by(percent)
-      mix_with(White, percent)
-    end
+    # Lighten the RGB hue by the stated percent.
+  def lighten_by(percent)
+    mix_with(White, percent)
+  end
 
-      # Darken the RGB hue by the stated percent.
-    def darken_by(percent)
-      mix_with(Black, percent)
-    end
+    # Darken the RGB hue by the stated percent.
+  def darken_by(percent)
+    mix_with(Black, percent)
+  end
 
-      # Mix the mask colour (which must be an RGB object) with the current
-      # colour at the stated opacity percentage (0 .. 100).
-    def mix_with(mask, opacity)
-      opacity /= 100.0
-      rgb = self.dup
+    # Mix the mask colour (which must be an RGB object) with the current
+    # colour at the stated opacity percentage (0 .. 100).
+  def mix_with(mask, opacity)
+    opacity /= 100.0
+    rgb = self.dup
 
-      rgb.r = (@r * opacity) + (mask.r * (1 - opacity))
-      rgb.g = (@g * opacity) + (mask.g * (1 - opacity))
-      rgb.b = (@b * opacity) + (mask.b * (1 - opacity))
+    rgb.r = (@r * opacity) + (mask.r * (1 - opacity))
+    rgb.g = (@g * opacity) + (mask.g * (1 - opacity))
+    rgb.b = (@b * opacity) + (mask.b * (1 - opacity))
 
-      rgb
-    end
+    rgb
+  end
 
-      # Returns the YIQ (NTSC) colour encoding of the RGB value.
-    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),
-      }
-    end
+    # Returns the YIQ (NTSC) colour encoding of the RGB value.
+  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)
+  end
 
-      # Returns the brightness value for a colour, a number between 0 and
-      # 1. Based on the Y value of YIQ encoding, representing luminosity, or
-      # perceived brightness.
-    def brightness
-      to_yiq[:y]
-    end
+    # Returns the brightness value for a colour, a number between 0 and
+    # 1. Based on the Y value of YIQ encoding, representing luminosity, or
+    # perceived brightness.
+  def brightness
+    to_yiq.y
+  end
+  alias to_grayscale brightness
+  alias to_greyscale to_grayscale
 
-    attr_accessor :r, :g, :b
+  attr_accessor :r, :g, :b
 
-    White = RGB.new(255, 255, 255)
-    Black = RGB.new(0, 0, 0)
-  end
+  White = Color::RGB.new(255, 255, 255)
+  Black = Color::RGB.new(0, 0, 0)
 end