pdf-writer 1.1.1 → 1.1.2

data/demo/demo.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: demo.rb,v 1.8 2005/06/29 03:00:31 austin Exp $
+# $Id: demo.rb,v 1.8.2.1 2005/08/25 03:38:05 austin Exp $
 #++
 begin
   require 'pdf/writer'
@@ -50,7 +50,7 @@ end
   x = (x - xw - 2)
 end
 
-pdf.stroke_color(Color::Black)
+pdf.stroke_color(Color::RGB::Black)
 pdf.stroke_style(PDF::Writer::StrokeStyle.new(1))
 pdf.rectangle(20, 20, 558, 802)
 

data/demo/pac.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: pac.rb,v 1.4 2005/06/13 19:32:37 austin Exp $
+# $Id: pac.rb,v 1.4.2.1 2005/08/25 03:38:05 austin Exp $
 #++
 begin
   require 'pdf/writer'
@@ -21,34 +21,34 @@ end
 
 pdf = PDF::Writer.new(:orientation => :landscape)
 
-pdf.fill_color    Color::Black
+pdf.fill_color    Color::RGB::Black
 pdf.rectangle(0, 0, pdf.page_width, pdf.page_height).fill
 
   # Wall
-pdf.fill_color    Color::Magenta
-pdf.stroke_color  Color::Cyan
+pdf.fill_color    Color::RGB::Magenta
+pdf.stroke_color  Color::RGB::Cyan
 pdf.rounded_rectangle(20, 500, 750, 20, 10).close_fill_stroke
 pdf.rounded_rectangle(20, 200, 750, 20, 10).close_fill_stroke
 
   # Body
-pdf.fill_color    Color::Yellow
-pdf.stroke_color  Color::Black
+pdf.fill_color    Color::RGB::Yellow
+pdf.stroke_color  Color::RGB::Black
 pdf.circle_at(150, 350, 100).fill_stroke
 
   # Mouth
-pdf.fill_color    Color::Black
+pdf.fill_color    Color::RGB::Black
 pdf.segment_at(150, 350, 100, 100, 30, -30).close_fill_stroke
 
   # Dot
-pdf.fill_color    Color::Yellow
+pdf.fill_color    Color::RGB::Yellow
 pdf.circle_at(250, 350, 20).fill_stroke
 pdf.circle_at(300, 350, 10).fill_stroke
 pdf.circle_at(350, 350, 10).fill_stroke
 pdf.circle_at(400, 350, 10).fill_stroke
 pdf.circle_at(450, 350, 10).fill_stroke
 
-pdf.fill_color    Color::Blue
-pdf.stroke_color  Color::Cyan
+pdf.fill_color    Color::RGB::Blue
+pdf.stroke_color  Color::RGB::Cyan
 pdf.move_to(500, 250)
 pdf.line_to(500, 425)
 pdf.curve_to(550, 475, 600, 475, 650, 425)
@@ -60,10 +60,10 @@ pdf.line_to(550, 250)
 pdf.line_to(525, 275)
 pdf.line_to(500, 250).fill_stroke
 
-pdf.fill_color    Color::White
+pdf.fill_color    Color::RGB::White
 pdf.rectangle(525, 375, 25, 25).fill
 pdf.rectangle(575, 375, 25, 25).fill
-pdf.fill_color    Color::Black
+pdf.fill_color    Color::RGB::Black
 pdf.rectangle(525, 375, 10, 10).fill
 pdf.rectangle(575, 375, 10, 10).fill
 

data/demo/pagenumber.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: pagenumber.rb,v 1.5 2005/06/13 19:32:37 austin Exp $
+# $Id: pagenumber.rb,v 1.5.2.1 2005/08/25 03:38:05 austin Exp $
 #++
 begin
   require 'pdf/writer'
@@ -23,10 +23,10 @@ def grey_page(pdf)
   @page_num ||= 0
   @page_num += 1
   pdf.save_state
