pdf-writer 1.1.1 → 1.1.2

data/lib/pdf/writer/graphics.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: graphics.rb,v 1.12 2005/06/28 21:32:17 austin Exp $
+# $Id: graphics.rb,v 1.12.2.1 2005/08/25 03:38:05 austin Exp $
 #++
   # Points for use in the drawing of polygons.
 class PDF::Writer::PolygonPoint
@@ -726,7 +726,7 @@ module PDF::Writer::Graphics
 
     if border
       border = {} if true == border
-      border[:color]  ||= Color::Grey50
+      border[:color]  ||= Color::RGB::Grey50
       border[:style]  ||= PDF::Writer::StrokeStyle::DEFAULT
 
       save_state
@@ -808,6 +808,6 @@ module PDF::Writer::Graphics
     # * Y axis skewing uses [ 1 tan(a) 0 1 0 0 ] where a is the angle,
     #   measured in radians.
   def transform_matrix(a, b, c, d, e, f)
-    add_content("\n%.3f %.3f %.3f %.3f %3.f %.3f cm" % [ a, b, c, d, e, f ])
+    add_content("\n%.3f %.3f %.3f %.3f %.3f %.3f cm" % [ a, b, c, d, e, f ])
   end
 end

data/lib/pdf/writer/lang/en.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: en.rb,v 1.9 2005/06/28 21:32:17 austin Exp $
+# $Id: en.rb,v 1.9.2.1 2005/08/25 03:38:06 austin Exp $
 #++
   # PDF::Writer::Lang::EN is the English-language output module. It contains a
   # hash, @message, that contains the messages that may be reported by any
@@ -44,6 +44,7 @@ code. Please change it.
     :png_unsupp_filter              => "Unsupported PNG filter method.",
     :png_header_missing             => "PNG information header is missing.",
     :png_8bit_colour                => "Only PNG colour depths of 8 bits or less are supported.",
+    :png_interlace                  => "Interlaced PNG images are not currently supported.",
     :png_alpha_trans                => "PNG alpha channel transparency is not supported; only palette transparency is supported.",
     :data_must_be_array             => "The table data is not an Array. (Temporary limitation.)",
     :columns_unspecified            => "Columns are unspecified. They must be data[0] and be an array.",

data/lib/pdf/writer/object/contents.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: contents.rb,v 1.2 2005/05/16 03:59:21 austin Exp $
+# $Id: contents.rb,v 1.2.2.1 2005/08/25 03:38:06 austin Exp $
 #++
   # The contents objects hold all of the content which appears on pages
 class PDF::Writer::Object::Contents < PDF::Writer::Object
@@ -25,7 +25,8 @@ class PDF::Writer::Object::Contents < PDF::Writer::Object
     end
   end
 
-  attr_reader :on_page
+  attr_reader   :on_page
+  attr_accessor :data
 
   def size
     @data.size

data/lib/pdf/writer/object/image.rb

@@ -6,11 +6,150 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: image.rb,v 1.2 2005/05/16 03:59:21 austin Exp $
+# $Id: image.rb,v 1.2.2.1 2005/08/25 03:38:06 austin Exp $
 #++
 require 'pdf/writer/oreader'
 
-  # an image object, will be an XObject in the document, includes description and data
+# An image object. This will be an /XObject dictionary in the document. This
+# includes description and data. The diectionary includes:
+#
+# Type::              (name, Optional) The type of PDF object that this
+#                     dictionary describes; if present, must be /XObject for
+#                     an image XObject.
+# Subtype::           (name, Required) The type of XObject that this
+#                     dictionary describes; must be /Image for an image
+#                     /XObject.
+# Width::             (integer, Required) The width of the image, in samples.
+# Height::            (integer, Required) The height of the image, in samples.
+# ColorSpace::        (name or array, Required for images, except those that
+#                     use the /JPXDecode filter; not allowed for image
+#                     masks) The color space in which image samples are
+#                     specified; it can be any type of color space except
+#                     /Pattern. If the image uses the JPXDecode filter, this
+#                     entry is optional: * If /ColorSpace is present, any
+#                     color space specifications in the JPEG2000 data are
+#                     ignored. * If /ColorSpace is absent, the color space
+#                     specifications in the JPEG2000 data are used. The
+#                     /Decode array is also ignored unless /ImageMask is
+#                     true.
+# BitsPerComponent::  (integer, Required except for image masks and images
+#                     that use the JPXDecode filter) The number of bits used
+#                     to represent each color component. Only a single value
+#                     may be specified; the number of bits is the same for
+#                     all color components. Valid values are 1, 2, 4, 8, and
+#                     (in PDF 1.5) 16. If /ImageMask is true, this entry is
+#                     optional, and if specified, its value must be 1. If
+#                     the image stream uses a filter, the value of
+#                     BitsPerComponent must be consistent with the size of
+#                     the data samples that the filter delivers. In
+#                     particular, a CCITTFaxDecode or JBIG2Decode filter
+#                     always delivers 1-bit samples, a RunLengthDecode or
+#                     DCTDecode filter delivers 8-bit samples, and an
+#                     LZWDecode or FlateDecode filter delivers samples of a
+#                     specified size if a predictor function is used. If the
+#                     image stream uses the JPXDecode filter, this entry is
+#                     optional and ignored if present. The bit depth is
+#                     determined in the process of decoding the JPEG2000
+#                     image.
+# Intent::            (name, Optional; PDF 1.1) The name of a color
+#                     rendering intent to be used in rendering the image
+#                     (see �Rendering Intents� on page 230). Default value:
+#                     the current rendering intent in the graphics state.
+# ImageMask::         (boolean, Optional) A flag indicating whether the
+#                     image is to be treated as an image mask (see Section
+#                     4.8.5, �Masked Images�). If this flag is true, the
+#                     value of /BitsPerComponent must be 1 and Mask and
+#                     /ColorSpace should not be specified; unmasked areas
+#                     are painted using the current nonstroking color.
+#                     Default value: false.
+# Mask::              (stream or array, Optional except for image masks; not
+#                     allowed for image masks; PDF 1.3) An image XObject
+#                     defining an image mask to be applied to this image
+#                     (see �Explicit Masking� on page 321), or an array
+#                     specifying a range of colors to be applied to it as a
+#                     color key mask (see �Color Key Masking� on page 321).
+#                     If ImageMask is true, this entry must not be present.
+#                     (See implementation note 51 in Appendix H.)
+# Decode::            (array, Optional) An array of numbers describing how
+#                     to map image samples into the range of values
+#                     appropriate for the image�s color space (see �Decode
+#                     Arrays� on page 314). If ImageMask is true, the array
+#                     must be either [0 1] or [1 0]; otherwise, its length
+#                     must be twice the number of color components required
+#                     by ColorSpace. If the image uses the JPXDecode filter
+#                     and ImageMask is false, Decode is ignored. Default
+#                     value: see �Decode Arrays� on page 314.
+# Interpolate::       (boolean, Optional) A flag indicating whether image
+#                     interpolation is to be performed (see �Image
+#                     Interpolation� on page 316). Default value: false.
+# Alternates::        (array, Optional; PDF 1.3) An array of alternate image
+#                     dictionaries for this image (see �Alternate Images� on
+#                     page 317). The order of elements within the array has
+#                     no significance. This entry may not be present in an
+#                     image XObject that is itself an alternate image.
+# SMask::             (stream, Optional; PDF 1.4) A subsidiary image XObject
+#                     defining a soft-mask image (see �Soft-Mask Images� on
+#                     page 522) to be used as a source of mask shape or mask
+#                     opacity values in the transparent imaging model. The
+#                     alpha source parameter in the graphics state
+#                     determines whether the mask values are interpreted as
+#                     shape or opacity. If present, this entry overrides the
+#                     current soft mask in the graphics state, as well as
+#                     the image�s Mask entry, if any. (However, the other
+#                     transparency related graphics state parameters�blend
+#                     mode and alpha constant�remain in effect.) If SMask is
+#                     absent, the image has no associated soft mask
+#                     (although the current soft mask in the graphics state
+#                     may still apply).
+# SMaskInData::       (integer, Optional for images that use the JPXDecode
+#                     filter, meaningless otherwise; PDF 1.5) A code
+#                     specifying how soft-mask information (see �Soft-Mask
+#                     Images� on page 522) encoded with image samples should
+#                     be used: (0) If present, encoded soft-mask image
+#                     information should be ignored. (1) The image�s data
+#                     stream includes encoded soft-mask values. An
+#                     application can create a soft-mask image from the
+#                     information to be used as a source of mask shape or
+#                     mask opacity in the transparency imaging model. (2)
+#                     The image�s data stream includes color channels that
+#                     have been preblended with a background; the image data
+#                     also includes an opacity channel. An application can
+#                     create a soft-mask image with a Matte entry from the
+#                     opacity channel information to be used as a source of
+#                     mask shape or mask opacity in the transparency model.
+#                     * If this entry has a nonzero value, SMask should not
+#                     be specified. See also Section 3.3.8, �JPXDecode
+#                     Filter.� Default value: 0.
+# Name::              (name, Required in PDF 1.0; optional otherwise) The
+#                     name by which this image XObject is referenced in the
+#                     XObject subdictionary of the current resource
+#                     dictionary (see Section 3.7.2, �Resource
+#                     Dictionaries�). Note: This entry is obsolescent and
+#                     its use is no longer recommended. (See implementation
+#                     note 52 in Appendix H.)
+# StructParent::      (integer, Required if the image is a structural
+#                     content item; PDF 1.3) The integer key of the image�s
+#                     entry in the structural parent tree (see �Finding
+#                     Structure Elements from Content Items� on page 797).
+# ID::                (string, Optional; PDF 1.3; indirect reference
+#                     preferred) The digital identifier of the image�s
+#                     parent Web Capture content set (see Section 10.9.5,
+#                     �Object Attributes Related to Web Capture�).
+# OPI::               (dictionary, Optional; PDF 1.2) An OPI version
+#                     dictionary for the image (see Section 10.10.6, �Open
+#                     Prepress Interface (OPI)�). If ImageMask is true, this
+#                     entry is ignored.
+# Metadata::          (stream, Optional; PDF 1.4) A metadata stream
+#                     containing metadata for the image (see Section 10.2.2,
+#                     �Metadata Streams�).
+# OC::                (dictionary, Optional; PDF 1.5) An optional content
+#                     group or optional content membership dictionary (see
+#                     Section 4.10, �Optional Content�), specifying the
+#                     optional content properties for this image XObject.
+#                     Before the image is processed, its visibility is
+#                     determined based on this entry. If it is determined to
+#                     be invisible, the entire image is skipped, as if there
+#                     were no Do operator to invoke it.
 class PDF::Writer::External::Image < PDF::Writer::External
   attr_reader :label
   attr_reader :image_info
