prawn-svg 0.9.1.3 → 0.9.1.4

data/README

@@ -32,6 +32,8 @@ prawn-svg is in its infancy and does not support the full SVG specifications.  I
   attributes: size, text-anchor
   partially supported attributes: font-family
   
+- style tag, if css_parser gem is installed on the system [1]
+  
 - attributes/styles: fill, stroke, stroke-width, opacity, fill-opacity, stroke-opacity, transform
 
 - transform methods: translate, rotate, scale
@@ -40,4 +42,6 @@ prawn-svg is in its infancy and does not support the full SVG specifications.  I
 
 - measurements specified in pt, cm, dm, ft, in, m, mm, yd
 
-prawn-svg does NOT support CSS classes, named elements, anything in the defs tag, the tspan tag, gradients/patterns or markers.
+prawn-svg does NOT support named elements, external references, the tspan tag, gradients/patterns or markers.
+
+[1] If the css_parser gem is installed, it will handle CSS style definitions, but only simple tag, class or id definitions.

data/lib/prawn/svg/parser.rb

@@ -12,6 +12,13 @@ require 'rexml/document'
 # SVG to another format.
 #
 class Prawn::Svg::Parser
+  begin
+    require 'css_parser'
+    CSS_PARSER_LOADED = true
+  rescue LoadError
+    CSS_PARSER_LOADED = false
+  end
+  
   include Prawn::Measurements
   
   attr_reader :width, :height
@@ -32,6 +39,7 @@ class Prawn::Svg::Parser
     @data = data
     @options = options
     @warnings = []
+    @css_parser = CssParser::Parser.new if CSS_PARSER_LOADED
     
     if data
       parse_document
@@ -82,50 +90,34 @@ class Prawn::Svg::Parser
     
   def parse_element(element, calls, state)
     attrs = element.attributes
+    calls, style_attrs = apply_styles(element, calls, state)    
 
-    if transform = attrs['transform']
-      parse_css_method_calls(transform).each do |name, arguments|
-        case name
-        when 'translate'
-          x, y = arguments
-          x, y = x.split(/\s+/) if y.nil?
-          calls << [name, [distance(x), -distance(y)], []]
-          calls = calls.last.last
-        when 'rotate'          
-          calls << [name, [-arguments.first.to_f, {:origin => [0, y('0')]}], []]
-          calls = calls.last.last
-        when 'scale'
-          calls << [name, [arguments.first.to_f], []]
-          calls = calls.last.last
-        else
-          @warnings << "Unknown transformation '#{name}'; ignoring"
-        end
-      end
-    end
-
-    calls, style_attrs, draw_type = apply_styles(attrs, calls, state)    
-
-    state[:draw_type] = draw_type if draw_type != ""
-    if state[:draw_type] && !%w(g svg).include?(element.name)
-      calls << [state[:draw_type], [], []]
-      calls = calls.last.last
-    end
-    
     if required_attributes = REQUIRED_ATTRIBUTES[element.name]
       return unless check_attrs_present(element, required_attributes)
     end
-  
+    
     case element.name
-    when 'defs', 'desc'
-      # ignore these tags
+    when 'title', 'desc'
+      # ignore
       
     when 'g', 'svg'
       element.elements.each do |child|
         parse_element(child, calls, state.dup)
       end
+    
+    when 'defs'
+      # Pass calls as a blank array so that nothing under this tag can be added to our call tree.
+      element.elements.each do |child|
+        parse_element(child, [], state.dup.merge(:display => false))
+      end
+            
+    when 'style'
+      load_css_styles(element)
 
     when 'text'
-      # very primitive support for fonts
+      # 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 != ""
@@ -139,7 +131,8 @@ class Prawn::Svg::Parser
         opts[:size] = size.to_f * @scale
       end
             
-      # This is not a prawn option but we can't work out how to render it here - it's handled by #rewrite_call
+      # 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
       if anchor = style_attrs['text-anchor']
         opts[:text_anchor] = anchor        
       end
@@ -213,6 +206,18 @@ class Prawn::Svg::Parser
     end
   end
   
+  def load_css_styles(element)
+    if @css_parser
+      data = if element.cdatas.any?
+        element.cdatas.collect(&:to_s).join
+      else
+        element.text
+      end
+    
+      @css_parser.add_block!(data) 
+    end    
+  end
+  
   def parse_css_declarations(declarations)
     # copied from css_parser
     declarations.gsub!(/(^[\s]*)|([\s]*$)/, '')