-  pdf.fill_color Color::Grey90
-  x = pdf.absolute_x_middle - (pdf.text_width(48, @page_num) / 2.0)
-  y = pdf.absolute_y_middle - (pdf.font_height(48) / 2.0)
-  pdf.add_text(x, y, 48, @page_num)
+  pdf.fill_color Color::RGB::Grey90
+  x = pdf.margin_x_middle - (pdf.text_width(@page_num, 48) / 2.0)
+  y = pdf.margin_y_middle - (pdf.font_height(48) / 2.0)
+  pdf.add_text(x, y, @page_num, 48)
   pdf.restore_state
 end
 
@@ -39,28 +39,32 @@ pdf = PDF::Writer.new(:paper => "A10")
 pdf.margins_pt 0
 pdf.select_font "Helvetica"
 
-grey_page(pdf)  # Page  1: blank
-sa = pdf.start_page_numbering(5, 60, 9, nil, nil, 1)
+x = pdf.absolute_x_middle
+
+grey_page(pdf)  # Page  1: 99 of 99
+sa = pdf.start_page_numbering(x, 70, 9, :center, nil, 99)
+pdf.stop_page_numbering(true, :current, sa)
 make_page(pdf)  # Page  2: 1 of 2
+sa = pdf.start_page_numbering(x, 60, 9, nil, nil, 1)
 make_page(pdf)  # Page  3: 2 of 2
 pdf.stop_page_numbering(true, :current, sa)
 make_page(pdf)  # Page  4: blank
-sb = pdf.start_page_numbering(5, 50, 9, :center, nil, 10)
+sb = pdf.start_page_numbering(x, 50, 9, :center, nil, 10)
 make_page(pdf)  # Page  5: 10 of 12
 make_page(pdf)  # Page  6: 11 of 12
 pdf.stop_page_numbering(true, :next, sb)
 make_page(pdf)  # Page  7: 12 of 12
-sc = pdf.start_page_numbering(5, 40, 9, nil, nil, 1)
+sc = pdf.start_page_numbering(x, 40, 9, nil, nil, 1)
 make_page(pdf)  # Page  8: 1 of 3
 make_page(pdf)  # Page  9: 2 of 3
 make_page(pdf)  # Page 10: 3 of 3
 pdf.stop_page_numbering(true, :current, sc)
 make_page(pdf)  # Page 11: blank
-sd = pdf.start_page_numbering(5, 30, 9, nil, nil, 1)
+sd = pdf.start_page_numbering(x, 30, 9, nil, nil, 1)
 make_page(pdf)  # Page 12: 1 of 6
 make_page(pdf)  # Page 13: 2 of 6
-se = pdf.start_page_numbering(5, 20, 9, nil, nil, 5)
-sf = pdf.start_page_numbering(5, 10, 9, :right, nil, 1)
+se = pdf.start_page_numbering(x, 20, 9, nil, nil, 5)
+sf = pdf.start_page_numbering(x, 10, 9, :right, nil, 1)
 make_page(pdf)  # Page 14: 3 of 6, 5 of 10, 1 of 8
 make_page(pdf)  # Page 15: 4 of 6, 6 of 10, 2 of 8
 make_page(pdf)  # Page 16: 5 of 6, 7 of 10, 3 of 8

data/lib/pdf/charts/stddev.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: stddev.rb,v 1.9 2005/07/01 16:48:26 austin Exp $
+# $Id: stddev.rb,v 1.9.2.1 2005/08/25 03:38:05 austin Exp $
 #++
 require 'pdf/writer'
 require 'pdf/charts'
@@ -20,7 +20,7 @@ require 'ostruct'
   # The scale of responses is the vertical scale; the average data points
   # and standard deviation values are the horizontal scale.
 class PDF::Charts::StdDev
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
     # A data element.
   DataPoint = Struct.new(:label, :average, :stddev)
@@ -117,7 +117,7 @@ class PDF::Charts::StdDev
       scale.show_labels         = false
       scale.label               = 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
       end
