Skip to content

Commit 3125292

Browse files
committed
Migrate to Quarto
1 parent cdd382b commit 3125292

67 files changed

Lines changed: 736 additions & 791 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.Rbuildignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,8 @@
4141
^vignettes/\.quarto$
4242
^vignettes/articles/\.quarto$
4343
^vignettes/articles/*_files$
44+
^vignettes/*_files$
45+
^README\.qmd$
46+
^inst/README\.qmd$
47+
^README_files$
48+
^README\.html$

.github/workflows/check-full.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
- {os: ubuntu-latest, r: "4.1.0"}
4343
env:
4444
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
45-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4645

4746
steps:
4847
- uses: actions/checkout@v6
@@ -58,9 +57,8 @@ jobs:
5857
- uses: r-lib/actions/setup-r-dependencies@v2
5958
with:
6059
extra-packages: |
60+
local::.
6161
any::rcmdcheck
62-
any::testthat
63-
any::usethis
6462
needs: check
6563

6664
- uses: r-lib/actions/check-r-package@v2

.github/workflows/update-docs.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,25 @@ jobs:
2727
with:
2828
extra-packages: |
2929
local::.
30+
any::rcmdcheck
3031
dieghernan/pkgdev
3132
needs: website
3233

34+
- name: Install optipng
35+
run: |
36+
if [ "$RUNNER_OS" == "Linux" ]; then
37+
sudo apt-get update
38+
sudo apt-get install optipng
39+
elif [ "$RUNNER_OS" == "Windows" ]; then
40+
choco install optipng
41+
elif [ "$RUNNER_OS" == "macOS" ]; then
42+
brew install optipng
43+
else
44+
echo "$RUNNER_OS not supported"
45+
exit 1
46+
fi
47+
shell: bash
48+
3349
- name: Run jarl
3450
uses: etiennebacher/setup-jarl@v0.1.0
3551
continue-on-error: true
@@ -45,7 +61,7 @@ jobs:
4561
- name: Update docs
4662
run: |
4763
48-
pkgdev::update_docs(opt_dir = c("man/figures", "img", "vignettes"))
64+
pkgdev::update_docs()
4965
5066
shell: Rscript {0}
5167

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ CRAN-SUBMISSION
3333
Rplots.pdf
3434
/.quarto/
3535
**/*.quarto_ipynb
36+
**/.quarto/
37+
README_files/
38+
README.html

CITATION.cff

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,23 @@ references:
230230
orcid: https://orcid.org/0000-0003-4757-117X
231231
year: '2026'
232232
doi: 10.32614/CRAN.package.lifecycle
233+
- type: software
234+
title: quarto
235+
abstract: 'quarto: R Interface to ''Quarto'' Markdown Publishing System'
236+
notes: Suggests
237+
url: https://quarto-dev.github.io/quarto-r/
238+
repository: https://CRAN.R-project.org/package=quarto
239+
authors:
240+
- family-names: Allaire
241+
given-names: JJ
242+
email: jj@posit.co
243+
orcid: https://orcid.org/0000-0003-0174-9868
244+
- family-names: Dervieux
245+
given-names: Christophe
246+
email: cderv@posit.co
247+
orcid: https://orcid.org/0000-0003-4474-2498
248+
year: '2026'
249+
doi: 10.32614/CRAN.package.quarto
233250
- type: software
234251
title: rmarkdown
235252
abstract: 'rmarkdown: Dynamic Documents for R'

DESCRIPTION

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ Suggests:
2828
bibtex (>= 0.5.0),
2929
knitr,
3030
lifecycle,
31+
quarto,
3132
rmarkdown,
3233
testthat (>= 3.0.0),
3334
usethis
3435
VignetteBuilder:
35-
knitr
36+
knitr,
37+
quarto
3638
Config/Needs/website: devtools
3739
Config/testthat/edition: 3
3840
Config/testthat/parallel: true

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# cffr (development version)
22

33
- Minimum **R** version required now is **4.1.0**.
4+
- Migrate vignettes to Quarto.
45

56
# cffr 1.2.1
67

R/as_bibentry.R

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,13 @@
6161
#' @family bibtex
6262
#' @family s3method
6363
#'
64-
#'
6564
#' @details
6665
#'
6766
#' A **R** `bibentry` object is the representation of a BibTeX entry. These
6867
#' objects can be converted to BibTeX markup with [toBibtex()], that creates an
6968
#' object of class `Bibtex` and can be printed and exported as a valid BibTeX
7069
#' entry.
7170
#'
72-
#'
7371
#' `as_bibtex()` tries to map the information of the source `x` into a `cff]
7472
#' object and performs a mapping of the metadata to BibTeX, according to
7573
#' `vignette("bibtex_cff", "cffr")`.
@@ -112,7 +110,6 @@
112110
#'
113111
#' installed_package
114112
#'
115-
#'
116113
#' # Use a DESCRIPTION file
117114
#' path2 <- system.file("examples/DESCRIPTION_gitlab", package = "cffr")
118115
#' desc_file <- as_bibentry(path2)

R/as_cff.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ as.cff <- function(x) {
157157

158158
#' Recursively clean lists
159159
#'
160-
#'
161160
#' @noRd
162161
rapply_drop_null <- function(x) {
163162
if (is.list(x) && length(x) > 0) {

R/as_cff_person.R

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#' "(https://github.com/citation-file-format/",
1111
#' "citation-file-format/blob/main/schema-guide.md)."))
1212
#'
13-
#'
1413
#' ```
1514
#'
1615
#' `as_cff_person` is an S3 generic, with methods for:
@@ -48,12 +47,10 @@
4847
#' "(https://github.com/citation-file-format/",
4948
#' "citation-file-format/blob/main/schema-guide.md). "))
5049
#'
51-
#'
5250
#' ```
5351
#' Each element of the `cff_pers_lst` object would have classes
5452
#' [`cff_pers, cff`][cff_pers].
5553
#'
56-
#'
5754
#' @details
5855
#'
5956
#' `as_cff_person()` would recognize if the input should be converted using the
@@ -100,7 +97,6 @@
10097
#'
10198
#' See **Examples** for more information.
10299
#'
103-
#'
104100
#' @examples
105101
#' # Create a person object
106102
#' a_person <- person(
@@ -151,7 +147,6 @@
151147
#' # Or as person object
152148
#' as.person(a_cff)
153149
#'
154-
#'
155150
#' # Or you can use BibTeX style as input if you prefer
156151
#'
157152
#' x <- "Frank Sinatra and Dean Martin and Davis, Jr., Sammy and Joey Bishop"

0 commit comments

Comments
 (0)