Merge branch 'main' into copy_scale

Author: teunbrand

NEWS.md

@@ -1,7 +1,13 @@
 # ggplot2 (development version)
 
-* (internal) The ViewScale class has a `make_fixed_copy()` method to permit 
-  copying trained position scales (#3441).
+* Deprecated functions and arguments prior to ggplot2 3.0.0 throw errors instead 
+  of warnings. 
+* Functions and arguments that were soft-deprecated up to ggplot2 3.4.0 now 
+  throw warnings.
+* (internal) layer data can be attenuated with parameter attributes 
+  (@teunbrand, #3175).
+* Date scales silently coerce <POSIXct> to <Date> and datetime scales silently
+  coerce <Date> to <POSIXct> (@laurabrianna, #3533)
 * New parameters for `geom_label()` (@teunbrand and @steveharoz, #5365):
   * The `linewidth` aesthetic is now applied and replaces the `label.size` 
     argument.
@@ -304,10 +310,18 @@
   particularly for data-points with a low radius near the center 
   (@teunbrand, #5023).
 * All scales now expose the `aesthetics` parameter (@teunbrand, #5841)
+* Staged expressions are handled more gracefully if legends cannot resolve them 
+  (@teunbrand, #6264).
 * New `theme(legend.key.justification)` to control the alignment of legend keys 
   (@teunbrand, #3669). 
 * Added `scale_{x/y}_time(date_breaks, date_minor_breaks, date_labels)` 
   (@teunbrand, #4335).
+* `ggsave()` can write a multi-page pdf file when provided with a list of plots 
+  (@teunbrand, #5093).
+* (internal) When `validate_subclass()` fails to find a class directly, it tries 
+  to retrieve the class via constructor functions (@teunbrand).
+* (internal) The ViewScale class has a `make_fixed_copy()` method to permit 
+  copying trained position scales (#3441).
 
 # ggplot2 3.5.1
 

R/aes.R

@@ -290,7 +290,7 @@ is_position_aes <- function(vars) {
 #'
 #' @export
 aes_ <- function(x, y, ...) {
-  deprecate_soft0(
+  deprecate_warn0(
     "3.0.0",
     "aes_()",
     details = "Please use tidy evaluation idioms with `aes()`"
@@ -317,7 +317,7 @@ aes_ <- function(x, y, ...) {
 #' @rdname aes_
 #' @export
 aes_string <- function(x, y, ...) {
-  deprecate_soft0(
+  deprecate_warn0(
     "3.0.0",
     "aes_string()",
     details = c(
@@ -374,29 +374,7 @@ aes_all <- function(vars) {
 #' @keywords internal
 #' @export
 aes_auto <- function(data = NULL, ...) {
-  deprecate_warn0("2.0.0", "aes_auto()")
-
-  # detect names of data
-  if (is.null(data)) {
-    cli::cli_abort("{.fn aes_auto} requires a {.cls data.frame} or names of data.frame.")
-  } else if (is.data.frame(data)) {
-    vars <- names(data)
-  } else {
-    vars <- data
-  }
-
-  # automatically detected aes
-  vars <- intersect(ggplot_global$all_aesthetics, vars)
-  names(vars) <- vars
-  aes <- lapply(vars, function(x) parse(text = x)[[1]])
-
-  # explicitly defined aes
-  if (length(match.call()) > 2) {
-    args <- as.list(match.call()[-1])
-    aes <- c(aes, args[names(args) != "data"])
-  }
-
-  structure(rename_aes(aes), class = "uneval")
+  lifecycle::deprecate_stop("2.0.0", "aes_auto()")
 }
 
 mapped_aesthetics <- function(x) {

R/annotation-custom.R

@@ -80,7 +80,7 @@ GeomCustomAnn <- ggproto("GeomCustomAnn", Geom,
     editGrob(grob, vp = vp, name = paste(grob$name, annotation_id()))
   },
 
-  default_aes = aes_(xmin = -Inf, xmax = Inf, ymin = -Inf, ymax = Inf)
+  default_aes = aes(xmin = -Inf, xmax = Inf, ymin = -Inf, ymax = Inf)
 )
 
 annotation_id <- local({

R/annotation-logticks.R

@@ -229,7 +229,7 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
   },
 
   default_aes = aes(
-    colour = from_theme(ink),
+    colour = from_theme(colour %||% ink),
     linewidth = from_theme(linewidth),
     linetype = from_theme(linetype),
     alpha = 1

R/bin.R

@@ -240,18 +240,24 @@ bin_loc <- function(x, id) {
   )
 }
 
-fix_bin_params = function(params, fun, version) {
+fix_bin_params <- function(params, fun, version) {
+
+  if (package_version(version) < "3.0.0") {
+    deprecate <- lifecycle::deprecate_stop
+  } else {
+    deprecate <- deprecate_warn0
+  }
 
   if (!is.null(params$origin)) {
     args <- paste0(fun, c("(origin)", "(boundary)"))
-    deprecate_warn0(version, args[1], args[2])
-    params$boudnary <- params$origin
+    deprecate(version, args[1], args[2])
+    params$boundary <- params$origin
     params$origin <- NULL
   }
 
   if (!is.null(params$right)) {
     args <- paste0(fun, c("(right)", "(closed)"))
-    deprecate_warn0(version, args[1], args[2])
+    deprecate(version, args[1], args[2])
     params$closed <- if (isTRUE(params$right)) "right" else "left"
     params$right <- NULL
   }

R/facet-grid-.R

@@ -132,10 +132,9 @@ facet_grid <- function(rows = NULL, cols = NULL, scales = "fixed",
                        switch = NULL, drop = TRUE, margins = FALSE,
                        axes = "margins", axis.labels = "all",
                        facets = deprecated()) {
-  # `facets` is deprecated and renamed to `rows`
+  # `facets` is deprecated
   if (lifecycle::is_present(facets)) {
-    deprecate_warn0("2.2.0", "facet_grid(facets)", "facet_grid(rows)")
-    rows <- facets
+    lifecycle::deprecate_stop("2.2.0", "facet_grid(facets)", "facet_grid(rows)")
   }
 
   # Should become a warning in a future release
@@ -177,7 +176,7 @@ facet_grid <- function(rows = NULL, cols = NULL, scales = "fixed",
   facets_list <- grid_as_facets_list(rows, cols)
 
   # Check for deprecated labellers
-  labeller <- fix_labeller(labeller)
+  check_labeller(labeller)
 
   ggproto(NULL, FacetGrid,
     shrink = shrink,

R/facet-wrap.R

@@ -174,14 +174,15 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
   )
 
   # Check for deprecated labellers
-  labeller <- fix_labeller(labeller)
+  check_labeller(labeller)
 
   # Flatten all facets dimensions into a single one
   facets <- compact_facets(facets)
 
   if (lifecycle::is_present(switch) && !is.null(switch)) {
-    deprecate_warn0("2.2.0", "facet_wrap(switch)", "facet_wrap(strip.position)")
-    strip.position <- if (switch == "x") "bottom" else "left"
+    lifecycle::deprecate_stop(
+      "2.2.0", "facet_wrap(switch)", "facet_wrap(strip.position)"
+    )
   }
   strip.position <- arg_match0(strip.position, c("top", "bottom", "left", "right"))
 

R/fortify-map.R

@@ -159,6 +159,6 @@ map_data <- function(map, region = ".", exact = FALSE, ...) {
 borders <- function(database = "world", regions = ".", fill = NA,
                     colour = "grey50", xlim = NULL, ylim = NULL, ...) {
   df <- map_data(database, regions, xlim = xlim, ylim = ylim)
-  geom_polygon(aes_(~long, ~lat, group = ~group), data = df,
+  geom_polygon(aes(.data$long, .data$lat, group = .data$group), data = df,
     fill = fill, colour = colour, ..., inherit.aes = FALSE)
 }

R/geom-.R

@@ -126,14 +126,14 @@ Geom <- ggproto("Geom",
     # Take care of subclasses setting the wrong default when inheriting from
     # a geom with rename_size = TRUE
     if (self$rename_size && is.null(default_aes$linewidth)) {
-      deprecate_soft0("3.4.0", I("Using the `size` aesthetic in this geom"), I("`linewidth` in the `default_aes` field and elsewhere"))
+      deprecate_warn0("3.4.0", I("Using the `size` aesthetic in this geom"), I("`linewidth` in the `default_aes` field and elsewhere"))
       default_aes$linewidth <- default_aes$size
     }
 
     # Fill in missing aesthetics with their defaults
     missing_aes <- setdiff(names(default_aes), names(data))
     default_aes <- default_aes[missing_aes]
-    themed_defaults <- eval_from_theme(default_aes, theme)
+    themed_defaults <- eval_from_theme(default_aes, theme, class(self))
     default_aes[names(themed_defaults)] <- themed_defaults
 
     # Mark staged/scaled defaults as modifier (#6135)
@@ -163,10 +163,15 @@ Geom <- ggproto("Geom",
     # If any after_scale mappings are detected they will be resolved here
     # This order means that they will have access to all default aesthetics
     if (length(modifiers) != 0) {
-      # Set up evaluation environment
-      modified_aes <- eval_aesthetics(
-        substitute_aes(modifiers), data,
-        mask = list(stage = stage_scaled)
+      modified_aes <- try_fetch(
+        eval_aesthetics(
+          substitute_aes(modifiers), data,
+          mask = list(stage = stage_scaled)
+        ),
+        error = function(cnd) {
+          cli::cli_warn("Unable to apply staged modifications.", parent = cnd)
+          data_frame0()
+        }
       )
 
       # Check that all output are valid data
@@ -177,10 +182,7 @@ Geom <- ggproto("Geom",
       )
 
       modified_aes <- cleanup_mismatched_data(modified_aes, nrow(data), "after_scale")
-
-      modified_aes <- data_frame0(!!!modified_aes)
-
-      data <- data_frame0(!!!defaults(modified_aes, data))
+      data[names(modified_aes)] <- modified_aes
     }
 
     # Override mappings with params
@@ -237,13 +239,33 @@ Geom <- ggproto("Geom",
 #' @rdname is_tests
 is.geom <- function(x) inherits(x, "Geom")
 
-eval_from_theme <- function(aesthetics, theme) {
+eval_from_theme <- function(aesthetics, theme, class = NULL) {
   themed <- is_themed_aes(aesthetics)
   if (!any(themed)) {
     return(aesthetics)
   }
-  settings <- calc_element("geom", theme) %||% .default_geom_element
-  lapply(aesthetics[themed], eval_tidy, data = settings)
+
+  element <- calc_element("geom", theme) %||% .default_geom_element
+  class <- setdiff(class, c("Geom", "ggproto", "gg"))
+
+  if (length(class) > 0) {
+
+    # CamelCase to dot.case
+    class <- gsub("([A-Za-z])([A-Z])([a-z])", "\\1.\\2\\3", class)
+    class <- gsub("([a-z])([A-Z])", "\\1.\\2", class)
+    class <- to_lower_ascii(class)
+
+    class <- class[class %in% names(theme)]
+
+    # Inherit up to parent geom class
+    if (length(class) > 0) {
+      for (cls in rev(class)) {
+        element <- combine_elements(theme[[cls]], element)
+      }
+    }
+  }
+
+  lapply(aesthetics[themed], eval_tidy, data = element)
 }
 
 #' Graphical units
@@ -279,7 +301,7 @@ check_aesthetics <- function(x, n) {
 
 fix_linewidth <- function(data, name) {
   if (is.null(data$linewidth) && !is.null(data$size)) {
-    deprecate_soft0("3.4.0", I(paste0("Using the `size` aesthetic with ", name)), I("the `linewidth` aesthetic"))
+    deprecate_warn0("3.4.0", I(paste0("Using the `size` aesthetic with ", name)), I("the `linewidth` aesthetic"))
     data$linewidth <- data$size
   }
   data

R/geom-abline.R

@@ -147,7 +147,7 @@ GeomAbline <- ggproto("GeomAbline", Geom,
   },
 
   default_aes = aes(
-    colour = from_theme(ink),
+    colour = from_theme(colour %||% ink),
     linewidth = from_theme(linewidth),
     linetype = from_theme(linetype),
     alpha = NA