Merge branch 'main' into type-date_breaks

Author: teunbrand

DESCRIPTION

@@ -39,11 +39,9 @@ Imports:
     isoband,
     lifecycle (> 1.0.1),
     MASS,
-    mgcv,
     rlang (>= 1.1.0),
     scales (>= 1.3.0),
     stats,
-    tibble,
     vctrs (>= 0.6.0),
     withr (>= 2.5.0)
 Suggests:
@@ -55,6 +53,7 @@ Suggests:
     knitr,
     mapproj,
     maps,
+    mgcv,
     multcomp,
     munsell,
     nlme,
@@ -67,6 +66,7 @@ Suggests:
     sf (>= 0.7-3),
     svglite (>= 2.1.2),
     testthat (>= 3.1.5),
+    tibble,
     vdiffr (>= 1.0.6),
     xml2
 Enhances: 

NAMESPACE

@@ -344,6 +344,7 @@ export(draw_key_vpath)
 export(dup_axis)
 export(el_def)
 export(element_blank)
+export(element_geom)
 export(element_grob)
 export(element_line)
 export(element_rect)
@@ -367,6 +368,7 @@ export(find_panel)
 export(flip_data)
 export(flipped_names)
 export(fortify)
+export(from_theme)
 export(geom_abline)
 export(geom_area)
 export(geom_bar)
@@ -422,6 +424,7 @@ export(geom_violin)
 export(geom_vline)
 export(get_alt_text)
 export(get_element_tree)
+export(get_geom_defaults)
 export(get_guide_data)
 export(get_last_plot)
 export(get_layer_data)
@@ -513,6 +516,8 @@ export(remove_missing)
 export(render_axes)
 export(render_strips)
 export(replace_theme)
+export(reset_geom_defaults)
+export(reset_stat_defaults)
 export(reset_theme_settings)
 export(resolution)
 export(scale_alpha)
@@ -733,7 +738,6 @@ importFrom(grid,unit)
 importFrom(lifecycle,deprecated)
 importFrom(scales,alpha)
 importFrom(stats,setNames)
-importFrom(tibble,tibble)
 importFrom(utils,.DollarNames)
 importFrom(utils,head)
 importFrom(utils,tail)

NEWS.md

