squib 0.16.0.pre.preview1 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24cc3f2b97503042d0ad1a0db003e8cb585e4853389c78b49c54c036f45bf4e2
-  data.tar.gz: aa49287f4fa01039f4ea8737e862d24637ba47142d84849e54335b44b00f4424
+  metadata.gz: 0ce274e1ac305556f491ca0ec5fe50ce3423aadd4eee2bbda2d143bded8590a7
+  data.tar.gz: 2c98fe372b7eeb24eceafe9e416c582a3e51662300d2c83dabcb3a43f99210c5
 SHA512:
-  metadata.gz: 529665761713e33f8743356a90af15ab244e8e09ffbb4836d1aa3dd1e0398cba320ffb0e443aff355cc71604146f03865b413c3307a76d372860a07b35a8bb2b
-  data.tar.gz: 0fe62d7d34630c98c2750e5da46d4fd5633692f6f5cab22248b4650e6f8bfa2964ac0c107f5efd847c44342ad7b2ccf41634719b6c6cf84a55154ca1bcaba405
+  metadata.gz: 9fe46e736b5a0acd2af24851041de586cd7fe0ab2208a6559b4cba676904ff07fadcdb2fe1d25084838634e1780b43dec32b7a3a7b4926fd173eeb6ccbdf2342
+  data.tar.gz: aecd5504f8dfd17518d9d675c58be8c1dfcbf5d5cff29aa9091308adbf4020e2fcadc91e4da155c69a20e397a5600c92269b8dfec306fcb87271c7342c68c04a

data/.github/workflows/tests.yml

@@ -8,9 +8,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        ruby: [2.5, 2.6, 2.7, head]
+        ruby: [2.5, 2.6, 2.7, 3.0, head]
     runs-on: ${{ matrix.os }}-latest
