pdf-writer 1.1.7 → 1.1.8

data/README

@@ -17,7 +17,7 @@ Please read the file LICENCE for licensing restrictions on this library, as
 well as important patent considerations.
 
 == Requirements
-PDF::Writer requires Ruby 1.8.2 or better, color-tools 1.3.0 or better, and
+PDF::Writer requires Ruby 1.8.2 or better, Color 1.4.0 or better, and
 Transaction::Simple 1.3.0 or better.
 
 #--
@@ -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 153 2007-02-07 02:28:41Z austin $
+# $Id: README 196 2008-01-04 23:15:50Z sandal $
 #++
 # vim: sts=2 sw=2 ts=4 et ai tw=77

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 194 2007-12-13 18:19:02Z sandal $
+# $Id: writer.rb 202 2008-03-16 23:30:11Z sandal $
 #++
 require 'thread'
 require 'open-uri'
@@ -19,7 +19,7 @@ require 'color'
 module PDF
   class Writer
       # The version of PDF::Writer.
-    VERSION = '1.1.7'
+    VERSION = '1.1.8'
 
       # Escape the text so that it's safe for insertion into the PDF
       # document.
@@ -800,7 +800,7 @@ class PDF::Writer
         break if fontfile
       end
     end
-
+    
     if font =~ /afm/o and fontfile
         # Find the array of font widths, and put that into an object.
       first_char  = -1
@@ -823,10 +823,12 @@ class PDF::Writer
         encoding_diff.each do |cnum, cname|
           (cnum - last_char).times { widths << 0 } if cnum > last_char
           last_char = cnum
-          widths[cnum - firstchar] = fonts.c[cname]['WX'] if metrics.c[cname]
+          widths[cnum - first_char] = metrics.c[cname]['WX'] if metrics.c[cname]
         end
       end
 
+      raise RuntimeError, 'Font metrics file (.afm) invalid - no charcters described' if first_char == -1 and last_char == 0
+
       widthid = PDF::Writer::Object::Contents.new(self, :raw)
       widthid << "["
       (first_char .. last_char).each do |ii|
@@ -841,38 +843,7 @@ class PDF::Writer
         # Load the pfb file, and put that into an object too. Note that PDF
         # supports only binary format Type1 font files and TrueType font
         # files. There is a simple utility to convert Type1 from pfa to pfb.
-      data = File.open(fbfile, "rb") { |ff| ff.read }
-
-        # Check to see if the font licence allows embedding.
-      if fbtype =~ /\.ttf$/o
-        offset  = 4
-        tables  = data[offset, 2].unpack('n')[0]
-        offset += 8
-
-        found   = false
-        tables.times do
-          if data[offset, 4] == 'OS/2'
-            found = true
-            break
-          end
-          offset += 4 + 12
-        end
-
-        if found
-          offset += 4
-          newoff  = data[offset, 4].unpack('N')[0]
-          offset  = newoff + 8
-          licence = data[offset, 2].unpack('n')[0]
-
-          rl  = ((licence & 0x02) != 0)
-          pp  = ((licence & 0x04) != 0)
-          ee  = ((licence & 0x08) != 0)
-
-          if rl and pp and ee
-            warn PDF::Writer::Lang[:ttf_licence_no_embedding] % name
-          end
-        end
-      end
+      data = File.open(fontfile, "rb") { |ff| ff.read }
 
         # Create the font descriptor.
       fdsc = PDF::Writer::Object::FontDescriptor.new(self)
@@ -938,13 +909,13 @@ class PDF::Writer
       end
 
         # Determine the cruicial lengths within this file
-      if fbtype =~ /\.pfb$/o
+      if fontfile =~ /\.pfb$/o
         fdopt['FontFile'] = pfbc.oid
         i1 = data.index('eexec') + 6
         i2 = data.index('00000000')  - i1
         i3 = data.size - i2 - i1
         pfbc.add('Length1' => i1, 'Length2' => i2, 'Length3' => i3)
