squib 0.10.0 → 0.11.0

data/lib/squib/layouts/hand.yml

@@ -1,62 +1,62 @@
-# A layout designed for a card to be held in your hand.
-#   * Bonuses align along the left-hand side.
-#   * Title along the top.
-#   * Middle area for artwork,
-#   * Room for a text description
-#   * And some theme-based text (which I like call the "snark")
-# Along the lines of Race for the Galaxy or 7 Wonders
-# Based on TheGameCrafter.com's Poker Card, which is 825x1125
-# Sample usage is found in samples/layouts.rb
-title:
-  x: 275
-  y: 75
-  width: 475
-  height: 125
-art:
-  x: 275
-  y: 225
-  width: 475
-  height: 475
-description:
-  x: 275
-  y: 725
-  width: 475
-  height: 200
-snark:
-  x: 275
-  y: 950
-  width: 475
-  height: 100
-bonus1:
-  x: 75
-  y: 75
-  width:  175
-  height: 175
-bonus2:
-  extends: bonus1
-  y: += 198
-bonus3:
-  extends: bonus2
-  y: += 198
-bonus4:
-  extends: bonus3
-  y: += 198
-bonus5:
-  extends: bonus4
-  y: += 198
-
-# The "cut line", without rounded corners
-cut:
-  x: 37.5
-  y: 37.5
-  width: 750
-  height: 1050
-
-# The "safe zone" as defined by TheGameCrafter poker cards
-safe:
-  x: 75
-  y: 75
-  width: 675
-  height: 975
-  radius: 16
-  dash: 3 3
+# A layout designed for a card to be held in your hand.
+#   * Bonuses align along the left-hand side.
+#   * Title along the top.
+#   * Middle area for artwork,
+#   * Room for a text description
+#   * And some theme-based text (which I like call the "snark")
+# Along the lines of Race for the Galaxy or 7 Wonders
+# Based on TheGameCrafter.com's Poker Card, which is 825x1125
+# Sample usage is found in samples/layouts.rb
+title:
+  x: 275
+  y: 75
+  width: 475
+  height: 125
+art:
+  x: 275
+  y: 225
+  width: 475
+  height: 475
+description:
+  x: 275
+  y: 725
+  width: 475
+  height: 200
+snark:
+  x: 275
+  y: 950
+  width: 475
+  height: 100
+bonus1:
+  x: 75
+  y: 75
+  width:  175
+  height: 175
+bonus2:
+  extends: bonus1
+  y: += 198
+bonus3:
+  extends: bonus2
+  y: += 198
+bonus4:
+  extends: bonus3
+  y: += 198
+bonus5:
+  extends: bonus4
+  y: += 198
+
+# The "cut line", without rounded corners
+cut:
+  x: 37.5
+  y: 37.5
+  width: 750
+  height: 1050
+
+# The "safe zone" as defined by TheGameCrafter poker cards
+safe:
+  x: 75
+  y: 75
+  width: 675
+  height: 975
+  radius: 16
+  dash: 3 3

data/lib/squib/layouts/playing-card.yml

@@ -1,35 +1,35 @@
-# A basic playing card layout with bonuses in the upper-left and lower-right.
-# The lower-right angle is rotated for text.
-bonus_ul:
-  x: 75
-  y: 75
-  width: 200
-  height: 200
-bonus_lr:
-  extends: bonus_ul
-  x: 750
-  y: 1050
-  angle: 3.14159
-art:
-  x: 150
-  y: 275
-  width: 525
-  height: 575
-  valign: middle
-  align: center
-
-# The "cut line", without rounded corners
-cut:
-  x: 37.5
-  y: 37.5
-  width: 750
-  height: 1050
-
-# The "safe zone" as defined by TheGameCrafter poker cards
-safe:
-  x: 75
-  y: 75
-  width: 675
-  height: 975
-  radius: 16
-  dash: 3 3
+# A basic playing card layout with bonuses in the upper-left and lower-right.
+# The lower-right angle is rotated for text.
+bonus_ul:
+  x: 75
+  y: 75
+  width: 200
+  height: 200
+bonus_lr:
+  extends: bonus_ul
+  x: 750
+  y: 1050
+  angle: 3.14159
+art:
+  x: 150
+  y: 275
+  width: 525
+  height: 575
+  valign: middle
+  align: center
+
+# The "cut line", without rounded corners
+cut:
+  x: 37.5
+  y: 37.5
+  width: 750
+  height: 1050
+
+# The "safe zone" as defined by TheGameCrafter poker cards
+safe:
+  x: 75
+  y: 75
+  width: 675
+  height: 975
+  radius: 16
+  dash: 3 3

