prawn-svg 0.12.0.3 → 0.12.0.4

data/README.md

@@ -50,9 +50,11 @@ prawn-svg is in its infancy and does not support the full SVG specifications.  I
    
  - <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; does not support 'slice' preserveAspectRatio
-   
- - 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>image</tt> tag, only with http/https schemes
+
+ - <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>
  
@@ -66,7 +68,7 @@ By default, prawn-svg has a fonts path of <tt>["/Library/Fonts", "/usr/share/fon
 Mac OS X and Debian Linux users.  You can add to the font path:
 
 ```ruby
-  Prawn::Svg.font_path << "/my/font/directory"
+  Prawn::Svg::Interface.font_path << "/my/font/directory"
 ```
 
 CSS

data/lib/prawn/svg/document.rb

@@ -6,11 +6,11 @@ class Prawn::Svg::Document
     CSS_PARSER_LOADED = true
   rescue LoadError
     CSS_PARSER_LOADED = false
-  end    
-  
+  end
+
   DEFAULT_WIDTH  = 640
   DEFAULT_HEIGHT = 480
-  
+
   # An +Array+ of warnings that occurred while parsing the SVG data.
   attr_reader :warnings
 
@@ -19,14 +19,15 @@ class Prawn::Svg::Document
 
   attr_reader :root,
     :actual_width, :actual_height, :width, :height, :x_offset, :y_offset, :cache_images,
-    :css_parser
-    
+    :css_parser, :elements_by_id
+
   def initialize(data, bounds, options)
     @css_parser = CssParser::Parser.new if CSS_PARSER_LOADED
 
     @root = REXML::Document.new(data).root
     @warnings = []
     @options = options
+    @elements_by_id = {}
     @cache_images = options[:cache_images]
     @actual_width, @actual_height = bounds # set this first so % width/heights can be used
 
@@ -39,9 +40,9 @@ class Prawn::Svg::Document
       @actual_width = points(@root.attributes['width'] || DEFAULT_WIDTH, :x)
       @actual_height = points(@root.attributes['height'] || DEFAULT_HEIGHT, :y)
     end
-    
+
     if @options[:width]
-      @width = @options[:width]      
+      @width = @options[:width]
       @scale = @options[:width] / @actual_width.to_f
     elsif @options[:height]
       @height = @options[:height]
@@ -51,9 +52,9 @@ class Prawn::Svg::Document
     end
 
     @width ||= @actual_width * @scale
-    @height ||= @actual_height * @scale    
+    @height ||= @actual_height * @scale
   end
-  
+
   def x(value)
     (points(value, :x) - @x_offset) * scale
   end

data/lib/prawn/svg/element.rb

@@ -1,50 +1,54 @@
 class Prawn::Svg::Element
   attr_reader :document, :element, :parent_calls, :base_calls, :state, :attributes
   attr_accessor :calls
-  
+
   def initialize(document, element, parent_calls, state)
     @document = document
     @element = element
     @parent_calls = parent_calls
     @state = state
     @base_calls = @calls = []
-    
+
     combine_attributes_and_style_declarations
     apply_styles
-    
+
     if id = @attributes["id"]
-      state[:ids][id] = @base_calls
+      document.elements_by_id[id] = self
     end
   end
-  
+
   def name
     @name ||= element.name
   end
-  
+
   def each_child_element
     element.elements.each do |e|
       yield self.class.new(@document, e, @calls, @state.dup)
     end
   end
-  
+
   def warnings
     @document.warnings
   end
-  
+
   def add_call(name, *arguments)
     @calls << [name.to_s, arguments, []]
   end
-  
+
   def add_call_and_enter(name, *arguments)
     @calls << [name.to_s, arguments, []]
     @calls = @calls.last.last
-  end  
-  
+  end
+
   def append_calls_to_parent
     @parent_calls.concat(@base_calls)
   end
-  
-  
+
+  def add_calls_from_element(other)
+    @calls.concat other.base_calls
+  end
+
+
   protected
   def apply_styles
     # Transform
@@ -87,15 +91,30 @@ class Prawn::Svg::Element
     fill_opacity = clamp(@attributes['fill-opacity'].to_f, 0, 1) if @attributes['fill-opacity']
     stroke_opacity = clamp(@attributes['stroke-opacity'].to_f, 0, 1) if @attributes['stroke-opacity']
 
-    if fill_opacity || stroke_opacity      
+    if fill_opacity || stroke_opacity
       state[:fill_opacity] = (state[:fill_opacity] || 1) * (fill_opacity || 1)
       state[:stroke_opacity] = (state[:stroke_opacity] || 1) * (stroke_opacity || 1)
 
       add_call_and_enter 'transparent', state[:fill_opacity], state[:stroke_opacity]
     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
+    end
+
     # Fill and stroke
-    draw_types = []  
+    draw_types = []
     [:fill, :stroke].each do |type|
       dec = @attributes[type.to_s]
       if dec == "none"
@@ -109,11 +128,11 @@ class Prawn::Svg::Element
 
       draw_types << type.to_s if state[type]
     end
-    
+
     # Stroke width
-    add_call('line_width', @document.distance(@attributes['stroke-width'])) if @attributes['stroke-width']      
+    add_call('line_width', @document.distance(@attributes['stroke-width'])) if @attributes['stroke-width']
 
-    # Fonts        
+    # Fonts
     if size = @attributes['font-size']
       @state[:font_size] = size.to_f * @document.scale
     end
@@ -125,20 +144,20 @@ class Prawn::Svg::Element
       font_updated = true
       @state[:font_family] = family
     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."
       end
-    end    
-    
+    end
+
     # Call fill, stroke, or both
     draw_type = draw_types.join("_and_")
-    if draw_type != "" && !Prawn::Svg::Parser::CONTAINER_TAGS.include?(element.name)
-      add_call_and_enter draw_type
-    end            
+    if draw_type != "" && !@state[:disable_drawing] && !Prawn::Svg::Parser::CONTAINER_TAGS.include?(element.name)
+      add_call_and_enter(draw_type)
+    end
   end
 
   def parse_css_method_calls(string)
@@ -150,7 +169,7 @@ class Prawn::Svg::Element
   end
 
   # TODO : use http://www.w3.org/TR/SVG11/types.html#ColorKeywords
-  HTML_COLORS = {    
+  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",
@@ -173,26 +192,26 @@ class Prawn::Svg::Element
           value = m[n].to_f
           value *= 2.55 if m[n][-1..-1] == '%'
           "%02x" % clamp(value.round, 0, 255)
-        end.join        
-      end    
+        end.join
+      end
     end
   end
 
   def clamp(value, min_value, max_value)
     [[value, min_value].max, max_value].min
-  end  
-      
+  end
+
   def combine_attributes_and_style_declarations
     if @document && @document.css_parser
       tag_style = @document.css_parser.find_by_selector(element.name)
       id_style = @document.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|
           @document.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|
@@ -204,7 +223,7 @@ class Prawn::Svg::Element
 
     @attributes = parse_css_declarations(style)
     element.attributes.each {|n,v| @attributes[n] = v unless @attributes[n]}
-  end    
+  end
 
   def parse_css_declarations(declarations)
     # copied from css_parser

data/lib/prawn/svg/extension.rb

@@ -6,7 +6,7 @@ module Prawn
       #
       # +options+ must contain the key :at, which takes a tuple of x and y co-ordinates.
       #
-      # +options+ can optionally contain the key :width or :height.  If both are 
+      # +options+ can optionally contain the key :width or :height.  If both are
       # specified, only :width will be used.  If neither are specified, the resolution
       # given in the SVG will be used.
       #
@@ -18,7 +18,7 @@ module Prawn
         svg = Prawn::Svg::Interface.new(data, self, options)
         svg.draw
         {:warnings => svg.document.warnings, :width => svg.document.width, :height => svg.document.height}
-      end  
+      end
     end
   end
 end

data/lib/prawn/svg/font.rb

@@ -7,7 +7,7 @@ class Prawn::Svg::Font
     "cursive"    => "Times-Roman",
     "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
@@ -17,25 +17,25 @@ class Prawn::Svg::Font
 
       generic_font = GENERIC_CSS_FONT_MAPPING[font]
       break generic_font if generic_font
-      
+
       break font.downcase if font_installed?(font, font_style)
     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]
     end
   end
-  
+
   def self.font_installed?(font_family, font_style = nil)
     !font_path(font_family, font_style).nil?
   end
 
   def self.installed_fonts
     return @installed_fonts if @installed_fonts
-    
+
     fonts = {}
     Prawn::Svg::Interface.font_path.uniq.collect {|path| Dir["#{path}/*"]}.flatten.each do |filename|
       information = font_information(filename) rescue nil
@@ -46,14 +46,14 @@ class Prawn::Svg::Font
         when 'Bold Italic' then :bold_italic
         else :normal
         end
-        
+
         (fonts[font_name.downcase] ||= {})[font_style] = filename
       end
     end
-    
+
     @installed_fonts = fonts
   end
-    
+
   def self.font_information(filename)
     File.open(filename, "r") do |f|
       x = f.read(12)
@@ -66,22 +66,22 @@ class Prawn::Svg::Font
           break tables[start+8..start+15].unpack("NN")
         end
       end
-      
+
       return unless length
       f.seek(offset)
       data = f.read(length)
-      
+
       format, name_count, string_offset = data[0..5].unpack("nnn")
-      
+
       names = {}
       name_count.times do |index|
         start = 6 + index * 12
-        platform_id, platform_specific_id, language_id, name_id, length, offset = data[start..start+11].unpack("nnnnnn")        
+        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
-        
+
         offset += string_offset
-        field = data[offset..offset+length-1]        
+        field = data[offset..offset+length-1]
         names[name_id] = if platform_id == 0
           begin
             if field.respond_to?(:encode)

data/lib/prawn/svg/interface.rb

@@ -9,11 +9,11 @@ module Prawn
 
       @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, :document, :options
-  
+
       #
       # Creates a Prawn::Svg object.
       #
@@ -21,19 +21,19 @@ module Prawn
       #
       # +options+ must contain the key :at, which takes a tuple of x and y co-ordinates.
       #
-      # +options+ can optionally contain the key :width or :height.  If both are 
+      # +options+ can optionally contain the key :width or :height.  If both are
       # specified, only :width will be used.
       #
       def initialize(data, prawn, options)
         @data = data
         @prawn = prawn
         @options = options
-    
+
         @options[:at] or raise "options[:at] must be specified"
 
         prawn.font_families.update(Prawn::Svg::Font.installed_fonts)
 
-        @document = Document.new(data, [prawn.bounds.width, prawn.bounds.height], options)        
+        @document = Document.new(data, [prawn.bounds.width, prawn.bounds.height], options)
       end
 
       #
@@ -47,12 +47,12 @@ module Prawn
         end
       end
 
-  
-      private  
+
+      private
       def proc_creator(prawn, calls)
         Proc.new {issue_prawn_command(prawn, calls)}
       end
-  
+
       def issue_prawn_command(prawn, calls)
         calls.each do |call, arguments, children|
           if rewrite_call_arguments(prawn, call, arguments) == false
@@ -66,21 +66,21 @@ module Prawn
           end
         end
       end
-  
+
       def rewrite_call_arguments(prawn, call, arguments)
         if call == 'relative_draw_text'
           call.replace "draw_text"
           arguments.last[:at][0] = @relative_text_position if @relative_text_position
         end
-        
+
         case call
         when 'text_group'
           @relative_text_position = nil
           false
-          
+
         when 'draw_text'
           text, options = arguments
-          
+
           width = prawn.width_of(text, options.merge(:kerning => true))
 
           if (anchor = options.delete(:text_anchor)) && %w(middle end).include?(anchor)
@@ -90,17 +90,21 @@ module Prawn
 
           space_width = prawn.width_of("n", options)
           @relative_text_position = options[:at][0] + width + space_width
-          
+
         when 'transformation_matrix'
           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])
