Merge remote-tracking branch 'hadley/master'

Author: thomasp85

.Rbuildignore

@@ -11,3 +11,4 @@ visual_test
 ^NEWS$
 ^revdep$
 ^\.httr-oauth$
+^codecov\.yml$

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: ggplot2
-Version: 2.1.0
+Version: 2.1.0.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", c("aut", "cre")),
     person("Winston", "Chang", , "[email protected]", "aut"),
@@ -23,7 +23,8 @@ Imports:
     plyr (>= 1.7.1),
     reshape2,
     scales (>= 0.3.0),
-    stats
+    stats,
+    tibble
 Suggests:
     covr,
     ggplot2movies,

NAMESPACE

@@ -491,3 +491,4 @@ import(scales)
 importFrom(plyr,as.quoted)
 importFrom(plyr,defaults)
 importFrom(stats,setNames)
+importFrom(tibble,tibble)

NEWS.md

@@ -1,5 +1,19 @@
 # ggplot2 2.1.0.9000 
 
+* `stat_bin()` and `stat_summary_hex()` now accept length 1 `binwidth` (#1610)
+
+* `geom_histogram()` and `stat_bin()` understand the `breaks` parameter once 
+  more. (#1665).
+
+* `geom_step()` gives useful warning if only one data point in layer (#1645).
+
+* Clarified needed input to `geom_contour()` (#1577).
+
+* Import tibble. This ensures that all built-in datasets print compactly
+  even if you haven't explicitly loaded tibble or dplyr (#1677).
+
+* `stat_ecdf()` respects `pad` argument (#1646).
+
 * `x` and `y` scales are now symmetric regarding the list of
   aesthetics they accept: `xmin_final`, `xmax_final`, `xlower`,
   `xmiddle` and `xupper` are now valid `x` aesthetics.
@@ -17,6 +31,9 @@
 * Minor code formatting issues in examples and function parameters were
   fixed. (@hrbrmstr)
 
+* Fix error message of Stats ggprotos when required aesthetics are
+  missing.
+
 # ggplot2 2.1.0
 
 ## New features

R/annotation.r

@@ -29,6 +29,11 @@
 #'   colour = "red", size = 1.5)
 #'
 #' p + annotate("text", x = 2:3, y = 20:21, label = c("my label", "label 2"))
+#'
+#' p + annotate("text", x = 4, y = 25, label = "italic(R) ^ 2 == 0.75",
+#'   parse = TRUE)
+#' p + annotate("text", x = 4, y = 25,
+#'   label = "paste(italic(R) ^ 2, \" = .75\")", parse = TRUE)
 annotate <- function(geom, x = NULL, y = NULL, xmin = NULL, xmax = NULL,
                      ymin = NULL, ymax = NULL, xend = NULL, yend = NULL, ...,
                      na.rm = FALSE) {

R/fortify.r

@@ -1,6 +1,6 @@
 #' Fortify a model with data.
 #'
-#' Rather than using this function, I now recomend using the \pkg{broom}
+#' Rather than using this function, I now recommend using the \pkg{broom}
 #' package, which implements a much wider range of methods. \code{fortify}
 #' may be deprecated in the future.
 #'

R/geom-bar.r

@@ -3,7 +3,7 @@
 #' There are two types of bar charts, determined by what is mapped to bar
 #' height. By default, \code{geom_bar} uses \code{stat="count"} which makes the
 #' height of the bar proportion to the number of cases in each group (or if the
-#' \code{weight} aethetic is supplied, the sum of the weights). If you want the
+#' \code{weight} aesthetic is supplied, the sum of the weights). If you want the
 #' heights of the bars to represent values in the data, use
 #' \code{stat="identity"} and map a variable to the \code{y} aesthetic.
 #'

R/geom-boxplot.r

@@ -13,7 +13,7 @@
 #' end of the whiskers are outliers and plotted as points (as specified by Tukey).
 #'
 #' In a notched box plot, the notches extend \code{1.58 * IQR / sqrt(n)}.
-#' This gives a roughly 95% confidence interval for comparing medians.
+#' This gives a roughly 95\% confidence interval for comparing medians.
 #' See McGill et al. (1978) for more details.
 #'
 #' @section Aesthetics:

R/geom-contour.r

@@ -1,5 +1,9 @@
 #' Display contours of a 3d surface in 2d.
 #'
+#' To be a valid surface, the most only be a single combination of each
+#' unique \code{x} and \code{y} aesthetics. Contouring tends to work best
+#' when \code{x} and \code{y} form a (roughly) evenly spaced grid.
+#'
 #' @section Aesthetics:
 #' \Sexpr[results=rd,stage=build]{ggplot2:::rd_aesthetics("geom", "contour")}
 #'

R/geom-histogram.r

@@ -61,9 +61,9 @@
 #' # bar is anchored at zero, and so when transformed becomes negative
 #' # infinity. This is not a problem when transforming the scales, because
 #' # no observations have 0 ratings.
-#' m + geom_histogram(origin = 0) + coord_trans(x = "log10")
-#' # Use origin = 0, to make sure we don't take sqrt of negative values
-#' m + geom_histogram(origin = 0) + coord_trans(x = "sqrt")
+#' m + geom_histogram(boundary = 0) + coord_trans(x = "log10")
+#' # Use boundary = 0, to make sure we don't take sqrt of negative values
+#' m + geom_histogram(boundary = 0) + coord_trans(x = "sqrt")
 #'
 #' # You can also transform the y axis.  Remember that the base of the bars
 #' # has value 0, so log transformations are not appropriate

R/geom-path.r

@@ -298,6 +298,11 @@ stairstep <- function(data, direction="hv") {
   data <- as.data.frame(data)[order(data$x), ]
   n <- nrow(data)
 
+  if (n <= 1) {
+    # Need at least one observation
+    return(data[0, , drop = FALSE])
+  }
+
   if (direction == "vh") {
     xs <- rep(1:n, each = 2)[-2*n]
     ys <- c(1, rep(2:n, each = 2))

R/geom-text.r

@@ -33,7 +33,7 @@
 #' @param nudge_x,nudge_y Horizontal and vertical adjustment to nudge labels by.
 #'   Useful for offsetting text from points, particularly on discrete scales.
 #' @param check_overlap If \code{TRUE}, text that overlaps previous text in the
-#'   same layer will not be plotted. A quick and dirty way
+#'   same layer will not be plotted.
 #' @export
 #' @examples
 #' p <- ggplot(mtcars, aes(wt, mpg, label = rownames(mtcars)))

R/hexbin.R

@@ -13,6 +13,10 @@ hex_bounds <- function(x, binwidth) {
 }
 
 hexBinSummarise <- function(x, y, z, binwidth, fun = mean, fun.args = list(), drop = TRUE) {
+  if (length(binwidth) == 1) {
+    binwidth <- rep(binwidth, 2)
+  }
+
   # Convert binwidths into bounds + nbins
   xbnds <- hex_bounds(x, binwidth[1])
   xbins <- diff(xbnds) / binwidth[1]

R/position-jitter.r

@@ -27,7 +27,7 @@
 #' # take up as much space as a boxplot or a bar
 #' ggplot(mpg, aes(class, hwy)) +
 #'   geom_jitter() +
-#'   geom_boxplot()
+#'   geom_boxplot(colour = "grey50")
 position_jitter <- function(width = NULL, height = NULL) {
   ggproto(NULL, PositionJitter,
     width = width,

R/save.r

@@ -84,7 +84,7 @@ plot_dim <- function(dim = c(NA, NA), scale = 1, units = c("in", "cm", "mm"),
 
   if (limitsize && any(dim >= 50)) {
     stop("Dimensions exceed 50 inches (height and width are specified in '",
-      units, "' not pixels). If you're sure you a plot that big, use ",
+      units, "' not pixels). If you're sure you want a plot that big, use ",
       "`limitsize = FALSE`.", call. = FALSE)
   }
 

R/scale-gradient.r

@@ -5,7 +5,7 @@
 #' \code{scale_*_gradientn} creats a n-colour gradient.
 #'
 #' Default colours are generated with \pkg{munsell} and
-#' \code{mnsl(c("2.5PB 2/4", "2.5PB 7/10")}. Generally, for continuous
+#' \code{mnsl(c("2.5PB 2/4", "2.5PB 7/10"))}. Generally, for continuous
 #' colour scales you want to keep hue constant, but vary chroma and
 #' luminance. The \pkg{munsell} package makes this easy to do using the
 #' Munsell colour system.

R/scale-manual.r

@@ -2,25 +2,25 @@
 #'
 #' @name scale_manual
 #' @inheritParams scale_x_discrete
-#' @param values a set of aesthetic values to map data values to.  If this
+#' @param values a set of aesthetic values to map data values to. If this
 #'   is a named vector, then the values will be matched based on the names.
 #'   If unnamed, values will be matched in order (usually alphabetical) with
-#'   the limits of the scale.  Any data values that don't match will be
+#'   the limits of the scale. Any data values that don't match will be
 #'   given \code{na.value}.
 #' @examples
 #' \donttest{
 #' p <- ggplot(mtcars, aes(mpg, wt)) +
 #'   geom_point(aes(colour = factor(cyl)))
 #'
-#' p + scale_colour_manual(values = c("red","blue", "green"))
+#' p + scale_colour_manual(values = c("red", "blue", "green"))
 #' p + scale_colour_manual(
-#'   values = c("8" = "red","4" = "blue","6" = "green"))
+#'   values = c("8" = "red", "4" = "blue", "6" = "green"))
 #' # With rgb hex values
 #' p + scale_colour_manual(values = c("#FF0000", "#0000FF", "#00FF00"))
 #'
 #' # As with other scales you can use breaks to control the appearance
 #' # of the legend
-#' cols <- c("8" = "red","4" = "blue","6" = "darkgreen", "10" = "orange")
+#' cols <- c("8" = "red", "4" = "blue", "6" = "darkgreen", "10" = "orange")
 #' p + scale_colour_manual(values = cols)
 #' p + scale_colour_manual(values = cols, breaks = c("4", "6", "8"))
 #' p + scale_colour_manual(values = cols, breaks = c("8", "6", "4"))
@@ -73,7 +73,6 @@ scale_alpha_manual <- function(..., values) {
   manual_scale("alpha", values, ...)
 }
 
-
 manual_scale <- function(aesthetic, values, ...) {
   pal <- function(n) {
     if (n > length(values)) {

R/scale-shape.r

@@ -24,6 +24,14 @@
 #'
 #' # Or for short:
 #' d %+% dsmall
+#'
+#' # Show a list of available shapes
+#' df_shapes <- data.frame(shape = 0:24)
+#' ggplot(df_shapes, aes(0, 0, shape = shape)) +
+#'   geom_point(aes(shape = shape), size = 5, fill = 'red') +
+#'   scale_shape_identity() +
+#'   facet_wrap(~shape) +
+#'   theme_void()
 scale_shape <- function(..., solid = TRUE) {
   discrete_scale("shape", "shape_d", shape_pal(solid), ...)
 }

R/stat-.r

@@ -68,9 +68,9 @@ Stat <- ggproto("Stat",
 
   compute_layer = function(self, data, params, panels) {
     check_required_aesthetics(
-      self$stat$required_aes,
+      self$required_aes,
       c(names(data), names(params)),
-      snake_class(self$stat)
+      snake_class(self)
     )
 
     data <- remove_missing(data, params$na.rm,

R/stat-bin.r

@@ -20,6 +20,9 @@
 #'   example, to center on integers, use \code{width = 1} and \code{boundary =
 #'   0.5}, even if \code{1} is outside the range of the data.  At most one of
 #'   \code{center} and \code{boundary} may be specified.
+#' @param breaks Alternatively, you can supply a numeric vector giving
+#'    the bin boundaries. Overrides \code{binwidth}, \code{bins}, \code{center},
+#'    and \code{boundary}.
 #' @param closed One of \code{"right"} or \code{"left"} indicating whether right
 #'   or left edges of bins are included in the bin.
 #' @param pad If \code{TRUE}, adds empty bins at either end of x. This ensures
@@ -44,6 +47,7 @@ stat_bin <- function(mapping = NULL, data = NULL,
                      bins = NULL,
                      center = NULL,
                      boundary = NULL,
+                     breaks = NULL,
                      closed = c("right", "left"),
                      pad = FALSE,
                      na.rm = FALSE,
@@ -63,6 +67,7 @@ stat_bin <- function(mapping = NULL, data = NULL,
       bins = bins,
       center = center,
       boundary = boundary,
+      breaks = breaks,
       closed = closed,
       pad = pad,
       na.rm = na.rm,

R/stat-contour.r

@@ -66,6 +66,11 @@ StatContour <- ggproto("StatContour", Stat,
 contour_lines <- function(data, breaks, complete = FALSE) {
   z <- tapply(data$z, data[c("x", "y")], identity)
 
+  if (is.list(z)) {
+    stop("Contour requires single `z` at each combination of `x` and `y`.",
+      call. = FALSE)
+  }
+
   cl <- grDevices::contourLines(
     x = sort(unique(data$x)), y = sort(unique(data$y)), z = z,
     levels = breaks)

R/stat-ecdf.r

@@ -15,15 +15,17 @@
 #' }
 #' @export
 #' @examples
-#' \donttest{
-#' df <- data.frame(x = rnorm(1000))
+#' df <- data.frame(
+#'   x = c(rnorm(100, 0, 3), rnorm(100, 0, 10)),
+#'   g = gl(2, 100)
+#' )
 #' ggplot(df, aes(x)) + stat_ecdf(geom = "step")
 #'
-#' df <- data.frame(x = c(rnorm(100, 0, 3), rnorm(100, 0, 10)),
-#'                  g = gl(2, 100))
+#' # Don't go to positive/negative infinity
+#' ggplot(df, aes(x)) + stat_ecdf(geom = "step", pad = FALSE)
 #'
+#' # Multiple ECDFs
 #' ggplot(df, aes(x, colour = g)) + stat_ecdf()
-#' }
 stat_ecdf <- function(mapping = NULL, data = NULL,
                       geom = "step", position = "identity",
                       ...,
@@ -42,6 +44,7 @@ stat_ecdf <- function(mapping = NULL, data = NULL,
     inherit.aes = inherit.aes,
     params = list(
       n = n,
+      pad = pad,
       na.rm = na.rm,
       ...
     )

R/theme-defaults.r

@@ -45,14 +45,14 @@
 #'      colour = factor(gear))) + facet_wrap(~am)
 #'
 #' p
-#' p + theme_gray()
 #' p + theme_bw()
 #' p + theme_linedraw()
 #' p + theme_light()
 #' p + theme_dark()
 #' p + theme_minimal()
 #' p + theme_classic()
 #' p + theme_void()
+#' p + theme_gray() # default theme
 #'
 #' @name ggtheme
 NULL
@@ -137,7 +137,7 @@ theme_grey <- function(base_size = 11, base_family = "") {
     plot.caption =       element_text(
                            size = rel(0.9),
                            hjust = 1,
-                           margin = margin(b = half_line * 0.9)
+                           margin = margin(t = half_line * 0.9)
                          ),
     plot.margin =        margin(half_line, half_line, half_line, half_line),
 

R/theme.r

@@ -128,7 +128,7 @@ print.theme <- function(x, ...) utils::str(x)
 #'   legend.key       \tab background underneath legend keys
 #'                    (\code{element_rect}; inherits from \code{rect}) \cr
 #'   legend.key.size  \tab size of legend keys
-#'                    (\code{unit}; inherits from \code{legend.key.size}) \cr
+#'                    (\code{unit}) \cr
 #'   legend.key.height  \tab key background height
 #'                    (\code{unit}; inherits from \code{legend.key.size}) \cr
 #'   legend.key.width   \tab key background width

R/utilities-resolution.r

@@ -1,6 +1,6 @@
 #' Compute the "resolution" of a data vector.
 #'
-#' The resolution is is the smallest non-zero distance between adjacent
+#' The resolution is the smallest non-zero distance between adjacent
 #' values.  If there is only one unique value, then the resolution is defined
 #' to be one.
 #'

R/utilities.r

@@ -280,3 +280,7 @@ dispatch_args <- function(f, ...) {
   formals(f) <- formals
   f
 }
+
+# Needed to trigger package loading
+#' @importFrom tibble tibble
+NULL

R/zzz.r

@@ -13,3 +13,9 @@
   tip <- sample(tips, 1)
   packageStartupMessage(paste(strwrap(tip), collapse = "\n"))
 }
+
+release_questions <- function() {
+  c(
+    "Have you built the book?"
+  )
+}

codecov.yml

@@ -0,0 +1 @@
+comment: false