pdf-writer 1.0.1 → 1.1.0

data/ChangeLog

@@ -1,11 +1,40 @@
 = PDF::Writer Change Log
 
-== PDF::Writer 1.0.1
+== PDF::Writer 1.1.0: June 29, 2005
+  NOTE: The first two changes are INCOMPATIBLE with previous versions of
+  PDF::Writer. If you find that your text is showing up at odd angles, negate
+  the value. That is, if you have 90 as your angle, use -90 (or 270) as your
+  angle and it will work like it used to.
+
+* Axis transformations in PDF::Writer::Graphics have been fixed.
+* Text axis transformation in PDF::Writer#add_text has been fixed.
+* Changed #text_width and #text_line_width so that the text value is the
+  first parameter and the size parameter is second, and is optional. The code
+  warns about it now, but it will break in PDF::Writer 2.0.
+* Changed #add_text and #add_text_wrap so that the text parameter is before
+  the now-optional size parameter. The code warns about it now, but it will
+  break in PDF::Writer 2.0.
+* Added #transform_matrix.
+* Fixed compression. NOTE: Compression must be set early in the documentation
+  process, or only some items will be compressed in the document. The various
+  #save_as methods have been changed to reflect this fact.
+* Enabled the placement of encoding differences dictionaries in the resulting
+  PDF document. This change should be considered experimental.
+* Added TTF licence checking. The embedding of a file not licenced for
+  inclusion in a document will continue, but a warning will be output to
+  standard error. This code has been gakked from FPDF (http://www.fpdf.org).
+* Properly supporting symbolic font flags now.
+* Added support and documentation for a separately downloadable demo package.
+* Expanded the installation documentation.
+* Added the ability to make images clickable links with any of the three
+  image insertion methods.
+
+== PDF::Writer 1.0.1: June 13, 2005
 * Fixed a few minor gem issues.
 * Renamed bin/manual to bin/techbook.
 * Fixed the manual.pwd locator for the default install.
 
-== PDF::Writer 1.0.0
+== PDF::Writer 1.0.0: June 12, 2005
 * Integrated ezwriter.rb functionality with writer.rb.
 * Factored out some functionality into modules and classes.
 * Added CMYK colour support to JPEG images.
@@ -28,12 +57,12 @@
   component characters, not the represented characters.
 * Fixed a performance bug. Thanks again to Leslie Hensley.
 
-== PDF::Writer 0.1.2 (CVS only)
+== PDF::Writer 0.1.2: CVS only
 * Fixed a problem with the improper reading of character numbers from .afm
   files that are not default files. Other font issues remain but will be fixed
   at a later date.
 
-== PDF::Writer 0.1.0
+== PDF::Writer 0.1.0: September, 2003
 * Initial technology preview.
 
 #--
@@ -44,6 +73,6 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: ChangeLog,v 1.10 2005/06/13 20:03:53 austin Exp $
+# $Id: ChangeLog,v 1.16 2005/06/29 10:25:50 austin Exp $
 #++
 # vim: sts=2 sw=2 ts=4 et ai tw=77

data/LICENCE

@@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 == Works Included Under Other Licences
-=== lib/pdf/writer/graphics/imageinfo.rb
+=== pdf/writer/graphics/imageinfo.rb
 PDF::Writer includes a derivative of Keisuke Minami's ImageSize library,
 which can be found at rubycgi[http://www.rubycgi.org/tools/index.en.htm].
 This work�and only this or other named works�may be treated as under the Ruby
@@ -48,13 +48,13 @@ Attributions ShareAlike[http://creativecommons.org/licenses/by-sa/2.0/]
 licence.
 
 === Adobe PostScript AFM Files
-[MustRead.html] and the 14 PostScript(R) AFM files it accompanies may be
-used, copied, and distributed for any purpose and without charge, with or
-without modification, provided that all copyright notices are retained; that
-the AFM files are not distributed without this file; that all modifications
-to this file or any of the AFM files are prominently noted in the modified
-file(s); and that this paragraph is not modified. Adobe Systems has no
-responsibility or obligation to support the use of the AFM files.
+pdf/writer/fonts/MustRead.html and the 14 PostScript(R) AFM files it
+accompanies may be used, copied, and distributed for any purpose and without
+charge, with or without modification, provided that all copyright notices are
+retained; that the AFM files are not distributed without this file; that all
+modifications to this file or any of the AFM files are prominently noted in
+the modified file(s); and that this paragraph is not modified. Adobe Systems
+has no responsibility or obligation to support the use of the AFM files.
 
 == Other Credits
 === PDF::Writer
@@ -62,11 +62,18 @@ PDF::Writer is based originally on the R & OS PDF class for
 PHP[http://www.ros.co.nz/pdf/], which is released as public domain.
 
 === Standard Deviation Chart
-The standard deviation chart (lib/pdf/charts/stddev.rb) class is based on
+The standard deviation chart (pdf/charts/stddev.rb) class is based on
 work by Cris Ewing[mailto:cewing@u.washington.edu] of the University of
 Washington School of Medicine, originally created for the R & OS PDF class
 for PHP. He has graciously donated the code for PDF::Writer for Ruby.
 
+=== bluesmoke.jpg
+The logo image for PDF::Writer, bluesmoke.jpg, is modified from a picture
+taken by Matthew "TheSaint" Bowden[mailto:matthewbowden@gmail.com] and is
+available on the stock.xchng(R) at
+<http://www.sxc.hu/browse.phtml?f=view&id=275430>. Many thanks to Matthew for
+the use of this image.
+
 == Patents Covering the Adobe PDF Format
 === ADOBE PATENTS
 This software is based on Adobe's PDF Reference, Third Edition, version 1.6.
@@ -114,5 +121,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.7 2005/06/06 21:12:12 austin Exp $
+$Id: LICENCE,v 1.10 2005/06/29 19:32:07 austin Exp $
 # vim: sts=2 sw=2 ts=4 et ai tw=77

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.5 2005/06/13 19:32:37 austin Exp $
+# $Id: demo.rb,v 1.8 2005/06/29 03:00:31 austin Exp $
 #++
 begin
   require 'pdf/writer'
@@ -59,15 +59,15 @@ y = 800
   height = pdf.font_height(size)
   y = y - height
 
-  pdf.add_text(30, y, size, line)
+  pdf.add_text(30, y, line, size)
 end
 
 (0...360).step(20) do |angle|
   pdf.fill_color(Color::RGB.from_fraction(rand, rand, rand))
 
   pdf.add_text(300 + Math.cos(PDF::Math.deg2rad(angle)) * 40,
-               300 - Math.sin(PDF::Math.deg2rad(angle)) * 40,
-               20, line, angle)
+               300 + Math.sin(PDF::Math.deg2rad(angle)) * 40,
+               line, 20, angle)
 end
 
-pdf.save_as("demo.pdf", true)
+pdf.save_as("demo.pdf")

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.4 2005/06/13 19:32:37 austin Exp $
+# $Id: gettysburg.rb,v 1.5 2005/06/15 21:38:38 austin Exp $
 #++
 begin
   require 'pdf/writer'
@@ -47,7 +47,7 @@ government of the people, by the people, for the people shall
 not perish from the earth.
 EOS
 
-gba = GETTYSBURG.split($/).join(" ").squeeze
+gba = GETTYSBURG.split($/).join(" ").squeeze(" ")
 
 pdf.text "The Gettysburg Address\n\n", :font_size => 36,
   :justification => :center

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.11 2005/06/13 19:32:37 austin Exp $
+# $Id: qr-language.rb,v 1.14 2005/06/29 19:57:30 austin Exp $
 #++
 begin
   require 'pdf/writer'
@@ -42,6 +42,7 @@ usage: #{File.basename($0)} [paper-size]
 end
 
 PDF::QuickRef.make(paper, 3) do
+  pdf.compressed    = true
   pdf.info.author   = "Ryan Davis"
   pdf.info.title    = "Ruby Language Quick Reference"
   pdf.info.subject  = "The Ruby Programming Language"
@@ -571,11 +572,9 @@ end
   x = pdf.absolute_right_margin + pdf.font_height(5)
   y = pdf.absolute_bottom_margin
   memo = %Q(Copyright � 2005 Ryan Davis with Austin Ziegler. PDF version by Austin Ziegler. Licensed under the  <c:alink uri="http://creativecommons.org/licenses/by-nc-sa/2.0/">Creative Commons Attribution-NonCommercial-ShareAlike</c:alink> Licence. The original HTML version is at <c:alink uri="http://www.zenspider.com/Languages/Ruby/QuickRef.html">Zen Spider</c:alink>. Generated by <c:alink uri="http://rubyforge.org/projects/ruby-pdf/">PDF::Writer</c:alink> #{PDF::Writer::VERSION} and PDF::QuickRef #{PDF::QuickRef::VERSION}.)
-  pdf.add_text(x, y, 5, memo, -90)
+  pdf.add_text(x, y, memo, 5, 90)
   x = pdf.absolute_right_margin - 32
   y = pdf.absolute_bottom_margin + 24
 
-  pdf.add_image_from_file("../images/pdfwriter-icon.jpg", x, y)
-
   save_as "Ruby-Language-QuickRef.pdf"
 end

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.5 2005/06/13 19:32:37 austin Exp $
+# $Id: qr-library.rb,v 1.7 2005/06/29 03:12:11 austin Exp $
 #++
 begin
   require 'pdf/writer'
@@ -42,6 +42,7 @@ usage: #{File.basename($0)} [paper-size]
 end
 
 PDF::QuickRef.make(paper, 3) do
+  pdf.compressed    = true
   pdf.info.author   = "Ryan Davis"
   pdf.info.title    = "Ruby Library Quick Reference"
   pdf.info.subject  = "The Ruby Standard Library"
@@ -371,7 +372,7 @@ empty	A null command repeats the last command.
   x = pdf.absolute_right_margin + pdf.font_height(5)
   y = pdf.absolute_bottom_margin
   memo = %Q(Copyright � 2005 Ryan Davis with Austin Ziegler. PDF version by Austin Ziegler. Licensed under the  <c:alink uri="http://creativecommons.org/licenses/by-nc-sa/2.0/">Creative Commons Attribution-NonCommercial-ShareAlike</c:alink> Licence. The original HTML version is at <c:alink uri="http://www.zenspider.com/Languages/Ruby/QuickRef.html">Zen Spider</c:alink>. Generated by <c:alink uri="http://rubyforge.org/projects/ruby-pdf/">PDF::Writer</c:alink> #{PDF::Writer::VERSION} and PDF::QuickRef #{PDF::QuickRef::VERSION}.)
-  pdf.add_text(x, y, 5, memo, -90)
+  pdf.add_text(x, y, memo, 5, 90)
   x = pdf.absolute_right_margin - 32
   y = pdf.absolute_bottom_margin + 24
 

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.6 2005/06/13 19:32:37 austin Exp $
+# $Id: stddev.rb,v 1.8 2005/06/28 21:32:17 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.0.1'
+  VERSION = '1.1.0'
 
     # A data element.
   DataPoint = Struct.new(:label, :average, :stddev)
@@ -264,7 +264,7 @@ class PDF::Charts::StdDev
 
       if @scale.show_labels
         scales.each_value do |scale|
-          this_width = pdf.text_width(@scale.label.text_size, scale.value)
+          this_width = pdf.text_width(scale.value, @scale.label.text_size)
           widest_scale_label = this_width if this_width > widest_scale_label
         end
       end
@@ -322,10 +322,10 @@ class PDF::Charts::StdDev
 
         data.each_with_index do |datum, ii|
           label = datum.label.to_s
-          label_width = pdf.text_width(@label.text_size, label)
+          label_width = pdf.text_width(label, @label.text_size)
           this_x = chart_x + (ii * chunk_width) + (chunk_width / 2.0) - (label_width / 2.0)
           this_y = chart_y + (@label.height / 2.0) - (@label.text_size / 3.0)
-          pdf.add_text(this_x, this_y, @label.text_size, label)
+          pdf.add_text(this_x, this_y, label, @label.text_size)
         end
         pdf.restore_state
       end
@@ -362,10 +362,10 @@ class PDF::Charts::StdDev
         pdf.save_state
         scales.each_value do |scale|
           this_y = chart_y + scale.label_height
-          label_width = pdf.text_width(@scale.label.text_size, scale.value)
+          label_width = pdf.text_width(scale.value, @scale.label.text_size)
           this_x = chart_x - label_width - @scale.label.pad
           pdf.fill_color! @scale.label.text_color
-          pdf.add_text(this_x, this_y, @scale.label.text_size, scale.value)
+          pdf.add_text(this_x, this_y, scale.value, @scale.label.text_size)
         end
         pdf.restore_state
       end

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.8 2005/06/13 19:32:37 austin Exp $
+# $Id: quickref.rb,v 1.9 2005/06/16 04:28:25 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.0.1'
+  VERSION = '1.1.0'
 
     # Create the quick reference document. +paper+ is passed unchanged to
     # the PDF::Writer.new; the page is always created landscape. Margins
@@ -301,8 +301,8 @@ class PDF::QuickRef
   end
 
     # Writes the Quick Reference to disk.
-  def save_as(filename, compressed = true)
-    @pdf.save_as(filename, compressed)
+  def save_as(filename)
+    @pdf.save_as(filename)
   end
 
     # Generates the PDF document as a string.

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.10 2005/06/13 19:32:37 austin Exp $
+# $Id: simpletable.rb,v 1.12 2005/06/28 21:32:17 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.0.1'
+  VERSION = '1.1.0'
 
   include Transaction::Simple
 
@@ -410,7 +410,7 @@ class PDF::SimpleTable
 
         # If the title is set, then render it.
       unless @title.nil? or @title.empty?
-        w = pdf.text_width(@title_font_size, @title)
+        w = pdf.text_width(@title, @title_font_size)
         _y = pdf.y - pdf.font_height(@title_font_size)
         if _y < pdf.absolute_bottom_margin
           pdf.start_new_page
@@ -425,7 +425,7 @@ class PDF::SimpleTable
 
         pdf.y -= pdf.font_height(@title_font_size)
         pdf.fill_color @title_color
-        pdf.add_text(middle - w / 2.0, pdf.y, @title_font_size, title)
+        pdf.add_text(middle - w / 2.0, pdf.y, title, @title_font_size)
         pdf.y -= @title_gap
       end
 
@@ -646,7 +646,8 @@ class PDF::SimpleTable
 
                     pdf.y = _y
                     line = pdf.add_text_wrap(pos[name], pdf.y,
-                      max_width[name], @font_size, line, just)
+                                             max_width[name], line,
+                                             @font_size, just)
                   end
                 end
               end
@@ -776,7 +777,7 @@ class PDF::SimpleTable
       # some analysis first.
     @data.each do |row|
       @cols.each do |name, column|
-        w = pdf.text_width(@font_size, row[name].to_s)
+        w = pdf.text_width(row[name].to_s, @font_size)
         w *= WIDTH_FACTOR
 
         max_width[name] = w if w > max_width[name]
@@ -786,7 +787,7 @@ class PDF::SimpleTable
     @cols.each do |name, column|
       title = column.heading.title if column.heading
       title ||= column.name
-      w = pdf.text_width(@heading_font_size, title)
+      w = pdf.text_width(title, @heading_font_size)
       w *= WIDTH_FACTOR
       max_width[name] = w if w > max_width[name]
     end

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.13 2005/06/13 20:03:53 austin Exp $
+# $Id: techbook.rb,v 1.16 2005/06/28 21:32:17 austin Exp $
 #++
 require 'pdf/simpletable'
 require 'pdf/charts/stddev'
@@ -65,10 +65,10 @@ require 'ostruct'
   #
   # === Styling and Callback Tags
   # Within normal, preserved, or code text, or in headings, HTML-like markup
-  # may be used for bold (<b>), italic (<i>) and underlined
-  # (<u>) text. TechBook supports standard PDF::Writer callback tags
-  # (<c:alink>, <c:ilink>, <C:bullet/>, and <C:disc/>) and adds two new ones
-  # (<r:xref/>, <C:tocdots/>).
+  # may be used for bold (&lt;b&gt;) and italic (&lt;i&gt;) text. TechBook
+  # supports standard PDF::Writer callback tags (<c:alink>, <c:ilink>,
+  # <C:bullet/>, and <C:disc/>) and adds two new ones (<r:xref/>,
+  # <C:tocdots/>).
   #
   # <tt>&lt;r:xref/></tt>::     Creates an internal document link to the
   #                             named cross-reference destination. Works
@@ -242,8 +242,9 @@ class PDF::TechBook < PDF::Writer
     #         used for forward references; only +title+ or +text+ will be
     #         used.
     # text::  Required if +label+ has a value of +text+. Ignored if +label+
-    #         is +title+, optional if +label+ is +title+. This value will be
-    #         used as the display for the internal link.
+    #         is +title+, optional if +label+ is +page+. This value will be
+    #         used as the display text for the internal link. +text+
+    #         takes precedence over +title+ if +label+ is +page+.
   class TagXref
     def self.[](pdf, params)
       name  = params["name"]
@@ -256,9 +257,9 @@ class PDF::TechBook < PDF::Writer
         when 'page'
           label = xref[:page]
           if text.nil? or text.empty?
-            label ||= text
-          else
             label ||= xref[:title]
+          else
+            label ||= text
           end
         when 'title'
           label = xref[:title]
@@ -344,7 +345,7 @@ class PDF::TechBook < PDF::Writer
 
         pdf.line(xpos, info[:y], info[:x] + 5, info[:y]).stroke
         pdf.restore_state
-        pdf.add_text(xpos + 5, info[:y], size, page)
+        pdf.add_text(xpos + 5, info[:y], page, size)
       end
     end
   end
@@ -854,7 +855,7 @@ class PDF::TechBook < PDF::Writer
         if (_tm_doc < _tm_cch) and (_tm_prg < _tm_cch)
           $stderr.puts PDF::Writer::Lang[:techbook_using_cached_doc] % File.basename(files[:cache])
           pdf = File.open(files[:cache], "rb") { |cf| Marshal.load(cf.read) }
-          pdf.save_as(files[:pdf], config.compressed)
+          pdf.save_as(files[:pdf])
           File.open(files[:pdf], "wb") { |pf| pf.write pdf.render }
           exit(0)
         else
@@ -867,6 +868,7 @@ class PDF::TechBook < PDF::Writer
 
       # Create the manual object.
     pdf = PDF::TechBook.new
+    pdf.compressed = config.compressed
     pdf.techbook_source_dir = File.expand_path(dirn)
 
     document = open(files[:document]) { |io| io.read.split($/) }
@@ -884,7 +886,7 @@ class PDF::TechBook < PDF::Writer
       File.open(files[:cache], "wb") { |f| f.write Marshal.dump(pdf) }
     end
 
-    pdf.save_as(files[:pdf], config.compressed)
+    pdf.save_as(files[:pdf])
   end
 
   def techbook_text(line)