Merge remote-tracking branch 'upstream/master' into feature/geom-ribbon-line

Author: yutannihilation

NAMESPACE

@@ -426,6 +426,8 @@ export(scale_alpha_manual)
 export(scale_alpha_ordinal)
 export(scale_color_brewer)
 export(scale_color_continuous)
+export(scale_color_date)
+export(scale_color_datetime)
 export(scale_color_discrete)
 export(scale_color_distiller)
 export(scale_color_gradient)
@@ -435,6 +437,7 @@ export(scale_color_grey)
 export(scale_color_hue)
 export(scale_color_identity)
 export(scale_color_manual)
+export(scale_color_ordinal)
 export(scale_color_viridis_c)
 export(scale_color_viridis_d)
 export(scale_colour_brewer)

NEWS.md

@@ -1,5 +1,8 @@
 # ggplot2 (development version)
 
+* `Geom` now gains a `setup_params()` method in line with the other ggproto
+  classes (@thomasp85, #3509)
+
 * `element_text()` now issues a warning when vectorized arguments are provided, as in
   `colour = c("red", "green", "blue")`. Such use is discouraged and not officially supported
    (@clauswilke, #3492).

R/data.R

@@ -100,7 +100,7 @@
 #'   \item{year}{year of manufacture}
 #'   \item{cyl}{number of cylinders}
 #'   \item{trans}{type of transmission}
-#'   \item{drv}{f = front-wheel drive, r = rear wheel drive, 4 = 4wd}
+#'   \item{drv}{the type of drive train, where f = front-wheel drive, r = rear wheel drive, 4 = 4wd}
 #'   \item{cty}{city miles per gallon}
 #'   \item{hwy}{highway miles per gallon}
 #'   \item{fl}{fuel type}

R/geom-.r

@@ -104,6 +104,8 @@ Geom <- ggproto("Geom",
     stop("Not implemented")
   },
 
+  setup_params = function(data, params) params,
+
   setup_data = function(data, params) data,
 
   # Combine data with defaults and set aesthetics from parameters

R/layer.r

@@ -340,8 +340,8 @@ Layer <- ggproto("Layer", NULL,
       c(names(data), names(self$aes_params)),
       snake_class(self$geom)
     )
-
-    self$geom$setup_data(data, c(self$geom_params, self$aes_params))
+    self$geom_params <- self$geom$setup_params(data, c(self$geom_params, self$aes_params))
+    self$geom$setup_data(data, self$geom_params)
   },
 
   compute_position = function(self, data, layout) {

R/zxx.r

@@ -10,6 +10,11 @@ scale_colour_discrete <- scale_colour_hue
 #' @usage NULL
 scale_colour_ordinal <- scale_colour_viridis_d
 
+#' @export
+#' @rdname scale_viridis
+#' @usage NULL
+scale_color_ordinal <- scale_colour_ordinal
+
 #' @export
 #' @rdname scale_gradient
 #' @usage NULL
@@ -29,6 +34,11 @@ scale_colour_datetime <- function(...,
   )
 }
 
+#' @export
+#' @rdname scale_gradient
+#' @usage NULL
+scale_color_datetime <- scale_colour_datetime
+
 #' @export
 #' @rdname scale_gradient
 #' @usage NULL
@@ -48,6 +58,12 @@ scale_colour_date <- function(...,
   )
 }
 
+
+#' @export
+#' @rdname scale_gradient
+#' @usage NULL
+scale_color_date <- scale_colour_date
+
 #' @export
 #' @rdname scale_hue
 #' @usage NULL