@@ -126,32 +126,32 @@ class PDF::Charts::StdDev
     @show_labels              = true
     @label                    = 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
     end
 
     @outer_borders            = Marker.new do |marker|
       marker.style            = PDF::Writer::StrokeStyle.new(1.5)
-      marker.color            = Color::Black
+      marker.color            = Color::RGB::Black
     end
     @inner_borders            = nil
 
     @dot                      = Marker.new do |marker|
       marker.style            = PDF::Writer::StrokeStyle.new(5)
-      marker.color            = Color::Black
+      marker.color            = Color::RGB::Black
     end
     @bar                      = Marker.new do |marker|
       marker.style            = PDF::Writer::StrokeStyle.new(0.5)
-      marker.color            = Color::Black
+      marker.color            = Color::RGB::Black
     end
     @upper_crossbar           = Marker.new do |marker|
       marker.style            = PDF::Writer::StrokeStyle.new(1)
-      marker.color            = Color::Black
+      marker.color            = Color::RGB::Black
     end
     @lower_crossbar           = Marker.new do |marker|
       marker.style            = PDF::Writer::StrokeStyle.new(1)
-      marker.color            = Color::Black
+      marker.color            = Color::RGB::Black
     end
 
     @height                   = 200

data/lib/pdf/quickref.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: quickref.rb,v 1.10 2005/07/01 16:48:26 austin Exp $
+# $Id: quickref.rb,v 1.10.2.2 2005/08/25 03:51:44 austin Exp $
 #++
 require 'pdf/simpletable'
 
@@ -51,7 +51,7 @@ require 'pdf/simpletable'
   #  qr.lines "Text to put after the header."
   #  qr.save_as "MyQuickRef.pdf"
 class PDF::QuickRef
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
     # Create the quick reference document. +paper+ is passed unchanged to
     # the PDF::Writer.new; the page is always created landscape. Margins
@@ -110,7 +110,7 @@ class PDF::QuickRef
       # Put lines between the columns.
     all = @pdf.open_object
     @pdf.save_state
-    @pdf.stroke_color! Color::Black
+    @pdf.stroke_color! Color::RGB::Black
     @pdf.stroke_style  PDF::Writer::StrokeStyle::DEFAULT
     (1 .. (columns - 1)).each do |ii|
       x = @pdf.left_margin + (@pdf.column_width * ii)
@@ -287,7 +287,8 @@ class PDF::QuickRef
   end
 
     # Draws a horizontal line with the specified style and colour.
-  def hline(style = PDF::Writer::StrokeStyle::DEFAULT, color = Color::Black)
+  def hline(style = PDF::Writer::StrokeStyle::DEFAULT,
+            color = Color::RGB::Black)
     @pdf.y -= 2.5
     @pdf.save_state
     @pdf.stroke_style  style

data/lib/pdf/simpletable.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: simpletable.rb,v 1.13 2005/07/01 16:48:26 austin Exp $
+# $Id: simpletable.rb,v 1.13.2.1 2005/08/25 03:38:05 austin Exp $
 #++
 require 'pdf/writer'
 require 'transaction/simple/group'
@@ -14,7 +14,7 @@ require 'transaction/simple/group'
   # This class will create tables with a relatively simple API and internal
   # implementation.
 class PDF::SimpleTable
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
   include Transaction::Simple
 
@@ -75,18 +75,18 @@ class PDF::SimpleTable
     @show_lines           = :outer
     @show_headings        = true
     @shade_rows           = :shaded
-    @shade_color          = Color::Grey80
-    @shade_color2         = Color::Grey70
+    @shade_color          = Color::RGB::Grey80
+    @shade_color2         = Color::RGB::Grey70
     @shade_headings       = false
-    @shade_heading_color  = Color::Grey90
+    @shade_heading_color  = Color::RGB::Grey90
     @font_size            = 10
     @heading_font_size    = 12
     @title_font_size      = 12
     @title_gap            = 5