-          
+
+        when 'clip'
+          prawn.add_content "W n" # clip to path
+          false
+
         when 'save'
           prawn.save_graphics_state
           false
-          
+
         when 'restore'
           prawn.restore_graphics_state
           false

data/lib/prawn/svg/parser.rb

@@ -12,12 +12,12 @@ require 'rexml/document'
 # SVG to another format.
 #
 class Prawn::Svg::Parser
-  CONTAINER_TAGS = %w(g svg symbol defs)
-  
+  CONTAINER_TAGS = %w(g svg symbol defs clipPath)
+
   #
-  # Construct a Parser object.  
+  # Construct a Parser object.
   #
-  # The +data+ argument is SVG data.  
+  # The +data+ argument is SVG data.
   #
   # +bounds+ is a tuple [width, height] that specifies the bounds of the drawing space in points.
   #
@@ -40,16 +40,16 @@ class Prawn::Svg::Parser
   #
   def parse
     @document.warnings.clear
-    
+
     calls = [['fill_color', '000000', []]]
     root_element = Prawn::Svg::Element.new(@document, @document.root, calls, :ids => {}, :fill => true)
-    
+
     parse_element(root_element)
     calls
   end
 
 
-  private  
+  private
   REQUIRED_ATTRIBUTES = {
     "polyline"  => %w(points),
     "polygon"   => %w(points),
@@ -57,9 +57,9 @@ class Prawn::Svg::Parser
     "ellipse"   => %w(rx ry),
     "rect"      => %w(width height),
     "path"      => %w(d),
-    "image"     => %w(width height)  
+    "image"     => %w(width height)
   }
