prawn-svg 0.32.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d054ded3422dc4cd1cb870dc09549c0a82c1e2813e314565c7a3aec70d95d188
-  data.tar.gz: 123a00b97f78f284a8e11fad37fed42cbec06d678675ec15ff7dafbcfe6505d5
+  metadata.gz: fa5a995fd0ec6d8426dcc87603695e91ff743e1fddc559da6cc7fcc08ab5eb88
+  data.tar.gz: d76a03c53c2d7dab41db812e3309f59f32baefb730970015a8bb35d6fb791653
 SHA512:
-  metadata.gz: 4ece284ced16e7b6f4d7562c17a97780375f4e255eb4199d489cfb1fa473dc1f65e6b9fa48894079f0756b42a749cc58f34c00507e19ccdfddab55723c82311d
-  data.tar.gz: 8826f6f457372cc7df38869e6448974f5731fdee1040bca44b8446b71c57e0713340481a3400705c8fd11ec5d13959dcd99f24a0fe8820c89a37ca725545656c
+  metadata.gz: 0a686e69f4759243fc9b672a4bad663f17bf3f4f1a7016e560d816859d3d49464dfbb6416d877cf35f5362cd316111661e96817b645f707cc19999bae7e98f17
+  data.tar.gz: 57fbf5408c56228a286ca10221759440c4fc1326c0855acc4c5a74a30652ca59af277d170cf5bcb7f40b24bfe511e6ff82fd24e81da301e15595dc7f9d283e7a

data/.github/workflows/test.yml

@@ -1,14 +1,31 @@
 name: test
 on: [push, pull_request]
 jobs:
-  rake:
+  rake_new:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0']
+        ruby: [2.6, 2.7, '3.0', 3.1, 3.2, 3.3]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - name: Run tests
+      run:  bundle exec rake
+      env:
+        RUBYOPT: "--enable-frozen-string-literal"
+  rake_old:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5]
+    steps:
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 .ruby-version
 vendor/bundle/
 .bundle/
+.mise.toml

data/README.md

@@ -10,7 +10,7 @@ This will take an SVG document as input and render it into your PDF.  Find out m
   http://github.com/prawnpdf/prawn
 
 prawn-svg is compatible with all versions of Prawn from 0.11.1 onwards, including the 1.x and 2.x series.
-The minimum Ruby version required is 2.3.0.
+The minimum Ruby version required is 2.5.0.
 
 ## Using prawn-svg
 
@@ -33,7 +33,8 @@ Option      | Data type | Description
 :enable_web_requests | boolean | If true, prawn-svg will make http and https requests to fetch images.  Defaults to true.
 :enable_file_requests_with_root | string | If not nil, prawn-svg will serve `file:` URLs from your local disk if the file is located under the specified directory. It is very dangerous to specify the root path ("/") if you're not fully in control of your input SVG.  Defaults to `nil` (off).
 :cache_images | boolean   | If true, prawn-svg will cache the result of all URL requests. Defaults to false.
-:fallback_font_name | string | A font name which will override the default fallback font of Times-Roman.  If this value is set to <tt>nil</tt>, prawn-svg will ignore a request for an unknown font and log a warning.
+:fallback_font_name | string | A font name which will override the default fallback font of Times-Roman.  If this value is set to `nil`, prawn-svg will ignore a request for an unknown font and log a warning.
+:color_mode | :rgb, :cmyk | Output color mode.  Defaults to :rgb.
 
 ## Examples
 
@@ -53,51 +54,57 @@ Option      | Data type | Description
 
 prawn-svg supports most but not all of the full SVG 1.1 specification.  It currently supports:
 
- - <tt>&lt;line&gt;</tt>, <tt>&lt;polyline&gt;</tt>, <tt>&lt;polygon&gt;</tt>, <tt>&lt;circle&gt;</tt> and <tt>&lt;ellipse&gt;</tt>
+ - `<line>`, `<polyline>`, `<polygon>`, `<circle>` and `<ellipse>`
 
- - <tt>&lt;rect&gt;</tt>.  Rounded rects are supported, but only one radius is applied to all corners.
+ - `<rect>`.  Rounded rects are supported, but only one radius is applied to all corners.
 
- - <tt>&lt;path&gt;</tt> supports all commands defined in SVG 1.1, although the
+ - `<path>` supports all commands defined in SVG 1.1, although the
    implementation of elliptical arc is a bit rough at the moment.
 
- - `<text>`, `<tspan>` and `<tref>` with attributes `x`, `y`, `dx`, `dy`, `rotate`, 'textLength', 'lengthAdjust', and with extra properties
-   `text-anchor`, `text-decoration` (underline only), `font-size`, `font-family`, `font-weight`, `font-style`, `letter-spacing`
+ - `<text>`, `<tspan>` and `<tref>` with attributes `x`, `y`, `dx`, `dy`, `rotate`, `textLength`, `lengthAdjust`,
+   and with extra properties `text-anchor`, `text-decoration` (underline only), `font-size`, `font-family`,
+   `font-weight`, `font-style`, `letter-spacing`, `dominant-baseline` (middle only)
 
- - <tt>&lt;svg&gt;</tt>, <tt>&lt;g&gt;</tt> and <tt>&lt;symbol&gt;</tt>
+ - `<svg>`, `<g>` and `<symbol>`
 
- - <tt>&lt;use&gt;</tt>
+ - `<use>`
 
- - <tt>&lt;style&gt;</tt> (see CSS section below)
+ - `<style>` (see CSS section below)
 
- - <tt>&lt;image&gt;</tt> with <tt>http:</tt>, <tt>https:</tt>, <tt>data:image/\*;base64</tt> and `file:` schemes
-   (`file:` is disabled by default for security reasons, see Options section above)
+ - `<image>` referencing a JPEG, PNG, or SVG image,  with `http:`, `https:`, `data:image/jpeg;base64`,
+   `data:image/png;base64`, `data:image/svg+xml;base64` and `file:` schemes (`file:` is disabled by default for
+   security reasons, see Options section above)
 
- - <tt>&lt;clipPath&gt;</tt>
+ - `<clipPath>`
 
  - `<marker>`
 
- - `<linearGradient>` and `<radialGradient>` are implemented on Prawn 2.2.0+ with attributes `gradientUnits` and `gradientTransform` (spreadMethod and stop-opacity are unimplemented.)
+ - `<linearGradient>` and `<radialGradient>` are implemented on Prawn 2.2.0+ with attributes `gradientUnits` and
+   `gradientTransform` (`spreadMethod` and `stop-opacity` are unimplemented.)
 
  - `<switch>` and `<foreignObject>`, although prawn-svg cannot handle any data that is not SVG so `<foreignObject>`
    tags are always ignored.
 
- - properties: `clip-path`, `color`, `display`, `fill`, `fill-opacity`, `fill-rule`, `opacity`, `overflow`, `stroke`, `stroke-dasharray`, `stroke-linecap`, `stroke-opacity`, `stroke-width`
+ - properties: `clip-path`, `color`, `display`, `fill`, `fill-opacity`, `fill-rule`, `opacity`, `overflow`,
+   `stroke`, `stroke-dasharray`, `stroke-linecap`, `stroke-linejoin`, `stroke-opacity`, `stroke-width`
 
  - properties on lines, polylines, polygons and paths: `marker-end`, `marker-mid`, `marker-start`
 
  - attributes on all elements: `class`, `id`, `style`, `transform`, `xml:space`
 
- - the <tt>viewBox</tt> attribute on <tt>&lt;svg&gt;</tt> and `<marker>` elements
+ - the `viewBox` attribute on `<svg>` and `<marker>` elements
 
- - the <tt>preserveAspectRatio</tt> attribute on <tt>&lt;svg&gt;</tt>, <tt>&lt;image&gt;</tt> and `<marker>` elements
+ - the `preserveAspectRatio` attribute on `<svg>`, `<image>` and `<marker>` elements
 
  - transform methods: `translate`, `translateX`, `translateY`, `rotate`, `scale`, `skewX`, `skewY`, `matrix`
 