-    @title_color          = Color::Black
-    @heading_color        = Color::Black
-    @text_color           = Color::Black
-    @line_color           = Color::Black
+    @title_color          = Color::RGB::Black
+    @heading_color        = Color::RGB::Black
+    @text_color           = Color::RGB::Black
+    @line_color           = Color::RGB::Black
     @position             = :center
     @orientation          = :center
     @bold_headings        = false
@@ -146,16 +146,16 @@ class PDF::SimpleTable
     #                     will be shaded with #shade_color; the rest of the
     #                     rows will be shaded with #shade_color2.
   attr_accessor :shade_rows
-    # The main row shading colour. Defaults to Color::Grey80. Used with
+    # The main row shading colour. Defaults to Color::RGB::Grey80. Used with
     # #shade_rows of <tt>:shaded</tt> and <tt>:striped</tt>.
   attr_accessor :shade_color
     # The alternate row shading colour, used with #shade_rows of
-    # <tt>:striped</tt>. Defaults to Color::Grey70.
+    # <tt>:striped</tt>. Defaults to Color::RGB::Grey70.
   attr_accessor :shade_color2
     # Places a background colour in the heading if +true+.
   attr_accessor :shade_headings
     # Defines the colour of the background shading for the heading if
-    # #shade_headings is +true+. Default is Color::Grey90.
+    # #shade_headings is +true+. Default is Color::RGB::Grey90.
   attr_accessor :shade_heading_color
     # The font size of the data cells, in points. Defaults to 10 points.
   attr_accessor :font_size
@@ -166,13 +166,13 @@ class PDF::SimpleTable
     # The gap, in PDF units, between the title and the table. Defaults to 5
     # units.
   attr_accessor :title_gap
-    # The text colour of the title. Defaults to Color::Black.
+    # The text colour of the title. Defaults to Color::RGB::Black.
   attr_accessor :title_color
-    # The text colour of the heading. Defaults to Color::Black.
+    # The text colour of the heading. Defaults to Color::RGB::Black.
   attr_accessor :heading_color
-    # The text colour of the body cells. Defaults to Color::Black.
+    # The text colour of the body cells. Defaults to Color::RGB::Black.
   attr_accessor :text_color
-    # The colour of the table lines. Defaults to Color::Black.
+    # The colour of the table lines. Defaults to Color::RGB::Black.
   attr_accessor :line_color
     # The +x+ position of the table. This will be one of:
     #

data/lib/pdf/techbook.rb

@@ -7,7 +7,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: techbook.rb,v 1.17 2005/07/01 16:48:26 austin Exp $
+# $Id: techbook.rb,v 1.17.2.1 2005/08/25 03:38:05 austin Exp $
 #++
 require 'pdf/simpletable'
 require 'pdf/charts/stddev'
