Skip to content

Commit 58b3cf1

Browse files
committed
merge & redocument
Merge branch 'main' into lgibson7-export-GeomBin2d # Conflicts: # man/ggplot2-ggproto.Rd
2 parents 88ca648 + 083a17d commit 58b3cf1

File tree

406 files changed

+42386
-10448
lines changed

Some content is hidden

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

406 files changed

+42386
-10448
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
cache-version: 3
6464
extra-packages: >
6565
any::rcmdcheck,
66-
Hmisc=?ignore-before-r=4.1.0,
66+
Hmisc=?ignore-before-r=4.2.0,
6767
quantreg=?ignore-before-r=4.3.0
6868
needs: check
6969

DESCRIPTION

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: ggplot2
2-
Version: 3.5.1.9000
32
Title: Create Elegant Data Visualisations Using the Grammar of Graphics
3+
Version: 3.5.1.9000
44
Authors@R: c(
55
person("Hadley", "Wickham", , "[email protected]", role = "aut",
66
comment = c(ORCID = "0000-0003-4757-117X")),
@@ -30,20 +30,17 @@ License: MIT + file LICENSE
3030
URL: https://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
3131
BugReports: https://github.com/tidyverse/ggplot2/issues
3232
Depends:
33-
R (>= 3.5)
33+
R (>= 4.0)
3434
Imports:
3535
cli,
3636
grDevices,
3737
grid,
3838
gtable (>= 0.1.1),
3939
isoband,
4040
lifecycle (> 1.0.1),
41-
MASS,
42-
mgcv,
4341
rlang (>= 1.1.0),
4442
scales (>= 1.3.0),
4543
stats,
46-
tibble,
4744
vctrs (>= 0.6.0),
4845
withr (>= 2.5.0)
4946
Suggests:
@@ -55,6 +52,8 @@ Suggests:
5552
knitr,
5653
mapproj,
5754
maps,
55+
MASS,
56+
mgcv,
5857
multcomp,
5958
munsell,
6059
nlme,
@@ -67,6 +66,7 @@ Suggests:
6766
sf (>= 0.7-3),
6867
svglite (>= 2.1.2),
6968
testthat (>= 3.1.5),
69+
tibble,
7070
vdiffr (>= 1.0.6),
7171
xml2
7272
Enhances:
@@ -75,6 +75,7 @@ VignetteBuilder:
7575
knitr
7676
Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate
7777
Config/testthat/edition: 3
78+
Config/usethis/last-upkeep: 2024-10-24
7879
Encoding: UTF-8
7980
LazyData: true
8081
Roxygen: list(markdown = TRUE)
@@ -151,7 +152,6 @@ Collate:
151152
'geom-density2d.R'
152153
'geom-dotplot.R'
153154
'geom-errorbar.R'
154-
'geom-errorbarh.R'
155155
'geom-freqpoly.R'
156156
'geom-function.R'
157157
'geom-hex.R'
@@ -276,7 +276,6 @@ Collate:
276276
'utilities-break.R'
277277
'utilities-grid.R'
278278
'utilities-help.R'
279-
'utilities-matrix.R'
280279
'utilities-patterns.R'
281280
'utilities-resolution.R'
282281
'utilities-tidy-eval.R'

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MIT License
22

3-
Copyright (c) 2020 ggplot2 authors
3+
Copyright (c) 2024 ggplot2 core developer team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

NAMESPACE

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ S3method(guide_train,default)
8484
S3method(guide_transform,default)
8585
S3method(heightDetails,titleGrob)
8686
S3method(heightDetails,zeroGrob)
87-
S3method(interleave,default)
88-
S3method(interleave,unit)
8987
S3method(limits,Date)
9088
S3method(limits,POSIXct)
9189
S3method(limits,POSIXlt)
@@ -126,8 +124,6 @@ S3method(scale_type,logical)
126124
S3method(scale_type,numeric)
127125
S3method(scale_type,ordered)
128126
S3method(scale_type,sfc)
129-
S3method(single_value,default)
130-
S3method(single_value,factor)
131127
S3method(summary,ggplot)
132128
S3method(vec_cast,character.mapped_discrete)
133129
S3method(vec_cast,double.mapped_discrete)
@@ -345,6 +341,7 @@ export(draw_key_vpath)
345341
export(dup_axis)
346342
export(el_def)
347343
export(element_blank)
344+
export(element_geom)
348345
export(element_grob)
349346
export(element_line)
350347
export(element_rect)
@@ -368,6 +365,7 @@ export(find_panel)
368365
export(flip_data)
369366
export(flipped_names)
370367
export(fortify)
368+
export(from_theme)
371369
export(geom_abline)
372370
export(geom_area)
373371
export(geom_bar)
@@ -423,7 +421,9 @@ export(geom_violin)
423421
export(geom_vline)
424422
export(get_alt_text)
425423
export(get_element_tree)
424+
export(get_geom_defaults)
426425
export(get_guide_data)
426+
export(get_labs)
427427
export(get_last_plot)
428428
export(get_layer_data)
429429
export(get_layer_grob)
@@ -461,10 +461,22 @@ export(guide_transform)
461461
export(guides)
462462
export(has_flipped_aes)
463463
export(is.Coord)
464+
export(is.coord)
464465
export(is.facet)
466+
export(is.geom)
465467
export(is.ggplot)
466468
export(is.ggproto)
469+
export(is.guide)
470+
export(is.guides)
471+
export(is.layer)
472+
export(is.mapping)
473+
export(is.margin)
474+
export(is.position)
475+
export(is.scale)
476+
export(is.stat)
467477
export(is.theme)
478+
export(is.theme_element)
479+
export(is.waiver)
468480
export(label_both)
469481
export(label_bquote)
470482
export(label_context)
@@ -514,6 +526,8 @@ export(remove_missing)
514526
export(render_axes)
515527
export(render_strips)
516528
export(replace_theme)
529+
export(reset_geom_defaults)
530+
export(reset_stat_defaults)
517531
export(reset_theme_settings)
518532
export(resolution)
519533
export(scale_alpha)
@@ -734,7 +748,6 @@ importFrom(grid,unit)
734748
importFrom(lifecycle,deprecated)
735749
importFrom(scales,alpha)
736750
importFrom(stats,setNames)
737-
importFrom(tibble,tibble)
738751
importFrom(utils,.DollarNames)
739752
importFrom(utils,head)
740753
importFrom(utils,tail)

NEWS.md

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

3+
* Custom and raster annotation now respond to scale transformations, and can
4+
use AsIs variables for relative placement (@teunbrand based on
5+
@yutannihilation's prior work, #3120)
6+
* When discrete breaks have names, they'll be used as labels by default
7+
(@teunbrand, #6147).
8+
* The helper function `is.waiver()` is now exported to help extensions to work
9+
with `waiver()` objects (@arcresu, #6173).
10+
* Date(time) scales now throw appropriate errors when `date_breaks`,
11+
`date_minor_breaks` or `date_labels` are not strings (@RodDalBen, #5880)
12+
* `geom_errorbarh()` is deprecated in favour of
13+
`geom_errorbar(orientation = "y")` (@teunbrand, #5961).
14+
* `geom_contour()` should be able to recognise a rotated grid of points
15+
(@teunbrand, #4320)
16+
* `geom_boxplot()` gains additional arguments to style the colour, linetype and
17+
linewidths of the box, whiskers, median line and staples (@teunbrand, #5126)
18+
* (internal) Using `after_scale()` in the `Geom*$default_aes()` field is now
19+
evaluated in the context of data (@teunbrand, #6135)
20+
* Fixed bug where binned scales wouldn't simultaneously accept transformations
21+
and function-limits (@teunbrand, #6144).
22+
* Fixed bug where the `ggplot2::`-prefix did not work with `stage()`
23+
(@teunbrand, #6104).
24+
* New `get_labs()` function for retrieving completed plot labels
25+
(@teunbrand, #6008).
26+
* Built-in `theme_*()` functions now have `ink` and `paper` arguments to control
27+
foreground and background colours respectively (@teunbrand)
28+
* The `summary()` method for ggplots is now more terse about facets
29+
(@teunbrand, #5989).
30+
* `guide_bins()`, `guide_colourbar()` and `guide_coloursteps()` gain an `angle`
31+
argument to overrule theme settings, similar to `guide_axis(angle)`
32+
(@teunbrand, #4594).
33+
* `coord_*(expand)` can now take a logical vector to control expansion at any
34+
side of the panel (top, right, bottom, left) (@teunbrand, #6020)
35+
* (Breaking) The defaults for all geoms can be set at one in the theme.
36+
(@teunbrand based on pioneering work by @dpseidel, #2239)
37+
* A new `theme(geom)` argument is used to track these defaults.
38+
* The `element_geom()` function can be used to populate that argument.
39+
* The `from_theme()` function allows access to the theme default fields from
40+
inside the `aes()` function.
41+
* Passing empty unmapped aesthetics to layers raises a warning instead of
42+
throwing an error (@teunbrand, #6009).
43+
* Moved {mgcv} from Imports to Suggests (@teunbrand, #5986)
44+
* New `reset_geom_defaults()` and `reset_stat_defaults()` to restore all geom or
45+
stat default aesthetics at once (@teunbrand, #5975).
46+
* `facet_wrap()` can have `space = "free_x"` with 1-row layouts and
47+
`space = "free_y"` with 1-column layouts (@teunbrand)
48+
* Secondary axes respect `n.breaks` setting in continuous scales (@teunbrand, #4483).
49+
* Layers can have names (@teunbrand, #4066).
50+
* (internal) improvements to `pal_qualitative()` (@teunbrand, #5013)
51+
* `coord_radial(clip = "on")` clips to the panel area when the graphics device
52+
supports clipping paths (@teunbrand, #5952).
53+
* (internal) Panel clipping responsibility moved from Facet class to Coord
54+
class through new `Coord$draw_panel()` method.
55+
* `theme(strip.clip)` now defaults to `"on"` and is independent of Coord
56+
clipping (@teunbrand, 5952).
57+
* (internal) rearranged the code of `Facet$draw_panels()` method (@teunbrand).
58+
* Axis labels are now justified across facet panels (@teunbrand, #5820)
59+
* Fixed bug in `stat_function()` so x-axis title now produced automatically
60+
when no data added. (@phispu, #5647).
361
* geom_sf now accepts shape names (@sierrajohnson, #5808)
462
* Added `gg` class to `labs()` (@phispu, #5553).
563
* Missing values from discrete palettes are no longer translated
@@ -135,6 +193,18 @@
135193
(@teunbrand, #5938, #4327).
136194
* Fixed bug where empty discrete scales weren't recognised as such
137195
(@teunbrand, #5945).
196+
* (internal) The summary function of `stat_summary()` and `stat_summary_bin()`
197+
is setup once in total instead of once per group (@teunbrand, #5971)
198+
* `facet_grid(space = "free")` can now be combined with `coord_fixed()`
199+
(@teunbrand, #4584).
200+
* `theme_classic()` now has black ticks and text instead of dark gray. In
201+
addition, `theme_classic()`'s axis line end is `"square"` (@teunbrand, #5978).
202+
* {tibble} is now suggested instead of imported (@teunbrand, #5986)
203+
* The ellipsis argument is now checked in `fortify()`, `get_alt_text()`,
204+
`labs()` and several guides (@teunbrand, #3196).
205+
* `stat_summary_bin()` no longer ignores `width` parameter (@teunbrand, #4647).
206+
* Added `keep.zeroes` argument to `stat_bin()` (@teunbrand, #3449)
207+
* `coord_sf()` no longer errors when dealing with empty graticules (@teunbrand, #6052)
138208

139209
# ggplot2 3.5.1
140210

@@ -181,6 +251,7 @@ documentation updates.
181251
* `annotate()` now warns about `stat` or `position` arguments (@teunbrand, #5151)
182252
* `guide_coloursteps(even.steps = FALSE)` now works with discrete data that has
183253
been formatted by `cut()` (@teunbrand, #3877).
254+
* `ggsave()` now offers to install svglite if needed (@eliocamp, #6166).
184255

185256
# ggplot2 3.5.0
186257

0 commit comments

Comments
 (0)