Merge branch 'hadley-master'

Author: thomasp85

.Rbuildignore

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

.gitignore

@@ -2,3 +2,5 @@
 .Rhistory
 .RData
 inst/doc
+.httr-oauth
+.*.Rnb.cached

.travis.yml

@@ -1,21 +1,15 @@
 language: R
-sudo: required
-warnings_are_errors: true
-
-r_packages:
-  - rmarkdown
+cache: packages
+sudo: false
 
 r_github_packages:
   - hadley/staticdocs
-  - jimhester/covr
-
-before_script:
-  - sudo Rscript -e "library(stringi); stri_install_icudt()"
 
 after_success:
   - Rscript -e 'covr::codecov()'
 
 before_deploy:
+  - R -e "install.packages('roxygen2', repos = 'http://cran.rstudio.com')"
   - R -e "staticdocs::build_site(examples = TRUE)"
 
 deploy:

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: ggplot2
-Version: 2.0.0.9001
+Version: 2.1.0
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", c("aut", "cre")),
     person("Winston", "Chang", , "[email protected]", "aut"),
@@ -25,18 +25,23 @@ Imports:
     scales (>= 0.3.0),
     stats
 Suggests:
+    covr,
     ggplot2movies,
     hexbin,
     Hmisc,
+    lattice,
     mapproj,
     maps,
     maptools,
     mgcv,
     multcomp,
     nlme,
-    testthat,
+    testthat (>= 0.11.0),
     quantreg,
-    knitr
+    knitr,
+    rpart,
+    rmarkdown,
+    svglite
 Enhances: sp
 License: GPL-2
 URL: http://ggplot2.org, https://github.com/hadley/ggplot2
@@ -64,6 +69,7 @@ Collate:
     'annotation.r'
     'autoplot.r'
     'bench.r'
+    'bin.R'
     'coord-.r'
     'coord-cartesian-.r'
     'coord-fixed.r'
@@ -134,6 +140,7 @@ Collate:
     'guides-.r'
     'guides-axis.r'
     'guides-grid.r'
+    'hexbin.R'
     'labels.r'
     'layer.r'
     'limits.r'
@@ -169,6 +176,7 @@ Collate:
     'scale-manual.r'
     'scale-shape.r'
     'scale-size.r'
+    'scale-type.R'
     'scales-.r'
     'stat-bin.r'
     'stat-bin2d.r'
@@ -198,7 +206,6 @@ Collate:
     'theme-defaults.r'
     'theme-elements.r'
     'theme.r'
-    'translate-qplot-base.r'
     'translate-qplot-ggplot.r'
     'translate-qplot-lattice.r'
     'utilities-break.r'
@@ -210,4 +217,4 @@ Collate:
     'zxx.r'
     'zzz.r'
 VignetteBuilder: knitr
-RoxygenNote: 5.0.0
+RoxygenNote: 5.0.1

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)
@@ -90,18 +91,21 @@ S3method(predictdf,loess)
 S3method(print,element)
 S3method(print,facet)
 S3method(print,ggplot)
+S3method(print,ggplot2_bins)
 S3method(print,ggproto)
 S3method(print,ggproto_method)
 S3method(print,rel)
 S3method(print,theme)
 S3method(print,uneval)
+S3method(scale_type,AsIs)
 S3method(scale_type,Date)
 S3method(scale_type,POSIXt)
 S3method(scale_type,character)
 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)
@@ -371,6 +375,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)
@@ -382,6 +388,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)
@@ -405,6 +413,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)
@@ -460,6 +470,7 @@ export(theme_grey)
 export(theme_light)
 export(theme_linedraw)
 export(theme_minimal)
+export(theme_replace)
 export(theme_set)
 export(theme_update)
 export(theme_void)

NEWS.md

@@ -1,14 +1,146 @@
-# ggplot2 2.0.0.9000
+# ggplot2 2.1.0.9000 
 
