Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
^README.Rmd$
^README.html$
^Rakefile$
^Rplots.pdf$
^pkgdown$
^_pkgdown.yml$
^data-raw$
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ codecov.yml
data-raw/*.png
vignettes/*.R
vignettes/*.html
Rplots.pdf
4 changes: 3 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: gridpattern
Type: Package
Title: 'grid' Pattern Grobs
Version: 1.4.0-1
Version: 1.4.0-2
Authors@R: c(
person("Trevor L.", "Davis", role=c("aut", "cre"), email="trevor.l.davis@gmail.com",
comment = c(ORCID = "0000-0001-6341-4639")),
Expand All @@ -26,6 +26,7 @@ Imports:
utils
Suggests:
ambient,
aqp,
aRtsy,
ggplot2 (>= 3.5.0),
gtable,
Expand All @@ -36,6 +37,7 @@ Suggests:
scales,
svglite (>= 2.1.0),
testthat,
Unicode,
vdiffr (>= 1.0.6)
VignetteBuilder: knitr, rmarkdown
Config/roxygen2/version: 8.0.0
3 changes: 3 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export(grid.pattern_circle)
export(grid.pattern_crosshatch)
export(grid.pattern_fill)
export(grid.pattern_gradient)
export(grid.pattern_hatch)
export(grid.pattern_image)
export(grid.pattern_line)
export(grid.pattern_magick)
Expand All @@ -35,7 +36,9 @@ export(grid.pattern_wave)
export(grid.pattern_weave)
export(guess_has_R4.1_features)
export(mean_col)
export(mix_col)
export(names_aRtsy)
export(names_hatch)
export(names_hex)
export(names_magick)
export(names_magick_intensity)
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@ gridpattern v1.4.0 (development)
New Features
------------

* New "hatch" pattern with corresponding `grid.pattern_hatch()` and `names_hatch()` (#97).

* New "line" pattern with corresponding `grid.pattern_line()`.
Unlike the "stripe" pattern which fills bands with solid colour,
"line" draws stroked lines using the device's native line rendering,
enabling all of R's built-in `linetype` values
(including `"dotdash"`, `"twodash"`, and custom line types specified as hex strings per `?par`).

* `mix_col()` is a new utility function that mixes colors via Munsell color
space using `aqp::mixMunsell()`.
Requires the suggested package `{aqp}`.

Bug fixes and minor improvements
--------------------------------

Expand Down
4 changes: 4 additions & 0 deletions R/grid-pattern.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#' See [grid.pattern_crosshatch()] for more information.}
#' \item{gradient}{Gradient array/geometry patterns.
#' See [grid.pattern_gradient()] for more information.}
#' \item{hatch}{Heraldic hatching patterns.
#' See [grid.pattern_hatch()] for more information.}
#' \item{image}{Image array patterns.
#' See [grid.pattern_image()] for more information.}
#' \item{line}{Line geometry patterns.
Expand Down Expand Up @@ -158,6 +160,7 @@ names_pattern <- c(
"crosshatch",
"fill",
"gradient",
"hatch",
"image",
"line",
"magick",
Expand Down Expand Up @@ -251,6 +254,7 @@ get_pattern_fn <- function(pattern) {
crosshatch = create_pattern_crosshatch_via_sf,
fill = create_pattern_fill,
gradient = create_pattern_gradient,
hatch = create_pattern_hatch,
line = create_pattern_line,
none = create_pattern_none,
pch = create_pattern_pch,
Expand Down
24 changes: 0 additions & 24 deletions R/mean_col.R

This file was deleted.

Loading
Loading