From d419c5cd33cb07304e650abcf516d35c0736f792 Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Fri, 13 Dec 2024 10:46:47 +0100 Subject: [PATCH 1/4] use quarto vignettes --- vignettes/articles/{faq-annotation.Rmd => faq-annotation.qmd} | 0 vignettes/articles/{faq-axes.Rmd => faq-axes.qmd} | 0 vignettes/articles/{faq-bars.Rmd => faq-bars.qmd} | 0 .../articles/{faq-customising.Rmd => faq-customising.qmd} | 0 vignettes/articles/{faq-faceting.Rmd => faq-faceting.qmd} | 0 vignettes/articles/{faq-reordering.Rmd => faq-reordering.qmd} | 0 vignettes/{extending-ggplot2.Rmd => extending-ggplot2.qmd} | 3 +-- vignettes/{ggplot2-in-packages.Rmd => ggplot2-in-packages.qmd} | 3 +-- vignettes/{ggplot2-specs.Rmd => ggplot2-specs.qmd} | 3 +-- vignettes/{ggplot2.Rmd => ggplot2.qmd} | 3 +-- vignettes/{profiling.Rmd => profiling.qmd} | 3 +-- 11 files changed, 5 insertions(+), 10 deletions(-) rename vignettes/articles/{faq-annotation.Rmd => faq-annotation.qmd} (100%) rename vignettes/articles/{faq-axes.Rmd => faq-axes.qmd} (100%) rename vignettes/articles/{faq-bars.Rmd => faq-bars.qmd} (100%) rename vignettes/articles/{faq-customising.Rmd => faq-customising.qmd} (100%) rename vignettes/articles/{faq-faceting.Rmd => faq-faceting.qmd} (100%) rename vignettes/articles/{faq-reordering.Rmd => faq-reordering.qmd} (100%) rename vignettes/{extending-ggplot2.Rmd => extending-ggplot2.qmd} (99%) rename vignettes/{ggplot2-in-packages.Rmd => ggplot2-in-packages.qmd} (99%) rename vignettes/{ggplot2-specs.Rmd => ggplot2-specs.qmd} (99%) rename vignettes/{ggplot2.Rmd => ggplot2.qmd} (99%) rename vignettes/{profiling.Rmd => profiling.qmd} (98%) diff --git a/vignettes/articles/faq-annotation.Rmd b/vignettes/articles/faq-annotation.qmd similarity index 100% rename from vignettes/articles/faq-annotation.Rmd rename to vignettes/articles/faq-annotation.qmd diff --git a/vignettes/articles/faq-axes.Rmd b/vignettes/articles/faq-axes.qmd similarity index 100% rename from vignettes/articles/faq-axes.Rmd rename to vignettes/articles/faq-axes.qmd diff --git a/vignettes/articles/faq-bars.Rmd b/vignettes/articles/faq-bars.qmd similarity index 100% rename from vignettes/articles/faq-bars.Rmd rename to vignettes/articles/faq-bars.qmd diff --git a/vignettes/articles/faq-customising.Rmd b/vignettes/articles/faq-customising.qmd similarity index 100% rename from vignettes/articles/faq-customising.Rmd rename to vignettes/articles/faq-customising.qmd diff --git a/vignettes/articles/faq-faceting.Rmd b/vignettes/articles/faq-faceting.qmd similarity index 100% rename from vignettes/articles/faq-faceting.Rmd rename to vignettes/articles/faq-faceting.qmd diff --git a/vignettes/articles/faq-reordering.Rmd b/vignettes/articles/faq-reordering.qmd similarity index 100% rename from vignettes/articles/faq-reordering.Rmd rename to vignettes/articles/faq-reordering.qmd diff --git a/vignettes/extending-ggplot2.Rmd b/vignettes/extending-ggplot2.qmd similarity index 99% rename from vignettes/extending-ggplot2.Rmd rename to vignettes/extending-ggplot2.qmd index c10fbcf4c2..f15b756604 100644 --- a/vignettes/extending-ggplot2.Rmd +++ b/vignettes/extending-ggplot2.qmd @@ -1,11 +1,10 @@ --- title: "Extending ggplot2" -output: rmarkdown::html_vignette description: | Official extension mechanism provided in ggplot2. vignette: > %\VignetteIndexEntry{Extending ggplot2} - %\VignetteEngine{knitr::rmarkdown} + %\VignetteEngine{quarto::html} %\VignetteEncoding{UTF-8} --- diff --git a/vignettes/ggplot2-in-packages.Rmd b/vignettes/ggplot2-in-packages.qmd similarity index 99% rename from vignettes/ggplot2-in-packages.Rmd rename to vignettes/ggplot2-in-packages.qmd index fb40d8ba44..7d7947ccc5 100644 --- a/vignettes/ggplot2-in-packages.Rmd +++ b/vignettes/ggplot2-in-packages.qmd @@ -1,11 +1,10 @@ --- title: "Using ggplot2 in packages" -output: rmarkdown::html_vignette description: | Customising how aesthetic specifications are represented on your plot. vignette: > %\VignetteIndexEntry{Using ggplot2 in packages} - %\VignetteEngine{knitr::rmarkdown} + %\VignetteEngine{quarto::html} %\VignetteEncoding{UTF-8} --- diff --git a/vignettes/ggplot2-specs.Rmd b/vignettes/ggplot2-specs.qmd similarity index 99% rename from vignettes/ggplot2-specs.Rmd rename to vignettes/ggplot2-specs.qmd index 21d90e12af..fdad131818 100644 --- a/vignettes/ggplot2-specs.Rmd +++ b/vignettes/ggplot2-specs.qmd @@ -1,11 +1,10 @@ --- title: "Aesthetic specifications" -output: rmarkdown::html_vignette description: | Customising how aesthetic specifications are represented on your plot. vignette: > %\VignetteIndexEntry{Aesthetic specifications} - %\VignetteEngine{knitr::rmarkdown} + %\VignetteEngine{quarto::html} %\VignetteEncoding{UTF-8} --- diff --git a/vignettes/ggplot2.Rmd b/vignettes/ggplot2.qmd similarity index 99% rename from vignettes/ggplot2.Rmd rename to vignettes/ggplot2.qmd index 988bbd8310..91a324eff9 100644 --- a/vignettes/ggplot2.Rmd +++ b/vignettes/ggplot2.qmd @@ -1,11 +1,10 @@ --- title: "Introduction to ggplot2" -output: rmarkdown::html_vignette description: | An overview of the layered grammar of graphics. vignette: > %\VignetteIndexEntry{Introduction to ggplot2} - %\VignetteEngine{knitr::rmarkdown} + %\VignetteEngine{quarto::html} %\VignetteEncoding{UTF-8} --- diff --git a/vignettes/profiling.Rmd b/vignettes/profiling.qmd similarity index 98% rename from vignettes/profiling.Rmd rename to vignettes/profiling.qmd index d08f8e5a26..fca21d6a32 100644 --- a/vignettes/profiling.Rmd +++ b/vignettes/profiling.qmd @@ -1,12 +1,11 @@ --- title: "Profiling Performance" author: "Thomas Lin Pedersen" -output: rmarkdown::html_vignette description: | Monitoring the performance of your plots. vignette: > %\VignetteIndexEntry{Profiling Performance} - %\VignetteEngine{knitr::rmarkdown} + %\VignetteEngine{quarto::html} %\VignetteEncoding{UTF-8} --- From 2ff3a72e1692c6ae5ec6e5cd954de1d24f1c62d9 Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Fri, 13 Dec 2024 10:47:14 +0100 Subject: [PATCH 2/4] add quarto as vignette builder/suggests --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 978cbf725c..0729b0b3fc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -60,9 +60,9 @@ Suggests: nlme, profvis, quantreg, + quarto, ragg (>= 1.2.6), RColorBrewer, - rmarkdown, rpart, sf (>= 0.7-3), svglite (>= 2.1.2), @@ -73,7 +73,7 @@ Suggests: Enhances: sp VignetteBuilder: - knitr + quarto Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate Config/testthat/edition: 3 Config/usethis/last-upkeep: 2024-10-24 From 1b2d02a61437052daa2ef877cafc17fd82d123de Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Fri, 13 Dec 2024 11:03:49 +0100 Subject: [PATCH 3/4] ignore render output files --- vignettes/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vignettes/.gitignore b/vignettes/.gitignore index 097b241637..7ee88177ab 100644 --- a/vignettes/.gitignore +++ b/vignettes/.gitignore @@ -1,2 +1,4 @@ *.html *.R +**/figure-html/ +**/libs/ From dd4e842c2d3ef40c23aec6ee5c165e96ad5672be Mon Sep 17 00:00:00 2001 From: Teun van den Brand Date: Fri, 13 Dec 2024 11:03:49 +0100 Subject: [PATCH 4/4] add html format --- vignettes/.gitignore | 4 ++++ vignettes/articles/faq-annotation.qmd | 1 + vignettes/articles/faq-axes.qmd | 1 + vignettes/articles/faq-bars.qmd | 1 + vignettes/articles/faq-customising.qmd | 1 + vignettes/articles/faq-faceting.qmd | 1 + vignettes/articles/faq-reordering.qmd | 1 + 7 files changed, 10 insertions(+) diff --git a/vignettes/.gitignore b/vignettes/.gitignore index 097b241637..ac68158dde 100644 --- a/vignettes/.gitignore +++ b/vignettes/.gitignore @@ -1,2 +1,6 @@ *.html *.R +**/figure-html/ +**/libs/ + +/.quarto/ diff --git a/vignettes/articles/faq-annotation.qmd b/vignettes/articles/faq-annotation.qmd index ff382d40b3..a88caa2c85 100644 --- a/vignettes/articles/faq-annotation.qmd +++ b/vignettes/articles/faq-annotation.qmd @@ -1,5 +1,6 @@ --- title: "FAQ: Annotation" +format: html --- ```{=html} diff --git a/vignettes/articles/faq-axes.qmd b/vignettes/articles/faq-axes.qmd index cf88240cfa..aa9e7c8bb7 100644 --- a/vignettes/articles/faq-axes.qmd +++ b/vignettes/articles/faq-axes.qmd @@ -1,5 +1,6 @@ --- title: "FAQ: Axes" +format: html --- ```{=html} diff --git a/vignettes/articles/faq-bars.qmd b/vignettes/articles/faq-bars.qmd index daae53ef58..8dad917181 100644 --- a/vignettes/articles/faq-bars.qmd +++ b/vignettes/articles/faq-bars.qmd @@ -1,5 +1,6 @@ --- title: "FAQ: Barplots" +format: html --- ```{=html} diff --git a/vignettes/articles/faq-customising.qmd b/vignettes/articles/faq-customising.qmd index 9b008af042..b213c15262 100644 --- a/vignettes/articles/faq-customising.qmd +++ b/vignettes/articles/faq-customising.qmd @@ -1,5 +1,6 @@ --- title: "FAQ: Customising" +format: html --- ```{=html} diff --git a/vignettes/articles/faq-faceting.qmd b/vignettes/articles/faq-faceting.qmd index d5a6926d83..4bf8f97ecc 100644 --- a/vignettes/articles/faq-faceting.qmd +++ b/vignettes/articles/faq-faceting.qmd @@ -1,5 +1,6 @@ --- title: "FAQ: Faceting" +format: html --- ```{=html} diff --git a/vignettes/articles/faq-reordering.qmd b/vignettes/articles/faq-reordering.qmd index 964dd6ba08..77304a99c1 100644 --- a/vignettes/articles/faq-reordering.qmd +++ b/vignettes/articles/faq-reordering.qmd @@ -1,5 +1,6 @@ --- title: "FAQ: Reordering" +format: html --- ```{=html}