-  
+
   USE_NEW_CIRCLE_CALL = Prawn::Document.new.respond_to?(:circle)
   USE_NEW_ELLIPSE_CALL = Prawn::Document.new.respond_to?(:ellipse)
 
@@ -69,17 +69,18 @@ class Prawn::Svg::Parser
     if required_attributes = REQUIRED_ATTRIBUTES[element.name]
       return unless check_attrs_present(element, required_attributes)
     end
-        
+
     case element.name
     when *CONTAINER_TAGS
+      do_not_append_calls = %w(symbol defs clipPath).include?(element.name)
+      element.state[:disable_drawing] = true if element.name == "clipPath"
+
       element.each_child_element do |child|
         element.add_call "save"
         parse_element(child)
         element.add_call "restore"
       end
-      
-      do_not_append_calls = %w(symbol defs).include?(element.name)
-          
+
     when 'style'
       load_css_styles(element)
 
@@ -107,20 +108,20 @@ class Prawn::Svg::Parser
         [x(x), y(y)]
       end
       element.add_call "polygon", *points
-  
+
     when 'circle'
       if USE_NEW_CIRCLE_CALL
-        element.add_call "circle", 
+        element.add_call "circle",
           [x(attrs['cx'] || "0"), y(attrs['cy'] || "0")], distance(attrs['r'])
       else
