fix series of minor issues

Author: teunbrand

R/plot-build.R

@@ -340,8 +340,8 @@ ggplotGrob <- function(x) {
   ggplot_gtable(ggplot_build(x))
 }
 
-S7::method(as.gtable, class_ggplot) <- ggplotGrob
-S7::method(as.gtable, class_ggplot_built) <- ggplotGrob
+S7::method(as.gtable, class_ggplot) <- function(x, ...) ggplotGrob(x)
+S7::method(as.gtable, class_ggplot_built) <- function(x, ...) ggplotGrob(x)
 
 # Apply function to layer and matching data
 by_layer <- function(f, layers, data, step = NULL) {

R/plot-construction.R

@@ -68,6 +68,11 @@ S7::method(`+`, list(class_ggplot, S7::class_any)) <- function(e1, e2) {
   add_ggplot(e1, e2, e2name)
 }
 
+S7::method(`+`, list(theme, S7::class_any)) <- function(e1, e2) {
+  e2name <- deparse(substitute(e2, env = caller_env(2)))
+  add_theme(e1, e2, e2name)
+}
+
 
 #' @rdname gg-add
 #' @export
@@ -88,7 +93,6 @@ add_ggplot <- function(p, object, objectname) {
 #'
 #' @param object An object to add to the plot
 #' @param plot The ggplot object to add `object` to
-#' @param object_name The name of the object to add
 #'
 #' @return A modified ggplot object
 #' @details
@@ -104,19 +108,18 @@ add_ggplot <- function(p, object, objectname) {
 #' @keywords internal
 #' @export
 #' @examples
-#' # making a new method for the generic
-#' # in this example, we apply a text element to the text theme setting
-#' ggplot_add.element_text <- function(object, plot, object_name) {
-#'   plot + theme(text = object)
-#' }
+#' S7::method(ggplot_add, list(S7::new_S3_class("element_text"), class_ggplot)) <-
+#'   function(object, plot, ...) {
+#'     plot + theme(text = object)
+#'   }
 #'
 #' # we can now use `+` to add our object to a plot
 #' ggplot(mpg, aes(displ, cty)) +
 #'   geom_point() +
 #'   element_text(colour = "red")
 #'
 #' # clean-up
-#' rm(ggplot_add.element_text)
+#' rm("element_text", envir = ggplot_add@methods)
 ggplot_add <- S7::new_generic("ggplot_add", c("object", "plot"))
 
 S7::method(ggplot_add, list(S7::class_any, class_ggplot)) <-

R/plot.R

@@ -232,9 +232,8 @@ plot_clone <- function(plot) {
 #' @return Invisibly returns the original plot.
 #' @export
 #' @method print ggplot2::ggplot
-#' @usage
-#' print(x, newpage = is.null(vp), vp = NULL, ...)
-#' plot(x, newpage = is.null(vp), vp = NULL, ...)
+#' @name print.ggplot
+#' @aliases print.ggplot2::ggplot plot.ggplot2::ggplot
 #' @examples
 #' colours <- list(~class, ~drv, ~fl)
 #'
@@ -249,9 +248,7 @@ plot_clone <- function(plot) {
 #'   print(ggplot(mpg, aes_(~ displ, ~ hwy, colour = colour)) +
 #'     geom_point())
 #' }
-`print.ggplot2::ggplot` <-
-  S7::method(plot, class_ggplot) <-
-  function(x, newpage = is.null(vp), vp = NULL, ...) {
+`print.ggplot2::ggplot` <- function(x, newpage = is.null(vp), vp = NULL, ...) {
   set_last_plot(x)
   if (newpage) grid.newpage()
 
@@ -281,6 +278,8 @@ plot_clone <- function(plot) {
   invisible(x)
 }
 
+S7::method(plot, class_ggplot) <- `print.ggplot2::ggplot`
+
 #' @export
 `$.ggplot2::gg` <- function(x, i) {
   `[[`(S7::props(x), i)

R/summary.R

@@ -1,9 +1,11 @@
 #' Displays a useful description of a ggplot object
 #'
+#' @noRd
 #' @param object ggplot2 object to summarise
 #' @param ... other arguments ignored (for compatibility with generic)
 #' @keywords internal
 #' @name summary.ggplot
+#' @aliases summary.ggplot summary.ggplot2::ggplot
 #' @usage summary(object, ...)
 #' @examples
 #' p <- ggplot(mtcars, aes(mpg, wt)) +