- - colors: HTML standard names, <tt>#xxx</tt>, <tt>#xxxxxx</tt>, <tt>rgb(1, 2, 3)</tt>, <tt>rgb(1%, 2%, 3%)</tt>
+ - colors: HTML standard names, `#xxx`, `#xxxxxx`, `rgb(1, 2, 3)`, `rgb(1%, 2%, 3%)`, and also the non-standard
+   `device-cmyk(1, 2, 3, 4)` for CMYK colors
 
- - 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>pc</tt>, <tt>%</tt>
+ - measurements specified in `pt`, `cm`, `dm`, `ft`, `in`, `m`, `mm`, `yd`, `pc`, `%`
 
- - fonts: generic CSS fonts, built-in PDF fonts, and any TTF fonts in your fonts path, specified in any of the measurements above plus `em` or `rem`
+ - fonts: generic CSS fonts, built-in PDF fonts, and any TTF fonts in your fonts path, specified in any of the
+   measurements above plus `em` or `rem`
 
 ## CSS
 
@@ -116,7 +123,7 @@ implemented, but `!important` is not.
 
 ## Not supported
 
-prawn-svg does not support hyperlinks, patterns or filters.
+prawn-svg does not support hyperlinks, patterns, masks or filters.
 
 It does not support text in the clip area, but you can clip shapes and text by any shape.
 
@@ -124,8 +131,9 @@ It does not support text in the clip area, but you can clip shapes and text by a
 
 ### Fonts
 
