Skip to content

Commit c094b4b

Browse files
authored
Quarto vignettes (#6241)
* use quarto vignettes * add quarto as vignette builder/suggests * ignore render output files * add html format * move knitr chunk options to yaml * force install self on old windows
1 parent 5f6d3c5 commit c094b4b

File tree

14 files changed

+91
-81
lines changed

14 files changed

+91
-81
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
7070
Hmisc=?ignore-before-r=4.2.0,
7171
quantreg=?ignore-before-r=4.3.0
72+
local::.
7273
needs: check
7374

7475
- uses: r-lib/actions/setup-r-dependencies@v2

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ Suggests:
6363
nlme,
6464
profvis,
6565
quantreg,
66+
quarto,
6667
ragg (>= 1.2.6),
6768
RColorBrewer,
68-
rmarkdown,
6969
roxygen2,
7070
rpart,
7171
sf (>= 0.7-3),
@@ -76,8 +76,8 @@ Suggests:
7676
xml2
7777
Enhances:
7878
sp
79-
VignetteBuilder:
80-
knitr
79+
VignetteBuilder:
80+
quarto
8181
Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate
8282
Config/testthat/edition: 3
8383
Config/usethis/last-upkeep: 2025-04-23

vignettes/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
*.html
22
*.R
3+
**/figure-html/
4+
**/libs/
5+
/.quarto/

vignettes/articles/faq-annotation.Rmd renamed to vignettes/articles/faq-annotation.qmd

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
---
22
title: "FAQ: Annotation"
3+
format: html
4+
knitr:
5+
opts_chunk:
6+
collapse: true
7+
comment: "#>"
8+
fig-dpi: 300
9+
fig-asp: 0.618
10+
fig-width: 6
11+
out-width: "80%"
312
---
413

514
```{=html}
@@ -17,14 +26,6 @@ title: "FAQ: Annotation"
1726
#| include: false
1827
library(ggplot2)
1928
library(dplyr)
20-
knitr::opts_chunk$set(
21-
fig.dpi = 300,
22-
collapse = TRUE,
23-
comment = "#>",
24-
fig.asp = 0.618,
25-
fig.width = 6,
26-
out.width = "80%"
27-
)
2829
```
2930

3031

vignettes/articles/faq-axes.Rmd renamed to vignettes/articles/faq-axes.qmd

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
---
22
title: "FAQ: Axes"
3+
format: html
4+
knitr:
5+
opts_chunk:
6+
collapse: true
7+
comment: "#>"
8+
fig-dpi: 300
9+
fig-asp: 0.618
10+
fig-width: 6
11+
out-width: "80%"
312
---
413

514
```{=html}
@@ -16,13 +25,6 @@ title: "FAQ: Axes"
1625
```{r}
1726
#| include: false
1827
library(ggplot2)
19-
knitr::opts_chunk$set(
20-
fig.dpi = 300,
21-
collapse = TRUE,
22-
comment = "#>",
23-
fig.asp = 0.618,
24-
fig.width = 6,
25-
out.width = "80%")
2628
```
2729

2830
## Label placement

vignettes/articles/faq-bars.Rmd renamed to vignettes/articles/faq-bars.qmd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
---
22
title: "FAQ: Barplots"
3+
format: html
4+
knitr:
5+
opts_chunk:
6+
collapse: true
7+
comment: "#>"
8+
fig-dpi: 300
9+
fig-asp: 0.618
10+
fig-width: 6
11+
out-width: "80%"
312
---
413

514
```{=html}
@@ -18,15 +27,6 @@ title: "FAQ: Barplots"
1827
library(ggplot2)
1928
library(dplyr)
2029
library(tidyr)
21-
22-
knitr::opts_chunk$set(
23-
fig.dpi = 300,
24-
collapse = TRUE,
25-
comment = "#>",
26-
fig.asp = 0.618,
27-
fig.width = 6,
28-
out.width = "80%"
29-
)
3030
```
3131

3232
## Colors

vignettes/articles/faq-customising.Rmd renamed to vignettes/articles/faq-customising.qmd

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
---
22
title: "FAQ: Customising"
3+
format: html
4+
knitr:
5+
opts_chunk:
6+
collapse: true
7+
comment: "#>"
8+
fig-dpi: 300
9+
fig-asp: 0.618
10+
fig-width: 6
11+
out-width: "80%"
312
---
413

514
```{=html}
@@ -17,14 +26,6 @@ title: "FAQ: Customising"
1726
#| include: false
1827
library(ggplot2)
1928
library(tibble)
20-
knitr::opts_chunk$set(
21-
fig.dpi = 300,
22-
collapse = TRUE,
23-
comment = "#>",
24-
fig.asp = 0.618,
25-
fig.width = 6,
26-
out.width = "80%"
27-
)
2829
```
2930

3031
## Legends

vignettes/articles/faq-faceting.Rmd renamed to vignettes/articles/faq-faceting.qmd

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
---
22
title: "FAQ: Faceting"
3+
format: html
4+
knitr:
5+
opts_chunk:
6+
collapse: true
7+
comment: "#>"
8+
fig-dpi: 300
9+
fig-asp: 0.618
10+
fig-width: 6
11+
out-width: "80%"
312
---
413

514
```{=html}
@@ -16,13 +25,6 @@ title: "FAQ: Faceting"
1625
```{r}
1726
#| include: false
1827
library(ggplot2)
19-
knitr::opts_chunk$set(
20-
fig.dpi = 300,
21-
collapse = TRUE,
22-
comment = "#>",
23-
fig.asp = 0.618,
24-
fig.width = 6,
25-
out.width = "80%")
2628
```
2729

2830
## Panes

vignettes/articles/faq-reordering.Rmd renamed to vignettes/articles/faq-reordering.qmd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
---
22
title: "FAQ: Reordering"
3+
format: html
4+
knitr:
5+
opts_chunk:
6+
collapse: true
7+
comment: "#>"
8+
fig-dpi: 300
9+
fig-asp: 0.618
10+
fig-width: 6
11+
out-width: "80%"
312
---
413

514
```{=html}
@@ -18,15 +27,6 @@ title: "FAQ: Reordering"
1827
library(ggplot2)
1928
library(dplyr)
2029
library(tibble)
21-
22-
knitr::opts_chunk$set(
23-
fig.dpi = 300,
24-
collapse = TRUE,
25-
comment = "#>",
26-
fig.asp = 0.618,
27-
fig.width = 6,
28-
out.width = "80%"
29-
)
3030
```
3131

3232
## Bar plots

vignettes/extending-ggplot2.Rmd renamed to vignettes/extending-ggplot2.qmd

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
---
22
title: "Extending ggplot2"
3-
output: rmarkdown::html_vignette
3+
knitr:
4+
opts_chunk:
5+
collapse: false
6+
comment: "#>"
7+
fig-width: 7
8+
fig-height: 7
9+
fig-align: "center"
410
description: |
511
Official extension mechanism provided in ggplot2.
612
vignette: >
713
%\VignetteIndexEntry{Extending ggplot2}
8-
%\VignetteEngine{knitr::rmarkdown}
14+
%\VignetteEngine{quarto::html}
915
%\VignetteEncoding{UTF-8}
1016
---
1117

1218
```{r}
1319
#| include: false
14-
knitr::opts_chunk$set(collapse = TRUE, comment = "#>", fig.width = 7, fig.height = 7, fig.align = "center")
1520
library(ggplot2)
1621
```
1722

0 commit comments

Comments
 (0)