Merge branch 'main' into revdep_deprecated_theme

Author: teunbrand

R/plot.R

@@ -282,5 +282,8 @@ S7::method(convert, list(from = class_ggplot, to = S7::class_list)) <-
   }
 rm(`convert`)
 
-S7::method(as.list, class_ggplot) <- function(x, ...) convert(x, S7::class_list)
-rm(`as.list`)
+# S7 currently attaches the S3 method to the calling environment which gives `ggplot2:::as.list`
+# Wrap in `local()` to provide a temp environment which throws away the attachment
+local({
+  S7::method(as.list, class_ggplot) <- function(x, ...) convert(x, S7::class_list)
+})

R/theme-elements.R

@@ -33,7 +33,7 @@
 #'   a blank element among its parents will cause this element to be blank as
 #'   well. If `FALSE` any blank parent element will be ignored when
 #'   calculating final element state.
-#' @return An S3 object of class `element`, `rel`, or `margin`.
+#' @return An object of class `element`, `rel`, or `margin`.
 #' @details
 #' The `element_polygon()` and `element_point()` functions are not rendered
 #' in standard plots and just serve as extension points.

R/utilities-help.R

@@ -34,7 +34,7 @@ rd_aesthetics_item <- function(x) {
     paste0("\\strong{\\code{", docs, "}}"),
     paste0("\\code{", docs, "}")
   )
-  paste0(" \u2022 \\tab ", item, " \\tab ", defaults, " \\cr\\cr")
+  paste0(" \u2022 \\tab ", item, " \\tab ", defaults, " \\cr")
 }
 
 rd_defaults <- function(layer, aesthetics) {