Skip to content

Commit 6fc469c

Browse files
committed
resolve merge conflict
Merge branch 'main' into adding_default_coords # Conflicts: # tests/testthat/test-coord-.R
2 parents 967a647 + 6094a23 commit 6fc469c

File tree

507 files changed

+10857
-8992
lines changed

Some content is hidden

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

507 files changed

+10857
-8992
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ about: Submit a bug report to help us improve ggplot2
55

66
### Tips for a helpful bug report:
77

8-
* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://community.rstudio.com/>.
8+
* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://forum.posit.co/>.
99

1010
* Please include a **minimal reproducible example**, a reprex, to demonstrate the bug.
1111
If you've never heard of a reprex, please read ["Make a reprex"](https://www.tidyverse.org/help/#reprex).

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
contact_links:
22
- name: Help or discussion
3-
url: https://community.rstudio.com/
4-
about: "Check out options for getting help on the RStudio Community."
3+
url: https://forum.posit.co/
4+
about: "Check out options for getting help on the Posit Community (formerly RStudio Community)."

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ about: Suggest a change or new feature in ggplot2
55

66
### Tips for a helpful feature request:
77

8-
* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://community.rstudio.com/>.
8+
* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://forum.posit.co/>.
99

1010
* See the [contributing guidelines](https://github.com/tidyverse/ggplot2/blob/main/CONTRIBUTING.md).
1111

.github/workflows/R-CMD-check.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,22 @@ jobs:
5858
http-user-agent: ${{ matrix.config.http-user-agent }}
5959
use-public-rspm: true
6060

61+
# TODO: remove this when R 4.6 is released
62+
- name: Tweak for old Windows (R 4.1)
63+
uses: r-lib/actions/setup-r-dependencies@v2
64+
if: ${{ matrix.config.os == 'windows-latest' && matrix.config.r == 'oldrel-4' }}
65+
with:
66+
cache-version: 3
67+
extra-packages: >
68+
any::rcmdcheck,
69+
70+
Hmisc=?ignore-before-r=4.2.0,
71+
quantreg=?ignore-before-r=4.3.0
72+
local::.
73+
needs: check
74+
6175
- uses: r-lib/actions/setup-r-dependencies@v2
76+
if: ${{ matrix.config.os != 'windows-latest' || matrix.config.r != 'oldrel-4' }}
6277
with:
6378
cache-version: 3
6479
extra-packages: >

DESCRIPTION

Lines changed: 18 additions & 23 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: 3.5.2.9002
3+
Version: 4.0.1.9000
44
Authors@R: c(
55
person("Hadley", "Wickham", , "[email protected]", role = "aut",
66
comment = c(ORCID = "0000-0003-4757-117X")),
@@ -52,6 +52,7 @@ Suggests:
5252
ggplot2movies,
5353
hexbin,
5454
Hmisc,
55+
hms,
5556
knitr,
5657
mapproj,
5758
maps,
@@ -62,41 +63,38 @@ Suggests:
6263
nlme,
6364
profvis,
6465
quantreg,
66+
quarto,
6567
ragg (>= 1.2.6),
6668
RColorBrewer,
67-
rmarkdown,
6869
roxygen2,
6970
rpart,
7071
sf (>= 0.7-3),
7172
svglite (>= 2.1.2),
72-
testthat (>= 3.1.5),
73+
testthat (>= 3.3.0),
7374
tibble,
7475
vdiffr (>= 1.0.6),
7576
xml2
7677
Enhances:
7778
sp
78-
VignetteBuilder:
79-
knitr
79+
VignetteBuilder:
80+
quarto
8081
Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate
8182
Config/testthat/edition: 3
8283
Config/usethis/last-upkeep: 2025-04-23
8384
Encoding: UTF-8
8485
LazyData: true
8586
Roxygen: list(markdown = TRUE)
86-
RoxygenNote: 7.3.2
87+
RoxygenNote: 7.3.3
8788
Collate:
88-
'ggproto.R'
89+
'aes-delayed-eval.R'
90+
'aes-variants.R'
8991
'ggplot-global.R'
90-
'aaa-.R'
91-
'aes-colour-fill-alpha.R'
92-
'aes-evaluation.R'
93-
'aes-group-order.R'
94-
'aes-linetype-size-shape.R'
95-
'aes-position.R'
92+
'ggproto.R'
9693
'all-classes.R'
9794
'compat-plyr.R'
9895
'utilities.R'
9996
'aes.R'
97+
'annotate.R'
10098
'annotation-borders.R'
10199
'utilities-checks.R'
102100
'legend-draw.R'
@@ -111,7 +109,6 @@ Collate:
111109
'annotation-map.R'
112110
'geom-raster.R'
113111
'annotation-raster.R'
114-
'annotation.R'
115112
'autolayer.R'
116113
'autoplot.R'
117114
'axis-secondary.R'
@@ -130,32 +127,32 @@ Collate:
130127
'coord-sf.R'
131128
'coord-transform.R'
132129
'data.R'
133-
'docs_layer.R'
130+
'docs-aes.R'
131+
'docs-layer.R'
134132
'facet-.R'
135133
'facet-grid-.R'
134+
'facet-labeller.R'
136135
'facet-null.R'
137136
'facet-wrap.R'
138137
'fortify-map.R'
139138
'fortify-models.R'
140139
'fortify-spatial.R'
141140
'fortify.R'
142141
'stat-.R'
143-
'geom-abline.R'
142+
'geom-abline-hline-vline.R'
144143
'geom-rect.R'
145144
'geom-bar.R'
146145
'geom-tile.R'
147146
'geom-bin2d.R'
148147
'geom-blank.R'
149148
'geom-boxplot.R'
150-
'geom-col.R'
151149
'geom-path.R'
152150
'geom-contour.R'
153151
'geom-point.R'
154152
'geom-count.R'
155153
'geom-crossbar.R'
156154
'geom-segment.R'
157155
'geom-curve.R'
158-
'geom-defaults.R'
159156
'geom-ribbon.R'
160157
'geom-density.R'
161158
'geom-density2d.R'
@@ -165,7 +162,6 @@ Collate:
165162
'geom-function.R'
166163
'geom-hex.R'
167164
'geom-histogram.R'
168-
'geom-hline.R'
169165
'geom-jitter.R'
170166
'geom-label.R'
171167
'geom-linerange.R'
@@ -176,12 +172,11 @@ Collate:
176172
'geom-smooth.R'
177173
'geom-spoke.R'
178174
'geom-text.R'
175+
'geom-update-defaults.R'
179176
'geom-violin.R'
180-
'geom-vline.R'
181177
'ggplot2-package.R'
182178
'grob-absolute.R'
183179
'grob-dotstack.R'
184-
'grob-null.R'
185180
'grouping.R'
186181
'properties.R'
187182
'margins.R'
@@ -203,15 +198,14 @@ Collate:
203198
'hexbin.R'
204199
'import-standalone-obj-type.R'
205200
'import-standalone-types-check.R'
206-
'labeller.R'
207201
'labels.R'
208202
'layer-sf.R'
209203
'layout.R'
210204
'limits.R'
211-
'performance.R'
212205
'plot-build.R'
213206
'plot-construction.R'
214207
'plot-last.R'
208+
'plot-render.R'
215209
'plot.R'
216210
'position-.R'
217211
'position-collide.R'
@@ -287,6 +281,7 @@ Collate:
287281
'utilities-grid.R'
288282
'utilities-help.R'
289283
'utilities-patterns.R'
284+
'utilities-performance.R'
290285
'utilities-resolution.R'
291286
'utilities-tidy-eval.R'
292287
'zxx.R'

NAMESPACE

Lines changed: 0 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)

NEWS.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,79 @@
11
# ggplot2 (development version)
22

3+
* The `arrow` and `arrow.fill` arguments are now available in
4+
`geom_linerange()` and `geom_pointrange()` layers (@teunbrand, #6481).
5+
* (internal) `zeroGrob()` now returns a `grid::nullGrob()` (#6390).
6+
* `stat_ydensity()` now only requires the `x` or `y` aesthetic. The other will
7+
be populated with 0, similar to `stat_boxplot()` (@teunbrand, #6600)
8+
* Implemented `as.list()` and `S7::convert()` methods for lists and classes in ggplot2
9+
(@teunbrand, #6695)
10+
* The default linetype in `geom_sf()` is derived from `geom_polygon()` for
11+
polygons and from `geom_line()` for (multi)linestrings (@teunbrand, #6543).
12+
* Using infinite `radius` aesthetic in `geom_spoke()` now throws a warning
13+
(#6671)
14+
* Scales and guides specified by a string can now use package name prefixes to
15+
indicate a namespace wherein to look for the scale/guide. For example, one can
16+
use `scale_x_continuous(guide = "legendry::axis_base")` (@teunbrand, #4705).
17+
* `get_layer_data()` and `get_layer_grob()` now accept layer names as index
18+
(@lgaborini, #6724)
19+
* Added new argument `geom_curve(shape)` that will be passed down to
20+
`grid::curveGrob()` (@fmarotta, #5998).
21+
* Fixed a regression where default `width` was miscalculated when some panels
22+
are empty (@teunbrand, #6758)
23+
* `geom_hex()` has a new `radius` aesthetic, representing the relative size of
24+
the hexagons (@teunbrand, #6727)
25+
* Added `preserve` argument to `position_jitterdodge()` (@teunbrand, #6584).
26+
* Fixed `position_jitterdodge(jitter.height, jitter.width)` applying to the
27+
wrong dimension with flipped geoms (@teunbrand, #6535).
28+
* New `position_dodge2(group.row)` argument that can be set to `"many"` to
29+
dodge groups with more than one row, such as in `geom_violin()`
30+
(@teunbrand, #6663)
31+
32+
# ggplot2 4.0.1
33+
34+
This is a smaller patch release focussed on fixing regressions from 4.0.0 and
35+
polishing the recent features.
36+
37+
## Bug fixes
38+
39+
* Fixed regression where `geom_area()` didn't draw panels with single groups
40+
when `stat = "align"` (@teunbrand, #6680)
41+
* Fixed regression where `position_stack(vjust)` was ignored when there are
42+
only single groups (#6692)
43+
* Fixed bug where `NA` handling in `geom_path()` was ignoring panels (@teunbrand, #6533)
44+
* Fixed bug where `stat_bin(boundary)` was ignored (#6682).
45+
* `geom_text()` and `geom_label()` accept expressions as the `label` aesthetic
46+
(@teunbrand, #6638)
47+
* Fixed regression where `draw_key_rect()` stopped using `fill` colours
48+
(@mitchelloharawild, #6609).
49+
* Fixed regression where `scale_{x,y}_*()` threw an error when an expression
50+
object is set to `labels` argument (@yutannihilation, #6617).
51+
* Fixed regression where the first (unnamed) argument to colour/fill scales was
52+
not passed as the `name` argument (@teunbrand, #6623)
53+
* Fixed issue where vectorised `arrow()`s caused errors in drawing the
54+
legend glyphs (@teunbrand, #6594)
55+
* Fixed regression where `NULL`-aesthetics contributed to plot labels too
56+
insistently. Now they contribute only as fallback labels (@teunbrand, #6616)
57+
* Fixed regression where empty arguments to colour/fill scale caused errors
58+
(@jmbarbone, #6710)
59+
* Fixed axis misplacement in `coor_radial()` when labels are blank (@teunbrand, #6574)
60+
61+
## Improvements
62+
63+
* Improved palette fallback mechanism in scales (@teunbrand, #6669).
64+
* Allow `stat` in `geom_hline`, `geom_vline`, and `geom_abline`. (@sierrajohnson, #6559)
65+
* `stat_boxplot()` treats `width` as an optional aesthetic (@Yunuuuu, #6575)
66+
* The `theme(panel.widths, panel.heights)` setting attempts to preserve the
67+
plot's aspect ratio when only one of the two settings is given, and the plot
68+
has a single panel (@teunbrand, #6701).
69+
* Logical values for the linetype aesthetic will be interpreted numerically,
70+
so that `linetype = FALSE` becomes 0/'blank' and `linetype = TRUE` becomes
71+
1/'solid' (@teunbrand, #6641)
72+
* Out-of-bounds datapoints used as padding by `stat_align()` now get removed
73+
silently rather than verbosely (@teunbrand, #6667)
74+
75+
# ggplot2 4.0.0
76+
377
## User facing
478

579
### Breaking changes

R/aaa-.R

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

0 commit comments

Comments
 (0)