Merge branch 'main' into relative_legend_spacing

Author: teunbrand

.github/workflows/test-coverage.yaml

@@ -35,14 +35,16 @@ jobs:
             clean = FALSE,
             install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
+          print(cov)
           covr::to_cobertura(cov)
         shell: Rscript {0}
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
-          fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
-          file: ./cobertura.xml
-          plugin: noop
+          # Fail if error if not on PR, or if on PR and token is given
+          fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
+          files: ./cobertura.xml
+          plugins: noop
           disable_search: true
           token: ${{ secrets.CODECOV_TOKEN }}
 

DESCRIPTION

@@ -20,7 +20,8 @@ Authors@R: c(
            comment = c(ORCID = "0000-0002-9415-4582")),
     person("Teun", "van den Brand", role = "aut",
            comment = c(ORCID = "0000-0002-9335-7468")),
-    person("Posit, PBC", role = c("cph", "fnd"))
+    person("Posit, PBC", role = c("cph", "fnd"),
+           comment = c(ROR = "03wc8by49"))
   )
 Description: A system for 'declaratively' creating graphics, based on "The
     Grammar of Graphics". You provide the data, tell 'ggplot2' how to map
@@ -30,7 +31,7 @@ License: MIT + file LICENSE
 URL: https://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
 BugReports: https://github.com/tidyverse/ggplot2/issues
 Depends:
-    R (>= 4.0)
+    R (>= 4.1)
 Imports:
     cli,
     grDevices,
@@ -63,6 +64,7 @@ Suggests:
     ragg (>= 1.2.6),
     RColorBrewer,
     rmarkdown,
+    roxygen2,
     rpart,
     sf (>= 0.7-3),
     svglite (>= 2.1.2),
@@ -76,7 +78,7 @@ VignetteBuilder:
     knitr
 Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate
 Config/testthat/edition: 3
-Config/usethis/last-upkeep: 2024-10-24
+Config/usethis/last-upkeep: 2025-04-23
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
@@ -93,6 +95,7 @@ Collate:
     'compat-plyr.R'
     'utilities.R'
     'aes.R'
+    'annotation-borders.R'
     'utilities-checks.R'
     'legend-draw.R'
     'geom-.R'

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2024
+YEAR: 2025
 COPYRIGHT HOLDER: ggplot2 core developer team

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2024 ggplot2 core developer team
+Copyright (c) 2025 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

@@ -28,6 +28,7 @@ S3method(element_grob,element_rect)
 S3method(element_grob,element_text)
 S3method(format,ggproto)
 S3method(format,ggproto_method)
+S3method(format,rd_section_aesthetics)
 S3method(fortify,"NULL")
 S3method(fortify,"function")
 S3method(fortify,Line)
@@ -297,6 +298,7 @@ export(after_scale)
 export(after_stat)
 export(alpha)
 export(annotate)
+export(annotation_borders)
 export(annotation_custom)
 export(annotation_logticks)
 export(annotation_map)

NEWS.md

@@ -1,7 +1,9 @@
 # ggplot2 (development version)
 
