pdf-writer 1.1.3 → 1.1.4

data/ChangeLog

@@ -105,6 +105,6 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: ChangeLog,v 1.17.2.4 2005/09/09 12:36:42 austin Exp $
+# $Id: ChangeLog 184 2007-12-10 03:18:48Z sandal $
 #++
 # vim: sts=2 sw=2 ts=4 et ai tw=77

data/LICENCE

@@ -1,7 +1,13 @@
 = PDF::Writer for Ruby
 Homepage::  http://rubyforge.org/projects/ruby-pdf/
-Copyright:: Copyright � 2003�2005 Austin Ziegler.
-Summary::   MIT-style
+Copyright:: Copyright � 2003�2005 Austin Ziegler. 
+Summary::   MIT-style                             
+
+This project had a change of maintainers in November, 2007.
+New developments are now copyrighted by Gregory Brown and Michael Milner,
+unless otherwise noted.
+
+---
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -121,5 +127,5 @@ feature for any purpose other than as set forth in the applicable license
 grant. Adobe has other patents in various fields, none of which are hereby
 licensed.
 
-$Id: LICENCE,v 1.10 2005/06/29 19:32:07 austin Exp $
+$Id: LICENCE 184 2007-12-10 03:18:48Z sandal $
 # vim: sts=2 sw=2 ts=4 et ai tw=77

data/README

@@ -28,6 +28,6 @@ Transaction::Simple 1.3.0 or better.
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: README,v 1.7.2.1 2005/08/25 03:38:05 austin Exp $
+# $Id: README 184 2007-12-10 03:18:48Z sandal $
 #++
 # vim: sts=2 sw=2 ts=4 et ai tw=77

data/bin/techbook

@@ -7,7 +7,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: techbook,v 1.1 2005/06/13 20:03:53 austin Exp $
+# $Id: techbook 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/techbook'

data/demo/chunkybacon.rb

@@ -10,7 +10,7 @@
 #   and are from "Why's (Poignant) Guide to Ruby" at
 #   <http://poignantguide.net/ruby> with permission.
 #
-# $Id: chunkybacon.rb,v 1.7 2005/07/01 16:48:26 austin Exp $
+# $Id: chunkybacon.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

data/demo/code.rb

@@ -11,7 +11,7 @@
 # I'll need to play with the X position some to get it right. This will NOT
 # make it into the 1.0 release. Maybe 1.1 or 1.2.
 #
-# $Id: code.rb,v 1.3 2005/06/13 19:32:37 austin Exp $
+# $Id: code.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

data/demo/colornames.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: colornames.rb,v 1.2.2.1 2005/08/25 03:38:05 austin Exp $
+# $Id: colornames.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

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.2.1 2005/08/25 03:38:05 austin Exp $
+# $Id: demo.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

data/demo/gettysburg.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: gettysburg.rb,v 1.5 2005/06/15 21:38:38 austin Exp $
+# $Id: gettysburg.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

data/demo/hello.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: hello.rb,v 1.6 2005/06/13 19:32:37 austin Exp $
+# $Id: hello.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

data/demo/individual-i.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: individual-i.rb,v 1.4 2005/06/13 19:32:37 austin Exp $
+# $Id: individual-i.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

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.2.1 2005/08/25 03:38:05 austin Exp $
+# $Id: pac.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

data/demo/qr-language.rb

@@ -10,7 +10,7 @@
 #
 #   See LICENCE in the main distribution for full licensing information.
 #
-# $Id: qr-language.rb,v 1.14 2005/06/29 19:57:30 austin Exp $
+# $Id: qr-language.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'
@@ -42,7 +42,7 @@ usage: #{File.basename($0)} [paper-size]
 end
 
 PDF::QuickRef.make(paper, 3) do
-  pdf.compressed    = true
+# pdf.compressed    = true
   pdf.info.author   = "Ryan Davis"
   pdf.info.title    = "Ruby Language Quick Reference"
   pdf.info.subject  = "The Ruby Programming Language"
@@ -167,11 +167,11 @@ variables, and operators.
   range = RangeThingy.new(lower_bound) .. RangeThingy.new(upper_bound)
   EOS
 
-  h2      "Regexen"
+  h2      "Regular Expressions"
   pre     <<-'EOS'
     /normal regex/[xim]
     %r|alternate form|[xim]
-    Regex.new(pattern, options)
+    Regexp.new(pattern, options)
   EOS
   pairs   <<-'EOS'
 .	any character except newline

data/demo/qr-library.rb

@@ -10,7 +10,7 @@
 #
 #   See LICENCE in the main distribution for full licensing information.
 #
-# $Id: qr-library.rb,v 1.7 2005/06/29 03:12:11 austin Exp $
+# $Id: qr-library.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 begin
   require 'pdf/writer'

