prawn 0.3.0 → 0.4.0

data/lib/prawn/graphics.rb

@@ -7,7 +7,6 @@
 # This is free software. Please see the LICENSE and COPYING files for details.
 
 require "enumerator"
-require "prawn/graphics/cell"
 require "prawn/graphics/color"
 
 module Prawn
@@ -84,7 +83,13 @@ module Prawn
       add_content("#{width} w")
     end
 
-    # The current line thickness
+    # When called without an argument, returns the current line thickness.
+    # When called with an argument, sets the line thickness to the specified
+    # value (in PDF points)
+    #
+    #   pdf.line_width #=> 1
+    #   pdf.line_width(5)
+    #   pdf.line_width #=> 5
     #
     def line_width(width=nil)
       if width

data/lib/prawn/images/png.rb

@@ -23,7 +23,7 @@ module Prawn
       
       # Process a new PNG image
       #
-      # <tt>:data</tt>:: A string containing a full PNG file
+      # <tt>data</tt>:: A string containing a full PNG file
       #
       def initialize(data)
         data = StringIO.new(data.dup)

data/lib/prawn/reference.rb

@@ -15,14 +15,16 @@ module Prawn
    attr_accessor :gen, :data, :offset
    attr_reader :identifier, :stream
     
-    def initialize(id,data)
+    def initialize(id, data, &block)
       @identifier = id 
       @gen   = 0       
       @data  = data     
       @compressed = false
+      @on_encode = block
     end            
     
     def object 
+      @on_encode.call(self) if @on_encode
       output = "#{@identifier} #{gen} obj\n" <<
                Prawn::PdfObject(data) << "\n"
       if @stream
@@ -43,14 +45,15 @@ module Prawn
     def compress_stream
       @stream = Zlib::Deflate.deflate(@stream)
       @data[:Filter] = :FlateDecode
+      @data[:Length] ||= @stream.length
       @compressed = true
     end
   end         
-  
+
   module_function
   
-  def Reference(*args) #:nodoc:
-    Reference.new(*args)
+  def Reference(*args, &block) #:nodoc:
+    Reference.new(*args, &block)
   end     
 
 end

data/spec/font_spec.rb

@@ -1,46 +1,15 @@
 # encoding: utf-8
 
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")           
+require 'iconv'
 
-describe "Font Metrics" do  
+describe "Font behavior" do  
 
   it "should default to Helvetica if no font is specified" do
     @pdf = Prawn::Document.new
-    @pdf.font.metrics.should == Prawn::Font::Metrics["Helvetica"]
+    @pdf.font.name.should == "Helvetica"
   end
 
-  it "should use the currently set font for font_metrics" do
-    @pdf = Prawn::Document.new
-    @pdf.font "Courier"
-    @pdf.font.metrics.should == Prawn::Font::Metrics["Courier"]
-   
-    comicsans = "#{Prawn::BASEDIR}/data/fonts/comicsans.ttf"
-    @pdf.font(comicsans)
-    @pdf.font.metrics.should == Prawn::Font::Metrics[comicsans]
-  end 
-
-  it "should wrap text" do
-    @pdf = Prawn::Document.new
-    @pdf.font "Courier"
-    @pdf.font.metrics.naive_wrap("Please wrap this text about HERE. More text that should be wrapped", 220, @pdf.font.size).should ==
-				 "Please wrap this text about\nHERE. More text that should be\nwrapped"
-  end
-
-  it "should respect end of line when wrapping text" do
-    @pdf = Prawn::Document.new
-    @pdf.font "Courier"
-    text = "Please wrap only before\nTHIS word. Don't wrap this"
-    @pdf.font.metrics.naive_wrap(text, 220, @pdf.font.size).should == text
-  end
-
-  it "should respect end of line when wrapping text and mode is set to 'character'" do
-    @pdf = Prawn::Document.new
-    @pdf.font "Courier"
-    opts = {:mode => :character}
-    @pdf.font.metrics.naive_wrap("You can wrap this text HERE", 180, @pdf.font.size, opts).should ==
-				 "You can wrap this text HE\nRE"
-  end     
-  
 end    
 
 describe "font style support" do