data/lib/squib/layouts/tuck_box.yml

@@ -1,46 +1,46 @@
-## Rectangles correspond to the "safe zones" as defined by TheGameCrafter for tuck boxes 2325x1950 pixels
-top_rect:
-  x: 313
-  y: 198
-  width: 688
-  height: 167
-
-bottom_rect:
-  x: 313
-  y: 1526
-  width: 688
-  height: 167
-
-right_rect:
-  x: 77
-  y: 466
-  width: 164
-  height: 988
-
-left_rect:
-  x: 1080
-  y: 466
-  width: 164
-  height: 988
-
-back_rect:
-  x: 313
-  y: 466
-  width: 688
-  height: 989
-
-front_rect:
-  x: 1322
-  y: 466
-  width: 688
-  height: 989
-
-front_curve:
-  x1: 1550
-  y1: 466
-  x2: 1765
-  y2: 466
-  cx1: 1575
-  cy1: 565
-  cx2: 1740
+## Rectangles correspond to the "safe zones" as defined by TheGameCrafter for tuck boxes 2325x1950 pixels
+top_rect:
+  x: 313
+  y: 198
+  width: 688
+  height: 167
+
+bottom_rect:
+  x: 313
+  y: 1526
+  width: 688
+  height: 167
+
+right_rect:
+  x: 77
+  y: 466
+  width: 164
+  height: 988
+
+left_rect:
+  x: 1080
+  y: 466
+  width: 164
+  height: 988
+
+back_rect:
+  x: 313
+  y: 466
+  width: 688
+  height: 989
+
+front_rect:
+  x: 1322
+  y: 466
+  width: 688
+  height: 989
+
+front_curve:
+  x1: 1550
+  y1: 466
+  x2: 1765
+  y2: 466
+  cx1: 1575
+  cy1: 565
+  cx2: 1740
   cy2: 565

data/lib/squib/version.rb

@@ -6,5 +6,5 @@ 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.10.0'
+  VERSION = '0.11.0'
 end

data/samples/custom-config.yml

@@ -1,5 +1,5 @@
-progress_bars: true
-text_hint: '#FF0000'
-custom_colors:
-  foo: '#ccc'
-img_dir: customconfig-imgdir
+progress_bars: true
+text_hint: '#FF0000'
+custom_colors:
+  foo: '#ccc'
+img_dir: customconfig-imgdir

data/samples/custom_config.rb

@@ -1,18 +1,18 @@
-require 'squib'
-
-Squib::Deck.new(config: 'custom-config.yml') do
-  # Custom color defined in our config
-  background color: :foo
-
-  # Hints can be turned on in the config file
-  text str: 'The Title', x: 0, y: 78, width: 825,
-       font: 'Arial 72', align: :center
-
-  # Progress bars are shown for these commands
-  # And images are taken from img_dir, not the cwd.
-  png file: 'shiny-purse2.png', x: 620, y: 75
-  svg file: 'spanner2.svg', x: 620, y: 218
-  save_png prefix: 'custom-config_'
-  save_pdf file: 'custom-config-out.pdf'
-
-end
+require 'squib'
+
+Squib::Deck.new(config: 'custom-config.yml') do
+  # Custom color defined in our config
+  background color: :foo
+
+  # Hints can be turned on in the config file
+  text str: 'The Title', x: 0, y: 78, width: 825,
+       font: 'Arial 72', align: :center
+
+  # Progress bars are shown for these commands
+  # And images are taken from img_dir, not the cwd.
+  png file: 'shiny-purse2.png', x: 620, y: 75
+  svg file: 'spanner2.svg', x: 620, y: 218
+  save_png prefix: 'custom-config_'
+  save_pdf file: 'custom-config-out.pdf'
+
+end

data/samples/embed_text.rb

@@ -8,10 +8,9 @@ Squib::Deck.new do
   text(str: embed_text, font: 'Sans 21',
        x: 0, y: 0, width: 180, hint: :red,
        align: :left, ellipsize: false, justify: false) do |embed|