@@ -396,36 +396,36 @@ class PDF::TechBook < PDF::Writer
   private :techbook_find_directive
 
   H1_STYLE = {
-    :background     => Color::Black,
-    :foreground     => Color::White,
+    :background     => Color::RGB::Black,
+    :foreground     => Color::RGB::White,
     :justification  => :center,
     :font_size      => 26,
     :bar            => true
   }
   H2_STYLE = {
-    :background     => Color::Grey80,
-    :foreground     => Color::Black,
+    :background     => Color::RGB::Grey80,
+    :foreground     => Color::RGB::Black,
     :justification  => :left,
     :font_size      => 18,
     :bar            => true
   }
   H3_STYLE = {
-    :background     => Color::White,
-    :foreground     => Color::Black,
+    :background     => Color::RGB::White,
+    :foreground     => Color::RGB::Black,
     :justification  => :left,
     :font_size      => 18,
     :bar            => false
   }
   H4_STYLE = {
-    :background     => Color::White,
-    :foreground     => Color::Black,
+    :background     => Color::RGB::White,
+    :foreground     => Color::RGB::Black,
     :justification  => :left,
     :font_size      => 14,
     :bar            => false
   }
   H5_STYLE = {
-    :background     => Color::White,
-    :foreground     => Color::Black,
+    :background     => Color::RGB::White,
+    :foreground     => Color::RGB::Black,
     :justification  => :left,
     :font_size      => 12,
     :bar            => false

data/lib/pdf/writer.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: writer.rb,v 1.38 2005/07/01 16:48:26 austin Exp $
+# $Id: writer.rb,v 1.38.2.1 2005/08/25 03:38:05 austin Exp $
 #++
 require 'thread'
 require 'open-uri'
@@ -19,7 +19,7 @@ require 'color'
 module PDF
   class Writer
       # The version of PDF::Writer.
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
 
       # Escape the text so that it's safe for insertion into the PDF
       # document.
@@ -194,9 +194,9 @@ class PDF::Writer
 
       all = pdf.open_object
       pdf.save_state
-      k = Color::CMYK.new(0, 0, 0, 100)
-      pdf.stroke_color! k
-      pdf.fill_color! k
+      kk = Color::CMYK.new(0, 0, 0, 100)
+      pdf.stroke_color! kk
+      pdf.fill_color! kk
       pdf.stroke_style! StrokeStyle.new(0.3)
 
       pdf.prepress_clip_mark(tx1, ty0,   0, mark_length, bleed_size)  # Upper Right
@@ -359,13 +359,10 @@ class PDF::Writer
     @pages    = PDF::Writer::Object::Pages.new(self)
 
     @current_node	= @pages
-
-    @current_text_render_style = 0
-
     @procset  = PDF::Writer::Object::Procset.new(self)
     @info     = PDF::Writer::Object::Info.new(self)
     @page     = PDF::Writer::Object::Page.new(self)
-
+    @current_text_render_style  = 0
     @first_page     = @page
 
     @version        = version
@@ -405,8 +402,8 @@ class PDF::Writer
       # process.
     @pageset[1] = @pages.first_page
 
-    fill_color!   Color::Black
-    stroke_color! Color::Black
+    fill_color!   Color::RGB::Black
+    stroke_color! Color::RGB::Black
 
     yield self if block_given?
   end
@@ -600,6 +597,11 @@ class PDF::Writer
     start_new_page if @y < bottom # Make a new page
   end
 
+    # Allows the user to find out what the ID is of the first page that was
+    # created during startup - useful if they wish to add something to it
+    # later.
+  attr_reader :first_page
+
     # Add a new translation table for a font family. A font family will be
     # used to associate a single name and font styles with multiple fonts.
     # A style will be identified with a single-character style identifier or
@@ -619,11 +621,6 @@ class PDF::Writer
     # Each font family key is the base name for the font.
   attr_reader :font_families
 
-    # Allows the user to find out what the ID is of the first page that was
-    # created during startup - useful if they wish to add something to it
-    # later.
-  attr_reader :first_page
-
     # Initialize the font families for the default fonts.
   def init_font_families
       # Set the known family groups. These font families will be used to
@@ -700,33 +697,33 @@ class PDF::Writer
     :add    => 32
   }
 