@@ -66,8 +35,26 @@ describe "font style support" do
     text.font_settings.map { |e| e[:name] }.should == 
      [:"Courier-Bold", :"Courier-BoldOblique", :"Courier-Oblique", 
       :Courier, :Helvetica]
- end
-      
+  end
+
+  it "should allow font familes to be defined in a single dfont" do
+    file = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
+    @pdf.font_families["Action Man"] = {
+      :normal      => { :file => file, :font => "ActionMan" },
+      :italic      => { :file => file, :font => "ActionMan-Italic" },
+      :bold        => { :file => file, :font => "ActionMan-Bold" },
+      :bold_italic => { :file => file, :font => "ActionMan-BoldItalic" }
+    }
+
+    @pdf.font "Action Man", :style => :italic
+    @pdf.text "In ActionMan-Italic"
+
+    text = PDF::Inspector::Text.analyze(@pdf.render)
+    name = text.font_settings.map { |e| e[:name] }.first
+    name = name.unpack("n*")[2..-1].pack("U*")
+    name = name.sub(/\w+\+/, "subset+")
+    name.should == "subset+ActionMan-Italic"
+  end
 end
 
 describe "Transactional font handling" do
@@ -75,51 +62,54 @@ describe "Transactional font handling" do
   
   it "should allow setting of size directly when font is created" do
     @pdf.font "Courier", :size => 16
-    @pdf.font.size.should == 16 
+    @pdf.font_size.should == 16 
   end
   
   it "should allow temporary setting of a new font using a transaction" do
-    original = @pdf.font
+    @pdf.font "Helvetica", :size => 12
     
     @pdf.font "Courier", :size => 16 do
       @pdf.font.name.should == "Courier"
-      @pdf.font.size.should == 16
+      @pdf.font_size.should == 16
     end
     
-    @pdf.font.should == original  
+    @pdf.font.name.should == "Helvetica"
+    @pdf.font_size.should == 12
+  end
+
+  it "should mask font size when using a transacation" do
+    @pdf.font "Courier", :size => 16 do
+      @pdf.font_size.should == 16
+    end
+
+    @pdf.font "Times-Roman"
+    @pdf.font "Courier"
+
+    @pdf.font_size.should == 12
   end
   
 end
 
-
 describe "Document#page_fonts" do
   before(:each) { create_pdf } 
   
-  it "should register the current font when changing pages" do
-    @pdf.font "Courier"
-    page_should_include_font("Courier") 
-    @pdf.start_new_page  
-    page_should_include_font("Courier")       
-  end 
-  
   it "should register fonts properly by page" do
-    @pdf.font "Courier"
-    @pdf.font "Helvetica"
-    @pdf.font "Times-Roman"          
+    @pdf.font "Courier"; @pdf.text("hello")
+    @pdf.font "Helvetica"; @pdf.text("hello")
+    @pdf.font "Times-Roman"; @pdf.text("hello")
     ["Courier","Helvetica","Times-Roman"].each { |f|
       page_should_include_font(f)
     }                                        
     
     @pdf.start_new_page    
-    @pdf.font "Helvetica"
-    ["Times-Roman","Helvetica"].each { |f|
-      page_should_include_font(f)    
-    }    
-    page_should_not_include_font("Courier")                           
+    @pdf.font "Helvetica"; @pdf.text("hello")
+    page_should_include_font("Helvetica")
+    page_should_not_include_font("Courier")
+    page_should_not_include_font("Times-Roman")
   end    
   
-  def page_includes_font?(font)          
-    @pdf.page_fonts.values.map { |e| e.data[:BaseFont] }.include?(font.to_sym)     
+  def page_includes_font?(font)
+    @pdf.page_fonts.values.map { |e| e.data[:BaseFont] }.include?(font.to_sym)
   end                             
   
   def page_should_include_font(font)    
