prawn-svg 0.27.1 → 0.31.0

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

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

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

@@ -7,7 +7,7 @@ class Prawn::SVG::Elements::Text < Prawn::SVG::Elements::DepthFirstBase
   # of the element, delegating it to our root text component.
 
   def parse_step
-    state.text = Prawn::SVG::Elements::TextComponent::PositionsList.new([], [], [], [], [], nil)
+    state.text = Prawn::SVG::Elements::TextComponent::TextState.new
 
     @text_root = Prawn::SVG::Elements::TextComponent.new(document, source, nil, state.dup)
     @text_root.parse_step

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

@@ -2,14 +2,22 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
   attr_reader :commands
 
   Printable = Struct.new(:element, :text, :leading_space?, :trailing_space?)
-  PositionsList = Struct.new(:x, :y, :dx, :dy, :rotation, :parent)
+  TextState = Struct.new(:parent, :x, :y, :dx, :dy, :rotation, :spacing, :mode, :text_length, :length_adjust)
 
   def parse
-    state.text.x = attributes['x'].split(COMMA_WSP_REGEXP).collect {|n| x(n)} if attributes['x']
-    state.text.y = attributes['y'].split(COMMA_WSP_REGEXP).collect {|n| y(n)} if attributes['y']
-    state.text.dx = attributes['dx'].split(COMMA_WSP_REGEXP).collect {|n| x_pixels(n)} if attributes['dx']
-    state.text.dy = attributes['dy'].split(COMMA_WSP_REGEXP).collect {|n| y_pixels(n)} if attributes['dy']
-    state.text.rotation = attributes['rotate'].split(COMMA_WSP_REGEXP).collect(&:to_f) if attributes['rotate']
+    if state.inside_clip_path
+      raise SkipElementError, "<text> elements are not supported in clip paths"
+    end
+
+    state.text.x = (attributes['x'] || "").split(COMMA_WSP_REGEXP).collect { |n| x(n) }
+    state.text.y = (attributes['y'] || "").split(COMMA_WSP_REGEXP).collect { |n| y(n) }
+    state.text.dx = (attributes['dx'] || "").split(COMMA_WSP_REGEXP).collect { |n| x_pixels(n) }
+    state.text.dy = (attributes['dy'] || "").split(COMMA_WSP_REGEXP).collect { |n| y_pixels(n) }
+    state.text.rotation = (attributes['rotate'] || "").split(COMMA_WSP_REGEXP).collect(&:to_f)
+    state.text.text_length = normalize_length(attributes['textLength'])
+    state.text.length_adjust = attributes['lengthAdjust']
+    state.text.spacing = calculate_character_spacing
+    state.text.mode = calculate_text_rendering_mode
 
     @commands = []
 
@@ -38,13 +46,18 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
     opts = {
       size:        computed_properties.numerical_font_size,
       style:       font && font.subfamily,
-      text_anchor: computed_properties.text_anchor
+      text_anchor: computed_properties.text_anchor,
     }
 
-    spacing = computed_properties.letter_spacing
-    spacing = spacing == 'normal' ? 0 : pixels(spacing)
+    opts[:decoration] = computed_properties.text_decoration unless computed_properties.text_decoration == 'none'
 
-    add_call_and_enter 'character_spacing', spacing
+    if state.text.parent
+      add_call_and_enter 'character_spacing', state.text.spacing unless state.text.spacing == state.text.parent.spacing
+      add_call_and_enter 'text_rendering_mode', state.text.mode unless state.text.mode == state.text.parent.mode
+    else
+      add_call_and_enter 'character_spacing', state.text.spacing unless state.text.spacing == 0
+      add_call_and_enter 'text_rendering_mode', state.text.mode unless state.text.mode == :fill
+    end
 
     @commands.each do |command|
       case command
@@ -59,8 +72,8 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
       end
     end
 
-    # It's possible there was no text to render.  In that case, add a 'noop' so
-    # character_spacing doesn't blow up when it finds it doesn't have a block to execute.
+    # It's possible there was no text to render.  In that case, add a 'noop' so character_spacing/text_rendering_mode
+    # don't blow up when they find they don't have a block to execute.
     add_call 'noop' if calls.empty?
   end
 
@@ -81,7 +94,7 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
 
   def append_child(child)
     new_state = state.dup
-    new_state.text = PositionsList.new([], [], [], [], [], state.text)
+    new_state.text = TextState.new(state.text)
 
     element = self.class.new(document, child, calls, new_state)
     @commands << element
@@ -124,6 +137,14 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
         opts.delete(:rotate)
       end
 
