diff --git a/lib/squib/card.rb b/lib/squib/card.rb index 60478e1..18a1bc6 100644 --- a/lib/squib/card.rb +++ b/lib/squib/card.rb @@ -25,7 +25,7 @@ module Squib @svgfile = "#{deck.dir}/#{deck.prefix}#{deck.count_format % index}.svg" @cairo_surface = make_surface(@svgfile, backend) @cairo_context = Squib::Graphics::CairoContextWrapper.new(Cairo::Context.new(@cairo_surface)) - @cairo_context.antialias = @deck.antialias + @cairo_context.antialias = ANTIALIAS_OPTS[(@deck.antialias.downcase)] || 'subpixel' end def make_surface(svgfile, backend) diff --git a/lib/squib/constants.rb b/lib/squib/constants.rb index 8b1ad10..35c0a07 100644 --- a/lib/squib/constants.rb +++ b/lib/squib/constants.rb @@ -74,6 +74,12 @@ module Squib 'progress_bar' => false, } + #Translate the hints to the methods. + ANTIALIAS_OPTS = { + 'best' => 'subpixel', + 'good' => 'gray', + 'fast' => 'gray', + } # These are parameters that are intended to be "expanded" across # range if they are singletons. # diff --git a/spec/data/samples/autoscale_font.rb.txt b/spec/data/samples/autoscale_font.rb.txt index c1637e3..1f69077 100644 --- a/spec/data/samples/autoscale_font.rb.txt +++ b/spec/data/samples/autoscale_font.rb.txt @@ -1,6 +1,6 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:white]) cairo: paint([]) diff --git a/spec/data/samples/basic.rb.txt b/spec/data/samples/basic.rb.txt index 8c0d01b..696ff9f 100644 --- a/spec/data/samples/basic.rb.txt +++ b/spec/data/samples/basic.rb.txt @@ -1,6 +1,6 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:white]) cairo: paint([]) diff --git a/spec/data/samples/cairo_access.rb.txt b/spec/data/samples/cairo_access.rb.txt index f4d1ae1..81eaf6d 100644 --- a/spec/data/samples/cairo_access.rb.txt +++ b/spec/data/samples/cairo_access.rb.txt @@ -1,5 +1,5 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:white]) cairo: paint([]) diff --git a/spec/data/samples/csv_import.rb.txt b/spec/data/samples/csv_import.rb.txt index 49560d5..a340642 100644 --- a/spec/data/samples/csv_import.rb.txt +++ b/spec/data/samples/csv_import.rb.txt @@ -1,5 +1,5 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:white]) cairo: paint([]) diff --git a/spec/data/samples/custom_config.rb.txt b/spec/data/samples/custom_config.rb.txt index f1cf298..bee0d70 100644 --- a/spec/data/samples/custom_config.rb.txt +++ b/spec/data/samples/custom_config.rb.txt @@ -1,4 +1,4 @@ -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color(["#ccc"]) cairo: paint([]) diff --git a/spec/data/samples/draw_shapes.rb.txt b/spec/data/samples/draw_shapes.rb.txt index c036206..ccaa1c3 100644 --- a/spec/data/samples/draw_shapes.rb.txt +++ b/spec/data/samples/draw_shapes.rb.txt @@ -1,4 +1,4 @@ -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: rounded_rectangle([300, 300, 400, 400, 0, 0]) cairo: set_source_color([:red]) diff --git a/spec/data/samples/excel.rb.txt b/spec/data/samples/excel.rb.txt index be26316..6a0a34c 100644 --- a/spec/data/samples/excel.rb.txt +++ b/spec/data/samples/excel.rb.txt @@ -1,6 +1,6 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:white]) cairo: paint([]) diff --git a/spec/data/samples/gradients.rb.txt b/spec/data/samples/gradients.rb.txt index 1b45ff3..628b254 100644 --- a/spec/data/samples/gradients.rb.txt +++ b/spec/data/samples/gradients.rb.txt @@ -1,4 +1,4 @@ -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source([LinearPattern]) cairo: paint([]) diff --git a/spec/data/samples/hello_world.rb.txt b/spec/data/samples/hello_world.rb.txt index fb05142..1045dad 100644 --- a/spec/data/samples/hello_world.rb.txt +++ b/spec/data/samples/hello_world.rb.txt @@ -1,5 +1,5 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:black]) cairo: translate([0, 0]) diff --git a/spec/data/samples/load_images.rb.txt b/spec/data/samples/load_images.rb.txt index 7302a6b..6e64b5e 100644 --- a/spec/data/samples/load_images.rb.txt +++ b/spec/data/samples/load_images.rb.txt @@ -1,4 +1,4 @@ -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color(["#0b7c8e"]) cairo: paint([]) diff --git a/spec/data/samples/portrait-landscape.rb.txt b/spec/data/samples/portrait-landscape.rb.txt index 1c30cdf..ce3eef0 100644 --- a/spec/data/samples/portrait-landscape.rb.txt +++ b/spec/data/samples/portrait-landscape.rb.txt @@ -1,4 +1,4 @@ -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color(["#aaa"]) cairo: paint([]) @@ -21,7 +21,7 @@ cairo: update_pango_layout([MockDouble]) cairo: show_pango_layout([MockDouble]) cairo: restore([]) surface: write_to_png(["_output/portrait_00.png"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color(["#aaa"]) cairo: paint([]) diff --git a/spec/data/samples/ranges.rb.txt b/spec/data/samples/ranges.rb.txt index 3ad9ee2..653d5f4 100644 --- a/spec/data/samples/ranges.rb.txt +++ b/spec/data/samples/ranges.rb.txt @@ -1,6 +1,6 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:white]) cairo: paint([]) diff --git a/spec/data/samples/saves.rb.txt b/spec/data/samples/saves.rb.txt index be85d73..a936279 100644 --- a/spec/data/samples/saves.rb.txt +++ b/spec/data/samples/saves.rb.txt @@ -1,19 +1,19 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:gray]) cairo: paint([]) diff --git a/spec/data/samples/showcase.rb.txt b/spec/data/samples/showcase.rb.txt index e5a2d28..61e06d6 100644 --- a/spec/data/samples/showcase.rb.txt +++ b/spec/data/samples/showcase.rb.txt @@ -1,7 +1,7 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color(["#CE534D"]) cairo: paint([]) diff --git a/spec/data/samples/text_options.rb.txt b/spec/data/samples/text_options.rb.txt index 44614d3..b1ef916 100644 --- a/spec/data/samples/text_options.rb.txt +++ b/spec/data/samples/text_options.rb.txt @@ -1,6 +1,6 @@ -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:white]) cairo: paint([]) diff --git a/spec/data/samples/tgc_proofs.rb.txt b/spec/data/samples/tgc_proofs.rb.txt index 9fe175b..68b5785 100644 --- a/spec/data/samples/tgc_proofs.rb.txt +++ b/spec/data/samples/tgc_proofs.rb.txt @@ -1,4 +1,4 @@ -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color([:white]) cairo: paint([]) diff --git a/spec/data/samples/units.rb.txt b/spec/data/samples/units.rb.txt index 983345d..dafde71 100644 --- a/spec/data/samples/units.rb.txt +++ b/spec/data/samples/units.rb.txt @@ -1,4 +1,4 @@ -cairo: antialias=(["best"]) +cairo: antialias=(["subpixel"]) cairo: save([]) cairo: set_source_color(["#ddd"]) cairo: paint([]) diff --git a/spec/graphics/graphics_images_spec.rb b/spec/graphics/graphics_images_spec.rb index 4677b0b..4769ae0 100644 --- a/spec/graphics/graphics_images_spec.rb +++ b/spec/graphics/graphics_images_spec.rb @@ -21,7 +21,7 @@ describe Squib::Card do context '#png' do it 'makes all the expected calls on a smoke test' do - expect(@context).to receive(:antialias=).with('best') + expect(@context).to receive(:antialias=).with('subpixel') expect(@context).to receive(:save).once expect(@context).to receive(:translate).with(-37, -38).once expect(@context).to receive(:rotate).with(0.0).once @@ -48,7 +48,7 @@ describe Squib::Card do it 'makes all the expected calls on a smoke test' do expect(@svg).to receive(:width).and_return(100).twice expect(@svg).to receive(:height).and_return(100).twice - expect(@context).to receive(:antialias=).with('best').once + expect(@context).to receive(:antialias=).with('subpixel').once expect(@context).to receive(:save).once expect(@context).to receive(:rotate).with(0.0).once expect(@context).to receive(:translate).with(37, 38).once diff --git a/spec/graphics/graphics_shapes_spec.rb b/spec/graphics/graphics_shapes_spec.rb index 1f8dba8..b7037d0 100644 --- a/spec/graphics/graphics_shapes_spec.rb +++ b/spec/graphics/graphics_shapes_spec.rb @@ -23,7 +23,7 @@ describe Squib::Card do context 'rect' do it 'make all the expected calls on a smoke test' do - expect(@context).to receive(:antialias=).with('best') + expect(@context).to receive(:antialias=).with('subpixel') expect(@context).to receive(:save).once expect(@context).to receive(:rounded_rectangle).with(37, 38, 50, 100, 10, 15).twice expect_stroke('#fff', '#f00', 2.0) @@ -38,7 +38,7 @@ describe Squib::Card do context 'circle' do it 'make all the expected calls on a smoke test' do - expect(@context).to receive(:antialias=).with('best') + expect(@context).to receive(:antialias=).with('subpixel') expect(@context).to receive(:save).once expect(@context).to receive(:move_to).with(137, 38) expect(@context).to receive(:circle).with(37, 38, 100).twice @@ -54,7 +54,7 @@ describe Squib::Card do context 'triangle' do it 'make all the expected calls on a smoke test' do - expect(@context).to receive(:antialias=).with('best') + expect(@context).to receive(:antialias=).with('subpixel') expect(@context).to receive(:save).once expect(@context).to receive(:triangle).with(1, 2, 3, 4, 5, 6).twice expect_stroke('#fff', '#f00', 2.0) @@ -67,7 +67,7 @@ describe Squib::Card do context 'line' do it 'make all the expected calls on a smoke test' do - expect(@context).to receive(:antialias=).with('best') + expect(@context).to receive(:antialias=).with('subpixel') expect(@context).to receive(:save).once expect(@context).to receive(:move_to).with(1, 2).once expect(@context).to receive(:line_to).with(3, 4).once diff --git a/spec/graphics/graphics_text_spec.rb b/spec/graphics/graphics_text_spec.rb index 3630051..7288528 100644 --- a/spec/graphics/graphics_text_spec.rb +++ b/spec/graphics/graphics_text_spec.rb @@ -20,7 +20,7 @@ describe Squib::Card, '#text' do it 'make all the expected calls on a smoke test' do extent = Pango::Rectangle.new(50,60,100,200) expect(Squib.logger).to receive(:debug).once - expect(context).to receive(:antialias=).with('best').once + expect(context).to receive(:antialias=).with('subpixel').once expect(context).to receive(:save).once expect(context).to receive(:set_source_color).once expect(context).to receive(:move_to).with(10, 15).once