From 874bdba8bc4cf0cb051e5e4e956e711892692d3e Mon Sep 17 00:00:00 2001
From: Andy Meneely <andy@se.rit.edu>
Date: Sat, 4 Apr 2015 09:33:04 -0400
Subject: [PATCH] Fix a string replacement issue.

Contributes to #30
---
 lib/squib/graphics/text.rb |  7 +++----
 samples/embed_text.rb      | 31 ++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib/squib/graphics/text.rb b/lib/squib/graphics/text.rb
index ad17679..78b6964 100644
--- a/lib/squib/graphics/text.rb
+++ b/lib/squib/graphics/text.rb
@@ -113,18 +113,17 @@ module Squib
       return [] unless embed.rules.any?
       layout.markup   = str
       clean_str       = layout.text
-      draw_calls = []
-      searches = []
+      draw_calls      = []
+      searches        = []
       while (key = next_embed(embed.rules.keys, clean_str)) != nil
         rule          = embed.rules[key]
         spacing       = rule[:width] * Pango::SCALE
         index         = clean_str.index(key)
-        str.sub!(key, "<span size=\"#{ZERO_WIDTH_CHAR_SIZE}\">a<span letter_spacing=\"#{spacing.to_i}\">a</span>a</span>")
+        str = str.sub(key, "<span size=\"#{ZERO_WIDTH_CHAR_SIZE}\">a<span letter_spacing=\"#{spacing.to_i}\">a</span>a</span>")
         layout.markup = str
         clean_str     = layout.text
         searches << { index: index, rule: rule }
       end
-      # byebug
       searches.each do |search|
         rect          = layout.index_to_pos(search[:index])
         x             = Pango.pixels(rect.x) + search[:rule][:dx]
diff --git a/samples/embed_text.rb b/samples/embed_text.rb
index d548ae7..44d9581 100644
--- a/samples/embed_text.rb
+++ b/samples/embed_text.rb
@@ -14,14 +14,14 @@ Squib::Deck.new do
   #   embed.png key: ':purse:',  width: 28, height: 28, dx:  0, dy: 4, file: 'shiny-purse.png'
   # end
 
-  embed_text = 'Middle align: Take 1 :tool: and gain 2 :health:. Take 2 :tool: and gain 3 :purse:'
-  text(str: embed_text, font: 'Sans 21',
-       x: 200, y: 0, width: 180, height: 300, valign: :middle,
-       align: :left, ellipsize: false, justify: false, hint: :cyan) do |embed|
-    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:'
+  # text(str: embed_text, font: 'Sans 21',
+  #      x: 200, y: 0, width: 180, height: 300, valign: :middle,
+  #      align: :left, ellipsize: false, justify: false, hint: :cyan) do |embed|
+  #   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 = 'This :tool: aligns on the bottom properly. :purse:'
   # text(str: embed_text, font: 'Sans 21',
@@ -66,5 +66,18 @@ Squib::Deck.new do
   #   embed.png key: ':purse:',  width: 28, height: 28, file: 'shiny-purse.png'
   # end
 
-  save_png prefix: 'embed_'
+  # save_png prefix: 'embed_'
+end
+
+Squib::Deck.new(cards: 3) do
+
+  embed_text = 'Take 1 :tool: and gain 2 :health:.'
+  text(str: embed_text, font: 'Sans', font_size: [18, 25, 32],
+       x: 0, y: 0, width: 180, height: 300, valign: :bottom,
+       align: :left, ellipsize: false, justify: false, hint: :cyan) do |embed|
+    embed.svg key: ':tool:',   width: 28, height: 28, file: 'spanner.svg'
+    embed.svg key: ':health:', width: 28, height: 28, file: 'glass-heart.svg'
+  end
+  save_png prefix: 'embed_multi_'
+  # save_sheet prefix: 'embed_multisheet_', columns: 4
 end
\ No newline at end of file