prawn-svg 0.12.0.11 → 0.12.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a14b8e4dc51812f13ac2defaf8ea8e1ec09f5183
-  data.tar.gz: c8fd5023335201e38d03c83921b10c7666321543
+  metadata.gz: 9f60ffdf19d946bf97ba8cd7fdf732cdef8f3d6f
+  data.tar.gz: 3885db032ea679b2993f359cb4728feaad8a7ccd
 SHA512:
-  metadata.gz: bac4b67bd32a2be9f148cffce11e3df1f3b66873281dc5434cfb7f0090493754e126995073d0401a10d60dbb06354e201c739e03e10fb145efbe165033eafe2b
-  data.tar.gz: 13bf35b240fbf40f4c9d1be3377a6dc87535898fb4f78a98a53473f588a8bf02d69ad3bb636ac331516242021f18bc949e1dd32325056b502eac1c15c0d65d00
+  metadata.gz: 65587a6f9fae146ac42583ecf9aebb60671834e92038b2845aaa3c79d7e3e848a47d7526f7cb525cad7b06032b3da500b181966a88bbdc88041a470b80e621e5
+  data.tar.gz: d3fe9134e90fce9a027f7e8b5d824006ee92a7e9ca6c8d912e509807db95b8b45783bfa11e86eb6436b99e37b090a5a5c4e13eb8e787bfef0fb32233499ea433

data/lib/prawn/svg/interface.rb

@@ -41,9 +41,8 @@ module Prawn
       #
       def draw
         prawn.bounding_box(@options[:at], :width => @document.width, :height => @document.height) do
-          clip_rectangle 0, 0, @document.width, @document.height
-
           prawn.save_graphics_state do
+            clip_rectangle 0, 0, @document.width, @document.height
             proc_creator(prawn, Parser.new(@document).parse).call
           end
         end

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

@@ -167,7 +167,85 @@ module Prawn
           end
 
         when 'A'
-          # unsupported
+          return unless @last_point
+
+          while values.any?
+            rx, ry, phi, fa, fs, x2, y2 = (1..7).collect {values.shift}
+            x1, y1 = @last_point
+
+            if relative
+              x2 += x1
+              y2 += y1
+            end
+
+            rx = rx.abs
+            ry = ry.abs
+            phi = (phi % 360) * 2 * Math::PI / 360.0
+
+            # We need to get the center co-ordinates, as well as the angles from the X axis to the start and end
+            # points.  To do this, we use the algorithm documented in the SVG specification section F.6.5.
+
+            # F.6.5.1
+            xp1 = Math.cos(phi) * ((x1-x2)/2.0) + Math.sin(phi) * ((y1-y2)/2.0)
+            yp1 = -Math.sin(phi) * ((x1-x2)/2.0) + Math.cos(phi) * ((y1-y2)/2.0)
+
+            # F.6.6.2
+            r2x = rx * rx
+            r2y = ry * ry
+            hat = xp1 * xp1 / r2x + yp1 * yp1 / r2y
+            if hat > 1
+              rx *= Math.sqrt(hat)
+              ry *= Math.sqrt(hat)
+            end
+
+            # F.6.5.2
+            r2x = rx * rx
+            r2y = ry * ry
+            square = (r2x * r2y - r2x * yp1 * yp1 - r2y * xp1 * xp1) / (r2x * yp1 * yp1 + r2y * xp1 * xp1)
+            square = 0 if square < 0 && square > -1e-10 # catch rounding errors
+            base = Math.sqrt(square)
+            base *= -1 if fa == fs
+            cpx = base * rx * yp1 / ry
+            cpy = base * -ry * xp1 / rx
+
+            # F.6.5.3
+            cx = Math.cos(phi) * cpx + -Math.sin(phi) * cpy + (x1 + x2) / 2
+            cy = Math.sin(phi) * cpx + Math.cos(phi) * cpy + (y1 + y2) / 2
+
+            # F.6.5.5
+            vx = (xp1 - cpx) / rx
+            vy = (yp1 - cpy) / ry
+            theta_1 = Math.acos(vx / Math.sqrt(vx * vx + vy * vy))
+            theta_1 *= -1 if vy < 0
+
+            # F.6.5.6
+            ux = vx
+            uy = vy
+            vx = (-xp1 - cpx) / rx
+            vy = (-yp1 - cpy) / ry
+
+            numerator = ux * vx + uy * vy
+            denominator = Math.sqrt(ux * ux + uy * uy) * Math.sqrt(vx * vx + vy * vy)
+            division = numerator / denominator
+            division = -1 if division < -1 # for rounding errors
+
+            d_theta = Math.acos(division) % (2 * Math::PI)
+            d_theta *= -1 if ux * vy - uy * vx < 0
+
+            # Adjust range
+            if fs == 0
+              d_theta -= 2 * Math::PI if d_theta > 0
+            else
+              d_theta += 2 * Math::PI if d_theta < 0
+            end
+
+            theta_2 = theta_1 + d_theta
+
+            calculate_bezier_curve_points_for_arc(cx, cy, rx, ry, theta_1, theta_2, phi).each do |points|
+              @calls << ["curve_to", points[:p2] + points[:q1] + points[:q2]]
+              @last_point = points[:p2]
+            end
+          end
         end
 
         @previous_control_point = nil unless %w(C S).include?(upcase_command)
