Merge pull request #4 from tidyverse/master

update to tidyverse edition 20191129

Author: microly

DESCRIPTION

@@ -253,6 +253,6 @@ Collate:
     'zxx.r'
     'zzz.r'
 VignetteBuilder: knitr
-RoxygenNote: 6.1.1
+RoxygenNote: 7.0.1
 Roxygen: list(markdown = TRUE)
 Encoding: UTF-8

R/aes.r

@@ -5,7 +5,7 @@ NULL
 #'
 #' Aesthetic mappings describe how variables in the data are mapped to visual
 #' properties (aesthetics) of geoms. Aesthetic mappings can be set in
-#' [ggplot2()] and in individual layers.
+#' [ggplot()] and in individual layers.
 #'
 #' This function also standardises aesthetic names by converting `color` to `colour`
 #' (also in substrings, e.g., `point_color` to `point_colour`) and translating old style

R/geom-bar.r

@@ -35,7 +35,7 @@
 #' automatically determines the orientation from the aesthetic mapping. In the
 #' rare event that this fails it can be given explicitly by setting `orientation`
 #' to either `"x"` or `"y"`. See the *Orientation* section for more detail.
-#' @param width Bar width. By default, set to 90\% of the resolution of the data.
+#' @param width Bar width. By default, set to 90% of the resolution of the data.
 #' @param binwidth `geom_bar()` no longer has a binwidth argument - if
 #'   you use it you'll get an warning telling to you use
 #'   [geom_histogram()] instead.

R/geom-boxplot.r

@@ -21,7 +21,7 @@
 #' individually.
 #'
 #' In a notched box plot, the notches extend `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.
 #'
 #' @eval rd_aesthetics("geom", "boxplot")

R/geom-rug.r

@@ -4,9 +4,9 @@
 #' with the two 1d marginal distributions. Rug plots display individual
 #' cases so are best used with smaller datasets.
 #'
-#' By default, the rug lines are drawn with a length that corresponds to 3\%
+#' By default, the rug lines are drawn with a length that corresponds to 3%
 #' of the total plot size. Since the default scale expansion of for continuous
-#' variables is 5\% at both ends of the scale, the rug will not overlap with
+#' variables is 5% at both ends of the scale, the rug will not overlap with
 #' any data points under the default settings.
 #'
 #' @eval rd_aesthetics("geom", "rug")

R/layer.r

@@ -5,7 +5,6 @@
 #' calls but it can also be created directly using this function.
 #'
 #' @export
-#' @inheritParams geom_point
 #' @param mapping Set of aesthetic mappings created by [aes()] or
 #'   [aes_()]. If specified and `inherit.aes = TRUE` (the
 #'   default), it is combined with the default mapping at the top level of the

R/plot-construction.r

@@ -15,7 +15,7 @@
 #'   - A `coord` overrides the current coordinate system.
 #'   - A `facet` specification overrides the current faceting.
 #'
-#' To replace the current default data frame, you must use \code{\%+\%},
+#' To replace the current default data frame, you must use `%+%`,
 #' due to S3 method precedence issues.
 #'
 #' You can also supply a list, in which case each element of the list will

R/position-dodge.r

@@ -6,7 +6,6 @@
 #' also works with bars and rectangles. But unlike `position_dodge`,
 #' `position_dodge2` works without a grouping variable in a layer.
 #'
-#' @inheritParams position_identity
 #' @param width Dodging width, when different to the width of the individual
 #'   elements. This is useful when you want to align narrow geoms with wider
 #'   geoms. See the examples.

R/position-jitter.r

@@ -9,8 +9,8 @@
 #'   is added in both positive and negative directions, so the total spread
 #'   is twice the value specified here.
 #'
-#'   If omitted, defaults to 40\% of the resolution of the data: this means the
-#'   jitter values will occupy 80\% of the implied bins. Categorical data
+#'   If omitted, defaults to 40% of the resolution of the data: this means the
+#'   jitter values will occupy 80% of the implied bins. Categorical data
 #'   is aligned on the integers, so a width or height of 0.5 will spread the
 #'   data so it's not possible to see the distinction between the categories.
 #' @param seed A random seed to make the jitter reproducible.

R/position-jitterdodge.R

@@ -5,7 +5,7 @@
 #' a fill aesthetic supplied).
 #'
 #' @family position adjustments
-#' @param jitter.width degree of jitter in x direction. Defaults to 40\% of the
+#' @param jitter.width degree of jitter in x direction. Defaults to 40% of the
 #'   resolution of the data.
 #' @param jitter.height degree of jitter in y direction. Defaults to 0.
 #' @param dodge.width the amount to dodge in the x direction. Defaults to 0.75,

R/scale-.r

