Skip to content

Commit 7c6d3d5

Browse files
Merge branch 'master' into feature/geom-ribbon-line
2 parents 7d8554a + 660aad2 commit 7c6d3d5

File tree

276 files changed

+5294
-2532
lines changed

Some content is hidden

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

276 files changed

+5294
-2532
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ visual_test
2626
^\.github$
2727
^vignettes/profilings
2828
^cran-comments\.md$
29+
^LICENSE\.md$

DESCRIPTION

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ Authors@R: c(
1414
person("Claus", "Wilke", role = "aut"),
1515
person("Kara", "Woo", role = "aut"),
1616
person("Hiroaki", "Yutani", role = "aut"),
17+
person("Dewey", "Dunnington", role = "aut"),
1718
person("RStudio", role = c("cph"))
1819
)
1920
Depends:
2021
R (>= 3.2)
2122
Imports:
2223
digest,
24+
glue,
2325
grDevices,
2426
grid,
2527
gtable (>= 0.1.1),
28+
isoband,
2629
MASS,
2730
mgcv,
28-
reshape2,
2931
rlang (>= 0.3.0),
3032
scales (>= 0.5.0),
3133
stats,
3234
tibble,
33-
viridisLite,
3435
withr (>= 2.0.0)
3536
Suggests:
3637
covr,
3738
dplyr,
3839
ggplot2movies,
3940
hexbin,
4041
Hmisc,
41-
isoband,
4242
knitr,
4343
lattice,
4444
mapproj,
@@ -65,8 +65,8 @@ Collate:
6565
'ggproto.r'
6666
'ggplot-global.R'
6767
'aaa-.r'
68-
'aes-calculated.r'
6968
'aes-colour-fill-alpha.r'
69+
'aes-evaluation.r'
7070
'aes-group-order.r'
7171
'aes-linetype-size-shape.r'
7272
'aes-position.r'
@@ -185,6 +185,7 @@ Collate:
185185
'position-stack.r'
186186
'quick-plot.r'
187187
'range.r'
188+
'reshape-add-margins.R'
188189
'save.r'
189190
'scale-.r'
190191
'scale-alpha.r'
@@ -253,6 +254,6 @@ Collate:
253254
'zxx.r'
254255
'zzz.r'
255256
VignetteBuilder: knitr
256-
RoxygenNote: 6.1.1
257+
RoxygenNote: 7.0.2
257258
Roxygen: list(markdown = TRUE)
258259
Encoding: UTF-8