-        element.add_call "circle_at", 
+        element.add_call "circle_at",
           [x(attrs['cx'] || "0"), y(attrs['cy'] || "0")], :radius => distance(attrs['r'])
       end
-      
+
     when 'ellipse'
-      element.add_call USE_NEW_ELLIPSE_CALL ? "ellipse" : "ellipse_at", 
+      element.add_call USE_NEW_ELLIPSE_CALL ? "ellipse" : "ellipse_at",
         [x(attrs['cx'] || "0"), y(attrs['cy'] || "0")], distance(attrs['rx']), distance(attrs['ry'])
-  
+
     when 'rect'
       radius = distance(attrs['rx'] || attrs['ry'])
       args = [[x(attrs['x'] || '0'), y(attrs['y'] || '0')], distance(attrs['width']), distance(attrs['height'])]
@@ -130,18 +131,18 @@ class Prawn::Svg::Parser
       else
         element.add_call "rectangle", *args
       end
-  
+
     when 'path'
       parse_path(element)
-      
+
     when 'use'
       parse_use(element)
 
     when 'title', 'desc', 'metadata'
       # ignore
       do_not_append_calls = true
-      
-    when 'font-face', 'clipPath'
+
+    when 'font-face'
       # not supported
       do_not_append_calls = true
 
@@ -152,11 +153,11 @@ class Prawn::Svg::Parser
     else
       @document.warnings << "Unknown tag '#{element.name}'; ignoring"
     end
-    
+
     element.append_calls_to_parent unless do_not_append_calls
   end
 
-  
+
   def parse_path(element)
     @svg_path ||= Path.new
 
@@ -179,21 +180,20 @@ class Prawn::Svg::Parser
       else
         element.add_call command
       end
-    end  
+    end
   end
-  
+
   def parse_use(element)
     if href = element.attributes['xlink:href']
       if href[0..0] == '#'
         id = href[1..-1]
-        if id_calls = element.state[:ids][id]
+        if definition_element = @document.elements_by_id[id]
           x = element.attributes['x']
           y = element.attributes['y']
           if x || y
             element.add_call_and_enter "translate", distance(x || 0), -distance(y || 0)
           end
-          
-          element.calls.concat(id_calls)              
+          element.add_calls_from_element definition_element
         else
           @document.warnings << "no tag with ID '#{id}' was found, referenced by use tag"
         end
@@ -203,7 +203,7 @@ class Prawn::Svg::Parser
     else
       @document.warnings << "no xlink:href specified on use tag"
     end
-  end    
+  end
 
   ####################################################################################################################
 
@@ -215,8 +215,8 @@ class Prawn::Svg::Parser
         element.element.text
       end
 
-      @document.css_parser.add_block!(data)       
-    end    
+      @document.css_parser.add_block!(data)
+    end
   end
 
   def check_attrs_present(element, attrs)
@@ -226,7 +226,7 @@ class Prawn::Svg::Parser
     end
     missing_attrs.empty?
   end
-  
+
   %w(x y distance).each do |method|
     define_method(method) {|*a| @document.send(method, *a)}
   end

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

@@ -44,20 +44,30 @@ class Prawn::Svg::Parser::Image
     par = (attrs['preserveAspectRatio'] || "xMidYMid meet").strip.split(/\s+/)
     par.shift if par.first == "defer"
     align, meet_or_slice = par
-    raise Error, "slice preserveAspectRatio not supported by Prawn" if meet_or_slice == "slice"
+    slice = meet_or_slice == "slice"
+
+    if slice
+      element.add_call "save"
+      element.add_call "rectangle", [x, y], width, height
+      element.add_call "clip"
+    end
 
     options = {}
     case align
     when /\Ax(Min|Mid|Max)Y(Min|Mid|Max)\z/
