Add full support for ragg

DESCRIPTION

@@ -42,6 +42,7 @@ Imports:
     withr (>= 2.0.0)
 Suggests:
     covr,
+    ragg,
     dplyr,
     ggplot2movies,
     hexbin,

R/save.r

@@ -158,18 +158,34 @@ plot_dev <- function(device, filename = NULL, dpi = 300) {
   force(dpi)
 
   if (is.function(device)) {
-    if ("file" %in% names(formals(device))) {
-      dev <- function(filename, ...) device(file = filename, ...)
-      return(dev)
-    } else {
-      return(device)
+    args <- formals(device)
+    call_args <- list()
+    if ("file" %in% names(args)) {
+      call_args$file <- filename
+    }
+    if ("res" %in% names(args)) {
+      call_args$res <- dpi
+    }
+    if ("units" %in% names(args)) {
+      call_args$units <- 'in'
     }
+    dev <- function(...) do.call(device, modify_list(list(...), call_args))
+    return(dev)
   }
 
   eps <- function(filename, ...) {
     grDevices::postscript(file = filename, ..., onefile = FALSE, horizontal = FALSE,
       paper = "special")
   }
+  if (requireNamespace('ragg', quietly = TRUE)) {
+    png_dev <- ragg::agg_png
+    jpeg_dev <- ragg::agg_jpeg
+    tiff_dev <- ragg::agg_tiff
+  } else {
+    png_dev <- grDevices::png
+    jpeg_dev <- grDevices::jpeg
+    tiff_dev <- grDevices::tiff
+  }
   devices <- list(
     eps =  eps,
     ps =   eps,
@@ -178,11 +194,11 @@ plot_dev <- function(device, filename = NULL, dpi = 300) {
     svg =  function(filename, ...) svglite::svglite(file = filename, ...),
     emf =  function(...) grDevices::win.metafile(...),
     wmf =  function(...) grDevices::win.metafile(...),
-    png =  function(...) grDevices::png(..., res = dpi, units = "in"),
-    jpg =  function(...) grDevices::jpeg(..., res = dpi, units = "in"),
-    jpeg = function(...) grDevices::jpeg(..., res = dpi, units = "in"),
+    png =  function(...) png_dev(..., res = dpi, units = "in"),
+    jpg =  function(...) jpeg_dev(..., res = dpi, units = "in"),
+    jpeg = function(...) jpeg_dev(..., res = dpi, units = "in"),
     bmp =  function(...) grDevices::bmp(..., res = dpi, units = "in"),
-    tiff = function(...) grDevices::tiff(..., res = dpi, units = "in")
+    tiff = function(...) tiff_dev(..., res = dpi, units = "in")
   )
 
   if (is.null(device)) {

tests/testthat/test-ggsave.R

@@ -85,23 +85,19 @@ test_that("scale multiplies height & width", {
 
 # plot_dev ---------------------------------------------------------------------
 
-test_that("function is passed back unchanged", {
-  expect_equal(plot_dev(png), png)
-})
-
 test_that("unknown device triggers error", {
   expect_error(plot_dev("xyz"), "Unknown graphics device")
   expect_error(plot_dev(NULL, "test.xyz"), "Unknown graphics device")
 })
 
 
 test_that("text converted to function", {
-  expect_identical(body(plot_dev("png"))[[1]], quote(grDevices::png))
+  expect_identical(body(plot_dev("png"))[[1]], quote(png_dev))
   expect_identical(body(plot_dev("pdf"))[[1]], quote(grDevices::pdf))
 })
 
 test_that("if device is NULL, guess from extension", {
-  expect_identical(body(plot_dev(NULL, "test.png"))[[1]], quote(grDevices::png))
+  expect_identical(body(plot_dev(NULL, "test.png"))[[1]], quote(png_dev))
 })
 
 # parse_dpi ---------------------------------------------------------------