From 5457e211d390233cc14ff9d1d99e267e6068a312 Mon Sep 17 00:00:00 2001 From: Vincent Arel-Bundock Date: Sun, 31 Mar 2024 20:26:24 -0400 Subject: [PATCH 1/2] issue #226 (#267) --- R/settings_quarto_website.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/settings_quarto_website.R b/R/settings_quarto_website.R index cd5c0d5..44cc77c 100644 --- a/R/settings_quarto_website.R +++ b/R/settings_quarto_website.R @@ -62,7 +62,8 @@ fs::path_join(c(path, "_quarto/man")), pattern = "\\.qmd$", full.names = TRUE) - fn_man <- gsub(".*_quarto.", "", fn_man) + # issue #266: add word boundary check + fn_man <- gsub(".*\\b_quarto.", "", fn_man) fn_vignettes <- gsub(".*_quarto.", "", fn_vignettes) yml <- paste(sidebar, collapse = "\n") From 9640d708b56008806693ebbceb05b733d22514f7 Mon Sep 17 00:00:00 2001 From: Kyle F Butts Date: Wed, 3 Apr 2024 22:12:51 -0400 Subject: [PATCH 2/2] Issue #268 (#269) --- R/render_docs.R | 2 -- R/setup_docs.R | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/R/render_docs.R b/R/render_docs.R index 74e75d4..5e12071 100644 --- a/R/render_docs.R +++ b/R/render_docs.R @@ -68,8 +68,6 @@ render_docs <- function(path = ".", verbose = FALSE, parallel = FALSE, freeze = fs::file_delete(docs_files) } - .add_gitignore("_quarto/", path = path) - .add_gitignore("!_quarto/_freeze/", path = path) } else { docs_dir <- fs::path_join(c(path, "docs")) } diff --git a/R/setup_docs.R b/R/setup_docs.R index 064293c..43a7472 100644 --- a/R/setup_docs.R +++ b/R/setup_docs.R @@ -109,7 +109,11 @@ setup_docs <- function(tool, path = ".", overwrite = FALSE) { .add_rbuildignore("^docs$", path = path) .add_rbuildignore("^altdoc$", path = path) .add_gitignore("altdoc/freeze.rds", path = path) - if (tool == "quarto_website") .add_rbuildignore("^_quarto$", path = path) + if (tool == "quarto_website") { + .add_rbuildignore("^_quarto$", path = path) + .add_gitignore("_quarto/*", path = path) + .add_gitignore("!_quarto/_freeze/", path = path) + } cli::cli_alert_info("Importing default settings file(s) to `altdoc/`")