prawn-svg 0.9.1.6 → 0.9.1.7

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

@@ -0,0 +1,184 @@
+module Prawn
+  module Svg
+    class Parser::Path
+      # Raised if the SVG path cannot be parsed.
+      InvalidError = Class.new(StandardError)
+
+      #
+      # Parses an SVG path and returns a Prawn-compatible call tree.
+      #
+      def parse(data)
+        cmd = values = nil
+        value = ""
+        @subpath_initial_point = @last_point = nil
+        @previous_control_point = @previous_quadratic_control_point = nil
+        @calls = []
+
+        data.each_char do |c|
+          if c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z'
+            values << value.to_f if value != ""
+            run_path_command(cmd, values) if cmd
+            cmd = c
+            values = []
+            value = ""
+          elsif c >= '0' && c <= '9' || c == '.' || c == "-"
+            unless cmd
+              raise InvalidError, "Numerical value specified before character command in SVG path data"
+            end
+            value << c
+          elsif c == ' ' || c == "\t" || c == "\r" || c == "\n" || c == ","
+            if value != ""
+              values << value.to_f
+              value = ""
+            end
+          else
+            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
+          y = values.shift
+
+          if relative && @last_point
+            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]
+            @last_point = @subpath_initial_point
+          end
+    
+        when 'L' # lineto
+          while values.any?
+            x = values.shift
+            y = values.shift
+            if relative && @last_point
+              x += @last_point.first
+              y += @last_point.last
+            end
+            @last_point = [x, y]
+            @calls << ["line_to", @last_point]
+          end
+      
+        when 'H' # horizontal lineto
+          while values.any?
+            x = values.shift
+            x += @last_point.first if relative && @last_point
+            @last_point = [x, @last_point.last]
+            @calls << ["line_to", @last_point]
+          end
+
+        when 'V' # vertical lineto
+          while values.any?
+            y = values.shift
+            y += @last_point.last if relative && @last_point
+            @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 
+            end
+        
+            @last_point = [x, y]
+            @previous_control_point = [x2, y2]
+            @calls << ["curve_to", [x, y, x1, y1, x2, y2]]
+          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 
+            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]        
+            @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        
+              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 
+              y1 += @last_point.last if y1
+            end
+        
+            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                
+        
+            # 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        
+
+            @last_point = [x, y]
+            @previous_quadratic_control_point = [x1, y1]
+                
+            @calls << ["curve_to", [x, y, cx1, cy1, cx2, cy2]]
+          end      
+      
+        when 'A'
+          # 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

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 1
-  - 6
-  version: 0.9.1.6
+  - 7
+  version: 0.9.1.7
 platform: ruby
 authors: 
 - Roger Nesbitt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +13:00
+date: 2010-05-08 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,10 +57,10 @@ extra_rdoc_files: []
 files: 
 - README
 - LICENSE
+- lib/prawn/svg/extension.rb
+- lib/prawn/svg/interface.rb
+- lib/prawn/svg/parser/path.rb
 - lib/prawn/svg/parser.rb
-- lib/prawn/svg/path.rb
-- lib/prawn/svg/svg.rb
-- lib/prawn/svg_document.rb
 - lib/prawn-svg.rb
 has_rdoc: true
 homepage: http://github.com/mogest/prawn-svg

data/lib/prawn/svg/path.rb

@@ -1,180 +0,0 @@
-class Prawn::Svg::Parser::Path
-  # Raised if the SVG path cannot be parsed.
-  InvalidError = Class.new(StandardError)
-
-  #
-  # Parses an SVG path and returns a Prawn-compatible call tree.
-  #
-  def parse(data)
-    cmd = values = nil
-    value = ""
-    @subpath_initial_point = @last_point = nil
-    @previous_control_point = @previous_quadratic_control_point = nil
-    @calls = []
-
-    data.each_char do |c|
-      if c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z'
-        values << value.to_f if value != ""
-        run_path_command(cmd, values) if cmd
-        cmd = c
-        values = []
-        value = ""
-      elsif c >= '0' && c <= '9' || c == '.' || c == "-"
-        unless cmd
-          raise InvalidError, "Numerical value specified before character command in SVG path data"
-        end
-        value << c
-      elsif c == ' ' || c == "\t" || c == "\r" || c == "\n" || c == ","
-        if value != ""
-          values << value.to_f
-          value = ""
-        end
-      else
-        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
-      y = values.shift
-
-      if relative && @last_point
-        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]
-        @last_point = @subpath_initial_point
-      end
-    
-    when 'L' # lineto
-      while values.any?
-        x = values.shift
-        y = values.shift
-        if relative && @last_point
-          x += @last_point.first
-          y += @last_point.last
-        end
-        @last_point = [x, y]
-        @calls << ["line_to", @last_point]
-      end
-      
-    when 'H' # horizontal lineto
-      while values.any?
-        x = values.shift
-        x += @last_point.first if relative && @last_point
-        @last_point = [x, @last_point.last]
-        @calls << ["line_to", @last_point]
-      end
-
-    when 'V' # vertical lineto
-      while values.any?
-        y = values.shift
-        y += @last_point.last if relative && @last_point
-        @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 
-        end
-        
-        @last_point = [x, y]
-        @previous_control_point = [x2, y2]
-        @calls << ["curve_to", [x, y, x1, y1, x2, y2]]
-      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 
-        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]        
-        @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        
-          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 
-          y1 += @last_point.last if y1
-        end
-        
-        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                
-        
-        # 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        
-
-        @last_point = [x, y]
-        @previous_quadratic_control_point = [x1, y1]
-                
-        @calls << ["curve_to", [x, y, cx1, cy1, cx2, cy2]]
-      end      
-      
-    when 'A'
-      # 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

data/lib/prawn/svg/svg.rb

@@ -1,83 +0,0 @@
-#
-# Prawn::Svg makes a Prawn::Svg::Parser instance, uses that object to parse the supplied
-# SVG into Prawn-compatible method calls, and then calls the Prawn methods.
-#
-class Prawn::Svg
-  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.
-  attr_reader :parser_warnings
-
-  #
-  # Creates a Prawn::Svg object.
-  #
-  # +data+ is the SVG data to convert.  +prawn+ is your Prawn::Document object.
-  #
-  # +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 
-  # 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"
-
-    @parser = Parser.new(data, [prawn.bounds.width, prawn.bounds.height], options)
-    @parser_warnings = @parser.warnings
-  end
-
-  #
-  # Draws the SVG to the Prawn::Document object.
-  #
-  def draw
-    prawn.bounding_box(@options[:at], :width => @parser.width, :height => @parser.height) do
-      prawn.save_graphics_state do
-        proc_creator(prawn, @parser.parse).call
-      end
-    end
-  end
-
-  
-  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
-        issue_prawn_command(prawn, children) if children.any?
-      else
-        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)
-    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'
-        arguments.last[:at][0] -= width
-      end
-      
-      arguments.last[:at][1] += prawn.height_of(*arguments) / 3 * 2
-    end
-  end
-end