-    # Encrypts the document. This will set the user and owner passwords that
-    # will be used to access the document and set the permissions the user
-    # has with the document. The passwords are limited to 32 characters.
-    #
-    # The permissions provided are an array of symbols, allowing identified
-    # users to perform particular actions:
-    # <tt>:print</tt>::   Print.
-    # <tt>:modify</tt>::  Modify text or objects.
-    # <tt>:copy</tt>::    Copy text or objects.
-    # <tt>:add</tt>::     Add text or objects.
-    def encrypt(user_pass = nil, owner_pass = nil, permissions = [])
-      perms = ["11000000"].pack("B8")
-
-      permissions.each do |perm|
-        perms += ENCRYPT_OPTIONS[perm] if ENCRYPT_OPTIONS[perm]
-      end
-
-      @arc4 ||= PDF::ARC4.new
-      owner_pass ||= user_pass
-
-      options = {
-        :owner_pass   => owner_pass,
-        :user_pass    => user_pass,
-        :permissions  => perms,
-      }
-      @encryption = PDF::Writer::Object::Encryption.new(self, options)
-    end
+  # Encrypts the document. This will set the user and owner passwords that
+  # will be used to access the document and set the permissions the user
+  # has with the document. The passwords are limited to 32 characters.
+  #
+  # The permissions provided are an array of symbols, allowing identified
+  # users to perform particular actions:
+  # <tt>:print</tt>::   Print.
+  # <tt>:modify</tt>::  Modify text or objects.
+  # <tt>:copy</tt>::    Copy text or objects.
+  # <tt>:add</tt>::     Add text or objects.
+  def encrypt(user_pass = nil, owner_pass = nil, permissions = [])
+    perms = ["11000000"].pack("B8")
+
+    permissions.each do |perm|
+      perms += ENCRYPT_OPTIONS[perm] if ENCRYPT_OPTIONS[perm]
+    end
+
+    @arc4 ||= PDF::ARC4.new
+    owner_pass ||= user_pass
+
+    options = {
+      :owner_pass   => owner_pass,
+      :user_pass    => user_pass,
+      :permissions  => perms,
+    }
+    @encryption = PDF::Writer::Object::Encryption.new(self, options)
+  end
 
   def encrypted?
     not @encryption.nil?
@@ -738,7 +735,7 @@ class PDF::Writer
 
     # Return the PDF stream as a string.
   def render(debug = false)
-    clean_up
+    add_page_numbers
     @compression = false if $DEBUG or debug
     @arc4.init(@encryption_key) unless @arc4.nil?
 
@@ -2197,30 +2194,35 @@ class PDF::Writer
   def start_page_numbering(x, y, size, pos = nil, pattern = nil, starting = nil)
     pos     ||= :left
     pattern ||= "<PAGENUM> of <TOTALPAGENUM>"
+    starting  ||= 1
 
     @page_numbering ||= []
     @page_numbering << (o = {})
 
-    page    = @pageset.size
+    page    = @pageset.size - 1
     o[page] = {
       :x        => x,
       :y        => y,
       :pos      => pos,
       :pattern  => pattern,
       :starting => starting,
-      :size     => size
+      :size     => size,
+      :start    => true
     }
     @page_numbering.index(o)
   end
 
     # Given a particular generic page number +page_num+ (numbered
     # sequentially from the beginning of the page set), return the page
-    # number under a particular page numbering +scheme+. Returns +nil+ if
-    # page numbering is not turned on.
+    # number under a particular page numbering +scheme+ (defaults to the
+    # first scheme turned on). Returns +nil+ if page numbering is not turned
+    # on or if the page is not under the current numbering scheme.
+    #
+    # This method has been dprecated.
   def which_page_number(page_num, scheme = 0)
     return nil unless @page_numbering
 
-    num = 0
+    num   = nil
     start = start_num = 1
 
     @page_numbering[scheme].each do |kk, vv|
@@ -2232,7 +2234,7 @@ class PDF::Writer
             num = page_num - start_num + start
           end
         else
-          num = 0
+          num = nil
         end
       end
     end
@@ -2245,103 +2247,108 @@ class PDF::Writer
     # numbering +scheme+ will be stopped as well. If +stop_at+ is
     # <tt>:current</tt>, then the page numbering will stop at this page;
     # otherwise, it will stop at the next page.
+    #
+    # This method has been dprecated.
   def stop_page_numbering(stop_total = false, stop_at = :current, scheme = 0)
     return false unless @page_numbering
 
-    page = @pageset.size
+    page = @pageset.size - 1
 
