Skip to content

Commit 346a8f0

Browse files
authored
Merge pull request #4 from tidyverse/master
update to tidyverse edition 20191129
2 parents 40bdc73 + 6424808 commit 346a8f0

File tree

122 files changed

+2501
-1112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+2501
-1112
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,6 @@ Collate:
253253
'zxx.r'
254254
'zzz.r'
255255
VignetteBuilder: knitr
256-
RoxygenNote: 6.1.1
256+
RoxygenNote: 7.0.1
257257
Roxygen: list(markdown = TRUE)
258258
Encoding: UTF-8

R/aes.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ NULL
55
#'
66
#' Aesthetic mappings describe how variables in the data are mapped to visual
77
#' properties (aesthetics) of geoms. Aesthetic mappings can be set in
8-
#' [ggplot2()] and in individual layers.
8+
#' [ggplot()] and in individual layers.
99
#'
1010
#' This function also standardises aesthetic names by converting `color` to `colour`
1111
#' (also in substrings, e.g., `point_color` to `point_colour`) and translating old style

R/geom-bar.r

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

R/geom-boxplot.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#' individually.
2222
#'
2323
#' In a notched box plot, the notches extend `1.58 * IQR / sqrt(n)`.
24-
#' This gives a roughly 95\% confidence interval for comparing medians.
24+
#' This gives a roughly 95% confidence interval for comparing medians.
2525
#' See McGill et al. (1978) for more details.
2626
#'
2727
#' @eval rd_aesthetics("geom", "boxplot")

R/geom-rug.r

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#' with the two 1d marginal distributions. Rug plots display individual
55
#' cases so are best used with smaller datasets.
66
#'
7-
#' By default, the rug lines are drawn with a length that corresponds to 3\%
7+
#' By default, the rug lines are drawn with a length that corresponds to 3%
88
#' of the total plot size. Since the default scale expansion of for continuous
9-
#' variables is 5\% at both ends of the scale, the rug will not overlap with
9+
#' variables is 5% at both ends of the scale, the rug will not overlap with
1010
#' any data points under the default settings.
1111
#'
1212
#' @eval rd_aesthetics("geom", "rug")

R/layer.r

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#' calls but it can also be created directly using this function.
66
#'
77
#' @export
8-
#' @inheritParams geom_point
98
#' @param mapping Set of aesthetic mappings created by [aes()] or
109
#' [aes_()]. If specified and `inherit.aes = TRUE` (the
1110
#' default), it is combined with the default mapping at the top level of the

R/plot-construction.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#' - A `coord` overrides the current coordinate system.
1616
#' - A `facet` specification overrides the current faceting.
1717
#'
18-
#' To replace the current default data frame, you must use \code{\%+\%},
18+
#' To replace the current default data frame, you must use `%+%`,
1919
#' due to S3 method precedence issues.
2020
#'
2121
#' You can also supply a list, in which case each element of the list will

R/position-dodge.r

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#' also works with bars and rectangles. But unlike `position_dodge`,
77
#' `position_dodge2` works without a grouping variable in a layer.
88
#'
9-
#' @inheritParams position_identity
109
#' @param width Dodging width, when different to the width of the individual
1110
#' elements. This is useful when you want to align narrow geoms with wider
1211
#' geoms. See the examples.

R/position-jitter.r

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#' is added in both positive and negative directions, so the total spread
1010
#' is twice the value specified here.
1111
#'
12-
#' If omitted, defaults to 40\% of the resolution of the data: this means the
13-
#' jitter values will occupy 80\% of the implied bins. Categorical data
12+
#' If omitted, defaults to 40% of the resolution of the data: this means the
13+
#' jitter values will occupy 80% of the implied bins. Categorical data
1414
#' is aligned on the integers, so a width or height of 0.5 will spread the
1515
#' data so it's not possible to see the distinction between the categories.
1616
#' @param seed A random seed to make the jitter reproducible.

R/position-jitterdodge.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#' a fill aesthetic supplied).
66
#'
77
#' @family position adjustments
8-
#' @param jitter.width degree of jitter in x direction. Defaults to 40\% of the
8+
#' @param jitter.width degree of jitter in x direction. Defaults to 40% of the
99
#' resolution of the data.
1010
#' @param jitter.height degree of jitter in y direction. Defaults to 0.
1111
#' @param dodge.width the amount to dodge in the x direction. Defaults to 0.75,

0 commit comments

Comments
 (0)