-## Bug fixes and minor improvements
+* `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.
 
-* Fixed a compatibility issue with `ggproto` and R versions prior to 3.1.2.
-  (#1444)
+* `ggtitle()` and `labs()` take a `subtitle` parameter which makes it
+  possible to add a subtitle below the main plot title. (@hrbrmstr)
+  
+* `labs()` takes a `caption` parameter that will set the label for
+  the annotation text below the plot panels. (@JanSchulz)
+  
+* The main plot title and subtitle are left-justified (`hjust = 0`) by
+  default. The `caption` annotation below the plot will be right-justified
+  by default. (@hrbrmstr)
+  
+* Minor code formatting issues in examples and function parameters were
+  fixed. (@hrbrmstr)
+
+# ggplot2 2.1.0
+
+## New features
+
+* When mapping an aesthetic to a constant (e.g. 
+  `geom_smooth(aes(colour = "loess")))`), the default guide title is the name 
+  of the aesthetic (i.e. "colour"), not the value (i.e. "loess") (#1431).
+
+* `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, @thomasp85). This is a more general version of the 
+  deprecated `subset` argument.
+
+* `theme_update()` now uses the `+` operator instead of `%+replace%`, so that
+  unspecified values will no longer be `NULL`ed out. `theme_replace()`
+  preserves the old behaviour if desired (@oneillkza, #1519). 
+
+* `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 (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 (somewhat) better job at picking nice widths 
+      and origins across a wider range of input data.
+      
+    * `bins = n` now gives a histogram with `n` bins, not `n + 1` (#1487).
+
+## Bug fixes
+
+* All `\donttest{}` examples run.
+
+* All `geom_()` and `stat_()` functions now have consistent argument order:
+  data + mapping, then geom/stat/position, then `...`, then specific arguments, 
+  then arguments common 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. In particular, you can now set the `n` parameter
+  in `geom_density2d()` without it partially matching `na.rm` (#1485).
+
+* For geoms with both `colour` and `fill`, `alpha` once again only affects
+  fill (Reverts #1371, #1523). This was causing problems for people.
+
+* `facet_wrap()`/`facet_grid()` works with multiple empty panels of data 
+  (#1445).
+
+* `facet_wrap()` correctly swaps `nrow` and `ncol` when facetting vertically
+  (#1417).
+
+* `ggsave("x.svg")` now uses svglite to produce the svg (#1432).
 
-* `stat-density-2d()` no longer ignores the `h` parameter.
+* `geom_boxplot()` now understands `outlier.color` (#1455).
 
-* `stat-density-2d()` now accepts `bins` and `binwidth` parameters
-  to control the number of contour levels (#1448, @has2k1).
+* `geom_path()` knows that "solid" (not just 1) represents a solid line (#1534).
+
+* `geom_ribbon()` preserves missing values so they correctly generate a 
+  gap in the ribbon (#1549).
+
+* `geom_tile()` once again accepts `width` and `height` parameters (#1513). 
+  It uses `draw_key_polygon()` for better a legend, including a coloured 
+  outline (#1484).
+
+* `layer()` now automatically adds a `na.rm` parameter if none is explicitly
+  supplied.
+
+* `position_jitterdodge()` now works on all possible dodge aesthetics, 
+  e.g. `color`, `linetype` etc. instead of only based on `fill` (@bleutner)
+
+* `position = "nudge"` now works (although it doesn't do anything useful)
+  (#1428).
+
+* The default scale for columns of class "AsIs" is now "identity" (#1518).
+
+* `scale_*_discrete()` has better defaults when used with purely continuous
+  data (#1542).
+
+* `scale_size()` warns when used with categorical data.
+
+* `scale_size()`, `scale_colour()`, and `scale_fill()` gain date and date-time
+  variants (#1526).
+
+* `stat_bin_hex()` and `stat_bin_summary()` now use the same underlying 
+  algorithm so results are consistent (#1383). `stat_bin_hex()` now accepts
+  a `weight` aesthetic. To be consistent with related stats, the output variable 
+  from `stat_bin_hex()` is now value instead of count.
+
+* `stat_density()` gains a `bw` parameter which makes it easy to get consistent 
+   smoothing between facets (@jiho)
+
+* `stat-density-2d()` no longer ignores the `h` parameter, and now accepts 
+  `bins` and `binwidth` parameters to control the number of contours 
+  (#1448, @has2k1).
+
+* `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).
+
+* `stat_function()` gains an `xlim` parameter (#1528). It once again works 
+  with discrete x values (#1509).
+
+* `stat_summary()` preserves sorted x order which avoids artefacts when
+  display results with `geom_smooth()` (#1520).
+
+* All elements should now inherit correctly for all themes except `theme_void()`.
+  (@Katiedaisey, #1555) 
+
+* `theme_void()` was completely void of text but facets and legends still
+  need labels. They are now visible (@jiho). 
+
+* You can once again set legend key and height width to unit arithmetic
+  objects (like `2 * unit(1, "cm")`) (#1437).
+
+* Eliminate spurious warning if you have a layer with no data and no aesthetics
+  (#1451).
+
+* Removed a superfluous comma in `theme-defaults.r` code (@jschoeley)
+
+* Fixed a compatibility issue with `ggproto` and R versions prior to 3.1.2.
+  (#1444)
 
 # ggplot2 2.0.0
 

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/annotation-custom.r

@@ -26,16 +26,13 @@ NULL
 #' base <- ggplot(df, aes(x, y)) +
 #'   geom_blank() +
 #'   theme_bw()
-#' # Adding a table
-#' \dontrun{
-#'  if (require(gridExtra)) {
-#' base + annotation_custom(grob = tableGrob(head(iris[ ,1:3])),
-#'         xmin = 3, xmax = 6, ymin = 2, ymax = 8)
-#' # full panel
-#' base + annotation_custom(grob = roundrectGrob(),
-#'           xmin = -Inf, xmax = Inf, ymin = -Inf, ymax = Inf)
-#' }
-#' }
+#'
+#' # Full panel annotation
+#' base + annotation_custom(
+#'   grob = grid::roundrectGrob(),
+#'   xmin = -Inf, xmax = Inf, ymin = -Inf, ymax = Inf
+#' )
+#'
 #' # Inset plot
 #' df2 <- data.frame(x = 1 , y = 1)
 #' g <- ggplotGrob(ggplot(df2, aes(x, y)) +

R/annotation.r

@@ -14,8 +14,7 @@
 #' @param geom name of geom to use for annotation
 #' @param x,y,xmin,ymin,xmax,ymax,xend,yend positioning aesthetics -
 #'   you must specify at least one of these.
-#' @param ... other aesthetics. These are not scaled so you can do (e.g.)
-#'   \code{colour = "red"} to get a red point.
+#' @inheritParams layer
 #' @inheritParams geom_point
 #' @export
 #' @examples