-      elsif fbtype =~ /\.ttf$/o
+      elsif fontfile =~ /\.ttf$/o
         fdopt['FontFile2'] = pfbc.oid
         pfbc.add('Length1' => data.size)
       end
@@ -961,7 +932,7 @@ class PDF::Writer
         'LastChar'        => last_char,
         'FontDescriptor'  => fdsc.oid
       }
-      tmp['SubType'] = 'TrueType' if fbtype == "ttf"
+      tmp['SubType'] = 'TrueType' if fontfile =~ /\.ttf/
 
       tmp.each { |kk, vv| wfo.__send__("#{kk.downcase}=".intern, vv) }
     end
@@ -2240,7 +2211,7 @@ class PDF::Writer
   end
   private :page_number_search
 
-  def add_page_numbers
+  def add_page_numbers            
       # This will go through the @page_numbering array and add the page
       # numbers are required.
     if @page_numbering                           
@@ -2252,14 +2223,14 @@ 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)        
-          if page
+          if page  
             total_pages = page
-          else
-            total_pages = page_count
+          else                     
+            total_pages = page_count - 1
           end
         end
 

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

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: font.rb 101 2005-06-28 21:32:17Z austin $
+# $Id: font.rb 198 2008-03-03 15:26:31Z jh $
 #++
   # An object to hold the font description
 class PDF::Writer::Object::Font < PDF::Writer::Object
@@ -42,11 +42,15 @@ class PDF::Writer::Object::Font < PDF::Writer::Object
     # Valid values: WinAnsiEncoding, MacRomanEncoding, MacExpertEncoding,
     # none, +nil+, or an instance of PDF::Writer::Object::FontEncoding.
   attr_reader :encoding
-  attr_reader :basefont
+
   def basefont #:nodoc:
     @name
   end
 
+  def basefont=(val) #:nodoc:
+    @name = val
+  end
+
   Details.each do |d|
     attr_accessor d.downcase.intern
   end

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

@@ -6,7 +6,7 @@
 #   Licensed under a MIT-style licence. See LICENCE in the main distribution
 #   for full licensing information.
 #
-# $Id: fontdescriptor.rb 50 2005-05-16 03:59:21Z austin $
+# $Id: fontdescriptor.rb 198 2008-03-03 15:26:31Z jh $
 #++
   # A font descriptor, needed for including additional fonts. +options+ is a
   # Hash with one of the following keys: Ascent, CapHeight, Descent, Flags,
@@ -29,6 +29,6 @@ class PDF::Writer::Object::FontDescriptor < PDF::Writer::Object
       res << "/#{k} [#{v.join(' ')}]\n" if k == "FontBBox"
       res << "/#{k} /#{v}\n" if k == "FontName"
     end
-    res << "\n>>\nendobj"
+    res << ">>\nendobj"
   end
 end

data/manual.pwd

@@ -2889,7 +2889,7 @@ the binary contents of a PNG or JPEG file <i>or</i> it must be a PDF image
 that has previously been inserted by one of the image insertion methods
 (including this one).
 
-The loaded image will be placed with its <i>upper left-hand corner</i> at
+The loaded image will be placed with its <i>lower left-hand corner</i> at
 <b>(x, y)</b> on the current page. The size of the image will be determined
 by the <b>width</b> and <b>height</b> parameters. If neither width nor height
 are provided, the image will be inserted at its �natural� size.
@@ -5960,6 +5960,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 153 2007-02-07 02:28:41Z austin $
+# $Id: manual.pwd 196 2008-01-04 23:15:50Z sandal $
 # vim: sts=2 sw=2 ts=4 et ai tw=77 foldmethod=marker foldcolumn=2
 #++

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: pdf-writer
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
-date: 2007-12-13 00:00:00 -05:00
+  version: 1.1.8
+date: 2008-03-16 00:00:00 -04:00
 summary: A pure Ruby PDF document creation library.
 require_paths: 
 - lib