Merge branch master

Merge branch 'tidyverse/master' into label-tag

# Conflicts:
#	NEWS.md
#	R/facet-.r
#	R/fortify.r
#	R/layer.r

Author: thomasp85

.travis.yml

@@ -9,7 +9,7 @@ addons:
       - libfreetype6
 
 r:
-- 3.1
+# - 3.1 # because of tidyr <- tidyselect
 - 3.2
 - oldrel
 - release

DESCRIPTION

@@ -18,9 +18,10 @@ Imports:
     gtable (>= 0.1.1),
     lazyeval,
     MASS,
+    mgcv,
     plyr (>= 1.7.1),
     reshape2,
-    rlang (>= 0.1.6.9002),
+    rlang (>= 0.2.0.9001),
     scales (>= 0.4.1.9002),
     stats,
     tibble,
@@ -36,7 +37,6 @@ Suggests:
     mapproj,
     maps,
     maptools,
-    mgcv,
     multcomp,
     munsell,
     nlme,
@@ -52,7 +52,7 @@ Suggests:
 Remotes: hadley/scales,
     hadley/svglite,
     jimhester/withr,
-    tidyverse/rlang
+    r-lib/rlang
 Enhances: sp
 License: GPL-2 | file LICENSE
 URL: http://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
@@ -232,6 +232,7 @@ Collate:
     'utilities-matrix.r'
     'utilities-resolution.r'
     'utilities-table.r'
+    'utilities-tidy-eval.R'
     'zxx.r'
     'zzz.r'
 VignetteBuilder: knitr

NAMESPACE

@@ -2,11 +2,13 @@
 
 S3method("$",ggproto)
 S3method("$",ggproto_parent)
+S3method("$<-",uneval)
 S3method("+",gg)
 S3method("[",uneval)
+S3method("[<-",uneval)
 S3method("[[",ggproto)
+S3method("[[<-",uneval)
 S3method(.DollarNames,ggproto)
-S3method(as.character,uneval)
 S3method(as.list,ggproto)
 S3method(autolayer,default)
 S3method(autoplot,default)
@@ -107,12 +109,12 @@ S3method(scale_type,logical)
 S3method(scale_type,numeric)
 S3method(scale_type,ordered)
 S3method(scale_type,sfc)
-S3method(str,uneval)
 S3method(summary,ggplot)
 S3method(widthDetails,titleGrob)
 S3method(widthDetails,zeroGrob)
 export("%+%")
 export("%+replace%")
+export(.data)
 export(.pt)
 export(.stroke)
 export(AxisSecondary)
@@ -274,8 +276,16 @@ export(element_grob)
 export(element_line)
 export(element_rect)
 export(element_text)
+export(enexpr)
+export(enexprs)
+export(enquo)
+export(enquos)
+export(ensym)
+export(ensyms)
 export(expand_limits)
 export(expand_scale)
+export(expr)
+export(exprs)
 export(facet_grid)
 export(facet_null)
 export(facet_wrap)
@@ -382,6 +392,9 @@ export(position_nudge)
 export(position_stack)
 export(qplot)
 export(quickplot)
+export(quo)
+export(quo_name)
+export(quos)
 export(rel)
 export(remove_missing)
 export(render_axes)
@@ -513,6 +526,8 @@ export(stat_ydensity)
 export(summarise_coord)
 export(summarise_layers)
 export(summarise_layout)
+export(sym)
+export(syms)
 export(theme)
 export(theme_bw)
 export(theme_classic)
@@ -533,6 +548,7 @@ export(unit)
 export(update_geom_defaults)
 export(update_labels)
 export(update_stat_defaults)
+export(vars)
 export(waiver)
 export(wrap_dims)
 export(xlab)
@@ -544,8 +560,21 @@ import(grid)
 import(gtable)
 import(scales)
 importFrom(lazyeval,f_eval)
-importFrom(plyr,as.quoted)
 importFrom(plyr,defaults)
+importFrom(rlang,.data)
+importFrom(rlang,enexpr)
+importFrom(rlang,enexprs)
+importFrom(rlang,enquo)
+importFrom(rlang,enquos)
+importFrom(rlang,ensym)
+importFrom(rlang,ensyms)
+importFrom(rlang,expr)
+importFrom(rlang,exprs)
+importFrom(rlang,quo)
+importFrom(rlang,quo_name)
+importFrom(rlang,quos)
+importFrom(rlang,sym)
+importFrom(rlang,syms)
 importFrom(stats,setNames)
 importFrom(tibble,tibble)
 importFrom(utils,.DollarNames)

NEWS.md

@@ -2,11 +2,29 @@
 
 ## New features
 
