Write methods for external generics as S7

Author: teunbrand

NAMESPACE

@@ -58,7 +58,6 @@ S3method(ggplot_build,ggplot)
 S3method(ggplot_build,ggplot_built)
 S3method(ggplot_gtable,ggplot_built)
 S3method(grid.draw,absoluteGrob)
-S3method(grid.draw,ggplot)
 S3method(grobHeight,absoluteGrob)
 S3method(grobHeight,zeroGrob)
 S3method(grobWidth,absoluteGrob)
@@ -87,19 +86,16 @@ S3method(pattern_alpha,GridPattern)
 S3method(pattern_alpha,GridTilingPattern)
 S3method(pattern_alpha,default)
 S3method(pattern_alpha,list)
-S3method(plot,ggplot)
 S3method(predictdf,default)
 S3method(predictdf,glm)
 S3method(predictdf,locfit)
 S3method(predictdf,loess)
 S3method(print,"ggplot2::mapping")
 S3method(print,element)
-S3method(print,ggplot)
 S3method(print,ggplot2_bins)
 S3method(print,ggproto)
 S3method(print,ggproto_method)
 S3method(print,rel)
-S3method(print,theme)
 S3method(scale_type,Date)
 S3method(scale_type,POSIXt)
 S3method(scale_type,character)
@@ -113,7 +109,6 @@ S3method(scale_type,logical)
 S3method(scale_type,numeric)
 S3method(scale_type,ordered)
 S3method(scale_type,sfc)
-S3method(summary,ggplot)
 S3method(vec_cast,character.mapped_discrete)
 S3method(vec_cast,double.mapped_discrete)
 S3method(vec_cast,factor.mapped_discrete)

R/plot.R

@@ -194,8 +194,10 @@ plot_clone <- function(plot) {
 #' @param ... other arguments not used by this method
 #' @keywords hplot
 #' @return Invisibly returns the original plot.
-#' @export
-#' @method print ggplot
+#' @name print.ggplot
+#' @usage
+#' print(x, newpage = is.null(vp), vp = NULL, ...)
+#' plot(x, newpage = is.null(vp), vp = NULL, ...)
 #' @examples
 #' colours <- list(~class, ~drv, ~fl)
 #'
@@ -210,7 +212,9 @@ plot_clone <- function(plot) {
 #'   print(ggplot(mpg, aes_(~ displ, ~ hwy, colour = colour)) +
 #'     geom_point())
 #' }
-print.ggplot <- function(x, newpage = is.null(vp), vp = NULL, ...) {
+S7::method(print, class_ggplot) <-
+  S7::method(plot, class_ggplot) <-
+  function(x, newpage = is.null(vp), vp = NULL, ...) {
   set_last_plot(x)
   if (newpage) grid.newpage()
 
@@ -239,7 +243,3 @@ print.ggplot <- function(x, newpage = is.null(vp), vp = NULL, ...) {
 
   invisible(x)
 }
-#' @rdname print.ggplot
-#' @method plot ggplot
-#' @export
-plot.ggplot <- print.ggplot

R/save.R

@@ -313,10 +313,7 @@ validate_device <- function(device, filename = NULL, dpi = 300, call = caller_en
   dev
 }
 
-#' @export
-grid.draw.ggplot <- function(x, recording = TRUE) {
-  print(x)
-}
+S7::method(grid.draw, class_ggplot) <- function(x, recording = TRUE) print(x)
 
 absorb_grdevice_args <- function(f) {
   function(..., type, antialias) {

R/summary.R

@@ -3,13 +3,13 @@
 #' @param object ggplot2 object to summarise
 #' @param ... other arguments ignored (for compatibility with generic)
 #' @keywords internal
-#' @method summary ggplot
-#' @export
+#' @name summary.ggplot
+#' @usage summary(object, ...)
 #' @examples
 #' p <- ggplot(mtcars, aes(mpg, wt)) +
 #'   geom_point()
 #' summary(p)
-summary.ggplot <- function(object, ...) {
+S7::method(summary, class_ggplot) <- function(object, ...) {
   wrap <- function(x) paste(
     paste(strwrap(x, exdent = 2), collapse = "\n"),
     "\n", sep = ""

R/theme.R

@@ -959,5 +959,4 @@ combine_elements <- function(e1, e2) {
   .subset2(x, ...)
 }
 
-#' @export
-print.theme <- function(x, ...) utils::str(x)
+S7::method(print, theme) <- function(x, ...) utils::str(x)