Merge remote branch 'upstream/master'

Author: koneill

.Rbuildignore

@@ -9,5 +9,4 @@ visual_test
 ^data-raw$
 ^CONTRIBUTING\.md$
 ^NEWS$
-^NEWS\.md$
 ^revdep$

DESCRIPTION

@@ -36,7 +36,8 @@ Suggests:
     nlme,
     testthat,
     quantreg,
-    knitr
+    knitr,
+    svglite
 Enhances: sp
 License: GPL-2
 URL: http://ggplot2.org, https://github.com/hadley/ggplot2
@@ -169,6 +170,7 @@ Collate:
     'scale-manual.r'
     'scale-shape.r'
     'scale-size.r'
+    'scale-type.R'
     'scales-.r'
     'stat-bin.r'
     'stat-bin2d.r'

NAMESPACE

@@ -36,6 +36,7 @@ S3method(format,facet)
 S3method(format,ggproto)
 S3method(format,ggproto_method)
 S3method(fortify,"NULL")
+S3method(fortify,"function")
 S3method(fortify,Line)
 S3method(fortify,Lines)
 S3method(fortify,Polygon)
@@ -103,6 +104,7 @@ S3method(scale_type,default)
 S3method(scale_type,factor)
 S3method(scale_type,logical)
 S3method(scale_type,numeric)
+S3method(scale_type,ordered)
 S3method(str,uneval)
 S3method(summary,ggplot)
 S3method(widthDetails,stripGrob)
@@ -372,6 +374,8 @@ export(scale_color_identity)
 export(scale_color_manual)
 export(scale_colour_brewer)
 export(scale_colour_continuous)
+export(scale_colour_date)
+export(scale_colour_datetime)
 export(scale_colour_discrete)
 export(scale_colour_distiller)
 export(scale_colour_gradient)
@@ -383,6 +387,8 @@ export(scale_colour_identity)
 export(scale_colour_manual)
 export(scale_fill_brewer)
 export(scale_fill_continuous)
+export(scale_fill_date)
+export(scale_fill_datetime)
 export(scale_fill_discrete)
 export(scale_fill_distiller)
 export(scale_fill_gradient)
@@ -406,6 +412,8 @@ export(scale_shape_manual)
 export(scale_size)
 export(scale_size_area)
 export(scale_size_continuous)
+export(scale_size_date)
+export(scale_size_datetime)
 export(scale_size_discrete)
 export(scale_size_identity)
 export(scale_size_manual)

NEWS.md

@@ -1,5 +1,78 @@
 # ggplot2 2.0.0.9000
 
