From e16ae8b600180c1b3d95a0da39bdaa3e43296373 Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Tue, 10 Dec 2024 13:56:10 +0100 Subject: [PATCH 1/4] add news bullet --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index dd574ac1aa..e693301d99 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # ggplot2 (development version) +* Attempt to boost detail in `coord_polar()` and `coord_radial()` near the + center (@teunbrand, #5023) * `guide_*()` can now accept two inside legend theme elements: `legend.position.inside` and `legend.justification.inside`, allowing inside legends to be placed at different positions. Only inside legends with the same From 4e30e190d994b182ff1f8799bfae2e4c28e2c37e Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Thu, 12 Dec 2024 11:28:00 +0100 Subject: [PATCH 2/4] add images --- man/figures/shape_table.pdf | Bin 0 -> 5370 bytes man/figures/shape_table.svg | 120 ++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 man/figures/shape_table.pdf create mode 100644 man/figures/shape_table.svg diff --git a/man/figures/shape_table.pdf b/man/figures/shape_table.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8e7f539dc2c72736cc80d3062e92ec3ef343ccfb GIT binary patch literal 5370 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +0: +square open +1: +circle open +2: +triangle open +3: +plus +4: +cross +5: +diamond open +6: +triangle down open +7: +square cross +8: +asterisk +9: +diamond plus +10: +circle plus +11: +star +12: +square plus +13: +circle cross +14: +square triangle +15: +square +16: +circle small +17: +triangle +18: +diamond +19: +circle +20: +bullet +21: +circle filled +22: +square filled +23: +diamond filled +24: +triangle filled +25: +triangle down filled + + From 1c0ded602672c8f9b0f4a54fc44d704487269abc Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Thu, 12 Dec 2024 11:28:13 +0100 Subject: [PATCH 3/4] include in docs --- R/scale-shape.R | 7 +++++++ man/scale_shape.Rd | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/R/scale-shape.R b/R/scale-shape.R index effa0a0b2f..39687022fc 100644 --- a/R/scale-shape.R +++ b/R/scale-shape.R @@ -12,6 +12,13 @@ #' @inheritParams scale_x_discrete #' @inheritDotParams discrete_scale -expand -position -scale_name -palette #' @rdname scale_shape +#' @details +#' Shapes can be referred to by number or name. Shapes in \[0, 20\] do not +#' support a fill aesthetic, whereas shapes in \[21, 25\] do. +#' +#' \if{html}{\figure{shape_table.svg}{All shapes by number and name}} +#' \if{latex}{\figure{shape_table.pdf}} +#' #' @seealso #' The documentation for [differentiation related aesthetics][aes_linetype_size_shape]. #' diff --git a/man/scale_shape.Rd b/man/scale_shape.Rd index 85b991fd9a..4f90b5c0d6 100644 --- a/man/scale_shape.Rd +++ b/man/scale_shape.Rd @@ -89,6 +89,13 @@ seventh and subsequent levels will not appear on the plot. Use a continuous variable to shape unless \code{scale_shape_binned()} is used. Still, as shape has no inherent order, this use is not advised. } +\details{ +Shapes can be referred to by number or name. Shapes in [0, 20] do not +support a fill aesthetic, whereas shapes in [21, 25] do. + +\if{html}{\figure{shape_table.svg}{All shapes by number and name}} +\if{latex}{\figure{shape_table.pdf}} +} \examples{ set.seed(596) dsmall <- diamonds[sample(nrow(diamonds), 100), ] From 64f9d510c08c1756aaf6c6f76cd844a1ede1db21 Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Thu, 12 Dec 2024 11:32:37 +0100 Subject: [PATCH 4/4] Revert "add news bullet" This reverts commit e16ae8b600180c1b3d95a0da39bdaa3e43296373. --- NEWS.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index e693301d99..dd574ac1aa 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,5 @@ # ggplot2 (development version) -* Attempt to boost detail in `coord_polar()` and `coord_radial()` near the - center (@teunbrand, #5023) * `guide_*()` can now accept two inside legend theme elements: `legend.position.inside` and `legend.justification.inside`, allowing inside legends to be placed at different positions. Only inside legends with the same