-    if stop_at != :current and @page_numbering[scheme][page].kind_of?(Hash)
-      if stop_total
-        @page_numbering[scheme][page]["stoptn"] = true
-      else
-        @page_numbering[scheme][page]["stopn"] = true
-      end
-    else
-      if stop_total
-        @page_numbering[scheme][page] = "stopt"
-      else
-        @page_numbering[scheme][page] = "stop"
-      end
+    @page_numbering[scheme][page] ||= {}
+    o = @page_numbering[scheme][page]
 
-      @page_numbering[scheme][page] << "n" unless stop_at == :current
+    case [ stop_total, stop_at == :current ]
+    when [ true, true ]
+      o[:stop] = :stop_total
+    when [ true, false ]
+      o[:stop] = :stop_total_next
+    when [ false, true ]
+      o[:stop] = :stop_next
+      else
+      o[:stop] = :stop
     end
   end
 
-  def page_number_search(label, tmp)
-    tmp.each do |scheme, v|
-      if v.kind_of?(Hash)
-        return scheme unless v[label].nil?
-      else
-        return scheme if v == label
-      end
-    end
-    0
+  def page_number_search(condition, scheme)
+    res = nil
+    scheme.each { |page, value| res = page if value[:stop] == condition }
+    res
   end
   private :page_number_search
 
   def add_page_numbers
       # This will go through the @page_numbering array and add the page
       # numbers are required.
-    unless @page_numbering.nil?
-      total_pages1 = @pageset.size
-      tmp1 = @page_numbering
-      status = 0
-      info = {}
-      tmp1.each do |tmp|
-          # Do each of the page numbering systems. First, find the total
-          # pages for this one.
-        k = page_number_search("stopt", tmp)
-        if k and k > 0
-          total_pages = k - 1
+    if @page_numbering
+      page_count  = @pageset.size
+      pn_tmp      = @page_numbering.dup
+
+        # Go through each of the page numbering schemes.
+      pn_tmp.each do |scheme|
+          # First, find the total pages for this schemes.
+        page = page_number_search(:stop_total, scheme)
+
+        if page
+          total_pages = page
         else
-          l = page_number_search("stoptn", tmp)
-          if l and l > 0
-            total_pages = l
+          page = page_number_search(:stop_total_next, scheme)
+          if page
+            total_pages = page
           else
-            total_pages = total_pages1
+            total_pages = page_count
           end
         end
-        @pageset.each_with_index do |id, page_num|
-          next if page_num == 0
-          if tmp[page_num].kind_of?(Hash) # This must be the starting page #s
-            status = 1
-            info = tmp[page_num]
+
+        status  = nil
+        delta   = pattern = pos = x = y = size = nil
+
+        @pageset.each_with_index do |page, index|
+          next if status.nil? and scheme[index].nil?
+
+          info = scheme[index]
+          if info
+            if info[:start]
+              status = true
             if info[:starting]
-              info[:delta] = info[:starting] - page_num
+                delta = info[:starting] - index
             else
-              info[:delta] = page_num
+                delta = index
+              end
+
+              pattern = info[:pattern]
+              pos     = info[:pos]
+              x       = info[:x]
+              y       = info[:y]
+              size    = info[:size]
+
+              # Check for the special case of page numbering starting and
+              # stopping on the same page.
+              status = :stop_next if info[:stop]
+            elsif [:stop, :stop_total].include?(info[:stop])
+              status = :stop_now
+            elsif status == true and [:stop_next, :stop_total_next].include?(info[:stop])
+              status = :stop_next
             end
-              # Also check for the special case of the numbering stopping
-              # and starting on the same page.
-            status = 2 if info["stopn"] or info["stoptn"]
-          elsif tmp[page_num] == "stop" or tmp[page_num] == "stopt"
-            status = 0 # we are stopping page numbers
-          elsif status == 1 and (tmp[page_num] == "stoptn" or tmp[page_num] == "stopn")
-            status = 2
           end
 
-          if status != 0
+          if status
               # Add the page numbering to this page
