fixup

grantmcdermott · Jul 24, 2024 · 5a2b246 · 5a2b246
1 parent 1bb4ceb
commit 5a2b246
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/R/sanitize.R b/R/sanitize.R
@@ -5,16 +5,6 @@ sanitize_ribbon.alpha <- function(ribbon.alpha) {
 }
 
 
-sanitize_legend <- function(x, add = FALSE) {
-    # no legend if adding to the previous plot
-    if (isTRUE(add)) return(FALSE)
-    if (is.character(x)) {
-        valid <- c("bottomright", "bottom", "bottomleft", "left", "topleft", "top", "topright", "right", "center")
-        valid <- c(valid, paste0(valid, "!"))
-        assert_choice(x, valid, name = "legend")
-    }
-    return(x)
-}
 
 
 sanitize_type <- function(type, x, y) {

diff --git a/R/tinyplot.R b/R/tinyplot.R
@@ -508,9 +508,11 @@ tinyplot.default = function(
   dots = list(...)
 
   ribbon.alpha = sanitize_ribbon.alpha(ribbon.alpha)
-  legend = sanitize_legend(substitute(legend), add)
   type = sanitize_type(type, x, y)
 
+  if (isTRUE(add)) legend = FALSE
+
+
   xlabs = NULL
 
   # Write plot to output file or window with fixed dimensions

diff --git a/inst/tinytest/helpers.R b/inst/tinytest/helpers.R
@@ -2,9 +2,9 @@ library(tinytest)
 library(tinysnapshot)
 
 # Skip tests if not on Linux
-ON_LINUX = Sys.info()["sysname"] == "Linux"
-if (!ON_LINUX) exit_file("Linux snapshots")
-
-options("tinysnapshot_os" = "Linux")
+# ON_LINUX = Sys.info()["sysname"] == "Linux"
+# if (!ON_LINUX) exit_file("Linux snapshots")
+#
+# options("tinysnapshot_os" = "Linux")
 options("tinysnapshot_device" = "svglite")
-options("tinysnapshot_device_args" = list(user_fonts = fontquiver::font_families("Liberation")))
+options("tinysnapshot_device_args" = list(user_fonts = fontquiver::font_families("Liberation")))