data/lib/pdf/charts.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: charts.rb,v 1.2 2005/05/16 03:59:21 austin Exp $
+# $Id: charts.rb 184 2007-12-10 03:18:48Z sandal $
 #++
   # A namespace for charts that can be drawn on PDF::Writer canvases.
 module PDF::Charts

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.2.2 2005/09/07 17:01:14 austin Exp $
+# $Id: stddev.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 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.3'
+  VERSION = '1.1.4'
 
     # A data element.
   DataPoint = Struct.new(:label, :average, :stddev)

data/lib/pdf/math.rb

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: math.rb,v 1.3 2005/05/16 20:44:34 austin Exp $
+# $Id: math.rb 184 2007-12-10 03:18:48Z sandal $
 #++
   # Encapsulate some of the mathematical calculations that need to be
   # performed when working with PDF documents. All angles in PDF::Writer are

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.2.3 2005/09/07 17:01:14 austin Exp $
+# $Id: quickref.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 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.3'
+  VERSION = '1.1.4'
 
     # Create the quick reference document. +paper+ is passed unchanged to
     # the PDF::Writer.new; the page is always created landscape. Margins
@@ -62,7 +62,7 @@ class PDF::QuickRef
     #
     # After the columns are started, lines will be drawn between column
     # positions.
-  def initialize(paper = "LETTER", columns = 3)
+  def initialize(paper = "LETTER", columns = 3, column_separators_visible = true)
     @pdf  = PDF::Writer.new(:paper => paper, :orientation => :landscape)
     @pdf.margins_pt 18
     @pdf.y = @pdf.absolute_top_margin
@@ -107,20 +107,22 @@ class PDF::QuickRef
     @ptab.maximum_width = @pdf.column_width - 10
     @ltab.maximum_width = @pdf.column_width - 10
 
+    if column_separators_visible
       # Put lines between the columns.
-    all = @pdf.open_object
-    @pdf.save_state
-    @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)
-      x += (@pdf.column_gutter * (ii - 0.5))
-      @pdf.line(x, @pdf.page_height - @pdf.top_margin, x, @pdf.bottom_margin)
-      @pdf.stroke
+      all = @pdf.open_object
+      @pdf.save_state
+      @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)
+        x += (@pdf.column_gutter * (ii - 0.5))
+        @pdf.line(x, @pdf.page_height - @pdf.top_margin, x, @pdf.bottom_margin)
+        @pdf.stroke
+      end
+      @pdf.restore_state
+      @pdf.close_object
+      @pdf.add_object(all, :all_pages)
     end
-    @pdf.restore_state
-    @pdf.close_object
-    @pdf.add_object(all, :all_pages)
   end
 
     # Access to the raw PDF canvas for normal PDF::Writer configuration.

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.2.2 2005/09/07 17:01:14 austin Exp $
+# $Id: simpletable.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 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.3'
+  VERSION = '1.1.4'
 
   include Transaction::Simple
 
@@ -555,7 +555,7 @@ class PDF::SimpleTable
               mx = 0
 
               if @show_headings
