Rename proto2 to ggproto

Author: wch

DESCRIPTION

@@ -41,7 +41,7 @@ URL: http://ggplot2.org, https://github.com/hadley/ggplot2
 BugReports: https://github.com/hadley/ggplot2/issues
 LazyData: true
 Collate:
-    'proto2.r'
+    'ggproto.r'
     'aaa-.r'
     'aaa-constants.r'
     'aes-calculated.r'

NAMESPACE

@@ -1,11 +1,11 @@
 # Generated by roxygen2 (4.1.1): do not edit by hand
 
-S3method("$",proto2)
+S3method("$",ggproto)
 S3method("+",gg)
 S3method("[",uneval)
-S3method("[[",proto2)
+S3method("[[",ggproto)
 S3method(as.character,uneval)
-S3method(as.list,proto2)
+S3method(as.list,ggproto)
 S3method(autoplot,default)
 S3method(coord_aspect,default)
 S3method(coord_aspect,fixed)
@@ -73,8 +73,8 @@ S3method(facet_vars,null)
 S3method(facet_vars,wrap)
 S3method(finite.cases,data.frame)
 S3method(format,facet)
-S3method(format,proto2)
-S3method(format,proto2_method)
+S3method(format,ggproto)
+S3method(format,ggproto_method)
 S3method(fortify,"NULL")
 S3method(fortify,Line)
 S3method(fortify,Lines)
@@ -130,8 +130,8 @@ S3method(predictdf,loess)
 S3method(print,element)
 S3method(print,facet)
 S3method(print,ggplot)
-S3method(print,proto2)
-S3method(print,proto2_method)
+S3method(print,ggproto)
+S3method(print,ggproto_method)
 S3method(print,rel)
 S3method(print,scale)
 S3method(print,theme)
@@ -282,6 +282,7 @@ export(ggplot)
 export(ggplotGrob)
 export(ggplot_build)
 export(ggplot_gtable)
+export(ggproto)
 export(ggsave)
 export(ggtitle)
 export(guide_colorbar)
@@ -291,7 +292,7 @@ export(guides)
 export(is.coord)
 export(is.facet)
 export(is.ggplot)
-export(is.proto2)
+export(is.ggproto)
 export(is.theme)
 export(label_both)
 export(label_bquote)
@@ -316,7 +317,6 @@ export(position_jitter)
 export(position_jitterdodge)
 export(position_nudge)
 export(position_stack)
-export(proto2)
 export(qplot)
 export(quickplot)
 export(rel)

NEWS

@@ -62,8 +62,8 @@ ggplot2 1.0.1.9xxx
 
 * `lims()` makes it easy to set the limits of any axis (#1138).
 
-* Switched away from proto and reference class objects to proto2. This makes it
-  easier to extend ggplot2, because proto2 supports clean cross-package
+* Switched away from proto and reference class objects to ggproto. This makes it
+  easier to extend ggplot2, because ggproto supports clean cross-package
   inheritance.
 
 * Fixed segment annotations not transforming with scales (@BrianDiggs, #859)

R/aaa-.r

@@ -1,7 +1,7 @@
-#' @include proto2.r
+#' @include ggproto.r
 NULL
 
-#' Base proto2 classes for ggplot2
+#' Base ggproto classes for ggplot2
 #'
 #' If you are creating a new geom, stat or positions in another package, you'll
 #' need to extend from \code{ggplot2::Geom}, \code{ggplot2::Stat} or
@@ -10,10 +10,10 @@ NULL
 #' @export Geom Stat Position
 #' @aliases Geom Stat Position
 #' @keywords internal
-#' @name ggplot2-proto2
+#' @name ggplot2-ggproto
 NULL
 
-TopLevel <- proto2("TopLevel", NULL,
+TopLevel <- ggproto("TopLevel", NULL,
   find = function(self, name) {
     # Convert name to camel case
     name <- camelize(name, first = TRUE)

R/annotation-custom.r

@@ -55,7 +55,7 @@ annotation_custom <- function (grob, xmin = -Inf, xmax = Inf, ymin = -Inf, ymax
   )
 }
 
-GeomCustomAnn <- proto2("GeomCustomAnn", Geom,
+GeomCustomAnn <- ggproto("GeomCustomAnn", Geom,
   draw_groups = function(data, scales, coordinates, grob, xmin, xmax,
                           ymin, ymax, ...) {
     if (!inherits(coordinates, "cartesian")) {

R/annotation-logticks.r

@@ -108,7 +108,7 @@ annotation_logticks <- function (base = 10, sides = "bl", scaled = TRUE,
   )
 }
 
-GeomLogticks <- proto2("GeomLogticks", Geom,
+GeomLogticks <- ggproto("GeomLogticks", Geom,
   draw_groups = function(data, scales, coordinates, base = 10, sides = "bl",
     scaled = TRUE, short = unit(0.1, "cm"), mid = unit(0.2, "cm"),
     long = unit(0.3, "cm"), ...)

R/annotation-map.r

@@ -42,7 +42,7 @@ annotation_map <- function(map, ...) {
   )
 }
 
-GeomAnnotationMap <- proto2("GeomAnnotationMap", GeomMap,
+GeomAnnotationMap <- ggproto("GeomAnnotationMap", GeomMap,
   draw_groups = function(data, scales, coordinates, map, ...) {
     # Munch, then set up id variable for polygonGrob -
     # must be sequential integers

R/annotation-raster.r

@@ -62,7 +62,7 @@ annotation_raster <- function (raster, xmin, xmax, ymin, ymax,
 
 }
 
-GeomRasterAnn <- proto2("GeomRasterAnn", GeomRaster,
+GeomRasterAnn <- ggproto("GeomRasterAnn", GeomRaster,
   reparameterise = function(df, params) df,
 
   draw_groups = function(data, scales, coordinates, raster, xmin, xmax,

R/geom-.r

@@ -1,6 +1,6 @@
 #' @include legend-draw.r
 
-Geom <- proto2("Geom", TopLevel,
+Geom <- ggproto("Geom", TopLevel,
   type = "geom",
 
   required_aes = c(),

R/geom-abline.r

@@ -100,7 +100,7 @@ geom_abline <- function(mapping = NULL, data = NULL, show_guide = FALSE, ...,
   )
 }
 
-GeomAbline <- proto2("GeomAbline", Geom,
+GeomAbline <- ggproto("GeomAbline", Geom,
   draw = function(data, scales, coordinates, ...) {
     ranges <- coord_range(coordinates, scales)