resolve merge conflict

Merge branch 'main' into fancy_ggproto_docs

# Conflicts:
#	R/coord-.R
#	R/facet-.R
#	R/guide-.R
#	R/layer.R
#	man/ggplot2-ggproto.Rd

Author: teunbrand

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ggplot2
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
-Version: 3.5.1.9000
+Version: 3.5.2.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0003-4757-117X")),
@@ -31,7 +31,7 @@ URL: https://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
 BugReports: https://github.com/tidyverse/ggplot2/issues
 Depends:
     R (>= 4.0)
-Imports: 
+Imports:
     cli,
     grDevices,
     grid,
@@ -70,9 +70,9 @@ Suggests:
     tibble,
     vdiffr (>= 1.0.6),
     xml2
-Enhances: 
+Enhances:
     sp
-VignetteBuilder: 
+VignetteBuilder:
     knitr
 Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate
 Config/testthat/edition: 3
@@ -81,7 +81,7 @@ Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.2
-Collate: 
+Collate:
     'ggproto.R'
     'ggplot-global.R'
     'aaa-.R'

NAMESPACE

@@ -470,22 +470,26 @@ export(guide_transform)
 export(guides)
 export(has_flipped_aes)
 export(is.Coord)
-export(is.coord)
 export(is.facet)
-export(is.geom)
 export(is.ggplot)
 export(is.ggproto)
-export(is.guide)
-export(is.guides)
-export(is.layer)
-export(is.mapping)
-export(is.margin)
-export(is.position)
-export(is.scale)
-export(is.stat)
 export(is.theme)
-export(is.theme_element)
 export(is.waiver)
+export(is_coord)
+export(is_facet)
+export(is_geom)
+export(is_ggplot)
+export(is_ggproto)
+export(is_guide)
+export(is_guides)
+export(is_layer)
+export(is_mapping)
+export(is_margin)
+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