@@ -49,7 +49,7 @@
 #'   range \[0, 1]. This is always [scales::rescale()], except for
 #'   diverging and n colour gradients (i.e., [scale_colour_gradient2()],
 #'   [scale_colour_gradientn()]). The `rescaler` is ignored by position
-#'   scales, which ways use [scales::rescale()].
+#'   scales, which always use [scales::rescale()].
 #' @param oob One of:
 #'   - Function that handles limits outside of the scale limits
 #'   (out of bounds).
@@ -75,7 +75,7 @@
 #'   padding around the data to ensure that they are placed some distance
 #'   away from the axes. Use the convenience function [expansion()]
 #'   to generate the values for the `expand` argument. The defaults are to
-#'   expand the scale by 5\% on each side for continuous variables, and by
+#'   expand the scale by 5% on each side for continuous variables, and by
 #'   0.6 units on each side for discrete variables.
 #' @param position For position scales, The position of the axis.
 #' `left` or `right` for y axes, `top` or `bottom` for x axes.
@@ -1033,7 +1033,7 @@ ScaleBinned <- ggproto("ScaleBinned", Scale,
           warning("Ignoring n.breaks. Use a breaks function that supports setting number of breaks", call. = FALSE)
         }
         breaks <- self$breaks(limits)
-      }      
+      }
     } else {
       breaks <- self$breaks
     }

R/scale-steps.R

@@ -18,7 +18,6 @@
 #' @seealso [scales::seq_gradient_pal()] for details on underlying
 #'   palette
 #' @family colour scales
-#' @rdname scale_steps
 #' @export
 #' @examples
 #' df <- data.frame(
@@ -41,10 +40,7 @@
 #' ggplot(df, aes(x, y)) +
 #'   geom_point(aes(colour = z1)) +
 #'   scale_colour_stepsn(colours = terrain.colors(10))
-#'
-
 #' @rdname scale_steps
-#' @export
 scale_colour_steps <- function(..., low = "#132B43", high = "#56B1F7", space = "Lab",
                                na.value = "grey50", guide = "coloursteps", aesthetics = "colour") {
   binned_scale(aesthetics, "steps", seq_gradient_pal(low, high, space),

R/stat-boxplot.r

@@ -5,11 +5,11 @@
 #' \describe{
 #'   \item{width}{width of boxplot}
 #'   \item{ymin}{lower whisker = smallest observation greater than or equal to lower hinge - 1.5 * IQR}
-#'   \item{lower}{lower hinge, 25\% quantile}
+#'   \item{lower}{lower hinge, 25% quantile}
 #'   \item{notchlower}{lower edge of notch = median - 1.58 * IQR / sqrt(n)}
-#'   \item{middle}{median, 50\% quantile}
+#'   \item{middle}{median, 50% quantile}
 #'   \item{notchupper}{upper edge of notch = median + 1.58 * IQR / sqrt(n)}
-#'   \item{upper}{upper hinge, 75\% quantile}
+#'   \item{upper}{upper hinge, 75% quantile}
 #'   \item{ymax}{upper whisker = largest observation less than or equal to upper hinge + 1.5 * IQR}
 #' }
 #' @export

R/theme-current.R

@@ -11,19 +11,19 @@ NULL
 #'
 #' @section Adding on to a theme:
 #'
-#' `+` and \code{\%+replace\%} can be used to modify elements in themes.
+#' `+` and `%+replace%` can be used to modify elements in themes.
 #'
 #' `+` updates the elements of e1 that differ from elements specified (not
 #' NULL) in e2. Thus this operator can be used to incrementally add or modify
 #' attributes of a ggplot theme.
 #'
-#' In contrast, \code{\%+replace\%} replaces the entire element; any element of
+#' In contrast, `%+replace%` replaces the entire element; any element of
 #' a theme not specified in e2 will not be present in the resulting theme (i.e.
 #' NULL). Thus this operator can be used to overwrite an entire theme.
 #'
 #' `theme_update` uses the `+` operator, so that any unspecified
 #' values in the theme element will default to the values they are set in the
-#' theme. `theme_replace` uses \code{\%+replace\%} to completely replace
+#' theme. `theme_replace` uses `%+replace%` to completely replace
 #' the element, so any unspecified values will overwrite the current value in
 #' the theme with `NULL`s.
 #'

R/theme.r

@@ -170,7 +170,7 @@
 #'   [`el_def()`]. See [`el_def()`] for more details.
 #'
 #' @seealso
-#'   [+.gg()] and \code{\link{\%+replace\%}},
+#'   [+.gg()] and [%+replace%],
 #'   [element_blank()], [element_line()],
 #'   [element_rect()], and [element_text()] for
 #'   details of the specific theme elements.