+      if state.text.text_length
+        if state.text.length_adjust == 'spacingAndGlyphs'
+          opts[:stretch_to_width] = state.text.text_length
+        else
+          opts[:pad_to_width] = state.text.text_length
+        end
+      end
+
       if remaining
         add_call 'draw_text', text[0..0], opts.dup
         text = text[1..-1]
@@ -164,7 +185,7 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
   end
 
   def find_referenced_element
-    href = attributes['xlink:href']
+    href = href_attribute
 
     if href && href[0..0] == '#'
       element = document.elements_by_id[href[1..-1]]
@@ -189,4 +210,32 @@ class Prawn::SVG::Elements::TextComponent < Prawn::SVG::Elements::DepthFirstBase
   def apply_font(font)
     add_call 'font', font.name, style: font.subfamily
   end
+
+  def calculate_text_rendering_mode
+    fill = computed_properties.fill != 'none'
+    stroke = computed_properties.stroke != 'none'
+
+    if fill && stroke
+      :fill_stroke
+    elsif fill
+      :fill
+    elsif stroke
+      :stroke
+    else
+      :invisible
+    end
+  end
+
+  def calculate_character_spacing
+    spacing = computed_properties.letter_spacing
+    spacing == 'normal' ? 0 : pixels(spacing)
+  end
+
+  # overridden, we don't want to call fill/stroke as draw_text does this for us
+  def apply_drawing_call
+  end
+
+  def normalize_length(length)
+    x_pixels(length) if length && length.match(/\d/)
+  end
 end

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

@@ -1,19 +1,35 @@
 class Prawn::SVG::Elements::Use < Prawn::SVG::Elements::Base
-  attr_reader :referenced_element
+  attr_reader :referenced_element_class
+  attr_reader :referenced_element_source
 
   def parse
-    require_attributes 'xlink:href'
-
-    href = attributes['xlink:href']
+    href = href_attribute
+    if href.nil?
+      raise SkipElementError, "use tag must have an href or xlink:href"
+    end
 
     if href[0..0] != '#'
       raise SkipElementError, "use tag has an href that is not a reference to an id; this is not supported"
     end
 
     id = href[1..-1]
