prawn-svg 0.9.1.11 → 0.12.0.1

data/.gitignore

@@ -3,3 +3,4 @@ spec/sample_output/*.pdf
 prawn-svg-*.gem
 Gemfile.lock
 .rvmrc
+.*.swp

data/README.md

@@ -0,0 +1,78 @@
+prawn-svg
+=========
+
+An SVG renderer for the Prawn PDF library.
+
+This will take an SVG file as input and render it into your PDF.  Find out more about the Prawn PDF library at:
+
+  http://wiki.github.com/sandal/prawn/
+
+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,
+the resolution specified in the SVG will be used.
+
+Supported features
+------------------
+
+prawn-svg is in its infancy and does not support the full SVG specifications.  It currently supports:
+
+ - <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)
+   
+ - 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>
+ 
+ - 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:
+
+```ruby
+  Prawn::Svg.font_path &lt;&lt; "/my/font/directory"
+```
+
+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
+-------------
+
+prawn-svg does NOT support external references, measurements in en or em, gradients/patterns or markers.
+
+--
+Copyright Roger Nesbitt <roger@seriousorange.com>.  MIT licence.

data/lib/prawn/svg/element.rb

@@ -53,37 +53,34 @@ class Prawn::Svg::Element
         case name
         when 'translate'
           x, y = arguments
-          x, y = x.split(/\s+/) if y.nil?
           add_call_and_enter name, @document.distance(x), -@document.distance(y)
 
         when 'rotate'
-          rotation_arguments = arguments.first.split(/\s+/)
-          if (rotation_arguments.length == 3)
-            add_call_and_enter name, -rotation_arguments.first.to_f, :origin => [@document.x(rotation_arguments[1].to_f), @document.y(rotation_arguments[2].to_f)]
+          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, -arguments.first.to_f, :origin => [0, @document.y('0')]
+            add_call_and_enter name, -r, :origin => [0, @document.y('0')]
           end
 
         when 'scale'
-          args = arguments.first.split(/\s+/)
-          x_scale = args[0].to_f
-          y_scale = (args[1] || x_scale).to_f
+          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'
-          args = arguments.first.split(/\s+/)
-          if args.length != 6
+          if arguments.length != 6
             @document.warnings << "transform 'matrix' must have six arguments"
           else
-            a, b, c, d, e, f = args.collect {|a| a.to_f}
-            add_call_and_enter "transformation_matrix", a, b, c, d, @document.distance(e), -@document.distance(f)
+            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    
-        
+    end
+
     # Opacity:
     # 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']
@@ -147,9 +144,9 @@ class Prawn::Svg::Element
   def parse_css_method_calls(string)
     string.scan(/\s*(\w+)\(([^)]+)\)\s*/).collect do |call|
       name, argument_string = call
-      arguments = argument_string.split(",").collect {|s| s.strip}
+      arguments = argument_string.strip.split(/\s*[,\s]\s*/)
       [name, arguments]
-    end    
+    end
   end
 
   # TODO : use http://www.w3.org/TR/SVG11/types.html#ColorKeywords

data/lib/prawn/svg/interface.rb

@@ -92,8 +92,10 @@ module Prawn
           @relative_text_position = options[:at][0] + width + space_width
           
         when 'transformation_matrix'
-          arguments[4] += prawn.bounds.absolute_left * (1 - arguments[0])
-          arguments[5] += prawn.bounds.absolute_top * (1 - arguments[3])
+          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 'save'
           prawn.save_graphics_state

data/lib/prawn/svg/parser.rb