@@ -46,11 +185,11 @@ class PDF::Writer::External::Image < PDF::Writer::External
       @info['BitsPerComponent'] = 8
     when "PNG"
       if image.info[:compression_method] != 0
-        raise TypeError, PDF::Writer::Message[:png_unsupp_compres]
+        raise TypeError, PDF::Writer::Lang[:png_unsupp_compres]
       end
 
       if image.info[:filter_method] != 0
-        raise TypeError, PDF::Writer::Message[:png_unsupp_filter]
+        raise TypeError, PDF::Writer::Lang[:png_unsupp_filter]
       end
 
       data = data.dup
@@ -88,7 +227,7 @@ class PDF::Writer::External::Image < PDF::Writer::External
               # Grey is two bytes, range 0 .. (2 ^ bit-depth) - 1
             trans[:grayscale] = data.read_o(2).unpack("n")
             trans[:type]      = 'indexed'
-            trans[:data]      = data.read_o.unpack("C")
+#           trans[:data]      = data.read_o.unpack("C")
           when 2
               # True colour with proper alpha channel.
             trans[:rgb] = data.read_o(6).unpack("nnn")
@@ -97,16 +236,16 @@ class PDF::Writer::External::Image < PDF::Writer::External
           data.offset += chunk_size
         end
 
-        ok = section != "IEND"
+        ok = (section != "IEND")
 
         data.read_o(4)  # Skip the CRC
       end
 
       if image.bits > 8
-        raise TypeError, PDF::Writer::Message[:png_8bit_colour]
+        raise TypeError, PDF::Writer::Lang[:png_8bit_colour]
       end
       if image.info[:interlace_method] != 0
-        raise TypeError, PDF::Writer::Message[:png_interlace]
+        raise TypeError, PDF::Writer::Lang[:png_interlace]
       end
 
       ncolor  = 1
@@ -119,7 +258,7 @@ class PDF::Writer::External::Image < PDF::Writer::External
       when 0
         colour = 'DeviceGray'
       else
-        raise TypeError, PDF::Writer::Message[:png_alpha_trans]
+        raise TypeError, PDF::Writer::Lang[:png_alpha_trans]
       end
 
       @info['Filter'] = '[/FlateDecode]'
@@ -128,7 +267,8 @@ class PDF::Writer::External::Image < PDF::Writer::External
 
       unless palette.empty?
         @info['ColorSpace']  = " [ /Indexed /DeviceRGB #{(palette.size / 3) - 1} "
-        contents            = PDF::Writer::Contents.new
+        contents            = PDF::Writer::Object::Contents.new(parent,
+                                                                self)
         contents.data       = palette
         @info['ColorSpace'] << "#{contents.oid} 0 R ]"
 

data/manual.pwd

