squib 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b78f6ac8982e7aec43208726ad1e5160a9417a39
-  data.tar.gz: a22fe5b8bb4347867c89f2d675c410166f104633
+  metadata.gz: d42de6fef7642fe4a8502678c202e8fc846d7c23
+  data.tar.gz: e04f188ec47f347cdf7aa468d3f035fe40fa4191
 SHA512:
-  metadata.gz: 86637107259a7b2051c8d85624070859e7084b0830979acc8a537f32f0a9ba38d9c2ed2718b4b5b8b20a5b41e71ee864ec39beea28b4eeb21f785054c1a224cb
-  data.tar.gz: 77f4a6dbc532038583ad321f47795fc0452af6e310b327d5302493fb5d567fe30b469e42984b3a34e1b8c7883592508b998ad5df1ec238c3e13ffacb61d13822
+  metadata.gz: cb9edf34ebf85f39a2dc2175e0e7e8c0fcba2f1b1635979f4ea6d3b35873c30cd5a440db517abda02c68c19565230df9b8976630d70cfffd470a13a23719521e
+  data.tar.gz: c014e1b53e200277c5a544f96c0cb792a29c0cf9ac1b5d741430bddb2d8de38ef4409c00e879434187a7d7f916b6ba8e772d132d007c344e6719196224ab6eed

data/.gitignore