@@ -51,7 +51,6 @@ class Prawn::Svg::Parser
 
   private  
   REQUIRED_ATTRIBUTES = {
-    "line"      => %w(x1 y1 x2 y2),
     "polyline"  => %w(points),
     "polygon"   => %w(points),
     "circle"    => %w(r),
@@ -88,7 +87,7 @@ class Prawn::Svg::Parser
       @svg_text.parse(element)
 
     when 'line'
-      element.add_call 'line', x(attrs['x1']), y(attrs['y1']), x(attrs['x2']), y(attrs['y2'])
+      element.add_call 'line', x(attrs['x1'] || '0'), y(attrs['y1'] || '0'), x(attrs['x2'] || '0'), y(attrs['y2'] || '0')
 
     when 'polyline'
       points = attrs['points'].split(/\s+/)
@@ -164,11 +163,15 @@ class Prawn::Svg::Parser
     end
 
     commands.collect do |command, args|
-      point_to = [x(args[0]), y(args[1])]
-      if command == 'curve_to'
-        opts = {:bounds => [[x(args[2]), y(args[3])], [x(args[4]), y(args[5])]]}
+      if args && args.length > 0
+        point_to = [x(args[0]), y(args[1])]
+        if command == 'curve_to'
+          opts = {:bounds => [[x(args[2]), y(args[3])], [x(args[4]), y(args[5])]]}
+        end
+        element.add_call command, point_to, opts
+      else
+        element.add_call command
       end
-      element.add_call command, point_to, opts
     end  
   end
   

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

@@ -68,7 +68,8 @@ module Prawn
       
         when 'Z' # closepath
           if @subpath_initial_point
-            @calls << ["line_to", @subpath_initial_point]
+            #@calls << ["line_to", @subpath_initial_point]
+            @calls << ["close_path"]
             @last_point = @subpath_initial_point
           end
     

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Svg
-    VERSION = '0.9.1.11'
+    VERSION = '0.12.0.1'
   end
 end

data/spec/lib/path_spec.rb

@@ -9,7 +9,7 @@ describe Prawn::Svg::Parser::Path 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")
+      @path.parse("A12.34 -56.78 89B4 5   C  6,7 T QX 0 Z")
       
       calls.should == [
         ["A", [12.34, -56.78, 89]],
@@ -17,7 +17,8 @@ describe Prawn::Svg::Parser::Path do
         ["C", [6, 7]],
         ["T", []],
         ["Q", []],
-        ["X", [0]]
+        ["X", [0]],
+        ["Z", []]
       ]      
     end
     

data/spec/sample_svg/close_path.svg

@@ -0,0 +1,10 @@
+<?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="12cm" height="4cm" viewBox="0 0 1200 400"
+     xmlns="http://www.w3.org/2000/svg" version="1.1">
+  <desc>Example close_path - triangle with rounded corners</desc>
+  <!-- Show outline of canvas using 'polygon' element -->
+  <path d="M 10,10 L 15,20 L 20,10 z" />
+</svg>
+

data/spec/sample_svg/matrix_transform.svg

@@ -0,0 +1,10 @@
+<svg height="975" version="1.1" width="1275" xmlns="http://www.w3.org/2000/svg">
+  <text x="200" y="200" text-anchor="middle" stroke="none" fill="#000000"  font-size="40px" font-weight="bold" transform="matrix(0.9848,0.1736,-0.1736,0.9848,0,0)">
+    Zero transform
+  </text>
+  <rect x="198" y="198" width="4" height="4" stroke="blue" fill="blue" />
+  <text x="638" y="471" text-anchor="middle" stroke="none" fill="#000000"  font-size="80px" font-weight="bold" transform="matrix(0.7071,-0.7071,0.7071,0.7071,-146.1814,589.0868)">
+    Matrix transform
+  </text>
+  <rect x="636" y="469" width="4" height="4" stroke="blue" fill="blue" />
+</svg>

metadata

@@ -1,82 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: prawn-svg
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.12.0.1
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 1
-  - 11
-  version: 0.9.1.11
 platform: ruby
-authors: 
+authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-20 00:00:00 +12:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: prawn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SVG renderer for Prawn PDF library
 email: roger@seriousorange.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
 - LICENSE
-- README
+- README.md
 - Rakefile
 - lib/prawn-svg.rb
 - lib/prawn/svg/document.rb
@@ -99,12 +92,14 @@ files:
 - spec/sample_output/directory
 - spec/sample_svg/arcs01.svg
 - spec/sample_svg/circle01.svg
+- spec/sample_svg/close_path.svg
 - spec/sample_svg/cubic01.svg
 - spec/sample_svg/cubic01a.svg
 - spec/sample_svg/cubic02.svg
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/line01.svg
 - spec/sample_svg/maths.svg
+- spec/sample_svg/matrix_transform.svg
 - spec/sample_svg/omnigraffle.svg
 - spec/sample_svg/opacity01.svg
 - spec/sample_svg/polygon01.svg
@@ -120,41 +115,31 @@ files:
 - spec/sample_svg/tspan03.svg
 - spec/sample_svg/use.svg
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/mogest/prawn-svg
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: SVG renderer for Prawn PDF library
-test_files: 
+test_files:
 - spec/lib/parser_spec.rb
 - spec/lib/path_spec.rb
 - spec/lib/svg_spec.rb
@@ -165,12 +150,14 @@ test_files:
 - spec/sample_output/directory
 - spec/sample_svg/arcs01.svg
 - spec/sample_svg/circle01.svg
+- spec/sample_svg/close_path.svg
 - spec/sample_svg/cubic01.svg
 - spec/sample_svg/cubic01a.svg
 - spec/sample_svg/cubic02.svg
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/line01.svg
 - spec/sample_svg/maths.svg
+- spec/sample_svg/matrix_transform.svg
 - spec/sample_svg/omnigraffle.svg
 - spec/sample_svg/opacity01.svg
 - spec/sample_svg/polygon01.svg

data/README

@@ -1,57 +0,0 @@
-An SVG renderer for the Prawn PDF library.
-
-This will take an SVG file as input and render it into your PDF.  Find out more about the Prawn PDF library at:
-
-  http://wiki.github.com/sandal/prawn/
-
-Using prawn-svg:
-
-  Prawn::Document.generate("svg.pdf") do
-    svg svg_data, :at => [x, y], :width => w
-  end
-  
-:at must be specified.  :width, :height, or neither may be specified; if neither is present,
-the resolution specified in the SVG will be used.
-
-prawn-svg is in its infancy and does not support the full SVG specifications.  It currently supports:
-
-- line tag
-- polyline tag
-- polygon tag
-- circle tag
-- ellipse tag (although this seems to be buggy)
-
-- rect tag
-  supports rounded rects, but only one radius is applied to all corners
-
-- path tag
-  supports moveto, closepath, lineto, horiz lineto, vert lineto, curveto, smooth curveto, quad curveto, smooth quad curveto
-  does not support elliptical arc
-
-- text and tspan tags
-  attributes: size, text-anchor, font-family, font-weight, dx, dy
-  
-- svg, g and symbol tags
-  
-- use tag
-  
-- 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, matrix
-
-- 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, %
-
-- 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 external references, 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.