Skip to content

Commit f858666

Browse files
authored
Merge pull request #1763 from quarto-dev/release-note/escape-shortcodes
2 parents 28558db + ad285b2 commit f858666

File tree

5 files changed

+69
-6
lines changed

5 files changed

+69
-6
lines changed

DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Depends:
77
dygraphs,
88
fs,
99
ggplot2,
10+
gh,
1011
gt,
1112
htmltools,
1213
knitr,

docs/download/changelog/1.3/_changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
## Jupyter Notebooks
2929

30-
- 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 >}}`.
30+
- 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 >}}}`.
3131
- Only attempt to postprocess `text/plain` output if it's nonempty ([#3896](https://github.com/quarto-dev/quarto-cli/issues/3896)).
3232
- Fix output of bokeh plots so the right number of cells is generated ([#2107](https://github.com/quarto-dev/quarto-cli/issues/2107)).
3333
- Fix output of code cells that contain triple backticks (or more) ([#3179](https://github.com/quarto-dev/quarto-cli/issues/3179)).

docs/download/changelog/1.5/_changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
- ([#9727](https://github.com/quarto-dev/quarto-cli/issues/9727)): `lightbox`: do not overwrite `window.onload` events.
261261
- ([#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.
262262
- ([#10003](https://github.com/quarto-dev/quarto-cli/issues/10003)): fix Giscus light/dark theme YAML example in schema where `theme` is missing.
263-
- Add support for `{{< lipsum >}}` shortcode, which is useful for emitting placeholder text. Provide a specific number of paragraphs (`{{< lipsum 3 >}}`).
263+
- Add support for `{{{< lipsum >}}}` shortcode, which is useful for emitting placeholder text. Provide a specific number of paragraphs (`{{{< lipsum 3 >}}}`).
264264
- Resolve data URIs in Pandoc's mediabag when rendering documents.
265265
- 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).
266266
- When running `quarto check` from a development build (from a git repository), show the git commit hash in addition to the version string.

renv.lock

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,13 +428,13 @@
428428
},
429429
"curl": {
430430
"Package": "curl",
431-
"Version": "6.2.3",
431+
"Version": "7.0.0",
432432
"Source": "Repository",
433433
"Repository": "P3M",
434434
"Requirements": [
435435
"R"
436436
],
437-
"Hash": "f15795aaa507bf90088346a1eff6534e"
437+
"Hash": "aa27e963d3deccf4bade44d06b976977"
438438
},
439439
"data.table": {
440440
"Package": "data.table",
@@ -688,6 +688,34 @@
688688
],
689689
"Hash": "52ef83f93f74833007f193b2d4c159a2"
690690
},
691+
"gh": {
692+
"Package": "gh",
693+
"Version": "1.5.0",
694+
"Source": "Repository",
695+
"Repository": "P3M",
696+
"Requirements": [
697+
"R",
698+
"cli",
699+
"gitcreds",
700+
"glue",
701+
"httr2",
702+
"ini",
703+
"jsonlite",
704+
"lifecycle",
705+
"rlang"
706+
],
707+
"Hash": "d92acb7afad09df6839e4e456e538d03"
708+
},
709+
"gitcreds": {
710+
"Package": "gitcreds",
711+
"Version": "0.1.2",
712+
"Source": "Repository",
713+
"Repository": "P3M",
714+
"Requirements": [
715+
"R"
716+
],
717+
"Hash": "ab08ac61f3e1be454ae21911eb8bc2fe"
718+
},
691719
"glue": {
692720
"Package": "glue",
693721
"Version": "1.7.0",
@@ -928,6 +956,27 @@
928956
],
929957
"Hash": "ac107251d9d9fd72f0ca8049988f1d7f"
930958
},
959+
"httr2": {
960+
"Package": "httr2",
961+
"Version": "1.2.1",
962+
"Source": "Repository",
963+
"Repository": "P3M",
964+
"Requirements": [
965+
"R",
966+
"R6",
967+
"cli",
968+
"curl",
969+
"glue",
970+
"lifecycle",
971+
"magrittr",
972+
"openssl",
973+
"rappdirs",
974+
"rlang",
975+
"vctrs",
976+
"withr"
977+
],
978+
"Hash": "6e29f1ed132b927f7d52e9fd8869f0ea"
979+
},
931980
"ids": {
932981
"Package": "ids",
933982
"Version": "1.0.1",
@@ -939,6 +988,13 @@
939988
],
940989
"Hash": "99df65cfef20e525ed38c3d2577f7190"
941990
},
991+
"ini": {
992+
"Package": "ini",
993+
"Version": "0.3.1",
994+
"Source": "Repository",
995+
"Repository": "P3M",
996+
"Hash": "6154ec2223172bce8162d4153cda21f7"
997+
},
942998
"isoband": {
943999
"Package": "isoband",
9441000
"Version": "0.2.7",

tools/release-notes.R

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,17 @@ cat("Prerelease:", new_release_major, "->", new_prerelease_major, "\n")
4949
changelog_url <- paste0("https://github.com/quarto-dev/quarto-cli/releases/download/v",
5050
old_release, "/changelog.md")
5151
changelog_dir <- dir_create(path(downloads, "changelog", major_version))
52+
changelog_file <- path(changelog_dir, "_changelog", ext = "md")
5253

53-
download_status <- download.file(changelog_url, path(changelog_dir,
54-
"_changelog", ext = "md"))
54+
download_status <- download.file(changelog_url, changelog_file)
5555
stopifnot(!download_status)
5656

57+
# escape shortcodes on changelog files as we don't want them processed on website
58+
# changelog.md is not supposed to have shortcodes that are meant to be resolved as they
59+
# are not .qmd files, but regular markdown files.
60+
# # Pattern that matches {{< >}} but NOT {{{< >}}} (already escaped): "(?<!\\{)(\\{\\{<[^>]*>\\}\\})(?!\\})"
61+
xfun::gsub_file(changelog_file, pattern = "(?<!\\{)(\\{\\{<[^>]*>\\}\\})(?!\\})", replacement = "{\\1}", perl = TRUE)
62+
5763
glue("
5864
---
5965
title: {major_version} Release Notes

0 commit comments

Comments
 (0)