GOVERNANCE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ The core developers of ggplot2 are:
4343
* [Claus Wilke](https://github.com/clauswilke)
4444
* [Kara Woo](https://github.com/karawoo)
4545
* [Hiroaki Yutani](https://github.com/yutannihilation)
46+
* [Dewey Dunnington](https://github.com/paleolimbot)
4647

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

LICENSE.md

Lines changed: 361 additions & 0 deletions
Large diffs are not rendered by default.

NAMESPACE

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ S3method(fortify,tbl_df)
4545
S3method(ggplot,"function")
4646
S3method(ggplot,default)
4747
S3method(ggplot_add,"NULL")
48+
S3method(ggplot_add,"function")
4849
S3method(ggplot_add,Coord)
4950
S3method(ggplot_add,Facet)
5051
S3method(ggplot_add,Layer)
@@ -105,6 +106,7 @@ S3method(makeContent,labelgrob)
105106
S3method(makeContext,dotstackGrob)
106107
S3method(merge_element,default)
107108
S3method(merge_element,element)
109+
S3method(merge_element,element_blank)
108110
S3method(plot,ggplot)
109111
S3method(predictdf,default)
110112
S3method(predictdf,glm)
@@ -250,6 +252,8 @@ export(aes_all)
250252
export(aes_auto)
251253
export(aes_q)
252254
export(aes_string)
255+
export(after_scale)
256+
export(after_stat)
253257
export(alpha)
254258
export(annotate)
255259
export(annotation_custom)
@@ -297,10 +301,12 @@ export(draw_key_timeseries)
297301
export(draw_key_vline)
298302
export(draw_key_vpath)
299303
export(dup_axis)
304+
export(el_def)
300305
export(element_blank)
301306
export(element_grob)
302307
export(element_line)
303308
export(element_rect)
309+
export(element_render)
304310
export(element_text)
305311
export(enexpr)
306312
export(enexprs)
@@ -566,6 +572,7 @@ export(scale_y_time)
566572
export(sec_axis)
567573
export(set_last_plot)
568574
export(should_stop)
575+
export(stage)
569576
export(standardise_aes_names)
570577
export(stat)
571578
export(stat_bin)
@@ -636,6 +643,8 @@ import(grid)
636643
import(gtable)
637644
import(rlang)
638645
import(scales)
646+
importFrom(glue,glue)
647+
importFrom(glue,glue_collapse)
639648
importFrom(stats,setNames)
640649
importFrom(tibble,tibble)
641650
importFrom(utils,.DollarNames)

NEWS.md

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

3+
* Fix a bug in `geom_raster()` that squeezed the image when it went outside
4+
scale limits (#3539, @thomasp85)
5+
6+
* The evaluation time of aesthetics can now be controlled to a finer degree.
7+
`after_stat()` superseeds the use of `stat()` and `..var..`-notation, ad is
8+
joined by `after_scale()` to allow for mapping to scaled aesthetic values.
9+
Remapping of the same aesthetic is now supported with `stage()`, so you can
10+
map a data variable to a stat aesthetic, and remap the same aesthetic to
11+
something else after statistical transformation (@thomasp85, #3534)
12+
13+
* ggplot2 no longer depends on reshape2, which means that it no longer
14+
(recursively) needs plyr, stringr, or stringi packages.
15+
16+
* `geom_sf()` now determines the legend type automatically (@microly, #3646).
17+
18+
* `scale_x_continuous()` and `scale_y_continuous()` gains an `n.breaks` argument
19+
guiding the number of automatic generated breaks (@thomasp85, #3102)
20+
21+
* `geom_sf()` now removes rows that can't be plotted due to `NA` aesthetics
22+
(#3546, @thomasp85)
23+
324
* A new scale type has been added, that allows binning of aesthetics at the
425
scale level. It has versions for both position and non-position aesthetics and
526
comes with two new guides (`guide_bins` and `guide_coloursteps`) (@thomasp85, #3096)
@@ -14,10 +35,18 @@
1435
* `Geom` now gains a `setup_params()` method in line with the other ggproto
1536
classes (@thomasp85, #3509)
1637

38+
* Themes can now modify the theme element tree, via the
39+
`element_tree` argument. This allows extension packages to add functionality that
40+
alters the element tree (@clauswilke, #2540).
41+
1742
* `element_text()` now issues a warning when vectorized arguments are provided, as in
1843
`colour = c("red", "green", "blue")`. Such use is discouraged and not officially supported
1944
(@clauswilke, #3492).
2045

46+
* Addition of partial themes to plots has been made more predictable;
47+
stepwise addition of individual partial themes is now equivalent to
48+
addition of multple theme elements at once (@clauswilke, #3039).
49+
2150
* stacking text when calculating the labels and the y axis with
2251
`stat_summary()` now works (@ikosmidis, #2709)
2352

@@ -78,10 +107,18 @@
78107

79108
* `stat_density2d()` can now take an `adjust` parameter to scale the default bandwidth. (#2860, @haleyjeppson)
80109

81-
* `geom_sf()` now removes rows that contain missing `shape`/`size`/`colour` (#3483, @yutannihilation)
82-
83110
* Fix a bug when `show.legend` is a named logical vector (#3461, @yutannihilation).
84111

112+
* Increase the default `nbin` of `guide_colourbar()` to place the ticks more precisely (#3508, @yutannihilation).
113+
114+
* `geom_sf()` now applies alpha to linestring geometries (#3589, @yutannihilation).
115+
116+
* `manual_scale()` now matches `values` with the order of `breaks` whenever
117+
`values` is an unnamed vector. Previously, unnamed `values` would match with
118+
the limits of the scale and ignore the order of any `breaks` provided. Note
119+
that this may change the appearance of plots that previously relied on the
120+
unordered behaviour (#2429, @idno0001).
121+
85122
# ggplot2 3.2.1
86123

87124
This is a patch release fixing a few regressions introduced in 3.2.0 as well as

R/aes-calculated.r

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

0 commit comments

Comments
 (0)