-    @referenced_element = @document.elements_by_id[id]
+    referenced_element = @document.elements_by_id[id]
+
+    if referenced_element
+      @referenced_element_class = referenced_element.class
+      @referenced_element_source = referenced_element.source
+    else
+      # Perhaps the element is defined further down in the document.  This is not recommended but still valid SVG,
+      # so we'll support it with an exception case that's not particularly performant.
+      raw_element = REXML::XPath.match(@document.root, %(//*[@id="#{id.gsub('"', '\"')}"])).first
+
+      if raw_element
+        @referenced_element_class = Prawn::SVG::Elements::TAG_CLASS_MAPPING[raw_element.name.to_sym]
+        @referenced_element_source = raw_element
+      end
+    end
 
-    if referenced_element.nil?
+    if referenced_element_class.nil?
       raise SkipElementError, "no tag with ID '#{id}' was found, referenced by use tag"
     end
 
@@ -36,7 +52,7 @@ class Prawn::SVG::Elements::Use < Prawn::SVG::Elements::Base
   def process_child_elements
     add_call "save"
 
-    child = referenced_element.class.new(referenced_element.document, referenced_element.source, calls, state.dup)
+    child = referenced_element_class.new(document, referenced_element_source, calls, state.dup)
     child.process
 
     add_call "restore"

data/lib/prawn/svg/extensions/additional_gradient_transforms.rb

@@ -0,0 +1,23 @@
+module Prawn::SVG::Extensions
+  module AdditionalGradientTransforms
+    def gradient_coordinates(gradient)
+      # As of Prawn 2.2.0, apply_transformations is used as purely a boolean.
+      #
+      # Here we're using it to optionally pass in a 6-tuple transformation matrix that gets applied to the
+      # gradient.  This should be added to Prawn properly, and then this monkey patch will not be necessary.
+
+      if gradient.apply_transformations.is_a?(Array)
+        x1, y1, x2, y2, transformation = super
+        a, b, c, d, e, f = transformation
+        na, nb, nc, nd, ne, nf = gradient.apply_transformations
+
+        matrix = Matrix[[a, c, e], [b, d, f], [0, 0, 1]] * Matrix[[na, nc, ne], [nb, nd, nf], [0, 0, 1]]
+        new_transformation = matrix.to_a[0..1].transpose.flatten
+
+        [x1, y1, x2, y2, new_transformation]
+      else
+        super
+      end
+    end
+  end
+end

data/lib/prawn/svg/font_registry.rb

@@ -24,7 +24,7 @@ class Prawn::SVG::FontRegistry
   end
 
   def load(family, weight = nil, style = nil)
-    Prawn::SVG::CSS.parse_font_family_string(family).detect do |name|
+    Prawn::SVG::CSS::FontFamilyParser.parse(family).detect do |name|
       name = name.gsub(/\s{2,}/, ' ').downcase
 
       font = Prawn::SVG::Font.new(name, weight, style, font_registry: self)
@@ -37,8 +37,9 @@ class Prawn::SVG::FontRegistry
   def merge_external_fonts
     if @font_case_mapping.nil?
       self.class.load_external_fonts unless self.class.external_font_families
-      @font_families.merge!(self.class.external_font_families)
-
+      @font_families.merge!(self.class.external_font_families) do |key, v1, v2|
+       v1
+      end
       @font_case_mapping = @font_families.keys.each.with_object({}) do |key, result|
         result[key.downcase] = key
       end

data/lib/prawn/svg/interface.rb

@@ -119,7 +119,7 @@ module Prawn
 
           if skip
             # the call has been overridden
-          elsif children.empty?
+          elsif children.empty? && call != 'transparent' # some prawn calls complain if they aren't supplied a block
             prawn.send(call, *arguments)
           else
             prawn.send(call, *arguments, &proc_creator(prawn, children))
@@ -148,6 +148,19 @@ module Prawn
 
           width = prawn.width_of(text, options.merge(kerning: true))
 
+          if stretch_to_width = options.delete(:stretch_to_width)
+            factor = stretch_to_width.to_f * 100 / width.to_f
+            prawn.add_content "#{factor} Tz"
+            width = stretch_to_width.to_f
+          end
+
+          if pad_to_width = options.delete(:pad_to_width)
+            padding_required = pad_to_width.to_f - width.to_f
+            padding_per_character = padding_required / text.length.to_f
+            prawn.add_content "#{padding_per_character} Tc"
+            width = pad_to_width.to_f
+          end
+
           case options.delete(:text_anchor)
           when 'middle'
             at[0] -= width / 2
@@ -159,6 +172,15 @@ module Prawn
             @cursor = [at[0] + width, at[1]]
           end
 
+          decoration = options.delete(:decoration)
+          if decoration == 'underline'
+            prawn.save_graphics_state do
+              prawn.line_width 1
+              prawn.line [at[0], at[1] - 1.25], [at[0] + width, at[1] - 1.25]
+              prawn.stroke
+            end
+          end
+
         when 'transformation_matrix'
           left = prawn.bounds.absolute_left
           top = prawn.bounds.absolute_top
@@ -186,7 +208,9 @@ 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.
-          prawn.add_content 'B'
+          even_odd = arguments[0].is_a?(Hash) && arguments[0][:fill_rule] == :even_odd
+          content  = even_odd ? 'B*' : 'B'
+          prawn.add_content content
 
         when 'noop'
           yield

data/lib/prawn/svg/loaders/data.rb

@@ -2,7 +2,7 @@ require 'base64'
 
 module Prawn::SVG::Loaders
   class Data
-    REGEXP = %r[\A(?i:data):image/(png|jpeg);base64(;[a-z0-9]+)*,]
+    REGEXP = %r[\Adata:image/(png|jpeg);base64(;[a-z0-9]+)*,]i
 
     def from_url(url)
       return if url[0..4].downcase != "data:"

data/lib/prawn/svg/loaders/file.rb

@@ -1,3 +1,5 @@
+require 'addressable/uri'
+
 #
 # Load a file from disk.
 #
@@ -56,7 +58,7 @@ module Prawn::SVG::Loaders
     private
 
     def load_file(path)
-      path = URI.decode(path)
+      path = Addressable::URI.unencode(path)
       path = build_absolute_and_expand_path(path)
       assert_valid_path!(path)
       assert_file_exists!(path)
@@ -85,7 +87,7 @@ module Prawn::SVG::Loaders
     end
 
     def assert_valid_file_uri!(uri)
-      if uri.host
+      unless uri.host.nil? || uri.host.empty?
         raise Prawn::SVG::UrlLoader::Error, "prawn-svg does not suport file: URLs with a host. Your URL probably doesn't start with three slashes, and it should."
       end
     end

data/lib/prawn/svg/properties.rb

@@ -18,6 +18,7 @@ class Prawn::SVG::Properties
     "display"          => Config.new("inline", false, %w(inherit inline none), true),
     "fill"             => Config.new("black", true, %w(inherit none currentColor)),
     "fill-opacity"     => Config.new("1", true),
+    "fill-rule"        => Config.new("nonzero", true, %w(inherit nonzero evenodd)),
     "font-family"      => Config.new("sans-serif", true),
     "font-size"        => Config.new("medium", true, %w(inherit xx-small x-small small medium large x-large xx-large larger smaller)),
     "font-style"       => Config.new("normal", true, %w(inherit normal italic oblique), true),
@@ -36,6 +37,7 @@ class Prawn::SVG::Properties
     "stroke-opacity"   => Config.new("1", true),
     "stroke-width"     => Config.new("1", true),
     "text-anchor"      => Config.new("start", true, %w(inherit start middle end), true),
+    'text-decoration'  => Config.new('none', true, %w(inherit none underline), true),
   }.freeze
 
   PROPERTIES.each do |name, value|

data/lib/prawn/svg/state.rb

@@ -1,10 +1,9 @@
 class Prawn::SVG::State
-  attr_accessor :disable_drawing,
-    :text, :preserve_space,
+  attr_accessor :text, :preserve_space,
     :fill_opacity, :stroke_opacity, :stroke_width,
     :computed_properties,
     :viewport_sizing,
-    :inside_use
+    :inside_use, :inside_clip_path
 
   def initialize
     @stroke_width = 1
@@ -16,4 +15,8 @@ class Prawn::SVG::State
   def initialize_dup(other)
     @computed_properties = @computed_properties.dup
   end
+
+  def disable_drawing
+    inside_clip_path
+  end
 end

data/lib/prawn/svg/transform_parser.rb

@@ -0,0 +1,72 @@
+module Prawn::SVG::TransformParser
+  def parse_transform_attribute(transform)
+    matrix = Matrix.identity(3)
+
+    parse_css_method_calls(transform).each do |name, arguments|
+      case name
+      when 'translate'
+        x, y = arguments
+        matrix *= Matrix[[1, 0, x_pixels(x.to_f)], [0, 1, -y_pixels(y.to_f)], [0, 0, 1]]
+
+      when 'translateX'
+        x = arguments.first
+        matrix *= Matrix[[1, 0, x_pixels(x.to_f)], [0, 1, 0], [0, 0, 1]]
+
+      when 'translateY'
+        y = arguments.first
+        matrix *= Matrix[[1, 0, 0], [0, 1, -y_pixels(y.to_f)], [0, 0, 1]]
+
+      when 'rotate'
+        angle, x, y = arguments.collect { |a| a.to_f }
+        angle = angle * Math::PI / 180.0
+
+        case arguments.length
+        when 1
+          matrix *= Matrix[[Math.cos(angle), Math.sin(angle), 0], [-Math.sin(angle), Math.cos(angle), 0], [0, 0, 1]]
+        when 3
+          matrix *= Matrix[[1, 0, x_pixels(x.to_f)], [0, 1, -y_pixels(y.to_f)], [0, 0, 1]]
+          matrix *= Matrix[[Math.cos(angle), Math.sin(angle), 0], [-Math.sin(angle), Math.cos(angle), 0], [0, 0, 1]]
+          matrix *= Matrix[[1, 0, -x_pixels(x.to_f)], [0, 1, y_pixels(y.to_f)], [0, 0, 1]]
+        else
+          warnings << "transform 'rotate' must have either one or three arguments"
+        end
+
+      when 'scale'
+        x_scale = arguments[0].to_f
+        y_scale = (arguments[1] || x_scale).to_f
+        matrix *= Matrix[[x_scale, 0, 0], [0, y_scale, 0], [0, 0, 1]]
+
+      when 'skewX'
+        angle = arguments[0].to_f * Math::PI / 180.0
+        matrix *= Matrix[[1, -Math.tan(angle), 0], [0, 1, 0], [0, 0, 1]]
+
+      when 'skewY'
+        angle = arguments[0].to_f * Math::PI / 180.0
+        matrix *= Matrix[[1, 0, 0], [-Math.tan(angle), 1, 0], [0, 0, 1]]
+
+      when 'matrix'
+        if arguments.length != 6
+          warnings << "transform 'matrix' must have six arguments"
+        else
+          a, b, c, d, e, f = arguments.collect { |argument| argument.to_f }
+          matrix *= Matrix[[a, -c, e], [-b, d, -f], [0, 0, 1]]
+        end
+
+      else
+        warnings << "Unknown/unsupported transformation '#{name}'; ignoring"
+      end
+    end
+
+    matrix.to_a[0..1].transpose.flatten
+  end
+
+  private
+
+  def parse_css_method_calls(string)
+    string.scan(/\s*(\w+)\(([^)]+)\)\s*/).collect do |call|
+      name, argument_string = call
+      arguments = argument_string.strip.split(/\s*[,\s]\s*/)
+      [name, arguments]
+    end
+  end
+end

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.27.1'
+    VERSION = '0.31.0'
   end
 end