@@ -29,4 +29,6 @@ samples/_output/*.pdf
 samples/_output/foo
 rubocop.txt
 benchmarks/_output/*.png
-benchmarks/_output/*.pdf
+benchmarks/_output/*.pdf
+benchmarks/_output/
+samples/_output/*.svg

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Squib CHANGELOG
 
-## v0.3.0a
+# v0.4.0
+* SVG backend support! You can now set the deck's back end to work with SVGs instead of images, making the resulting PDFs vectorized. (You can still save to PNGs too.) This was a big change for Squib, and it's got at least one known issue and probably a few more here and there. See discussion on the README for more details.
+* Added config option for antialiasing method. My benchmarks showed that 'best' is only 10% slower than 'fast' on extremely alias-intensive tasks, so that's the Squib default now.
+* Bugfix: Stray stroke on circles after text (#35)
+* Bugfix: Progress bar increment error (#34)
+
+Known issues
+* Masking SVGs onto an SVG backend will rasterize as an intermediate step. (#43)
+* Compatibility change: gradient coordinates for the `mask` option in `svg` and `png` commands are relative to the given x,y - NOT to card as it was before.
+
+## v0.3.0
 * Masks! The `png` and `svg` commands can be used as if they are a mask, so you can color the icon with any color you like. Can be handy for switching to black-and-white, or for reusing the same image but different colors across cards.
 * Gradients! Can now specify linear or radial gradients anywhere you specify colors. See README and `samples/gradients.rb` for more details.
 * Number padding! `save_png` will now pad zeros on the filenames for friendlier sorting. You can also specify your own with `count_format` using the classical format string from Ruby's `Kernel::sprintf` (mostly just C-style format strings). Default: `'%02d'. The `prefix:` option is still there too.

data/README.md

@@ -1,16 +1,18 @@
 # Squib [![Gem Version](https://badge.fury.io/rb/squib.svg)](https://rubygems.org/gems/squib) [![Build Status](https://secure.travis-ci.org/andymeneely/squib.svg?branch=master)](https://travis-ci.org/andymeneely/squib) [![Dependency Status](https://gemnasium.com/andymeneely/squib.svg)](https://gemnasium.com/andymeneely/squib) [![Coverage Status](https://img.shields.io/coveralls/andymeneely/squib.svg)](https://coveralls.io/r/andymeneely/squib) [![Inline docs](http://inch-ci.org/github/andymeneely/squib.png?branch=master)](http://inch-ci.org/github/andymeneely/squib)
-Squib is a Ruby [DSL](http://en.wikipedia.org/wiki/Domain-specific_language) for prototyping card and board games. Write a little bit of Ruby, define your deck's stats, and you can compile your game into a series of images ready for print-and-play or even print-on-demand. Squib is very data-driven and built on the principle of Don't Repeat Yourself. Think of it like [nanDeck](http://www.nand.it/nandeck/) done "the Ruby way". Squib supports:
+Squib is a Ruby [DSL](http://en.wikipedia.org/wiki/Domain-specific_language) for prototyping card and board games. Write a little bit of Ruby, define your deck's stats, then compile your game into a series of images ready for print-and-play or even print-on-demand. Squib is very data-driven and built on the principle of Don't Repeat Yourself. Think of it like [nanDeck](http://www.nand.it/nandeck/) done "the Ruby way". Squib supports:
 
 * A concise set of rules for laying out your cards
-* Loading PNGs and SVGs using [Cairo](http://cairographics.org/)
+* Loading PNGs and SVGs
 * Complex text rendering using [Pango](http://www.pango.org/)
 * Reading `xlsx` and `csv` files
-* Rendering to individual PNGs or PDF sheets
+* Rendering to PNGs, PDFs, and SVGs (sheets or individual files)
 * Flexible, data-driven layouts in Yaml
-* Basic shape drawing
+* Basic shape drawing, blending operators, gradients, etc.
 * Unit conversion
 * The full power of Ruby!
 
+Squib is based on the [Cairo](http://cairographics.org/) graphics rendering engine, the library of choice for WebKit, Gecko, Inkscape and many, many others.
+
 Check this out.
 
 ```ruby
@@ -287,6 +289,21 @@ This can hopefully be helpful for:
 
 If your layout file is not found in the current directory, Squib will search for its own set of layout files (here's the latest the development version [on GitHub](https://github.com/andymeneely/squib/tree/master/lib/squib/layouts). See the `layouts.rb` sample found [here](https://github.com/andymeneely/squib/tree/master/samples/) for some demonstrative examples.
 
+## Backends: Raster vs. Vector
+Under the hood, Cairo has the ability to support a variety of surfaces to draw on, including both raster images stored in memory and vectors stored in SVG files. Thus, Squib supports the ability to handle both. They are options in the configuration file `backend: memory` or `backend: svg`.
+
+If you save to a PDF then the backend will determine how your cards are saved too. For `memory`, the PDF will be filled with compressed raster images and be a larger file (yet it will still print at high quality... see discussion below). For SVG backends, PDFs will be smaller. If you have your deck backed by SVG, then the cards are auto-saved, so there is no `save_svg` in Squib. (Technically, the operations are stored and then flushed to the SVG file at the very end.)
+
+There are trade-offs that one should consider here.
+
+* _Print quality is **higher** for raster images_. This seems counterintuitive at first, but consider where Squib sits in your workflow. It's the final assembly line for your cards before they get printed. Cairo puts _a ton_ of work into rendering each pixel perfectly when it works with raster images. Printers, on the other hand, don't think in vectors and will render your paths in their own memory with their own embedded libraries without putting a lot of work into antialiasing and various other graphical esoterica. You may notice that print-on-demand companies such as The Game Crafter [only accept raster file types](https://www.thegamecrafter.com/help/supported-file-types), because they don't want their customers complaining about printers not rendering vectors with enough care.
+* _PDFs are **smaller** for SVG back ends_. If file size is a limitation for you, and it can be for some printers or internet forums, then an SVG back end for vectorized PDFs is the way to go.
+* _Squib is **greedy** with memory_. While I've tested Squib with big decks on older computers, the `memory` backend is quite greedy with RAM. If memory is at a premium for you, switching to SVG might help.
+
+Note: you can still load PNGs into an SVG-backed deck and load SVGs into a memory-backed deck. To me, the sweet spot is to keep all of my icons, text, and other stuff in vector form for infinite scaling and then render them all to pixels with Squib.
+
+Fortunately, switching backends in Squib should be as trivial as changing the setting in the config file. So go ahead and experiment with both and see what works for you. See below for how the configuration options work.
+
 ## Configuration File
 
 Squib supports various configuration properties that can be specified in an external file. The `config:` option in `Deck.new` can specify an optional configuration file in YML format. The properties there are intended to be immutable for the life of the Deck. The options include:
@@ -295,6 +312,9 @@ Squib supports various configuration properties that can be specified in an exte
 * `dpi` (Integer, default: 300). Used in calculations when units are used (e.g. for PDF rendering and unit conversion).
 * `hint` (ColorString, default: off). Text hints are used to show the boundaries of text boxes. Can be enabled/disabled for individual commands, or set globally with the `set` command. This setting is overriden by `set` and individual commands.
 * `custom_colors` (Hash of Colors, default: {}). Defines globally-available colors available to the deck that can be specified in commands.
+* `antialias` (`fast, good, best, none`, default: best). Set the algorithm that Cairo will use for antialiasing. Using our benchmarks on large decks, `best` is only X% slower anyway. For more info see the [Cairo docs](http://www.cairographics.org/manual/cairo-cairo-t.html#cairo-antialias-t).
+* `backend` (`svg` or `memory`, default: `memory`). Defines how Cairo will store the operations. Memory is recommended for higher quality rendering.
+* `prefix` (default: `card_`). When using an SVG backend, cards are auto-saved with this prefix and `"%02d"` numbering format.
 
 The following sample demonstrates the config file.
 

data/Rakefile

@@ -2,6 +2,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'yard'
 require 'benchmark'
+require 'byebug'
 
 task default: [:install, :spec]
 
@@ -26,6 +27,7 @@ YARD::Rake::YardocTask.new(:yarddoc) do |t|
 end
 
 task benchmark: [:install] do
+  require 'squib'
   Squib::logger.level = Logger::ERROR #silence warnings
   Dir.chdir('benchmarks') do
     Benchmark.bm(15) do |bm|

data/benchmarks/antialias_best.rb

@@ -0,0 +1,13 @@
+require 'squib'
+
+Squib::Deck.new(cards: 200, config: 'antialias_best.yml') do
+  background color: :white
+  # alphabet = 'a'.upto('z').to_a.join + ' ' + 'A'.upto('Z').to_a.join + ' '
+  # text       str: alphabet * 36 , font: 'Sans Bold 18', width: 825, height: 1125, hint: :red
+  0.upto(500).each do |i|
+    circle radius: 50,
+           x: (i % 17) * 50,
+           y: (i / 17) * 50
+  end
+  save_png   prefix: 'antialias_best_'
+end

data/benchmarks/antialias_best.yml

@@ -0,0 +1 @@
+antialias: best

data/benchmarks/antialias_fast.rb

@@ -0,0 +1,13 @@
+require 'squib'
+
+Squib::Deck.new(cards: 200, config: 'antialias_fast.yml') do
+  background color: :white
+  # alphabet = 'a'.upto('z').to_a.join + ' ' + 'A'.upto('Z').to_a.join + ' '
+  # text       str: alphabet * 36 , font: 'Sans Bold 18', width: 825, height: 1125, hint: :red
+   0.upto(500).each do |i|
+    circle radius: 50,
+           x: (i % 17) * 50,
+           y: (i / 17) * 50
+  end
+  save_png   prefix: 'antialias_fast_'
+end

data/benchmarks/antialias_fast.yml

@@ -0,0 +1 @@
+antialias: fast

data/benchmarks/backend-memory.rb

@@ -0,0 +1,14 @@
+require 'squib'
+
+Squib::Deck.new(cards: 200) do
+  background color: :white
+  text       str: "Hello, world!", y: 500, width: 825, font: 'Sans bold 72', align: :center
+  rect       x: 10, y: 10, width: 20, height: 20
+  circle     x: 40, y: 40, radius: 25
+  triangle   x1: 50, y1: 15, x2: 60, y2: 25, x3: 75, y3: 25
+  line       x1: 100, y1: 620, x2: 720, y2: 620, stroke_width: 15.0
+  svg        file: 'spanner.svg', x: 100, y: 20
+  png        file: 'shiny-purse.png', x: 250, y: 20
+  save_png   prefix: 'rasterized_'
+  save_pdf   file: 'backend.pdf'
+end

data/benchmarks/backend-svg.rb

@@ -0,0 +1,14 @@
+require 'squib'
+
+Squib::Deck.new(cards: 200, config: 'backend-svg.yml') do
+  background color: :white
+  text       str: "Hello, world!", y: 500, width: 825, font: 'Sans bold 72', align: :center
+  rect       x: 10, y: 10, width: 20, height: 20
+  circle     x: 40, y: 40, radius: 25
+  triangle   x1: 50, y1: 15, x2: 60, y2: 25, x3: 75, y3: 25
+  line       x1: 100, y1: 620, x2: 720, y2: 620, stroke_width: 15.0
+  svg        file: 'spanner.svg', x: 100, y: 20
+  png        file: 'shiny-purse.png', x: 250, y: 20
+  save_png   prefix: 'rasterized_'
+  save_pdf   file: 'backend.pdf'
+end

data/benchmarks/backend-svg.yml

@@ -0,0 +1,4 @@
+backend: svg
+prefix: vector_backend_
+count_format: '%02d'
+dir: _output

data/lib/squib/api/image.rb

@@ -17,7 +17,7 @@ module Squib
     # @option opts alpha [Decimal] (1.0) the alpha-transparency percentage used to blend this image. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @option opts blend [:none, :multiply, :screen, :overlay, :darken, :lighten, :color_dodge, :color_burn, :hard_light, :soft_light, :difference, :exclusion, :hsl_hue, :hsl_saturation, :hsl_color, :hsl_luminosity] (:none) the composite blend operator used when applying this image. See Blend Modes at http://cairographics.org/operators. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @option opts angle [FixNum] (0) Rotation of the in radians. Note that this rotates around the upper-left corner, making the placement of x-y coordinates slightly tricky. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
-    # @option opts mask [String] (nil) If specified, the image will be used as a mask for the given color/gradient. Transparent pixels are ignored, opaque pixels are the given color.
+    # @option opts mask [String] (nil) If specified, the image will be used as a mask for the given color/gradient. Transparent pixels are ignored, opaque pixels are the given color. Note: the origin for gradient coordinates is at the given x,y, not at 0,0 as it is most other places.
     # @return [nil] Returns nil
     # @api public
     def png(opts = {})
@@ -52,7 +52,7 @@ module Squib
     # @option opts alpha [Decimal] (1.0) the alpha-transparency percentage used to blend this image. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @option opts blend [:none, :multiply, :screen, :overlay, :darken, :lighten, :color_dodge, :color_burn, :hard_light, :soft_light, :difference, :exclusion, :hsl_hue, :hsl_saturation, :hsl_color, :hsl_luminosity] (:none) the composite blend operator used when applying this image. See Blend Modes at http://cairographics.org/operators. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
     # @option opts angle [FixNum] (0) Rotation of the in radians. Note that this rotates around the upper-left corner, making the placement of x-y coordinates slightly tricky. Supports Arrays, see {file:README.md#Arrays_and_Singleton_Expansion Arrays and Singleon Expansion}
-    # @option opts mask [String] (nil) If specified, the image will be used as a mask for the given color/gradient. Transparent pixels are ignored, opaque pixels are the given color.
+    # @option opts mask [String] (nil) If specified, the image will be used as a mask for the given color/gradient. Transparent pixels are ignored, opaque pixels are the given color. Note: the origin for gradient coordinates is at the given x,y, not at 0,0 as it is most other places.
     # @return [nil] Returns nil
     # @api public
     def svg(opts = {})

data/lib/squib/api/save.rb

@@ -11,9 +11,9 @@ module Squib
     # @return self
     # @api public
     def save(opts = {})
-      opts = needs(opts, [:range, :creatable_dir, :formats, :prefix, :rotate])
-      save_png(opts) if opts[:format].include? :png
-      save_pdf(opts) if opts[:format].include? :pdf
+      # opts = needs(opts, [:range, :creatable_dir, :formats, :prefix, :rotate])
+      save_png(opts) if Array(opts[:format]).include? :png
+      save_pdf(opts) if Array(opts[:format]).include? :pdf
       self
     end
 

data/lib/squib/card.rb

@@ -9,7 +9,7 @@ module Squib
 
     # :nodoc:
     # @api private
-    attr_reader :width, :height
+    attr_reader :width, :height, :backend, :svgfile
 
     # :nodoc:
     # @api private
@@ -17,12 +17,31 @@ module Squib
 
     # :nodoc:
     # @api private
-    def initialize(deck, width, height)
-      @deck=deck; @width=width; @height=height
-      @cairo_surface = Cairo::ImageSurface.new(width,height)
+    def initialize(deck, width, height, backend=:memory, index=-1)
+      @deck          = deck
+      @width         = width
+      @height        = height
+      @backend       = backend
+      @svgfile       = "#{deck.dir}/#{deck.prefix}#{deck.count_format % index}.svg"
+      @cairo_surface = make_surface(@svgfile, backend)
       @cairo_context = Squib::Graphics::CairoContextWrapper.new(Cairo::Context.new(@cairo_surface))
+      @cairo_context.antialias = ANTIALIAS_OPTS[(@deck.antialias.downcase)] || 'subpixel'
     end
 
+    def make_surface(svgfile, backend)
+      case backend
+      when :memory
+        Cairo::ImageSurface.new(@width, @height)
+      when :svg
+        Dir.mkdir @deck.dir unless Dir.exists?(@deck.dir)
+        Cairo::SVGSurface.new(svgfile, @width, @height)
+      else
+        Squib.logger.fatal "Back end not recognized: '#{backend}'"
+        abort
+      end
+    end
+
+
   # A save/restore wrapper for using Cairo
   # :nodoc:
   # @api private

data/lib/squib/constants.rb

@@ -63,13 +63,23 @@ module Squib
     #
     # @api public
     CONFIG_DEFAULTS = {
+      'antialias'     => 'best',
+      'backend'       => 'memory',
+      'count_format'  => SYSTEM_DEFAULTS[:count_format],
       'custom_colors' => {},
-      'dpi' => 300,
-      'hint' => :none,
-      'progress_bar' => false,
-      'img_dir' => '.',
+      'dir'           => SYSTEM_DEFAULTS[:dir],
+      'dpi'           => 300,
+      'hint'          => :none,
+      'img_dir'       => '.',
+      'progress_bar'  => false,
     }
 
+    #Translate the hints to the methods.
+    ANTIALIAS_OPTS = {
+      'best' => 'subpixel',
+      'good' => 'gray',
+      'fast' => 'gray',
+    }
     # These are parameters that are intended to be "expanded" across
     # range if they are singletons.
     #

data/lib/squib/deck.rb

@@ -30,12 +30,14 @@ module Squib
 
     # :nodoc:
     # @api private
-    attr_reader :text_hint
+    attr_reader :text_hint, :antialias
 
     # :nodoc:
     # @api private
     attr_reader :layout, :config
 
+    attr_reader :dir, :prefix, :count_format
+
     # Squib's constructor that sets the immutable properties.
     #
     # This is the starting point for Squib. In providing a block to the constructor, you have access to all of Deck's instance methods.
@@ -56,18 +58,23 @@ module Squib
     # @param block [Block] the main body of the script.
     # @api public
     def initialize(width: 825, height: 1125, cards: 1, dpi: 300, config: 'config.yml', layout: nil, &block)
+      @antialias     = CONFIG_DEFAULTS['antialias']
       @dpi           = dpi
-      @width         = Args::UnitConversion.parse width, dpi
-      @height        = Args::UnitConversion.parse height, dpi
-      @font          = Squib::SYSTEM_DEFAULTS[:default_font]
+      @font          = SYSTEM_DEFAULTS[:default_font]
       @cards         = []
       @custom_colors = {}
       @img_dir       = '.'
-      @progress_bar  = Squib::Progress.new(false)
+      @progress_bar  = Progress.new(false)
       @text_hint     = :off
-      cards.times{ @cards << Squib::Card.new(self, @width, @height) }
+      @backend       = :memory
+      @dir           = SYSTEM_DEFAULTS[:dir]
+      @prefix        = SYSTEM_DEFAULTS[:prefix]
+      @count_format  = SYSTEM_DEFAULTS[:count_format]
       show_info(config, layout)
       load_config(config)
+      @width         = Args::UnitConversion.parse width, dpi
+      @height        = Args::UnitConversion.parse height, dpi
+      cards.times{ |i| @cards << Squib::Card.new(self, @width, @height, @backend, i) }
       @layout        = LayoutParser.load_layout(layout)
       if block_given?
         instance_eval(&block) # here we go. wheeeee!
@@ -93,12 +100,17 @@ module Squib
     def load_config(file)
       if File.exists?(file) && config = YAML.load_file(file)
         Squib::logger.info { "  using config: #{file}" }
-        config = Squib::CONFIG_DEFAULTS.merge(config)
-        @dpi = config['dpi'].to_i
-        @text_hint = config['text_hint']
+        config                = CONFIG_DEFAULTS.merge(config)
+        @dpi                  = config['dpi'].to_i
+        @text_hint            = config['text_hint']
         @progress_bar.enabled = config['progress_bars']
-        @custom_colors = config['custom_colors']
-        @img_dir = config['img_dir']
+        @custom_colors        = config['custom_colors']
+        @img_dir              = config['img_dir']
+        @backend              = (config['backend'].to_s.downcase.strip == 'svg') ? :svg : :memory
+        @dir                  = config['dir']
+        @prefix               = config['prefix']
+        @count_format         = config['count_format']
+        @antialias            = config['antialias']
       end
     end
 
@@ -108,6 +120,7 @@ module Squib
     def show_info(config, layout)
       Squib::logger.info "Squib v#{Squib::VERSION}"
       Squib::logger.info "  building #{@cards.size} #{@width}x#{@height} cards"
+      Squib::logger.info "  using #{@backend}"
     end
 
     ##################

data/lib/squib/graphics/cairo_context_wrapper.rb

@@ -15,7 +15,8 @@ module Squib
         :translate, :rotate, :move_to, :update_pango_layout, :width, :height,
         :show_pango_layout, :rounded_rectangle, :set_line_width, :stroke, :fill,
         :set_source, :scale, :render_rsvg_handle, :circle, :triangle, :line_to,
-        :operator=, :show_page, :clip, :transform, :mask, :create_pango_layout
+        :operator=, :show_page, :clip, :transform, :mask, :create_pango_layout,
+        :antialias=
 
       def set_source_squibcolor(arg)
         if match = arg.match(LINEAR_GRADIENT)

data/lib/squib/graphics/image.rb

@@ -27,7 +27,7 @@ module Squib
           cc.scale(width.to_f / png.width.to_f, height.to_f / png.height.to_f)
         end
         cc.rotate(angle)
-        cc.translate(-1 * x, -1 * y)
+        cc.translate(-x, -y)
         cc.set_source(png, x, y)
         cc.operator = blend unless blend == :none
         if mask.nil?
@@ -44,24 +44,25 @@ module Squib
     def svg(file, id, x, y, width, height, alpha, blend, angle, mask)
       Squib.logger.debug {"Rendering: #{file}, id: #{id} @#{x},#{y} #{width}x#{height}, alpha: #{alpha}, blend: #{blend}, angle: #{angle}, mask: #{mask}"}
       return if file.nil? or file.eql? ''
-      svg = RSVG::Handle.new_from_file(file)
-      width = svg.width if width == :native
-      height = svg.height if height == :native
-      tmp = Cairo::ImageSurface.new(width, height)
-      tmp_cc = Cairo::Context.new(tmp)
-      tmp_cc.scale(width.to_f / svg.width.to_f, height.to_f / svg.height.to_f)
-      tmp_cc.render_rsvg_handle(svg, id)
+      svg          = RSVG::Handle.new_from_file(file)
+      width        = svg.width  if width == :native
+      height       = svg.height if height == :native
+      scale_width  = width.to_f / svg.width.to_f
+      scale_height = height.to_f / svg.height.to_f
       use_cairo do |cc|
         cc.translate(x, y)
         cc.rotate(angle)
-        cc.translate(-1 * x, -1 * y)
+        cc.scale(scale_width, scale_height)
         cc.operator = blend unless blend == :none
+        #FIXME Alpha is no longer used since we are not using cc.paint anymore
         if mask.nil?
-          cc.set_source(tmp, x, y)
-          cc.paint(alpha)
+          cc.render_rsvg_handle(svg, id)
         else
+          tmp = Cairo::ImageSurface.new(width / scale_width, height / scale_height)
+          tmp_cc = Cairo::Context.new(tmp)
+          tmp_cc.render_rsvg_handle(svg, id)
           cc.set_source_squibcolor(mask)
-          cc.mask(tmp, x, y)
+          cc.mask(tmp, 0, 0)
         end
       end
     end

data/lib/squib/graphics/save_doc.rb

@@ -16,25 +16,45 @@ module Squib
     # @return [nil]
     # @api public
     def save_pdf(opts = {})
-      opts = {width: 3300, height: 2550}.merge(opts)
-      p = needs(opts, [:range, :paper_width, :paper_height, :file_to_save, :creatable_dir, :margin, :gap, :trim])
-      cc = Cairo::Context.new(Cairo::PDFSurface.new("#{p[:dir]}/#{p[:file]}", p[:width], p[:height]))
-      x = p[:margin]
-      y = p[:margin]
-      @progress_bar.start("Saving PDF to #{p[:dir]}/#{p[:file]}", p[:range].size) do |bar|
+      opts   = {width: 3300, height: 2550}.merge(opts)
+      p      = needs(opts, [:range, :paper_width, :paper_height, :file_to_save,
+                          :creatable_dir, :margin, :gap, :trim])
+      paper_width  = p[:width]
+      paper_height = p[:height]
+      file         = "#{p[:dir]}/#{p[:file]}"
+      cc           = Cairo::Context.new(Cairo::PDFSurface.new(file, paper_width, paper_height))
+      x, y         = p[:margin], p[:margin]
+      card_width   = @width  - 2 * p[:trim]
+      card_height  = @height - 2 * p[:trim]
+      @progress_bar.start("Saving PDF to #{file}", p[:range].size) do |bar|
         p[:range].each do |i|
-          surface = trim(@cards[i].cairo_surface, p[:trim], @width, @height)
-          cc.set_source(surface, x, y)
-          cc.paint
+          card = @cards[i]
+          cc.translate(x,y)
+          cc.rectangle(p[:trim], p[:trim], card_width, card_height)
+          cc.clip
+          case card.backend
+          when :memory
+            cc.set_source(card.cairo_surface, 0, 0)
+            cc.paint
+          when :svg
+            card.cairo_surface.finish
+            cc.save
+            cc.scale(0.8,0.8) # I really don't know why I needed to do this at all. But 0.8 is the magic number to get this to scale right
+            cc.render_rsvg_handle(RSVG::Handle.new_from_file(card.svgfile), nil)
+            cc.restore
+          else
+            abort "No such back end supported for save_pdf: #{backend}"
+          end
           bar.increment
-          x += surface.width + p[:gap]
-          if x > (p[:width] - surface.width - p[:margin])
+          cc.reset_clip
+          cc.translate(-x,-y)
+          x += card.width + p[:gap] - 2*p[:trim]
+          if x > (paper_width - card_width - p[:margin])
             x = p[:margin]
-            y += surface.height + p[:gap]
-            if y > (p[:height] - surface.height - p[:margin])
-              x = p[:margin]
-              y = p[:margin]
-              cc.show_page #next page
+            y += card.height + p[:gap] - 2*p[:trim]
+            if y > (paper_height - card_height - p[:margin])
+              cc.show_page # next page
+              x,y = p[:margin],p[:margin]
             end
           end
         end
@@ -44,7 +64,7 @@ module Squib
     # Lays out the cards in range and renders a stitched PNG sheet
     #
     # @example
-    #   save_png_sheet prefix: 'sheet_', margin: 75, gap: 5, trim: 37
+    #   save_sheet prefix: 'sheet_', margin: 75, gap: 5, trim: 37
     #
     # @option opts [Enumerable] range (:all) the range of cards over which this will be rendered. See {file:README.md#Specifying_Ranges Specifying Ranges}
     # @option opts colulmns [Integer] (1) the number of columns in the grid
@@ -81,7 +101,6 @@ module Squib
           surface = trim(@cards[i].cairo_surface, p[:trim], @width, @height)
           cc.set_source(surface, x, y)
           cc.paint
-          bar.increment
           num_this_sheet += 1
           x += surface.width + p[:gap]
           if num_this_sheet % p[:columns] == 0 # new row