prawn-svg 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b7ff6138c2cf404469001e4d18217b5758af6c0
-  data.tar.gz: 15a9474c4bf2f479db7a1e167292c81037d17069
+  metadata.gz: bcd6cefab7e10066561afcaee2e9aeed78c9b30f
+  data.tar.gz: dbe371b99f2cf4953de90e892a3f95718abdd02e
 SHA512:
-  metadata.gz: a446a4b93bc4e590eb76ad93c3b3df2786a300a54c4fd0d28a6e2c1360ea7e7f5ff05ed7759e61cd723c6c16048639d2bc44f6f6be3126d43d59a3259b698465
-  data.tar.gz: e383d553e521457d5b248f6043086dcf0a9573060c50044e9d631dc5b5e2deff7ed0ad39aaae5c0291f9225608beb038fe488c90390a56a44042c1cd94da72e9
+  metadata.gz: 7c567a3f24cebf73c40ec247799f78e730b5f3479be3b486791b7bba9cf7140611db88b00e49422b6bb151613a09296e167e08b30b9f2bd73acf34a9ff49f193
+  data.tar.gz: b2e8135844d8e09dbabdf153794775531c6f3b15a6ca796b7a3a765a135b16837fa9127d5d88c616d07709868d296210eba044605540afe010d68e42a63e36c7

data/README.md

@@ -60,14 +60,14 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
  - <tt>&lt;path&gt;</tt> supports all commands defined in SVG 1.1, although the
    implementation of elliptical arc is a bit rough at the moment.
 
- - <tt>&lt;text&gt;</tt> and <tt>&lt;tspan&gt;</tt> with attributes
-   <tt>text-anchor</tt>, <tt>font-size</tt>, <tt>font-family</tt>, <tt>font-weight</tt>, <tt>font-style</tt>, <tt>letter-spacing</tt>, <tt>dx</tt>, <tt>dy</tt>
+ - `<text>`, `<tspan>` and `<tref>` with attributes `x`, `y`, `dx`, `dy`, `rotate`, and with extra properties
+   `text-anchor`, `font-size`, `font-family`, `font-weight`, `font-style`, `letter-spacing`
 
  - <tt>&lt;svg&gt;</tt>, <tt>&lt;g&gt;</tt> and <tt>&lt;symbol&gt;</tt>
 
  - <tt>&lt;use&gt;</tt>
 
- - <tt>&lt;style&gt;</tt> plus <tt>id</tt>, <tt>class</tt> and <tt>style</tt> attributes (see CSS section below)
+ - <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
    (`file:` is disabled by default for security reasons, see Options section above)
@@ -82,19 +82,23 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
  - `<switch>` and `<foreignObject>`, although prawn-svg cannot handle any data that is not SVG so `<foreignObject>`
    tags are always ignored.
 
- - attributes/styles: <tt>fill</tt>, <tt>stroke</tt>, <tt>stroke-width</tt>, <tt>stroke-linecap</tt>, <tt>stroke-dasharray</tt>, <tt>opacity</tt>, <tt>fill-opacity</tt>, <tt>stroke-opacity</tt>, <tt>transform</tt>, <tt>clip-path</tt>, <tt>display</tt>, `marker-start`, `marker-mid`, `marker-end`
+ - properties: `clip-path`, `color`, `display`, `fill-opacity`, `fill`, `opacity`, `overflow`, `stroke`, `stroke-dasharray`, `stroke-linecap`, `stroke-opacity`, `stroke-width`
 
- - the <tt>viewBox</tt> attribute on <tt>&lt;svg&gt;</tt> and `<marker>` tags
+ - properties on lines, polylines, polygons and paths: `marker-end`, `marker-mid`, `marker-start`
 
- - the <tt>preserveAspectRatio</tt> attribute on <tt>&lt;svg&gt;</tt>, <tt>&lt;image&gt;</tt> and `<marker>` tags
+ - attributes on all elements: `class`, `id`, `style`, `transform`, `xml:space`
 
