Merge branch 'main' into absorb_coord_fixed

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)

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)

NEWS.md

@@ -3,6 +3,11 @@
 * New `coord_cartesian(ratio)` argument that absorbs the aspect ratio 
   functionality from `coord_equal()` and `coord_fixed()`, which are now 
   wrappers for `coord_cartesian()`.
+* Better handling of the `guide_axis_logticks(negative.small)` parameter when
+  scale limits have small maximum (@teunbrand, #6121).
+* Fixed bug where the `ggplot2::`-prefix did not work with `stage()` 
+* 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

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)
 

R/coord-polar.R

@@ -1,69 +1,9 @@
-#' Polar coordinates
-#'
-#' The polar coordinate system is most commonly used for pie charts, which
-#' are a stacked bar chart in polar coordinates. `coord_radial()` has extended
-#' options.
-#'
-#' @param theta variable to map angle to (`x` or `y`)
-#' @param start Offset of starting point from 12 o'clock in radians. Offset
-#'   is applied clockwise or anticlockwise depending on value of `direction`.
-#' @param direction 1, clockwise; -1, anticlockwise
-#' @param clip Should drawing be clipped to the extent of the plot panel? A
-#'   setting of `"on"` (the default) means yes, and a setting of `"off"`
-#'   means no. For details, please see [`coord_cartesian()`].
+#' @rdname coord_radial
 #' @export
-#' @seealso
-#' The `r link_book("polar coordinates section", "coord#polar-coordinates-with-coord_polar")`
-#' @examples
-#' # NOTE: Use these plots with caution - polar coordinates has
-#' # major perceptual problems.  The main point of these examples is
-#' # to demonstrate how these common plots can be described in the
-#' # grammar.  Use with EXTREME caution.
-#'
-#' # A pie chart = stacked bar chart + polar coordinates
-#' pie <- ggplot(mtcars, aes(x = factor(1), fill = factor(cyl))) +
-#'  geom_bar(width = 1)
-#' pie + coord_polar(theta = "y")
-#'
-#' \donttest{
-#'
-#' # A coxcomb plot = bar chart + polar coordinates
-#' cxc <- ggplot(mtcars, aes(x = factor(cyl))) +
-#'   geom_bar(width = 1, colour = "black")
-#' cxc + coord_polar()
-#' # A new type of plot?
-#' cxc + coord_polar(theta = "y")
-#'
-#' # The bullseye chart
-#' pie + coord_polar()
-#'
-#' # Hadley's favourite pie chart
-#' df <- data.frame(
-#'   variable = c("does not resemble", "resembles"),
-#'   value = c(20, 80)
-#' )
-#' ggplot(df, aes(x = "", y = value, fill = variable)) +
-#'   geom_col(width = 1) +
-#'   scale_fill_manual(values = c("red", "yellow")) +
-#'   coord_polar("y", start = pi / 3) +
-#'   labs(title = "Pac man")
-#'
-#' # Windrose + doughnut plot
-#' if (require("ggplot2movies")) {
-#' movies$rrating <- cut_interval(movies$rating, length = 1)
-#' movies$budgetq <- cut_number(movies$budget, 4)
-#'
-#' doh <- ggplot(movies, aes(x = rrating, fill = budgetq))
-#'
-#' # Wind rose
-#' doh + geom_bar(width = 1) + coord_polar()
-#' # Race track plot
-#' doh + geom_bar(width = 0.9, position = "fill") + coord_polar(theta = "y")
-#' }
-#' }
 coord_polar <- function(theta = "x", start = 0, direction = 1, clip = "on") {
   theta <- arg_match0(theta, c("x", "y"))
   r <- if (theta == "x") "y" else "x"
+  lifecycle::signal_stage("superseded", "coord_polar()", "coord_radial()")
 
   ggproto(NULL, CoordPolar,
     theta = theta,