-            unless info[:delta]
-              num = page_num
-            else
-              num = page_num + info[:delta]
-            end
+            num   = index + delta.to_i
+            total = total_pages + num - index
+            patt  = pattern.gsub(/<PAGENUM>/, num.to_s).gsub(/<TOTALPAGENUM>/, total.to_s)
+            reopen_object(page.contents.first)
 
-            total = total_pages + num - page_num
-            pat = info[:pattern].gsub(/<PAGENUM>/, num.to_s).gsub(/<TOTALPAGENUM>/, total.to_s)
-            reopen_object(id.contents.first)
-            case info[:pos]
-            when :right
+            case pos
+            when :left    # Write the page number from x.
               w = 0
-            when :left
-              w = text_width(pat, info[:size])
-            when :center
-              w = text_width(pat, info[:size]) / 2.0
+            when :right   # Write the page number to x.
+              w = text_width(patt, size)
+            when :center  # Write the page number around x.
+              w = text_width(patt, size) / 2.0
             end
-            add_text(info[:x] + w, info[:y], pat, info[:size])
+            add_text(x - w, y, patt, size)
             close_object
-            status = 0 if status == 2
+            status = nil if [ :stop_now, :stop_next ].include?(status)
           end
         end
       end
@@ -2349,11 +2356,6 @@ class PDF::Writer
   end
   private :add_page_numbers
 
-  def clean_up
-    add_page_numbers
-  end
-  private :clean_up
-
   def preprocess_text(text)
     text
   end
@@ -2530,8 +2532,8 @@ class PDF::Writer
   class TagAlink
       # The default anchored link style.
     DEFAULT_STYLE = {
-      :color      => Color::Blue,
-      :text_color => Color::Blue,
+      :color      => Color::RGB::Blue,
+      :text_color => Color::RGB::Blue,
       :draw_line  => true,
       :line_style => { :dash => PDF::Writer::StrokeStyle::SOLID_LINE },
       :factor     => 0.05
@@ -2542,9 +2544,9 @@ class PDF::Writer
         # is expected to be a hash with the following keys:
         #
         # <tt>:color</tt>::       The colour to be applied to the link
-        #                         underline. Default is Color::Blue.
+        #                         underline. Default is Color::RGB::Blue.
         # <tt>:text_color</tt>::  The colour to be applied to the link text.
-        #                         Default is Color::Blue.
+        #                         Default is Color::RGB::Blue.
         # <tt>:factor</tt>::      The size of the line, as a multiple of the
         #                         text height. Default is 0.05.
         # <tt>:draw_line</tt>::   Whether to draw the underline as part of
@@ -2691,11 +2693,11 @@ class PDF::Writer
     # with <C:bullet>.
   class TagBullet
       # The default bullet color.
-    DEFAULT_COLOR = Color::Black
+    DEFAULT_COLOR = Color::RGB::Black
 
     class << self
         # Sets the style for <C:bullet> callback bullets that follow.
-        # Default is Color::Black.
+        # Default is Color::RGB::Black.
         #
         # Set this to +nil+ to get the default colour.
       attr_accessor :color
@@ -2722,17 +2724,17 @@ class PDF::Writer
     # A callback function to support drawing of a disc bullet style.
   class TagDisc
       # The default disc bullet foreground.
-    DEFAULT_FOREGROUND = Color::Black
+    DEFAULT_FOREGROUND = Color::RGB::Black
       # The default disc bullet background.
-    DEFAULT_BACKGROUND = Color::White
+    DEFAULT_BACKGROUND = Color::RGB::White
     class << self
         # The foreground color for <C:disc> bullets. Default is
-        # Color::Black.
+        # Color::RGB::Black.
         #
         # Set to +nil+ to get the default color.
       attr_accessor :foreground
         # The background color for <C:disc> bullets. Default is
-        # Color::White.
+        # Color::RGB::White.
         #
         # Set to +nil+ to get the default color.
       attr_accessor :background