@@ -184,6 +262,113 @@ module Prawn
         end
         result
       end
+
+      def calculate_eta_from_lambda(a, b, lambda_1, lambda_2)
+        # 2.2.1
+        eta1 = Math.atan2(Math.sin(lambda_1) / b, Math.cos(lambda_1) / a)
+        eta2 = Math.atan2(Math.sin(lambda_2) / b, Math.cos(lambda_2) / a)
+
+        # ensure eta1 <= eta2 <= eta1 + 2*PI
+        eta2 -= 2 * Math::PI * ((eta2 - eta1) / (2 * Math::PI)).floor
+        eta2 += 2 * Math::PI if lambda_2 - lambda_1 > Math::PI && eta2 - eta1 < Math::PI
+
+        [eta1, eta2]
+      end
+
+      # Convert the elliptical arc to a cubic bézier curve using this algorithm:
+      # http://www.spaceroots.org/documents/ellipse/elliptical-arc.pdf
+      def calculate_bezier_curve_points_for_arc(cx, cy, a, b, lambda_1, lambda_2, theta)
+        e = lambda do |eta|
+          [
+            cx + a * Math.cos(theta) * Math.cos(eta) - b * Math.sin(theta) * Math.sin(eta),
+            cy + a * Math.sin(theta) * Math.cos(eta) + b * Math.cos(theta) * Math.sin(eta)
+          ]
+        end
+
+        ep = lambda do |eta|
+          [
+            -a * Math.cos(theta) * Math.sin(eta) - b * Math.sin(theta) * Math.cos(eta),
+            -a * Math.sin(theta) * Math.sin(eta) + b * Math.cos(theta) * Math.cos(eta)
+          ]
+        end
+
+        iterations = 1
+        d_lambda = lambda_2 - lambda_1
+
+        while iterations < 1024
+          if d_lambda.abs <= Math::PI / 2.0
+            # TODO : run error algorithm, see whether it meets threshold or not
+            # puts "error = #{calculate_curve_approximation_error(a, b, eta1, eta1 + d_eta)}"
+            break
+          end
+          iterations *= 2
+          d_lambda = (lambda_2 - lambda_1) / iterations
+        end
+
+        (0...iterations).collect do |iteration|
+          eta_a, eta_b = calculate_eta_from_lambda(a, b, lambda_1+iteration*d_lambda, lambda_1+(iteration+1)*d_lambda)
+          d_eta = eta_b - eta_a
+
+          alpha = Math.sin(d_eta) * ((Math.sqrt(4 + 3 * Math.tan(d_eta / 2) ** 2) - 1) / 3)
+
+          x1, y1 = e[eta_a]
+          x2, y2 = e[eta_b]
+
+          ep_eta1_x, ep_eta1_y = ep[eta_a]
+          q1_x = x1 + alpha * ep_eta1_x
+          q1_y = y1 + alpha * ep_eta1_y
+
+          ep_eta2_x, ep_eta2_y = ep[eta_b]
+          q2_x = x2 - alpha * ep_eta2_x
+          q2_y = y2 - alpha * ep_eta2_y
+
+          {:p2 => [x2, y2], :q1 => [q1_x, q1_y], :q2 => [q2_x, q2_y]}
+        end
+      end
+
+      ERROR_COEFFICIENTS_A = [
+        [
+          [3.85268, -21.229, -0.330434, 0.0127842],
+          [-1.61486, 0.706564, 0.225945, 0.263682],
+          [-0.910164, 0.388383, 0.00551445, 0.00671814],
+          [-0.630184, 0.192402, 0.0098871, 0.0102527]
+        ],
+        [
+          [-0.162211, 9.94329, 0.13723, 0.0124084],
+          [-0.253135, 0.00187735, 0.0230286, 0.01264],
+          [-0.0695069, -0.0437594, 0.0120636, 0.0163087],
+          [-0.0328856, -0.00926032, -0.00173573, 0.00527385]
+        ]
+      ]
+
+      ERROR_COEFFICIENTS_B = [
+        [
+          [0.0899116, -19.2349, -4.11711, 0.183362],
+          [0.138148, -1.45804, 1.32044, 1.38474],
+          [0.230903, -0.450262, 0.219963, 0.414038],
+          [0.0590565, -0.101062, 0.0430592, 0.0204699]
+        ],
+        [
+          [0.0164649, 9.89394, 0.0919496, 0.00760802],
+          [0.0191603, -0.0322058, 0.0134667, -0.0825018],
+          [0.0156192, -0.017535, 0.00326508, -0.228157],
+          [-0.0236752, 0.0405821, -0.0173086, 0.176187]
+        ]
+      ]
+
+      def calculate_curve_approximation_error(a, b, eta1, eta2)
+        b_over_a = b / a
+        coefficents = b_over_a < 0.25 ? ERROR_COEFFICIENTS_A : ERROR_COEFFICIENTS_B
+
+        c = lambda do |i|
+          (0..3).inject(0) do |accumulator, j|
+            coef = coefficents[i][j]
+            accumulator + ((coef[0] * b_over_a**2 + coef[1] * b_over_a + coef[2]) / (b_over_a * coef[3])) * Math.cos(j * (eta1 + eta2))
+          end
+        end
+
+        ((0.001 * b_over_a**2 + 4.98 * b_over_a + 0.207) / (b_over_a * 0.0067)) * a * Math.exp(c[0] + c[1] * (eta2 - eta1))
+      end
     end
   end
 end

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Svg
-    VERSION = '0.12.0.11'
+    VERSION = '0.12.0.12'
   end
 end