- - transform methods: <tt>translate</tt>, <tt>rotate</tt>, <tt>scale</tt>, <tt>matrix</tt>
+ - the <tt>viewBox</tt> attribute on <tt>&lt;svg&gt;</tt> and `<marker>` elements
+
+ - the <tt>preserveAspectRatio</tt> attribute on <tt>&lt;svg&gt;</tt>, <tt>&lt;image&gt;</tt> and `<marker>` elements
+
+ - 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>pc</tt>, <tt>%</tt>
 
- - fonts: generic CSS fonts, built-in PDF fonts, and any TTF fonts in your fonts path
+ - 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
 
@@ -102,7 +106,7 @@ prawn-svg uses the css_parser gem to parse CSS <tt>&lt;style&gt;</tt> blocks.  I
 
 ## Not supported
 
-prawn-svg does not support sub-viewports, radial gradients, or patterns.
+prawn-svg does not support radial gradients or patterns.
 
 ## Configuration
 

data/lib/prawn/svg/attributes.rb

@@ -1,6 +1,6 @@
 module Prawn::SVG::Attributes
 end
 
-%w(transform opacity clip_path stroke).each do |name|
+%w(transform opacity clip_path stroke space).each do |name|
   require "prawn/svg/attributes/#{name}"
 end

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

@@ -0,0 +1,10 @@
+module Prawn::SVG::Attributes::Space
+  def parse_xml_space_attribute
+    case attributes['xml:space']
+    when 'preserve'
+      state.preserve_space = true
+    when 'default'
+      state.preserve_space = false
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module Prawn::SVG::Attributes::Stroke
 
   def parse_stroke_attributes_and_call
     if width_string = properties.stroke_width
-      width = distance(width_string)
+      width = pixels(width_string)
       state.stroke_width = width
       add_call('line_width', width)
     end
@@ -21,7 +21,7 @@ module Prawn::SVG::Attributes::Stroke
       else
         array = dasharray.split(Prawn::SVG::Elements::COMMA_WSP_REGEXP)
         array *= 2 if array.length % 2 == 1
-        number_array = array.map {|value| distance(value)}
+        number_array = array.map {|value| pixels(value)}
 
         if number_array.any? {|number| number < 0}
           @document.warnings << "stroke-dasharray cannot have negative numbers; treating as 'none'"

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

@@ -6,7 +6,7 @@ module Prawn::SVG::Attributes::Transform
       case name
       when 'translate'
         x, y = arguments
-        add_call_and_enter name, distance(x.to_f, :x), -distance(y.to_f, :y)
+        add_call_and_enter name, x_pixels(x.to_f), -y_pixels(y.to_f)
 
       when 'rotate'
         r, x, y = arguments.collect {|a| a.to_f}
@@ -29,7 +29,7 @@ module Prawn::SVG::Attributes::Transform
           warnings << "transform 'matrix' must have six arguments"
         else
           a, b, c, d, e, f = arguments.collect {|argument| argument.to_f}
-          add_call_and_enter "transformation_matrix", a, -b, -c, d, distance(e, :x), -distance(f, :y)
+          add_call_and_enter "transformation_matrix", a, -b, -c, d, x_pixels(e), -y_pixels(f)
         end
 
       else

data/lib/prawn/svg/calculators/document_sizing.rb

@@ -30,13 +30,12 @@ module Prawn::SVG::Calculators
       container_width = @requested_width || @bounds[0]
       container_height = @requested_height || @bounds[1]
 
-      @output_width = Pixels.to_pixels(@document_width || @requested_width, container_width)
-      @output_height = Pixels.to_pixels(@document_height || @requested_height, container_height)
+      @output_width = Pixels::Measurement.to_pixels(@document_width || @requested_width, container_width)
+      @output_height = Pixels::Measurement.to_pixels(@document_height || @requested_height, container_height)
 
       if @view_box
         values = @view_box.strip.split(Prawn::SVG::Elements::COMMA_WSP_REGEXP)
         @x_offset, @y_offset, @viewport_width, @viewport_height = values.map {|value| value.to_f}
-        @x_offset = -@x_offset
 
         if @viewport_width > 0 && @viewport_height > 0
           @output_width ||= container_width