@@ -111,7 +111,7 @@ aes <- function(x, y, ...) {
 
 #' @export
 #' @rdname is_tests
-is.mapping <- function(x) inherits(x, "uneval")
+is_mapping <- function(x) inherits(x, "uneval")
 
 # Wrap symbolic objects in quosures but pull out constants out of
 # quosures for backward-compatibility

R/aes.R

@@ -120,15 +120,15 @@ compute_bins <- function(x, scale = NULL, breaks = NULL, binwidth = NULL, bins =
                          center = NULL, boundary = NULL,
                          closed = c("right", "left")) {
 
-  range <- if (is.scale(scale)) scale$dimension() else range(x)
+  range <- if (is_scale(scale)) scale$dimension() else range(x)
   check_length(range, 2L)
 
   if (!is.null(breaks)) {
     breaks <- allow_lambda(breaks)
     if (is.function(breaks)) {
       breaks <- breaks(x)
     }
-    if (is.scale(scale) && !scale$is_discrete()) {
+    if (is_scale(scale) && !scale$is_discrete()) {
       breaks <- scale$transform(breaks)
     }
     check_numeric(breaks)

R/bin.R

@@ -689,14 +689,14 @@ Coord <- ggproto("Coord",
 
 #' @export
 #' @rdname is_tests
-is.coord <- function(x) inherits(x, "Coord")
+is_coord <- function(x) inherits(x, "Coord")
 
 #' @export
 #' @rdname is_tests
 #' @usage is.Coord(x) # Deprecated
 is.Coord <- function(x) {
-  deprecate_soft0("3.5.2", "is.Coord()", "is.coord()")
-  is.coord(x)
+  deprecate_soft0("3.5.2", "is.Coord()", "is_coord()")
+  is_coord(x)
 }
 
 # Renders an axis with the correct orientation or zeroGrob if no axis should be

R/coord-.R

@@ -165,7 +165,7 @@ view_scales_from_scale <- function(scale, coord_limits = NULL, expand = TRUE) {
 }
 
 panel_guides_grob <- function(guides, position, theme, labels = NULL) {
-  if (!is.guides(guides)) {
+  if (!is_guides(guides)) {
     return(zeroGrob())
   }
   pair <- guides$get_position(position)

R/coord-cartesian-.R

@@ -11,8 +11,8 @@ NULL
 #'
 #' @details
 #' Extending facets can range from the simple modifications of current facets,
-#' to very laborious rewrites with a lot of [gtable()] manipulation.
-#' For some examples of both, please see the extension vignette.
+#' to very laborious rewrites with a lot of [`gtable()`][gtable::gtable()]
+#' manipulation.For some examples of both, please see the extension vignette.
 #' The object and its parameters are chaperoned by the [Layout] class.
 #'
 #' `Facet` subclasses, like other extendible ggproto classes, have a range
@@ -424,7 +424,7 @@ Facet <- ggproto("Facet", NULL,
   #'
   #' **Value**
   #'
-  #' A [gtable][gtable::gtable] object.
+  #' A [`gtable`][gtable::gtable()] object.
   draw_panels = function(self, panels, layout, x_scales = NULL, y_scales = NULL,
                          ranges, coord, data = NULL, theme, params) {
 
@@ -482,7 +482,7 @@ Facet <- ggproto("Facet", NULL,
   #'
   #' **Value**
   #'
-  #' A [gtable][gtable::gtable] object containing panel grobs prefixed with
+  #' A [`gtable`][gtable::gtable()] object containing panel grobs prefixed with
   #' `"panel"`.
   init_gtable = function(panels, layout, theme, ranges, params,
                          aspect_ratio = NULL) {
@@ -549,7 +549,7 @@ Facet <- ggproto("Facet", NULL,
   #' ```
   #' **Arguments**
   #' \describe{
-  #'   \item{`table`}{A [gtable][gtable()] object populated with panels from the
+  #'   \item{`table`}{A [`gtable`][gtable::gtable()] object populated with panels from the
   #'   `init_gtable()` method.}
   #'   \item{`layout`}{A data frame computed by the `compute_layout()` method.
   #'   Typically contains the faceting variables, `ROW`, `COL`, `PANEL`,
@@ -564,7 +564,7 @@ Facet <- ggproto("Facet", NULL,
   #'
   #' **Value**
   #'
-  #' A [gtable][gtable::gtable] object.
+  #' A [`gtable`][gtable::gtable()] object.
   attach_axes = function(table, layout, ranges, coord, theme, params) {
     table
   },
@@ -582,7 +582,7 @@ Facet <- ggproto("Facet", NULL,
   #' ```
   #' **Arguments**
   #' \describe{
-  #'   \item{`table`}{A [gtable][gtable()] object from the `attach_axes()`
+  #'   \item{`table`}{A [`gtable`][gtable::gtable()] object from the `attach_axes()`
   #'   method.}
   #'   \item{`layout`}{A data frame computed by the `compute_layout()` method.
   #'   Typically contains the faceting variables, `ROW`, `COL`, `PANEL`,
@@ -594,7 +594,7 @@ Facet <- ggproto("Facet", NULL,
   #'
   #' **Value**
   #'
-  #' A [gtable][gtable::gtable] object.
+  #' A [`gtable`][gtable::gtable()] object.
   attach_strips = function(table, layout, params, theme) {
     table
   },
@@ -638,7 +638,7 @@ Facet <- ggproto("Facet", NULL,
   #' ```
   #' **Arguments**
   #' \describe{
-  #'   \item{`table`}{A [gtable][gtable()] object populated by the
+  #'   \item{`table`}{A [`gtable`][gtable::gtable()] object populated by the
   #'   `draw_panels()` method.}
   #'   \item{`theme`}{A [complete theme][complete_theme()] object.}
   #' }
@@ -719,7 +719,7 @@ Facet <- ggproto("Facet", NULL,
   #' ```
   #' **Arguments**
   #' \describe{
-  #'   \item{`panels`}{A [gtable][gtable()] object initiated by the
+  #'   \item{`panels`}{A [`gtable`][gtable::gtable()] object initiated by the
   #'   `draw_panels()` method.}
   #'   \item{`layout`}{A data frame computed by the `compute_layout()` method.
   #'   Typically contains the faceting variables, `ROW`, `COL`, `PANEL`,
@@ -739,7 +739,7 @@ Facet <- ggproto("Facet", NULL,
   #'
   #' **Value**
   #'
-  #' A [gtable][gtable::gtable] object.
+  #' A [`gtable`][gtable::gtable()] object.
   draw_labels = function(panels, layout, x_scales, y_scales, ranges, coord, data, theme, labels, params) {
     panel_dim <-  find_panel(panels)
 
@@ -789,10 +789,6 @@ Facet <- ggproto("Facet", NULL,
   }
 )
 
-#' @export
-#' @rdname is_tests
-is.facet <- function(x) inherits(x, "Facet")
-
 # Helpers -----------------------------------------------------------------
 
 #' Quote faceting variables
@@ -854,6 +850,18 @@ vars <- function(...) {
   quos(...)
 }
 
+#' @export
+#' @rdname is_tests
+is_facet <- function(x) inherits(x, "Facet")
+
+#' @export
+#' @rdname is_tests
+#' @usage is.facet(x) # Deprecated
+is.facet <- function(x) {
+  deprecate_soft0("3.5.2", "is.facet()", "is_facet()")
+  is_facet(x)
+}
+
 #' Accessing a plot's facet strip labels
 #'
 #' This functions retrieves labels from facet strips with the labeller applied.
@@ -964,7 +972,7 @@ as_facets_list <- function(x) {
 }
 
 check_vars <- function(x) {
-  if (is.mapping(x)) {
+  if (is_mapping(x)) {
     cli::cli_abort("Please use {.fn vars} to supply facet variables.")
   }
   # Native pipe have higher precedence than + so any type of gg object can be

R/facet-.R

@@ -94,7 +94,7 @@ fortify.default <- function(model, data, ...) {
     "or an object coercible by {.fn fortify}, or a valid ",
     "{.cls data.frame}-like object coercible by {.fn as.data.frame}"
   )
-  if (is.mapping(model)) {
+  if (is_mapping(model)) {
     msg <- c(
       paste0(msg, ", not ", obj_type_friendly(model), "."),
       "i" = "Did you accidentally pass {.fn aes} to the {.arg data} argument?"

R/fortify.R

@@ -465,7 +465,7 @@ Geom <- ggproto(
 
 #' @export
 #' @rdname is_tests
-is.geom <- function(x) inherits(x, "Geom")
+is_geom <- function(x) inherits(x, "Geom")
 
 eval_from_theme <- function(aesthetics, theme, class = NULL) {
   themed <- is_themed_aes(aesthetics)