+* `layer()` now accepts a function as the data argument. The function will be
+  applied to the data passed to the `ggplot()` function and must return a
+  data.frame (#1527).
+  
+* The theme can now modify the margins of legend title and text (#1502).
+
+* `scale_size()` warns when used with categorical data.
+
+* `scale_size()`, `scale_colour()`, and `scale_fill()` gain date and date-time
+  variants (#1526).
+
+* `stat_function()` gains an `xlim` parameter (#1528).
+
+* `stat_summary()` preserves sorted x order which avoids artefacts when
+  display results with `geom_smooth()` (#1520).
+
+* All `geom_()` and `stat_()` function now have consistent argument order:
+  data + mapping, geom/stat/position, ..., specific arguments, common arguments
+  to all layers (#1305). This may break code if you were previously relying on
+  partial name matching, but in the long-term should make ggplot2 easier to 
+  use.
+
+* `stat_ecdf()` does a better job of adding padding to -Inf/Inf, and gains
+  an argument `pad` to suppress the padding if not needed (#1467).
+
+* `theme_void()` was completely void of text but facets and legends still
+  needed labels. They are now visible (@jiho).
+
+* Multipanel empty data is correctly plotted, rather than throwing an unhelpful 
+  error (#1445).
+
+* Eliminate spurious warning if you have a layer with no data and no aesthetics
+  (#1451).
+
+* `position = "nudge"` now works (although it doesn't do anything useful)
+  (#1428).
+
+* You can once again set legend key and height width to unit arithmetic
+  objects (like `2 * unit(1, "cm")`) (#1437).
+
+* When mapping an aesthetic to a constant (e.g. 
+  `geom_smooth(aes(colour = "loess")))`), the default guide title is the name 
+  of the aesthetic, not the value (#1431).
+
+* `ggsave("x.svg")` now uses svglite to produce the svg (#1432).
+
+* `stat_bin()` has been overhauled to use the same algorithm as ggvis, which 
+  has been considerably improved thanks to the advice of Randy Prium (@rpruim).
+  This includes:
+  
+    * Better arguments and a better algorithm for determining the origin.
+      You can now specify either `boundary` or the `center` of a bin.
+      `origin` has been deprecated in favour of these arguments.
+      
+    * `drop` is deprecated in favour of `pad`, which adds extra 0-count bins
+      at either end. This is needed for frequency polygons. `geom_histogram()`
+      defaults to `pad = FALSE` which considerably improves the default limits 
+      for the histogram, especially when the bins are big (#1477).
+      
+    * The default algorithm does a better job at picking nice width and 
+      origins across a wider range of input data.
+
+    This change brings with the removal of some rarely used features:
+    
+    * The `breaks` argument is no longer supported - this was rarely used
+      and didn't work correctly for frequency polygons.
+      
+* `geom_tile()` uses `draw_key_polygon()` for better legend keys, including 
+  coloured outline (#1484).
+
+* The position of `...` in `geom_density2d()` has been adjusted so you can
+  set the `n` parameter (#1485).
+
 * The default scale for columns of class "AsIs" is now "identity" (#1518).
 
 * `geom_boxplot()` now understands `outlier.color` (#1455).

R/aes.r

@@ -112,7 +112,7 @@ is_position_aes <- function(vars) {
 #' evaluation to capture the variable names. \code{aes_} and \code{aes_string}
 #' require you to explicitly quote the inputs either with \code{""} for
 #' \code{aes_string()}, or with \code{quote} or \code{~} for \code{aes_()}.
-#' (\code{aes_q} is an alias to \code{aeq_})
+#' (\code{aes_q} is an alias to \code{aes_})
 #'
 #' It's better to use \code{aes_q()}, because there's no easy way to create the
 #' equivalent to \code{aes(colour = "my colour")} or \code{aes{x = `X$1`}}

R/facet-grid-.r

@@ -45,119 +45,69 @@
 #'   will be shown, regardless of whether or not they appear in the data.
 #' @export
 #' @examples
-#' \donttest{
-#' p <- ggplot(mtcars, aes(mpg, wt)) + geom_point()
-#' # With one variable
-#' p + facet_grid(. ~ cyl)
-#' p + facet_grid(cyl ~ .)
+#' p <- ggplot(mpg, aes(displ, cty)) + geom_point()
 #'
-#' # With two variables
-#' p + facet_grid(vs ~ am)
-#' p + facet_grid(am ~ vs)
-#' p + facet_grid(vs ~ am, margins=TRUE)
+#' p + facet_grid(. ~ cyl)
+#' p + facet_grid(drv ~ .)
+#' p + facet_grid(drv ~ cyl)
 #'
 #' # To change plot order of facet grid,
 #' # change the order of variable levels with factor()
 #'
-#' set.seed(6809)
-#' diamonds <- diamonds[sample(nrow(diamonds), 1000), ]
-#' diamonds$cut <- factor(diamonds$cut,
-#'          levels = c("Ideal", "Very Good", "Fair", "Good", "Premium"))
-#'
-#' # Repeat first example with new order
-#' p <- ggplot(diamonds, aes(carat, ..density..)) +
-#'         geom_histogram(binwidth = 1)
-#' p + facet_grid(. ~ cut)
-#'
-#' g <- ggplot(mtcars, aes(mpg, wt)) +
-#'   geom_point()
-#' g + facet_grid(. ~ vs + am)
-#' g + facet_grid(vs + am ~ .)
-#'
-#' # You can also use strings, which makes it a little easier
-#' # when writing functions that generate faceting specifications
-#'
-#' p + facet_grid("cut ~ .")
-#'
-#' # see also ?plotmatrix for the scatterplot matrix
-#'
-#' # If there isn't any data for a given combination, that panel
-#' # will be empty
-#'
-#' g + facet_grid(cyl ~ vs)
-#'
 #' # If you combine a facetted dataset with a dataset that lacks those
 #' # facetting variables, the data will be repeated across the missing
 #' # combinations:
-#'
-#' g + facet_grid(vs ~ cyl)
-#'
-#' df <- data.frame(mpg = 22, wt = 3)
-#' g + facet_grid(vs ~ cyl) +
+#' df <- data.frame(displ = mean(mpg$displ), cty = mean(mpg$cty))
+#' p +
+#'   facet_grid(. ~ cyl) +
 #'   geom_point(data = df, colour = "red", size = 2)
 #'
-#' df2 <- data.frame(mpg = c(19, 22), wt = c(2,4), vs = c(0, 1))
-#' g + facet_grid(vs ~ cyl) +
-#'   geom_point(data = df2, colour = "red", size = 2)
-#'
-#' df3 <- data.frame(mpg = c(19, 22), wt = c(2,4), vs = c(1, 1))
-#' g + facet_grid(vs ~ cyl) +
-#'   geom_point(data = df3, colour = "red", size = 2)
-#'
-#'
+#' # Free scales -------------------------------------------------------
 #' # You can also choose whether the scales should be constant
 #' # across all panels (the default), or whether they should be allowed
 #' # to vary
 #' mt <- ggplot(mtcars, aes(mpg, wt, colour = factor(cyl))) +
 #'   geom_point()
 #'
 #' mt + facet_grid(. ~ cyl, scales = "free")
+#'
 #' # If scales and space are free, then the mapping between position
-#' # and values in the data will be the same across all panels
-#' mt + facet_grid(. ~ cyl, scales = "free", space = "free")
+#' # and values in the data will be the same across all panels. This
+#' # is particularly useful for categorical axes
+#' ggplot(mpg, aes(drv, model)) +
+#'   geom_point() +
+#'   facet_grid(manufacturer ~ ., scales = "free", space = "free") +
+#'   theme(strip.text.y = element_text(angle = 0))
 #'
-#' mt + facet_grid(vs ~ am, scales = "free")
-#' mt + facet_grid(vs ~ am, scales = "free_x")
-#' mt + facet_grid(vs ~ am, scales = "free_y")
-#' mt + facet_grid(vs ~ am, scales = "free", space = "free")
-#' mt + facet_grid(vs ~ am, scales = "free", space = "free_x")
-#' mt + facet_grid(vs ~ am, scales = "free", space = "free_y")
+#' # Facet labels ------------------------------------------------------
+#' p <- ggplot(mtcars, aes(wt, mpg)) + geom_point()
+#' p
 #'
-#' # You may need to set your own breaks for consistent display:
-#' mt + facet_grid(. ~ cyl, scales = "free_x", space = "free") +
-#'   scale_x_continuous(breaks = seq(10, 36, by = 2))
-#' # Adding scale limits override free scales:
-#' last_plot() + xlim(10, 15)
+#' # label_both() displays both variable name and value
+#' p + facet_grid(vs ~ cyl, labeller = label_both)
 #'
-#' # Free scales are particularly useful for categorical variables
-#' ggplot(mpg, aes(cty, model)) +
+#' # label_parsed() parses text into mathematical expressions, see ?plotmath
+#' mtcars$cyl2 <- factor(mtcars$cyl, labels = c("alpha", "beta", "sqrt(x, y)"))
+#' ggplot(mtcars, aes(wt, mpg)) +
 #'   geom_point() +
-#'   facet_grid(manufacturer ~ ., scales = "free", space = "free")
-#' # particularly when you reorder factor levels
-#' mpg$model <- reorder(mpg$model, mpg$cty)
-#' manufacturer <- reorder(mpg$manufacturer, mpg$cty)
-#' last_plot() %+% mpg + theme(strip.text.y = element_text())
+#'   facet_grid(. ~ cyl2, labeller = label_parsed)
 #'
-#' # Use as.table to to control direction of horizontal facets, TRUE by default
-#' h <- ggplot(mtcars, aes(x = mpg, y = wt)) +
-#'   geom_point()
-#' h + facet_grid(cyl ~ vs)
-#' h + facet_grid(cyl ~ vs, as.table = FALSE)
+#' # label_bquote() makes it easy to construct math expressions
+#' p + facet_grid(. ~ vs, labeller = label_bquote(cols = alpha ^ .(vs)))
 #'
-#' # Use labeller to control facet labels, label_value is default
-#' h + facet_grid(cyl ~ vs, labeller = label_both)
-#' # Using label_parsed, see ?plotmath for more options
-#' mtcars$cyl2 <- factor(mtcars$cyl, labels = c("alpha", "beta", "sqrt(x, y)"))
-#' k <- ggplot(mtcars, aes(wt, mpg)) +
-#'   geom_point()
-#' k + facet_grid(. ~ cyl2)
-#' k + facet_grid(. ~ cyl2, labeller = label_parsed)
-#' # For label_bquote the label value is x.
-#' p <- ggplot(mtcars, aes(wt, mpg)) +
-#'   geom_point()
-#' p + facet_grid(. ~ vs, labeller = label_bquote(alpha ^ .(x)))
-#' p + facet_grid(. ~ vs, labeller = label_bquote(.(x) ^ .(x)))
+#' # The facet strips can be displayed near the axes with switch
+#' data <- transform(mtcars,
+#'   am = factor(am, levels = 0:1, c("Automatic", "Manual")),
+#'   gear = factor(gear, levels = 3:5, labels = c("Three", "Four", "Five"))
+#' )
+#' p <- ggplot(data, aes(mpg, disp)) + geom_point()
+#' p + facet_grid(am ~ gear, switch = "both")
+#' # It looks better without boxes around the strips
+#' p + facet_grid(am ~ gear, switch = "both") +
+#'   theme(strip.background = element_blank())
 #'
+#' # Margins ----------------------------------------------------------
+#' \dontrun{
 #' # Margins can be specified by logically (all yes or all no) or by specific
 #' # variables as (character) variable names
 #' mg <- ggplot(mtcars, aes(x = mpg, y = wt)) + geom_point()
@@ -170,20 +120,6 @@
 #' mg + facet_grid(vs + am ~ gear, margins = "vs")
 #' mg + facet_grid(vs + am ~ gear, margins = "gear")
 #' mg + facet_grid(vs + am ~ gear, margins = c("gear", "am"))
-#'
-#' # The facet strips can be displayed near the axes with switch
-#' data <- transform(mtcars,
-#'   am = factor(am, levels = 0:1, c("Automatic", "Manual")),
-#'   gear = factor(gear, levels = 3:5, labels = c("Three", "Four", "Five"))
-#' )
-#' p <- ggplot(data, aes(mpg, disp)) + geom_point()
-#' p + facet_grid(am ~ gear, switch = "both") + theme_light()
-#'
-#' # It may be more aesthetic to use a theme without boxes around
-#' # around the strips.
-#' p + facet_grid(am ~ gear + vs, switch = "y") + theme_minimal()
-#' p + facet_grid(am ~ ., switch = "y") +
-#'   theme_gray() %+replace% theme(strip.background  = element_blank())
 #' }
 #' @importFrom plyr as.quoted
 facet_grid <- function(facets, margins = FALSE, scales = "fixed", space = "fixed", shrink = TRUE, labeller = "label_value", as.table = TRUE, switch = NULL, drop = TRUE) {

R/fortify.r

@@ -16,6 +16,8 @@ fortify.data.frame <- function(model, data, ...) model
 #' @export
 fortify.NULL <- function(model, data, ...) waiver()
 #' @export
+fortify.function <- function(model, data, ...) model
+#' @export
 fortify.default <- function(model, data, ...) {
   stop(
     "ggplot2 doesn't know how to deal with data of class ",

R/geom-.r

@@ -67,7 +67,10 @@ Geom <- ggproto("Geom",
   },
 
   draw_layer = function(self, data, params, panel, coord) {
-    if (empty(data)) return(list(zeroGrob()))
+    if (empty(data)) {
+      n <- if (is.factor(data$PANEL)) nlevels(data$PANEL) else 1L
+      return(rep(list(zeroGrob()), n))
+    }
 
     # Trim off extra parameters
     params <- params[intersect(names(params), self$parameters())]

R/geom-abline.r

@@ -69,8 +69,10 @@ NULL
 #'   facet_wrap(~ cyl)
 geom_abline <- function(mapping = NULL, data = NULL,
                         ...,
-                        slope, intercept,
-                        na.rm = FALSE, show.legend = NA) {
+                        slope,
+                        intercept,
+                        na.rm = FALSE,
+                        show.legend = NA) {
 
   # If nothing set, default to y = x
   if (missing(mapping) && missing(slope) && missing(intercept)) {

R/geom-bar.r

@@ -73,9 +73,14 @@
 #' }
 #' ggplot(mpg, aes(reorder_size(class))) + geom_bar()
 #' }
-geom_bar <- function(mapping = NULL, data = NULL, stat = "count",
-                     position = "stack", width = NULL, binwidth = NULL, ...,
-                     na.rm = FALSE, show.legend = NA, inherit.aes = TRUE) {
+geom_bar <- function(mapping = NULL, data = NULL,
+                     stat = "count", position = "stack",
+                     ...,
+                     width = NULL,
+                     binwidth = NULL,
+                     na.rm = FALSE,
+                     show.legend = NA,
+                     inherit.aes = TRUE) {
 
   if (!is.null(binwidth)) {
     warning("`geom_bar()` no longer has a `binwidth` parameter. ",