prawn-svg 0.12.0.4 → 0.12.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 77d41d8457a9fc1b77f14802fb58ec0ba9afda1e
+  data.tar.gz: f5c44534f0c24368ecf755021b5fb6220f15e678
+SHA512:
+  metadata.gz: 9bba222558b111e36c62d8d51568c0e78f3deb26e9e58c8844f38c2455520b756cb1fa9c8309b96c44c6ea1f40dcb27e02fd2ca6f7c4b8b6d2e9a4d730db2357
+  data.tar.gz: ac9fb650d66c5bb0847ea612f81626690c8b4b5b80212d4bbd11a9056f91d32865171257e6ababb6105c56d81703a035e9fab2a354e74ac4176b61c924c38b4c

data/.gitignore

@@ -4,3 +4,4 @@ prawn-svg-*.gem
 Gemfile.lock
 .rvmrc
 .*.swp
+.ruby-version

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright 2010 Roger Nesbitt
+Copyright 2010-2013 Roger Nesbitt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,4 @@
-prawn-svg
-=========
+# prawn-svg
 
 An SVG renderer for the Prawn PDF library.
 
@@ -7,15 +6,14 @@ This will take an SVG file as input and render it into your PDF.  Find out more
 
   http://wiki.github.com/sandal/prawn/
 
-Using prawn-svg
----------------
+## Using prawn-svg
 
 ```ruby
 Prawn::Document.generate("svg.pdf") do
   svg svg_data, :at => [x, y], :width => w
 end
 ```
-  
+
 <tt>:at</tt> must be specified.
 
 <tt>:width</tt>, <tt>:height</tt>, or neither may be specified; if neither is present,
@@ -23,31 +21,31 @@ the resolution specified in the SVG will be used.
 
 <tt>:cache_images</tt>, if set to true, will cache images per document based on their URL.
 
-Supported features
-------------------
+<tt>:fallback_font_name</tt> takes a font name which will override the default fallback font of Times-Roman.
+If this value is set to <tt>nil</tt>, prawn-svg will ignore a request for an unknown font and log a warning.
+
+## Supported features
 
-prawn-svg is in its infancy and does not support the full SVG specifications.  It currently supports:
+prawn-svg does not support the full SVG specification.  It currently supports:
+
+ - <tt>line</tt>, <tt>polyline</tt>, <tt>polygon</tt>, and <tt>circle</tt> tags
 
- - <tt>line</tt> tag
- - <tt>polyline</tt> tag
- - <tt>polygon</tt> tag
- - <tt>circle</tt> tag
  - <tt>ellipse</tt> tag (although this seems to be buggy)
- 
+
  - <tt>rect</tt> tag
    supports rounded rects, but only one radius is applied to all corners
- 
+
  - <tt>path</tt> tag
    supports moveto, closepath, lineto, horiz lineto, vert lineto, curveto, smooth curveto, quad curveto, smooth quad curveto
    does not support elliptical arc
- 
+
  - <tt>text</tt> and <tt>tspan</tt> tags
    attributes: size, text-anchor, font-family, font-weight, dx, dy
-   
+
  - <tt>svg</tt>, <tt>g</tt> and <tt>symbol</tt> tags
-   
+
  - <tt>use</tt> tag
-   
+
  - <tt>style</tt> tag, if css_parser gem is installed on the system (see CSS section below)
 
  - <tt>image</tt> tag, only with http/https schemes
@@ -55,32 +53,35 @@ prawn-svg is in its infancy and does not support the full SVG specifications.  I
  - <tt>clipPath</tt> tag
 
  - attributes/styles: <tt>fill</tt>, <tt>stroke</tt>, <tt>stroke-width</tt>, <tt>opacity</tt>, <tt>fill-opacity</tt>, <tt>stroke-opacity</tt>, <tt>transform</tt>, <tt>clip-path</tt>
- 
+
  - transform methods: <tt>translate</tt>, <tt>rotate</tt>, <tt>scale</tt>, <tt>matrix</tt>
- 
+
  - colors: HTML standard names, <tt>#xxx</tt>, <tt>#xxxxxx</tt>, <tt>rgb(1, 2, 3)</tt>, <tt>rgb(1%, 2%, 3%)</tt>
- 
- - measurements specified in <tt>pt</tt>, <tt>cm</tt>, <tt>dm</tt>, <tt>ft</tt>, <tt>in</tt>, <tt>m</tt>, <tt>mm</tt>, <tt>yd</tt>, <tt>%</tt>
- 
- - fonts: generic CSS fonts, built in PDF fonts, and any TTF fonts in your fonts path
 
-By default, prawn-svg has a fonts path of <tt>["/Library/Fonts", "/usr/share/fonts/truetype/**"]</tt> to catch
-Mac OS X and Debian Linux users.  You can add to the font path:
+ - measurements specified in <tt>pt</tt>, <tt>cm</tt>, <tt>dm</tt>, <tt>ft</tt>, <tt>in</tt>, <tt>m</tt>, <tt>mm</tt>, <tt>yd</tt>, <tt>%</tt>
 
-```ruby
-  Prawn::Svg::Interface.font_path << "/my/font/directory"
-```
+ - fonts: generic CSS fonts, built in PDF fonts, and any TTF fonts in your fonts path
 
-CSS
----
+## CSS
 
 If the css_parser gem is installed, it will handle CSS style definitions, but only simple tag, class or id definitions.  It's very basic
 so do not expect too much of it.
 
-Not supported
--------------
+## Not supported
 
 prawn-svg does NOT support external references, measurements in en or em, sub-viewports, gradients/patterns or markers.
 
+## Configuration
+
+### Fonts
+
+By default, prawn-svg has a fonts path of <tt>["/Library/Fonts", "/System/Library/Fonts", "#{ENV["HOME"]}/Library/Fonts", "/usr/share/fonts/truetype/**"]</tt> to catch
+Mac OS X and Debian Linux users.  You can add to the font path:
+
+```ruby
+  Prawn::Svg::Interface.font_path << "/my/font/directory"
+```
+
+
 --
 Copyright Roger Nesbitt <roger@seriousorange.com>.  MIT licence.

data/lib/prawn-svg.rb

@@ -1,4 +1,5 @@
 require 'prawn'
+require 'prawn/svg/color'
 require 'prawn/svg/extension'
 require 'prawn/svg/interface'
 require 'prawn/svg/font'

data/lib/prawn/svg/color.rb

@@ -0,0 +1,35 @@
+class Prawn::Svg::Color
+  # TODO : use http://www.w3.org/TR/SVG11/types.html#ColorKeywords
+  HTML_COLORS = {
+    'black' => "000000", 'green' => "008000", 'silver' => "c0c0c0", 'lime' => "00ff00",
+    'gray' => "808080", 'olive' => "808000", 'white' => "ffffff", 'yellow' => "ffff00",
+    'maroon' => "800000", 'navy' => "000080", 'red' => "ff0000", 'blue' => "0000ff",
+    'purple' => "800080", 'teal' => "008080", 'fuchsia' => "ff00ff", 'aqua' => "00ffff"
+  }.freeze
+
+  RGB_VALUE_REGEXP = "\s*(-?[0-9.]+%?)\s*"
+  RGB_REGEXP = /\Argb\(#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP}\)\z/i
+
+  def self.color_to_hex(color_string)
+    color_string.scan(/([^(\s]+(\([^)]*\))?)/).detect do |color, *_|
+      if m = color.match(/\A#([0-9a-f])([0-9a-f])([0-9a-f])\z/i)
+        break "#{m[1] * 2}#{m[2] * 2}#{m[3] * 2}"
+      elsif color.match(/\A#[0-9a-f]{6}\z/i)
+        break color[1..6]
+      elsif hex = HTML_COLORS[color.downcase]
+        break hex
+      elsif m = color.match(RGB_REGEXP)
+        break (1..3).collect do |n|
+          value = m[n].to_f
+          value *= 2.55 if m[n][-1..-1] == '%'
+          "%02x" % clamp(value.round, 0, 255)
+        end.join
+      end
+    end
+  end
+
+  protected
+  def self.clamp(value, min_value, max_value)
+    [[value, min_value].max, max_value].min
+  end
+end

data/lib/prawn/svg/document.rb

@@ -10,6 +10,7 @@ class Prawn::Svg::Document
 
   DEFAULT_WIDTH  = 640
   DEFAULT_HEIGHT = 480
+  DEFAULT_FALLBACK_FONT_NAME = "Times-Roman"
 
   # An +Array+ of warnings that occurred while parsing the SVG data.
   attr_reader :warnings
@@ -18,7 +19,8 @@ class Prawn::Svg::Document
   attr_accessor :scale
 
   attr_reader :root,
-    :actual_width, :actual_height, :width, :height, :x_offset, :y_offset, :cache_images,
+    :actual_width, :actual_height, :width, :height, :x_offset, :y_offset,
+    :cache_images, :fallback_font_name,
     :css_parser, :elements_by_id
 
   def initialize(data, bounds, options)
@@ -29,6 +31,7 @@ class Prawn::Svg::Document
     @options = options
     @elements_by_id = {}
     @cache_images = options[:cache_images]
+    @fallback_font_name = options.fetch(:fallback_font_name, DEFAULT_FALLBACK_FONT_NAME)
     @actual_width, @actual_height = bounds # set this first so % width/heights can be used
 
     if vb = @root.attributes['viewBox']

data/lib/prawn/svg/element.rb

@@ -51,41 +51,54 @@ class Prawn::Svg::Element
 
   protected
   def apply_styles
-    # Transform
-    if transform = @attributes['transform']
-      parse_css_method_calls(transform).each do |name, arguments|
-        case name
-        when 'translate'
-          x, y = arguments
-          add_call_and_enter name, @document.distance(x), -@document.distance(y)
-
-        when 'rotate'
-          r, x, y = arguments.collect {|a| a.to_f}
-          if arguments.length == 3
-            add_call_and_enter name, -r, :origin => [@document.x(x), @document.y(y)]
-          else
-            add_call_and_enter name, -r, :origin => [0, @document.y('0')]
-          end
-
-        when 'scale'
-          x_scale = arguments[0].to_f
-          y_scale = (arguments[1] || x_scale).to_f
-          add_call_and_enter "transformation_matrix", x_scale, 0, 0, y_scale, 0, 0
-
-        when 'matrix'
-          if arguments.length != 6
-            @document.warnings << "transform 'matrix' must have six arguments"
-          else
-            a, b, c, d, e, f = arguments.collect {|argument| argument.to_f}
-            add_call_and_enter "transformation_matrix", a, -b, -c, d, @document.distance(e), -@document.distance(f)
-          end
+    parse_transform_attribute_and_call
+    parse_opacity_attributes_and_call
+    parse_clip_path_attribute_and_call
+    draw_types = parse_fill_and_stroke_attributes_and_call
+    parse_stroke_width_attribute_and_call
+    parse_font_attributes_and_call
+
+    if draw_types.length > 0 && !@state[:disable_drawing] && !Prawn::Svg::Parser::CONTAINER_TAGS.include?(element.name)
+      add_call_and_enter(draw_types.join("_and_"))
+    end
+  end
+
+  def parse_transform_attribute_and_call
+    return unless transform = @attributes['transform']
+
+    parse_css_method_calls(transform).each do |name, arguments|
+      case name
+      when 'translate'
+        x, y = arguments
+        add_call_and_enter name, @document.distance(x), -@document.distance(y)
+
+      when 'rotate'
+        r, x, y = arguments.collect {|a| a.to_f}
+        if arguments.length == 3
+          add_call_and_enter name, -r, :origin => [@document.x(x), @document.y(y)]
+        else
+          add_call_and_enter name, -r, :origin => [0, @document.y('0')]
+        end
+
+      when 'scale'
+        x_scale = arguments[0].to_f
+        y_scale = (arguments[1] || x_scale).to_f
+        add_call_and_enter "transformation_matrix", x_scale, 0, 0, y_scale, 0, 0
+
+      when 'matrix'
+        if arguments.length != 6
+          @document.warnings << "transform 'matrix' must have six arguments"
         else
-          @document.warnings << "Unknown transformation '#{name}'; ignoring"
+          a, b, c, d, e, f = arguments.collect {|argument| argument.to_f}
+          add_call_and_enter "transformation_matrix", a, -b, -c, d, @document.distance(e), -@document.distance(f)
         end
+      else
+        @document.warnings << "Unknown transformation '#{name}'; ignoring"
       end
     end
+  end
 
-    # Opacity:
+  def parse_opacity_attributes_and_call
     # We can't do nested opacities quite like the SVG requires, but this is close enough.
     fill_opacity = stroke_opacity = clamp(@attributes['opacity'].to_f, 0, 1) if @attributes['opacity']
     fill_opacity = clamp(@attributes['fill-opacity'].to_f, 0, 1) if @attributes['fill-opacity']
@@ -97,23 +110,25 @@ class Prawn::Svg::Element
 
       add_call_and_enter 'transparent', state[:fill_opacity], state[:stroke_opacity]
     end
+  end
 
-    # Clip path
-    if clip_path = @attributes['clip-path']
-      if (matches = clip_path.strip.match(/\Aurl\(#(.*)\)\z/)).nil?
-        document.warnings << "Only clip-path attributes with the form 'url(#xxx)' are supported"
-      elsif (clip_path_element = @document.elements_by_id[matches[1]]).nil?
-        document.warnings << "clip-path ID '#{matches[1]}' not defined"
-      elsif clip_path_element.element.name != "clipPath"
-        document.warnings << "clip-path ID '#{matches[1]}' does not point to a clipPath tag"
-      else
-        add_call_and_enter 'save_graphics_state'
-        add_calls_from_element clip_path_element
-        add_call "clip"
-      end
+  def parse_clip_path_attribute_and_call
+    return unless clip_path = @attributes['clip-path']
+
+    if (matches = clip_path.strip.match(/\Aurl\(#(.*)\)\z/)).nil?
+      document.warnings << "Only clip-path attributes with the form 'url(#xxx)' are supported"
+    elsif (clip_path_element = @document.elements_by_id[matches[1]]).nil?
+      document.warnings << "clip-path ID '#{matches[1]}' not defined"
+    elsif clip_path_element.element.name != "clipPath"
+      document.warnings << "clip-path ID '#{matches[1]}' does not point to a clipPath tag"
+    else
+      add_call_and_enter 'save_graphics_state'
+      add_calls_from_element clip_path_element
+      add_call "clip"
     end
+  end
 
-    # Fill and stroke
+  def parse_fill_and_stroke_attributes_and_call
     draw_types = []
     [:fill, :stroke].each do |type|
       dec = @attributes[type.to_s]
@@ -121,24 +136,31 @@ class Prawn::Svg::Element
         state[type] = false
       elsif dec
         state[type] = true
-        if color = color_to_hex(dec)
+        if color = Prawn::Svg::Color.color_to_hex(dec)
           add_call "#{type}_color", color
         end
       end
 
       draw_types << type.to_s if state[type]
     end
+    draw_types
+  end
 
-    # Stroke width
+  def parse_stroke_width_attribute_and_call
     add_call('line_width', @document.distance(@attributes['stroke-width'])) if @attributes['stroke-width']
+  end
 
-    # Fonts
+  def parse_font_attributes_and_call
     if size = @attributes['font-size']
       @state[:font_size] = size.to_f * @document.scale
     end
     if weight = @attributes['font-weight']
       font_updated = true
-      @state[:font_style] = weight == 'bold' ? :bold : nil
+      @state[:font_weight] = Prawn::Svg::Font.weight_for_css_font_weight(weight)
+    end
+    if style = @attributes['font-style']
+      font_updated = true
+      @state[:font_style] = style == 'italic' ? :italic : nil
     end
     if (family = @attributes['font-family']) && family.strip != ""
       font_updated = true
@@ -146,20 +168,23 @@ class Prawn::Svg::Element
     end
 
     if @state[:font_family] && font_updated
-      if pdf_font = Prawn::Svg::Font.map_font_family_to_pdf_font(@state[:font_family], @state[:font_style])
-        add_call_and_enter 'font', pdf_font
-      else
-        @document.warnings << "Font family '#{@state[:font_family]}' style '#{@state[:font_style] || 'normal'}' is not a known font."
+      usable_font_families = [@state[:font_family], document.fallback_font_name]
+
+      font_used = usable_font_families.compact.detect do |name|
+        if font = Prawn::Svg::Font.load(name, @state[:font_weight], @state[:font_style])
+          @state[:font_subfamily] = font.subfamily
+          add_call_and_enter 'font', font.name, :style => @state[:font_subfamily]
+          true
+        end
       end
-    end
 
-    # Call fill, stroke, or both
-    draw_type = draw_types.join("_and_")
-    if draw_type != "" && !@state[:disable_drawing] && !Prawn::Svg::Parser::CONTAINER_TAGS.include?(element.name)
-      add_call_and_enter(draw_type)
+      if font_used.nil?
+        @document.warnings << "Font family '#{@state[:font_family]}' style '#{@state[:font_style] || 'normal'}' is not a known font, and the fallback font could not be found."
+      end
     end
   end
 
+
   def parse_css_method_calls(string)
     string.scan(/\s*(\w+)\(([^)]+)\)\s*/).collect do |call|
       name, argument_string = call
@@ -168,35 +193,6 @@ class Prawn::Svg::Element
     end
   end
 
-  # TODO : use http://www.w3.org/TR/SVG11/types.html#ColorKeywords
-  HTML_COLORS = {
-  	'black' => "000000", 'green' => "008000", 'silver' => "c0c0c0", 'lime' => "00ff00",
-  	'gray' => "808080", 'olive' => "808000", 'white' => "ffffff", 'yellow' => "ffff00",
-  	'maroon' => "800000", 'navy' => "000080", 'red' => "ff0000", 'blue' => "0000ff",
-  	'purple' => "800080", 'teal' => "008080", 'fuchsia' => "ff00ff", 'aqua' => "00ffff"
-  }.freeze
-
-  RGB_VALUE_REGEXP = "\s*(-?[0-9.]+%?)\s*"
-  RGB_REGEXP = /\Argb\(#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP}\)\z/i
-
-  def color_to_hex(color_string)
-    color_string.scan(/([^(\s]+(\([^)]*\))?)/).detect do |color, *_|
-      if m = color.match(/\A#([0-9a-f])([0-9a-f])([0-9a-f])\z/i)
-        break "#{m[1] * 2}#{m[2] * 2}#{m[3] * 2}"
-      elsif color.match(/\A#[0-9a-f]{6}\z/i)
-        break color[1..6]
-      elsif hex = HTML_COLORS[color.downcase]
-        break hex
-      elsif m = color.match(RGB_REGEXP)
-        break (1..3).collect do |n|
-          value = m[n].to_f
-          value *= 2.55 if m[n][-1..-1] == '%'
-          "%02x" % clamp(value.round, 0, 255)
-        end.join
-      end
-    end
-  end
-
   def clamp(value, min_value, max_value)
     [[value, min_value].max, max_value].min
   end

data/lib/prawn/svg/font.rb

@@ -1,6 +1,4 @@
 class Prawn::Svg::Font
-  BUILT_IN_FONTS = ["Courier", "Helvetica", "Times-Roman", "Symbol", "ZapfDingbats"]
-
   GENERIC_CSS_FONT_MAPPING = {
     "serif"      => "Times-Roman",
     "sans-serif" => "Helvetica",
@@ -8,50 +6,96 @@ class Prawn::Svg::Font
     "fantasy"    => "Times-Roman",
     "monospace"  => "Courier"}
 
-  def self.map_font_family_to_pdf_font(font_family, font_style = nil)
-    font_family.split(",").detect do |font|
-      font = font.gsub(/['"]/, '').gsub(/\s{2,}/, ' ').strip.downcase
+  attr_reader :name, :weight, :style
 
-      built_in_font = BUILT_IN_FONTS.detect {|f| f.downcase == font}
-      break built_in_font if built_in_font
+  def self.load(family, weight = nil, style = nil)
+    family.split(",").detect do |name|
+      name = name.gsub(/['"]/, '').gsub(/\s{2,}/, ' ').strip.downcase
 
-      generic_font = GENERIC_CSS_FONT_MAPPING[font]
-      break generic_font if generic_font
+      # If it's a standard CSS font name, map it to one of the standard PDF fonts.
+      name = GENERIC_CSS_FONT_MAPPING[name] || name
 
-      break font.downcase if font_installed?(font, font_style)
+      font = new(name, weight, style)
+      break font if font.installed?
     end
   end
 
-  def self.font_path(font_family, font_style = nil)
-    font_style = :normal if font_style.nil?
-    if installed_styles = installed_fonts[font_family.downcase]
-      installed_styles[font_style]
+  def self.weight_for_css_font_weight(weight)
+    case weight
+    when '100', '200', '300' then :light
+    when '400', '500'        then :normal
+    when '600'               then :semibold
+    when '700', 'bold'       then :bold
+    when '800'               then :extrabold
+    when '900'               then :black
     end
   end
 
-  def self.font_installed?(font_family, font_style = nil)
-    !font_path(font_family, font_style).nil?
+  # This method is passed prawn's font_families hash.  It'll be pre-populated with the fonts that prawn natively
+  # supports.  We'll add fonts we find in the font path to this hash.
+  def self.load_external_fonts(fonts)
+    Prawn::Svg::Interface.font_path.uniq.collect {|path| Dir["#{path}/*"]}.flatten.each do |filename|
+      information = font_information(filename) rescue nil
+      if information && font_name = (information[16] || information[1])
+        subfamily = (information[17] || information[2]).gsub(/\s+/, "_").downcase.to_sym
+        subfamily = :normal if subfamily == :regular
+        (fonts[font_name] ||= {})[subfamily] = filename
+      end
+    end
+
+    @font_case_mapping = {}
+    fonts.each {|key, _| @font_case_mapping[key.downcase] = key}
+
+    @installed_fonts = fonts
   end
 
   def self.installed_fonts
-    return @installed_fonts if @installed_fonts
+    @installed_fonts
+  end
 
-    fonts = {}
-    Prawn::Svg::Interface.font_path.uniq.collect {|path| Dir["#{path}/*"]}.flatten.each do |filename|
-      information = font_information(filename) rescue nil
-      if information && font_name = information[1]
-        font_style = case information[2]
-        when 'Bold' then :bold
-        when 'Italic' then :italic
-        when 'Bold Italic' then :bold_italic
-        else :normal
-        end
+  def self.correctly_cased_font_name(name)
+    @font_case_mapping[name.downcase]
+  end
+
+
+  def initialize(name, weight, style)
+    @name = self.class.correctly_cased_font_name(name) || name
+    @weight = weight
+    @style = style
+  end
+
+  def installed?
+    subfamilies = self.class.installed_fonts[name]
+    !subfamilies.nil? && subfamilies.key?(subfamily)
+  end
 
-        (fonts[font_name.downcase] ||= {})[font_style] = filename
+  # Construct a subfamily name, ensuring that the subfamily is a valid one for the font.
+  def subfamily
+    if subfamilies = self.class.installed_fonts[name]
+      if subfamilies.key?(subfamily_name)
+        subfamily_name
+      elsif subfamilies.key?(:normal)
+        :normal
+      else
+        subfamilies.keys.first
       end
     end
+  end
 
-    @installed_fonts = fonts
+
+  private
+  # Construct a subfamily name from the weight and style information.
+  # Note that this name might not actually exist in the font.
+  def subfamily_name
+    sfn = if weight == :normal && style
+      style
+    elsif weight || style
+      "#{weight} #{style}"
+    else
+      "normal"
+    end
+
+    sfn.strip.gsub(/\s+/, "_").downcase.to_sym
   end
 
   def self.font_information(filename)
@@ -78,7 +122,7 @@ class Prawn::Svg::Font
         start = 6 + index * 12
         platform_id, platform_specific_id, language_id, name_id, length, offset = data[start..start+11].unpack("nnnnnn")
         next unless language_id == 0 # English
-        next unless name_id == 1 || name_id == 2
+        next unless [1, 2, 16, 17].include?(name_id)
 
         offset += string_offset
         field = data[offset..offset+length-1]

data/lib/prawn/svg/interface.rb

@@ -5,7 +5,7 @@
 module Prawn
   module Svg
     class Interface
-      DEFAULT_FONT_PATHS = ["/Library/Fonts", "/usr/share/fonts/truetype/**"]
+      DEFAULT_FONT_PATHS = ["/Library/Fonts", "/System/Library/Fonts", "#{ENV["HOME"]}/Library/Fonts", "/usr/share/fonts/truetype/**"]
 
       @font_path = []
       DEFAULT_FONT_PATHS.each {|path| @font_path << path if File.exists?(path)}
@@ -31,7 +31,7 @@ module Prawn
 
         @options[:at] or raise "options[:at] must be specified"
 
-        prawn.font_families.update(Prawn::Svg::Font.installed_fonts)
+        Prawn::Svg::Font.load_external_fonts(prawn.font_families)
 
         @document = Document.new(data, [prawn.bounds.width, prawn.bounds.height], options)
       end
@@ -95,7 +95,7 @@ module Prawn
           x = prawn.bounds.absolute_left
           y = prawn.bounds.absolute_top
           arguments[4] += x - (x * arguments[0] - y * arguments[1])
-          arguments[5] += y - (x * arguments[1] + y * arguments[0])
+          arguments[5] += y - (x * arguments[2] + y * arguments[3])
 
         when 'clip'
           prawn.add_content "W n" # clip to path

data/lib/prawn/svg/parser/text.rb

@@ -22,9 +22,7 @@ class Prawn::Svg::Parser::Text
     if size = element.state[:font_size]
       opts[:size] = size
     end
-    if style = element.state[:font_style]
-      opts[:style] = style
-    end
+    opts[:style] = element.state[:font_subfamily]
 
     # This is not a prawn option but we can't work out how to render it here -
     # it's handled by Svg#rewrite_call_arguments

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Svg
-    VERSION = '0.12.0.4'
+    VERSION = '0.12.0.6'
   end
 end

data/prawn-svg.gemspec

@@ -10,13 +10,14 @@ spec = Gem::Specification.new do |gem|
   gem.author = "Roger Nesbitt"
   gem.email = "roger@seriousorange.com"
   gem.homepage = "http://github.com/mogest/prawn-svg"
-  
+  gem.license = 'MIT'
+
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "prawn-svg"
   gem.require_paths = ["lib"]
-  
+
   gem.add_dependency "prawn", ">= 0.8.4"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"

data/spec/prawn/svg/color_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Prawn::Svg::Color do
+  describe :color_to_hex do
+    it "converts #xxx to a hex value" do
+      Prawn::Svg::Color.color_to_hex("#9ab").should == "99aabb"
+    end
+
+    it "converts #xxxxxx to a hex value" do
+      Prawn::Svg::Color.color_to_hex("#9ab123").should == "9ab123"
+    end
+
+    it "converts an html colour name to a hex value" do
+      Prawn::Svg::Color.color_to_hex("White").should == "ffffff"
+    end
+
+    it "converts an rgb string to a hex value" do
+      Prawn::Svg::Color.color_to_hex("rgb(16, 32, 48)").should == "102030"
+      Prawn::Svg::Color.color_to_hex("rgb(-5, 50%, 120%)").should == "007fff"
+    end
+
+    it "scans the string and finds the first colour it can parse" do
+      Prawn::Svg::Color.color_to_hex("function(#someurl, 0) nonexistent rgb( 3 ,4,5 ) white").should == "030405"
+    end
+  end
+end

data/spec/prawn/svg/element_spec.rb

@@ -4,29 +4,34 @@ describe Prawn::Svg::Element do
   before :each do
     e = mock
     e.stub!(:attributes).and_return({})
-    @element = Prawn::Svg::Element.new(nil, e, [], {})
+
+    @document = Struct.new(:fallback_font_name, :css_parser, :warnings).new("Courier", nil, [])
+    @element = Prawn::Svg::Element.new(@document, e, [], {})
   end
-    
-  describe :color_to_hex do
-    it "converts #xxx to a hex value" do
-      @element.send(:color_to_hex, "#9ab").should == "99aabb"
-    end
 
-    it "converts #xxxxxx to a hex value" do
-      @element.send(:color_to_hex, "#9ab123").should == "9ab123"
-    end
-    
-    it "converts an html colour name to a hex value" do
-      @element.send(:color_to_hex, "White").should == "ffffff"
+  describe :parse_font_attributes_and_call do
+    it "uses a font if it can find it" do
+      @element.should_receive(:add_call_and_enter).with('font', 'Helvetica', :style => :normal)
+
+      @element.attributes["font-family"] = "Helvetica"
+      @element.send :parse_font_attributes_and_call
     end
-    
-    it "converts an rgb string to a hex value" do      
-      @element.send(:color_to_hex, "rgb(16, 32, 48)").should == "102030"
-      @element.send(:color_to_hex, "rgb(-5, 50%, 120%)").should == "007fff"
+
+    it "uses the fallback font if the requested font is not defined" do
+      @element.should_receive(:add_call_and_enter).with('font', 'Courier', :style => :normal)
+
+      @element.attributes["font-family"] = "Font That Doesn't Exist"
+      @element.send :parse_font_attributes_and_call
     end
-    
-    it "scans the string and finds the first colour it can parse" do
-      @element.send(:color_to_hex, "function(#someurl, 0) nonexistent rgb( 3 ,4,5 ) white").should == "030405"
+
+    it "doesn't call the font method if there's no fallback font" do
+      @document.fallback_font_name = nil
+
+      @element.should_not_receive(:add_call_and_enter)
+
+      @element.attributes["font-family"] = "Font That Doesn't Exist"
+      @element.send :parse_font_attributes_and_call
+      @document.warnings.length.should == 1
     end
   end
 end

data/spec/prawn/svg/font_spec.rb

@@ -1,31 +1,31 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Prawn::Svg::Font do
-  describe :map_font_family_to_pdf_font do    
+  describe :load do
     it "matches a built in font" do
-      Prawn::Svg::Font.map_font_family_to_pdf_font("blah, 'courier', nothing").should == 'Courier'
+      Prawn::Svg::Font.load("blah, 'courier', nothing").name.should == 'Courier'
     end
-    
+
     it "matches a default font" do
-      Prawn::Svg::Font.map_font_family_to_pdf_font("serif").should == 'Times-Roman'
-      Prawn::Svg::Font.map_font_family_to_pdf_font("blah, serif").should == 'Times-Roman'
-      Prawn::Svg::Font.map_font_family_to_pdf_font("blah, serif , test").should == 'Times-Roman'
+      Prawn::Svg::Font.load("serif").name.should == 'Times-Roman'
+      Prawn::Svg::Font.load("blah, serif").name.should == 'Times-Roman'
+      Prawn::Svg::Font.load("blah, serif , test").name.should == 'Times-Roman'
     end
-    
-    if !Prawn::Svg::Font.installed_fonts.empty?
+
+    if Prawn::Svg::Font.installed_fonts["Verdana"]
       it "matches a font installed on the system" do
-        Prawn::Svg::Font.map_font_family_to_pdf_font("verdana, sans-serif").should == 'verdana'
-        Prawn::Svg::Font.map_font_family_to_pdf_font("VERDANA, sans-serif").should == 'verdana'
-        Prawn::Svg::Font.map_font_family_to_pdf_font("something, \"Times New Roman\", serif").should == "times new roman"
-        Prawn::Svg::Font.map_font_family_to_pdf_font("something, Times New Roman, serif").should == "times new roman"
+        Prawn::Svg::Font.load("verdana, sans-serif").name.should == 'Verdana'
+        Prawn::Svg::Font.load("VERDANA, sans-serif").name.should == 'Verdana'
+        Prawn::Svg::Font.load("something, \"Times New Roman\", serif").name.should == "Times New Roman"
+        Prawn::Svg::Font.load("something, Times New Roman, serif").name.should == "Times New Roman"
       end
     else
-      it "not running font test because we couldn't find a font directory"
+      it "not running font test because we couldn't find Verdana installed on the system"
     end
-    
+
     it "returns nil if it can't find any such font" do
-      Prawn::Svg::Font.map_font_family_to_pdf_font("blah, thing").should be_nil
-      Prawn::Svg::Font.map_font_family_to_pdf_font("").should be_nil      
+      Prawn::Svg::Font.load("blah, thing").should be_nil
+      Prawn::Svg::Font.load("").should be_nil
     end
   end
 end

data/spec/sample_svg/subfamilies.svg

@@ -0,0 +1,12 @@
+<svg style="overflow: hidden; position: relative;" height="579.1447861965491" version="1.1" width="772" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <rect x="0" y="0" width="772" height="19" r="0" rx="0" ry="0" fill="#000000" stroke="#000000" transform="matrix(1,0,0,1,0,0.5)" stroke-width="1"></rect>
+  <rect x="0" y="560" width="772" height="19" r="0" rx="0" ry="0" fill="#000000" stroke="#000000" transform="matrix(1,0,0,1,0,0.5)" stroke-width="1"></rect>
+  <rect x="0" y="0" width="19" height="579" r="0" rx="0" ry="0" fill="#000000" stroke="#000000" transform="matrix(1,0,0,1,0,0.5)" stroke-width="1"></rect>
+  <rect x="753" y="0" width="19" height="579" r="0" rx="0" ry="0" fill="#000000" stroke="#000000" transform="matrix(1,0,0,1,0,0.5)" stroke-width="1"></rect>
+  <g style="text-anchor: middle; font-style: normal; font-variant: normal; font-size: 80px; line-height: normal; font-family: 'Open Sans';" transform="translate(186, 151)">
+    <text y="0" fill="black" style="font-weight: 100;">prawn-svg</text>
+    <text y="100" fill="black" style="font-weight: 400;">prawn-svg</text>
+    <text y="200" fill="black" style="font-weight: 600;">prawn-svg</text>
+    <text y="300" fill="black" style="font-weight: 800;">prawn-svg</text>
+  </g>
+</svg>

data/spec/spec_helper.rb

@@ -7,3 +7,5 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
 end
+
+Prawn::Svg::Font.load_external_fonts(Prawn::Document.new.font_families)

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.12.0.4
-  prerelease: 
+  version: 0.12.0.6
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: SVG renderer for Prawn PDF library
@@ -72,6 +65,7 @@ files:
 - README.md
 - Rakefile
 - lib/prawn-svg.rb
+- lib/prawn/svg/color.rb
 - lib/prawn/svg/document.rb
 - lib/prawn/svg/element.rb
 - lib/prawn/svg/extension.rb
@@ -86,6 +80,7 @@ files:
 - spec/lib/parser_spec.rb
 - spec/lib/path_spec.rb
 - spec/lib/svg_spec.rb
+- spec/prawn/svg/color_spec.rb
 - spec/prawn/svg/document_spec.rb
 - spec/prawn/svg/element_spec.rb
 - spec/prawn/svg/font_spec.rb
@@ -113,6 +108,7 @@ files:
 - spec/sample_svg/rect02.svg
 - spec/sample_svg/rotate_scale.svg
 - spec/sample_svg/scruffy_graph.svg
+- spec/sample_svg/subfamilies.svg
 - spec/sample_svg/text_entities.svg
 - spec/sample_svg/triangle01.svg
 - spec/sample_svg/tspan01.svg
@@ -122,33 +118,34 @@ files:
 - spec/sample_svg/use.svg
 - spec/spec_helper.rb
 homepage: http://github.com/mogest/prawn-svg
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SVG renderer for Prawn PDF library
 test_files:
 - spec/lib/parser_spec.rb
 - spec/lib/path_spec.rb
 - spec/lib/svg_spec.rb
+- spec/prawn/svg/color_spec.rb
 - spec/prawn/svg/document_spec.rb
 - spec/prawn/svg/element_spec.rb
 - spec/prawn/svg/font_spec.rb
@@ -176,6 +173,7 @@ test_files:
 - spec/sample_svg/rect02.svg
 - spec/sample_svg/rotate_scale.svg
 - spec/sample_svg/scruffy_graph.svg
+- spec/sample_svg/subfamilies.svg
 - spec/sample_svg/text_entities.svg
 - spec/sample_svg/triangle01.svg
 - spec/sample_svg/tspan01.svg