-    # Notice how we use dx and dy to adjust the icon to not rest directly on the baseline
-    embed.svg key: ':tool:',   width: 28, height: 28, dx:  0, dy: 4, file: 'spanner.svg'
-    embed.svg key: ':health:', width: 28, height: 28, dx: -2, dy: 4, file: 'glass-heart.svg'
-    embed.png key: ':purse:',  width: 28, height: 28, dx:  0, dy: 4, file: 'shiny-purse.png'
+    embed.svg key: ':tool:',   width: 28, height: 28, file: 'spanner.svg'
+    embed.svg key: ':health:', width: 28, height: 28, file: 'glass-heart.svg'
+    embed.png key: ':purse:',  width: 28, height: 28, file: 'shiny-purse.png'
   end
 
   embed_text = 'Middle align: Take 1 :tool: and gain 2 :health:. Take 2 :tool: and gain 3 :purse:'
@@ -32,11 +31,11 @@ Squib::Deck.new do
     embed.png key: ':purse:',  width: 28, height: 28, file: 'shiny-purse.png'
   end
 
-  embed_text = 'Wrapping multiples: These are 1 :tool::tool::tool: and these are multiple :tool::tool: :tool::tool:'
-  text(str: embed_text, font: 'Sans 21',
-       x: 600, y: 0, width: 180, height: 300, valign: :middle,
+  embed_text = 'Yes, this wraps strangely. We are trying to determine the cause. These are 1 :tool::tool::tool: and these are multiple :tool::tool: :tool::tool:'
+  text(str: embed_text, font: 'Sans 18',
+       x: 600, y: 0, width: 180, height: 300, wrap: :word_char,
        align: :left, ellipsize: false, justify: false, hint: :cyan) do |embed|
-    embed.svg key: ':tool:',   width: 28, height: 28, file: 'spanner.svg'
+    embed.svg key: ':tool:', width: 28, height: 28, file: 'spanner.svg'
   end
 
   embed_text = ':tool:Justify will :tool: work too, and :purse: with more words just for fun'
@@ -87,13 +86,32 @@ Squib::Deck.new do
 
   embed_text = ":tool: Death to Nemesis bug 103!! :purse:"
   text(str: embed_text, font: 'Sans Bold 24', stroke_width: 2,
-       color: :red, stroke_color: :blue, dash: '3 3', align: :center,
+       color: :red, stroke_color: :blue, dash: '3 3', align: :left,
        valign: :middle, x: 0, y: 700, width: 380, height: 150,
        hint: :magenta) do |embed|
     embed.svg key: ':tool:', file: 'spanner.svg', width: 32, height: 32
     embed.png key: ':purse:', file: 'shiny-purse.png', width: 32, height: 32
   end
 
+  embed_text = 'You can adjust the icon with dx and dy. Normal: :tool: Adjusted: :heart:'
+  text(str: embed_text, font: 'Sans 18', x: 400, y: 640, width: 180,
+       height: 300, hint: :magenta) do |embed|
+    embed.svg key: ':tool:', width: 28, height: 28, file: 'spanner.svg'
+    embed.svg key: ':heart:', width: 28, height: 28, dx: 10, dy: 10,
+              file: 'glass-heart.svg'
+  end
+
+  embed_text = "Native sizes work too\n:tool:\n\n\n\n\n\n:shiny-purse:\n\n\n\n\n\n:tool2:"
+  text(str: embed_text, font: 'Sans 18', x: 600, y: 640, width: 180,
+       height: 475, hint: :magenta) do |embed|
+    embed.svg key: ':tool:', width: :native, height: :native,
+              file: 'spanner.svg'
+    embed.svg key: ':tool2:', width: :native, height: :native,
+              data: File.open('spanner.svg','r').read
+    embed.png key: ':shiny-purse:', width: :native, height: :native,
+              file: 'shiny-purse.png'
+  end
+
   save_png prefix: 'embed_'
 end
 

data/samples/layouts/_output/.gitignore

@@ -0,0 +1,2 @@
+# Ignore outputs in directory, but keep the directory to suppress warning
+*.png

data/samples/{layouts_builtin.rb → layouts/builtin_layouts.rb}

@@ -1,51 +1,74 @@
-require 'squib'
-
-# This sample demonstrates the built-in layouts for Squib.
-# Each card demonstrates a different built-in layout.
-Squib::Deck.new(layout: 'fantasy.yml') do
-  background color: 'white'
-
-  set font: 'Times New Roman,Serif 32'
-  hint text: '#333' # show extents of text boxes to demo the layout
-
-  text str: 'fantasy.yml', layout: :title
-  text str: 'ur',          layout: :upper_right
-  text str: 'art',         layout: :art
-  text str: 'type',        layout: :type
-  text str: 'tr',          layout: :type_right
-  text str: 'description', layout: :description
-  text str: 'lr',          layout: :lower_right
-  text str: 'll',          layout: :lower_left
-  text str: 'credits',     layout: :copy
-
-  rect layout: :safe
-  rect layout: :cut
-  save_png prefix: 'layouts_builtin_fantasy_'
-end
-
-Squib::Deck.new(layout: 'economy.yml') do
-  background color: 'white'
-
-  set font: 'Times New Roman,Serif 32'
-  hint text: '#333' # show extents of text boxes to demo the layout
-
-  text str: 'economy.yml', layout: :title
-  text str: 'art',         layout: :art
-  text str: 'description', layout: :description
-  text str: 'type',        layout: :type
-  text str: 'lr',          layout: :lower_right
-  text str: 'll',          layout: :lower_left
-  text str: 'credits',     layout: :copy
-
-  rect layout: :safe
-  rect layout: :cut
-  save_png prefix: 'layouts_builtin_economy_'
-end
-
-# Stitch together a deck of all the above examples
-Squib::Deck.new(cards: 2) do
-  Dir.glob('_output/layouts_builtin_*.png').each.with_index do |file, i|
-    png file: file, range: i
-  end
-  save_sheet prefix: 'layouts_builtinsheet_'
-end
+require 'squib'
+
+# This sample demonstrates the built-in layouts for Squib.
+# Each card demonstrates a different built-in layout.
+Squib::Deck.new(layout: 'fantasy.yml') do
+  background color: 'white'
+
+  set font: 'Times New Roman,Serif 32'
+  hint text: '#333' # show extents of text boxes to demo the layout
+
+  text str: 'fantasy.yml', layout: :title
+  text str: 'ur',          layout: :upper_right
+  text str: 'art',         layout: :art
+  text str: 'type',        layout: :type
+  text str: 'tr',          layout: :type_right
+  text str: 'description', layout: :description
+  text str: 'lr',          layout: :lower_right
+  text str: 'll',          layout: :lower_left
+  text str: 'credits',     layout: :copy
+
+  rect layout: :safe
+  rect layout: :cut
+  save_png prefix: 'layouts_builtin_fantasy_'
+end
+
+Squib::Deck.new(layout: 'economy.yml') do
+  background color: 'white'
+
+  set font: 'Times New Roman,Serif 32'
+  hint text: '#333' # show extents of text boxes to demo the layout
+
+  text str: 'economy.yml', layout: :title
+  text str: 'art',         layout: :art
+  text str: 'description', layout: :description
+  text str: 'type',        layout: :type
+  text str: 'lr',          layout: :lower_right
+  text str: 'll',          layout: :lower_left
+  text str: 'credits',     layout: :copy
+
+  rect layout: :safe
+  rect layout: :cut
+  save_png prefix: 'layouts_builtin_economy_'
+end
+
+Squib::Deck.new(layout: 'hand.yml') do
+  background color: 'white'
+  %w(title bonus1 bonus2 bonus3 bonus4 bonus5 description
+     snark art).each do |icon|
+    text str: icon.capitalize, layout: icon,
+         hint: :red, valign: 'middle', align: 'center'
+  end
+  save_png prefix: 'layouts_builtin_hand_'
+end
+
+Squib::Deck.new(layout: 'playing-card.yml') do
+  background color: 'white'
+  text str: "A\u2660", layout: :bonus_ul, font: 'Sans bold 100', hint: :red
+  text str: "A\u2660", layout: :bonus_lr, font: 'Sans bold 100', hint: :red
+  text str: 'artwork here', layout: :art, hint: :red
+  save_png prefix: 'layouts_builtin_playing_card_'
+end
+
+Squib::Deck.new(layout: 'tuck_box.yml', width: 2325, height: 1950) do
+  background color: 'white'
+  rect layout: :top_rect
+  rect layout: :bottom_rect
+  rect layout: :right_rect
+  rect layout: :left_rect
+  rect layout: :back_rect
+  rect layout: :front_rect
+  curve layout: :front_curve
+
+  save_png prefix: 'layouts_builtin_tuck_box_'
+end