Skip to content

Commit d98daa4

Browse files
mcanouilmcanouil
authored
Merge branch 'main' into issue11769
2 parents 1055fc1 + 4c97071 commit d98daa4

File tree

26 files changed

+861
-407
lines changed

26 files changed

+861
-407
lines changed

‎.github/workflows/preview.yml‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,26 @@ jobs:
155155
if (changedFiles.length > 0) {
156156
commentBody += `### 🔄 Modified Documents\n\n`;
157157
changedFiles.forEach(file => {
158-
if (file.endsWith('.qmd') || file.endsWith('.md')) {
158+
let fileUrlPath;
159+
160+
// Define a mapping for special files to their corresponding URLs
161+
const specialFileMapping = {
162+
'docs/extensions/listings/shortcodes-and-filters.yml': 'docs/extensions/index.html',
163+
'docs/extensions/listings/journal-articles.yml': 'docs/extensions/index.html',
164+
'docs/extensions/listings/custom-formats.yml': 'docs/extensions/index.html',
165+
'docs/extensions/listings/revealjs-formats.yml': 'docs/extensions/index.html',
166+
'docs/extensions/listings/revealjs.yml': 'docs/extensions/index.html'
167+
};
168+
169+
// Check if the file is in the special mapping
170+
if (specialFileMapping[file]) {
171+
fileUrlPath = specialFileMapping[file];
172+
} else if (file.endsWith('.qmd') || file.endsWith('.md')) {
159173
// Convert path to URL (removing file extension and adding appropriate path)
160-
const fileUrlPath = file
161-
.replace(/\.(qmd|md)$/, '.html');
174+
fileUrlPath = file.replace(/\.(qmd|md)$/, '.html');
175+
}
176+
177+
if (fileUrlPath) {
162178
const fileUrl = `${deployUrl}/${fileUrlPath}`;
163179
commentBody += `- [${file}](${fileUrl})\n`;
164180
}

‎_redirects‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
/download/latest/changelog.md-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/changelog.md
2-
/download/latest/quarto-checksums.txt https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-checksums.txt
3-
/download/latest/quarto-linux-amd64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-linux-amd64.deb
4-
/download/latest/quarto-linux-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-linux-amd64.tar.gz
5-
/download/latest/quarto-linux-arm64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-linux-arm64.deb
6-
/download/latest/quarto-linux-arm64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-linux-arm64.tar.gz
7-
/download/latest/quarto-linux-rhel7-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-linux-rhel7-amd64.tar.gz
8-
/download/latest/quarto-macos.pkg https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-macos.pkg
9-
/download/latest/quarto-macos.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-macos.tar.gz
10-
/download/latest/quarto-win.msi https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-win.msi
11-
/download/latest/quarto-win.zip https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31-win.zip
12-
/download/latest/quarto-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.31/quarto-1.7.31.tar.gz
13-
/download/prerelease/changelog.md-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/changelog.md
14-
/download/prerelease/quarto-checksums.txt https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-checksums.txt
15-
/download/prerelease/quarto-linux-amd64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-linux-amd64.deb
16-
/download/prerelease/quarto-linux-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-linux-amd64.tar.gz
17-
/download/prerelease/quarto-linux-arm64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-linux-arm64.deb
18-
/download/prerelease/quarto-linux-arm64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-linux-arm64.tar.gz
19-
/download/prerelease/quarto-linux-rhel7-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-linux-rhel7-amd64.tar.gz
20-
/download/prerelease/quarto-macos.pkg https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-macos.pkg
21-
/download/prerelease/quarto-macos.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-macos.tar.gz
22-
/download/prerelease/quarto-win.msi https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-win.msi
23-
/download/prerelease/quarto-win.zip https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13-win.zip
24-
/download/prerelease/quarto-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.13/quarto-1.8.13.tar.gz
1+
/download/latest/changelog.md-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/changelog.md
2+
/download/latest/quarto-checksums.txt https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-checksums.txt
3+
/download/latest/quarto-linux-amd64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-linux-amd64.deb
4+
/download/latest/quarto-linux-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-linux-amd64.tar.gz
5+
/download/latest/quarto-linux-arm64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-linux-arm64.deb
6+
/download/latest/quarto-linux-arm64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-linux-arm64.tar.gz
7+
/download/latest/quarto-linux-rhel7-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-linux-rhel7-amd64.tar.gz
8+
/download/latest/quarto-macos.pkg https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-macos.pkg
9+
/download/latest/quarto-macos.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-macos.tar.gz
10+
/download/latest/quarto-win.msi https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-win.msi
11+
/download/latest/quarto-win.zip https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32-win.zip
12+
/download/latest/quarto-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.32/quarto-1.7.32.tar.gz
13+
/download/prerelease/changelog.md-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/changelog.md
14+
/download/prerelease/quarto-checksums.txt https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-checksums.txt
15+
/download/prerelease/quarto-linux-amd64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-linux-amd64.deb
16+
/download/prerelease/quarto-linux-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-linux-amd64.tar.gz
17+
/download/prerelease/quarto-linux-arm64.deb https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-linux-arm64.deb
18+
/download/prerelease/quarto-linux-arm64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-linux-arm64.tar.gz
19+
/download/prerelease/quarto-linux-rhel7-amd64.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-linux-rhel7-amd64.tar.gz
20+
/download/prerelease/quarto-macos.pkg https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-macos.pkg
21+
/download/prerelease/quarto-macos.tar.gz https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-macos.tar.gz
22+
/download/prerelease/quarto-win.msi https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-win.msi
23+
/download/prerelease/quarto-win.zip https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16-win.zip
24+
/download/prerelease/quarto-. https://github.com/quarto-dev/quarto-cli/releases/download/v1.8.16/quarto-1.8.16.tar.gz

‎docs/advanced/environment-vars.qmd‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ You can read about other ways to set environment variables in Quarto Projects in
3838
+---------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
3939
| `QUARTO_CHROMIUM_HEADLESS_MODE` | Used for adaption of the `--headless` mode used with `QUARTO_CHROMIUM` binary. Set to `"none"` for `--headless` , or to `"old"` or `"new"` to pass as argument, e.g. `--headless=<QUARTO_CHROMIUM_HEADLESS_MODE>` . Quarto 1.6 sets `"old"` as default, which works from Chrome 112 to 131. Starting Quarto 1.7.13, `"none"` is the default as [Chrome 132 removed old headless mode](https://developer.chrome.com/blog/removing-headless-old-from-chrome). |
4040
+---------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
41+
| `QUARTO_LOG` | Those variables controls the logging behavior: |
42+
| | |
43+
| `QUARTO_LOG_LEVEL` | - `QUARTO_LOG` is the same as using `--log` at command line. It is used to set the path to the log file |
44+
| | |
45+
| `QUARTO_LOG_FORMAT` | - `QUARTO_LOG_LEVEL` is the same as using `--log-level` at command line. It is used to set the max level that will be log. Possible values are `DEBUG`, `INFO`(default), `WARNING`, and `ERROR`. |
46+
| | |
47+
| | - `QUARTO_LOG_FORMAT` is the same as using `--log-format` at command line. It is used to set the format for the log. Possible values are `plain` (default) and `json-stream`. |
48+
+---------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
4149

4250
## Variables Quarto sets
4351

@@ -78,4 +86,4 @@ ENV["QUARTO_DOCUMENT_PATH"]
7886
| `QUARTO_FIG_WIDTH` and `QUARTO_FIG_HEIGHT` | Values for `fig-width` and `fig-height` as set in the document metadata |
7987
+--------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8088
| `QUARTO_RUN_NO_NETWORK` | When `true`, Quarto project scripts written in TypeScript won't be allowed to use the network to download sources. In this setting, those scripts will not have access to the standard library. |
81-
+--------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
89+
+--------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

‎docs/authoring/markdown-basics.qmd‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ This document provides examples of the most commonly used markdown syntax. See t
117117
+===================================+=================================+
118118
| ``` markdown | |
119119
| * unordered list | * unordered list |
120-
| + sub-item 1 | + sub-item 1 |
121-
| + sub-item 2 | + sub-item 2 |
122-
| - sub-sub-item 1 | - sub-sub-item 1 |
120+
| + sub-item 1 | + sub-item 1 |
121+
| + sub-item 2 | + sub-item 2 |
122+
| - sub-sub-item 1 | - sub-sub-item 1 |
123123
| ``` | |
124124
+-----------------------------------+---------------------------------+
125125
| ``` markdown | |
@@ -131,10 +131,21 @@ This document provides examples of the most commonly used markdown syntax. See t
131131
| ``` markdown | |
132132
| 1. ordered list | 1. ordered list |
133133
| 2. item 2 | 2. item 2 |
134-
| i) sub-item 1 | i) sub-item 1 |
135-
| A. sub-sub-item 1 | A. sub-sub-item 1 |
134+
| i) sub-item 1 | i) sub-item 1 |
135+
| A. sub-sub-item 1 | A. sub-sub-item 1 |
136136
| ``` | |
137137
+-----------------------------------+---------------------------------+
138+
| ```` markdown | |
139+
| 1. ordered list | 1. ordered list |
140+
| 2. item 2 | 2. item 2 |
141+
| | |
142+
| ```python | ```python |
143+
| print("Hello, World!") | print("Hello, World!") |
144+
| ``` | ``` |
145+
| | |
146+
| A. sub-sub-item 1 | A. sub-sub-item 1 |
147+
| ```` | |
148+
+-----------------------------------+---------------------------------+
138149
| ``` markdown | |
139150
| - [ ] Task 1 | - [ ] Task 1 |
140151
| - [x] Task 2 | - [x] Task 2 |

‎docs/computations/julia.qmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ date: "5/22/2021"
4848
format:
4949
html:
5050
code-fold: true
51-
jupyter: julia-1.8
51+
engine: julia
5252
---
5353

5454
### Parametric Plots

0 commit comments

Comments
 (0)