@@ -136,6 +126,109 @@ describe "Document#page_fonts" do
       
 end
     
-    
-    
-    
+describe "AFM fonts" do
+  
+  setup do
+    create_pdf
+    @times = @pdf.find_font "Times-Roman"
+    @iconv = ::Iconv.new('Windows-1252', 'utf-8')
+  end
+  
+  it "should calculate string width taking into account accented characters" do
+    @times.width_of(@iconv.iconv("é"), :size => 12).should == @times.width_of("e", :size => 12)
+  end
+  
+  it "should calculate string width taking into account kerning pairs" do
+    @times.width_of(@iconv.iconv("To"), :size => 12).should == 13.332
+    @times.width_of(@iconv.iconv("To"), :size => 12, :kerning => true).should == 12.372
+    @times.width_of(@iconv.iconv("Tö"), :size => 12, :kerning => true).should == 12.372
+  end
+
+  it "should encode text without kerning by default" do
+    @times.encode_text(@iconv.iconv("To")).should == [[0, "To"]]
+    @times.encode_text(@iconv.iconv("Télé")).should == [[0, @iconv.iconv("Télé")]]
+    @times.encode_text(@iconv.iconv("Technology")).should == [[0, "Technology"]]
+    @times.encode_text(@iconv.iconv("Technology...")).should == [[0, "Technology..."]]
+  end
+
+  it "should encode text with kerning if requested" do
+    @times.encode_text(@iconv.iconv("To"), :kerning => true).should == [[0, ["T", 80, "o"]]]
+    @times.encode_text(@iconv.iconv("Télé"), :kerning => true).should == [[0, ["T", 70, @iconv.iconv("élé")]]]
+    @times.encode_text(@iconv.iconv("Technology"), :kerning => true).should == [[0, ["T", 70, "echnology"]]]
+    @times.encode_text(@iconv.iconv("Technology..."), :kerning => true).should == [[0, ["T", 70, "echnology", 65, "..."]]]
+  end
+  
+end
+
+describe "TTF fonts" do
+  
+  setup do
+    create_pdf
+    @activa = @pdf.find_font "#{Prawn::BASEDIR}/data/fonts/Activa.ttf"
+  end
+  
+  it "should calculate string width taking into account accented characters" do
+    @activa.width_of("é", :size => 12).should == @activa.width_of("e", :size => 12)
+  end
+  
+  it "should calculate string width taking into account kerning pairs" do
+    @activa.width_of("To", :size => 12).should == 15.228
+    @activa.width_of("To", :size => 12, :kerning => true).should == 12.996
+  end
+  
+  it "should encode text without kerning by default" do
+    @activa.encode_text("To").should == [[0, "To"]]
+    @activa.encode_text("Télé").should == [[0, "T\216l\216"]]
+    @activa.encode_text("Technology").should == [[0, "Technology"]]
+    @activa.encode_text("Technology...").should == [[0, "Technology..."]]
+    @activa.encode_text("Teχnology...").should == [[0, "Te"], [1, "!"], [0, "nology..."]]
+  end
+
+  it "should encode text with kerning if requested" do
+    @activa.encode_text("To", :kerning => true).should == [[0, ["T", 186.0, "o"]]]
+    @activa.encode_text("To", :kerning => true).should == [[0, ["T", 186.0, "o"]]]
+    @activa.encode_text("Technology", :kerning => true).should == [[0, ["T", 186.0, "echnology"]]]
+    @activa.encode_text("Technology...", :kerning => true).should == [[0, ["T", 186.0, "echnology", 88.0, "..."]]]
+    @activa.encode_text("Teχnology...", :kerning => true).should == [[0, ["T", 186.0, "e"]], [1, "!"], [0, ["nology", 88.0, "..."]]]
+  end
+  
+end
+
+describe "DFont fonts" do
+  setup do
+    create_pdf
+    @file = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
+  end
+
+  it "should list all named fonts" do
+    list = Prawn::Font::DFont.named_fonts(@file)
+    list.sort.should == %w(ActionMan ActionMan-Italic ActionMan-Bold ActionMan-BoldItalic).sort
+  end
+
+  it "should count the number of fonts in the file" do
+    Prawn::Font::DFont.font_count(@file).should == 4
+  end
+
+  it "should default selected font to the first one if not specified" do
+    font = @pdf.find_font(@file)
+    font.basename.should == "ActionMan"
+  end
+
+  it "should allow font to be selected by index" do
+    font = @pdf.find_font(@file, :font => 2)
+    font.basename.should == "ActionMan-Italic"
+  end
+
+  it "should allow font to be selected by name" do
+    font = @pdf.find_font(@file, :font => "ActionMan-BoldItalic")
+    font.basename.should == "ActionMan-BoldItalic"
+  end
+
+  it "should cache font object based on selected font" do
+    f1 = @pdf.find_font(@file, :font => "ActionMan")
+    f2 = @pdf.find_font(@file, :font => "ActionMan-Bold")
+    assert_not_equal f1.object_id, f2.object_id
+    assert_equal f1.object_id, @pdf.find_font(@file, :font => "ActionMan").object_id
+    assert_equal f2.object_id, @pdf.find_font(@file, :font => "ActionMan-Bold").object_id
+  end
+end

