diff --git a/samples/text_options.rb b/samples/text_options.rb index 4409e74..62413b1 100644 --- a/samples/text_options.rb +++ b/samples/text_options.rb @@ -23,12 +23,12 @@ Squib::Deck.new(width: 825, height: 1125, cards: 3) do text str: 'Font string sizes can be overridden per card.', x: 65, y: 350, font: 'Impact 36', font_size: [16, 20, 24] - text str: 'This text has fixed width, fixed height, center-aligned, middle-valigned, has a red hint, and "smart quotes"', + text str: 'This text has fixed width, fixed height, center-aligned, middle-valigned, and has a red hint', hint: :red, x: 65, y: 400, width: 300, height: 125, align: :center, valign: 'MIDDLE', # these can be specified with case-insenstive strings too - font: 'Serif 16', quotes: [:smart,:smart, :dumb] + font: 'Serif 16' extents = text str: 'Ink extent return value', x: 65, y: 550, @@ -93,6 +93,5 @@ Squib::Deck.new(width: 825, height: 1125, cards: 3) do valign: :bottom, font: 'Serif 18', hint: :cyan - save prefix: 'text_', format: :png end diff --git a/spec/data/samples/text_options.rb.txt b/spec/data/samples/text_options.rb.txt index df7b8c8..9d2c8a1 100644 --- a/spec/data/samples/text_options.rb.txt +++ b/spec/data/samples/text_options.rb.txt @@ -343,7 +343,7 @@ cairo: translate([65, 400]) cairo: rotate([0]) cairo: move_to([0, 0]) pango: font_description=([MockDouble]) -pango: text=(["This text has fixed width, fixed height, center-aligned, middle-valigned, has a red hint, and \"smart quotes\""]) +pango: text=(["This text has fixed width, fixed height, center-aligned, middle-valigned, and has a red hint"]) pango: width=([307200]) pango: height=([128000]) pango: wrap=([#]) @@ -366,7 +366,7 @@ cairo: translate([65, 400]) cairo: rotate([0]) cairo: move_to([0, 0]) pango: font_description=([MockDouble]) -pango: text=(["This text has fixed width, fixed height, center-aligned, middle-valigned, has a red hint, and \"smart quotes\""]) +pango: text=(["This text has fixed width, fixed height, center-aligned, middle-valigned, and has a red hint"]) pango: width=([307200]) pango: height=([128000]) pango: wrap=([#]) @@ -389,7 +389,7 @@ cairo: translate([65, 400]) cairo: rotate([0]) cairo: move_to([0, 0]) pango: font_description=([MockDouble]) -pango: text=(["This text has fixed width, fixed height, center-aligned, middle-valigned, has a red hint, and \"smart quotes\""]) +pango: text=(["This text has fixed width, fixed height, center-aligned, middle-valigned, and has a red hint"]) pango: width=([307200]) pango: height=([128000]) pango: wrap=([#]) diff --git a/spec/samples/expected/embed_multi_00.png b/spec/samples/expected/embed_multi_00.png deleted file mode 100644 index e45cc9d..0000000 Binary files a/spec/samples/expected/embed_multi_00.png and /dev/null differ diff --git a/spec/samples/expected/embed_multi_01.png b/spec/samples/expected/embed_multi_01.png deleted file mode 100644 index b902b92..0000000 Binary files a/spec/samples/expected/embed_multi_01.png and /dev/null differ diff --git a/spec/samples/expected/embed_multi_02.png b/spec/samples/expected/embed_multi_02.png deleted file mode 100644 index c878f65..0000000 Binary files a/spec/samples/expected/embed_multi_02.png and /dev/null differ diff --git a/spec/samples/expected/text_00.png b/spec/samples/expected/text_00.png index 9dbc35e..6ddb485 100644 Binary files a/spec/samples/expected/text_00.png and b/spec/samples/expected/text_00.png differ diff --git a/spec/samples/expected/text_01.png b/spec/samples/expected/text_01.png index 1b51d09..14535a7 100644 Binary files a/spec/samples/expected/text_01.png and b/spec/samples/expected/text_01.png differ diff --git a/spec/samples/expected/text_02.png b/spec/samples/expected/text_02.png index 5d5faf5..b18d859 100644 Binary files a/spec/samples/expected/text_02.png and b/spec/samples/expected/text_02.png differ diff --git a/spec/samples/samples_regression_spec.rb b/spec/samples/samples_regression_spec.rb index 85d59ff..e21fee5 100644 --- a/spec/samples/samples_regression_spec.rb +++ b/spec/samples/samples_regression_spec.rb @@ -73,10 +73,10 @@ describe "Squib samples" do log = StringIO.new mock_cairo(log) load sample - overwrite_sample(sample, log) # Use TEMPORARILY once happy with the new sample log + # overwrite_sample(sample, log) # Use TEMPORARILY once happy with the new sample log test_file_str = File.open(sample_regression_file(sample), 'r:UTF-8').read expect(log.string).to eq(test_file_str) end end -end \ No newline at end of file +end