Skip to content

Clear merge debris #6416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
70c3dab
Increment version number to 3.5.1
thomasp85 Apr 22, 2024
3e585a8
update cran comments
thomasp85 Apr 22, 2024
8fa3974
fix wrong automatic version bump
thomasp85 Apr 22, 2024
4b67b19
remove tests for ragg/svglite
teunbrand Mar 31, 2025
7960366
Forward compatibility: cherry-pick accessors (#6387)
teunbrand Apr 3, 2025
836d820
Forward compatibility: `is_*()` functions (#6388)
teunbrand Apr 3, 2025
bb2c405
Forward compatibility: fix mistakes (#6394)
teunbrand Apr 3, 2025
2663bb1
Fix deprecation calls
thomasp85 Apr 7, 2025
19f2ed6
Prep tests for next svglite release
thomasp85 Apr 7, 2025
be1b49f
rename is_element -> is_theme_element
thomasp85 Apr 7, 2025
4ed6abe
Add back deleted functions
thomasp85 Apr 8, 2025
ff44403
run revdepcheck
thomasp85 Apr 8, 2025
92032f2
update news
thomasp85 Apr 8, 2025
3255f65
fix urls
thomasp85 Apr 8, 2025
35f02b9
better forward compat for svglite
thomasp85 Apr 8, 2025
ceb5a37
Fix links
thomasp85 Apr 8, 2025
78100d3
correctly ref new is_ggproto() in docs
thomasp85 Apr 8, 2025
2271567
update cran comments
thomasp85 Apr 8, 2025
8b27990
Increment version number to 3.5.2
thomasp85 Apr 8, 2025
0e7c028
Fix feedback from CRAN
thomasp85 Apr 9, 2025
99e9b7e
Increment version number to 3.5.2.9000
thomasp85 Apr 9, 2025
2ff77b1
Resolve merge conflict with RC branch (#6415)
teunbrand Apr 10, 2025
ec9e909
resolve merge conflict
teunbrand Apr 10, 2025
e1cdee0
Merge pull request #6403 from tidyverse/rc/3.5.2
teunbrand Apr 10, 2025
039aca7
move 3.5.2 news behind dev news
teunbrand Apr 10, 2025
2a3875c
rename `is.waiver()` -> `is_waiver()` for consistency
teunbrand Apr 10, 2025
587b87c
more consistently use new test functions
teunbrand Apr 10, 2025
884b0b0
include new elements in `is_theme_element(type)`
teunbrand Apr 10, 2025
ba76efc
replace `is.zero()` with `is_zero()`
teunbrand Apr 10, 2025
8f72633
replace `is.rel()` with `is_rel()`
teunbrand Apr 10, 2025
7658827
replace `is.formula()` with `rlang::is_formula()`
teunbrand Apr 10, 2025
fcd9c4b
replace `is.discrete()` with `is_discrete()`
teunbrand Apr 10, 2025
c8f0ae6
replace `is.derived()` with `is_derived()`
teunbrand Apr 10, 2025
928b605
replace `is.sec_axis()` with `is_sec_axis()`
teunbrand Apr 10, 2025
d471a11
fix doc issues
teunbrand Apr 10, 2025
95be32b
fix dumb mistake
teunbrand Apr 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix doc issues
  • Loading branch information
teunbrand committed Apr 10, 2025
commit d471a113e79082e2e25c6385bd3e9337001574f4
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ export(element_geom)
export(element_grob)
export(element_line)
export(element_point)
export(element_polygon)
export(element_rect)
export(element_render)
export(element_text)
Expand Down
2 changes: 2 additions & 0 deletions R/theme-elements.R
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ element_text <- function(family = NULL, face = NULL, colour = NULL,
)
}

#' @export
#' @rdname element
element_polygon <- function(fill = NULL, colour = NULL, linewidth = NULL,
linetype = NULL, color = NULL,
inherit.blank = FALSE) {
Expand Down
10 changes: 10 additions & 0 deletions man/element.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/is.rel.Rd → man/is_rel.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.