-                hOID = __open_new_object__(pdf) if @shade_headings
+                old_y = y
 
                 pdf.fill_color @heading_color
                 _height, y = __table_column_headings__(pdf, pos, max_width,
@@ -566,12 +566,13 @@ class PDF::SimpleTable
                 y1 = y
 
                 if @shade_headings
-                  pdf.close_object
                   pdf.fill_color! @shade_heading_color
                   pdf.rectangle(x0 - @gap / 2, y, x1 - x0, _height).fill
-                  pdf.reopen_object(hOID)
-                  pdf.close_object
-                  pdf.restore_state
+                  pdf.fill_color @heading_color
+                  __table_column_headings__(pdf, pos, max_width, height,
+                                            descender, @row_gap,
+                                            @heading_font_size, old_y)
+                  pdf.fill_color @text_color
                 end
 
                 dm = pdf.absolute_left_margin - base_left_margin
@@ -769,29 +770,29 @@ class PDF::SimpleTable
 
     # Find the maximum widths of the text within each column. Default to
     # zero.
-  def __find_table_max_width__(pdf)
-    max_width = PDF::Writer::OHash.new(0)
+  def __find_table_max_width__(pdf)     
+    max_width = PDF::Writer::OHash.new(-1)
 
-      # Find the maximum cell widths based on the data and the headings.
-      # Passing through the data multiple times is unavoidable as we must do
-      # some analysis first.
+    # Find the maximum cell widths based on the data and the headings.
+    # Passing through the data multiple times is unavoidable as we must
+    # do some analysis first.
     @data.each do |row|
-      @cols.each do |name, column|
-        w = pdf.text_width(row[name].to_s, @font_size)
-        w *= WIDTH_FACTOR
+     @cols.each do |name, column|
+       w = pdf.text_width(row[name].to_s, @font_size)
+       w *= PDF::SimpleTable::WIDTH_FACTOR
 
-        max_width[name] = w if w > max_width[name]
-      end
+       max_width[name] = w if w > max_width[name]
+     end
     end
 
     @cols.each do |name, column|
-      title = column.heading.title if column.heading
-      title ||= column.name
-      w = pdf.text_width(title, @heading_font_size)
-      w *= WIDTH_FACTOR
-      max_width[name] = w if w > max_width[name]
+     title = column.heading.title if column.heading
+     title ||= column.name
+     w = pdf.text_width(title, @heading_font_size)
+     w *= PDF::SimpleTable::WIDTH_FACTOR  
+     max_width[name] = w if w > max_width[name]
     end
-    max_width
+    max_width  
   end
   private :__find_table_max_width__
 

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.2.1 2005/08/25 03:38:05 austin Exp $
+# $Id: techbook.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 require 'pdf/simpletable'
 require 'pdf/charts/stddev'

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.2.2 2005/09/07 17:01:14 austin Exp $
+# $Id: writer.rb 184 2007-12-10 03:18:48Z sandal $
 #++
 require 'thread'
 require 'open-uri'
@@ -19,7 +19,7 @@ require 'color'
 module PDF
   class Writer
       # The version of PDF::Writer.
-    VERSION = '1.1.3'
+    VERSION = '1.1.4'
 
       # Escape the text so that it's safe for insertion into the PDF
       # document.
@@ -370,9 +370,8 @@ class PDF::Writer
       # Initialize the default font families.
     init_font_families
 
-      # Items formerly in EZWriter
     @font_size = 10
-    @pageset = []
+    @pageset = [@pages.first_page]
 
     if paper.kind_of?(Array)
       if paper.size == 4
@@ -400,7 +399,6 @@ class PDF::Writer
     @y = absolute_top_margin
       # Get the ID of the page that was created during the instantiation
       # process.
-    @pageset[1] = @pages.first_page
 
     fill_color!   Color::RGB::Black
     stroke_color! Color::RGB::Black
@@ -697,38 +695,6 @@ 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
-
-  def encrypted?
-    not @encryption.nil?
-  end
-
     # should be used for internal checks, not implemented as yet
   def check_all_here
   end
@@ -743,7 +709,7 @@ class PDF::Writer
 
     xref = []
 
-    content = "%PDF-#{@version}\n%����\n"
+    content = "%PDF-#{@version}\n%âãÏÓ\n"
     pos = content.size
 
     objects.each do |oo|
@@ -2186,12 +2152,14 @@ class PDF::Writer
     # number of pages in the page numbering scheme. The default +pattern+ is
     # "<PAGENUM> of <TOTALPAGENUM>".
     #
-    # If +starting+ is non-nil, this is the first page number. The number of
-    # total pages will be adjusted to account for this.
     #
     # Each time page numbers are started, a new page number scheme will be
     # started. The scheme number will be returned.
-  def start_page_numbering(x, y, size, pos = nil, pattern = nil, starting = nil)
+  def start_page_numbering(x, y, size, pos = nil, pattern = nil)  
+    if starting
+      raise "We have currently disabled starting values for start_page_numbering" +
+            " because it is buggy." 
+    end   
     pos     ||= :left
     pattern ||= "<PAGENUM> of <TOTALPAGENUM>"
     starting  ||= 1
@@ -2279,7 +2247,7 @@ class PDF::Writer
   def add_page_numbers
       # This will go through the @page_numbering array and add the page
       # numbers are required.
-    if @page_numbering
+    if @page_numbering                           
       page_count  = @pageset.size
       pn_tmp      = @page_numbering.dup
 
@@ -2288,10 +2256,10 @@ class PDF::Writer
           # First, find the total pages for this schemes.
         page = page_number_search(:stop_total, scheme)
 
-        if page
+        if page                                       
           total_pages = page
         else
-          page = page_number_search(:stop_total_next, scheme)
+          page = page_number_search(:stop_total_next, scheme)        
           if page
             total_pages = page
           else
@@ -2300,7 +2268,7 @@ class PDF::Writer
         end
 
         status  = nil
-        delta   = pattern = pos = x = y = size = nil
+        pattern = pos = x = y = size = nil
 
         @pageset.each_with_index do |page, index|
           next if status.nil? and scheme[index].nil?
@@ -2309,11 +2277,6 @@ class PDF::Writer
           if info
             if info[:start]
               status = true
-            if info[:starting]
-                delta = info[:starting] - index
-            else
-                delta = index
-              end
 
               pattern = info[:pattern]
               pos     = info[:pos]
@@ -2333,8 +2296,8 @@ class PDF::Writer
 
           if status
               # Add the page numbering to this page
-            num   = index + delta.to_i
-            total = total_pages + num - index
+            num   = index + 1
+            total = total_pages
             patt  = pattern.gsub(/<PAGENUM>/, num.to_s).gsub(/<TOTALPAGENUM>/, total.to_s)
             reopen_object(page.contents.first)
 
@@ -2783,5 +2746,11 @@ class PDF::Writer
     # Save the PDF as a file to disk.
   def save_as(name)
     File.open(name, "wb") { |f| f.write self.render }
+  end 
+
+  # memory improvement for transaction-simple  
+  def _post_transaction_rewind
+    @objects.each { |e| e.instance_variable_set(:@parent,self) }
   end
+          
 end