Skip to content

Commit fa2db1e

Browse files
committed
Merge changes from master
2 parents cc53225 + 28aec3a commit fa2db1e

File tree

560 files changed

+23069
-8905
lines changed

Some content is hidden

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

560 files changed

+23069
-8905
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ jobs:
2525
- {os: macos-latest, r: 'release'}
2626

2727
- {os: windows-latest, r: 'release'}
28-
# Use 3.6 to trigger usage of RTools35
29-
- {os: windows-latest, r: '3.6'}
3028
# use 4.1 to check with rtools40's older compiler
3129
- {os: windows-latest, r: '4.1'}
3230

@@ -64,7 +62,7 @@ jobs:
6462
extra-packages: >
6563
any::rcmdcheck,
6664
Hmisc=?ignore-before-r=4.1.0,
67-
quantreg=?ignore-before-r=3.6.0,
65+
quantreg=?ignore-before-r=4.3.0,
6866
needs: check
6967

7068
- uses: r-lib/actions/check-r-package@v2

DESCRIPTION

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: ggplot2
2-
Version: 3.4.2.9000
2+
Version: 3.5.1.9000
33
Title: Create Elegant Data Visualisations Using the Grammar of Graphics
44
Authors@R: c(
55
person("Hadley", "Wickham", , "[email protected]", role = "aut",
@@ -18,6 +18,8 @@ Authors@R: c(
1818
comment = c(ORCID = "0000-0002-3385-7233")),
1919
person("Dewey", "Dunnington", role = "aut",
2020
comment = c(ORCID = "0000-0002-9415-4582")),
21+
person("Teun", "van den Brand", role = "aut",
22+
comment = c(ORCID = "0000-0002-9335-7468")),
2123
person("Posit, PBC", role = c("cph", "fnd"))
2224
)
2325
Description: A system for 'declaratively' creating graphics, based on "The
@@ -28,7 +30,7 @@ License: MIT + file LICENSE
2830
URL: https://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
2931
BugReports: https://github.com/tidyverse/ggplot2/issues
3032
Depends:
31-
R (>= 3.3)
33+
R (>= 3.5)
3234
Imports:
3335
cli,
3436
glue,
@@ -40,10 +42,10 @@ Imports:
4042
MASS,
4143
mgcv,
4244
rlang (>= 1.1.0),
43-
scales (>= 1.2.0),
45+
scales (>= 1.3.0),
4446
stats,
4547
tibble,
46-
vctrs (>= 0.5.0),
48+
vctrs (>= 0.6.0),
4749
withr (>= 2.5.0)
4850
Suggests:
4951
covr,
@@ -54,20 +56,19 @@ Suggests:
5456
knitr,
5557
mapproj,
5658
maps,
57-
maptools,
5859
multcomp,
5960
munsell,
6061
nlme,
6162
profvis,
6263
quantreg,
63-
ragg,
64+
ragg (>= 1.2.6),
6465
RColorBrewer,
6566
rmarkdown,
6667
rpart,
6768
sf (>= 0.7-3),
68-
svglite (>= 1.2.0.9001),
69+
svglite (>= 2.1.2),
6970
testthat (>= 3.1.2),
70-
vdiffr (>= 1.0.0),
71+
vdiffr (>= 1.0.6),
7172
xml2
7273
Enhances:
7374
sp
@@ -78,7 +79,7 @@ Config/testthat/edition: 3
7879
Encoding: UTF-8
7980
LazyData: true
8081
Roxygen: list(markdown = TRUE)
81-
RoxygenNote: 7.2.3
82+
RoxygenNote: 7.3.1
8283
Collate:
8384
'ggproto.R'
8485
'ggplot-global.R'
@@ -116,9 +117,11 @@ Collate:
116117
'coord-munch.R'
117118
'coord-polar.R'
118119
'coord-quickmap.R'
120+
'coord-radial.R'
119121
'coord-sf.R'
120122
'coord-transform.R'
121123
'data.R'
124+
'docs_layer.R'
122125
'facet-.R'
123126
'facet-grid-.R'
124127
'facet-null.R'
@@ -173,14 +176,20 @@ Collate:
173176
'grob-dotstack.R'
174177
'grob-null.R'
175178
'grouping.R'
179+
'theme-elements.R'
176180
'guide-.R'
177181
'guide-axis.R'
182+
'guide-axis-logticks.R'
183+
'guide-axis-stack.R'
184+
'guide-axis-theta.R'
178185
'guide-legend.R'
179186
'guide-bins.R'
180187
'guide-colorbar.R'
181188
'guide-colorsteps.R'
189+
'guide-custom.R'
182190
'layer.R'
183191
'guide-none.R'
192+
'guide-old.R'
184193
'guides-.R'
185194
'guides-grid.R'
186195
'hexbin.R'
@@ -262,16 +271,15 @@ Collate:
262271
'stat-ydensity.R'
263272
'summarise-plot.R'
264273
'summary.R'
265-
'theme-elements.R'
266274
'theme.R'
267275
'theme-defaults.R'
268276
'theme-current.R'
269277
'utilities-break.R'
270278
'utilities-grid.R'
271279
'utilities-help.R'
272280
'utilities-matrix.R'
281+
'utilities-patterns.R'
273282
'utilities-resolution.R'
274-
'utilities-table.R'
275283
'utilities-tidy-eval.R'
276284
'zxx.R'
277285
'zzz.R'

GOVERNANCE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ The core developers of ggplot2 are:
4444
* [Kara Woo](https://github.com/karawoo)
4545
* [Hiroaki Yutani](https://github.com/yutannihilation)
4646
* [Dewey Dunnington](https://github.com/paleolimbot)
47+
* [Teun van den Brand](https://github.com/teunbrand)
4748

4849
All core developers are bound by the [code of conduct](CODE_OF_CONDUCT.md).
4950

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
YEAR: 2020
2-
COPYRIGHT HOLDER: ggplot2 authors
1+
YEAR: 2024
2+
COPYRIGHT HOLDER: ggplot2 core developer team

NAMESPACE

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
S3method("$",ggproto)
44
S3method("$",ggproto_parent)
5+
S3method("$",theme)
56
S3method("$<-",uneval)
67
S3method("+",gg)
78
S3method("[",mapped_discrete)
@@ -66,6 +67,7 @@ S3method(ggplot_add,list)
6667
S3method(ggplot_add,theme)
6768
S3method(ggplot_add,uneval)
6869
S3method(ggplot_build,ggplot)
70+
S3method(ggplot_build,ggplot_built)
6971
S3method(ggplot_gtable,ggplot_built)
7072
S3method(grid.draw,absoluteGrob)
7173
S3method(grid.draw,ggplot)
@@ -75,6 +77,11 @@ S3method(grobWidth,absoluteGrob)
7577
S3method(grobWidth,zeroGrob)
7678
S3method(grobX,absoluteGrob)
7779
S3method(grobY,absoluteGrob)
80+
S3method(guide_gengrob,default)
81+
S3method(guide_geom,default)
82+
S3method(guide_merge,default)
83+
S3method(guide_train,default)
84+
S3method(guide_transform,default)
7885
S3method(heightDetails,titleGrob)
7986
S3method(heightDetails,zeroGrob)
8087
S3method(interleave,default)
@@ -89,6 +96,10 @@ S3method(makeContext,dotstackGrob)
8996
S3method(merge_element,default)
9097
S3method(merge_element,element)
9198
S3method(merge_element,element_blank)
99+
S3method(pattern_alpha,GridPattern)
100+
S3method(pattern_alpha,GridTilingPattern)
101+
S3method(pattern_alpha,default)
102+
S3method(pattern_alpha,list)
92103
S3method(plot,ggplot)
93104
S3method(predictdf,default)
94105
S3method(predictdf,glm)
@@ -102,7 +113,6 @@ S3method(print,ggproto_method)
102113
S3method(print,rel)
103114
S3method(print,theme)
104115
S3method(print,uneval)
105-
S3method(scale_type,AsIs)
106116
S3method(scale_type,Date)
107117
S3method(scale_type,POSIXt)
108118
S3method(scale_type,character)
@@ -142,6 +152,8 @@ S3method(widthDetails,zeroGrob)
142152
export("%+%")
143153
export("%+replace%")
144154
export(.data)
155+
export(.expose_data)
156+
export(.ignore_data)
145157
export(.pt)
146158
export(.stroke)
147159
export(AxisSecondary)
@@ -152,6 +164,7 @@ export(CoordFlip)
152164
export(CoordMap)
153165
export(CoordPolar)
154166
export(CoordQuickmap)
167+
export(CoordRadial)
155168
export(CoordSf)
156169
export(CoordTrans)
157170
export(Facet)
@@ -206,11 +219,16 @@ export(GeomViolin)
206219
export(GeomVline)
207220
export(Guide)
208221
export(GuideAxis)
222+
export(GuideAxisLogticks)
223+
export(GuideAxisStack)
224+
export(GuideAxisTheta)
209225
export(GuideBins)
210226
export(GuideColourbar)
211227
export(GuideColoursteps)
228+
export(GuideCustom)
212229
export(GuideLegend)
213230
export(GuideNone)
231+
export(GuideOld)
214232
export(Layout)
215233
export(Position)
216234
export(PositionDodge)
@@ -285,7 +303,9 @@ export(benchplot)
285303
export(binned_scale)
286304
export(borders)
287305
export(calc_element)
306+
export(check_device)
288307
export(combine_vars)
308+
export(complete_theme)
289309
export(continuous_scale)
290310
export(coord_cartesian)
291311
export(coord_equal)
@@ -295,6 +315,7 @@ export(coord_map)
295315
export(coord_munch)
296316
export(coord_polar)
297317
export(coord_quickmap)
318+
export(coord_radial)
298319
export(coord_sf)
299320
export(coord_trans)
300321
export(cut_interval)
@@ -341,6 +362,7 @@ export(expr)
341362
export(facet_grid)
342363
export(facet_null)
343364
export(facet_wrap)
365+
export(fill_alpha)
344366
export(find_panel)
345367
export(flip_data)
346368
export(flipped_names)
@@ -400,7 +422,14 @@ export(geom_violin)
400422
export(geom_vline)
401423
export(get_alt_text)
402424
export(get_element_tree)
425+
export(get_guide_data)
426+
export(get_last_plot)
427+
export(get_layer_data)
428+
export(get_layer_grob)
429+
export(get_panel_scales)
430+
export(get_theme)
403431
export(gg_dep)
432+
export(gg_par)
404433
export(ggplot)
405434
export(ggplotGrob)
406435
export(ggplot_add)
@@ -411,13 +440,22 @@ export(ggproto_parent)
411440
export(ggsave)
412441
export(ggtitle)
413442
export(guide_axis)
443+
export(guide_axis_logticks)
444+
export(guide_axis_stack)
445+
export(guide_axis_theta)
414446
export(guide_bins)
415447
export(guide_colorbar)
416448
export(guide_colorsteps)
417449
export(guide_colourbar)
418450
export(guide_coloursteps)
451+
export(guide_custom)
452+
export(guide_gengrob)
453+
export(guide_geom)
419454
export(guide_legend)
455+
export(guide_merge)
420456
export(guide_none)
457+
export(guide_train)
458+
export(guide_transform)
421459
export(guides)
422460
export(has_flipped_aes)
423461
export(is.Coord)
@@ -451,8 +489,10 @@ export(mean_se)
451489
export(median_hilow)
452490
export(merge_element)
453491
export(new_guide)
492+
export(old_guide)
454493
export(panel_cols)
455494
export(panel_rows)
495+
export(pattern_alpha)
456496
export(position_dodge)
457497
export(position_dodge2)
458498
export(position_fill)
@@ -471,6 +511,7 @@ export(rel)
471511
export(remove_missing)
472512
export(render_axes)
473513
export(render_strips)
514+
export(replace_theme)
474515
export(reset_theme_settings)
475516
export(resolution)
476517
export(scale_alpha)
@@ -606,6 +647,7 @@ export(scale_y_sqrt)
606647
export(scale_y_time)
607648
export(sec_axis)
608649
export(set_last_plot)
650+
export(set_theme)
609651
export(sf_transform_xy)
610652
export(should_stop)
611653
export(stage)
@@ -671,6 +713,7 @@ export(unit)
671713
export(update_geom_defaults)
672714
export(update_labels)
673715
export(update_stat_defaults)
716+
export(update_theme)
674717
export(vars)
675718
export(waiver)
676719
export(wrap_dims)
@@ -686,7 +729,12 @@ import(scales)
686729
import(vctrs)
687730
importFrom(glue,glue)
688731
importFrom(glue,glue_collapse)
732+
importFrom(grid,arrow)
733+
importFrom(grid,unit)
689734
importFrom(lifecycle,deprecated)
735+
importFrom(scales,alpha)
690736
importFrom(stats,setNames)
691737
importFrom(tibble,tibble)
692738
importFrom(utils,.DollarNames)
739+
importFrom(utils,head)
740+
importFrom(utils,tail)

NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ NEW FEATURES
2828
`example(position_jitterdodge)` for a potential usage. (@kevinushey, #932)
2929

3030
* Allow specifying only one of the limits in a scale and use the automatic
31-
calculation of the other limit by passing NA to to the limit function,
31+
calculation of the other limit by passing NA to the limit function,
3232
`xlim()` or `ylim()` (@jimhester, #557).
3333

3434
* Allow to use brewer palettes for continuous scales, through the new

0 commit comments

Comments
 (0)