@@ -49,8 +48,8 @@ module Prawn::SVG::Calculators
           @y_offset -= aspect.y / @y_scale
         end
       else
-        @output_width ||= Pixels.to_pixels(DEFAULT_WIDTH, container_width)
-        @output_height ||= Pixels.to_pixels(DEFAULT_HEIGHT, container_height)
+        @output_width ||= Pixels::Measurement.to_pixels(DEFAULT_WIDTH, container_width)
+        @output_height ||= Pixels::Measurement.to_pixels(DEFAULT_HEIGHT, container_height)
 
         @viewport_width = @output_width
         @viewport_height = @output_height

data/lib/prawn/svg/calculators/pixels.rb

@@ -1,8 +1,8 @@
-module Prawn::SVG::Calculators
-  class Pixels
+module Prawn::SVG::Calculators::Pixels
+  class Measurement
     extend Prawn::Measurements
 
-    def self.to_pixels(value, axis_length)
+    def self.to_pixels(value, axis_length = nil)
       if value.is_a?(String)
         if match = value.match(/\d(cm|dm|ft|in|m|mm|yd)$/)
           send("#{match[1]}2pt", value.to_f)
@@ -18,4 +18,28 @@ module Prawn::SVG::Calculators
       end
     end
   end
+
+  protected
+
+  def x(value)
+    x_pixels(value)
+  end
+
+  def y(value)
+    # This uses document.sizing, not state.viewport_sizing, because we always
+    # want to subtract from the total height of the document.
+    document.sizing.output_height - y_pixels(value)
+  end
+
+  def pixels(value)
+    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_diagonal)
+  end
+
+  def x_pixels(value)
+    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_width)
+  end
+
+  def y_pixels(value)
+    value && Measurement.to_pixels(value, state.viewport_sizing.viewport_height)
+  end
 end

data/lib/prawn/svg/document.rb

@@ -43,26 +43,8 @@ class Prawn::SVG::Document
     sizing.requested_height = options[:height]
     sizing.calculate
 
-    @axis_to_size = {:x => sizing.viewport_width, :y => sizing.viewport_height}
-
     @css_parser = CssParser::Parser.new
 
     yield self if block_given?
   end
-
-  def x(value)
-    points(value, :x)
-  end
-
-  def y(value)
-    sizing.output_height - points(value, :y)
-  end
-
-  def distance(value, axis = nil)
-    value && points(value, axis)
-  end
-
-  def points(value, axis = nil)
-    Prawn::SVG::Calculators::Pixels.to_pixels(value, @axis_to_size.fetch(axis, sizing.viewport_diagonal))
-  end
 end

data/lib/prawn/svg/elements.rb

@@ -2,18 +2,18 @@ module Prawn::SVG::Elements
   COMMA_WSP_REGEXP = /(?:\s+,?\s*|,\s*)/
 end
 
