Skip to content

Commit bac8602

Browse files
authored
Merge branch 'main' into rc/4.0.3
2 parents 7f2ef19 + c02c05a commit bac8602

447 files changed

Lines changed: 20730 additions & 27352 deletions

File tree

Some content is hidden

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

DESCRIPTION

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: ggplot2
22
Title: Create Elegant Data Visualisations Using the Grammar of Graphics
3-
Version: 4.0.2
3+
Version: 4.0.2.9000
44
Authors@R: c(
55
person("Hadley", "Wickham", , "hadley@posit.co", role = "aut",
66
comment = c(ORCID = "0000-0003-4757-117X")),
@@ -70,7 +70,7 @@ Suggests:
7070
rpart,
7171
sf (>= 0.7-3),
7272
svglite (>= 2.1.2),
73-
testthat (>= 3.1.5),
73+
testthat (>= 3.3.0),
7474
tibble,
7575
vdiffr (>= 1.0.6),
7676
xml2
@@ -86,18 +86,15 @@ LazyData: true
8686
Roxygen: list(markdown = TRUE)
8787
RoxygenNote: 7.3.3
8888
Collate:
89-
'ggproto.R'
89+
'aes-delayed-eval.R'
90+
'aes-variants.R'
9091
'ggplot-global.R'
91-
'aaa-.R'
92-
'aes-colour-fill-alpha.R'
93-
'aes-evaluation.R'
94-
'aes-group-order.R'
95-
'aes-linetype-size-shape.R'
96-
'aes-position.R'
92+
'ggproto.R'
9793
'all-classes.R'
9894
'compat-plyr.R'
9995
'utilities.R'
10096
'aes.R'
97+
'annotate.R'
10198
'annotation-borders.R'
10299
'utilities-checks.R'
103100
'legend-draw.R'
@@ -112,7 +109,6 @@ Collate:
112109
'annotation-map.R'
113110
'geom-raster.R'
114111
'annotation-raster.R'
115-
'annotation.R'
116112
'autolayer.R'
117113
'autoplot.R'
118114
'axis-secondary.R'
@@ -131,32 +127,32 @@ Collate:
131127
'coord-sf.R'
132128
'coord-transform.R'
133129
'data.R'
134-
'docs_layer.R'
130+
'docs-aes.R'
131+
'docs-layer.R'
135132
'facet-.R'
136133
'facet-grid-.R'
134+
'facet-labeller.R'
137135
'facet-null.R'
138136
'facet-wrap.R'
139137
'fortify-map.R'
140138
'fortify-models.R'
141139
'fortify-spatial.R'
142140
'fortify.R'
143141
'stat-.R'
144-
'geom-abline.R'
142+
'geom-abline-hline-vline.R'
145143
'geom-rect.R'
146144
'geom-bar.R'
147145
'geom-tile.R'
148146
'geom-bin2d.R'
149147
'geom-blank.R'
150148
'geom-boxplot.R'
151-
'geom-col.R'
152149
'geom-path.R'
153150
'geom-contour.R'
154151
'geom-point.R'
155152
'geom-count.R'
156153
'geom-crossbar.R'
157154
'geom-segment.R'
158155
'geom-curve.R'
159-
'geom-defaults.R'
160156
'geom-ribbon.R'
161157
'geom-density.R'
162158
'geom-density2d.R'
@@ -166,7 +162,6 @@ Collate:
166162
'geom-function.R'
167163
'geom-hex.R'
168164
'geom-histogram.R'
169-
'geom-hline.R'
170165
'geom-jitter.R'
171166
'geom-label.R'
172167
'geom-linerange.R'
@@ -177,12 +172,11 @@ Collate:
177172
'geom-smooth.R'
178173
'geom-spoke.R'
179174
'geom-text.R'
175+
'geom-update-defaults.R'
180176
'geom-violin.R'
181-
'geom-vline.R'
182177
'ggplot2-package.R'
183178
'grob-absolute.R'
184179
'grob-dotstack.R'
185-
'grob-null.R'
186180
'grouping.R'
187181
'properties.R'
188182
'margins.R'
@@ -204,15 +198,14 @@ Collate:
204198
'hexbin.R'
205199
'import-standalone-obj-type.R'
206200
'import-standalone-types-check.R'
207-
'labeller.R'
208201
'labels.R'
209202
'layer-sf.R'
210203
'layout.R'
211204
'limits.R'
212-
'performance.R'
213205
'plot-build.R'
214206
'plot-construction.R'
215207
'plot-last.R'
208+
'plot-render.R'
216209
'plot.R'
217210
'position-.R'
218211
'position-collide.R'
@@ -287,7 +280,9 @@ Collate:
287280
'utilities-break.R'
288281
'utilities-grid.R'
289282
'utilities-help.R'
283+
'utilities-lifecycle.R'
290284
'utilities-patterns.R'
285+
'utilities-performance.R'
291286
'utilities-resolution.R'
292287
'utilities-tidy-eval.R'
293288
'zxx.R'

NAMESPACE

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ S3method(as.list,ggproto)
2020
S3method(autolayer,default)
2121
S3method(autoplot,default)
2222
S3method(c,mapped_discrete)
23-
S3method(drawDetails,zeroGrob)
2423
S3method(format,ggproto)
2524
S3method(format,ggproto_method)
2625
S3method(format,rd_section_aesthetics)
@@ -52,9 +51,7 @@ S3method(ggplot,default)
5251
S3method(ggplot_add,default)
5352
S3method(grid.draw,absoluteGrob)
5453
S3method(grobHeight,absoluteGrob)
55-
S3method(grobHeight,zeroGrob)
5654
S3method(grobWidth,absoluteGrob)
57-
S3method(grobWidth,zeroGrob)
5855
S3method(grobX,absoluteGrob)
5956
S3method(grobY,absoluteGrob)
6057
S3method(guide_gengrob,default)
@@ -63,7 +60,6 @@ S3method(guide_merge,default)
6360
S3method(guide_train,default)
6461
S3method(guide_transform,default)
6562
S3method(heightDetails,titleGrob)
66-
S3method(heightDetails,zeroGrob)
6763
S3method(limits,Date)
6864
S3method(limits,POSIXct)
6965
S3method(limits,POSIXlt)
@@ -117,7 +113,6 @@ S3method(vec_ptype2,mapped_discrete.factor)
117113
S3method(vec_ptype2,mapped_discrete.integer)
118114
S3method(vec_ptype2,mapped_discrete.mapped_discrete)
119115
S3method(widthDetails,titleGrob)
120-
S3method(widthDetails,zeroGrob)
121116
export("%+%")
122117
export("%+replace%")
123118
export(.data)
@@ -424,6 +419,7 @@ export(geom_vline)
424419
export(get_alt_text)
425420
export(get_element_tree)
426421
export(get_geom_defaults)
422+
export(get_ggplot2_edition)
427423
export(get_guide_data)
428424
export(get_labs)
429425
export(get_last_plot)
@@ -498,6 +494,7 @@ export(layer_grob)
498494
export(layer_scales)
499495
export(layer_sf)
500496
export(lims)
497+
export(local_ggplot2_edition)
501498
export(make_constructor)
502499
export(map_data)
503500
export(margin)
@@ -671,6 +668,7 @@ export(scale_y_reverse)
671668
export(scale_y_sqrt)
672669
export(scale_y_time)
673670
export(sec_axis)
671+
export(set_ggplot2_edition)
674672
export(set_last_plot)
675673
export(set_theme)
676674
export(sf_transform_xy)
@@ -755,6 +753,7 @@ export(update_stat_defaults)
755753
export(update_theme)
756754
export(vars)
757755
export(waiver)
756+
export(with_ggplot2_edition)
758757
export(wrap_dims)
759758
export(xlab)
760759
export(xlim)

NEWS.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,51 @@ polishing the recent features.
1212

1313
## Bug fixes
1414

15+
* `geom_boxplot()`/`stat_boxplot()` gain a `quantile.type` parameter (default `7`)
16+
to control the percentile definition used for hinges and median; set `quantile.type = 2`
17+
to match SAS's default `PCTLDEF = 5`, enabling parity with SAS boxplots out-of-the-box.
18+
(@munoztd0, #6819)
19+
* `make_constructor()` no longer captures `rlang::list2()` at build time.
20+
* The `arrow` and `arrow.fill` arguments are now available in
21+
`geom_linerange()` and `geom_pointrange()` layers (@teunbrand, #6481).
22+
* (internal) `zeroGrob()` now returns a `grid::nullGrob()` (#6390).
23+
* `stat_ydensity()` now only requires the `x` or `y` aesthetic. The other will
24+
be populated with 0, similar to `stat_boxplot()` (@teunbrand, #6600)
25+
* Implemented `as.list()` and `S7::convert()` methods for lists and classes in ggplot2
26+
(@teunbrand, #6695)
27+
* The default linetype in `geom_sf()` is derived from `geom_polygon()` for
28+
polygons and from `geom_line()` for (multi)linestrings (@teunbrand, #6543).
29+
* Using infinite `radius` aesthetic in `geom_spoke()` now throws a warning
30+
(#6671)
31+
* Scales and guides specified by a string can now use package name prefixes to
32+
indicate a namespace wherein to look for the scale/guide. For example, one can
33+
use `scale_x_continuous(guide = "legendry::axis_base")` (@teunbrand, #4705).
34+
* `get_layer_data()` and `get_layer_grob()` now accept layer names as index
35+
(@lgaborini, #6724)
36+
* Added new argument `geom_curve(shape)` that will be passed down to
37+
`grid::curveGrob()` (@fmarotta, #5998).
38+
* Fixed a regression where default `width` was miscalculated when some panels
39+
are empty (@teunbrand, #6758)
40+
* `geom_hex()` has a new `radius` aesthetic, representing the relative size of
41+
the hexagons (@teunbrand, #6727)
42+
* Added `preserve` argument to `position_jitterdodge()` (@teunbrand, #6584).
43+
* Fixed `position_jitterdodge(jitter.height, jitter.width)` applying to the
44+
wrong dimension with flipped geoms (@teunbrand, #6535).
45+
* New `position_dodge2(group.row)` argument that can be set to `"many"` to
46+
dodge groups with more than one row, such as in `geom_violin()`
47+
(@teunbrand, #6663)
48+
49+
# ggplot2 4.0.2
50+
51+
This hotfix release makes ggplot2 more interoperable between rlang versions.
52+
53+
# ggplot2 4.0.1
54+
55+
This is a smaller patch release focussed on fixing regressions from 4.0.0 and
56+
polishing the recent features.
57+
58+
## Bug fixes
59+
1560
* Fixed regression where `geom_area()` didn't draw panels with single groups
1661
when `stat = "align"` (@teunbrand, #6680)
1762
* Fixed regression where `position_stack(vjust)` was ignored when there are

R/aaa-.R

Lines changed: 0 additions & 14 deletions
This file was deleted.

R/aes-colour-fill-alpha.R

Lines changed: 0 additions & 112 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ is_calculated <- function(x, warn = FALSE) {
257257
what <- I(paste0("The dot-dot notation (`", x, "`)"))
258258
var <- gsub(match_calculated_aes, "\\1", as.character(x))
259259
with <- I(paste0("`after_stat(", var, ")`"))
260-
deprecate_warn0("3.4.0", what, with, id = "ggplot-warn-aes-dot-dot")
260+
deprecate("3.4.0", what, with, id = "ggplot-warn-aes-dot-dot")
261261
}
262262
res
263263
} else if (is_quosure(x)) {
@@ -268,7 +268,7 @@ is_calculated <- function(x, warn = FALSE) {
268268
what <- I(paste0("`", expr_deparse(x), "`"))
269269
x[[1]] <- quote(after_stat)
270270
with <- I(paste0("`", expr_deparse(x), "`"))
271-
deprecate_warn0("3.4.0", what, with, id = "ggplot-warn-aes-stat")
271+
deprecate("3.4.0", what, with, id = "ggplot-warn-aes-stat")
272272
}
273273
TRUE
274274
} else {

0 commit comments

Comments
 (0)