From 3d1f1ff989a6bffb63a15ac227f40fde5117a696 Mon Sep 17 00:00:00 2001 From: Andy Meneely Date: Tue, 31 Jul 2018 13:54:14 -0400 Subject: [PATCH] Fix extra page for PDF sprues Fixes #246 --- CHANGELOG.md | 1 + lib/squib/graphics/save_sprue.rb | 9 ++++----- samples/sprues/_hex_tiles.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5f140cc..8f67e41e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Squib follows [semantic versioning](http://semver.org). Bugs: * Fixed bug on circle and other shapes that had an extra stroke from a previous text call (#248) +* Fixed extra page on all sprue saves (#246) Chores: * Bumped deps: Pango et al. to 3.2.7, Cairo to 1.15.13. diff --git a/lib/squib/graphics/save_sprue.rb b/lib/squib/graphics/save_sprue.rb index 8135fab7..b946569a 100644 --- a/lib/squib/graphics/save_sprue.rb +++ b/lib/squib/graphics/save_sprue.rb @@ -29,16 +29,15 @@ def render_sheet(range) card = @deck.cards[i] slot = slots[i % per_sheet] - draw_card cc, card, - slot['x'], slot['y'], - slot['rotate'], + draw_card cc, card, + slot['x'], slot['y'], + slot['rotate'], @sheet_args.trim, @sheet_args.trim_radius bar.increment end draw_overlay_above_cards cc - cc = draw_page cc cc.target.finish end end @@ -61,7 +60,7 @@ def full_filename private def next_page_if_needed(cc, i, per_sheet) - return cc unless (i != 0) && (i % per_sheet).zero? + return cc unless (i != 0) && (i % per_sheet) == 0 draw_overlay_above_cards cc cc = draw_page cc diff --git a/samples/sprues/_hex_tiles.rb b/samples/sprues/_hex_tiles.rb index 33fb632f..d36c2b68 100644 --- a/samples/sprues/_hex_tiles.rb +++ b/samples/sprues/_hex_tiles.rb @@ -7,7 +7,7 @@ ) text( str: %w[One Two Three Four Five Six Seven Eight Nine], - x: '27mm', y: '35mm', width: '11.8mm', height: '6mm', + x: '22mm', y: '35mm', width: '21.8mm', height: '6mm', align: :center, valign: :middle ) save_pdf file: 'hex_tiles.pdf',