diff --git a/CHANGELOG.md b/CHANGELOG.md index e237750..7bd6047 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ Docs: Chores: * Bumped deps: Pango et al. to 3.3.6, Cairo to 1.16.4, Nokogiri to 1.10.3 +Compatibility: +* A LOT more pre-defined colors built into Cairo. Some of the named colors got redefined with the upgrade to the latest Cairo. This means that named colors like `:gray` and `:green` may look slightly different. + Special thanks to @lcarlsen ## v0.14.2 / 2018-08-01 diff --git a/samples/backend/backend_00_expected.png b/samples/backend/backend_00_expected.png index 941a552..4e3bef0 100644 Binary files a/samples/backend/backend_00_expected.png and b/samples/backend/backend_00_expected.png differ diff --git a/samples/backend/backend_01.png b/samples/backend/backend_01.png new file mode 100644 index 0000000..4e3bef0 Binary files /dev/null and b/samples/backend/backend_01.png differ diff --git a/samples/backend/backend_01_expected.png b/samples/backend/backend_01_expected.png deleted file mode 100644 index 941a552..0000000 Binary files a/samples/backend/backend_01_expected.png and /dev/null differ diff --git a/samples/backend/backend_vectors_00_expected.svg b/samples/backend/backend_vectors_00_expected.svg index e9ae072..63d0342 100644 --- a/samples/backend/backend_vectors_00_expected.svg +++ b/samples/backend/backend_vectors_00_expected.svg @@ -39,18 +39,18 @@ - + - + - - + + @@ -78,7 +78,7 @@ - + diff --git a/samples/backend/backend_vectors_01_expected.svg b/samples/backend/backend_vectors_01_expected.svg index ade1d4a..90e73a9 100644 --- a/samples/backend/backend_vectors_01_expected.svg +++ b/samples/backend/backend_vectors_01_expected.svg @@ -39,18 +39,18 @@ - + - + - - + + @@ -78,7 +78,7 @@ - + diff --git a/samples/backend/showcase_expected.png b/samples/backend/showcase_expected.png index ef1a32b..369c536 100644 Binary files a/samples/backend/showcase_expected.png and b/samples/backend/showcase_expected.png differ diff --git a/samples/colors/_colors.rb b/samples/colors/_colors.rb index f3d25ae..76da0b0 100644 --- a/samples/colors/_colors.rb +++ b/samples/colors/_colors.rb @@ -19,17 +19,23 @@ Squib::Deck.new(width: 825, height: 1125, cards: 1) do end # This script generates a table of the built-in constants -Squib::Deck.new(width: 3000, height: 1500) do +colors = (Cairo::Color.constants - %i(HEX_RE Base RGB CMYK HSV X11)) +colors.sort_by! do |c| + hsv = Cairo::Color.parse(c).to_hsv + [(hsv.hue / 16.0).to_i, hsv.value, hsv.saturation] +end +w, h = 300, 50 +deck_height = 4000 +deck_width = (colors.size / ((deck_height / h) + 1)) * w +Squib::Deck.new(width: deck_width, height: deck_height) do background color: :white - colors = (Cairo::Color.constants - %i(HEX_RE Base RGB CMYK HSV X11)) - colors.sort_by! {|c| Cairo::Color.parse(c).to_s} - x, y, w, h = 0, 0, 300, 50 + x, y = 0, 0 colors.each_with_index do |color, i| rect x: x, y: y, width: w, height: h, fill_color: color text str: color.to_s, x: x + 5, y: y + 13, font: 'Sans Bold 5', color: (Cairo::Color.parse(color).to_hsv.v > 0.9) ? '#000' : '#fff' y += h - if y > @height + if y > deck_height x += w y = 0 end diff --git a/samples/colors/color_constants_00_expected.png b/samples/colors/color_constants_00_expected.png index c496462..a72a478 100644 Binary files a/samples/colors/color_constants_00_expected.png and b/samples/colors/color_constants_00_expected.png differ diff --git a/samples/ranges/ranges_00_expected.png b/samples/ranges/ranges_00_expected.png index 5b44873..e42442b 100644 Binary files a/samples/ranges/ranges_00_expected.png and b/samples/ranges/ranges_00_expected.png differ diff --git a/samples/saves/save_png_00_expected.png b/samples/saves/save_png_00_expected.png index 65b67b9..5207cf6 100644 Binary files a/samples/saves/save_png_00_expected.png and b/samples/saves/save_png_00_expected.png differ diff --git a/samples/saves/save_png_no_scaled_00_expected.png b/samples/saves/save_png_no_scaled_00_expected.png new file mode 100644 index 0000000..1db0e58 Binary files /dev/null and b/samples/saves/save_png_no_scaled_00_expected.png differ diff --git a/samples/saves/save_png_no_scaled_trimmed_00_expected.png b/samples/saves/save_png_no_scaled_trimmed_00_expected.png new file mode 100644 index 0000000..a4d459f Binary files /dev/null and b/samples/saves/save_png_no_scaled_trimmed_00_expected.png differ diff --git a/samples/saves/save_png_scaled2_00_expected.png b/samples/saves/save_png_scaled2_00_expected.png new file mode 100644 index 0000000..2a60999 Binary files /dev/null and b/samples/saves/save_png_scaled2_00_expected.png differ diff --git a/samples/saves/save_png_scaled_00_expected.png b/samples/saves/save_png_scaled_00_expected.png new file mode 100644 index 0000000..3c4dadb Binary files /dev/null and b/samples/saves/save_png_scaled_00_expected.png differ diff --git a/samples/saves/save_png_scaled_trimmed_00_expected.png b/samples/saves/save_png_scaled_trimmed_00_expected.png new file mode 100644 index 0000000..b97b4a6 Binary files /dev/null and b/samples/saves/save_png_scaled_trimmed_00_expected.png differ diff --git a/samples/saves/save_png_trimmed_00_expected.png b/samples/saves/save_png_trimmed_00_expected.png index f2a2722..32cd34c 100644 Binary files a/samples/saves/save_png_trimmed_00_expected.png and b/samples/saves/save_png_trimmed_00_expected.png differ diff --git a/samples/saves/save_sheet_00_expected.png b/samples/saves/save_sheet_00_expected.png index fc3599f..8b9a87a 100644 Binary files a/samples/saves/save_sheet_00_expected.png and b/samples/saves/save_sheet_00_expected.png differ diff --git a/samples/saves/save_sheet_01_expected.png b/samples/saves/save_sheet_01_expected.png index 1b8bd68..3f5ac0d 100644 Binary files a/samples/saves/save_sheet_01_expected.png and b/samples/saves/save_sheet_01_expected.png differ diff --git a/samples/saves/save_sheet_02_expected.png b/samples/saves/save_sheet_02_expected.png new file mode 100644 index 0000000..b57734c Binary files /dev/null and b/samples/saves/save_sheet_02_expected.png differ diff --git a/samples/saves/save_sheet_range_00_expected.png b/samples/saves/save_sheet_range_00_expected.png index b2b0733..f2f935f 100644 Binary files a/samples/saves/save_sheet_range_00_expected.png and b/samples/saves/save_sheet_range_00_expected.png differ diff --git a/samples/saves/save_sheet_range_01_expected.png b/samples/saves/save_sheet_range_01_expected.png index 93094b5..99f8a19 100644 Binary files a/samples/saves/save_sheet_range_01_expected.png and b/samples/saves/save_sheet_range_01_expected.png differ diff --git a/samples/saves/save_sheet_rtl_00_expected.png b/samples/saves/save_sheet_rtl_00_expected.png index 5967bff..f403fa0 100644 Binary files a/samples/saves/save_sheet_rtl_00_expected.png and b/samples/saves/save_sheet_rtl_00_expected.png differ diff --git a/samples/saves/save_sheet_rtl_01_expected.png b/samples/saves/save_sheet_rtl_01_expected.png new file mode 100644 index 0000000..8bce0de Binary files /dev/null and b/samples/saves/save_sheet_rtl_01_expected.png differ diff --git a/samples/saves/save_single_sheet_00_expected.png b/samples/saves/save_single_sheet_00_expected.png index 27fa64c..97791c5 100644 Binary files a/samples/saves/save_single_sheet_00_expected.png and b/samples/saves/save_single_sheet_00_expected.png differ diff --git a/samples/saves/save_single_sheet_01_expected.png b/samples/saves/save_single_sheet_01_expected.png new file mode 100644 index 0000000..9db2f8f Binary files /dev/null and b/samples/saves/save_single_sheet_01_expected.png differ diff --git a/samples/saves/save_single_sheet_02_expected.png b/samples/saves/save_single_sheet_02_expected.png new file mode 100644 index 0000000..b57734c Binary files /dev/null and b/samples/saves/save_single_sheet_02_expected.png differ diff --git a/samples/saves/saves_notrim_01_expected.png b/samples/saves/saves_notrim_01_expected.png index 72c256f..d251a59 100644 Binary files a/samples/saves/saves_notrim_01_expected.png and b/samples/saves/saves_notrim_01_expected.png differ diff --git a/samples/shapes/proof_tiny_00_expected.png b/samples/shapes/proof_tiny_00_expected.png index 269e2f6..658a650 100644 Binary files a/samples/shapes/proof_tiny_00_expected.png and b/samples/shapes/proof_tiny_00_expected.png differ diff --git a/samples/shapes/shape_00_expected.png b/samples/shapes/shape_00_expected.png index 23e3686..0c9fed8 100644 Binary files a/samples/shapes/shape_00_expected.png and b/samples/shapes/shape_00_expected.png differ diff --git a/samples/sprues/advanced_sprues_01_expected.png b/samples/sprues/advanced_sprues_01_expected.png index 34b5a6e..2672a4f 100644 Binary files a/samples/sprues/advanced_sprues_01_expected.png and b/samples/sprues/advanced_sprues_01_expected.png differ diff --git a/samples/sprues/advanced_sprues_02_expected.png b/samples/sprues/advanced_sprues_02_expected.png deleted file mode 100644 index 734f4ab..0000000 Binary files a/samples/sprues/advanced_sprues_02_expected.png and /dev/null differ diff --git a/samples/sprues/sprue_drivethrucards_1up.yml_01_expected.png b/samples/sprues/sprue_drivethrucards_1up.yml_01_expected.png index 4c4b2e4..05b77a3 100644 Binary files a/samples/sprues/sprue_drivethrucards_1up.yml_01_expected.png and b/samples/sprues/sprue_drivethrucards_1up.yml_01_expected.png differ diff --git a/samples/sprues/sprue_printplaygames_18up.yml_01_expected.png b/samples/sprues/sprue_printplaygames_18up.yml_01_expected.png deleted file mode 100644 index 32c9713..0000000 Binary files a/samples/sprues/sprue_printplaygames_18up.yml_01_expected.png and /dev/null differ diff --git a/samples/text/_text_00_expected.png b/samples/text/_text_00_expected.png index 47fc350..f34b88b 100644 Binary files a/samples/text/_text_00_expected.png and b/samples/text/_text_00_expected.png differ diff --git a/samples/text/embed_00_expected.png b/samples/text/embed_00_expected.png index 3d1bf33..963f33c 100644 Binary files a/samples/text/embed_00_expected.png and b/samples/text/embed_00_expected.png differ diff --git a/samples/text/text_options_00_expected.png b/samples/text/text_options_00_expected.png index 2d60467..23d9614 100644 Binary files a/samples/text/text_options_00_expected.png and b/samples/text/text_options_00_expected.png differ