@@ -227,11 +232,55 @@ class Prawn::Svg::Parser
     end
   end
   
-  def apply_styles(attrs, calls, state)
-    draw_types = []
+  def determine_style_for(element)
+    if @css_parser
+      tag_style = @css_parser.find_by_selector(element.name)
+      id_style = @css_parser.find_by_selector("##{element.attributes["id"]}") if element.attributes["id"]
+      
+      if classes = element.attributes["class"]
+        class_styles = classes.strip.split(/\s+/).collect do |class_name|
+          @css_parser.find_by_selector(".#{class_name}")
+        end
+      end
+      
+      element_style = element.attributes['style']
+
+      style = [tag_style, class_styles, id_style, element_style].flatten.collect do |s|
+        s.nil? || s.strip == "" ? "" : "#{s}#{";" unless s.match(/;\s*\z/)}"
+      end.join
+    else
+      style = element.attributes['style'] || ""
+    end
 
-    decs = attrs["style"] ? parse_css_declarations(attrs["style"]) : {}
-    attrs.each {|n,v| decs[n] = v unless decs[n]}
+    decs = parse_css_declarations(style)
+    element.attributes.each {|n,v| decs[n] = v unless decs[n]}
+    decs
+  end
+  
+  def apply_styles(element, calls, state)
+    decs = determine_style_for(element)    
+    draw_types = []
+    
+    # Transform
+    if transform = decs['transform']
+      parse_css_method_calls(transform).each do |name, arguments|
+        case name
+        when 'translate'
+          x, y = arguments
+          x, y = x.split(/\s+/) if y.nil?
+          calls << [name, [distance(x), -distance(y)], []]
+          calls = calls.last.last
+        when 'rotate'          
+          calls << [name, [-arguments.first.to_f, {:origin => [0, y('0')]}], []]
+          calls = calls.last.last
+        when 'scale'
+          calls << [name, [arguments.first.to_f], []]
+          calls = calls.last.last
+        else
+          @warnings << "Unknown transformation '#{name}'; ignoring"
+        end
+      end
+    end    
             
     # Opacity:
     # We can't do nested opacities quite like the SVG requires, but this is close enough.
@@ -247,6 +296,7 @@ class Prawn::Svg::Parser
       calls = calls.last.last
     end
 
+    # Fill and stroke
     if decs['fill'] && decs['fill'] != "none"
       if color = color_to_hex(decs['fill'])
         calls << ['fill_color', [color], []]
@@ -261,9 +311,16 @@ class Prawn::Svg::Parser
       draw_types << 'stroke'
     end
     
-    calls << ['line_width', [distance(decs['stroke-width'])], []] if decs['stroke-width']          
+    calls << ['line_width', [distance(decs['stroke-width'])], []] if decs['stroke-width']  
+    
+    draw_type = draw_types.join("_and_")
+    state[:draw_type] = draw_type if draw_type != ""
+    if state[:draw_type] && !%w(g svg).include?(element.name)
+      calls << [state[:draw_type], [], []]
+      calls = calls.last.last
+    end            
         
-    [calls, decs, draw_types.join("_and_")]
+    [calls, decs]
   end
   
   def parse_css_method_calls(string)

data/lib/prawn/svg/svg.rb

@@ -49,17 +49,21 @@ class Prawn::Svg
   
   def issue_prawn_command(prawn, calls)
     calls.each do |call, arguments, children|
-      if children.empty?
-        rewrite_call_arguments(prawn, call, arguments)
-        prawn.send(call, *arguments)
+      if rewrite_call_arguments(prawn, call, arguments) == false
+        issue_prawn_command(prawn, children) if children.any?
       else
-        prawn.send(call, *arguments, &proc_creator(prawn, children))
+        if children.empty?
+          prawn.send(call, *arguments)
+        else
+          prawn.send(call, *arguments, &proc_creator(prawn, children))
+        end
       end
     end
   end
   
   def rewrite_call_arguments(prawn, call, arguments)
-    if call == 'text_box'
+    case call
+    when 'text_box'
       if (anchor = arguments.last.delete(:text_anchor)) && %w(middle end).include?(anchor)
         width = prawn.width_of(*arguments)
         width /= 2 if anchor == 'middle'
@@ -67,6 +71,12 @@ 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

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 1
-  - 3
-  version: 0.9.1.3
+  - 4
+  version: 0.9.1.4
 platform: ruby
 authors: 
 - Roger Nesbitt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +13:00
+date: 2010-03-31 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency