prawn-svg 0.31.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed78a64dc94709fc5e53f1d6f521f93e3bf41196c29dde616c6139743c9c889
-  data.tar.gz: 7a0a5683370d3478e8b9717069e0f4012337aaf6250106065dfd5ad9b4458a91
+  metadata.gz: c9f71b82858f8ee91e1ccaf2903c2e2a0d49108b1532a81d15c2275362a0d136
+  data.tar.gz: f3336c6a727df24e6a5877e4d26cf030eabbb1c9af9852f95c35c5bfe5128995
 SHA512:
-  metadata.gz: a58fd3f4508d486b3632f2e337f5e2fe97ef8c2baeeeda9b4f53f816ff18eb10b3e8879c98ea10c645becb29c8351a7addc6867c22abfeda77a7edf654607f44
-  data.tar.gz: 3bdbbc06f25405d3f51de30e81c39406f7ccf535e507bb36b43df3939d1a4931b763cb5308bde72674ab3f2ffcb55171b958f93a3b603bf5cf17a1bbd24d44b4
+  metadata.gz: 94f1a140e837ab37b088cc659bc8ef63a3e89778539236441f43e7b4885b9028cce1cb83c9e9636b00ff2ac740770ec8d853c123aa42b0764fb1264405269e76
+  data.tar.gz: 4d02f2e14875214bb5460ace33925f9ab17302b39f46e0a37e0e5521e63b0fdd2f23f6018c8e048bf2bce7d148548aa86b5b9967dca827faddccfa23e8e09b13

data/.github/workflows/test.yml

@@ -0,0 +1,35 @@
+name: test
+on: [push, pull_request]
+jobs:
+  rake_new:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7, '3.0', 3.1, 3.2]
+    steps:
+    - 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:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - name: Run tests
+      run:  bundle exec rake

data/README.md

