Merge pull request #188 from jrnold/switch-syler-to-air

Use air instead of styler for code formatting

Author: jrnold

.Rbuildignore

@@ -24,3 +24,5 @@
 ^scripts$
 ^pkgdown$
 ^CLAUDE\.md$
+^air\.toml$
+^\.claude$

.github/workflows/pr-commands.yaml

@@ -60,11 +60,11 @@ jobs:
       - uses: r-lib/actions/setup-r@v2
 
       - name: Install dependencies
-        run: install.packages("styler")
+        run: install.packages("air")
         shell: Rscript {0}
 
       - name: Style
-        run: styler::style_pkg()
+        run: air::air_style_pkg()
         shell: Rscript {0}
 
       - name: commit

.gitignore

@@ -6,3 +6,4 @@ README.html
 revdep
 *.DS_Store
 docs
+.RData

CLAUDE.md

@@ -69,6 +69,7 @@ Rscript -e 'testthat::test_file("tests/testthat/test-economist.R")'
 
 This project uses [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for commit messages.
 
+
 ### Format
 ```
 <type>[optional scope]: <description>
@@ -96,6 +97,10 @@ test: add visual regression tests for tufte theme
 chore: update pkgdown configuration
 ```
 
+## NEWS.md
+
+For user-facing changes update `NEWS.md` when commiting.
+
 ## Architecture
 
 ### Code Organization
@@ -153,9 +158,32 @@ Tests use:
 
 ### Code Style
 
-- Uses tidyverse style enforced by styler (see `.lintr` for configuration)
-- Line length limit: 120 characters
-- Some example files are excluded from linting/styling (see `.lintr` and `scripts/style.R`)
+Code sytle is enforced by the the [air](https://tidyverse.org/blog/2025/02/air/) and [lintr](https://lintr.r-lib.org/) packages.
+
+- Generally follows the [tidyverse style](https://style.tidyverse.org/).
+- Line length of 120
+- `air` package configuration: `air.toml`.
+- `lintr` package configuration: `.lintr`
+
+### Spelling
+
+Check spelling using the [spelling](https://docs.ropensci.org/spelling/) package.
+
+```bash
+# Run spell check
+Rscript tests/spelling.R
+
+# Update wordlist interactively (adds new words found in documentation)
+Rscript -e 'spelling::update_wordlist()'
+```
+
+The custom wordlist is stored in `inst/WORDLIST` and contains project-specific terms like:
+- Package names (ggplot, vdiffr, pkgdown)
+- Theme names (fivethirtyeight, solarized, stata)
+- Author names and proper nouns
+- Technical terms specific to this project
+
+When spell check finds new valid words, add them to `inst/WORDLIST` using `spelling::update_wordlist()`.
 
 ## Key Concepts
 

DESCRIPTION

@@ -54,7 +54,7 @@ Description: Some extra themes, geoms, and scales for 'ggplot2'.
 License: GPL-2
 URL: https://jrnold.github.io/ggthemes/, https://github.com/jrnold/ggthemes, http://jrnold.github.io/ggthemes/
 BugReports: https://github.com/jrnold/ggthemes/issues
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.3
 LazyData: true
 Language: en-US
 Encoding: UTF-8

Makefile

@@ -29,6 +29,10 @@ style:
 lint:
 	$(RSCRIPT) -e 'devtools::lint()'
 
+.PHONY: format
+format:
+	./scripts/format
+
 README.md: README.Rmd
 	$(RSCRIPT) -e 'knitr::knit("$<", output = "$@", quiet = TRUE)'
 

R/banking.R

@@ -99,8 +99,7 @@ calc_slopes <- function(x, y, cull = FALSE) {
 #' @seealso \code{\link[lattice]{banking}()}
 #' @export
 #' @example inst/examples/ex-bank_slopes.R
-bank_slopes <- function(x, y, cull = FALSE, weight = NULL,
-                        method = c("ms", "as"), ...) {
+bank_slopes <- function(x, y, cull = FALSE, weight = NULL, method = c("ms", "as"), ...) {
   method <- match.arg(method)
   fun <- bank_slopes_funs[[method]]
   # Heer produces functions with the target alpha = w/h = x/y

R/base.R

@@ -427,14 +427,18 @@ theme_par <- function(base_size = par()$ps, base_family = par()$family) {
         colour = par()$col.axis,
         face = faces[par()$font.axis]
       ),
-      axis.text.x = element_text(margin = margin(
-        t = 0.8 * half_line / 2,
-        b = 0.8 * half_line / 2
-      )),
-      axis.text.y = element_text(margin = margin(
-        r = 0.8 * half_line / 2,
-        l = 0.8 * half_line / 2
-      )),
+      axis.text.x = element_text(
+        margin = margin(
+          t = 0.8 * half_line / 2,
+          b = 0.8 * half_line / 2
+        )
+      ),
+      axis.text.y = element_text(
+        margin = margin(
+          r = 0.8 * half_line / 2,
+          l = 0.8 * half_line / 2
+        )
+      ),
       axis.ticks = element_line(colour = par()$fg),
       legend.title = element_text(colour = par()$fg),
       legend.text = element_text(colour = par()$fg),
@@ -458,42 +462,50 @@ theme_par <- function(base_size = par()$ps, base_family = par()$family) {
         face = faces[par()$font.sub],
         colour = par()$col.sub
       ),
-      strip.text.x = element_text(margin = margin(
-        t = half_line,
-        b = half_line
-      )),
-      strip.text.y = element_text(margin = margin(
-        l = half_line,
-        r = half_line
-      )),
+      strip.text.x = element_text(
+        margin = margin(
+          t = half_line,
+          b = half_line
+        )
+      ),
+      strip.text.y = element_text(
+        margin = margin(
+          l = half_line,
+          r = half_line
+        )
+      ),
       strip.background = element_rect(colour = NA)
     )
 
   las <- par()$las
   if (las == 0) {
     # parallel to axis
-    thm <- thm + theme(
-      axis.title.x = element_text(angle = 0),
-      axis.title.y = element_text(angle = 90)
-    )
+    thm <- thm +
+      theme(
+        axis.title.x = element_text(angle = 0),
+        axis.title.y = element_text(angle = 90)
+      )
   } else if (las == 1) {
     # horizontal
-    thm <- thm + theme(
-      axis.title.x = element_text(angle = 0),
-      axis.title.y = element_text(angle = 0)
-    )
+    thm <- thm +
+      theme(
+        axis.title.x = element_text(angle = 0),
+        axis.title.y = element_text(angle = 0)
+      )
   } else if (las == 2) {
     # perpendicular
-    thm <- thm + theme(
-      axis.title.x = element_text(angle = 90),
-      axis.title.y = element_text(angle = 0)
-    )
+    thm <- thm +
+      theme(
+        axis.title.x = element_text(angle = 90),
+        axis.title.y = element_text(angle = 0)
+      )
   } else if (las == 3) {
     # vertical
-    thm <- thm + theme(
-      axis.title.x = element_text(angle = 90),
-      axis.title.y = element_text(angle = 90)
-    )
+    thm <- thm +
+      theme(
+        axis.title.x = element_text(angle = 90),
+        axis.title.y = element_text(angle = 90)
+      )
   }
 
   # ticks
@@ -504,18 +516,20 @@ theme_par <- function(base_size = par()$ps, base_family = par()$family) {
   }
   # plot x or y axis
   if (par()$xaxt == "n") {
-    thm <- thm + theme(
-      axis.line.x = element_blank(),
-      axis.text.x = element_blank(),
-      axis.ticks.x = element_blank()
-    )
+    thm <- thm +
+      theme(
+        axis.line.x = element_blank(),
+        axis.text.x = element_blank(),
+        axis.ticks.x = element_blank()
+      )
   }
   if (par()$yaxt == "n") {
-    thm <- thm + theme(
-      axis.line.y = element_blank(),
-      axis.text.y = element_blank(),
-      axis.ticks.y = element_blank()
-    )
+    thm <- thm +
+      theme(
+        axis.line.y = element_blank(),
+        axis.text.y = element_blank(),
+        axis.ticks.y = element_blank()
+      )
   }
 
   thm

R/calc.R

@@ -7,8 +7,8 @@
 #' @family themes calc
 #' @example inst/examples/ex-theme_calc.R
 theme_calc <- function(base_size = 10, base_family = "sans") {
-  (theme_foundation(base_family = base_family, base_size = base_size)
-  + theme(
+  (theme_foundation(base_family = base_family, base_size = base_size) +
+    theme(
       rect = element_rect(colour = "black", fill = "white"),
       text = element_text(colour = "black"),
       line = element_line(colour = "gray70"),

R/clean.R

@@ -12,13 +12,12 @@
 #' @export
 #'
 #' @example inst/examples/ex-theme_clean.R
-theme_clean <- function(base_size = 12,
-                        base_family = "sans") {
-  (
-    theme_foundation(
-      base_size = base_size,
-      base_family = base_family
-    ) + theme(
+theme_clean <- function(base_size = 12, base_family = "sans") {
+  (theme_foundation(
+    base_size = base_size,
+    base_family = base_family
+  ) +
+    theme(
       axis.line.x = element_line(
         colour = "black",
         size = 0.5,
@@ -52,6 +51,5 @@ theme_clean <- function(base_size = 12,
       plot.background = element_rect(colour = "black"),
       plot.title = element_text(size = ceiling(base_size * 1.1), face = "bold"),
       plot.subtitle = element_text(size = ceiling(base_size * 1.05))
-    )
-  )
+    ))
 }