data/spec/lib/svg_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe Prawn::Svg::Interface do
+  root = "#{File.dirname(__FILE__)}/../.."
+
   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
@@ -20,4 +21,27 @@ describe Prawn::Svg::Interface do
       end
     end
   end
+
+  describe "multiple file rendering" do
+    it "renders multiple files on to the same PDF" do
+      Prawn::Document.generate("#{root}/spec/sample_output/multiple.pdf") do |prawn|
+        width = prawn.bounds.width
+
+        y = prawn.bounds.top - 12
+        prawn.draw_text "This is multiple SVGs being output to the same PDF", :at => [0, y]
+
+        y -= 12
+        prawn.svg IO.read("#{root}/spec/sample_svg/arcs01.svg"),   :at => [0, y],         :width => width / 2
+        prawn.svg IO.read("#{root}/spec/sample_svg/circle01.svg"), :at => [width / 2, y], :width => width / 2
+
+        y -= 120
+        prawn.draw_text "Here are some more PDFs below", :at => [0, y]
+
+        y -= 12
+        prawn.svg IO.read("#{root}/spec/sample_svg/quad01.svg"), :at => [0, y],             :width => width / 3
+        prawn.svg IO.read("#{root}/spec/sample_svg/rect01.svg"), :at => [width / 3, y],     :width => width / 3
+        prawn.svg IO.read("#{root}/spec/sample_svg/rect02.svg"), :at => [width / 3 * 2, y], :width => width / 3
+      end
+    end
+  end
 end