@@ -2,6 +2,41 @@
 
 * Date(time) scales now throw appropriate errors when `date_breaks`, 
   `date_minor_breaks` or `date_labels` are not strings (@RodDalBen, #5880)
+* The `summary()` method for ggplots is now more terse about facets 
+  (@teunbrand, #5989).
+* `guide_bins()`, `guide_colourbar()` and `guide_coloursteps()` gain an `angle`
+  argument to overrule theme settings, similar to `guide_axis(angle)` 
+  (@teunbrand, #4594).
+* `coord_*(expand)` can now take a logical vector to control expansion at any
+  side of the panel (top, right, bottom, left) (@teunbrand, #6020)
+* (Breaking) The defaults for all geoms can be set at one in the theme. 
+  (@teunbrand based on pioneering work by @dpseidel, #2239)
+    * A new `theme(geom)` argument is used to track these defaults.
+    * The `element_geom()` function can be used to populate that argument.
+    * The `from_theme()` function allows access to the theme default fields from
+      inside the `aes()` function.
+* Passing empty unmapped aesthetics to layers raises a warning instead of
+  throwing an error (@teunbrand, #6009).
+* Moved {mgcv} from Imports to Suggests (@teunbrand, #5986)
+* New `reset_geom_defaults()` and `reset_stat_defaults()` to restore all geom or
+  stat default aesthetics at once (@teunbrand, #5975).
+* `facet_wrap()` can have `space = "free_x"` with 1-row layouts and 
+  `space = "free_y"` with 1-column layouts (@teunbrand)
+* Secondary axes respect `n.breaks` setting in continuous scales (@teunbrand, #4483).
+* Layers can have names (@teunbrand, #4066).
+* (internal) improvements to `pal_qualitative()` (@teunbrand, #5013)
+* `coord_radial(clip = "on")` clips to the panel area when the graphics device
+  supports clipping paths (@teunbrand, #5952).
+* (internal) Panel clipping responsibility moved from Facet class to Coord 
+  class through new `Coord$draw_panel()` method.
+* `theme(strip.clip)` now defaults to `"on"` and is independent of Coord 
+  clipping (@teunbrand, 5952).
+* (internal) rearranged the code of `Facet$draw_panels()` method (@teunbrand).
+* Axis labels are now justified across facet panels (@teunbrand, #5820)
+* Fixed bug in `stat_function()` so x-axis title now produced automatically 
+  when no data added. (@phispu, #5647).
+* geom_sf now accepts shape names (@sierrajohnson, #5808)
+* Added `gg` class to `labs()` (@phispu, #5553).
 * Missing values from discrete palettes are no longer translated 
   (@teunbrand, #5929).
 * Fixed bug in `facet_grid(margins = TRUE)` when using expresssions 
@@ -135,6 +170,16 @@
   (@teunbrand, #5938, #4327).
 * Fixed bug where empty discrete scales weren't recognised as such 
   (@teunbrand, #5945).
+* (internal) The summary function of `stat_summary()` and `stat_summary_bin()` 
+  is setup once in total instead of once per group (@teunbrand, #5971)
+* `facet_grid(space = "free")` can now be combined with `coord_fixed()` 
+  (@teunbrand, #4584).
+* `theme_classic()` now has black ticks and text instead of dark gray. In 
+  addition, `theme_classic()`'s axis line end is `"square"` (@teunbrand, #5978).
+* {tibble} is now suggested instead of imported (@teunbrand, #5986)
+* 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).
 
 # ggplot2 3.5.1
 

R/aes-evaluation.R

@@ -109,6 +109,13 @@
 #'     fun.data = ~ round(data.frame(mean = mean(.x), sd = sd(.x)), 2)
 #'   )
 #' ```
+#'
+#' ## Theme access
+#' The `from_theme()` function can be used to acces the [`element_geom()`]
+#' fields of the `theme(geom)` argument. Using `aes(colour = from_theme(ink))`
+#' and `aes(colour = from_theme(accent))` allows swapping between foreground and
+#' accent colours.
+#'
 #' @rdname aes_eval
 #' @name aes_eval
 #'
@@ -192,6 +199,13 @@ stat <- function(x) {
 after_scale <- function(x) {
   x
 }
+
+#' @rdname aes_eval
+#' @export
+from_theme <- function(x) {
+  x
+}
+
 #' @rdname aes_eval
 #' @export
 stage <- function(start = NULL, after_stat = NULL, after_scale = NULL) {
@@ -221,6 +235,9 @@ is_scaled_aes <- function(aesthetics) {
 is_staged_aes <- function(aesthetics) {
   vapply(aesthetics, is_staged, logical(1), USE.NAMES = FALSE)
 }
+is_themed_aes <- function(aesthetics) {
+  vapply(aesthetics, is_themed, logical(1), USE.NAMES = FALSE)
+}
 is_calculated <- function(x, warn = FALSE) {
   if (is_call(get_expr(x), "after_stat")) {
     return(TRUE)
@@ -263,6 +280,9 @@ is_scaled <- function(x) {
 is_staged <- function(x) {
   is_call(get_expr(x), "stage")
 }
+is_themed <- function(x) {
+  is_call(get_expr(x), "from_theme")
+}
 
 # Strip dots from expressions
 strip_dots <- function(expr, env, strip_pronoun = FALSE) {

R/annotation-logticks.R

@@ -165,7 +165,7 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
 
       names(xticks)[names(xticks) == "value"] <- x_name   # Rename to 'x' for coordinates$transform
       xticks <- coord$transform(xticks, panel_params)
-      xticks = xticks[xticks$x <= 1 & xticks$x >= 0,]
+      xticks <- xticks[xticks$x <= 1 & xticks$x >= 0,]
 
       if (outside)
         xticks$end = -xticks$end
@@ -203,7 +203,7 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
 
       names(yticks)[names(yticks) == "value"] <- y_name   # Rename to 'y' for coordinates$transform
       yticks <- coord$transform(yticks, panel_params)
-      yticks = yticks[yticks$y <= 1 & yticks$y >= 0,]
+      yticks <- yticks[yticks$y <= 1 & yticks$y >= 0,]
 
       if (outside)
         yticks$end = -yticks$end
@@ -228,7 +228,12 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
     gTree(children = inject(gList(!!!ticks)))
   },
 
-  default_aes = aes(colour = "black", linewidth = 0.5, linetype = 1, alpha = 1)
+  default_aes = aes(
+    colour = from_theme(ink),
+    linewidth = from_theme(linewidth),
+    linetype = from_theme(linetype),
+    alpha = 1
+  )
 )
 
 
@@ -238,7 +243,7 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
 # - start: on the other axis, start position of the line (usually 0)
 # - end: on the other axis, end position of the line (for example, .1, .2, or .3)
 calc_logticks <- function(base = 10, ticks_per_base = base - 1,
-    minpow = 0, maxpow = minpow + 1, start = 0, shortend = .1, midend = .2, longend = .3) {
+    minpow = 0, maxpow = minpow + 1, start = 0, shortend = 0.1, midend = 0.2, longend = 0.3) {
 
   # Number of blocks of tick marks
   reps <- maxpow - minpow

R/axis-secondary.R

@@ -188,7 +188,13 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
       if (scale$is_discrete()) {
         self$breaks <- scale$get_breaks()
       } else {
-        self$breaks <- scale$get_transformation()$breaks
+        breaks <- scale$get_transformation()$breaks
+        n_breaks <- scale$n.breaks
+        if (!is.null(n_breaks) && "n" %in% fn_fmls_names(breaks)) {
+          self$breaks <- function(x) breaks(x, n = n_breaks)
+        } else {
+          self$breaks <- breaks
+        }
       }
     }
     if (is.derived(self$labels)) self$labels <- scale$labels

R/bin.R

@@ -165,7 +165,7 @@ bin_vector <- function(x, bins, weight = NULL, pad = FALSE) {
   }
 
   # Add row for missings
-  if (any(is.na(bins))) {
+  if (anyNA(bins)) {
     bin_count <- c(bin_count, sum(is.na(bins)))
     bin_widths <- c(bin_widths, NA)
     bin_x <- c(bin_x, NA)

R/compat-plyr.R

@@ -54,13 +54,13 @@ rename <- function(x, replace) {
 id_var <- function(x, drop = FALSE) {
   if (length(x) == 0) {
     id <- integer()
-    n = 0L
+    n <- 0L
   } else if (!is.null(attr(x, "n")) && !drop) {
     return(x)
   } else if (is.factor(x) && !drop) {
     x <- addNA(x, ifany = TRUE)
     id <- as.integer(x)
-    n <- length(levels(x))
+    n <- nlevels(x)
   } else {
     levels <- sort(unique0(x), na.last = TRUE)
     id <- match(x, levels)

R/coord-.R

@@ -184,10 +184,11 @@ Coord <- ggproto("Coord",
   # Will generally have to return FALSE for coordinate systems that enforce a fixed aspect ratio.
   is_free = function() FALSE,
 
-  setup_params = function(data) {
+  setup_params = function(self, data) {
     list(
       guide_default = guide_axis(),
-      guide_missing = guide_none()
+      guide_missing = guide_none(),
+      expand = parse_coord_expand(self$expand %||% TRUE)
     )
   },
 
@@ -208,6 +209,20 @@ Coord <- ggproto("Coord",
   # used as a fudge for CoordFlip and CoordPolar
   modify_scales = function(scales_x, scales_y) {
     invisible()
+  },
+
+  draw_panel = function(self, panel, params, theme) {
+    fg <- self$render_fg(params, theme)
+    bg <- self$render_bg(params, theme)
+    if (isTRUE(theme$panel.ontop)) {
+      panel <- list2(!!!panel, bg, fg)
+    } else {
+      panel <- list2(bg, !!!panel, fg)
+    }
+    gTree(
+      children = inject(gList(!!!panel)),
+      vp = viewport(clip = self$clip)
+    )
   }
 )
 
@@ -229,6 +244,26 @@ render_axis <- function(panel_params, axis, scale, position, theme) {
   }
 }
 
+# Elaborates an 'expand' argument for every side (top, right, bottom or left)
+parse_coord_expand <- function(expand) {
+  check_logical(expand)
+  if (anyNA(expand)) {
+    cli::cli_abort("{.arg expand} cannot contain missing values.")
+  }
+
+  if (!is_named(expand)) {
+    return(rep_len(expand, 4))
+  }
+
+  # Match by top/right/bottom/left
+  out <- rep(TRUE, 4)
+  i <- match(names(expand), .trbl)
+  if (sum(!is.na(i)) > 0) {
+    out[i] <- unname(expand)[!is.na(i)]
+  }
+  out
+}
+
 # Utility function to check coord limits
 check_coord_limits <- function(
     limits, arg = caller_arg(limits), call = caller_env()

R/coord-cartesian-.R

@@ -9,6 +9,10 @@
 #' @param expand If `TRUE`, the default, adds a small expansion factor to
 #'   the limits to ensure that data and axes don't overlap. If `FALSE`,
 #'   limits are taken exactly from the data or `xlim`/`ylim`.
+#'   Giving a logical vector will separately control the expansion for the four
+#'   directions (top, left, bottom and right). The `expand` argument will be
+#'   recycled to length 4 if necessary. Alternatively, can be a named logical
+#'   vector to control a single direction, e.g. `expand = c(bottom = FALSE)`.
 #' @param default Is this the default coordinate system? If `FALSE` (the default),
 #'   then replacing this coordinate system with another one creates a message alerting
 #'   the user that the coordinate system is being replaced. If `TRUE`, that warning
@@ -100,8 +104,8 @@ CoordCartesian <- ggproto("CoordCartesian", Coord,
 
   setup_panel_params = function(self, scale_x, scale_y, params = list()) {
     c(
-      view_scales_from_scale(scale_x, self$limits$x, self$expand),
-      view_scales_from_scale(scale_y, self$limits$y, self$expand)
+      view_scales_from_scale(scale_x, self$limits$x, params$expand[c(4, 2)]),
+      view_scales_from_scale(scale_y, self$limits$y, params$expand[c(3, 1)])
     )
   },