-      options[:fit] = [width, height]
       ratio = image_ratio(image)
-      if width/height < ratio
+
+      options[:fit] = [width, height] unless slice
+
+      if (width/height > ratio) == slice
+        options[:width] = width if slice
         y -= case $2
              when "Min" then 0
              when "Mid" then (height - width/ratio)/2
              when "Max" then height - width/ratio
              end
       else
+        options[:height] = height if slice
         x += case $1
              when "Min" then 0
              when "Mid" then (width - height*ratio)/2
@@ -74,6 +84,7 @@ class Prawn::Svg::Parser::Image
     options[:at] = [x, y]
 
     element.add_call "image", FakeIO.new(image), options
+    element.add_call "restore" if slice
   rescue Error => e
     @document.warnings << e.message
   end

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

@@ -38,19 +38,19 @@ module Prawn
             raise InvalidError, "Invalid character '#{c}' in SVG path data"
           end
         end
-    
+
         values << value.to_f if value != ""
         run_path_command(cmd, values) if cmd
-    
+
         @calls
       end
-  
-  
+
+
       private
       def run_path_command(command, values)
         upcase_command = command.upcase
         relative = command != upcase_command
-    
+
         case upcase_command
         when 'M' # moveto
           x = values.shift
@@ -60,19 +60,19 @@ module Prawn
             x += @last_point.first
             y += @last_point.last
           end
-      
+
           @last_point = @subpath_initial_point = [x, y]
           @calls << ["move_to", @last_point]
-      
+
           return run_path_command('L', values) if values.any?
-      
+
         when 'Z' # closepath
           if @subpath_initial_point
             #@calls << ["line_to", @subpath_initial_point]
             @calls << ["close_path"]
             @last_point = @subpath_initial_point
           end
-    
+
         when 'L' # lineto
           while values.any?
             x = values.shift
@@ -84,7 +84,7 @@ module Prawn
             @last_point = [x, y]
             @calls << ["line_to", @last_point]
           end
-      
+
         when 'H' # horizontal lineto
           while values.any?
             x = values.shift
@@ -100,89 +100,89 @@ module Prawn
             @last_point = [@last_point.first, y]
             @calls << ["line_to", @last_point]
           end
-    
+
         when 'C' # curveto
           while values.any?
             x1, y1, x2, y2, x, y = (1..6).collect {values.shift}
             if relative && @last_point
               x += @last_point.first
               x1 += @last_point.first
-              x2 += @last_point.first                    
-              y += @last_point.last 
-              y1 += @last_point.last 
-              y2 += @last_point.last 
+              x2 += @last_point.first
+              y += @last_point.last
+              y1 += @last_point.last
+              y2 += @last_point.last
             end
-        
+
             @last_point = [x, y]
             @previous_control_point = [x2, y2]
             @calls << ["curve_to", [x, y, x1, y1, x2, y2]]
-          end      
+          end
 
         when 'S' # shorthand/smooth curveto
           while values.any?
             x2, y2, x, y = (1..4).collect {values.shift}
             if relative && @last_point
               x += @last_point.first
-              x2 += @last_point.first                    
-              y += @last_point.last 
-              y2 += @last_point.last 
+              x2 += @last_point.first
+              y += @last_point.last
+              y2 += @last_point.last
             end
-        
+
             if @previous_control_point
               x1 = 2 * @last_point.first - @previous_control_point.first
               y1 = 2 * @last_point.last - @previous_control_point.last
             else
               x1, y1 = @last_point
             end
-        
+
             @last_point = [x, y]
-            @previous_control_point = [x2, y2]        
+            @previous_control_point = [x2, y2]
             @calls << ["curve_to", [x, y, x1, y1, x2, y2]]
           end
-      
+
         when 'Q', 'T' # quadratic curveto
           while values.any?
             if shorthand = upcase_command == 'T'
-              x, y = (1..2).collect {values.shift}          
-            else        
+              x, y = (1..2).collect {values.shift}
+            else
               x1, y1, x, y = (1..4).collect {values.shift}
             end
-        
+
             if relative && @last_point
               x += @last_point.first
               x1 += @last_point.first if x1
-              y += @last_point.last 
+              y += @last_point.last
               y1 += @last_point.last if y1
             end
-        
-            if shorthand 
+
+            if shorthand
               if @previous_quadratic_control_point
                 x1 = 2 * @last_point.first - @previous_quadratic_control_point.first
                 y1 = 2 * @last_point.last - @previous_quadratic_control_point.last
               else
                 x1, y1 = @last_point
               end
