diff --git a/DESCRIPTION b/DESCRIPTION
index a4c7b3fe..ea515e59 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -40,7 +40,6 @@ Suggests:
gganimate,
ggiraph,
htmltools,
- httpgd,
jsonlite,
knitr,
lattice,
@@ -61,7 +60,7 @@ Config/Needs/routine: ggrepel
Config/Needs/website: GGally, RColorBrewer, patchwork, apreshill/quillt
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
Collate:
'auto.R'
'base.R'
diff --git a/NEWS.md b/NEWS.md
index e32de51d..7608534e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,7 @@
# thematic 0.1.4
* The `{httpgd}` graphics device (and thus, Github codespaces) is now supported. (#143)
+* `{thematic}` now works with recent versions of the `{vdiffr}` package. (#149)
# thematic 0.1.3
diff --git a/R/hooks.R b/R/hooks.R
index b6dd2898..a861366d 100644
--- a/R/hooks.R
+++ b/R/hooks.R
@@ -246,8 +246,9 @@ get_device_function <- function(name = infer_device()) {
agg_jpeg = ragg::agg_jpeg,
Cairo = Cairo::Cairo,
devSVG = svglite::svglite,
+ devSVG_vdiffr = svglite::svglite,
dsvg_device = ggiraph::dsvg,
- httpgd = httpgd::hgd,
+ httpgd = getFromNamespace("hgd", "httpgd"),
# TODO: support cairoDevices? tikz?
stop(
"thematic doesn't (yet) support the '", name, "' graphics device. ",
diff --git a/README.Rmd b/README.Rmd
index 2934c2d0..2e2f85db 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -28,7 +28,6 @@ set.seed(1234)
[](https://github.com/rstudio/thematic)
[](https://CRAN.R-project.org/package=thematic)
-[](https://lifecycle.r-lib.org/articles/stages.html)
Simplified theming of `{ggplot2}`, `{lattice}`, and `{base}` R graphics. In addition to providing a [centralized approach](https://rstudio.github.io/thematic/articles/custom.html) to styling R graphics, `{thematic}` also enables [automatic styling](https://rstudio.github.io/thematic/articles/auto.html) of R plots in Shiny, R Markdown, and RStudio.
diff --git a/README.md b/README.md
index c674e109..4bfa75fa 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,6 @@
status](https://github.com/rstudio/thematic/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rstudio/thematic)
[](https://CRAN.R-project.org/package=thematic)
-[](https://lifecycle.r-lib.org/articles/stages.html)
Simplified theming of `{ggplot2}`, `{lattice}`, and `{base}` R graphics.
diff --git a/tests/testthat/_snaps/ggplot/geombar.svg b/tests/testthat/_snaps/ggplot/geombar.svg
index 4e20c651..d69e4d58 100644
--- a/tests/testthat/_snaps/ggplot/geombar.svg
+++ b/tests/testthat/_snaps/ggplot/geombar.svg
@@ -27,13 +27,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geombin2d.svg b/tests/testthat/_snaps/ggplot/geombin2d.svg
index 36041767..44ffb9f2 100644
--- a/tests/testthat/_snaps/ggplot/geombin2d.svg
+++ b/tests/testthat/_snaps/ggplot/geombin2d.svg
@@ -27,104 +27,104 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geombox.svg b/tests/testthat/_snaps/ggplot/geombox.svg
index ca7159bc..2f4968c6 100644
--- a/tests/testthat/_snaps/ggplot/geombox.svg
+++ b/tests/testthat/_snaps/ggplot/geombox.svg
@@ -29,39 +29,39 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/tests/testthat/_snaps/ggplot/geomdensity.svg b/tests/testthat/_snaps/ggplot/geomdensity.svg
index c76c18b2..eeb85f5d 100644
--- a/tests/testthat/_snaps/ggplot/geomdensity.svg
+++ b/tests/testthat/_snaps/ggplot/geomdensity.svg
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/tests/testthat/_snaps/ggplot/geomdensitycolor.svg b/tests/testthat/_snaps/ggplot/geomdensitycolor.svg
index a6a175d8..19f7b710 100644
--- a/tests/testthat/_snaps/ggplot/geomdensitycolor.svg
+++ b/tests/testthat/_snaps/ggplot/geomdensitycolor.svg
@@ -27,16 +27,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -85,15 +85,15 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/tests/testthat/_snaps/ggplot/geomdotplot.svg b/tests/testthat/_snaps/ggplot/geomdotplot.svg
index 1560fa1c..29b38531 100644
--- a/tests/testthat/_snaps/ggplot/geomdotplot.svg
+++ b/tests/testthat/_snaps/ggplot/geomdotplot.svg
@@ -27,38 +27,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geomerrorbar.svg b/tests/testthat/_snaps/ggplot/geomerrorbar.svg
index 0f90ca08..dcd41f68 100644
--- a/tests/testthat/_snaps/ggplot/geomerrorbar.svg
+++ b/tests/testthat/_snaps/ggplot/geomerrorbar.svg
@@ -27,10 +27,10 @@
-
-
-
-
+
+
+
+
@@ -70,9 +70,9 @@
-
+
-
+
diff --git a/tests/testthat/_snaps/ggplot/geomhistogram.svg b/tests/testthat/_snaps/ggplot/geomhistogram.svg
index 0dd63deb..2ab8aa97 100644
--- a/tests/testthat/_snaps/ggplot/geomhistogram.svg
+++ b/tests/testthat/_snaps/ggplot/geomhistogram.svg
@@ -27,196 +27,196 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -283,15 +283,15 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/tests/testthat/_snaps/ggplot/geompolygon.svg b/tests/testthat/_snaps/ggplot/geompolygon.svg
index f6c773cc..15366109 100644
--- a/tests/testthat/_snaps/ggplot/geompolygon.svg
+++ b/tests/testthat/_snaps/ggplot/geompolygon.svg
@@ -27,12 +27,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geompolygon2.svg b/tests/testthat/_snaps/ggplot/geompolygon2.svg
index d98c6dda..bffa0a1c 100644
--- a/tests/testthat/_snaps/ggplot/geompolygon2.svg
+++ b/tests/testthat/_snaps/ggplot/geompolygon2.svg
@@ -27,12 +27,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geomribbon.svg b/tests/testthat/_snaps/ggplot/geomribbon.svg
index da711dc9..02051fe6 100644
--- a/tests/testthat/_snaps/ggplot/geomribbon.svg
+++ b/tests/testthat/_snaps/ggplot/geomribbon.svg
@@ -27,9 +27,9 @@
-
-
-
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geomrug.svg b/tests/testthat/_snaps/ggplot/geomrug.svg
index 8ef745e7..a1717494 100644
--- a/tests/testthat/_snaps/ggplot/geomrug.svg
+++ b/tests/testthat/_snaps/ggplot/geomrug.svg
@@ -59,70 +59,70 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geomrug2.svg b/tests/testthat/_snaps/ggplot/geomrug2.svg
index 2c5573e5..513816b1 100644
--- a/tests/testthat/_snaps/ggplot/geomrug2.svg
+++ b/tests/testthat/_snaps/ggplot/geomrug2.svg
@@ -52,70 +52,70 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geomsf.svg b/tests/testthat/_snaps/ggplot/geomsf.svg
deleted file mode 100644
index b0966ec0..00000000
--- a/tests/testthat/_snaps/ggplot/geomsf.svg
+++ /dev/null
@@ -1,353 +0,0 @@
-
-
diff --git a/tests/testthat/_snaps/ggplot/geomsmooth.svg b/tests/testthat/_snaps/ggplot/geomsmooth.svg
index b41cf9ea..da2c21c9 100644
--- a/tests/testthat/_snaps/ggplot/geomsmooth.svg
+++ b/tests/testthat/_snaps/ggplot/geomsmooth.svg
@@ -57,9 +57,9 @@
-
-
-
+
+
+
@@ -307,9 +307,9 @@
-
-
-
+
+
+
@@ -414,9 +414,9 @@
-
-
-
+
+
+
@@ -845,9 +845,9 @@
-
-
-
+
+
+
@@ -1087,9 +1087,9 @@
-
-
-
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/geomtile.svg b/tests/testthat/_snaps/ggplot/geomtile.svg
index e4034e58..c3d2264a 100644
--- a/tests/testthat/_snaps/ggplot/geomtile.svg
+++ b/tests/testthat/_snaps/ggplot/geomtile.svg
@@ -27,16 +27,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -72,15 +72,15 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/tests/testthat/_snaps/ggplot/geomviolin.svg b/tests/testthat/_snaps/ggplot/geomviolin.svg
index 192096c2..971ee2ee 100644
--- a/tests/testthat/_snaps/ggplot/geomviolin.svg
+++ b/tests/testthat/_snaps/ggplot/geomviolin.svg
@@ -27,9 +27,9 @@
-
-
-
+
+
+
diff --git a/tests/testthat/_snaps/ggplot/patchwork.svg b/tests/testthat/_snaps/ggplot/patchwork.svg
new file mode 100644
index 00000000..f787aa67
--- /dev/null
+++ b/tests/testthat/_snaps/ggplot/patchwork.svg
@@ -0,0 +1,271 @@
+
+
diff --git a/tests/testthat/_snaps/ggplot/qualitative-fill.svg b/tests/testthat/_snaps/ggplot/qualitative-fill.svg
index cf020e89..8a83b879 100644
--- a/tests/testthat/_snaps/ggplot/qualitative-fill.svg
+++ b/tests/testthat/_snaps/ggplot/qualitative-fill.svg
@@ -27,10 +27,10 @@
-
-
-
-
+
+
+
+
@@ -104,9 +104,9 @@
-
+
-
+
diff --git a/tests/testthat/_snaps/ggthemes/axis-interitance-distant.svg b/tests/testthat/_snaps/ggthemes/axis-interitance-distant.svg
index 350712d7..66da7871 100644
--- a/tests/testthat/_snaps/ggthemes/axis-interitance-distant.svg
+++ b/tests/testthat/_snaps/ggthemes/axis-interitance-distant.svg
@@ -44,36 +44,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggthemes/axis-interitance-distant2.svg b/tests/testthat/_snaps/ggthemes/axis-interitance-distant2.svg
index 350712d7..66da7871 100644
--- a/tests/testthat/_snaps/ggthemes/axis-interitance-distant2.svg
+++ b/tests/testthat/_snaps/ggthemes/axis-interitance-distant2.svg
@@ -44,36 +44,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggthemes/axis-interitance.svg b/tests/testthat/_snaps/ggthemes/axis-interitance.svg
index 9ae8ff9a..2310ec48 100644
--- a/tests/testthat/_snaps/ggthemes/axis-interitance.svg
+++ b/tests/testthat/_snaps/ggthemes/axis-interitance.svg
@@ -44,36 +44,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggthemes/ggtheme-minimal-off.svg b/tests/testthat/_snaps/ggthemes/ggtheme-minimal-off.svg
index 7a278d0a..b2991f3f 100644
--- a/tests/testthat/_snaps/ggthemes/ggtheme-minimal-off.svg
+++ b/tests/testthat/_snaps/ggthemes/ggtheme-minimal-off.svg
@@ -27,36 +27,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggthemes/ggtheme-minimal.svg b/tests/testthat/_snaps/ggthemes/ggtheme-minimal.svg
index 0a3aa167..3ad9f593 100644
--- a/tests/testthat/_snaps/ggthemes/ggtheme-minimal.svg
+++ b/tests/testthat/_snaps/ggthemes/ggtheme-minimal.svg
@@ -27,36 +27,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/ggthemes/ggtheme-void.svg b/tests/testthat/_snaps/ggthemes/ggtheme-void.svg
index 88d33de8..b6f4a5e1 100644
--- a/tests/testthat/_snaps/ggthemes/ggtheme-void.svg
+++ b/tests/testthat/_snaps/ggthemes/ggtheme-void.svg
@@ -27,36 +27,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/lattice/bwplot.svg b/tests/testthat/_snaps/lattice/bwplot.svg
index bd3422aa..2da1870c 100644
--- a/tests/testthat/_snaps/lattice/bwplot.svg
+++ b/tests/testthat/_snaps/lattice/bwplot.svg
@@ -91,14 +91,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+