prawn 0.12.0 → 0.13.0

data/lib/prawn/font/afm.rb

@@ -7,6 +7,7 @@
 # This is free software. Please see the LICENSE and COPYING files for details.
 
 require 'prawn/encoding'
+require 'afm'
 
 module Prawn
   class Font
@@ -27,8 +28,8 @@ module Prawn
           @metrics_path ||= [
             ".", "/usr/lib/afm",
             "/usr/local/lib/afm",
-            "/usr/openwin/lib/fonts/afm/",
-             Prawn::BASEDIR+'/data/fonts/']
+            "/usr/openwin/lib/fonts/afm",
+             Prawn::DATADIR+'/fonts']
         end
       end
 
@@ -41,26 +42,28 @@ module Prawn
 
         super
 
-        @attributes     = {}
-        @glyph_widths   = {}
-        @bounding_boxes = {}
-        @kern_pairs     = {}
+        @@winansi   ||= Prawn::Encoding::WinAnsi.new # parse data/encodings/win_ansi.txt once only
+        @@font_data ||= SynchronizedCache.new        # parse each ATM font file once only
 
         file_name = @name.dup
         file_name << ".afm" unless file_name =~ /\.afm$/
         file_name = file_name[0] == ?/ ? file_name : find_font(file_name)
 
-        parse_afm(file_name)
+        font_data = @@font_data[file_name] ||= ::AFM::Font.new(file_name)
+        @glyph_table     = build_glyph_table(font_data)
+        @kern_pairs      = font_data.kern_pairs
+        @kern_pair_table = build_kern_pair_table(@kern_pairs)
+        @attributes      = font_data.metadata
 
-        @ascender  = @attributes["ascender"].to_i
-        @descender = @attributes["descender"].to_i
+        @ascender  = @attributes["Ascender"].to_i
+        @descender = @attributes["Descender"].to_i
         @line_gap  = Float(bbox[3] - bbox[1]) - (@ascender - @descender)
       end
 
       # The font bbox, as an array of integers
       #
       def bbox
-        @bbox ||= @attributes['fontbbox'].split(/\s+/).map { |e| Integer(e) }
+        @bbox ||= @attributes['FontBBox'].split(/\s+/).map { |e| Integer(e) }
       end
 
       # NOTE: String *must* be encoded as WinAnsi
@@ -87,7 +90,7 @@ module Prawn
       # is replaced with a string in WinAnsi encoding.
       #
       def normalize_encoding(text)
-        enc = Prawn::Encoding::WinAnsi.new
+        enc = @@winansi
         text.unpack("U*").collect { |i| enc[i] }.pack("C*")
       rescue ArgumentError
         raise Prawn::Errors::IncompatibleStringEncoding,
@@ -138,7 +141,7 @@ module Prawn
       end
 
       def symbolic?
-        attributes["characterset"] == "Special"
+        attributes["CharacterSet"] == "Special"
       end
 
       def find_font(file)
@@ -149,46 +152,6 @@ module Prawn
            self.class.metrics_path.join("\n")
       end
 
-      def parse_afm(file_name)
-        section = []
-
-        File.foreach(file_name) do |line|
-          case line
-          when /^Start(\w+)/
-            section.push $1
-            next
-          when /^End(\w+)/
-            section.pop
-            next
-          end
-
-          case section
-          when ["FontMetrics", "CharMetrics"]
-            next unless line =~ /^CH?\s/
-
-            name                  = line[/\bN\s+(\.?\w+)\s*;/, 1]
-            @glyph_widths[name]   = line[/\bWX\s+(\d+)\s*;/, 1].to_i
-            @bounding_boxes[name] = line[/\bB\s+([^;]+);/, 1].to_s.rstrip
-          when ["FontMetrics", "KernData", "KernPairs"]
-            next unless line =~ /^KPX\s+(\.?\w+)\s+(\.?\w+)\s+(-?\d+)/
-            @kern_pairs[[$1, $2]] = $3.to_i
-          when ["FontMetrics", "KernData", "TrackKern"],
-            ["FontMetrics", "Composites"]
-            next
-          else
-            parse_generic_afm_attribute(line)
-          end
-        end
-      end
-
-      def parse_generic_afm_attribute(line)
-        line =~ /(^\w+)\s+(.*)/
-        key, value = $1.to_s.downcase, $2
-
-        @attributes[key] =  @attributes[key] ?
-        Array(@attributes[key]) << value : value
-      end
-
       # converts a string into an array with spacing offsets
       # bewteen characters that need to be kerned
       #