-            end                
-        
+            end
+
             # convert from quadratic to cubic
             cx1 = @last_point.first + (x1 - @last_point.first) * 2 / 3.0
             cy1 = @last_point.last + (y1 - @last_point.last) * 2 / 3.0
             cx2 = cx1 + (x - @last_point.first) / 3.0
-            cy2 = cy1 + (y - @last_point.last) / 3.0        
+            cy2 = cy1 + (y - @last_point.last) / 3.0
 
             @last_point = [x, y]
             @previous_quadratic_control_point = [x1, y1]
-                
+
             @calls << ["curve_to", [x, y, cx1, cy1, cx2, cy2]]
-          end      
-      
+          end
+
         when 'A'
-          # unsupported      
+          # unsupported
         end
-    
+
         @previous_control_point = nil unless %w(C S).include?(upcase_command)
         @previous_quadratic_control_point = nil unless %w(Q T).include?(upcase_command)
       end
     end
-  end  
+  end
 end

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

@@ -3,17 +3,17 @@ class Prawn::Svg::Parser::Text
     element.add_call_and_enter "text_group"
     internal_parse(element, [element.document.x(0)], [element.document.y(0)], false)
   end
-    
+
   protected
   def internal_parse(element, x_positions, y_positions, relative)
     attrs = element.attributes
-    
+
     if attrs['x'] || attrs['y']
       relative = false
       x_positions = attrs['x'].split(/[\s,]+/).collect {|n| element.document.x(n)} if attrs['x']
       y_positions = attrs['y'].split(/[\s,]+/).collect {|n| element.document.y(n)} if attrs['y']
     end
-    
+
     if attrs['dx'] || attrs['dy']
       element.add_call_and_enter "translate", element.document.distance(attrs['dx'] || 0), -element.document.distance(attrs['dy'] || 0)
     end
@@ -25,18 +25,18 @@ class Prawn::Svg::Parser::Text
     if style = element.state[:font_style]
       opts[:style] = style
     end
-      
+
     # 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 = attrs['text-anchor']
-      opts[:text_anchor] = anchor        
+      opts[:text_anchor] = anchor
     end
 
     element.element.children.each do |child|
       if child.node_type == :text
-        text = child.to_s.strip.gsub(/\s+/, " ")
+        text = child.value.strip.gsub(/\s+/, " ")
 
-        while text != "" 
+        while text != ""
           opts[:at] = [x_positions.first, y_positions.first]
 
           if x_positions.length > 1 || y_positions.length > 1
@@ -59,10 +59,10 @@ class Prawn::Svg::Parser::Text
         internal_parse(child_element, x_positions, y_positions, relative)
         child_element.append_calls_to_parent
         element.add_call 'restore'
-        
+
       else
         element.warnings << "Unknown tag '#{child.name}' inside text tag; ignoring"
       end
-    end    
+    end
   end
 end

data/lib/prawn/svg/version.rb

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

data/spec/lib/parser_spec.rb

@@ -8,7 +8,7 @@ describe Prawn::Svg::Parser do
           <line x1="10%" y1="10%" x2="90%" y2="90%" />
         </svg>
       SVG
-    
+
       document = Prawn::Svg::Document.new(svg, [2000, 2000], {})
       Prawn::Svg::Parser.new(document).parse[-2][-1].should == [["line", [100.0, 900.0, 900.0, 100.0], []]]
     end
@@ -19,18 +19,18 @@ describe Prawn::Svg::Parser do
           <line x1="1in" y1="1in" x2="9in" y2="9in" />
         </svg>
       SVG
-    
+
       document = Prawn::Svg::Document.new(svg, [2000, 2000], {})
       Prawn::Svg::Parser.new(document).parse[-2][-1].should == [["line", [72.0, 720.0 - 72.0, 720.0 - 72.0, 72.0], []]]
     end
   end
-  
+
   describe :parse_element do
     before(:each) do
       @document = Prawn::Svg::Document.new("<svg></svg>", [100, 100], {})
       @parser = Prawn::Svg::Parser.new(@document)
     end
-    
+
     def mock_element(name, attributes = {})
       e = mock
       e.stub!(:name).and_return(name)
@@ -38,7 +38,7 @@ describe Prawn::Svg::Parser do
 
       Prawn::Svg::Element.new(@document, e, [], {})
     end
-    
+
     it "ignores tags it doesn't know about" do
       calls = []
       @parser.send :parse_element, mock_element("unknown")
@@ -46,7 +46,7 @@ describe Prawn::Svg::Parser do
       @document.warnings.length.should == 1
       @document.warnings.first.should include("Unknown tag")
     end
-    
+
     it "ignores tags that don't have all required attributes set" do
       calls = []
       @parser.send :parse_element, mock_element("ellipse", "rx" => "1")

