diff --git a/DESCRIPTION b/DESCRIPTION index 7ef5555879..4182349a5d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -7,6 +7,7 @@ Depends: dygraphs, fs, ggplot2, + gh, gt, htmltools, knitr, diff --git a/docs/download/changelog/1.3/_changelog.md b/docs/download/changelog/1.3/_changelog.md index 5f780e99b1..e3417658a2 100644 --- a/docs/download/changelog/1.3/_changelog.md +++ b/docs/download/changelog/1.3/_changelog.md @@ -27,7 +27,7 @@ ## Jupyter Notebooks -- Add support for embedding cell outputs in quarto documents using `{{< embed >}}`. You can address cells by Id, Tag, or label, such as `{{< embed mynotebook.ipynb#fig-output >}}` which would embed the output of a cell with the label `fig-output`). You can also provide a list of ids like `{{< embed mynotebook.ipynb#fig-output,tbl-out >}}`. +- Add support for embedding cell outputs in quarto documents using `{{{< embed >}}}`. You can address cells by Id, Tag, or label, such as `{{{< embed mynotebook.ipynb#fig-output >}}}` which would embed the output of a cell with the label `fig-output`). You can also provide a list of ids like `{{{< embed mynotebook.ipynb#fig-output,tbl-out >}}}`. - Only attempt to postprocess `text/plain` output if it's nonempty ([#3896](https://github.com/quarto-dev/quarto-cli/issues/3896)). - Fix output of bokeh plots so the right number of cells is generated ([#2107](https://github.com/quarto-dev/quarto-cli/issues/2107)). - Fix output of code cells that contain triple backticks (or more) ([#3179](https://github.com/quarto-dev/quarto-cli/issues/3179)). diff --git a/docs/download/changelog/1.5/_changelog.md b/docs/download/changelog/1.5/_changelog.md index 5d4d03024a..4603c539f7 100644 --- a/docs/download/changelog/1.5/_changelog.md +++ b/docs/download/changelog/1.5/_changelog.md @@ -260,7 +260,7 @@ - ([#9727](https://github.com/quarto-dev/quarto-cli/issues/9727)): `lightbox`: do not overwrite `window.onload` events. - ([#9792](https://github.com/quarto-dev/quarto-cli/issues/9798)): Fix a 1.5 regression where `freeze` would be accidentally triggered in single-file renders. - ([#10003](https://github.com/quarto-dev/quarto-cli/issues/10003)): fix Giscus light/dark theme YAML example in schema where `theme` is missing. -- Add support for `{{< lipsum >}}` shortcode, which is useful for emitting placeholder text. Provide a specific number of paragraphs (`{{< lipsum 3 >}}`). +- Add support for `{{{< lipsum >}}}` shortcode, which is useful for emitting placeholder text. Provide a specific number of paragraphs (`{{{< lipsum 3 >}}}`). - Resolve data URIs in Pandoc's mediabag when rendering documents. - Increase v8's max heap size by default, to avoid out-of-memory errors when rendering large documents (also cf. https://github.com/denoland/deno/issues/18935). - When running `quarto check` from a development build (from a git repository), show the git commit hash in addition to the version string. diff --git a/renv.lock b/renv.lock index 4d46ce8126..48fe7a783f 100644 --- a/renv.lock +++ b/renv.lock @@ -428,13 +428,13 @@ }, "curl": { "Package": "curl", - "Version": "6.2.3", + "Version": "7.0.0", "Source": "Repository", "Repository": "P3M", "Requirements": [ "R" ], - "Hash": "f15795aaa507bf90088346a1eff6534e" + "Hash": "aa27e963d3deccf4bade44d06b976977" }, "data.table": { "Package": "data.table", @@ -688,6 +688,34 @@ ], "Hash": "52ef83f93f74833007f193b2d4c159a2" }, + "gh": { + "Package": "gh", + "Version": "1.5.0", + "Source": "Repository", + "Repository": "P3M", + "Requirements": [ + "R", + "cli", + "gitcreds", + "glue", + "httr2", + "ini", + "jsonlite", + "lifecycle", + "rlang" + ], + "Hash": "d92acb7afad09df6839e4e456e538d03" + }, + "gitcreds": { + "Package": "gitcreds", + "Version": "0.1.2", + "Source": "Repository", + "Repository": "P3M", + "Requirements": [ + "R" + ], + "Hash": "ab08ac61f3e1be454ae21911eb8bc2fe" + }, "glue": { "Package": "glue", "Version": "1.7.0", @@ -928,6 +956,27 @@ ], "Hash": "ac107251d9d9fd72f0ca8049988f1d7f" }, + "httr2": { + "Package": "httr2", + "Version": "1.2.1", + "Source": "Repository", + "Repository": "P3M", + "Requirements": [ + "R", + "R6", + "cli", + "curl", + "glue", + "lifecycle", + "magrittr", + "openssl", + "rappdirs", + "rlang", + "vctrs", + "withr" + ], + "Hash": "6e29f1ed132b927f7d52e9fd8869f0ea" + }, "ids": { "Package": "ids", "Version": "1.0.1", @@ -939,6 +988,13 @@ ], "Hash": "99df65cfef20e525ed38c3d2577f7190" }, + "ini": { + "Package": "ini", + "Version": "0.3.1", + "Source": "Repository", + "Repository": "P3M", + "Hash": "6154ec2223172bce8162d4153cda21f7" + }, "isoband": { "Package": "isoband", "Version": "0.2.7", diff --git a/tools/release-notes.R b/tools/release-notes.R index 4b6bbee37d..b174de7d2d 100644 --- a/tools/release-notes.R +++ b/tools/release-notes.R @@ -49,11 +49,17 @@ cat("Prerelease:", new_release_major, "->", new_prerelease_major, "\n") changelog_url <- paste0("https://github.com/quarto-dev/quarto-cli/releases/download/v", old_release, "/changelog.md") changelog_dir <- dir_create(path(downloads, "changelog", major_version)) +changelog_file <- path(changelog_dir, "_changelog", ext = "md") -download_status <- download.file(changelog_url, path(changelog_dir, - "_changelog", ext = "md")) +download_status <- download.file(changelog_url, changelog_file) stopifnot(!download_status) +# escape shortcodes on changelog files as we don't want them processed on website +# changelog.md is not supposed to have shortcodes that are meant to be resolved as they +# are not .qmd files, but regular markdown files. +# # Pattern that matches {{< >}} but NOT {{{< >}}} (already escaped): "(?]*>\\}\\})(?!\\})" +xfun::gsub_file(changelog_file, pattern = "(?]*>\\}\\})(?!\\})", replacement = "{\\1}", perl = TRUE) + glue(" --- title: {major_version} Release Notes