@@ -198,46 +161,41 @@ module Prawn
         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]]
+        string.each_byte do |byte|
+          if k = last_byte && @kern_pair_table[[last_byte, byte]]
             kerned << -k << [byte]
           else
             kerned.last << byte
-          end         
+          end
           last_byte = byte
         end
 
-        kerned.map { |e| 
+        kerned.map { |e|
           e = (Array === e ? e.pack("C*") : e)
-          e.respond_to?(:force_encoding) ? e.force_encoding("Windows-1252") : e  
+          e.respond_to?(:force_encoding) ? e.force_encoding("Windows-1252") : e
         }
       end
 
-      def latin_kern_pairs_table
-        return @kern_pairs_table if defined?(@kern_pairs_table)
-        
+      def build_kern_pair_table(kern_pairs)
         character_hash = Hash[Encoding::WinAnsi::CHARACTERS.zip((0..Encoding::WinAnsi::CHARACTERS.size).to_a)]
-        @kern_pairs_table = @kern_pairs.inject({}) do |h,p|
-          h[p[0].map { |n| character_hash[n] }] = p[1]
+        kern_pairs.inject({}) do |h,p|
+          h[
+            [character_hash[p[0]], character_hash[p[1]]]
+          ] = p[2]
           h
         end
       end
 
-      def latin_glyphs_table
-        @glyphs_table ||= (0..255).map do |i|
-          @glyph_widths[Encoding::WinAnsi::CHARACTERS[i]].to_i
+      def build_glyph_table(font_data)
+        (0..255).map do |char|
+          metrics = font_data.metrics_for(char)
+          metrics ? metrics[:wx] : 0
         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]
+        string.bytes.inject(0) do |s,r|
+          s + @glyph_table[r]
         end
       end
     end

data/lib/prawn/font/dfont.rb

@@ -11,7 +11,7 @@ require 'prawn/font/ttf'
 module Prawn
   class Font
     class DFont < TTF
-      
+
       # Returns a list of the names of all named fonts in the given dfont file.
       # Note that fonts are not required to be named in a dfont file, so the
       # list may be empty even if the file does contain fonts. Also, note that
@@ -32,7 +32,7 @@ module Prawn
         end
       end
 
-      private 
+      private
 
       def read_ttf_file
         TTFunk::File.from_dfont(@name, @options[:font] || 0)

data/lib/prawn/font/ttf.rb

@@ -2,7 +2,7 @@
 
 # prawn/font/ttf.rb : Implements AFM font support for Prawn
 #
-# Copyright May 2008, Gregory Brown / James Healy / Jamis Buck  
+# Copyright May 2008, Gregory Brown / James Healy / Jamis Buck
 # All Rights Reserved.
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
@@ -18,7 +18,7 @@ module Prawn
       def unicode?
         true
       end
-      
+
       def initialize(document, name, options={})
         super
 
@@ -26,8 +26,8 @@ module Prawn
         @subsets          = TTFunk::SubsetCollection.new(@ttf)
 
         @attributes       = {}
-        @bounding_boxes   = {} 
-        @char_widths      = {}   
+        @bounding_boxes   = {}
+        @char_widths      = {}
         @has_kerning_data = @ttf.kerning.exists? && @ttf.kerning.tables.any?
 
         @ascender         = Integer(@ttf.ascent * scale_factor)
@@ -42,26 +42,26 @@ module Prawn
           kern(string).inject(0) do |s,r|
             if r.is_a?(Numeric)
               s - r
-            else 
+            else
               r.inject(s) { |s2, u| s2 + character_width_by_code(u) }
             end
           end * scale
         else
-          string.unpack("U*").inject(0) do |s,r|
+          string.codepoints.inject(0) do |s,r|
             s + character_width_by_code(r)
           end * scale
         end
-      end   
-     
+      end
+
       # The font bbox, as an array of integers
-      # 
+      #
       def bbox
         @bbox ||= @ttf.bbox.map { |i| Integer(i * scale_factor) }
       end
 
       # Returns true if the font has kerning data, false otherwise
       def has_kerning_data?
-        @has_kerning_data 
+        @has_kerning_data
       end
 
       # Perform any changes to the string that need to happen
@@ -77,7 +77,7 @@ module Prawn
 
         if options[:kerning]
           last_subset = nil
-          kern(text).inject([]) do |result, element| 
+          kern(text).inject([]) do |result, element|
             if element.is_a?(Numeric)
               result.last[1] = [result.last[1]] unless result.last[1].is_a?(Array)
               result.last[1] << element
@@ -102,7 +102,7 @@ module Prawn
           @subsets.encode(text.unpack("U*"))
         end
       end
-      
+
       def basename
         @basename ||= @ttf.name.postscript_name
       end
@@ -126,7 +126,7 @@ module Prawn
       def cap_height
         @cap_height ||= begin
           height = @ttf.os2.exists? && @ttf.os2.cap_height || 0
-          height == 0 ? ascender : height
+          height == 0 ? @ascender : height
         end
       end
 
@@ -160,44 +160,18 @@ module Prawn
       end
 
       def normalize_encoding(text)
-        if text.respond_to?(:encode)
-          # if we're running under a M17n aware VM, ensure the string provided is
-          # UTF-8 (by converting it if necessary)
-          begin
-            text.encode("UTF-8")
-          rescue
-            raise Prawn::Errors::IncompatibleStringEncoding, "Encoding " +
-            "#{text.encoding} can not be transparently converted to UTF-8. " +
-            "Please ensure the encoding of the string you are attempting " +
-            "to use is set correctly"
-          end
-        else
-          # on a non M17N aware VM, use unpack as a hackish way to verify the
-          # string is valid utf-8. I thought it was better than loading iconv
-          # though.
-          begin
-            text.unpack("U*")
-            return text.dup
-          rescue
-            raise Prawn::Errors::IncompatibleStringEncoding, "The string you " +
-              "are attempting to render is not encoded in valid UTF-8."
-          end
-        end
+        text.normalize_to_utf8
       end
 
       def glyph_present?(char)
-        code = char.unpack("U*").first
+        code = char.codepoints.first
         cmap[code] > 0
       end
 
       # Returns the number of characters in +str+ (a UTF-8-encoded string).
       #
       def character_count(str)
-        if str.respond_to?(:encode)
-          str.length
-        else
-          str.unpack("U*").length
-        end
+        str.unicode_length
       end
 
       private
@@ -205,7 +179,7 @@ module Prawn
       def cmap
         @cmap ||= @ttf.cmap.unicode.first or raise("no unicode cmap for font")
       end
-      
+
       # +string+ must be UTF8-encoded.
       #
       # Returns an array. If an element is a numeric, it represents the
@@ -214,7 +188,7 @@ module Prawn
       def kern(string)
         a = []
 
-        string.unpack("U*").each do |r|
+        string.each_codepoint do |r|
           if a.empty?
             a << [r]
           elsif (kern = kern_pairs_table[[cmap[a.last.last], cmap[r]]])
@@ -241,7 +215,7 @@ module Prawn
         @hmtx ||= @ttf.horizontal_metrics
       end
 
-      def character_width_by_code(code)    
+      def character_width_by_code(code)
         return 0 unless cmap[code]
 
         # Some TTF fonts have nonzero widths for \n (UTF-8 / ASCII code: 10).
@@ -249,7 +223,7 @@ module Prawn
         return 0.0 if code == 10
 
         @char_widths[code] ||= Integer(hmtx.widths[cmap[code]] * scale_factor)
-      end                   
+      end
 
       def scale_factor
         @scale ||= 1000.0 / @ttf.header.units_per_em
@@ -259,7 +233,7 @@ module Prawn
         temp_name = @ttf.name.postscript_name.gsub("\0","").to_sym
         ref = @document.ref!(:Type => :Font, :BaseFont => temp_name)
 
-        # Embed the font metrics in the document after everything has been 
+        # Embed the font metrics in the document after everything has been
         # drawn, just before the document is emitted.
         @document.before_render { |doc| embed(ref, subset) }
 
@@ -280,12 +254,9 @@ module Prawn
 
         raise "Can't detect a postscript name for #{file}" if basename.nil?
 
-        compressed_font = Zlib::Deflate.deflate(font_content)
-
-        fontfile = @document.ref!(:Length => compressed_font.size,
-                                 :Length1 => font_content.size,
-                                 :Filter => :FlateDecode )
-        fontfile << compressed_font
+        fontfile = @document.ref!(:Length1 => font_content.size)
+        fontfile.stream << font_content
+        fontfile.stream.compress!
 
         descriptor = @document.ref!(:Type        => :FontDescriptor,
                                    :FontName    => basename.to_sym,
@@ -294,8 +265,8 @@ module Prawn
                                    :Flags       => pdf_flags,
                                    :StemV       => stemV,
                                    :ItalicAngle => italic_angle,
-                                   :Ascent      => ascender,
-                                   :Descent     => descender,
+                                   :Ascent      => @ascender,
+                                   :Descent     => @descender,
                                    :CapHeight   => cap_height,
                                    :XHeight     => x_height)
 
@@ -316,7 +287,7 @@ module Prawn
         map = @subsets[subset].to_unicode_map
 
         ranges = [[]]
-        lines = map.keys.sort.inject("") do |s, code|
+        map.keys.sort.inject("") do |s, code|
           ranges << [] if ranges.last.length >= 100
           unicode = map[code]
           ranges.last << "<%02x><%04x>" % [code, unicode]
@@ -330,7 +301,7 @@ module Prawn
 
         cmap = @document.ref!({})
         cmap << to_unicode_cmap
-        cmap.compress_stream
+        cmap.stream.compress!
 
         reference.data.update(:Subtype => :TrueType,
                               :BaseFont => basename.to_sym,

data/lib/prawn/font_metric_cache.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+#
+# font_metric_cache.rb : The Prawn font class
+#
+# Copyright Dec 2012, Kenneth Kalmer. All Rights Reserved.
+#
+# This is free software. Please see the LICENSE and COPYING files for details.
+#
+
+module Prawn
+
+  # Cache used internally by Prawn::Document instances to calculate the width
+  # of various strings for layout purposes.
+  class FontMetricCache
+
+    CacheEntry = Struct.new( :font, :options, :string )
+
+    def initialize( document )
+      @document = document
+
+      @cache = {}
+    end
+
+    def width_of( string, options )
+      f = if options[:style]
+            # override style with :style => :bold
+            @document.find_font(@document.font ? @document.font.name : 'Helvetica',
+                      :style => options[:style])
+          else
+            @document.font
+          end
+
+      key = CacheEntry.new( f, options, string )
+
+      unless length = @cache[ key ]
+        length = @cache[ key ] = f.compute_width_of(string, options)
+      end
+
+      length +
+        (@document.character_spacing * @document.font.character_count(string))
+    end
+
+  end
+
+end