Merge branch 'main' into discrete_labels_from_break_names

Author: teunbrand

.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", , "[email protected]", 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

NAMESPACE

@@ -461,7 +461,6 @@ export(guides)
 export(has_flipped_aes)
 export(is.Coord)
 export(is.coord)
-export(is.element)
 export(is.facet)
 export(is.geom)
 export(is.ggplot)
@@ -475,6 +474,7 @@ export(is.position)
 export(is.scale)
 export(is.stat)
 export(is.theme)
+export(is.theme_element)
 export(label_both)
 export(label_bquote)
 export(label_context)

NEWS.md

@@ -2,6 +2,10 @@
 
 * When discrete breaks have names, they'll be used as labels by default 
   (@teunbrand, #6147).
+* (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()` 
   (@teunbrand, #6104).
 * New `get_labs()` function for retrieving completed plot labels 
@@ -186,6 +190,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
 
@@ -232,6 +237,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/backports.R

@@ -67,6 +67,6 @@ on_load({
     as.mask <- grid::as.mask
   }
   if ("linearGradient" %in% getNamespaceExports("grid")) {
-    linearGradient <- grid::linearGradient()
+    linearGradient <- grid::linearGradient
   }
 })

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/facet-.R

@@ -237,8 +237,8 @@ Facet <- ggproto("Facet", NULL,
     # Set panel names
     table$layout$name <- paste(
       "panel",
-      rep(seq_len(dim[2]), dim[1]),
-      rep(seq_len(dim[1]), each = dim[2]),
+      rep(seq_len(dim[2]), each = dim[1]),
+      rep(seq_len(dim[1]), dim[2]),
       sep = "-"
     )
 

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)