Cran release v1.1.1

.Rbuildignore

@@ -13,5 +13,7 @@
 ^_pkgdown.yml$
 ^doc$
 ^Meta$
+^revdep$
+^tmp$
 vignettes/precompute_vignettes.R
 vignettes/*.Rmd.orig

.Rbuildignore_CRAN

@@ -13,6 +13,8 @@
 ^_pkgdown.yml$
 ^doc$
 ^Meta$
+^revdep$
+^tmp$
 vignettes/precompute_vignettes.R
 vignettes/*.Rmd.orig
 

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

@@ -1,14 +1,10 @@
-# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
-# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches:
-      - main
-      - master
+    branches: [main, master]
   pull_request:
-    branches:
-      - main
-      - master
+    branches: [main, master]
 
 name: R-CMD-check
 
@@ -22,63 +18,31 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-          - {os: ubuntu-20.04,   r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
 
     env:
-      R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
-      RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
 
     steps:
       - uses: actions/checkout@v4
 
+      - uses: r-lib/actions/setup-pandoc@v2
+
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+          use-public-rspm: true
 
-      - uses: r-lib/actions/setup-pandoc@v2
-
-      - name: Query dependencies
-        run: |
-          install.packages('remotes')
-          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
-          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
-        shell: Rscript {0}
-
-      - name: Restore R package cache
-        uses: actions/cache@v2
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
-
-      - name: Install system dependencies
-        if: runner.os == 'Linux'
-        run: |
-          while read -r cmd
-          do
-            eval sudo $cmd
-          done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
-
-      - name: Install dependencies
-        run: |
-          remotes::install_deps(dependencies = TRUE)
-          remotes::install_bioc("EBImage")
-          remotes::install_cran("rcmdcheck")
-        shell: Rscript {0}
-
-      - name: Check
-        env:
-          _R_CHECK_CRAN_INCOMING_REMOTE_: false
-        run: |
-          options(crayon.enabled = TRUE)
-          rcmdcheck::rcmdcheck(args = c("--no-manual", "--ignore-vignettes", "--no-build-vignettes", "--as-cran"), build_args = c("--no-manual", "--no-build-vignettes"), error_on = "error")
-        shell: Rscript {0}
+          extra-packages: any::rcmdcheck
+          needs: check
 
-      - name: Upload check results
-        if: failure()
-        uses: actions/upload-artifact@main
+      - uses: r-lib/actions/check-r-package@v2
         with:
-          name: ${{ runner.os }}-r${{ matrix.config.r }}-results
-          path: check
+          upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.gitignore

@@ -13,3 +13,5 @@ working
 pkgdown
 /doc/
 /Meta/
+/revdep/
+/tmp/

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: ggpattern
 Type: Package
 Title: 'ggplot2' Pattern Geoms
-Version: 1.1.0-9
+Version: 1.1.1
 Authors@R: c(person("Mike", "FC", role = "aut"),
              person("Trevor L.", "Davis", role = c("aut", "cre"),
                     email = "trevor.l.davis@gmail.com",
@@ -19,7 +19,7 @@ Imports:
     ggplot2 (>= 3.5.1),
     glue,
     grid,
-    gridpattern (>= 1.2.0-6),
+    gridpattern (>= 1.2.2),
     lifecycle,
     rlang (>= 1.1.3),
     scales,
@@ -28,21 +28,21 @@ Suggests:
     ambient,
     dplyr,
     gganimate,
-    knitr,
+    knitr (>= 1.47),
     magick,
     mapproj,
     maps,
     png,
     ragg (>= 1.2.0),
     readr,
-    rmarkdown,
+    rmarkdown (>= 2.27),
     sf (>= 0.7-3),
     svglite (>= 2.1.3),
     testthat (>= 2.1.0),
     vdiffr (>= 1.0.6)
-Remotes: trevorld/gridpattern
 VignetteBuilder: knitr, ragg, rmarkdown
 Collate: 
+    'a-geom-docs.R'
     'aaa-ggplot2-compat-plyr.R'
     'aaa-ggplot2-ggplot-global.R'
     'aaa-ggplot2-performance.R'

NEWS.md

@@ -1,4 +1,4 @@
-# ggpattern 1.1.0 (development)
+# ggpattern 1.1.1
 
 ## Breaking changes
 
@@ -35,10 +35,11 @@
 * Each pattern aesthetic may now be a list of vectors with each list element
   providing that aesthetic for a different pattern (#100).
   Most builtin `{gridpattern}` "geometry" patterns support multiple fill colors etc. which previously we could only access in `{ggpattern}` via custom patterns.
-* The `fill` and `pattern_fill` aesthetics may now be (a list of) gradient/pattern fills
+* The `fill`, `pattern_fill`, and `pattern_fill2` aesthetics may now be (a list of) gradient/pattern fills
   (in addition to color strings) (#112).
-  Note using gradient/pattern fills will require R (>= 4.2) and a graphics device with support for the gradient/pattern fill feature.
-  Use of just color fills should continue to work on a wider variety of R versions and graphics devices.
+  Note using gradient/pattern fills will require R (>= 4.2), a graphics device with support for the gradient/pattern fill feature,
+  and will work only for a subset of patterns (i.e. most of the "geometry" patterns).
+  Use of just color fills should continue to work on a wider variety of R versions, graphics devices, and patterns.
 * {ggpattern} now supports the `pattern_units` aesthetic (#81).
   Supported by most "geometry" patterns.
   It sets the `grid::unit()` used by the `pattern_spacing`, `pattern_xoffset`, `pattern_yoffset`,

R/a-geom-docs.R

@@ -0,0 +1,113 @@
+#' ggplot2 geoms with support for pattern fills
+#'
+#' All geoms in this package are identical to their counterparts in ggplot2 except
+#' that they can be filled with patterns.
+#'
+#' @section Pattern Arguments:
+#'
+#' Not all arguments apply to all patterns.
+#'
+#' \describe{
+#' \item{\strong{`pattern`}}{Pattern name string e.g. 'stripe' (default), 'crosshatch', 'point', 'circle', 'none'}
+#' \item{\strong{`pattern_alpha`}}{ Alpha transparency for pattern. default: 1}
+#' \item{\strong{`pattern_angle`}}{ Orientation of the pattern in degrees. default: 30}
+#' \item{\strong{`pattern_aspect_ratio`}}{ Aspect ratio adjustment. }
+#' \item{\strong{`pattern_colour`}}{ Colour used for strokes and points. default: 'black'}
+#' \item{\strong{`pattern_density`}}{ Approximate fill fraction of the pattern. Usually in range \[0, 1], but can be higher. default: 0.2}
+#' \item{\strong{`pattern_filename`}}{ Image filename/URL. }
+#' \item{\strong{`pattern_fill`}}{ Fill colour (or [grid::pattern()]/gradient fill). default: 'grey80'}
+#' \item{\strong{`pattern_fill2`}}{ Second fill colour (or [grid::pattern()]/gradient fill). default: '#4169E1'}
+#' \item{\strong{`pattern_filter`}}{ (Image scaling) filter. default: 'lanczos' }
+#' \item{\strong{`pattern_frequency`}}{ Frequency. default: 0.1 }
+#' \item{\strong{`pattern_gravity`}}{ Image placement. default: 'center' }
+#' \item{\strong{`pattern_grid`}}{ Pattern grid type. default: 'square' }
+#' \item{\strong{`pattern_key_scale_factor`}}{ Scale factor for pattern in legend. default: 1 }
+#' \item{\strong{`pattern_linetype`}}{ Stroke linetype. default: 1}
+#' \item{\strong{`pattern_option_1`}}{ Generic user value for custom patterns. }
+#' \item{\strong{`pattern_option_2`}}{ Generic user value for custom patterns. }
+#' \item{\strong{`pattern_option_3`}}{ Generic user value for custom patterns. }
+#' \item{\strong{`pattern_option_4`}}{ Generic user value for custom patterns. }
+#' \item{\strong{`pattern_option_5`}}{ Generic user value for custom patterns. }
+#' \item{\strong{`pattern_orientation`}}{ 'vertical', 'horizontal', or 'radial'. default: 'vertical' }
+#' \item{\strong{`pattern_res`}}{ Pattern resolution (pixels per inch). }
+#' \item{\strong{`pattern_rot`}}{ Rotation angle (shape within pattern). default: 0 }
+#' \item{\strong{`pattern_scale`}}{ Scale. default: 1}
+#' \item{\strong{`pattern_shape`}}{ Plotting shape. default: 1}
+#' \item{\strong{`pattern_size`}}{ Stroke line width. default: 1}
+#' \item{\strong{`pattern_spacing`}}{ Spacing of the pattern as a fraction of the plot size. default: 0.05}
+#' \item{\strong{`pattern_type`}}{ Generic control option }
+#' \item{\strong{`pattern_subtype`}}{ Generic control option }
+#' \item{\strong{`pattern_xoffset`}}{Offset the origin of the pattern. Range \[0, 1]. default: 0.  Use this to slightly shift the origin of the pattern. For most patterns, the user should limit the offset value to be less than the pattern spacing.}
+#' \item{\strong{`pattern_yoffset`}}{Offset the origin of the pattern. Range \[0, 1]. default: 0.  Use this to slightly shift the origin of the pattern. For most patterns, the user should limit the offset value to be less than the pattern spacing.}
+#' }
+#' @inheritParams ggplot2::geom_bar
+#' @inheritParams ggplot2::geom_boxplot
+#' @inheritParams ggplot2::geom_crossbar
+#' @inheritParams ggplot2::geom_histogram
+#' @inheritParams ggplot2::geom_map
+#' @inheritParams ggplot2::geom_polygon
+#' @inheritParams ggplot2::geom_rect
+#' @inheritParams ggplot2::geom_ribbon
+#' @inheritParams ggplot2::geom_violin
+#' @examples
+#'   if (require("ggplot2")) {
+#'
+#'     # 'stripe' pattern example
+#'     df <- data.frame(level = c("a", "b", "c", 'd'), outcome = c(2.3, 1.9, 3.2, 1))
+#'     gg <- ggplot(df) +
+#'       geom_col_pattern(
+#'         aes(level, outcome, pattern_fill = level),
+#'         pattern = 'stripe',
+#'         fill    = 'white',
+#'         colour  = 'black'
+#'       ) +
+#'       theme_bw(18) +
+#'       theme(legend.position = 'none') +
+#'       labs(
+#'         title    = "ggpattern::geom_col_pattern()",
+#'         subtitle = "pattern = 'stripe'"
+#'       )
+#'     plot(gg)
+#'
+#'     # 'pch' pattern example
+#'     gg <- ggplot(mtcars, aes(as.factor(cyl), mpg)) +
+#'       geom_violin_pattern(aes(fill = as.factor(cyl),
+#'                               pattern_shape = as.factor(cyl)),
+#'         pattern = 'pch',
+#'         pattern_density = 0.3,
+#'         pattern_angle = 0,
+#'         colour  = 'black'
+#'       ) +
+#'       theme_bw(18) +
+#'       theme(legend.position = 'none') +
+#'       labs(
+#'         title    = "ggpattern::geom_violin_pattern()",
+#'         subtitle = "pattern = 'pch'"
+#'       )
+#'     plot(gg)
+#'
+#'     # 'polygon_tiling' pattern example
+#'     gg <- ggplot(mtcars) +
+#'        geom_density_pattern(
+#'          aes(
+#'            x            = mpg,
+#'            pattern_fill = as.factor(cyl),
+#'            pattern_type = as.factor(cyl)
+#'          ),
+#'          pattern = 'polygon_tiling',
+#'          pattern_key_scale_factor = 1.2
+#'        ) +
+#'        scale_pattern_type_manual(values = c("hexagonal", "rhombille",
+#'                                   "pythagorean")) +
+#'        theme_bw(18) +
+#'        theme(legend.key.size = unit(2, 'cm')) +
+#'        labs(
+#'          title    = "ggpattern::geom_density_pattern()",
+#'          subtitle = "pattern = 'polygon_tiling'"
+#'        )
+#'     plot(gg)
+#'   }
+#'
+#' @return A [ggplot2::Geom] object.
+#' @name geom-docs
+NULL