-* The `theme(legend.spacing.{x/y})` setting now accepts `null`-units 
-  (@teunbrand, #6417).
+* New roxygen tag `@aesthetics` that takes a Geom, Stat or Position class and
+  generates an 'Aesthetics' section.
+* `annotation_borders()` replaces the now-deprecated `borders()` 
+  (@teunbrand, #6392)
 * New `make_constructor()` function that builds a standard constructor for
   Geom and Stat classes (@teunbrand, #6142).
 * In continuous scales, when `breaks` is a function and `n.breaks` is set, the 
@@ -348,6 +350,8 @@
   (@teunbrand, #6269).
 * The default colour and fill scales have a new `palette` argument
   (@teunbrand, #6064).
+* The `theme(legend.spacing.{x/y})` setting now accepts `null`-units 
+  (@teunbrand, #6417).
 
 # ggplot2 3.5.2
 

R/annotation-borders.R

@@ -0,0 +1,51 @@
+#' Create a layer of map borders
+#'
+#' This is a quick and dirty way to get map data (from the \pkg{maps} package)
+#' onto your plot. This is a good place to start if you need some crude
+#' reference lines, but you'll typically want something more sophisticated
+#' for communication graphics.
+#'
+#' @param database map data, see [maps::map()] for details
+#' @param regions map region
+#' @param fill fill colour
+#' @param colour border colour
+#' @param xlim,ylim latitudinal and longitudinal ranges for extracting map
+#'   polygons, see [maps::map()] for details.
+#' @inheritDotParams geom_polygon
+#' @export
+#' @examples
+#' if (require("maps")) {
+#' data(us.cities)
+#' capitals <- subset(us.cities, capital == 2)
+#' ggplot(capitals, aes(long, lat)) +
+#'   annotation_borders("state") +
+#'   geom_point(aes(size = pop)) +
+#'   scale_size_area() +
+#'   coord_quickmap()
+#' }
+#'
+#' if (require("maps")) {
+#' # Same map, with some world context
+#' ggplot(capitals, aes(long, lat)) +
+#'   annotation_borders("world", xlim = c(-130, -60), ylim = c(20, 50)) +
+#'   geom_point(aes(size = pop)) +
+#'   scale_size_area() +
+#'   coord_quickmap()
+#' }
+annotation_borders <- function(database = "world", regions = ".", fill = NA,
+                               colour = "grey50", xlim = NULL, ylim = NULL, ...) {
+  df <- map_data(database, regions, xlim = xlim, ylim = ylim)
+  annotate(
+    geom = "polygon",
+    x = df$long, y = df$lat, group = df$group,
+    fill = fill, colour = colour, ...
+  )
+}
+
+#' @export
+#' @rdname annotation_borders
+#' @usage borders(...) # Deprecated
+borders <- function(...) {
+  deprecate_soft0("4.0.0", "borders()", "annotation_borders()")
+  annotation_borders(...)
+}

R/annotation-logticks.R

@@ -43,11 +43,11 @@
 #' a <- ggplot(msleep, aes(bodywt, brainwt)) +
 #'  geom_point(na.rm = TRUE) +
 #'  scale_x_log10(
-#'    breaks = scales::trans_breaks("log10", function(x) 10^x),
+#'    breaks = scales::trans_breaks("log10", \(x) 10^x),
 #'    labels = scales::trans_format("log10", scales::math_format(10^.x))
 #'  ) +
 #'  scale_y_log10(
-#'    breaks = scales::trans_breaks("log10", function(x) 10^x),
+#'    breaks = scales::trans_breaks("log10", \(x) 10^x),
 #'    labels = scales::trans_format("log10", scales::math_format(10^.x))
 #'  ) +
 #'  theme_bw()
@@ -93,6 +93,8 @@ annotation_logticks <- function(base = 10, sides = "bl", outside = FALSE, scaled
   if (!is.null(color))
     colour <- color
 
+  lifecycle::signal_stage("superseded", "annotation_logticks()", "guide_axis_logticks()")
+
   if (lifecycle::is_present(size)) {
     deprecate_soft0("3.5.0", I("Using the `size` aesthetic in this geom"), I("`linewidth`"))
     linewidth <- linewidth %||% size

R/coord-flip.R

@@ -57,6 +57,7 @@
 #'   geom_area() +
 #'   coord_flip()
 coord_flip <- function(xlim = NULL, ylim = NULL, expand = TRUE, clip = "on") {
+  lifecycle::signal_stage("superseded", "coord_flip()")
   check_coord_limits(xlim)
   check_coord_limits(ylim)
   ggproto(NULL, CoordFlip,

R/coord-map.R

@@ -136,7 +136,7 @@ coord_map <- function(projection="mercator", ..., parameters = NULL, orientation
   } else {
     params <- parameters
   }
-
+  lifecycle::signal_stage("superseded", "coord_map()", "coord_sf()")
   check_coord_limits(xlim)
   check_coord_limits(ylim)