@@ -1,7 +1,7 @@
 # prawn-svg
 
 [![Gem Version](https://badge.fury.io/rb/prawn-svg.svg)](https://badge.fury.io/rb/prawn-svg)
-[![Build Status](https://travis-ci.org/mogest/prawn-svg.svg?branch=master)](https://travis-ci.org/mogest/prawn-svg)
+![Build Status](https://github.com/mogest/prawn-svg/actions/workflows/test.yml/badge.svg?branch=master)
 
 An SVG renderer for the Prawn PDF library.
 
@@ -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.1.0.
+The minimum Ruby version required is 2.3.0.
 
 ## Using prawn-svg
 
@@ -34,6 +34,7 @@ Option      | Data type | Description
 :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.
+:color_mode | :rgb, :cmyk | Output color mode.  Defaults to :rgb.
 
 ## Examples
 
@@ -61,7 +62,7 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
    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-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>
 
@@ -69,7 +70,7 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
 
  - <tt>&lt;style&gt;</tt> (see CSS section below)
 
- - <tt>&lt;image&gt;</tt> with <tt>http:</tt>, <tt>https:</tt>, <tt>data:image/\*;base64</tt> and `file:` schemes
+ - `<image>` referencing a JPEG or PNG image,  with `http:`, `https:`, `data:image/jpeg;base64`, `data:image/png;base64` and `file:` schemes
    (`file:` is disabled by default for security reasons, see Options section above)
 
  - <tt>&lt;clipPath&gt;</tt>
@@ -93,7 +94,8 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
 
  - 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, <tt>#xxx</tt>, <tt>#xxxxxx</tt>, <tt>rgb(1, 2, 3)</tt>, <tt>rgb(1%, 2%, 3%)</tt>,
+   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>
 
@@ -116,7 +118,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.
 

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,7 +13,8 @@ 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)
     @root = REXML::Document.new(data).root
@@ -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],
@@ -52,4 +54,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

@@ -91,12 +91,12 @@ class Prawn::SVG::Elements::Base
     parse_xml_space_attribute
   end
 
-  def add_call(name, *arguments)
-    @calls << [name.to_s, arguments, []]
+  def add_call(name, *arguments, **kwarguments)
+    @calls << [name.to_s, arguments, kwarguments, []]
   end
 
-  def add_call_and_enter(name, *arguments)
-    @calls << [name.to_s, arguments, []]
+  def add_call_and_enter(name, *arguments, **kwarguments)
+    @calls << [name.to_s, arguments, kwarguments, []]
     @calls = @calls.last.last
   end
 
@@ -168,7 +168,7 @@ class Prawn::SVG::Elements::Base
       command = stroke ? 'fill_and_stroke' : 'fill'
 
       if computed_properties.fill_rule == 'evenodd'
-        add_call_and_enter(command, {fill_rule: :even_odd})
+        add_call_and_enter(command, fill_rule: :even_odd)
       else
         add_call_and_enter(command)
       end
@@ -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/call_duplicator.rb

@@ -12,7 +12,7 @@ module Prawn::SVG::Elements::CallDuplicator
   end
 
   def duplicate_call(call)
-    [call[0], duplicate_array(call[1]), duplicate_calls(call[2])]
+    [call[0], duplicate_array(call[1]), duplicate_hash(call[2]), duplicate_calls(call[3])]
   end
 
   def duplicate_array(array)

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

@@ -67,15 +67,14 @@ 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
-    else
-      raise SkipElementError, "Unsupported image type supplied to image tag; Prawn only supports JPG and PNG"
+    unless (handler = find_image_handler(data))
+      raise SkipElementError, 'Unsupported image type supplied to image tag'
     end
-
     image = handler.new(data)
     [image.width.to_f, image.height.to_f]
   end
+
+  def find_image_handler(data)
+    Prawn.image_handler.find(data) rescue nil
+  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

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

@@ -41,14 +41,15 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
     font = select_font
     apply_font(font) if font
 
-    # text_anchor isn't a Prawn option; we have to do some math to support it
-    # and so we handle this in Prawn::SVG::Interface#rewrite_call_arguments
+    # text_anchor and dominant_baseline aren't Prawn options; we have to do some math to support them
+    # and so we handle them in Prawn::SVG::Interface#rewrite_call_arguments
     opts = {
       size:        computed_properties.numerical_font_size,
       style:       font && font.subfamily,
       text_anchor: computed_properties.text_anchor,
     }
 
+    opts[:dominant_baseline] = computed_properties.dominant_baseline unless computed_properties.dominant_baseline == 'auto'
     opts[:decoration] = computed_properties.text_decoration unless computed_properties.text_decoration == 'none'
 
     if state.text.parent
@@ -146,10 +147,10 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
       end
 
       if remaining
-        add_call 'draw_text', text[0..0], opts.dup
+        add_call 'draw_text', text[0..0], **opts.dup
         text = text[1..-1]
       else
-        add_call 'draw_text', text, opts.dup
+        add_call 'draw_text', text, **opts.dup
 
         # we can get to this path with rotations still pending
         # solve this by shifting them out by the number of
@@ -171,7 +172,11 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
 
   def svg_text_children
     text_children.select do |child|
-      child.node_type == :text || child.namespace == SVG_NAMESPACE || child.namespace == ''
+      child.node_type == :text || (
+        child.node_type == :element && (
+          child.namespace == SVG_NAMESPACE || child.namespace == ''
+        )
+      )
     end
   end
 

data/lib/prawn/svg/gradients.rb

@@ -0,0 +1,48 @@
+module Prawn::SVG
+  class Gradients
+    def initialize(document)
+      @document = document
+      @gradients_by_id = {}
+    end
+
+    def [](id)
+      id &&= id.strip
+      return unless id && id != ''
+
+      if element = @gradients_by_id[id]
+        element
+      elsif raw_element = find_raw_gradient_element_by_id(id)
+        create_gradient_element(raw_element)
+      end
+    end
+
+    def []=(id, gradient)
+      @gradients_by_id[id] = gradient
+    end
+
+    private
+
+    def find_raw_gradient_element_by_id(id)
+      raw_element = find_raw_element_by_id(id)
+      raw_element if gradient_element?(raw_element)
+    end
+
+    def create_gradient_element(raw_element)
+      Elements::Gradient.new(@document, raw_element, [], new_state).tap(&:process)
+    end
+
+    def find_raw_element_by_id(id)
+      REXML::XPath.match(@document.root, %(//*[@id="#{id.gsub('"', '\"')}"])).first
+    end
+
+    def gradient_element?(raw_element)
+      Elements::TAG_CLASS_MAPPING[raw_element.name.to_sym] == Elements::Gradient
+    end
+
+    def new_state
+      State.new.tap do |state|
+        state.viewport_sizing = @document.sizing
+      end
+    end
+  end
+end

data/lib/prawn/svg/interface.rb

@@ -5,7 +5,7 @@
 module Prawn
   module SVG
     class Interface
-      VALID_OPTIONS = [:at, :position, :vposition, :width, :height, :cache_images, :enable_web_requests, :enable_file_requests_with_root, :fallback_font_name]
+      VALID_OPTIONS = [:at, :position, :vposition, :width, :height, :cache_images, :enable_web_requests, :enable_file_requests_with_root, :fallback_font_name, :color_mode]
 
       attr_reader :data, :prawn, :document, :options
 
@@ -109,10 +109,10 @@ module Prawn
       end
 
       def issue_prawn_command(prawn, calls)
-        calls.each do |call, arguments, children|
+        calls.each do |call, arguments, kwarguments, children|
           skip = false
 
-          rewrite_call_arguments(prawn, call, arguments) do
+          rewrite_call_arguments(prawn, call, arguments, kwarguments) do
             issue_prawn_command(prawn, children) if children.any?
             skip = true
           end
@@ -120,27 +120,42 @@ module Prawn
           if skip
             # the call has been overridden
           elsif children.empty? && call != 'transparent' # some prawn calls complain if they aren't supplied a block
-            prawn.send(call, *arguments)
+            if RUBY_VERSION >= '2.7' || !kwarguments.empty?
+              prawn.send(call, *arguments, **kwarguments)
+            else
+              prawn.send(call, *arguments)
+            end
           else
-            prawn.send(call, *arguments, &proc_creator(prawn, children))
+            if RUBY_VERSION >= '2.7' || !kwarguments.empty?
+              prawn.send(call, *arguments, **kwarguments, &proc_creator(prawn, children))
+            else
+              prawn.send(call, *arguments, &proc_creator(prawn, children))
+            end
           end
         end
       end
 
-      def rewrite_call_arguments(prawn, call, arguments)
+      def rewrite_call_arguments(prawn, call, arguments, kwarguments)
         case call
         when 'text_group'
           @cursor = [0, document.sizing.output_height]
           yield
 
         when 'draw_text'
-          text, options = arguments
+          text, options = arguments.first, kwarguments
 
           at = options.fetch(:at)
 
           at[0] = @cursor[0] if at[0] == :relative
           at[1] = @cursor[1] if at[1] == :relative
 
+          case options.delete(:dominant_baseline)
+          when 'middle'
+            height = prawn.font.height
+            at[1] -= height / 2.0
+            @cursor = [at[0], at[1]]
+          end
+
           if offset = options.delete(:offset)
             at[0] += offset[0]
             at[1] -= offset[1]
@@ -208,7 +223,7 @@ module Prawn
           # prawn (as at 2.0.1 anyway) uses 'b' for its fill_and_stroke.  'b' is 'h' (closepath) + 'B', and we
           # never want closepath to be automatically run as it stuffs up many drawing operations, such as dashes
           # and line caps, and makes paths close that we didn't ask to be closed when fill is specified.
-          even_odd = arguments[0].is_a?(Hash) && arguments[0][:fill_rule] == :even_odd
+          even_odd = kwarguments[:fill_rule] == :even_odd
           content  = even_odd ? 'B*' : 'B'
           prawn.add_content content