-    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug'  || (matrix.ruby == '3.0' && matrix.os == 'macos')}}
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,7 +1,25 @@
 # Squib CHANGELOG
 Squib follows [semantic versioning](http://semver.org).
 
-## v0.16.0 / Unreleased
+## v0.17.1 / 2021-08-11
+
+Bugs:
+* Sprues now allow negative coordinates (#336)
+* Documentation typos (#337)
+
+## v0.17.0 / 2021-07-23
+Features:
+* Drop shadows! The `save_png` method now supports a bunch of `shadow_` arguments that will add a drop shadow just before rendering. This is intended for using in rulebooks or marketing. Try it out by adding `shadow_radius: 8` to your save_png (#306, #264)
+* Added debug methods for checking font access. `Squib.system_fonts` and `Squib.print_system_fonts` (#334)
+
+Bugs:
+* The `rows` argument is always respected in `save_sheet` (#332).
+
+Chores:
+* Bump cairo to ~1.17
+* Bump classy_hash to 1.0
+
+## v0.16.0 / 2020-11-24
 
 Features:
 * Special custom unit: cells. A "cell" defaults to 37.5px, or 1/8in, e.g. `x: '1 cell'` means `x: 37.5`. See the docs for details.

data/RELEASE TODO.md

@@ -9,14 +9,15 @@ Be sure to remember to do the following for releases. (Copy into a GitHub issue)
  - [ ] Bump docs/conf.py versions
  - [ ] Do a full rake locally
  - [ ] `rake sanity`, and check visually
- - [ ] Travis is passing on dev branch
+ - [ ] GitHub Actions is passing on dev branch
  - [ ] Merge master branch
  - [ ] Merge release branch
  - [ ] Push master and release branches
  - [ ] Create GitHub release tag
  - [ ] `gem push pkg/squib-x.y.z.gem`
- - [ ] `gem push --key github --host https://rubygems.pkg.github.com/andymeneely pkg/squib-x.y.z.gem`
  - [ ] Github milestone closed
- - [ ] Activate version on squib.readthedocs.org
+ - [ ] Activate version on squib.readthedocs.org (Versions)
+ - [ ] Set default version on squib.readthedocs.org (Advanced Settings)
  - [ ] Bump version.rb to the next alpha
+ - [ ] Check Docker build
  - [ ] Publish on BoardGameGeek thread

data/lib/squib.rb

@@ -7,6 +7,8 @@ require_relative 'squib/version'
 require_relative 'squib/commands/cli'
 require_relative 'squib/deck'
 require_relative 'squib/card'
+require_relative 'squib/system_fonts'
+
 
 module Squib
   using Rainbow # we can colorize strings now!

data/lib/squib/args/drop_shadow.rb

@@ -0,0 +1,39 @@
+require_relative 'color_validator'
+
+module Squib::Args
+  module_function def extract_drop_shadow(opts, deck)
+    DropShadow.new(deck.custom_colors).extract! opts, deck
+  end
+
+  class DropShadow
+    include ArgLoader
+    include ColorValidator
+
+    def initialize(custom_colors)
+      @custom_colors = custom_colors
+    end
+
+    def self.parameters
+      {
+        shadow_color: :black,
+        shadow_offset_x: 3,
+        shadow_offset_y: 3,
+        shadow_radius: nil,
+        shadow_trim: 0,
+      }
+    end
+
+    def self.expanding_parameters
+      self.parameters.keys # all of them
+    end
+
+    def self.params_with_units
+      [:shadow_offset_x, :shadow_offset_y, :shadow_radius, :shadow_trim]
+    end
+
+    def validate_shadow_color(arg, _i)
+      colorify(arg, @custom_colors)
+    end
+
+  end
+end

data/lib/squib/args/sheet.rb

@@ -82,14 +82,9 @@ module Squib::Args
 
     def validate_rows(arg)
       raise 'columns must be an integer' unless columns.respond_to? :to_i
-      count = if range == :all
-                @deck.size
-              else
-                count = range.to_a.length
-              end
-      return 1 if count <= columns
-      return arg if arg.respond_to? :to_i
-      (count.to_f / columns.to_f).ceil
+      count = (range == :all) ? @deck.size : count = range.to_a.length
+      return arg.to_i if arg.respond_to? :to_i
+      (count.to_f / columns.to_f).ceil # e.g. :infinite
     end
 
     def full_filename(i=nil)

data/lib/squib/args/xywh_shorthands.rb

@@ -3,49 +3,44 @@ require_relative 'unit_conversion'
 module Squib
   module Args
     module XYWHShorthands
-      WIDTH_MINUS_REGEX = /^width\s*\-\s*/
-      HEIGHT_MINUS_REGEX = /^height\s*\-\s*/
-      WIDTH_DIV_REGEX = /^width\s*\/\s*/
-      HEIGHT_DIV_REGEX = /^height\s*\/\s*/
-      MIDDLE_PLUS_REGEX = /^middle\s*\+\s*/
-      MIDDLE_MINUS_REGEX = /^middle\s*\-\s*/
 
+      MIDDLE_ONLY = /^(middle|center)\s*$/
+      DECK_ONLY = /^deck\s*$/
+      MIDDLE_MINUS_REGEX = /^(middle|center)\s*\-\s*/
+      MIDDLE_PLUS_REGEX = /^(middle|center)\s*\+\s*/
+      DECK_MINUS_REGEX = /^deck\s*\-\s*/
+      DECK_PLUS_REGEX = /^deck\s*\+\s*/
+      DECK_DIV_REGEX = /^deck\s*\/\s*/
 
       # dimension is usually either deck_width or deck_height
       def apply_shorthands(arg, deck, axis: :x)
         dimension = (axis == :x) ? deck.width : deck.height
         arg_s = arg.to_s
         case arg_s
-        when 'middle'
+        when MIDDLE_ONLY
           dimension / 2.0
-        when 'center'
-          dimension / 2.0
-        when 'deck'
+        when DECK_ONLY
           dimension
-        when WIDTH_MINUS_REGEX # e.g. width - 1.5in
-          n = arg_s.sub WIDTH_MINUS_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px)
-          deck.width - n
-        when HEIGHT_MINUS_REGEX # e.g. height - 1.5in
-          n = arg_s.sub HEIGHT_MINUS_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px)
-          deck.height - n
-        when WIDTH_DIV_REGEX # e.g. width / 3
-          n = arg_s.sub WIDTH_DIV_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
-          deck.width / n
-        when HEIGHT_DIV_REGEX # e.g. height / 3
-          n = arg_s.sub HEIGHT_DIV_REGEX, ''
+        when MIDDLE_MINUS_REGEX # e.g. width: middle - 3
+          n = arg_s.sub MIDDLE_MINUS_REGEX, ''
           n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
-          deck.height / n
+          dimension / 2.0 - n
         when MIDDLE_PLUS_REGEX # e.g. middle + 1.5in
           n = arg_s.sub MIDDLE_PLUS_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px)
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
           dimension / 2.0 + n
-        when MIDDLE_MINUS_REGEX # e.g. middle - 1.5in
-          n = arg_s.sub MIDDLE_MINUS_REGEX, ''
-          n = UnitConversion.parse(n, deck.dpi, deck.cell_px)
-          dimension / 2.0 - n
+        when DECK_MINUS_REGEX # e.g. width: deck - 1.5in
+          n = arg_s.sub DECK_MINUS_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension - n
+        when DECK_PLUS_REGEX # e.g. deck + 1.5in (which is weird but ok)
+          n = arg_s.sub DECK_PLUS_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension + n
+        when DECK_DIV_REGEX # e.g. width: deck/3
+          n = arg_s.sub DECK_DIV_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension / n
         else
           arg
         end

data/lib/squib/dsl/save_png.rb

@@ -1,5 +1,7 @@
 require_relative '../errors_warnings/warn_unexpected_params'
-
+require_relative '../args/card_range'
+require_relative '../args/save_batch'
+require_relative '../args/drop_shadow'
 
 module Squib
   class Deck
@@ -24,24 +26,23 @@ module Squib
           range
           dir prefix suffix count_format
           rotate trim trim_radius
+          shadow_offset_x shadow_offset_y shadow_radius shadow_color shadow_trim
          )
       end
 
       def run(opts)
         warn_if_unexpected opts
-        Dir.chdir(deck.img_dir) do
-          range = Args.extract_range opts, deck
-          batch = Args.extract_save_batch opts, deck
-          @bar.start("Saving PNGs to #{batch.summary}", deck.size) do |bar|
-            range.map do |i|
-              deck.cards[i].save_png(batch[i])
-              bar.increment
-            end
-
+        range = Args.extract_range opts, deck
+        batch = Args.extract_save_batch opts, deck
+        shadow = Args.extract_drop_shadow opts, deck
+        @bar.start("Saving PNGs to #{batch.summary}", deck.size) do |bar|
+          range.map do |i|
+            deck.cards[i].save_png(batch[i], shadow[i])
+            bar.increment
           end
         end
-
       end
     end
+
   end
 end

data/lib/squib/graphics/cairo_context_wrapper.rb

@@ -20,12 +20,14 @@ module Squib
 
       def_delegators :cairo_cxt, :save, :set_source_color, :paint, :restore,
         :translate, :rotate, :move_to, :update_pango_layout, :width, :height,
-        :show_pango_layout, :rectangle, :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,
-        :antialias=, :curve_to, :matrix, :matrix=, :identity_matrix, :pango_layout_path,
-        :stroke_preserve, :target, :new_path, :new_sub_path, :reset_clip, :fill_preserve, :close_path,
-        :set_line_join, :set_line_cap, :set_dash, :arc, :arc_negative
+        :show_pango_layout, :rectangle, :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, :antialias=, :curve_to, :matrix, :matrix=,
+        :identity_matrix, :pango_layout_path, :stroke_preserve, :target,
+        :new_path, :new_sub_path, :reset_clip, :fill_preserve, :close_path,
+        :set_line_join, :set_line_cap, :set_dash, :arc, :arc_negative,
+        :pseudo_blur
 
       # :nodoc:
       # @api private

data/lib/squib/graphics/save_images.rb

@@ -1,12 +1,14 @@
+require_relative 'cairo_context_wrapper'
+
 module Squib
   class Card
 
     # :nodoc:
     # @api private
-    def save_png(batch)
-      surface = if preprocess_save?(batch)
+    def save_png(batch, shadow)
+      surface = if preprocess_save?(batch, shadow)
                   w, h = compute_dimensions(batch.rotate, batch.trim)
-                  preprocessed_save(w, h, batch)
+                  preprocessed_save(w, h, batch, shadow)
                 else
                   @cairo_surface
                 end
@@ -15,8 +17,8 @@ module Squib
 
     # :nodoc:
     # @api private
-    def preprocess_save?(batch)
-      batch.rotate != false || batch.trim > 0
+    def preprocess_save?(batch, shadow)
+      batch.rotate != false || batch.trim > 0 || !(shadow.shadow_radius.nil?)
     end
 
     def compute_dimensions(rotate, trim)
@@ -27,25 +29,62 @@ module Squib
       end
     end
 
-    def preprocessed_save(width, height, batch)
-      new_cc = Cairo::Context.new(Cairo::ImageSurface.new(width, height))
+    def preprocessed_save(w, h, batch, shadow)
+      new_cc = Cairo::Context.new(Cairo::ImageSurface.new(w, h))
       trim_radius = batch.trim_radius
       if batch.rotate != false
-        new_cc.translate(width * 0.5, height * 0.5)
-        new_cc.rotate(batch.angle)
-        new_cc.translate(height * -0.5, width * -0.5)
-        new_cc.rounded_rectangle(0, 0, height, width, trim_radius, trim_radius)
+        new_cc.translate w * 0.5, h * 0.5
+        new_cc.rotate batch.angle
+        new_cc.translate h * -0.5, w * -0.5
+        new_cc.rounded_rectangle(0, 0, h, w, trim_radius, trim_radius)
       else
-        new_cc.rounded_rectangle(0, 0, width, height, trim_radius, trim_radius)
+        new_cc.rounded_rectangle(0, 0, w, h, trim_radius, trim_radius)
       end
       new_cc.clip
       new_cc.set_source(@cairo_surface, -batch.trim, -batch.trim)
       new_cc.paint
+      new_cc.reset_clip
+      new_cc = drop_shadow(new_cc, shadow, batch) unless shadow.shadow_radius.nil?
       return new_cc.target
     end
 
+    # pseudo-blur behave weirdly with a radius of 0 - wrapping
+    def blur(cc, r, &block)
+      if r == 0
+        yield(block)
+      else
+        cc.pseudo_blur(r, &block)
+      end
+    end
+
+    def drop_shadow(cc, s, batch)
+      off_x = s.shadow_offset_x
+      off_y = s.shadow_offset_y
+      s_trim = s.shadow_trim
+      s_rad = s.shadow_radius
+      new_w = cc.target.width  + off_x + 3 * s_rad - (2 * s_trim)
+      new_h = cc.target.height + off_y + 3 * s_rad - (2 * s_trim)
+      new_cc = Squib::Graphics::CairoContextWrapper.new(
+        Cairo::Context.new(Cairo::ImageSurface.new(new_w, new_h)))
+      blur(new_cc, s_rad) do
+        # fill in with shadow color
+        new_cc.set_source_squibcolor s.shadow_color
+        new_cc.rectangle 0, 0, new_cc.target.width, new_cc.target.height
+        new_cc.fill
+        # then, paint but blend with :dest_in to get a shadow-shaped drawing
+        new_cc.set_source cc.target, s_rad + off_x, s_rad + off_y
+        new_cc.operator = :dest_in # see https://www.cairographics.org/operators/
+        new_cc.paint
+      end
+      new_cc.set_source cc.target, s_rad, s_rad
+      new_cc.operator = :over
+      new_cc.paint
+      return new_cc
+    end
+
     def write_png(surface, i, b)
-      surface.write_to_png("#{b.dir}/#{b.prefix}#{b.count_format % i}#{b.suffix}.png")
+      filename = "#{b.dir}/#{b.prefix}#{b.count_format % i}#{b.suffix}.png"
+      surface.write_to_png filename
     end
 
   end

data/lib/squib/sprues/sprue_schema.rb

@@ -1,7 +1,8 @@
 module Squib
   module Sprues
     UNIT_REGEX = /^(\d*[.])?\d+(in|cm|mm)$/
-    ROTATE_REGEX = /^(\d*[.])?\d+(deg|rad)?$/
+    COORD_REGEX = /^\-?(\d*[.])?\d+(in|cm|mm)$/
+    ROTATE_REGEX = /^\-?(\d*[.])?\d+(deg|rad)?$/
     SCHEMA = {
       'sheet_width' => UNIT_REGEX,
       'sheet_height' => UNIT_REGEX,
@@ -35,8 +36,8 @@ module Squib
         }]]
       },
       'cards' => [[{
-        'x' => UNIT_REGEX,
-        'y' => UNIT_REGEX,
+        'x' => COORD_REGEX,
+        'y' => COORD_REGEX,
         'rotate' => [
           :optional, Numeric,
           ClassyHash::G.enum(:clockwise, :counterclockwise, :turnaround),

data/lib/squib/system_fonts.rb

@@ -0,0 +1,17 @@
+require 'pango'
+module Squib
+
+  # List all system fonts that Cairo/Pango can see
+  # Wow this call was convoluted...
+  # Returns array of strings with the names of fonts
+  module_function def system_fonts
+    cc = Cairo::Context.new(Cairo::ImageSurface.new(0,0)) # empty image
+    cc.create_pango_layout.context.families.map {|f| f.name }
+  end
+
+  # Prints out the system fonts in sorted order
+  module_function def print_system_fonts
+    puts "== DEBUG: Squib knows about these fonts =="
+    puts system_fonts.sort
+  end
+end

data/lib/squib/version.rb

@@ -6,5 +6,6 @@ module Squib
   # Most of the time this is in the alpha of the next release.
   # e.g. v0.0.5a is on its way to becoming v0.0.5
   #
-  VERSION = '0.16.0-preview1'
+  VERSION = '0.17.1'
 end
+

data/samples/saves/_saves.rb

@@ -50,3 +50,13 @@ Squib::Deck.new(width: 825, height: 1125, cards: 16) do
              columns: 2, rows: 1,
              margin: 75, gap: 5, trim: 37
 end
+
+Squib::Deck.new(width: 100, height: 100, cards: 3) do
+  background color: :grey
+  text str: 'Hi', font: 'Arial 18'
+
+  # Test bug 332.
+  # When we only have 3 cards but want a 2x4 grid with lots of empty spaces.
+  # Buggy behavior was to revert to 1 row and not respect the rows arg.
+  save_sheet prefix: 'save_sheet_bug332_', rows: 2, columns: 4
+end

data/samples/shadows/_shadow.rb

@@ -0,0 +1,72 @@
+require 'squib'
+# The save_png method supports drop shadows on the final save
+# This is useful for when you want to generate images for your rulebook
+
+Squib::Deck.new(width: 100, height: 150) do
+  background color: '#abc'
+  svg file: '../spanner.svg',
+      x: 'middle - 25', y: 'middle - 25',
+      width: 50, height: 50
+
+  # Shadows off by default, i.e. shadow_radius is nil
+  # So our final dimensions are 100 - 2*15 and 150-2*15
+  save_png prefix: 'no_shadow_', trim: 15, trim_radius: 15
+
+  # Here's a nice-looking drop shadow
+  # Defaults are designed to be generally good, so I recommend just
+  # trying out a shadow_radius of 3 to 10 and see how it looks first
+  save_png prefix: 'with_shadow_', trim: 15, trim_radius: 15,
+           shadow_radius: 8,
+           shadow_offset_x: 3, shadow_offset_y: 3,  # about r / 2.5 looks good
+           shadow_trim: 2.5, # about r/ 3 looks good
+           shadow_color: '#101010aa' #tip: start the shadow color kinda transparent
+
+  # Don't want a blur? Use a radius of 0
+  save_png prefix: 'no_blur_', trim: 15, trim_radius: 15,
+           shadow_radius: 0
+
+  # Ok this next stop is crazytown, but it does give you ultimate control
+  # Remember that all Squib colors can also be gradients.
+  # They can be clunky but they do work here.
+  #   - x,y's are centered in the card itself
+  #   - stops go from fully empty to fully black
+  #   - we need to still turn on radius to get the effect
+  #   - but, this makes the upper-left corner not have a glowing effect and
+  #     have a harder edge, which (to my eye at least) feels more realistic
+  #     since the card would obscure the upper-left shadow at that angle
+  #   - this also allows you have a larger, softer blur without making it look
+  #     like it's glowing
+  #
+  # Oh just because it's easier to write we can use a ruby heredoc
+  save_png prefix: 'gradient_blur_', trim: 15, trim_radius: 15,
+           shadow_radius: 10,
+           shadow_color: <<~EOS
+              (25,25)
+              (175,175)
+              #0000@0.0
+              #000f@1.0
+           EOS
+
+  # This one looks weird I know but it's for regression testing
+  save_png prefix: 'with_shadow_test_',
+           trim: 15, trim_radius: 15, rotate: :clockwise,
+           shadow_offset_x: 5, shadow_offset_y: 25, shadow_radius: 10,
+           shadow_trim: 10,
+           shadow_color: '#123'
+end
+
+Squib::Deck.new(width:50, height: 50) do
+
+  # What if we had a transparent card but just some shapes?
+  # Like chits or something
+
+  # background defaults to fully transparent here
+
+  png file: 'doodle.png'
+
+  save_png prefix: 'transparent_bg_shadow_',
+           shadow_radius: 2,
+           shadow_offset_x: 2, shadow_offset_y: 2,
+           shadow_color: :black
+
+end

data/samples/sprues/_negative_coords.rb

@@ -0,0 +1,7 @@
+require_relative '../../lib/squib'
+
+Squib::Deck.new(width: 100, height: 100, cards: 3) do 
+  background color: :grey
+  text str: 'Hello', font: 'Sans Bold 10'
+  save_sheet sprue: 'my_sprues/negatives.yml', prefix: 'sprue_negatives_'
+end

data/samples/system_font_debug/_list_fonts.rb

@@ -0,0 +1,14 @@
+# require 'squib'
+require_relative '../../lib/squib'
+
+# Per issue #334, sometimes Pango doesn't find the font file you want
+# Pango requires fonts to be installed on the system, but sometimes the
+# font name is not obvious. e.g. "Foo Regular" might be actually named "Foo"
+# Use these methods to debug this problem
+
+# Usually you would just run this method to see what fonts are installed
+# This is commented out to make our test cases
+# Squib.print_system_fonts
+
+Squib.system_fonts.include? 'Open Sans' # checks if we have Open Sans installed
+# Note: does nothing since it's just a check

data/samples/units/_cells.rb

@@ -19,7 +19,7 @@ Squib::Deck.new(width: '1.5in', height: '1.5in') do
   # Technically, the "cell" is actually a "unit", so you can even combine
   # with xywh shorhands!!
   rect fill_color: :red,
-       x: 'middle + 0.5c', y: 'height - 1.5c',
+       x: 'middle + 0.5c', y: 'deck - 1.5c',
        width: '1c', height: '1c'
 
   # And, unlike xywh shorthands, this applies basically everywhere we support

data/samples/units/_shorthands.rb

@@ -20,14 +20,13 @@ Squib::Deck.new(width: '0.5in', height: '0.25in') do
 
   # We can also do width-, height-, width/, height/
   rect x: 20, y: 5, stroke_color: :green,
-  width: 'width - 0.1in', height: 10
+  width: 'deck - 0.1in', height: 10
 
-  rect x: 10, y: 50, width: 10, height: 'height / 3',
+  rect x: 10, y: 50, width: 10, height: 'deck / 3',
        stroke_color: :purple
 
   # And middle+/-
-
-  rect x: 'middle + 0.1in', y: 'middle - 0.1in',
+  rect x: 'middle + 0.1in', y: 'center - 0.1in',
        width: '0.1in', height: '0.1in', fill_color: :blue
 
   # Layouts apply this too.

data/squib.gemspec

@@ -31,18 +31,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(spec|samples|docs|benchmarks)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'cairo',                 '~> 1.16'
-  spec.add_runtime_dependency 'classy_hash',           '0.2.1'
+  spec.add_runtime_dependency 'cairo',                 '~> 1.17'
+  spec.add_runtime_dependency 'classy_hash',           '1.0.0'
   spec.add_runtime_dependency 'gio2',                  '~> 3.4'
   spec.add_runtime_dependency 'gobject-introspection', '~> 3.4'
   spec.add_runtime_dependency 'highline',              '2.0.3'
   spec.add_runtime_dependency 'mercenary',             '0.4.0'
-  spec.add_runtime_dependency 'nokogiri',              '~> 1.10'
+  spec.add_runtime_dependency 'nokogiri',              '~> 1.11'
   spec.add_runtime_dependency 'pango',                 '~> 3.4'
   spec.add_runtime_dependency 'rainbow',               '~> 3.0'
   spec.add_runtime_dependency 'roo',                   '~> 2.8'
   spec.add_runtime_dependency 'rsvg2',                 '~> 3.4'
-  spec.add_runtime_dependency 'ruby-progressbar',      '~> 1.10'
+  spec.add_runtime_dependency 'ruby-progressbar',      '~> 1.11'
 
   spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'bundler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squib
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre.preview1
+  version: 0.17.1
 platform: ruby
 authors:
 - Andy Meneely
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: classy_hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: gio2
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +358,7 @@ extra_rdoc_files:
 - samples/saves/_save_filenames.rb
 - samples/saves/_save_pdf.rb
 - samples/saves/_showcase.rb
+- samples/shadows/_shadow.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
 - samples/sprues/_advanced_sprues.rb
@@ -365,7 +366,9 @@ extra_rdoc_files:
 - samples/sprues/_fold_sheet.rb
 - samples/sprues/_hex_tiles.rb
 - samples/sprues/_mints.rb
+- samples/sprues/_negative_coords.rb
 - samples/sprues/_sprue_example.rb
+- samples/system_font_debug/_list_fonts.rb
 - samples/text/bug134.rb
 - samples/text/_embed_text.rb
 - samples/text/_text.rb
@@ -396,6 +399,7 @@ files:
 - lib/squib/args/csv_opts.rb
 - lib/squib/args/dir_validator.rb
 - lib/squib/args/draw.rb
+- lib/squib/args/drop_shadow.rb
 - lib/squib/args/embed_adjust.rb
 - lib/squib/args/embed_key.rb
 - lib/squib/args/hand_special.rb
@@ -517,6 +521,7 @@ files:
 - lib/squib/sprues/invalid_sprue_definition.rb
 - lib/squib/sprues/sprue.rb
 - lib/squib/sprues/sprue_schema.rb
+- lib/squib/system_fonts.rb
 - lib/squib/version.rb
 - samples/autoscale_font/_autoscale_font.rb
 - samples/backend/_backend.rb
@@ -551,6 +556,7 @@ files:
 - samples/saves/_save_pdf.rb
 - samples/saves/_saves.rb
 - samples/saves/_showcase.rb
+- samples/shadows/_shadow.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
 - samples/sprues/_advanced_sprues.rb
@@ -558,7 +564,9 @@ files:
 - samples/sprues/_fold_sheet.rb
 - samples/sprues/_hex_tiles.rb
 - samples/sprues/_mints.rb
+- samples/sprues/_negative_coords.rb
 - samples/sprues/_sprue_example.rb
+- samples/system_font_debug/_list_fonts.rb
 - samples/text/_embed_text.rb
 - samples/text/_text.rb
 - samples/text/_text_options.rb
@@ -583,13 +591,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - On Windows, you need the Ruby+DevKit. See https://rubyinstaller.org/downloads
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 2
 summary: A Ruby DSL for prototyping card games
 test_files:
@@ -626,6 +634,7 @@ test_files:
 - samples/saves/_save_pdf.rb
 - samples/saves/_saves.rb
 - samples/saves/_showcase.rb
+- samples/shadows/_shadow.rb
 - samples/shapes/_draw_shapes.rb
 - samples/shapes/_proofs.rb
 - samples/sprues/_advanced_sprues.rb
@@ -633,7 +642,9 @@ test_files:
 - samples/sprues/_fold_sheet.rb
 - samples/sprues/_hex_tiles.rb
 - samples/sprues/_mints.rb
+- samples/sprues/_negative_coords.rb
 - samples/sprues/_sprue_example.rb
+- samples/system_font_debug/_list_fonts.rb
 - samples/text/_embed_text.rb
 - samples/text/_text.rb
 - samples/text/_text_options.rb