-* `aes()` now supports quasiquotation so that you can use `!!`, `!!!`, and
-  `:=`. (ggplot2 does not currently support full tidy evaluation because
-  when I wrote ggplot2 my understanding of NSE was quite flawed, and hence
-  ggplot2 only captures one environment per plot, not one environment
-  per aesthetic. We will fix this in a future release.)
+* `aes()` now supports quasiquotation so that you can use `!!`, `!!!`,
+  and `:=`. This replaces `aes_()` and `aes_string()` which are now
+  soft-deprecated (but will remain around for a long time).
+
+* `facet_wrap()` and `facet_grid()` now support `vars()` inputs. Like
+  `dplyr::vars()`, this helper quotes its inputs and supports
+  quasiquotation. For instance you can now supply facetting variables
+  like this: `facet_wrap(vars(am, cyl))` instead of `facet_wrap(~am +
+  cyl)`. Note that the formula interface is not going away and will
+  not be deprecated. `vars()` is simply meant to make it easier to
+  create functions around `facet_wrap()` and `facet_grid()`.
+
+  The first two arguments of `facet_grid()` become `rows` and `cols`
+  and now support `vars()` inputs. Note however that we took special
+  care to ensure complete backward compatibility. With this change
+  `facet_grid(vars(cyl), vars(am, vs))` is equivalent to
+  `facet_grid(cyl ~ am + vs)` and `facet_grid(cols = vars(am, vs))` is
+  equivalent to `facet_grid(. ~ am + vs)`.
+
+  One nice aspect of the new interface is that you can now easily
+  supply names: `facet_grid(vars(Cylinder = cyl), labeller =
+  label_both)` will give nice label titles to the facets. Of course
+  those names can be unquoted with the usual tidy eval syntax.
 
 * ggplot2 now works on R 3.1 onwards, and uses the 
   [vdiffr](https://github.com/lionel-/vdiffr) package for visual testing.
@@ -26,6 +44,10 @@
   of padding between elements (@karawoo, #2143). A `reverse` parameter allows 
   you to reverse the placement order of bars and boxes (@karawoo, #2171).
 
+* The `geom_segment()` and `geom_curve()` geoms both have a new 
+  `arrow.fill` parameter which enables specifying a separate fill colour for 
+  closed arrowheads. (@hrbrmstr and @clauswilke, #2375).
+  
 * The `expand` argument for `scale_*_continuous()` and `scale_*_discrete()`
   now accepts separate expansion values for the lower and upper range
   limits. The expansion limits can be specified using the convenience
@@ -84,6 +106,9 @@
 
 * The colorbar shows all colours of the scale (@has2k1, 2343).
 
+* Guides generated by `geom_text()` (e.g. colour) now accept custom labels using 
+  `guide_legend(override.aes = list(label = "foo"))` (@brianwdavis, #2458).
+
 ### Margins
 
 * Strips gain margins on all sides by default. This means that to fully justify
@@ -178,6 +203,9 @@ up correct aspect ratio, and draws a graticule.
 
 * In most cases, using `%>%` instead of `+` should generate an informative
   error (#2400).
+  
+* `layer()` gives considerably better error messages for incorrectly specified
+  `geom`, `stat`, or `position` (#2401).
 
 * In all layers that use it, `linemitre` now defaults to 10 (instead of 1)
   to better match base R.
@@ -274,6 +302,11 @@ up correct aspect ratio, and draws a graticule.
 * `ggsave()`'s DPI argument now supports 3 string options: "retina" (320
   DPI), "print" (300 DPI), and "screen" (72 DPI) (@foo-bar-baz-qux, #2156).
 
+* Fixed partial argument matches in `ggsave()`. (#2355)
+
+* `ggsave()` now correctly restores the previous graphics device when several
+  graphics devices are open. (#2363)
+
 * `print.ggplot()` now returns the original ggplot object, instead of the 
   output from `ggplot_build()`. Also, the object returned from 
   `ggplot_build()` now has the class `"ggplot_built"`. (#2034)
@@ -286,7 +319,6 @@ up correct aspect ratio, and draws a graticule.
 
 * Update startup messages to reflect new resources. (#2410, @mine-cetinkaya-rundel)
 
-
 # ggplot2 2.2.1
 
 * Fix usage of `structure(NULL)` for R-devel compatibility (#1968).

R/aes-calculated.r

@@ -91,7 +91,7 @@ make_labels <- function(mapping) {
     if (is.atomic(mapping)) {
       aesthetic
     } else {
-      x <- deparse(strip_dots(mapping))
+      x <- rlang::quo_text(strip_dots(mapping))
       if (length(x) > 1) {
         x <- paste0(x[[1]], "...")
       }