Merge branch 'main' into partial_margins

.github/workflows/R-CMD-check.yaml

@@ -63,7 +63,7 @@ jobs:
           cache-version: 3
           extra-packages: >
             any::rcmdcheck,
-            Hmisc=?ignore-before-r=4.1.0,
+            Hmisc=?ignore-before-r=4.2.0,
             quantreg=?ignore-before-r=4.3.0
           needs: check
 

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ggplot2
-Version: 3.5.1.9000
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
+Version: 3.5.1.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "hadley@posit.co", role = "aut",
            comment = c(ORCID = "0000-0003-4757-117X")),
@@ -30,7 +30,7 @@ License: MIT + file LICENSE
 URL: https://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
 BugReports: https://github.com/tidyverse/ggplot2/issues
 Depends:
-    R (>= 3.5)
+    R (>= 4.0)
 Imports: 
     cli,
     grDevices,
@@ -75,6 +75,7 @@ VignetteBuilder:
     knitr
 Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate
 Config/testthat/edition: 3
+Config/usethis/last-upkeep: 2024-10-24
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2020 ggplot2 authors
+Copyright (c) 2024 ggplot2 core developer team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NEWS.md

@@ -3,6 +3,8 @@
 * Theme margins can have NA-units to inherit from parent elements. The new
   function `margin_part()` has NA-units as default (@teunbrand, #6115)
 * New `margin_auto()` specification for theme margins.
+* (internal) Using `after_scale()` in the `Geom*$default_aes()` field is now
+  evaluated in the context of data (@teunbrand, #6135)
 * Fixed bug where binned scales wouldn't simultaneously accept transformations
   and function-limits (@teunbrand, #6144).
 * Fixed bug where the `ggplot2::`-prefix did not work with `stage()` 
@@ -189,6 +191,7 @@
 * The ellipsis argument is now checked in `fortify()`, `get_alt_text()`, 
   `labs()` and several guides (@teunbrand, #3196).
 * `stat_summary_bin()` no longer ignores `width` parameter (@teunbrand, #4647).
+* Added `keep.zeroes` argument to `stat_bin()` (@teunbrand, #3449)
 
 # ggplot2 3.5.1
 
@@ -235,6 +238,7 @@ documentation updates.
 * `annotate()` now warns about `stat` or `position` arguments (@teunbrand, #5151)
 * `guide_coloursteps(even.steps = FALSE)` now works with discrete data that has 
   been formatted by `cut()` (@teunbrand, #3877).
+* `ggsave()` now offers to install svglite if needed (@eliocamp, #6166).
 
 # ggplot2 3.5.0
 

R/bin.R

@@ -54,9 +54,7 @@ bin_breaks <- function(breaks, closed = c("right", "left")) {
 
 bin_breaks_width <- function(x_range, width = NULL, center = NULL,
                              boundary = NULL, closed = c("right", "left")) {
-  if (length(x_range) != 2) {
-    cli::cli_abort("{.arg x_range} must have two elements.")
-  }
+  check_length(x_range, 2L)
 
   # binwidth seems to be the argument name supplied to width. (stat-bin and stat-bindot)
   check_number_decimal(width, min = 0, allow_infinite = FALSE, arg = "binwidth")
@@ -106,9 +104,7 @@ bin_breaks_width <- function(x_range, width = NULL, center = NULL,
 
 bin_breaks_bins <- function(x_range, bins = 30, center = NULL,
                             boundary = NULL, closed = c("right", "left")) {
-  if (length(x_range) != 2) {
-    cli::cli_abort("{.arg x_range} must have two elements.")
-  }
+  check_length(x_range, 2L)
 
   check_number_whole(bins, min = 1)
   if (zero_range(x_range)) {

R/coord-.R

@@ -281,14 +281,6 @@ check_coord_limits <- function(
   if (is.null(limits)) {
     return(invisible(NULL))
   }
-  if (!obj_is_vector(limits) || length(limits) != 2) {
-    what <- "{.obj_type_friendly {limits}}"
-    if (is.vector(limits)) {
-      what <- paste0(what, " of length {length(limits)}")
-    }
-    cli::cli_abort(
-      paste0("{.arg {arg}} must be a vector of length 2, not ", what, "."),
-      call = call
-    )
-  }
+  check_object(limits, is_vector, "a vector", arg = arg, call = call)
+  check_length(limits, 2L, arg = arg, call = call)
 }

R/geom-.R

@@ -136,6 +136,13 @@ Geom <- ggproto("Geom",
     themed_defaults <- eval_from_theme(default_aes, theme)
     default_aes[names(themed_defaults)] <- themed_defaults
 
+    # Mark staged/scaled defaults as modifier (#6135)
+    delayed <- is_scaled_aes(default_aes) | is_staged_aes(default_aes)
+    if (any(delayed)) {
+      modifiers <- defaults(modifiers, default_aes[delayed])
+      default_aes <- default_aes[!delayed]
+    }
+
     missing_eval <- lapply(default_aes, eval_tidy)
     # Needed for geoms with defaults set to NULL (e.g. GeomSf)
     missing_eval <- compact(missing_eval)

R/geom-map.R

@@ -22,7 +22,7 @@ NULL
 #' # how `geom_map()` works. It requires two data frames:
 #' # One contains the coordinates of each polygon (`positions`), and is
 #' # provided via the `map` argument. The other contains the
-#' # other the values associated with each polygon (`values`).  An id
+#' # values associated with each polygon (`values`).  An id
 #' # variable links the two together.
 #'
 #' ids <- factor(c("1.1", "2.1", "1.2", "2.2", "1.3", "2.3"))

R/geom-sf.R

@@ -238,7 +238,8 @@ GeomSf <- ggproto("GeomSf", Geom,
     linewidth[is_point] <- stroke[is_point]
 
     gp <- gpar(
-      col = colour, fill = fill, fontsize = font_size, lwd = linewidth,
+      col = colour, fill = fill, fontsize = font_size,
+      lwd = linewidth, lty = data$linetype,
       lineend = lineend, linejoin = linejoin, linemitre = linemitre
     )
 

R/import-standalone-obj-type.R

@@ -1,17 +1,27 @@
 # Standalone file: do not edit by hand
-# Source: <https://github.com/r-lib/rlang/blob/main/R/standalone-obj-type.R>
+# Source: https://github.com/r-lib/rlang/blob/HEAD/R/standalone-obj-type.R
+# Generated by: usethis::use_standalone("r-lib/rlang", "obj-type")
 # ----------------------------------------------------------------------
 #
 # ---
 # repo: r-lib/rlang
 # file: standalone-obj-type.R
-# last-updated: 2022-10-04
+# last-updated: 2024-02-14
 # license: https://unlicense.org
 # imports: rlang (>= 1.1.0)
 # ---
 #
 # ## Changelog
 #
+# 2024-02-14:
+# - `obj_type_friendly()` now works for S7 objects.
+#
+# 2023-05-01:
+# - `obj_type_friendly()` now only displays the first class of S3 objects.
+#
+# 2023-03-30:
+# - `stop_input_type()` now handles `I()` input literally in `arg`.
+#
 # 2022-10-04:
 # - `obj_type_friendly(value = TRUE)` now shows numeric scalars
 #   literally.
@@ -65,7 +75,7 @@ obj_type_friendly <- function(x, value = TRUE) {
     if (inherits(x, "quosure")) {
       type <- "quosure"
     } else {
-      type <- paste(class(x), collapse = "/")
+      type <- class(x)[[1L]]
     }
     return(sprintf("a <%s> object", type))
   }
@@ -261,19 +271,19 @@ vec_type_friendly <- function(x, length = FALSE) {
 #' Return OO type
 #' @param x Any R object.
 #' @return One of `"bare"` (for non-OO objects), `"S3"`, `"S4"`,
-#'   `"R6"`, or `"R7"`.
+#'   `"R6"`, or `"S7"`.
 #' @noRd
 obj_type_oo <- function(x) {
   if (!is.object(x)) {
     return("bare")
   }
 
-  class <- inherits(x, c("R6", "R7_object"), which = TRUE)
+  class <- inherits(x, c("R6", "S7_object"), which = TRUE)
 
   if (class[[1]]) {
     "R6"
   } else if (class[[2]]) {
-    "R7"
+    "S7"
   } else if (isS4(x)) {
     "S4"
   } else {
@@ -315,10 +325,15 @@ stop_input_type <- function(x,
   if (length(what)) {
     what <- oxford_comma(what)
   }
+  if (inherits(arg, "AsIs")) {
+    format_arg <- identity
+  } else {
+    format_arg <- cli$format_arg
+  }
 
   message <- sprintf(
     "%s must be %s, not %s.",
-    cli$format_arg(arg),
+    format_arg(arg),
     what,
     obj_type_friendly(x, value = show_value)
   )

R/import-standalone-types-check.R

@@ -1,5 +1,6 @@
 # Standalone file: do not edit by hand
-# Source: <https://github.com/r-lib/rlang/blob/main/R/standalone-types-check.R>
+# Source: https://github.com/r-lib/rlang/blob/HEAD/R/standalone-types-check.R
+# Generated by: usethis::use_standalone("r-lib/rlang", "types-check")
 # ----------------------------------------------------------------------
 #
 # ---
@@ -13,6 +14,9 @@
 #
 # ## Changelog
 #
+# 2024-08-15:
+# - `check_character()` gains an `allow_na` argument (@martaalcalde, #1724)
+#
 # 2023-03-13:
 # - Improved error messages of number checkers (@teunbrand)
 # - Added `allow_infinite` argument to `check_number_whole()` (@mgirlich).
@@ -461,15 +465,28 @@ check_formula <- function(x,
 
 # Vectors -----------------------------------------------------------------
 
+# TODO: Figure out what to do with logical `NA` and `allow_na = TRUE`
+
 check_character <- function(x,
                             ...,
+                            allow_na = TRUE,
                             allow_null = FALSE,
                             arg = caller_arg(x),
                             call = caller_env()) {
+
   if (!missing(x)) {
     if (is_character(x)) {
+      if (!allow_na && any(is.na(x))) {
+        abort(
+          sprintf("`%s` can't contain NA values.", arg),
+          arg = arg,
+          call = call
+        )
+      }
+
       return(invisible(NULL))
     }
+
     if (allow_null && is_null(x)) {
       return(invisible(NULL))
     }
@@ -479,7 +496,6 @@ check_character <- function(x,
     x,
     "a character vector",
     ...,
-    allow_na = FALSE,
     allow_null = allow_null,
     arg = arg,
     call = call

R/limits.R

@@ -113,9 +113,7 @@ ylim <- function(...) {
 limits <- function(lims, var, call = caller_env()) UseMethod("limits")
 #' @export
 limits.numeric <- function(lims, var, call = caller_env()) {
-  if (length(lims) != 2) {
-    cli::cli_abort("{.arg {var}} must be a two-element vector.", call = call)
-  }
+  check_length(lims, 2L, arg = var, call = call)
   if (!anyNA(lims) && lims[1] > lims[2]) {
     trans <- "reverse"
   } else {
@@ -143,23 +141,17 @@ limits.factor <- function(lims, var, call = caller_env()) {
 }
 #' @export
 limits.Date <- function(lims, var, call = caller_env()) {
-  if (length(lims) != 2) {
-    cli::cli_abort("{.arg {var}} must be a two-element vector.", call = call)
-  }
+  check_length(lims, 2L, arg = var, call = call)
   make_scale("date", var, limits = lims, call = call)
 }
 #' @export
 limits.POSIXct <- function(lims, var, call = caller_env()) {
-  if (length(lims) != 2) {
-    cli::cli_abort("{.arg {var}} must be a two-element vector.", call = call)
-  }
+  check_length(lims, 2L, arg = var, call = call)
   make_scale("datetime", var, limits = lims, call = call)
 }
 #' @export
 limits.POSIXlt <- function(lims, var, call = caller_env()) {
-  if (length(lims) != 2) {
-    cli::cli_abort("{.arg {var}} must be a two-element vector.", call = call)
-  }
+  check_length(lims, 2L, arg = var, call = call)
   make_scale("datetime", var, limits = as.POSIXct(lims), call = call)
 }
 

R/plot-build.R

@@ -358,13 +358,10 @@ table_add_tag <- function(table, label, theme) {
       ),
       call = expr(theme()))
     }
-    if (length(position) != 2) {
-      cli::cli_abort(paste0(
-        "A {.cls numeric} {.arg plot.tag.position} ",
-        "theme setting must have length 2."
-      ),
-      call = expr(theme()))
-    }
+    check_length(
+      position, 2L, call = expr(theme()),
+      arg = I("A {.cls numeric} {.arg plot.tag.position}")
+    )
     top <- left <- right <- bottom <- FALSE
   } else {
     # Break position into top/left/right/bottom

R/save.R

@@ -277,7 +277,10 @@ plot_dev <- function(device, filename = NULL, dpi = 300, call = caller_env()) {
     ps =   eps,
     tex =  function(filename, ...) grDevices::pictex(file = filename, ...),
     pdf =  function(filename, ..., version = "1.4") grDevices::pdf(file = filename, ..., version = version),
-    svg =  function(filename, ...) svglite::svglite(file = filename, ...),
+    svg =  function(filename, ...) {
+      check_installed("svglite", reason = "to save as SVG.")
+      svglite::svglite(file = filename, ...)
+    },
     # win.metafile() doesn't have `bg` arg so we need to absorb it before passing `...`
     emf =  function(..., bg = NULL) grDevices::win.metafile(...),
     wmf =  function(..., bg = NULL) grDevices::win.metafile(...),

R/scale-.R

@@ -128,12 +128,14 @@ continuous_scale <- function(aesthetics, scale_name = deprecated(), palette, nam
   }
 
   transform <- as.transform(transform)
+  limits   <- allow_lambda(limits)
+
   if (!is.null(limits) && !is.function(limits)) {
     limits <- transform$transform(limits)
   }
+  check_continuous_limits(limits, call = call)
 
   # Convert formula to function if appropriate
-  limits   <- allow_lambda(limits)
   breaks   <- allow_lambda(breaks)
   labels   <- allow_lambda(labels)
   rescaler <- allow_lambda(rescaler)
@@ -1400,6 +1402,16 @@ check_transformation <- function(x, transformed, name, arg = NULL, call = NULL)
   cli::cli_warn(msg, call = call)
 }
 
+check_continuous_limits <- function(limits, ...,
+                                    arg = caller_arg(limits),
+                                    call = caller_env()) {
+  if (is.null(limits) || is.function(limits)) {
+    return(invisible())
+  }
+  check_numeric(limits, arg = arg, call = call, allow_na = TRUE)
+  check_length(limits, 2L, arg = arg, call = call)
+}
+
 trans_support_nbreaks <- function(trans) {
   "n" %in% names(formals(trans$breaks))
 }