data/spec/lib/path_spec.rb

@@ -4,13 +4,13 @@ describe Prawn::Svg::Parser::Path do
   before :each do
     @path = Prawn::Svg::Parser::Path.new
   end
-  
-  describe "command parsing" do    
+
+  describe "command parsing" do
     it "correctly parses a valid path" do
       calls = []
       @path.stub!(:run_path_command) {|*args| calls << args}
       @path.parse("A12.34 -56.78 89B4 5   C  6,7 T QX 0 Z")
-      
+
       calls.should == [
         ["A", [12.34, -56.78, 89]],
         ["B", [4, 5]],
@@ -19,19 +19,19 @@ describe Prawn::Svg::Parser::Path do
         ["Q", []],
         ["X", [0]],
         ["Z", []]
-      ]      
+      ]
     end
-    
+
     it "correctly parses an empty path" do
       @path.should_not_receive(:run_path_command)
       @path.parse("").should == []
       @path.parse("   ").should == []
     end
-    
+
     it "raises on invalid characters in the path" do
       lambda {@path.parse("M 10 % 20")}.should raise_error(Prawn::Svg::Parser::Path::InvalidError)
     end
-    
+
     it "raises on numerical data before a command letter" do
       lambda {@path.parse("10 P")}.should raise_error(Prawn::Svg::Parser::Path::InvalidError)
     end

data/spec/lib/svg_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe Prawn::Svg::Interface do  
+describe Prawn::Svg::Interface do
   describe "sample file rendering" do
     root = "#{File.dirname(__FILE__)}/../.."
     files = Dir["#{root}/spec/sample_svg/*.svg"]
-    
+
     it "has at least 10 SVG sample files to test" do
       files.length.should >= 10
     end
-    
+
     files.each do |file|
       it "renders the #{File.basename file} sample file without warnings or crashing" do
         warnings = nil

data/spec/sample_svg/clip_path.svg

@@ -0,0 +1,10 @@
+<svg width="120" height="120" viewPort="0 0 120 120" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <clipPath id="myClip">
+            <circle cx="30" cy="30" r="20"/>
+            <circle cx="70" cy="70" r="20"/>
+        </clipPath>
+    </defs>
+
+    <rect x="10" y="10" width="100" height="100" fill="red" clip-path="url(#myClip)"/>
+</svg>

data/spec/sample_svg/image01.svg

@@ -4,7 +4,19 @@
 <svg width="210mm" height="297mm" viewBox="0 0 1050 1485"
      xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 
+  <g transform="translate(0 50)">
+    <text y="50" font-size="12pt">mid/mid</text>
+    <text y="200" font-size="12pt">mid/mid</text>
+    <text y="350" font-size="12pt">mid/mid</text>
+    <text y="550" font-size="12pt">min/min</text>
+    <text y="700" font-size="12pt">min/min</text>
+    <text y="900" font-size="12pt">max/max</text>
+    <text y="1050" font-size="12pt">max/max</text>
+  </g>
+
   <g transform="translate(50 0)">
+    <text y="25" font-size="12pt">wide image, aspect ratio meet</text>
+
     <rect y="50" width="100" height="100" fill="none" stroke="blue" stroke-width="2"/>
     <image y="50" width="100" height="100" preserveAspectRatio="xMidYMid" xlink:href="http://files.myopera.com/baby2u/albums/423302/smiley-cool.jpg"></image>
 
@@ -28,6 +40,33 @@
   </g>
 
   <g transform="translate(250 0)">
+    <text y="25" font-size="12pt">wide image, aspect ratio slice</text>
+
+    <rect y="50" width="100" height="100" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="50" width="100" height="100" preserveAspectRatio="xMidYMid slice" xlink:href="http://files.myopera.com/baby2u/albums/423302/smiley-cool.jpg"></image>
+
+    <rect y="200" width="150" height="100" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="200" width="150" height="100" preserveAspectRatio="xMidYMid slice" xlink:href="http://files.myopera.com/baby2u/albums/423302/smiley-cool.jpg"></image>
+
+    <rect y="350" width="100" height="150" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="350" width="100" height="150" preserveAspectRatio="xMidYMid slice" xlink:href="http://files.myopera.com/baby2u/albums/423302/smiley-cool.jpg"></image>
+
+    <rect y="550" width="150" height="100" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="550" width="150" height="100" preserveAspectRatio="xMinYMin slice" xlink:href="http://files.myopera.com/baby2u/albums/423302/smiley-cool.jpg"></image>
+
+    <rect y="700" width="100" height="150" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="700" width="100" height="150" preserveAspectRatio="xMinYMin slice" xlink:href="http://files.myopera.com/baby2u/albums/423302/smiley-cool.jpg"></image>
+
+    <rect y="900" width="150" height="100" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="900" width="150" height="100" preserveAspectRatio="xMaxYMax slice" xlink:href="http://files.myopera.com/baby2u/albums/423302/smiley-cool.jpg"></image>
+
+    <rect y="1050" width="100" height="150" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="1050" width="100" height="150" preserveAspectRatio="xMaxYMax slice" xlink:href="http://files.myopera.com/baby2u/albums/423302/smiley-cool.jpg"></image>
+  </g>
+
+  <g transform="translate(450 0)">
+    <text y="25" font-size="12pt">long image, aspect ratio meet</text>
+
     <rect y="50" width="100" height="100" fill="none" stroke="blue" stroke-width="2"/>
     <image y="50" width="100" height="100" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
 
@@ -50,7 +89,34 @@
     <image y="1050" width="100" height="200" preserveAspectRatio="xMaxYMax" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
   </g>
 
-  <g transform="translate(450 0)">
+  <g transform="translate(650 0)">
+    <text y="25" font-size="12pt">long image, aspect ratio slice</text>
+
+    <rect y="50" width="100" height="100" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="50" width="100" height="100" preserveAspectRatio="xMidYMid slice" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
+
+    <rect y="200" width="150" height="100" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="200" width="150" height="100" preserveAspectRatio="xMidYMid slice" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
+
+    <rect y="350" width="100" height="200" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="350" width="100" height="200" preserveAspectRatio="xMidYMid slice" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
+
+    <rect y="550" width="150" height="100" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="550" width="150" height="100" preserveAspectRatio="xMinYMin slice" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
+
+    <rect y="700" width="100" height="200" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="700" width="100" height="200" preserveAspectRatio="xMinYMin slice" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
+
+    <rect y="900" width="150" height="100" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="900" width="150" height="100" preserveAspectRatio="xMaxYMax slice" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
+
+    <rect y="1050" width="100" height="200" fill="none" stroke="blue" stroke-width="2"/>
+    <image y="1050" width="100" height="200" preserveAspectRatio="xMaxYMax slice" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
+  </g>
+
+  <g transform="translate(850 0)">
+    <text y="25" font-size="12pt">aspect ratio preservation disabled</text>
+
     <rect y="50" width="100" height="100" fill="none" stroke="blue" stroke-width="2"/>
     <image y="50" width="100" height="100" preserveAspectRatio="none" xlink:href="http://imalbum.aufeminin.com/album/D20090809/583007_KWWH1ZQ8FU5ATJXSR84C5MRBUWW33L_989174388_H143954_L.jpg"></image>
 

data/spec/sample_svg/text_entities.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="10cm" height="3cm" viewBox="0 0 1000 300" xmlns="http://www.w3.org/2000/svg" version="1.1">
+  <g font-family="Verdana" font-size="24">
+    <text x="200" y="150" fill="blue">
+      More &amp; more people say      &quot;Less is &lt; and
+      more is &gt;.&quot;
+    </text>
+  </g>
+  <rect x="1" y="1" width="998" height="298" fill="none" stroke="blue" stroke-width="2" />
+</svg>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.12.0.3
+  version: 0.12.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -93,6 +93,7 @@ files:
 - spec/sample_output/directory
 - spec/sample_svg/arcs01.svg
 - spec/sample_svg/circle01.svg
+- spec/sample_svg/clip_path.svg
 - spec/sample_svg/close_path.svg
 - spec/sample_svg/cubic01.svg
 - spec/sample_svg/cubic01a.svg
@@ -112,6 +113,7 @@ files:
 - spec/sample_svg/rect02.svg
 - spec/sample_svg/rotate_scale.svg
 - spec/sample_svg/scruffy_graph.svg
+- spec/sample_svg/text_entities.svg
 - spec/sample_svg/triangle01.svg
 - spec/sample_svg/tspan01.svg
 - spec/sample_svg/tspan02.svg
@@ -154,6 +156,7 @@ test_files:
 - spec/sample_output/directory
 - spec/sample_svg/arcs01.svg
 - spec/sample_svg/circle01.svg
+- spec/sample_svg/clip_path.svg
 - spec/sample_svg/close_path.svg
 - spec/sample_svg/cubic01.svg
 - spec/sample_svg/cubic01a.svg
@@ -173,6 +176,7 @@ test_files:
 - spec/sample_svg/rect02.svg
 - spec/sample_svg/rotate_scale.svg
 - spec/sample_svg/scruffy_graph.svg
+- spec/sample_svg/text_entities.svg
 - spec/sample_svg/triangle01.svg
 - spec/sample_svg/tspan01.svg
 - spec/sample_svg/tspan02.svg