data/spec/text_spec.rb

@@ -17,6 +17,17 @@ describe "when drawing text" do
      @pdf.y.should.be.close(position - 3*@pdf.font.height, 0.0001)
    end
    
+   it "should advance down the document based on font ascender only if final_gap is given" do
+     position = @pdf.y
+     @pdf.text "Foo", :final_gap => false
+
+     @pdf.y.should.be.close(position - @pdf.font.ascender, 0.0001)
+
+     position = @pdf.y
+     @pdf.text "Foo\nBar\nBaz", :final_gap => false
+     @pdf.y.should.be.close(position - 2*@pdf.font.height - @pdf.font.ascender, 0.0001)
+   end
+
    it "should default to 12 point helvetica" do
       @pdf.text "Blah", :at => [100,100]              
       text = PDF::Inspector::Text.analyze(@pdf.render)  
@@ -32,14 +43,19 @@ describe "when drawing text" do
    end
    
    it "should allow setting a default font size" do
-     @pdf.font.size = 16
+     @pdf.font_size = 16
      @pdf.text "Blah"
      text = PDF::Inspector::Text.analyze(@pdf.render)  
      text.font_settings[0][:size].should == 16
    end
+
+   it "should allow setting font size in DSL style" do
+     @pdf.font_size 20
+     @pdf.font_size.should == 20
+   end
    
    it "should allow overriding default font for a single instance" do
-     @pdf.font.size = 16
+     @pdf.font_size = 16
 
      @pdf.text "Blah", :size => 11
      @pdf.text "Blaz"
@@ -49,7 +65,7 @@ describe "when drawing text" do
    end
    
    it "should allow setting a font size transaction with a block" do
-     @pdf.font.size 16 do
+     @pdf.font_size 16 do
        @pdf.text 'Blah'
      end
 
@@ -62,7 +78,7 @@ describe "when drawing text" do
    
    it "should allow manual setting the font size " +
        "when in a font size block" do
-     @pdf.font.size(16) do
+     @pdf.font_size(16) do
         @pdf.text 'Foo'
         @pdf.text 'Blah', :size => 11
         @pdf.text 'Blaz'
@@ -115,8 +131,6 @@ describe "when drawing text" do
        lambda { @pdf.text str }.should.raise(ArgumentError)
      end
      it "should not raise an exception when a shift-jis string is rendered" do 
-       puts "\nFIXME: SJIS not working on 1.9 right now due to TTFunk issue"
-       return
        datafile = "#{Prawn::BASEDIR}/data/shift_jis_text.txt"  
        sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets } 
        @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf")
@@ -134,4 +148,31 @@ describe "when drawing text" do
      end
    end 
 
+  it "should wrap text" do
+    @pdf = Prawn::Document.new
+    @pdf.font "Courier"
+
+    text = "Please wrap this text about HERE. More text that should be wrapped"
+    expect = "Please wrap this text about\nHERE. More text that should be\nwrapped"
+
+    @pdf.naive_wrap(text, 220, @pdf.font_size).should == expect
+  end
+
+  it "should respect end of line when wrapping text" do
+    @pdf = Prawn::Document.new
+    @pdf.font "Courier"
+    text = "Please wrap only before\nTHIS word. Don't wrap this"
+    @pdf.naive_wrap(text, 220, @pdf.font_size).should == text
+  end
+
+  it "should respect end of line when wrapping text and mode is set to 'character'" do
+    @pdf = Prawn::Document.new
+    @pdf.font "Courier"
+
+    text = "You can wrap this text HERE"
+    expect = "You can wrap this text HE\nRE"
+
+    @pdf.naive_wrap(text, 180, @pdf.font_size, :mode => :character).should == expect
+  end     
+  
 end

data/vendor/pdf-inspector/lib/pdf/inspector.rb

@@ -14,7 +14,7 @@ module PDF
     end         
     
     def self.analyze_file(filename,*args,&block)
-      analyze(File.open(filenmame, "rb") { |f| f.read },*args,&block)
+      analyze(File.open(filename, "rb") { |f| f.read },*args,&block)
     end  
     
     def self.parse(obj)

data/vendor/ttfunk/example.rb

@@ -1,5 +1,45 @@
 $LOAD_PATH << "#{File.dirname(__FILE__)}/lib"
 require "ttfunk"
 
-file = TTFunk::File.new("data/fonts/DejaVuSans.ttf")
-p file.kern.sub_tables[0].keys.sort
+def character_lookup(file, character)
+  puts "character     : #{character}"
+
+  character_code = character.unpack("U*").first
+  puts "character code: #{character_code}"
+
+  glyph_id = file.cmap.unicode.first[character_code]
+  puts "glyph id      : #{glyph_id}"
+
+  glyph = file.glyph_outlines.for(glyph_id)
+  puts "glyph type    : %s" % glyph.class.name.split(/::/).last.downcase
+  puts "glyph size    : %db" % glyph.raw.length
+  puts "glyph bbox    : (%d,%d)-(%d,%d)" % [glyph.x_min, glyph.y_min, glyph.x_max, glyph.y_max]
+
+  if glyph.compound?
+    puts "components    : %d %s" % [glyph.glyph_ids.length, glyph.glyph_ids.inspect]
+  end
+end
+
+file = TTFunk::File.open(ARGV.first || "data/fonts/DejaVuSans.ttf")
+
+puts "-- FONT ------------------------------------"
+
+puts "revision  : %08x" % file.header.font_revision
+puts "name      : #{file.name.font_name.join(', ')}"
+puts "family    : #{file.name.font_family.join(', ')}"
+puts "subfamily : #{file.name.font_subfamily.join(', ')}"
+puts "postscript: #{file.name.postscript_name}"
+
+puts "-- FONT METRICS ----------------------------"
+
+puts "units/em  : #{file.header.units_per_em}"
+puts "ascent    : #{file.ascent}"
+puts "descent   : #{file.descent}"
+puts "line gap  : #{file.line_gap}"
+puts "bbox      : (%d,%d)-(%d,%d)" % file.bbox
+
+puts "-- SIMPLE CHARACTER -> GLYPH LOOKUP --------"
+character_lookup(file, "\xE2\x98\x9C")
+
+puts "-- COMPOUND CHARACTER -> GLYPH LOOKUP ------"
+character_lookup(file, "ë")