-By default, prawn-svg has a fonts path of <tt>["/Library/Fonts", "/System/Library/Fonts", "#{ENV["HOME"]}/Library/Fonts", "/usr/share/fonts/truetype"]</tt> to catch
-Mac OS X and Debian Linux users.  You can add to the font path:
+By default, prawn-svg has a fonts path of `["/Library/Fonts", "/System/Library/Fonts",
+"#{ENV["HOME"]}/Library/Fonts", "/usr/share/fonts/truetype"]` to catch MacOS and Debian Linux users.  You can add
+to the font path:
 
 ```ruby
   Prawn::SVG::FontRegistry.font_path << "/my/font/directory"
@@ -137,4 +145,4 @@ In your Gemfile, put `gem 'prawn-svg'` before `gem 'prawn-rails'` so that prawn-
 
 ## Licence
 
-MIT licence.  Copyright Roger Nesbitt.
+MIT licence.  Copyright Mog Nesbitt.

data/lib/prawn/svg/attributes/stroke.rb

@@ -1,5 +1,6 @@
 module Prawn::SVG::Attributes::Stroke
   CAP_STYLE_TRANSLATIONS = {"butt" => :butt, "round" => :round, "square" => :projecting_square}
+  JOIN_STYLE_TRANSLATIONS = {"miter" => :miter, "round" => :round, "bevel" => :bevel}
 
   def parse_stroke_attributes_and_call
     if width_string = properties.stroke_width
@@ -11,6 +12,10 @@ module Prawn::SVG::Attributes::Stroke
     if (linecap = properties.stroke_linecap) && linecap != 'inherit'
       add_call('cap_style', CAP_STYLE_TRANSLATIONS.fetch(linecap, :butt))
     end
+    
+    if (linejoin = properties.stroke_linejoin) && linejoin != 'inherit'
+      add_call('join_style', JOIN_STYLE_TRANSLATIONS.fetch(linejoin, :miter))
+    end
 
     if dasharray = properties.stroke_dasharray
       case dasharray

data/lib/prawn/svg/color.rb

@@ -1,17 +1,9 @@
 class Prawn::SVG::Color
-  class Hex
-    attr_reader :value
+  RGB = Struct.new(:value)
+  CMYK = Struct.new(:value)
 
-    def initialize(value)
-      @value = value
-    end
-
-    def ==(other)
-      value == other.value
-    end
-  end
-
-  DEFAULT_COLOR = Hex.new("000000")
+  RGB_DEFAULT_COLOR = RGB.new("000000")
+  CMYK_DEFAULT_COLOR = CMYK.new([0, 0, 0, 100])
 
   HTML_COLORS = {
     'aliceblue' => 'f0f8ff',
@@ -163,24 +155,25 @@ class Prawn::SVG::Color
     'yellowgreen' => '9acd32'
   }.freeze
 
-  RGB_VALUE_REGEXP = "\s*(-?[0-9.]+%?)\s*"
-  RGB_REGEXP = /\Argb\(#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP}\)\z/i
+  VALUE_REGEXP = "\s*(-?[0-9.]+%?)\s*"
+  RGB_REGEXP = /\Argb\(#{VALUE_REGEXP},#{VALUE_REGEXP},#{VALUE_REGEXP}\)\z/i
+  CMYK_REGEXP = /\Adevice-cmyk\(#{VALUE_REGEXP},#{VALUE_REGEXP},#{VALUE_REGEXP},#{VALUE_REGEXP}\)\z/i
   URL_REGEXP = /\Aurl\(([^)]*)\)\z/i
 
-  def self.parse(color_string, gradients = nil)
+  def self.parse(color_string, gradients = nil, color_mode = :rgb)
     url_specified = false
 
     components = color_string.to_s.strip.scan(/([^(\s]+(\([^)]*\))?)/)
 
     result = components.map do |color, *_|
       if m = color.match(/\A#([0-9a-f])([0-9a-f])([0-9a-f])\z/i)
-        Hex.new("#{m[1] * 2}#{m[2] * 2}#{m[3] * 2}")
+        RGB.new("#{m[1] * 2}#{m[2] * 2}#{m[3] * 2}")
 
       elsif color.match(/\A#[0-9a-f]{6}\z/i)
-        Hex.new(color[1..6])
+        RGB.new(color[1..6])
 
       elsif hex = HTML_COLORS[color.downcase]
-        Hex.new(hex)
+        hex_color(hex, color_mode)
 
       elsif m = color.match(RGB_REGEXP)
         hex = (1..3).collect do |n|
@@ -189,7 +182,16 @@ class Prawn::SVG::Color
           "%02x" % clamp(value.round, 0, 255)
         end.join
 
-        Hex.new(hex)
+        RGB.new(hex)
+
+      elsif m = color.match(CMYK_REGEXP)
+        cmyk = (1..4).collect do |n|
+          value = m[n].to_f
+          value *= 100 unless m[n][-1..-1] == '%'
+          clamp(value, 0, 100)
+        end
+
+        CMYK.new(cmyk)
 
       elsif matches = color.match(URL_REGEXP)
         url_specified = true
@@ -203,18 +205,40 @@ class Prawn::SVG::Color
     # Generally, we default to black if the colour was unparseable.
     # http://www.w3.org/TR/SVG/painting.html section 11.2 says if a URL was
     # supplied without a fallback, that's an error.
-    result << DEFAULT_COLOR unless url_specified
+    result << default_color(color_mode) unless url_specified
 
     result.compact
   end
 
-  def self.color_to_hex(color)
-    result = parse(color).detect {|result| result.is_a?(Hex)}
+  def self.css_color_to_prawn_color(color)
+    result = parse(color).detect {|result| result.is_a?(RGB) || result.is_a?(CMYK)}
     result.value if result
   end
 
   protected
+
   def self.clamp(value, min_value, max_value)
     [[value, min_value].max, max_value].min
   end
+
+  def self.default_color(color_mode)
+    color_mode == :cmyk ? CMYK_DEFAULT_COLOR : RGB_DEFAULT_COLOR
+  end
+
+  def self.hex_color(hex, color_mode)
+    if color_mode == :cmyk
+      r, g, b = [hex[0..1], hex[2..3], hex[4..5]].map { |h| h.to_i(16) / 255.0 }
+      k = 1 - [r, g, b].max
+      if k == 1
+        CMYK.new([0, 0, 0, 100])
+      else
+        c = (1 - r - k) / (1 - k)
+        m = (1 - g - k) / (1 - k)
+        y = (1 - b - k) / (1 - k)
+        CMYK.new([c, m, y, k].map { |v| (v * 100).round })
+      end
+    else
+      RGB.new(hex)
+    end
+  end
 end

data/lib/prawn/svg/css/selector_parser.rb

@@ -10,7 +10,7 @@ module Prawn::SVG::CSS
         case token
         when Modifier
           part = token.type
-          result.last[part] ||= part == :name ? "" : []
+          result.last[part] ||= part == :name ? +"" : []
         when Identifier
           return unless part
           result.last[part] << token.name
@@ -48,7 +48,7 @@ module Prawn::SVG::CSS
           case attribute
           when :pre_key
             if VALID_CSS_IDENTIFIER_CHAR.match(char)
-              result.last.key = char
+              result.last.key = String.new(char)
               attribute = :key
             elsif char != " " && char != "\t"
               return
@@ -60,7 +60,7 @@ module Prawn::SVG::CSS
             elsif char == "]"
               attribute = nil
             elsif "=*~^|$".include?(char)
-              result.last.operator = char
+              result.last.operator = String.new(char)
               attribute = :operator
             elsif char == " " || char == "\t"
               attribute = :pre_operator
@@ -70,7 +70,7 @@ module Prawn::SVG::CSS
 
           when :pre_operator
             if "=*~^|$".include?(char)
-              result.last.operator = char
+              result.last.operator = String.new(char)
               attribute = :operator
             elsif char != " " && char != "\t"
               return
@@ -82,25 +82,25 @@ module Prawn::SVG::CSS
             elsif char == " " || char == "\t"
               attribute = :pre_value
             elsif char == '"' || char == "'"
-              result.last.value = ''
-              attribute = char
+              result.last.value = +''
+              attribute = String.new(char)
             else
-              result.last.value = char
+              result.last.value = String.new(char)
               attribute = :value
             end
 
           when :pre_value
             if char == '"' || char == "'"
-              result.last.value = ''
-              attribute = char
+              result.last.value = +''
+              attribute = String.new(char)
             elsif char != " " && char != "\t"
-              result.last.value = char
+              result.last.value = String.new(char)
               attribute = :value
             end
 
           when :value
             if char == "]"
-              result.last.value = result.last.value.rstrip
+              result.last.value = String.new(result.last.value.rstrip)
               attribute = nil
             else
               result.last.value << char

data/lib/prawn/svg/css/stylesheets.rb

@@ -69,14 +69,14 @@ module Prawn::SVG::CSS
 
         result = case element[:combinator]
                  when :child
-                   "/"
+                   +"/"
                  when :adjacent
                    pseudo_classes << 'first-child'
-                   "/following-sibling::"
+                   +"/following-sibling::"
                  when :siblings
-                   "/following-sibling::"
+                   +"/following-sibling::"
                  else
-                   "//"
+                   +"//"
                  end
 
         positions = []

data/lib/prawn/svg/document.rb

@@ -13,9 +13,10 @@ class Prawn::SVG::Document
     :font_registry,
     :url_loader,
     :elements_by_id, :gradients,
-    :element_styles
+    :element_styles,
+    :color_mode
 
-  def initialize(data, bounds, options, font_registry: nil, css_parser: CssParser::Parser.new)
+  def initialize(data, bounds, options, font_registry: nil, css_parser: CssParser::Parser.new, attribute_overrides: {})
     @root = REXML::Document.new(data).root
 
     if @root.nil?
@@ -29,9 +30,10 @@ class Prawn::SVG::Document
     @warnings = []
     @options = options
     @elements_by_id = {}
-    @gradients = {}
+    @gradients = Prawn::SVG::Gradients.new(self)
     @fallback_font_name = options.fetch(:fallback_font_name, DEFAULT_FALLBACK_FONT_NAME)
     @font_registry = font_registry
+    @color_mode = load_color_mode
 
     @url_loader = Prawn::SVG::UrlLoader.new(
       enable_cache:          options[:cache_images],
@@ -39,7 +41,10 @@ class Prawn::SVG::Document
       enable_file_with_root: options[:enable_file_requests_with_root]
     )
 
-    @sizing = Prawn::SVG::Calculators::DocumentSizing.new(bounds, @root.attributes)
+    attributes = @root.attributes.dup
+    attribute_overrides.each { |key, value| attributes.add(REXML::Attribute.new(key, value)) }
+
+    @sizing = Prawn::SVG::Calculators::DocumentSizing.new(bounds, attributes)
     calculate_sizing(requested_width: options[:width], requested_height: options[:height])
 
     @element_styles = Prawn::SVG::CSS::Stylesheets.new(css_parser, root).load
@@ -52,4 +57,15 @@ class Prawn::SVG::Document
     sizing.requested_height = requested_height
     sizing.calculate
   end
+
+  private
+
+  def load_color_mode
+    case @options[:color_mode]
+    when nil, :rgb then :rgb
+    when :cmyk then :cmyk
+    else
+      raise ArgumentError, ":color_mode must be set to :rgb (default) or :cmyk"
+    end
+  end
 end

data/lib/prawn/svg/elements/base.rb

@@ -189,11 +189,11 @@ class Prawn::SVG::Elements::Base
         color = computed_properties.color
       end
 
-      results = Prawn::SVG::Color.parse(color, document.gradients)
+      results = Prawn::SVG::Color.parse(color, document.gradients, document.color_mode)
 
       success = results.detect do |result|
         case result
-        when Prawn::SVG::Color::Hex
+        when Prawn::SVG::Color::RGB, Prawn::SVG::Color::CMYK
           add_call "#{type}_color", result.value
           true
         when Prawn::SVG::Elements::Gradient
@@ -237,16 +237,15 @@ class Prawn::SVG::Elements::Base
 
   def parse_css_declarations(declarations)
     # copied from css_parser
-    declarations.gsub!(/(^[\s]*)|([\s]*$)/, '')
-
-    output = {}
-    declarations.split(/[\;$]+/m).each do |decs|
-      if matches = decs.match(/\s*(.[^:]*)\s*\:\s*(.[^;]*)\s*(;|\Z)/i)
-        property, value, _ = matches.captures
-        output[property.downcase] = value
+    declarations
+      .gsub(/(^[\s]*)|([\s]*$)/, '')
+      .split(/[\;$]+/m)
+      .each_with_object({}) do |decs, output|
+        if matches = decs.match(/\s*(.[^:]*)\s*\:\s*(.[^;]*)\s*(;|\Z)/i)
+          property, value, _ = matches.captures
+          output[property.downcase] = value
+        end
       end
-    end
-    output
   end
 
   def require_attributes(*names)

data/lib/prawn/svg/elements/gradient.rb

@@ -147,8 +147,8 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
         offset = result.last.first
       end
 
-      if color_hex = Prawn::SVG::Color.color_to_hex(child.properties.stop_color)
-        result << [offset, color_hex]
+      if color = Prawn::SVG::Color.css_color_to_prawn_color(child.properties.stop_color)
+        result << [offset, color]
       end
     end
 

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

@@ -3,29 +3,32 @@ class Prawn::SVG::Elements::Image < Prawn::SVG::Elements::Base
     def initialize(data)
       @data = data
     end
+
     def read
       @data
     end
-    def rewind
-    end
+
+    def rewind; end
   end
 
+  ImageData = Struct.new(:dimensions, :document)
+
   def parse
     require_attributes 'width', 'height'
 
-    raise SkipElementQuietly if state.computed_properties.display == "none"
+    raise SkipElementQuietly if state.computed_properties.display == 'none'
 
     @url = href_attribute
-    if @url.nil?
-      raise SkipElementError, "image tag must have an href or xlink:href"
-    end
+    raise SkipElementError, 'image tag must have an href or xlink:href' if @url.nil?
 
     x = x(attributes['x'] || 0)
     y = y(attributes['y'] || 0)
     width = x_pixels(attributes['width'])
     height = y_pixels(attributes['height'])
+    preserveAspectRatio = attributes['preserveAspectRatio']
 
     raise SkipElementQuietly if width.zero? || height.zero?
+
     require_positive_value width, height
 
     @image = begin
@@ -34,7 +37,9 @@ class Prawn::SVG::Elements::Image < Prawn::SVG::Elements::Base
       raise SkipElementError, "Error retrieving URL #{@url}: #{e.message}"
     end
 
-    @aspect = Prawn::SVG::Calculators::AspectRatio.new(attributes['preserveAspectRatio'], [width, height], image_dimensions(@image))
+    @image_data = process_image(@image, width, height, preserveAspectRatio)
+
+    @aspect = Prawn::SVG::Calculators::AspectRatio.new(preserveAspectRatio, [width, height], @image_data.dimensions)
 
     @clip_x = x
     @clip_y = y
@@ -49,15 +54,21 @@ class Prawn::SVG::Elements::Image < Prawn::SVG::Elements::Base
 
   def apply
     if @aspect.slice?
-      add_call "save"
-      add_call "rectangle", [@clip_x, @clip_y], @clip_width, @clip_height
-      add_call "clip"
+      add_call 'save'
+      add_call 'rectangle', [@clip_x, @clip_y], @clip_width, @clip_height
+      add_call 'clip'
     end
 
-    options = {:width => @width, :height => @height, :at => [@x, @y]}
+    if (document = @image_data.document)
+      add_call_and_enter 'translate', @x, @y
+      add_call 'svg:render_sub_document', document
+    else
+      options = { width: @width, height: @height, at: [@x, @y] }
+
+      add_call 'image', FakeIO.new(@image), options
+    end
 
-    add_call "image", FakeIO.new(@image), options
-    add_call "restore" if @aspect.slice?
+    add_call 'restore' if @aspect.slice?
   end
 
   def bounding_box
@@ -66,16 +77,38 @@ class Prawn::SVG::Elements::Image < Prawn::SVG::Elements::Base
 
   protected
 
-  def image_dimensions(data)
-    handler = if data[0, 3].unpack("C*") == [255, 216, 255]
-      Prawn::Images::JPG
-    elsif data[0, 8].unpack("C*") == [137, 80, 78, 71, 13, 10, 26, 10]
-      Prawn::Images::PNG
+  def process_image(data, width, height, preserveAspectRatio)
+    if (handler = find_image_handler(data))
+      image = handler.new(data)
+      ImageData.new([image.width.to_f, image.height.to_f], nil)
+
+    elsif potentially_svg?(data)
+      document = Prawn::SVG::Document.new(
+        data, [width, height], { width: width, height: height },
+        attribute_overrides: { 'preserveAspectRatio' => preserveAspectRatio }
+      )
+
+      dimensions = [document.sizing.output_width, document.sizing.output_height]
+      ImageData.new(dimensions, document)
+
     else
-      raise SkipElementError, "Unsupported image type supplied to image tag; Prawn only supports JPG and PNG"
+      raise_invalid_image_type
     end
+  rescue Prawn::SVG::Document::InvalidSVGData
+    raise_invalid_image_type
+  end
+
+  def find_image_handler(data)
+    Prawn.image_handler.find(data)
+  rescue StandardError
+    nil
+  end
+
+  def potentially_svg?(data)
+    data.include?('<svg')
+  end
 
-    image = handler.new(data)
-    [image.width.to_f, image.height.to_f]
+  def raise_invalid_image_type
+    raise SkipElementError, 'Unsupported image type supplied to image tag'
   end
 end

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

@@ -55,8 +55,6 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
   end
 
   def apply
-    add_call 'join_style', :bevel
-
     apply_commands
     apply_markers
   end

data/lib/prawn/svg/elements/root.rb

@@ -9,7 +9,7 @@ class Prawn::SVG::Elements::Root < Prawn::SVG::Elements::Base
 
   def apply
     if [nil, 'inherit', 'none', 'currentColor'].include?(properties.fill)
-      add_call 'fill_color', '000000'
+      add_call 'fill_color', Prawn::SVG::Color.default_color(@document.color_mode).value
     end
 
     add_call 'transformation_matrix', @document.sizing.x_scale, 0, 0, @document.sizing.y_scale, 0, 0