From 820445ea084c500ddf4970be319aa31125f984a6 Mon Sep 17 00:00:00 2001 From: William Gearty Date: Tue, 10 Oct 2023 16:52:20 -0400 Subject: [PATCH] Fixes for rsvg v. 2.6.0 --- DESCRIPTION | 2 +- .../add_phylopic/phylopic-in-background.svg | 38 +- .../phylopic-png-in-background.svg | 2 +- .../add_phylopic/phylopics-on-top-of-plot.svg | 476 +++++++++--------- .../phylopic-in-background.svg | 48 +- .../phylopic-png-in-background.svg | 2 +- .../phylopics-on-top-of-plot.svg | 468 ++++++++--------- .../geom_phylopic/geom-phylopic-with-png.svg | 8 +- .../_snaps/geom_phylopic/geom-phylopic.svg | 48 +- .../phylopic-key-glyph-with-img.svg | 20 +- .../phylopic-key-glyph-with-uuid.svg | 20 +- .../_snaps/phylopic_utils/plot-array.svg | 2 +- .../_snaps/phylopic_utils/plot-picture.svg | 10 +- 13 files changed, 554 insertions(+), 590 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 10e11363..d3f8d9b7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -30,7 +30,7 @@ Imports: graphics, png, grImport2 (>= 0.3.0), - rsvg, + rsvg (>= 2.6.0), httr, curl, methods, diff --git a/tests/testthat/_snaps/add_phylopic/phylopic-in-background.svg b/tests/testthat/_snaps/add_phylopic/phylopic-in-background.svg index 2da77b76..ca25f80d 100644 --- a/tests/testthat/_snaps/add_phylopic/phylopic-in-background.svg +++ b/tests/testthat/_snaps/add_phylopic/phylopic-in-background.svg @@ -29,27 +29,27 @@ - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/tests/testthat/_snaps/add_phylopic/phylopic-png-in-background.svg b/tests/testthat/_snaps/add_phylopic/phylopic-png-in-background.svg index 2f7c5e86..20720143 100644 --- a/tests/testthat/_snaps/add_phylopic/phylopic-png-in-background.svg +++ b/tests/testthat/_snaps/add_phylopic/phylopic-png-in-background.svg @@ -27,7 +27,7 @@ - + diff --git a/tests/testthat/_snaps/add_phylopic/phylopics-on-top-of-plot.svg b/tests/testthat/_snaps/add_phylopic/phylopics-on-top-of-plot.svg index d9d6eff0..b2542647 100644 --- a/tests/testthat/_snaps/add_phylopic/phylopics-on-top-of-plot.svg +++ b/tests/testthat/_snaps/add_phylopic/phylopics-on-top-of-plot.svg @@ -29,90 +29,90 @@ - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - + + - - + + - - - + + + @@ -122,217 +122,217 @@ - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -342,239 +342,239 @@ - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + diff --git a/tests/testthat/_snaps/add_phylopic_base/phylopic-in-background.svg b/tests/testthat/_snaps/add_phylopic_base/phylopic-in-background.svg index 3b7cdfdd..f6b9bbf8 100644 --- a/tests/testthat/_snaps/add_phylopic_base/phylopic-in-background.svg +++ b/tests/testthat/_snaps/add_phylopic_base/phylopic-in-background.svg @@ -46,50 +46,14 @@ 1 - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/tests/testthat/_snaps/add_phylopic_base/phylopic-png-in-background.svg b/tests/testthat/_snaps/add_phylopic_base/phylopic-png-in-background.svg index 23056ad3..e5964840 100644 --- a/tests/testthat/_snaps/add_phylopic_base/phylopic-png-in-background.svg +++ b/tests/testthat/_snaps/add_phylopic_base/phylopic-png-in-background.svg @@ -44,6 +44,6 @@ A cat 1 1 - + diff --git a/tests/testthat/_snaps/add_phylopic_base/phylopics-on-top-of-plot.svg b/tests/testthat/_snaps/add_phylopic_base/phylopics-on-top-of-plot.svg index 5d794e49..91e0d570 100644 --- a/tests/testthat/_snaps/add_phylopic_base/phylopics-on-top-of-plot.svg +++ b/tests/testthat/_snaps/add_phylopic_base/phylopics-on-top-of-plot.svg @@ -48,90 +48,90 @@ posy - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -141,217 +141,217 @@ - - + + - - + + - - - + + + - - + + - - - + + + - + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -361,151 +361,151 @@ - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -515,8 +515,8 @@ - - + + @@ -526,74 +526,74 @@ - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + diff --git a/tests/testthat/_snaps/geom_phylopic/geom-phylopic-with-png.svg b/tests/testthat/_snaps/geom_phylopic/geom-phylopic-with-png.svg index 42e96362..3e607ae6 100644 --- a/tests/testthat/_snaps/geom_phylopic/geom-phylopic-with-png.svg +++ b/tests/testthat/_snaps/geom_phylopic/geom-phylopic-with-png.svg @@ -27,10 +27,10 @@ - - - - + + + + diff --git a/tests/testthat/_snaps/geom_phylopic/geom-phylopic.svg b/tests/testthat/_snaps/geom_phylopic/geom-phylopic.svg index 5ab9e96b..2ca6098a 100644 --- a/tests/testthat/_snaps/geom_phylopic/geom-phylopic.svg +++ b/tests/testthat/_snaps/geom_phylopic/geom-phylopic.svg @@ -34,22 +34,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -69,8 +69,8 @@ - - + + @@ -90,9 +90,9 @@ - - - + + + @@ -112,9 +112,9 @@ - - - + + + diff --git a/tests/testthat/_snaps/geom_phylopic/phylopic-key-glyph-with-img.svg b/tests/testthat/_snaps/geom_phylopic/phylopic-key-glyph-with-img.svg index 8d4e559a..9f9ff186 100644 --- a/tests/testthat/_snaps/geom_phylopic/phylopic-key-glyph-with-img.svg +++ b/tests/testthat/_snaps/geom_phylopic/phylopic-key-glyph-with-img.svg @@ -72,24 +72,24 @@ name - - + + - - - + + + - - + + - - - + + + Felis silvestris catus diff --git a/tests/testthat/_snaps/geom_phylopic/phylopic-key-glyph-with-uuid.svg b/tests/testthat/_snaps/geom_phylopic/phylopic-key-glyph-with-uuid.svg index 976e42b8..67cc4157 100644 --- a/tests/testthat/_snaps/geom_phylopic/phylopic-key-glyph-with-uuid.svg +++ b/tests/testthat/_snaps/geom_phylopic/phylopic-key-glyph-with-uuid.svg @@ -72,24 +72,24 @@ name - - + + - - - + + + - - + + - - - + + + Felis silvestris catus diff --git a/tests/testthat/_snaps/phylopic_utils/plot-array.svg b/tests/testthat/_snaps/phylopic_utils/plot-array.svg index c65321dc..24068529 100644 --- a/tests/testthat/_snaps/phylopic_utils/plot-array.svg +++ b/tests/testthat/_snaps/phylopic_utils/plot-array.svg @@ -18,6 +18,6 @@ - + diff --git a/tests/testthat/_snaps/phylopic_utils/plot-picture.svg b/tests/testthat/_snaps/phylopic_utils/plot-picture.svg index 55c5e3e4..dc800143 100644 --- a/tests/testthat/_snaps/phylopic_utils/plot-picture.svg +++ b/tests/testthat/_snaps/phylopic_utils/plot-picture.svg @@ -20,13 +20,13 @@ - - + + - - - + + +