prawn 0.4.0 → 0.4.1

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 require "rake/rdoctask"
 require "rake/gempackagetask"  
 
-PRAWN_VERSION = "0.4.0" 
+PRAWN_VERSION = "0.4.1" 
 
 task :default => [:test]
        

data/lib/prawn.rb

@@ -20,7 +20,7 @@ module Prawn
   # The base source directory for Prawn as installed on the system
   BASEDIR = File.expand_path(File.join(dir, '..'))
   
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
   
   extend self
 

data/lib/prawn/document.rb

@@ -55,7 +55,7 @@ module Prawn
     #   end                                                
     #
     def self.generate(filename,options={},&block)
-      pdf = Prawn::Document.new(options,&block)          
+      pdf = new(options,&block)          
       pdf.render_file(filename)
     end
           

data/lib/prawn/document/text/box.rb

@@ -61,7 +61,7 @@ module Prawn
 
           lines = text.lines.to_a
           
-          unless lines.length < max_lines
+          if lines.length > max_lines
             @text = lines[0...max_lines].join
             case(@overflow)
             when :ellipses

data/lib/prawn/font/afm.rb

@@ -57,18 +57,11 @@ module Prawn
         scale = (options[:size] || size) / 1000.0
 
         if options[:kerning]
-          no_kern_opts = options.merge(:kerning => false)
-          kern(string).inject(0) do |s,r|
-            if r.is_a? String
-              s + width_of(r, no_kern_opts)
-            else
-              s - (r * scale)
-            end
-          end
+          strings, numbers = kern(string).partition { |e| e.is_a?(String) }
+          total_kerning_offset = numbers.inject(0.0) { |s,r| s + r }
+          (unscaled_width_of(strings.join) - total_kerning_offset) * scale
         else
-          string.unpack("C*").inject(0) do |s,r|
-            s + latin_glyphs_table[r]
-          end * scale
+          unscaled_width_of(string) * scale
         end
       end
 
@@ -162,23 +155,23 @@ module Prawn
       # String *must* be encoded as WinAnsi
       #
       def kern(string)
-        kerned = string.unpack("C*").inject([]) do |a,r|
-          if a.last.is_a? Array
-            if k = latin_kern_pairs_table[[a.last.last, r]]
-              a << k << [r]
-            else
-              a.last << r
-            end
+        kerned = [[]]
+        last_byte = nil
+
+        kern_pairs = latin_kern_pairs_table
+
+        string.unpack("C*").each do |byte|
+          if k = last_byte && kern_pairs[[last_byte, byte]]
+            kerned << -k << [byte]
           else
-            a << [r]
-          end
-          a
+            kerned.last << byte
+          end         
+          last_byte = byte
         end
 
-        kerned.map { |r|
-          i = r.is_a?(Array) ? r.pack("C*") : r
-          i.force_encoding("Windows-1252") if i.respond_to?(:force_encoding)
-          i.is_a?(Numeric) ? -i : i
+        kerned.map { |e| 
+          e = (Array === e ? e.pack("C*") : e)
+          e.respond_to?(:force_encoding) ? e.force_encoding("Windows-1252") : e  
         }
       end
 
@@ -194,6 +187,16 @@ module Prawn
           @glyph_widths[Encoding::WinAnsi::CHARACTERS[i]].to_i
         end
       end
+      
+      private
+      
+      def unscaled_width_of(string)
+        glyph_table = latin_glyphs_table
+        
+        string.unpack("C*").inject(0) do |s,r|
+          s + glyph_table[r]
+        end
+      end
     end
   end
 end

data/lib/prawn/font/ttf.rb

@@ -229,7 +229,10 @@ module Prawn
         # subset. Perhaps this could be done by querying the subset,
         # rather than by parsing the font that the subset produces?
         font = TTFunk::File.new(font_content)
-        basename = font.name.postscript_name
+
+        # empirically, it looks like Adobe Reader will not display fonts
+        # if their font name is more than 33 bytes long. Strange. But true.
+        basename = font.name.postscript_name[0, 33]
 
         raise "Can't detect a postscript name for #{file}" if basename.nil?
 
@@ -254,39 +257,44 @@ module Prawn
 
         hmtx = font.horizontal_metrics
         widths = font.cmap.tables.first.code_map.map { |gid|
-          Integer(hmtx.widths[gid] * scale_factor) }
+          Integer(hmtx.widths[gid] * scale_factor) }[32..-1]
+
+        # It would be nice to have Encoding set for the macroman subsets,
+        # and only do a ToUnicode cmap for non-encoded unicode subsets.
+        # However, apparently Adobe Reader won't render MacRoman encoded
+        # subsets if original font contains unicode characters. (It has to
+        # be some flag or something that ttfunk is simply copying over...
+        # but I can't figure out which flag that is.)
+        #
+        # For now, it's simplest to just create a unicode cmap for every font.
+        # It offends my inner purist, but it'll do.
+
+        map = @subsets[subset].to_unicode_map
+
+        ranges = [[]]
+        lines = map.keys.sort.inject("") do |s, code|
+          ranges << [] if ranges.last.length >= 100
+          unicode = map[code]
+          ranges.last << "<%02x><%04x>" % [code, unicode]
+        end
+
+        range_blocks = ranges.inject("") do |s, list|
+          s << "%d beginbfchar\n%s\nendbfchar\n" % [list.length, list.join("\n")]
+        end
+
+        to_unicode_cmap = UNICODE_CMAP_TEMPLATE % range_blocks.strip
+
+        cmap = @document.ref({})
+        cmap << to_unicode_cmap
+        cmap.compress_stream
 
         reference.data.update(:Subtype => :TrueType,
                               :BaseFont => basename,
                               :FontDescriptor => descriptor,
-                              :FirstChar => 0,
+                              :FirstChar => 32,
                               :LastChar => 255,
-                              :Widths => @document.ref(widths))
-
-        if @subsets[subset].unicode?
-          map = @subsets[subset].to_unicode_map
-
-          ranges = [[]]
-          lines = map.keys.sort.inject("") do |s, code|
-            ranges << [] if ranges.last.length >= 100
-            unicode = map[code]
-            ranges.last << "<%02x><%04x>" % [code, unicode]
-          end
-
-          range_blocks = ranges.inject("") do |s, list|
-            s << "%d beginbfchar\n%s\nendbfchar\n" % [list.length, list.join("\n")]
-          end
-
-          to_unicode_cmap = UNICODE_CMAP_TEMPLATE % range_blocks.strip
-
-          cmap = @document.ref({})
-          cmap << to_unicode_cmap
-          cmap.compress_stream
-
-          @references[subset].data[:ToUnicode] = cmap
-        else
-          @references[subset].data[:Encoding] = :MacRomanEncoding
-        end
+                              :Widths => @document.ref(widths),
+                              :ToUnicode => cmap)
       end
 
       UNICODE_CMAP_TEMPLATE = <<-STR.strip.gsub(/^\s*/, "")

data/spec/document_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "tempfile"
 
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper") 
 
@@ -11,6 +12,17 @@ describe "The cursor" do
     pdf.cursor.should == pdf.y - pdf.bounds.absolute_bottom 
   end
 end 
+
+describe "when generating a document from a subclass" do
+  it "should be an instance_eval of the subclass" do
+    custom_document = Class.new(Prawn::Document)
+    custom_document.generate(Tempfile.new("generate_test").path) do |e| 
+      e.class.should == custom_document
+      assert e.kind_of?(Prawn::Document)
+    end
+  end
+end
+
                                
 describe "When creating multi-page documents" do 
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prawn
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Gregory Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -05:00
+date: 2009-01-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency