prawn-svg 0.9.1.5 → 0.9.1.6

data/README

@@ -40,7 +40,14 @@ prawn-svg is in its infancy and does not support the full SVG specifications.  I
 
 - colors: html standard names, #xxx, #xxxxxx, rgb(1, 2, 3), rgb(1%, 2%, 3%)
 
-- measurements specified in pt, cm, dm, ft, in, m, mm, yd
+- measurements specified in pt, cm, dm, ft, in, m, mm, yd, %
+
+- 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 ["/Library/Fonts", "/usr/share/fonts/truetype/**"] to catch
+Mac OS X and Debian Linux users.  You can add to the font path:
+
+  Prawn::Svg.font_path << "/my/font/directory"
 
 prawn-svg does NOT support named elements, external references, the tspan tag, gradients/patterns or markers.
 

data/lib/prawn/svg/parser.rb

@@ -124,11 +124,12 @@ class Prawn::Svg::Parser
       # Very primitive support for font-family; it won't work in most cases because
       # PDF only has a few built-in fonts, and they're not the same as the names
       # used typically with the web fonts.
-      if (font = style_attrs['font-family']) && !font.match(/[\/\\]/)
-        font = font.strip
-        if font != ""
-          calls << ['font', [font], []]
+      if font_family = style_attrs["font-family"]
+        if font_family != "" && pdf_font = map_font_family_to_pdf_font(font_family)
+          calls << ['font', [pdf_font], []]
           calls = calls.last.last
+        else
+          @warnings << "#{font_family} is not a known font."
         end
       end
       
@@ -336,6 +337,35 @@ class Prawn::Svg::Parser
       [name, arguments]
     end    
   end
+  
+  BUILT_IN_FONTS = ["Courier", "Helvetica", "Times-Roman", "Symbol", "ZapfDingbats"]
+  GENERIC_CSS_FONT_MAPPING = {
+    "serif"      => "Times-Roman",
+    "sans-serif" => "Helvetica",
+    "cursive"    => "Times-Roman",
+    "fantasy"    => "Times-Roman",
+    "monospace"  => "Courier"}
+    
+  def installed_fonts
+    @installed_fonts ||= Prawn::Svg.font_path.uniq.collect {|path| Dir["#{path}/*"]}.flatten
+  end
+  
+  def map_font_family_to_pdf_font(font_family)
+    font_family.split(",").detect do |font|
+      font = font.gsub(/['"]/, '').gsub(/\s{2,}/, ' ').strip.downcase
+      
+      built_in_font = BUILT_IN_FONTS.detect {|f| f.downcase == font}
+      break built_in_font if built_in_font
+      
+      generic_font = GENERIC_CSS_FONT_MAPPING[font]
+      break generic_font if generic_font
+      
+      installed_font = installed_fonts.detect do |file|
+        (matches = File.basename(file).match(/(.+)\./)) && matches[1].downcase == font
+      end
+      break installed_font if installed_font
+    end
+  end
 
   # TODO : use http://www.w3.org/TR/SVG11/types.html#ColorKeywords
   HTML_COLORS = {    

data/lib/prawn/svg/svg.rb

@@ -3,7 +3,14 @@
 # SVG into Prawn-compatible method calls, and then calls the Prawn methods.
 #
 class Prawn::Svg
-  attr_reader :data, :prawn, :options
+  DEFAULT_FONT_PATHS = ["/Library/Fonts", "/usr/share/fonts/truetype/**"]
+
+  @font_path = []
+  DEFAULT_FONT_PATHS.each {|path| @font_path << path if File.exists?(path)}
+  
+  class << self; attr_accessor :font_path; end
+  
+  attr_reader :data, :prawn, :parser, :options
   
   # An +Array+ of warnings that occurred while parsing the SVG data.  If this array is non-empty,
   # it's likely that the SVG failed to render correctly.
@@ -71,12 +78,6 @@ class Prawn::Svg
       end
       
       arguments.last[:at][1] += prawn.height_of(*arguments) / 3 * 2
-      
-    when 'font'
-      unless prawn.font_families.member?(arguments.first)      
-        @parser_warnings << "#{arguments.first} is not a known font."
-        false
-      end
     end
   end
 end

data/lib/prawn/svg_document.rb

@@ -16,7 +16,7 @@ module Prawn
     def svg(data, options={})
       svg = Prawn::Svg.new(data, self, options)
       svg.draw
-      {:warnings => svg.parser_warnings}
+      {:warnings => svg.parser_warnings, :width => svg.parser.width, :height => svg.parser.height}
     end
   end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 1
-  - 5
-  version: 0.9.1.5
+  - 6
+  version: 0.9.1.6
 platform: ruby
 authors: 
 - Roger Nesbitt