data/spec/sample_svg/arcs01.svg

@@ -8,10 +8,12 @@
         a picture of a line with arc blips</desc>
   <rect x="1" y="1" width="1198" height="398"
         fill="none" stroke="blue" stroke-width="1" />
+
   <path d="M300,200 h-150 a150,150 0 1,0 150,-150 z"
         fill="red" stroke="blue" stroke-width="5" />
   <path d="M275,175 v-150 a150,150 0 0,0 -150,150 z"
         fill="yellow" stroke="blue" stroke-width="5" />
+
   <path d="M600,350 l 50,-25 
            a25,25 -30 0,1 50,-25 l 50,-25 
            a25,50 -30 0,1 50,-25 l 50,-25 

data/spec/sample_svg/highcharts.svg

@@ -0,0 +1,52 @@
+<?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 xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" width="700" height="700">
+<desc>Created with Highcharts 3.0.7</desc>
+<defs>
+    <clipPath id="highcharts-1">
+        <rect fill="none" x="0" y="0" width="680" height="675"/>
+    </clipPath>
+</defs>
+<rect rx="5" ry="5" fill="#FFFFFF" x="0" y="0" width="700" height="700"/>
+<g class="highcharts-series-group" zIndex="3">
+    <g class="highcharts-series highcharts-tracker" visibility="visible" zIndex="0.1" transform="translate(10,10) scale(1 1)" style="cursor:pointer;">
+        <path fill="none" d="M 398.21842343360134 47.01407539537521 C 393.21842343360134 47.01407539537521 391.6876463101181 54.86625479973296 389.5828277653285 65.66300148072486 L 387.47800922053887 76.45974816171676" stroke="#DF000D" stroke-width="1" visibility="visible"/>
+        <path fill="none" d="M 402.2770459083969 592.163288554881 C 397.2770459083969 592.163288554881 395.62952638563803 584.3347714908305 393.3641870418453 573.570560527761 L 391.09884769805257 562.8063495646916" stroke="#df424c" stroke-width="1" visibility="visible"/>
+        <path fill="none" d="M 226.7036279754776 63.82542782054614 C 231.7036279754776 63.82542782054614 234.81866968764356 71.19404472817988 239.10185204187187 81.32589297617625 L 243.38503439610017 91.45774122417262" stroke="#df878c" stroke-width="1" visibility="visible"/>
+        <path fill="#DF000D" d="M 339.94946358633314 71.87500514645669 A 248.125 248.125 0 0 1 432.9087444368945 89.92614048493073 L 405.3871617019353 158.07900164103185 A 174.625 174.625 0 0 0 339.96443356680476 145.37500362196474 Z" stroke="#FFFFFF" stroke-width="1" stroke-linejoin="round" transform="translate(0,0)"/>
+        <path fill="#df424c" d="M 433.13877180369553 90.01916425080302 A 248.125 248.125 0 1 1 161.76607819326867 147.3770445670913 L 214.56282681914172 198.51170340565568 A 174.625 174.625 0 1 0 405.5490499797293 158.14446975232838 Z" stroke="#FFFFFF" stroke-width="1" stroke-linejoin="round" transform="translate(0,0)"/>
+        <path fill="#df878c" d="M 161.93879023688453 147.19889698646077 A 248.125 248.125 0 0 1 339.65535935286596 71.87523934958779 L 339.7574493783142 145.375168449055 A 174.625 174.625 0 0 0 214.68437781406936 198.3863269975243 Z" stroke="#FFFFFF" stroke-width="1" stroke-linejoin="round" transform="translate(0,0)"/>
+    </g>
+    <g class="highcharts-markers" visibility="visible" zIndex="0.1" transform="translate(10,10) scale(1 1)"/>
+</g>
+<g class="highcharts-data-labels highcharts-tracker" visibility="visible" zIndex="6" transform="translate(10,10) scale(1 1)" style="cursor:pointer;">
+    <g zIndex="1" style="cursor:pointer;" transform="translate(403,37)" visibility="visible">
+        <text x="3" y="26" style="font-family:&quot;Open Sans&quot;, Verdana, Arial, Helvetica, sans-serif;font-size:24px;color:#000000;line-height:14px;fill:#000000;" zIndex="1">
+            <tspan x="3">Mobili&#xE8;re</tspan>
+        </text>
+    </g>
+    <g zIndex="1" style="cursor:pointer;" transform="translate(407,582)" visibility="visible">
+        <text x="3" y="26" style="font-family:&quot;Open Sans&quot;, Verdana, Arial, Helvetica, sans-serif;font-size:24px;color:#000000;line-height:14px;fill:#000000;" zIndex="1">
+            <tspan x="3">B&#xE2;loise</tspan>
+        </text>
+    </g>
+    <g zIndex="1" style="cursor:pointer;" transform="translate(130,54)" visibility="visible">
+        <text x="3" y="26" style="font-family:&quot;Open Sans&quot;, Verdana, Arial, Helvetica, sans-serif;font-size:24px;color:#000000;line-height:14px;fill:#000000;" zIndex="1">
+            <tspan x="3">Generali</tspan>
+        </text>
+    </g>
+</g>
+<g class="highcharts-legend" zIndex="7">
+    <rect rx="5" ry="5" fill="none" x="0.5" y="0.5" width="7" height="7" stroke="#909090" stroke-width="1" visibility="hidden"/>
+    <g zIndex="1">
+        <g/>
+    </g>
+</g>
+<g class="highcharts-tooltip" zIndex="8" style="cursor:default;padding:0;white-space:nowrap;" transform="translate(0,-999)">
+    <rect rx="3" ry="3" fill="none" x="0.5" y="0.5" width="16" height="16" fill-opacity="0.85" isShadow="true" stroke="black" stroke-width="5" transform="translate(1, 1)" opacity="0.049999999999999996"/>
+    <rect rx="3" ry="3" fill="none" x="0.5" y="0.5" width="16" height="16" fill-opacity="0.85" isShadow="true" stroke="black" stroke-width="3" transform="translate(1, 1)" opacity="0.09999999999999999"/>
+    <rect rx="3" ry="3" fill="none" x="0.5" y="0.5" width="16" height="16" fill-opacity="0.85" isShadow="true" stroke="black" stroke-width="1" transform="translate(1, 1)" opacity="0.15"/>
+    <rect rx="3" ry="3" fill="rgb(255,255,255)" x="0.5" y="0.5" width="16" height="16" fill-opacity="0.85"/>
+    <text x="8" y="21" style="font-family:&quot;Lucida Grande&quot;, &quot;Lucida Sans Unicode&quot;, Verdana, Arial, Helvetica, sans-serif;font-size:12px;color:#333333;fill:#333333;" zIndex="1"/>
+</g>
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.12.0.11
+  version: 0.12.0.12
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -95,6 +95,7 @@ files:
 - spec/sample_svg/cubic02.svg
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/google_charts.svg
+- spec/sample_svg/highcharts.svg
 - spec/sample_svg/image01.svg
 - spec/sample_svg/image02_base64.svg
 - spec/sample_svg/line01.svg
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: SVG renderer for Prawn PDF library
@@ -163,6 +164,7 @@ test_files:
 - spec/sample_svg/cubic02.svg
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/google_charts.svg
+- spec/sample_svg/highcharts.svg
 - spec/sample_svg/image01.svg
 - spec/sample_svg/image02_base64.svg
 - spec/sample_svg/line01.svg