-%w(base root container style text line polyline polygon circle ellipse rect path use image gradient marker ignored).each do |filename|
+%w(base depth_first_base root container viewport style text text_component line polyline polygon circle ellipse rect path use image gradient marker ignored).each do |filename|
   require "prawn/svg/elements/#{filename}"
 end
 
 module Prawn::SVG::Elements
   TAG_CLASS_MAPPING = {
-    svg: Prawn::SVG::Elements::Container,
     g: Prawn::SVG::Elements::Container,
     symbol: Prawn::SVG::Elements::Container,
     defs: Prawn::SVG::Elements::Container,
     clipPath: Prawn::SVG::Elements::Container,
     switch: Prawn::SVG::Elements::Container,
+    svg: Prawn::SVG::Elements::Viewport,
     style: Prawn::SVG::Elements::Style,
     text: Prawn::SVG::Elements::Text,
     line: Prawn::SVG::Elements::Line,

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

@@ -1,10 +1,13 @@
 class Prawn::SVG::Elements::Base
   extend Forwardable
 
+  include Prawn::SVG::Calculators::Pixels
+
   include Prawn::SVG::Attributes::Transform
   include Prawn::SVG::Attributes::Opacity
   include Prawn::SVG::Attributes::ClipPath
   include Prawn::SVG::Attributes::Stroke
+  include Prawn::SVG::Attributes::Space
 
   PAINT_TYPES = %w(fill stroke)
   COMMA_WSP_REGEXP = Prawn::SVG::Elements::COMMA_WSP_REGEXP
@@ -16,7 +19,7 @@ class Prawn::SVG::Elements::Base
   attr_reader :document, :source, :parent_calls, :base_calls, :state, :attributes, :properties
   attr_accessor :calls
 
-  def_delegators :@document, :x, :y, :distance, :points, :warnings
+  def_delegators :@document, :warnings
   def_delegator :@state, :computed_properties
 
   def initialize(document, source, parent_calls, state)
@@ -39,6 +42,7 @@ class Prawn::SVG::Elements::Base
   end
 
   def parse_and_apply
+    parse_standard_attributes
     parse
 
     apply_calls_from_standard_attributes
@@ -71,6 +75,14 @@ class Prawn::SVG::Elements::Base
     false
   end
 
+  def drawable?
+    !container?
+  end
+
+  def parse_standard_attributes
+    parse_xml_space_attribute
+  end
+
   def add_call(name, *arguments)
     @calls << [name.to_s, arguments, []]
   end
@@ -131,7 +143,7 @@ class Prawn::SVG::Elements::Base
   end
 
   def apply_drawing_call
-    if !state.disable_drawing && !container?
+    if !state.disable_drawing && drawable?
       draw_types = PAINT_TYPES.select { |property| computed_properties.send(property) != 'none' }
 
       if draw_types.empty?

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

@@ -6,7 +6,7 @@ class Prawn::SVG::Elements::Circle < Prawn::SVG::Elements::Base
 
     @x = x(attributes['cx'] || "0")
     @y = y(attributes['cy'] || "0")
-    @r = distance(attributes['r'])
+    @r = pixels(attributes['r'])
 
     require_positive_value @r
   end

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

@@ -0,0 +1,52 @@
+class Prawn::SVG::Elements::DepthFirstBase < Prawn::SVG::Elements::Base
+  def initialize(document, source, parent_calls, state)
+    super
+    @base_calls = @calls = @parent_calls
+  end
+
+  def process
+    parse_step
+    apply_step(calls)
+  rescue SkipElementQuietly
+  rescue SkipElementError => e
+    @document.warnings << e.message
+  end
+
+  def parse_and_apply
+    raise "unsupported"
+  end
+
+  protected
+
+  def parse_step
+    extract_attributes_and_properties
+    parse_standard_attributes
+    parse
+    parse_child_elements if container?
+  end
+
+  def apply_step(calls)
+    @base_calls = @calls = calls
+    apply_calls_from_standard_attributes
+    apply
+    apply_child_elements if container?
+  end
+
+  def parse_child_elements
+    return unless source
+
+    source.elements.each do |elem|
+      if element_class = Prawn::SVG::Elements::TAG_CLASS_MAPPING[elem.name.to_sym]
+        child = element_class.new(@document, elem, @calls, state.dup)
+        child.parse_step
+        @children << child
+      end
+    end
+  end
+
+  def apply_child_elements
+    @children.each do |child|
+      child.apply_step(calls)
+    end
+  end
+end

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

@@ -6,8 +6,8 @@ class Prawn::SVG::Elements::Ellipse < Prawn::SVG::Elements::Base
 
     @x = x(attributes['cx'] || "0")
     @y = y(attributes['cy'] || "0")
-    @rx = distance(attributes['rx'], :x)
-    @ry = distance(attributes['ry'], :y)
+    @rx = x_pixels(attributes['rx'])
+    @ry = y_pixels(attributes['ry'])
 
     require_positive_value @rx, @ry
   end

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

@@ -22,8 +22,8 @@ class Prawn::SVG::Elements::Image < Prawn::SVG::Elements::Base
 
     x = x(attributes['x'] || 0)
     y = y(attributes['y'] || 0)
-    width = distance(attributes['width'])
-    height = distance(attributes['height'])
+    width = x_pixels(attributes['width'])
+    height = y_pixels(attributes['height'])
 
     raise SkipElementQuietly if width.zero? || height.zero?
     require_positive_value width, height

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

@@ -2,10 +2,10 @@ class Prawn::SVG::Elements::Line < Prawn::SVG::Elements::Base
   include Prawn::SVG::Pathable
 
   def parse
-    @x1 = points(attributes['x1'] || '0', :x)
-    @y1 = points(attributes['y1'] || '0', :y)
-    @x2 = points(attributes['x2'] || '0', :x)
-    @y2 = points(attributes['y2'] || '0', :y)
+    @x1 = x_pixels(attributes['x1'] || 0)
+    @y1 = y_pixels(attributes['y1'] || 0)
+    @x2 = x_pixels(attributes['x2'] || 0)
+    @y2 = y_pixels(attributes['y2'] || 0)
   end
 
   def apply

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

@@ -41,8 +41,8 @@ class Prawn::SVG::Elements::Marker < Prawn::SVG::Elements::Base
         element.add_call 'transformation_matrix', scale, 0, 0, scale, 0, 0
       end
 
-      ref_x = document.distance(attributes['refX']) || 0
-      ref_y = document.distance(attributes['refY']) || 0
+      ref_x = x_pixels(attributes['refX']) || 0
+      ref_y = y_pixels(attributes['refY']) || 0
 
       element.add_call 'transformation_matrix', 1, 0, 0, 1, -ref_x * sizing.x_scale, ref_y * sizing.y_scale
 

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

@@ -4,12 +4,12 @@ class Prawn::SVG::Elements::Rect < Prawn::SVG::Elements::Base
 
     @x = x(attributes['x'] || '0')
     @y = y(attributes['y'] || '0')
-    @width = distance(attributes['width'], :x)
-    @height = distance(attributes['height'], :y)
+    @width = x_pixels(attributes['width'])
+    @height = y_pixels(attributes['height'])
 
     require_positive_value @width, @height
 
-    @radius = distance(attributes['rx'] || attributes['ry'])
+    @radius = x_pixels(attributes['rx']) || y_pixels(attributes['ry'])
     if @radius
       # If you implement separate rx and ry in the future, you'll want to change this
       # so that rx is constrained to @width/2 and ry is constrained to @height/2.

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

@@ -3,10 +3,14 @@ class Prawn::SVG::Elements::Root < Prawn::SVG::Elements::Base
     super
   end
 
+  def parse
+    state.viewport_sizing = @document.sizing
+  end
+
   def apply
     add_call 'fill_color', '000000'
     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
+    add_call 'transformation_matrix', 1, 0, 0, 1, -@document.sizing.x_offset, @document.sizing.y_offset
   end
 
   def container?

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

@@ -1,108 +1,70 @@
-class Prawn::SVG::Elements::Text < Prawn::SVG::Elements::Base
+class Prawn::SVG::Elements::Text < Prawn::SVG::Elements::DepthFirstBase
   def parse
-    case attributes['xml:space']
-    when 'preserve'
-      state.preserve_space = true
-    when 'default'
-      state.preserve_space = false
-    end
-
-    @relative = state.text_relative || false
+    state.text = Prawn::SVG::Elements::TextComponent::PositionsList.new([], [], [], [], [], nil)
 
-    if attributes['x'] || attributes['y']
-      @relative = false
-      @x_positions = attributes['x'].split(COMMA_WSP_REGEXP).collect {|n| document.x(n)} if attributes['x']
-      @y_positions = attributes['y'].split(COMMA_WSP_REGEXP).collect {|n| document.y(n)} if attributes['y']
-    end
+    @text_root = Prawn::SVG::Elements::TextComponent.new(document, source, nil, state.dup)
+    @text_root.parse_step
 
-    @x_positions ||= state.text_x_positions || [document.x(0)]
-    @y_positions ||= state.text_y_positions || [document.y(0)]
+    reintroduce_trailing_and_leading_whitespace
   end
 
   def apply
-    raise SkipElementQuietly if computed_properties.display == "none"
-
-    font = select_font
-    apply_font(font) if font
-
-    add_call_and_enter "text_group" if name == 'text'
-
-    if attributes['dx'] || attributes['dy']
-      add_call_and_enter "translate", document.distance(attributes['dx'] || 0), -document.distance(attributes['dy'] || 0)
-    end
-
-    # 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
-    opts = {
-      size:        computed_properties.numerical_font_size,
-      style:       font && font.subfamily,
-      text_anchor: computed_properties.text_anchor
-    }
-
-    spacing = computed_properties.letter_spacing
-    spacing = spacing == 'normal' ? 0 : document.points(spacing)
-
-    add_call_and_enter 'character_spacing', spacing
-
-    source.children.each do |child|
-      if child.node_type == :text
-        text = child.value.strip.gsub(state.preserve_space ? /[\n\t]/ : /\s+/, " ")
-
-        while text != ""
-          opts[:at] = [@x_positions.first, @y_positions.first]
-
-          if @x_positions.length > 1 || @y_positions.length > 1
-            add_call 'draw_text', text[0..0], opts.dup
-            text = text[1..-1]
+    add_call_and_enter "text_group"
+    @text_root.apply_step(calls)
+  end
 
-            @x_positions.shift if @x_positions.length > 1
-            @y_positions.shift if @y_positions.length > 1
-          else
-            add_call @relative ? 'relative_draw_text' : 'draw_text', text, opts.dup
-            @relative = true
-            break
-          end
-        end
+  private
 
-      elsif child.name == "tspan"
-        add_call 'save'
+  def drawable?
+    false
+  end
 
-        new_state = state.dup
-        new_state.text_x_positions = @x_positions
-        new_state.text_y_positions = @y_positions
-        new_state.text_relative = @relative
+  def apply_calls_from_standard_attributes
+    # overridden because we want the attributes to be applied in the TextComponent root,
+    # which is a duplicate of this element.
+  end
 
-        Prawn::SVG::Elements::Text.new(document, child, calls, new_state).process
+  def reintroduce_trailing_and_leading_whitespace
+    printables = []
+    built_printable_queue(printables, @text_root)
 
-        add_call 'restore'
+    remove_whitespace_only_printables_and_start_and_end(printables)
+    remove_printables_that_are_completely_empty(printables)
+    apportion_leading_and_trailing_spaces(printables)
+  end
 
+  def built_printable_queue(queue, component)
+    component.commands.each do |command|
+      case command
+      when Prawn::SVG::Elements::TextComponent::Printable
+        queue << command
       else
-        warnings << "Unknown tag '#{child.name}' inside text tag; ignoring"
+        built_printable_queue(queue, command)
       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.
-    add_call 'noop' if calls.empty?
   end
 
-  private
-
-  def select_font
-    font_families = [computed_properties.font_family, document.fallback_font_name]
-    font_style = :italic if computed_properties.font_style == 'italic'
-    font_weight = Prawn::SVG::Font.weight_for_css_font_weight(computed_properties.font_weight)
+  def remove_whitespace_only_printables_and_start_and_end(printables)
+    printables.pop   while printables.last  && printables.last.text.empty?
+    printables.shift while printables.first && printables.first.text.empty?
+  end
 
-    font_families.compact.each do |name|
-      font = document.font_registry.load(name, font_weight, font_style)
-      return font if font
+  def remove_printables_that_are_completely_empty(printables)
+    printables.reject! do |printable|
+      printable.text.empty? && !printable.trailing_space? && !printable.leading_space?
     end
-
-    warnings << "Font family '#{computed_properties.font_family}' style '#{computed_properties.font_style}' is not a known font, and the fallback font could not be found."
-    nil
   end
 
-  def apply_font(font)
-    add_call 'font', font.name, style: font.subfamily
+  def apportion_leading_and_trailing_spaces(printables)
+    printables.each_cons(2) do |a, b|
+      if a.text.empty?
+        # Empty strings can only get a leading space from the previous non-empty text,
+        # and never get a trailing space
+      elsif a.trailing_space?
+        a.text += ' '
+      elsif b.leading_space?
+        b.text = " #{b.text}"
+      end
+    end
   end
 end