Merge remote-tracking branch 'upstream/master' into use-ignore-empty-all

Author: yutannihilation

.github/move.yml

@@ -0,0 +1,21 @@
+# Configuration for move-issues bot - https://github.com/dessant/move-issues
+
+# Delete the command comment when it contains no other content
+deleteCommand: true
+
+# Close the source issue after moving
+closeSourceIssue: true
+
+# Lock the source issue after moving
+lockSourceIssue: false
+
+# Mention issue and comment authors
+mentionAuthors: true
+
+# Preserve mentions in the issue content
+keepContentMentions: true
+
+# Set custom aliases for targets
+# aliases:
+#   r: repo
+#   or: owner/repo

.travis.yml

@@ -9,15 +9,12 @@ matrix:
   - r: devel
   - r: release
     env: USE_VDIFFR=true
+    r_github_packages: lionel-/vdiffr
   - r: oldrel
   - r: 3.2
+    env: R_REMOTES_NO_ERRORS_FROM_WARNINGS=true
   - r: 3.1
-
-# work around temporary travis + R 3.5 bug
-r_packages: devtools
-
-# Install manually because dev vdiffr is not compatible with Appveyor yet
-r_github_packages: lionel-/vdiffr
+    env: R_REMOTES_NO_ERRORS_FROM_WARNINGS=true
 
 # environment variables set for all builds
 env:

CONTRIBUTING.md

@@ -79,15 +79,15 @@ See http://docs.ggplot2.org/dev/vignettes/development.html for more details.
 
 Pull requests will be evaluated against a seven point checklist:
 
-1.  __Motivation__. Your pull request should clearly and concisely motivates the
-   need for change. Unfortunately neither Winston nor I have much time to
-   work on ggplot2 these days, so you need to describe the problem and show
-   how your pull request solves it as concisely as possible.
+1.  __Motivation__. Your pull request should clearly and concisely motivate the
+    need for change. Unfortunately neither Winston nor I have much time to
+    work on ggplot2 these days, so you need to describe the problem and show
+    how your pull request solves it as concisely as possible.
 
-   Also include this motivation in `NEWS` so that when a new release of
-   ggplot2 comes out it's easy for users to see what's changed. Add your
-   item at the top of the file and use markdown for formatting. The
-   news item should end with `(@yourGithubUsername, #the_issue_number)`.
+    Also include this motivation in `NEWS` so that when a new release of
+    ggplot2 comes out it's easy for users to see what's changed. Add your
+    item at the top of the file and use markdown for formatting. The
+    news item should end with `(@yourGithubUsername, #the_issue_number)`.
 
 1.  __Only related changes__. Before you submit your pull request, please
     check to make sure that you haven't accidentally included any unrelated
@@ -124,8 +124,9 @@ Pull requests will be evaluated against a seven point checklist:
     to the appropriate function.
 
 This seems like a lot of work but don't worry if your pull request isn't perfect.
-It's a learning process and members of the ggplot2 team will be on hand to help you out. A pull request is a process, and unless you've submitted a few in the past 
-it's unlikely that your pull request will be accepted as is. All PRs require 
+It's a learning process and members of the ggplot2 team will be on hand to help you
+out. A pull request ("PR") is a process, and unless you've submitted a few in the
+past it's unlikely that your pull request will be accepted as is. All PRs require
 review and approval from at least one member of the ggplot2 development team 
 before merge.
 

NEWS.md

@@ -53,6 +53,9 @@ This is a minor release and breaking changes have been kept to a minimum. End us
     safer to feed data columns into `aes()` or into parameters of geoms or
     stats. However, doing so remains discouraged (@clauswilke, #2694).
 
+*   `coord_sf()` now also understands the `clip` argument, just like the other
+    coords (@clauswilke, #2938).
+
 *   `fortify()` now displays a more informative error message for
     `grouped_df()` objects when dplyr is not installed (@jimhester, #2822).
 
@@ -954,7 +957,7 @@ There were a number of tweaks to the theme elements that control legends:
 
 ## Major changes
 
-* ggplot no longer throws an error if you your plot has no layers. Instead it 
+* ggplot no longer throws an error if your plot has no layers. Instead it 
   automatically adds `geom_blank()` (#1246).
   
 * New `cut_width()` is a convenient replacement for the verbose

R/facet-wrap.r

@@ -12,8 +12,8 @@ NULL
 #'   The variables can be named (the names are passed to `labeller`).
 #'
 #'   For compatibility with the classic interface, can also be a
-#'   formula or character vector. Use either a one sided formula, `~a
-#'   + b`, or a character vector, `c("a", "b")`.
+#'   formula or character vector. Use either a one sided formula, `~a + b`,
+#'   or a character vector, `c("a", "b")`.
 #' @param nrow,ncol Number of rows and columns.
 #' @param scales Should scales be fixed (`"fixed"`, the default),
 #'   free (`"free"`), or free in one dimension (`"free_x"`,

R/geom-bar.r

@@ -10,11 +10,8 @@
 #' uses `stat_identity()`: it leaves the data as is.
 #'
 #' A bar chart uses height to represent a value, and so the base of the
-#' bar must always be shown to produce a valid visual comparison. Naomi Robbins
-#' has a nice
-#' \href{http://www.b-eye-network.com/view/index.php?cid=2468}{article on this
-#' topic}. This is why it doesn't make sense to use a log-scaled y axis with a
-#' bar chart.
+#' bar must always be shown to produce a valid visual comparison. This is why
+#' it doesn't make sense to use a log-scaled y axis with a bar chart.
 #'
 #' By default, multiple bars occupying the same `x` position will be stacked
 #' atop one another by [position_stack()]. If you want them to be dodged

R/plot-build.r

@@ -137,7 +137,7 @@ layer_grob <- function(plot, i = 1L) {
 #' to (e.g.) make the legend box 2 cm wide, or combine multiple plots into
 #' a single display, preserving aspect ratios across the plots.
 #'
-#' @seealso [print.ggplot()] and \code{link{benchplot}} for
+#' @seealso [print.ggplot()] and [benchplot()] for
 #'  for functions that contain the complete set of steps for generating
 #'  a ggplot2 plot.
 #' @return a [gtable()] object

R/sf.R

@@ -789,7 +789,7 @@ coord_sf <- function(xlim = NULL, ylim = NULL, expand = TRUE,
                      crs = NULL, datum = sf::st_crs(4326),
                      label_graticule = waiver(),
                      label_axes = waiver(),
-                     ndiscr = 100, default = FALSE) {
+                     ndiscr = 100, default = FALSE, clip = "on") {
 
   if (is.waive(label_graticule) && is.waive(label_axes)) {
     # if both `label_graticule` and `label_axes` are set to waive then we
@@ -830,7 +830,8 @@ coord_sf <- function(xlim = NULL, ylim = NULL, expand = TRUE,
     label_graticule = label_graticule,
     ndiscr = ndiscr,
     expand = expand,
-    default = default
+    default = default,
+    clip = clip
   )
 }