@@ -98,7 +98,7 @@
 # Use .eval to do encoding configuration.
 .eval {{{
 pdf.techbook_encoding  = {
-  :encoding     => 'WinAnsiEncoding',
+  :encoding     => "WinAnsiEncoding",
   :differences  => {
     169 => "copyright",
     215 => "multiply",
@@ -111,7 +111,7 @@ pdf.select_font     "Helvetica", pdf.techbook_encoding
   # Put a heading on all pages.
 pdf.open_object do |heading|
   pdf.save_state
-  pdf.stroke_color! Color::Black
+  pdf.stroke_color! Color::RGB::Black
   pdf.stroke_style! PDF::Writer::StrokeStyle::DEFAULT
 
   s = 6
@@ -134,7 +134,7 @@ end
   # Put a footing on all pages.
 pdf.open_object do |footing|
   pdf.save_state
-  pdf.stroke_color! Color::Black
+  pdf.stroke_color! Color::RGB::Black
   pdf.stroke_style! PDF::Writer::StrokeStyle::DEFAULT
 
   s = 6
@@ -172,11 +172,11 @@ size  = 72
 fh    = pdf.font_height(size) * 1.01
 fd    = pdf.font_descender(size) * 1.01
 pdf.save_state
-pdf.fill_color    Color::Red
-pdf.stroke_color  Color::Red 
+pdf.fill_color    Color::RGB::Red
+pdf.stroke_color  Color::RGB::Red 
 pdf.rectangle(pdf.absolute_left_margin, 0, fh, pdf.page_height).fill
-pdf.fill_color    Color::White
-pdf.stroke_color  Color::White
+pdf.fill_color    Color::RGB::White
+pdf.stroke_color  Color::RGB::White
 pdf.add_text(pdf.absolute_left_margin + fh + fd, 70, title, size, 90)
 pdf.restore_state
 
@@ -199,12 +199,15 @@ Copyright
 INFO
 
 pdf.text(info, :font_size => 18, :justification => :right)
-pdf.open_here('Fit')
+pdf.open_here("Fit")
 
-pdf.start_page_numbering(pnx, pny, 6, :right, "<PAGENUM>", 1)
 pdf.techbook_fontsize = 12
 .endeval }}}
 .newpage
+.eval {{{
+pnx = pdf.absolute_right_margin
+pdf.start_page_numbering(pnx, 36, 6, :right, "<PAGENUM>", 1)
+.endeval }}}
 # The main document.
 1<Introduction to PDF::Writer for Ruby>Introduction
 
@@ -264,7 +267,7 @@ centered at the top of the page in 72-point (1
 
 .code {{{
   # This code is demo/hello.rb
-require 'pdf/writer'
+require "pdf/writer"
 
 pdf = PDF::Writer.new
 pdf.select_font "Times-Roman"
@@ -278,7 +281,7 @@ that the images are JPEG and PNG
 
 .code {{{
   # This code is demo/chunkybacon.rb
-require 'pdf/writer'
+require "pdf/writer"
 
 pdf = PDF::Writer.new
 pdf.select_font "Times-Roman"
@@ -529,13 +532,13 @@ pdf.select_font("Times-Roman", { :encoding =&gt; "MacExpertEncoding" })
   # Set up the Helvetica font for use with German characters as an offset
   # of the WinAnsiEncoding.
 diff= {
-  196 =&gt; 'Adieresis',
-  228 =&gt; 'adieresis',
-  214 =&gt; 'Odieresis',
-  246 =&gt; 'odieresis',
-  220 =&gt; 'Udieresis',
-  252 =&gt; 'udieresis',
-  223 =&gt; 'germandbls'
+  196 =&gt; "Adieresis",
+  228 =&gt; "adieresis",
+  214 =&gt; "Odieresis",
+  246 =&gt; "odieresis",
+  220 =&gt; "Udieresis",
+  252 =&gt; "udieresis",
+  223 =&gt; "germandbls"
 }
 pdf.select_font("Helvetica", { :encoding =&gt; "WinAnsiEncoding", :differences => diff })
 .endcode }}}
@@ -558,10 +561,10 @@ pdf = PDF::Writer.new
   # different font than "ib" (&lt;i&gt;&lt;b&gt;).
 pdf.font_families["Helvetica"] =
 {
-  "b"   =&gt; 'Helvetica-Bold',
-  "i"   =&gt; 'Helvetica-Oblique',
-  "bi"  =&gt; 'Helvetica-BoldOblique',
-  "ib"  =&gt; 'Helvetica-BoldOblique'
+  "b"   =&gt; "Helvetica-Bold",
+  "i"   =&gt; "Helvetica-Oblique",
+  "bi"  =&gt; "Helvetica-BoldOblique",
+  "ib"  =&gt; "Helvetica-BoldOblique"
 }
 .endcode }}}
 
@@ -624,7 +627,7 @@ built-in fonts as well).
 
 .code {{{
 encoding = {
-  :encoding     =&gt; 'WinAnsiEncoding',
+  :encoding     =&gt; "WinAnsiEncoding",
   :differences  =&gt; {
     215 =&gt; "multiply",
     148 =&gt; "copyright",
@@ -687,7 +690,7 @@ are standard US Letter (8
 named parameters, <b>:paper</b>, <b>:version</b>, and <b>:orientation</b>.
 
 .code {{{
-require 'pdf/writer'
+require "pdf/writer"
 
   # US Letter, portrait, 1.3
 PDF::Writer.new
@@ -806,7 +809,7 @@ points).
 Prepress marks will appear on all pages.
 
 .code {{{
-require 'pdf/writer'
+require "pdf/writer"
 
 PDF::Writer.prepress # US Letter, portrait, 1.3, prepress
 .endcode }}}
@@ -1119,7 +1122,7 @@ encountered.
 The example below is the �bullet� tag from PDF::Writer.
 .code {{{
 class TagBullet
-  DEFAULT_COLOR = Color::Black
+  DEFAULT_COLOR = Color::RGB::Black
 
   class << self
     attr_accessor :color
@@ -1274,8 +1277,8 @@ The callback object is <b>PDF::Writer::TagAlink</b>. The display style of
 linking and link underlining may be modified through
 <b>TagAlink.style</b>, which is a hash of five keys:
 .blist {{{
-<b>:color</b> is colour of the link underline. The default is Color::Blue. If nil, the current stroke colour will be maintained.
-<b>:text_color</b> is the colour of the text. The default is Color::Blue. If nil, the current fill colour will be maintained.
+<b>:color</b> is colour of the link underline. The default is Color::RGB::Blue. If nil, the current stroke colour will be maintained.
+<b>:text_color</b> is the colour of the text. The default is Color::RGB::Blue. If nil, the current fill colour will be maintained.
 <b>:factor</b> is the size of the line, as a multiplier of the text height. The default is 5% of the line height (0.05).
 <b>:line_style</b> is a style modification hash provided to PDF::Writer::StrokeStyle.new. The default is a solid line with normal cap, join, and miter limit values. See �<r:xref name="StrokeStyleClass" label="title" />� for more information.
 <b>:draw_line</b> indicates whether the underline should be drawn or not.
@@ -1321,14 +1324,14 @@ linking and link underlining may be modified through
 The &lt;C:bullet&gt; tag inserts a solid circular bullet, like this:
 � <C:bullet />�. Bullets are implemented in <b>PDF::Writer::TagBullet</b>. The
 bullet display colour may be modified through <b>TagBullet.color</b>, which
-defaults to <b>Color::Black</b>.
+defaults to <b>Color::RGB::Black</b>.
 
 5<&lt;C:disc&gt;>
 The &lt;C:disc&gt; tag inserts a hollow circular bullet, like this: � <C:disc
 />�. Bullets are implemented in <b>PDF::Writer::TagDisc</b>. The disc display
 colours may be modified throguh <b>TagDisc.foreground</b> and
-<b>TagDisc.background</b>, which default to <b>Color::Black</b> and
-<b>Color::White</b>, respectively.
+<b>TagDisc.background</b>, which default to <b>Color::RGB::Black</b> and
+<b>Color::RGB::White</b>, respectively.
 
 5<&lt;C:tocdots ...&gt;>
 This is a stand-alone callback that draws a dotted line over to the right and
@@ -1677,8 +1680,8 @@ Returns <b>true</b> if columns are turned on.
 2<Page Numbering>PageNumbering
 PDF::Writer supports automatic page numbering. The current page numbering
 system does not support anything except standard Arabic numbering (e.g., 1,
-2, 3). <b>The page numbering mechanism will be changing in a later version of
-PDF::Writer to be far more flexible.</b>
+2, 3). <b>The page numbering mechanism will be changing in a future version
+of PDF::Writer to be far more flexible.</b>
 
 4<PDF::Writer#start_page_numbering(x, y, size, pos = nil, pattern = nil, starting = nil)>
 Prepares the placement of page numbers on pages from the current page. Place
@@ -1705,8 +1708,8 @@ page (labelled
 pdf = PDF::Writer.new
 pdf.select_font "Helvetica"
                     # page  1, blank
-pdf.start_page_numbering(300, 500, 20, nil, nil, 1)
 pdf.start_new_page  # page  2, 1 of 9
+pdf.start_page_numbering(300, 500, 20, nil, nil, 1)
 pdf.start_new_page  # page  3, 2 of 9
 pdf.start_new_page  # page  4, 3 of 9
 pdf.start_new_page  # page  5, 4 of 9
@@ -2013,12 +2016,12 @@ y = pdf.y + 90
 
 pdf.select_font "Times-Roman"
 
-pdf.fill_color    Color::Grey70
-pdf.stroke_color! Color::Black
+pdf.fill_color    Color::RGB::Grey70
+pdf.stroke_color! Color::RGB::Black
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
 pdf.rectangle(pdf.absolute_left_margin, y + 64, pdf.margin_width, -100).fill_stroke
 
-pdf.fill_color    Color::Black
+pdf.fill_color    Color::RGB::Black
 
 (0..7).each do |style|
   pdf.add_text(pdf.absolute_left_margin + 20 + (60 * style), y + 48,
@@ -2412,7 +2415,7 @@ pdf.line(100, pdf.y - 5, 400, pdf.y + 5)
 .eval {{{
 pdf.move_pointer(20, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.line(100, pdf.y - 15, 400, pdf.y - 5).stroke
 .endeval }}}
 
@@ -2428,7 +2431,7 @@ pdf.curve(100, pdf.y - 5, 200, pdf.y + 5, 300, pdf.y - 5, 400, pdf.y + 5
 .eval {{{
 pdf.move_pointer(20, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.curve(100, pdf.y - 15, 200, pdf.y - 5, 300, pdf.y - 15, 400, pdf.y - 5)
 pdf.stroke
 .endeval }}}
@@ -2445,7 +2448,7 @@ pdf.scurve(100, pdf.y - 5, 300, pdf.y + 5, 400, pdf.y - 5)
 .eval {{{
 pdf.move_pointer(20, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.scurve(100, pdf.y - 15, 300, pdf.y - 5, 400, pdf.y - 15).stroke
 .endeval }}}
 
@@ -2461,7 +2464,7 @@ pdf.ecurve(100, pdf.y - 5, 200, pdf.y + 5, 400, pdf.y - 5)
 .eval {{{
 pdf.move_pointer(20, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.ecurve(100, pdf.y - 15, 200, pdf.y - 5, 400, pdf.y - 15)
 pdf.stroke
 .endeval }}}
@@ -2476,7 +2479,7 @@ pdf.circle_at(250, pdf.y, 10)
 .eval {{{
 pdf.move_pointer(30, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.circle_at(250, pdf.y + 15, 10)
 pdf.stroke
 .endeval }}}
@@ -2492,7 +2495,7 @@ pdf.ellipse_at(250, pdf.y, 20, 10)
 .eval {{{
 pdf.move_pointer(30, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.ellipse_at(250, pdf.y + 15, 20, 10)
 pdf.stroke
 .endeval }}}
@@ -2512,7 +2515,7 @@ pdf.ellipse2_at(250, pdf.y, 20, 10)
 .eval {{{
 pdf.move_pointer(30, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.ellipse2_at(250, pdf.y + 15, 20, 10).stroke
 .endeval }}}
 
@@ -2522,7 +2525,7 @@ pdf.ellipse2_at(250, pdf.y, 20, 10, 135, -45)
 .eval {{{
 pdf.move_pointer(30, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.ellipse2_at(250, pdf.y + 15, 20, 10, 135, -45).stroke
 .endeval }}}
 
@@ -2531,11 +2534,11 @@ ss = PDF::Writer::StrokeStyle.new(2)
 ss.cap = :round
 
 pdf.stroke_style  ss
-pdf.fill_color! Color::BlueViolet
+pdf.fill_color! Color::RGB::BlueViolet
 pdf.translate_axis(300, pdf.y + 25)
 pdf.circle_at(0, 0, 38).fill
 pdf.rotate_axis(10)
-pdf.stroke_color! Color::Grey30
+pdf.stroke_color! Color::RGB::Grey30
 pdf.ellipse2_at(0, 0, 81, 20, 65.5, -245.5).stroke
 pdf.ellipse2_at(0, 0, 85, 22, 67.5, -247.5).stroke
 pdf.ellipse2_at(0, 0, 89, 25, 70.5, -250.5).stroke
@@ -2547,11 +2550,11 @@ ss = PDF::Writer::StrokeStyle.new(2)
 ss.cap = :round
 
 pdf.stroke_style  ss
-pdf.fill_color! Color::BlueViolet
+pdf.fill_color! Color::RGB::BlueViolet
 pdf.translate_axis(300, pdf.y + 25)
 pdf.circle_at(0, 0, 38).fill
 pdf.rotate_axis(10)
-pdf.stroke_color! Color::Grey30
+pdf.stroke_color! Color::RGB::Grey30
 pdf.ellipse2_at(0, 0, 81, 20, 65.5, -245.5).stroke
 pdf.ellipse2_at(0, 0, 85, 22, 67.5, -247.5).stroke
 pdf.ellipse2_at(0, 0, 89, 25, 70.5, -250.5).stroke
@@ -2568,7 +2571,7 @@ pdf.segment_at(250, pdf.y, 20, 10, 45, -45)
 .eval {{{
 pdf.move_pointer(30, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.segment_at(250, pdf.y + 15, 20, 10, 45, -45)
 pdf.stroke
 .endeval }}}
@@ -2676,7 +2679,7 @@ pdf.rounded_rectangle(100, pdf.y, 300, 30, 5)
 .eval {{{
 pdf.move_pointer(40, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.rounded_rectangle(100, pdf.y + 35, 100, 30, 10)
 pdf.stroke
 pdf.move_pointer(5, true)
@@ -2699,7 +2702,7 @@ pdf.star(430, pdf.y, 20, 8).stroke
 .eval {{{
 pdf.move_pointer(40, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 pdf.star(166, pdf.y + 15, 20, 4).stroke
 pdf.star(232, pdf.y + 15, 20, 5).stroke
 pdf.star(298, pdf.y + 15, 20, 6).stroke
@@ -2781,7 +2784,7 @@ winding number fill rule, it is hollow.
 .eval {{{
 pdf.move_pointer(60, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 y0 = pdf.y + 50 # top
 y1 = y0 - 10    # top-middle
 y2 = y1 - 20    # bottom-middle
@@ -2816,7 +2819,7 @@ filled using the even-odd rule. They appear the same.
 .eval {{{
 pdf.move_pointer(60, true)
 pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
-pdf.stroke_color  Color::Black
+pdf.stroke_color  Color::RGB::Black
 y0 = pdf.y + 50 # top
 y1 = y0 - 10    # top-middle
 y2 = y1 - 20    # bottom-middle
@@ -3556,13 +3559,13 @@ The font size of the heading cells, in points. Defaults to 12 points.
 The font size of the #title, in points. Defaults to 12 points.
 
 4<SimpleTable#title_color, SimpleTable#title_color=>
-The text colour of the #title. Defaults to Color::Black.
+The text colour of the #title. Defaults to Color::RGB::Black.
 
 4<SimpleTable#heading_color, SimpleTable#heading_color=>
-The text colour of the heading. Defaults to Color::Black.
+The text colour of the heading. Defaults to Color::RGB::Black.
 
 4<SimpleTable#text_color, SimpleTable#text_color=>
-The text colour of the body cells. Defaults to Color::Black.
+The text colour of the body cells. Defaults to Color::RGB::Black.
 
 4<SimpleTable#bold_headings, SimpleTable#bold_headings=>
 Makes the heading text bold if <b>true</b>. The default is <b>false</b>.
@@ -3599,16 +3602,16 @@ colour.
 4<SimpleTable#shade_color2, SimpleTable#shade_color2=>
 
 The main and alternate shading colours. #shade_color defaults to
-Color::Grey80; #shade_color2 defaults to Color::Grey70.
+Color::RGB::Grey80; #shade_color2 defaults to Color::RGB::Grey70.
 
 4<SimpleTable#shade_headings, SimpleTable#shade_headings=>
 4<SimpleTable#shade_heading_color, SimpleTable#shade_heading_color=>
 If #shade_headings is <b>true</b>, heading rows will be shaded with the value
-of #shade_heading_color (Color::Grey90 by default). Headings are not shaded
-by default.
+of #shade_heading_color (Color::RGB::Grey90 by default). Headings are not
+shaded by default.
 
 4<SimpleTable#line_color, SimpleTable#line_color=>
-The colour of table lines, defaultting to Color::Black.
+The colour of table lines, defaultting to Color::RGB::Black.
 
 4<SimpleTable#inner_line_style, SimpleTable#inner_line_style=>
 4<SimpleTable#outer_line_style, SimpleTable#outer_line_style=>
@@ -4099,7 +4102,7 @@ PDF::Charts::StdDev::Scale.new do |scale|
   scale.show_labels         = false
   PDF::Charts::StdDev::Label.new do |label|
     label.text_size         = 8
-    label.text_color        = Color::Black
+    label.text_color        = Color::RGB::Black
     label.pad               = 2
     label.decimal_precision = 1
     scale.label             = label
@@ -4133,8 +4136,8 @@ StdDev::Label object.
   # This is the default chart label style.
 Label.new do |label|
   label.height            = 25
-  label.background_color  = Color::Black
-  label.text_color        = Color::White
+  label.background_color  = Color::RGB::Black
+  label.text_color        = Color::RGB::White
   label.text_size         = 12
   chart.label = label
 end
@@ -4149,7 +4152,7 @@ drawn. If set, they must be PDF::Charts::StdDev::Marker objects.
   # These are the defaults.
 PDF::Charts::StdDev::Marker.new do |marker|
   marker.style        = PDF::Writer::StrokeStyle.new(1.5)
-  marker.color        = Color::Black
+  marker.color        = Color::RGB::Black
   chart.outer_borders = marker
 end
 chart.inner_borders = nil
@@ -4173,22 +4176,22 @@ as it is thick.
   # These are the defaults.
 PDF::Charts::StdDev::Marker.new do |marker|
   marker.style  = PDF::Writer::StrokeStyle.new(5)
-  marker.color  = Color::Black
+  marker.color  = Color::RGB::Black
   chart.dot     = marker
 end
 PDF::Charts::StdDev::Marker.new do |marker|
   marker.style  = PDF::Writer::StrokeStyle.new(0.5)
-  marker.color  = Color::Black
+  marker.color  = Color::RGB::Black
   chart.bar     = marker
 end
 PDF::Charts::StdDev::Marker.new do |marker|
   marker.style          = PDF::Writer::StrokeStyle.new(1)
-  marker.color          = Color::Black
+  marker.color          = Color::RGB::Black
   chart.upper_crossbar  = marker
 end
 PDF::Charts::StdDev::Marker.new do |marker|
   marker.style          = PDF::Writer::StrokeStyle.new(1)
-  marker.color          = Color::Black
+  marker.color          = Color::RGB::Black
   chart.lower_crossbar  = marker
 end
 .endcode }}}
@@ -4351,13 +4354,13 @@ pdf.move_pointer(150, true)
 _y = pdf.y + 140
 
 pdf.save_state
-pdf.stroke_color! Color::Black
+pdf.stroke_color! Color::RGB::Black
 pdf.stroke_style! PDF::Writer::StrokeStyle::DEFAULT
 
 pdf.rectangle(100, _y, 75, -50).line(125, _y, 125, _y - 50)
 pdf.line(150, _y, 150, _y - 50).stroke
 
-pdf.fill_color  Color::Grey60
+pdf.fill_color  Color::RGB::Grey60
 pdf.add_text(105, _y - 36, "1", 36)
 pdf.add_text(130, _y - 36, "2", 36)
 pdf.add_text(155, _y - 36, "3", 36)
@@ -4365,12 +4368,12 @@ pdf.add_text(155, _y - 36, "3", 36)
 pdf.rectangle(215, _y - 15, 25, -50).stroke
 pdf.add_text(220, _y - 51, "3", 36)
 pdf.line(225, _y, 215, _y - 15).line(225, _y - 50, 215, _y - 65).stroke
-pdf.fill_color  Color::White
+pdf.fill_color  Color::RGB::White
 pdf.rectangle(200, _y, 25, -50).fill_stroke
-pdf.fill_color  Color::Grey60
+pdf.fill_color  Color::RGB::Grey60
 pdf.add_text(205, _y - 36, "1", 36)
 
-pdf.fill_color  Color::Black
+pdf.fill_color  Color::RGB::Black
 pdf.line(200, _y + 5, 225, _y + 5).stroke
 pdf.move_to(227, _y + 5).line_to(220, _y + 7.5).line_to(220, _y + 2.5)
 pdf.close_fill
@@ -4402,12 +4405,12 @@ pdf.move_pointer(150, true)
 _y = pdf.y + 140
 pdf.save_state
 
-pdf.stroke_color! Color::Black
+pdf.stroke_color! Color::RGB::Black
 pdf.stroke_style! PDF::Writer::StrokeStyle::DEFAULT
 pdf.rectangle(100, _y, 75, -50).line(125, _y, 125, _y - 50)
 pdf.line(150, _y, 150, _y - 50).stroke
 
-pdf.fill_color  Color::Grey60
+pdf.fill_color  Color::RGB::Grey60
 pdf.add_text(103, _y - 36, "1", 36)
 pdf.add_text(128, _y - 36, "2", 36)
 pdf.add_text(153, _y - 36, "3", 36)
@@ -4420,7 +4423,7 @@ pdf.line(255, _y - 40, 250, _y - 50).stroke
 pdf.add_text(228, _y - 36, "2", 36)
 
 pdf.save_state
-pdf.fill_color  Color::Black
+pdf.fill_color  Color::RGB::Black
 pdf.line(250, _y - 60, 275, _y - 60).stroke
 pdf.move_to(248, _y - 60).line_to(255, _y - 57.5).line_to(255, _y - 62.5)
 pdf.close_fill
@@ -4432,7 +4435,7 @@ pdf.line(320, _y - 40, 325, _y - 50).stroke
 pdf.add_text(328, _y - 36, "4", 36)
 pdf.save_state
 pdf.line(300, _y - 60, 325, _y - 60).stroke
-pdf.fill_color  Color::Black
+pdf.fill_color  Color::RGB::Black
 pdf.move_to(327, _y - 60).line_to(320, _y - 57.5).line_to(320, _y - 62.5)
 pdf.close_fill
 pdf.restore_state
@@ -4541,7 +4544,7 @@ platform dependent). The text will be placed with full justification.
 3<QuickRef#pre(text)>
 Writes code text. Newlines and spaces will be preserved.
 
-3<QuickRef#hline(style = PDF::Writer::StrokeStyle::DEFAULT, color = Color::Black)>
+3<QuickRef#hline(style = PDF::Writer::StrokeStyle::DEFAULT, color = Color::RGB::Black)>
 Draws a horizontal line with the specified style and colour across the width
 of the column.
 
@@ -5089,18 +5092,27 @@ must be understood. Transaction::Simple:
 2<color-tools>ColorTools
 The color-tools package was created to abstract out the colour needs for
 PDF::Writer and make them available for other uses as well (such as web
-pages). There are five main components to color-tools in the current version:
+pages). There are several main components to color-tools in version 1.3.0:
 .blist {{{
 Named colours: more than 150 named RGB colours so that the exact colour representation does not need to be remembered.
 Color::RGB: a colour class that encapsulates operations on RGB (red, green, blue) colours.
 Color::CMYK: a colour class that encapsulates operations on CMYK (cyan, magenta, yellow, black) colours, mostly used for printing.
+Color::GrayScale: a colour class that encapsulates operations on greyscale colours, mostly used for PDF operations.
+Color::YIQ: a colour class that encapsulates the NTSC/YIQ video colour space.
+Color::HSL: a colour class that encapsulates the HSL (hue, saturation, luminance) colour space.
 Color::Palette::MonoContrast: an RGB colour palette generator.
-Color::Palette::GIMP: a class to read GIMP (GNU Image Manipulation Program) colour palettes and make them available for access.
+Color::Palette::Gimp: a class to read Gimp (GNU Image Manipulation Program) colour palettes and make them available for access.
+Color::CSS: An interface for interpreting named CSS3 colours.
 .endblist }}}
 
 3<Named Colors>
-There are more than 150 named colours available in the Color namespace. The
-demo program demo/colornames.rb illustrates these colours.
+There are more than 150 named colours available in the Color::RGB and
+Color::RGB::Metallic namespaces. The demo program demo/colornames.rb shows
+these colours. The colours in Color::RGB used to be part of the Color
+namespace. If a colour like Color::Black is used, there will be a single
+warning printed. Future versions of color-tools will see a warning printed on
+every use (1.4.x) and ultimately the constants will be completely removed
+(1.5.x or 2.x).
 
 3<Color::RGB>
 This class encapsulates RGB colours and offers some operations on them. Other
@@ -5139,9 +5151,18 @@ fed     = Color::RGB.from_html("fed")
 cabbed  = Color::RGB.from_html("#cabbed;")
 .endcode }}}
 
+4<Color::RGB#==(other)>
+Compares the other colour to this one. The other colour will be converted to
+RGB before comparison, so the comparison between a RGB colour and a non-RGB
+colour will be approximate and based on the other colour�s default #to_rgb
+conversion. If there is no #to_rgb conversion, this will raise an exception.
+This will report that two RGB colours are equivalent if all component values
+are within 1e-4 (0.0001) of each other.
+
 4<Color::RGB#pdf_fill>
 4<Color::RGB#pdf_stroke>
-Renders the colour as a string suitable for PDF colour changes.
+Renders the colour as a string suitable for PDF colour changes. These two
+methods will be removed from the color-tools base package in version 2.0.
 .code {{{
 cabbed.pdf_fill
 blue.pdf_stroke
@@ -5161,17 +5182,56 @@ experts strongly suggest that this is a <b>bad</b> idea. CMYK colours
 represent percentages of inks on paper, not mixed colour intensities like
 RGB. The CMYK versions of RGB colours will usually be darker than the
 original RGB.
+
 .code {{{
 cabbed.to_cmyk
 .endcode }}}
 
+The method used is as follows:
+
+5<1. RGB-&lt;CMY>
+Convert the R, G, and B components to C, M, and Y components.
+.code {{{
+    c = 1.0 � r
+    m = 1.0 � g
+    y = 1.0 � b
+.endcode }}}
+
+5<2. Minimum Black Calculation>
+Compute the minimum amount of black (K) required to smooth the colour in
+inks.
+.code {{{
+    k = min(c, m, y)
+.endcode }}}
+
+5<3. Undercolour Removal>
+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.
+.code {{{
+    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)))
+.endcode }}}
+
+The undercolour removal function and the black generation functions return a
+value based on the brightness of the RGB colour.
+
+4<Color::RGB#to_rgb(ignored = nil)>
+Returns the existing colour object.
+
+4<Color::RGB#to_hsl>
+Converts the colour to the HSL colour space.
+
 4<Color::RGB#lighten_by(percent)>
-Lightens the RGB hue by the stated percent by mixing the current colour with
-White at the desired opacity.
+Mix the RGB hue with White so that the RGB hue is the specified percentage of
+the resulting colour. Strictly speaking, this isn�t a lighten_by operation.
 
 4<Color::RGB#darken_by(percent)>
-Darkens the RGB hue by the stated percent by mixing the current colour with
-Black at the desired opacity.
+Mix the RGB hue with Black so that the RGB hue is the specified percentage of
+the resulting colour. Strictly speaking, this isn�t a darken_by operation.
 
 4<Color::RGB#mix_with(mask, opacity)>
 Mixes the mask colour (which must be an RGB object) with the current colour
@@ -5187,10 +5247,42 @@ keys of :y, :i, and :q.
 Returns the perceived brightness value for a colour on a scale of 0 .. 1.
 This is based on the Y (luminosity) value of YIQ colour encoding.
 
+4<Color::RGB#to_grayscale>
+4<Color::RGB#to_greyscale>
+Converts the color to a GrayScale colour based on the HSL luminance.
+
+4<Color::RGB#adjust_brightness(percent)>
+Returns a new colour with the brightness adjusted by the specified
+percentage. Negative percentages will darken the colour; positive percentages
+will brighten the colour.
+.code {{{
+  Color::RGB::DarkBlue.adjust_brightness(10)
+  Color::RGB::DarkBlue.adjust_brightness(-10)
+.endcode }}}
+
+4<Color::RGB#adjust_saturation(percent)>
+Returns a new colour with the saturation adjusted by the specified
+percentage. Negative percentages will reduce the saturation; positive
+percentages will increase the saturation.
+.code {{{
+  Color::RGB::DarkBlue.adjust_saturation(10)
+  Color::RGB::DarkBlue.adjust_saturation(-10)
+.endcode }}}
+
+4<Color::RGB#adjust_hue(percent)>
+Returns a new colour with the hue adjusted by the specified percentage.
+Negative percentages will reduce the hue; positive percentages will increase
+the hue.
+.code {{{
+  Color::RGB::DarkBlue.adjust_hue(10)
+  Color::RGB::DarkBlue.adjust_hue(-10)
+.endcode }}}
+
 4<Color::RGB#r, Color::RGB#r=>
 4<Color::RGB#g, Color::RGB#g=>
 4<Color::RGB#b, Color::RGB#b=>
-Read and set the independent components of the RGB colour.
+Read and set the independent components of the RGB colour. The colour values
+will be in the range (0..1).
 
 3<Color::CMYK>
 This class encapsulates CMYK colours and offers some operations on them.
@@ -5203,31 +5295,256 @@ black = Color::CMYK.new(0, 0, 0, 100)
 .endcode }}}
 
 4<Color::CMYK.from_fraction(c = 0, m = 0, y = 0, k = 0)>
-Creates a CMYK colour object from fractional values.
+Creates a CMYK colour object from fractional values (0..1).
 .code {{{
 black = Color::CMYK.new(0, 0, 0, 1)
 .endcode }}}
 
+4<Color::CMYK#==(other)>
+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.
+This will report that two CMYK colours are equivalent if all component values
+are within 1e-4 (0.0001) of each other.
+
 4<Color::CMYK#pdf_fill>
 4<Color::CMYK#pdf_stroke>
-Renders the colour as a string suitable for PDF colour changes.
+Renders the colour as a string suitable for PDF colour changes. These two
+methods will be removed from the color-tools base package in version 2.0.
 .code {{{
 black.pdf_fill
 black.pdf_stroke
 .endcode }}}
 
 4<Color::CMYK#html>
-Presents the colour as a converted RGB HTML and CSS colour string.
+Present the colour as an RGB HTML/CSS colour string. Note that this will
+perform a #to_rgb operation using the default conversion formula.
+
+4<Color::CMYK#to_rgb(use_adobe_method = false)>
+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.
+
+.code {{{
+    # 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)
+.endcode }}}
 
-4<Color::CMYK#to_rgb>
-Converts the CMYK colour to RGB. See the notes about Color::RGB#to_cmyk for
-cautions.
+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 <b>true</b> to #to_rgb.
+
+Future versions of color-tools may offer other conversion mechanisms that
+offer greater colour fidelity.
+
+4<Color::CMYK#to_grayscale>
+4<Color::CMYK#to_greyscale>
+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:
+
+.code {{{
+  g = 1.0 - min(1.0, 0.299 * c + 0.587 * m + 0.114 * y + k)
+.endcode }}}
+
+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).
+
+4<Color::CMYK#to_cmyk>
+Returns the current CMYK colour object.
+
+4<Color::CMYK#to_yiq>
+4<Color::CMYK#to_hsl>
+Converts to RGB and then HSL. Uses only the default RGB conversion method.
 
 4<Color::CMYK#c, Color::CMYK#c=>
 4<Color::CMYK#m, Color::CMYK#m=>
 4<Color::CMYK#y, Color::CMYK#y=>
 4<Color::CMYK#k, Color::CMYK#k=>
-Read and set the independent components of the CMYK colour.
+Read and set the independent components of the CMYK colour. The colour values
+will be in the range (0..1).
+
+3<Color::GrayScale>
+Also know as Color::GreyScale, this is to provide colours representing
+continuous shades of grey.
+
+4<Color::GrayScale.from_fraction(g = 0)>
+Creates a greyscale colour object from fractional (0..1).
+.code {{{
+    Color::GreyScale.from_fraction(0.5)
+.endcode }}}
+
+4<Color::GrayScale.new(g = 0)
+Creates a greyscale colour object from percentages (0..100).
+.code {{{
+    Color::GrayScale.new(50)
+.endcode }}}
+
+4<Color::GrayScale#==(other)>
+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. This will report that two GreyScale values are equivalent
+if they are within 1e-4 (0.0001) of each other.
+
+4<Color::GrayScale#pdf_fill>
+4<Color::GrayScale#pdf_stroke>
+Present the colour as a string suitable for PDF colour changes with
+DeviceGray. These two methods will be removed from the color-tools base
+package in version 2.0.
+
+4<Color::GrayScale#html>
+Presents the colour as an RGB HTML/CSS colour string.
+
+4<Color::GrayScale#to_cmyk>
+Convert the greyscale colour to CMYK.
+
+4<Color::GrayScale#to_rgb(ignored = true)>
+Convert the greyscale colour to RGB.
+
+4<Color::GrayScale#to_grayscale>
+4<Color::GrayScale#to_greyscale>
+Returns the current greyscale colour object.
+
+4<Color::GrayScale#lighten_by>
+Lightens the greyscale colour by the stated percent.
+
+4<Color::GrayScale#darken_by>
+Darkens the greyscale colour by the stated percent.
+
+4<Color::GrayScale#to_yiq>
+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.
+
+4<Color::GrayScale#to_hsl>
+Returns the HSL colour encoding of the greyscale value.
+
+4<Color::GrayScale#brightness>
+Returns the brightness value for this greyscale value; this is the percentage
+of grey.
+
+4<Color::GrayScale#g, Color::GrayScale#g=>
+Read and set the grayscale value. The colour values will be in the range
+(0..1).
+
+3<Color::HSL>
+An HSL colour object. Internally, the hue (#h), saturation (#s), and
+luminosity (#l) values are dealt with as fractional values in the range
+(0..1).
+
+4<Color::HSL.from_fraction(h = 0.0, s = 0.0, l = 0.0)>
+Creates an HSL colour object from fractional values 0..1.
+
+4<Color::HSL.new(h = 0, s = 0, l = 0)>
+Creates an HSL colour object from the standard values of degrees and
+percentages (e.g., 145�, 30%, 50%).
+
+4<Color::HSL#==(other)>
+Compares the other colour to this one. The other colour will be converted to
+HSL before comparison, so the comparison between a HSL colour and a non-HSL
+colour will be approximate and based on the other colour�s #to_hsl
+conversion. If there is no #to_hsl conversion, this will raise an exception.
+This will report that two HSL values are equivalent if all component values
+are within 1e-4 (0.0001) of each other.
+
+4<Color::HSL#html>
+Present the colour as an HTML/CSS colour string.
+
+4<Color::HSL#to_rgb(ignored = nil)>
+Converting to HSL as adapted from Foley and Van-Dam from
+<c:alink
+uri="http://www.bobpowell.net/RGBHSB.htm">http://www.bobpowell.net/RGBHSB.htm</c:alink>.
+
+4<Color::HSL#to_yiq>
+4<Color::HSL#to_cmyk>
+Converts to RGB and then YIQ and CMYK, respectively.
+
+4<Color::HSL#brightness>
+Returns the luminosity (#l) of the colour.
+
+4<Color::HSL#to_greyscale>
+4<Color::HSL#to_grayscale>
+Converts the HSL colour to Color::GrayScale.
+
+4<Color::HSL#h, Color::HSL#h=>
+4<Color::HSL#s, Color::HSL#s=>
+4<Color::HSL#l, Color::HSL#l=>
+Read and set the independent components of the HSL colour. The colour values
+will be in the range (0..1).
+
+3<Color::YIQ>
+A colour object representing YIQ (NTSC) colour encoding.
+
+4<Color::YIQ.from_fraction(y = 0.0, i = 0.0, q = 0.0)>
+Creates a YIQ colour object from fractional values (0..1).
+.code {{{
+  Color::YIQ.new(0.3, 0.2, 0.1)
+.endcode }}}
+
+4<Color::YIQ.new(y = 0, i = 0, q = 0)>
+Creates a YIQ colour object from percentages (0..100).
+.code {{{
+    Color::YIQ.new(10, 20, 30)
+.endcode }}}
+
+4<Color::YIQ#==(other)>
+Compares the other colour to this one. The other colour will be converted to
+YIQ before comparison, so the comparison between a YIQ colour and a non-YIQ
+colour will be approximate and based on the other colour�s #to_yiq
+conversion. If there is no #to_yiq conversion, this will raise an exception.
+This will report that two YIQ values are equivalent if all component colours
+are within 1e-4 (0.0001) of each other.
+
+4<Color::YIQ#to_yiq>
+Returns the current YIQ colour.
+
+4<Color::YIQ#brightness>
+Returns the brightness (#y) of the current colour.
+
+4<Color::YIQ#to_grayscale>
+4<Color::YIQ#to_greyscale>
+Converts the current YIQ colour to Color::GrayScale based on the #y version.
+
+4<Color::YIQ#y, Color::YIQ#y=>
+4<Color::YIQ#i, Color::YIQ#i=>
+4<Coqor::YIQ#q, Coqor::YIQ#q=>
+Read and set the independent components of the HSL colour. The colour values
+will be in the range (0..1).
+
+3<Color::CSS>
+This namespace contains some CSS colour names.
+
+4<Color::CSS[name]>
+Returns the RGB colour for name or +nil+ if the name is not valid. This is
+based on the constants from the Color::RGB namespace.
+
+Future versions of this will be extended to recognise other valid CSS colour
+specifications, including <b>hsl()</b>, <b>hsv()</b>, and <b>rgb()</b>.
 
 3<Color::Palette::MonoContrast>
 Generates a monochromatic constrasting colour palette for background and
@@ -5265,15 +5582,18 @@ values.
 .endblist }}}
 
 4<Color::Palette::MonoContrast#minimum_brightness_diff>
-The minimum brightness difference between the background and the foreground.
-This ensures that the foreground colours will have acceptable contrast ratios
-to the background colours. Changing this value will regenerate the palette.
-The default value for this is about 0.49 (125 / 255).
+4<Color::Palette::MonoContrast#minimum_brightness_diff=>
+The minimum brightness difference between the background and the foreground,
+and must be between (0..1). Setting this value will regenerate the palette
+based on the base colours. The default value for this is 125 / 255.0. If this
+value is set to <b>nil</b>, it will be restored to the default.
 
 4<Color::Palette::MonoContrast#minimum_color_diff>
-The minimum colour difference between the background and the foreground.
-Changing this value will regenerate the palette. The default value for this
-is about 0.65 (500 / 765).
+4<Color::Palette::MonoContrast#minimum_color_diff=>
+The minimum colour difference between the background and the foreground, and
+must be between 0..3. Setting this value will regenerate the palette based on
+the base colours. The default value for this is about 1.96 (500 / 255). If
+this value is set to <b>nil</b>, it will be restored to the default.
 
 4<Color::Palette::MonoContrast#regenerate(background, foreground = nil)
 Regenerates the palette based on new background and foreground values. If
@@ -5298,28 +5618,50 @@ contrast</c:alink> suggest that this value be at least approximately 0.49
 Returns the contrast between to colours, a decimal value between 0 and 3.
 Accessibility guidelines from the W3C for <c:alink
 uri="http://www.w3.org/TR/AERT#color-contrast">colour contrast</c:alink>
-suggest that this value be at least approximately 1.96 (500 / 765.0) for
+suggest that this value be at least approximately 1.96 (500 / 255.0) for
 proper contrast.
 
-3<Color::Palette::GIMP>
-This class will read a GIMP palette file and make the colours in it
-accessible by name. If one or more colours have the same name, <b>all</b>
-colours with that name will be discarded.
+3<Color::Palette::Gimp>
+A class that can read a Gimp (GNU Image Manipulation Program) palette file
+and provide a Hash-like interface to the contents. Gimp colour palettes are
+RGB values only.
+
+Because two or more entries in a Gimp palette may have the same name, all
+named entries are returned as an array.
+
+.code {{{
+  pal = Color::Palette::Gimp.from_file(my_gimp_palette)
+  pal[0]          => Color::RGB<...>
+  pal["white"]    => [ Color::RGB<...> ]
+  pal["unknown"]  => [ Color::RGB<...>, Color::RGB<...>, ... ]
+.endcode }}}
+
+Gimp Palettes are always indexable by insertion order (an integer key).
 
-4<Color::Palette::GIMP.new(palette)>
-Iterates through the data of the GIMP palette and interprets it.
+4<Color::Palette::Gimp.new(palette)>
+Iterates through the data of the Gimp palette and interprets it.
 
-4<Color::Palette::GIMP.from_file(filename)>
+4<Color::Palette::Gimp.from_file(filename)>
 Reads the palette data from the filename.
 
-4<Color::Palette::GIMP.from_io(io)>
+4<Color::Palette::Gimp.from_io(io)>
 Reads the palette data from the IO or IO-like object (depends on #read).
 
-4<Color::Palette::GIMP#[](key)>
-Access the colours by name.
+4<Color::Palette::Gimp#[](key)>
+Access the colours by name or numeric index.
 
-4<Color::Palette::GIMP#each>
-Loops through the palette�s colours.
+4<Color::Palette::Gimp#each>
+Loops through the palette�s colours, yielding each colour in turn.
+
+4<Color::Palette::Gimp#each_name>
+Loops through the named colours, yielding the colour name and an Array of
+colours.
+
+4<Color::Palette::Gimp#valid?>
+Returns true if this is believed to be a valid GIMP palette.
+
+4<Color::Palette::Gimp#name>
+Returns the name of the GIMP palette.
 .newpage
 1<PDF::Writer Demos>
 
@@ -5391,6 +5733,17 @@ Unicode support
 .newpage
 1<Revision History>
 
+2<PDF::Writer 1.1.2: August 25, 2005>
+.blist {{{
+Thomas Gantner <thomas.gantner@gmx.net> found a problem with the interpretation of the placement of page numbers and provided a patch. Thanks!
+Thomas also reported a problem with an inability to place page numbering on the first page of a document, as well as strange results from not providing a starting page number. This has been fixed. Also reported as #2204.
+Modified PDF::Writer requirements to require color-tools version 1.3.0 or later. This necessitates that Color constants be changed to Color::RGB constants.
+Updated supporting library documentation to include information on color-tools version 1.3.
+Fixed a bug with Graphics#transform_matrix truncating one of the transform parameters.
+Applied a fix to PDF::SimpleTable submitted by Mike Leddy in #2129 on the RubyForge tracker.
+Applied a partial fix for PNG with index-transparency provided by Marc Vleugels in #2245 on the RubyForge tracker. NOTE: This does not solve the transparency problem; at this point, PDF::Writer cannot be said to support PNGs with transparency. This will be fixed in a later version of PDF::Writer.
+.endblist }}}
+
 2<Version 1.1.1: July 1, 2005>
 .blist {{{
 Fixed the packaging process; the .tar.gz files will no longer corrupt the images.
@@ -5602,6 +5955,6 @@ pdf.stop_page_numbering(true, :current)
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: manual.pwd,v 1.51 2005/07/01 16:48:26 austin Exp $
+# $Id: manual.pwd,v 1.51.2.2 2005/08/25 03:43:59 austin Exp $
 # vim: sts=2 sw=2 ts=4 et ai tw=77 foldmethod=marker foldcolumn=2
 #++