Skip to content

Commit 8d603b9

Browse files
authored
Merge branch 'main' into bugfix/typst-unitless-image-column-widths
2 parents 6009106 + d5559d7 commit 8d603b9

File tree

136 files changed

+4874
-3334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+4874
-3334
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,29 @@ body:
2929
You can share a Quarto document using the following syntax, _i.e._, using more backticks than you have in your document (usually four ` ```` `).
3030
For example with Quarto CLI >=1.5:
3131
32-
`````md
33-
````qmd
34-
---
35-
title: "Reproducible Quarto Document"
36-
format: html
37-
engine: jupyter
38-
---
39-
40-
This is a reproducible Quarto document using `format: html`.
41-
It is written in Markdown and contains embedded Python code.
42-
When you run the code, it will produce a message.
43-
44-
```{python}
45-
print("Hello, world!")
46-
```
47-
48-
![An image]({{< placeholder 600 400 >}}){#fig-placeholder}
49-
50-
{{< lipsum 1 >}}
51-
52-
A reference to @fig-placeholder.
53-
54-
The end.
55-
````
56-
`````
32+
````qmd
33+
---
34+
title: "Reproducible Quarto Document"
35+
format: html
36+
engine: jupyter
37+
---
38+
39+
This is a reproducible Quarto document using `format: html`.
40+
It is written in Markdown and contains embedded Python code.
41+
When you run the code, it will produce a message.
42+
43+
```{python}
44+
print("Hello, world!")
45+
```
46+
47+
![An image]({{< placeholder 600 400 >}}){#fig-placeholder}
48+
49+
{{< lipsum 1 >}}
50+
51+
A reference to @fig-placeholder.
52+
53+
The end.
54+
````
5755
5856
- type: textarea
5957
attributes:

.github/workflows/test-smokes.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
- name: Install uv for Python
144144
uses: astral-sh/setup-uv@v3
145145
with:
146-
version: "0.5.6"
146+
version: "0.5.9"
147147
enable-cache: true
148148
cache-dependency-glob: "tests/uv.lock"
149149

@@ -170,7 +170,7 @@ jobs:
170170
- name: Setup Julia
171171
uses: julia-actions/setup-julia@v2
172172
with:
173-
version: "1.10"
173+
version: "1.11"
174174

175175
- name: Cache Julia Packages
176176
uses: julia-actions/cache@v2

CITATION.cff

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ authors:
1616
- family-names: "Dervieux"
1717
given-names: "Christophe"
1818
orcid: "https://orcid.org/0000-0003-4474-2498"
19+
- family-names: "Woodhull"
20+
given-names: "Gordon"
21+
orcid: "https://orcid.org/0009-0005-1809-8936"
1922
title: "Quarto"
20-
version: 1.4
23+
version: 1.6
2124
doi: 10.5281/zenodo.5960048
22-
date-released: 2024-02-15
25+
date-released: 2024-11-27
2326
url: "https://github.com/quarto-dev/quarto-cli"

configuration

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ export TIPPY_JS=6.3.7
3737
export PDF_JS=2.8.335
3838
export REVEAL_JS=5.1.0
3939
export REVEAL_JS_MENU=2.1.0
40-
# unrelease version needed for a fix with Reveal.js 5
40+
# unrelease version needed for fixes with Reveal.js 5
4141
# https://github.com/rajgoel/reveal.js-plugins/pull/180
42-
export REVEAL_JS_CHALKBOARD=8408d5a265abf74a042122520bbb4fd0d31feaed
42+
# https://github.com/rajgoel/reveal.js-plugins/pull/184
43+
export REVEAL_JS_CHALKBOARD=217142176341e24628db2908cae38221ef13d639
4344
export REVEAL_JS_PDFEXPORT=2.0.1
4445
export LIST_JS=2.3.1
4546
export DAY_JS=1.11.7
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
- [ ] ensure main is up to date and tests are passing on latest commit.
2+
- [ ] create new prerelease installers
3+
- Click Actions -> Build Installers -> "Run Workflow" Dropdown Menu
4+
- Select the main branch in the "Use workflow from..." dropdown
5+
- Check "Pre-release" (or ensure it's checked)
6+
- Check "Publish release" (or ensure it's checked)
7+
- [ ] Click "Run Workflow"
8+
- If workflow fails for some reason, re-run all jobs and not only failed jobs or trigger a new clean build from Actions -> Build Installers -> "Run Workflow" Dropdown Menu.
9+
This is important because workflow commit an update to version.txt to main, and revert if cancelled or failure. A triggering a new workflow needs to re-run the configure step.
10+
- If everything went well:
11+
- New release prerelease should be on Github at <https://github.com/quarto-dev/quarto-cli/releases>
12+
- A new tag should be on main for the new prerelease version
13+
- `version.txt` on main should have been updated by the workflow to the pre-release version just released: https://github.com/quarto-dev/quarto-cli/blob/main/version.txt

dev-docs/checklist-make-a-new-quarto-release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
- [ ] publish the release blog post that should exist in https://github.com/quarto-dev/quarto-web/tree/main/docs/blog/posts
4646
by removing the `draft: true` line in the metadata and changing the date to match the release date. Do this on a branch off of `main` to trigger our PR automation to make the corresponding change to `prerelease`.
4747

48+
- [ ] Update https://github.com/quarto-dev/quarto-cli/blob/main/CITATION.cff
4849
- [ ] Packaging and package managers, etc
4950
- TBD winget, etc?
5051
- [ ] chocolatey

dev-docs/checklist-make-a-new-stable-quarto-release.md

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
To perform fine-grained profiling of Pandoc Lua filters, we use custom binaries:
2+
3+
- a patch of Lua that supports sample-based profiling
4+
- a custom binary of Pandoc linked against that version of Lua
5+
6+
## Compile the custom Lua version
7+
8+
This has currently only been tested on Macos and Linux.
9+
10+
```
11+
$ git clone [email protected]:cscheid/lua-fast-profiler.git
12+
$ cd lua-fast-profiler
13+
$ git checkout feature/fast-profiler-5.4
14+
$ make
15+
```
16+
17+
You should have `lua` and `liblua.a` in the `lua-fast-profiler` directory.
18+
19+
This version of Lua adds a new debugging hook, "time".
20+
This hook triggers at specified intervals, and is enabled using the letter `t` in the `debug.sethook` call.
21+
The debug hook callback also supports the "alarm" hook, used when calling the `sethook` callback.
22+
23+
Quarto ships with a custom Lua profiler that supports these hooks and performs low-overhead stack profiling.
24+
25+
## Compile the custom Pandoc binary
26+
27+
Clone the Pandoc repository, and then
28+
29+
```
30+
$ C_INCLUDE_PATH=<path-lua-fast-profiler> LIBRARY_PATH=<path-lua-fast-profiler> cabal build pandoc-cli --constraint 'lua +system-lua'
31+
```
32+
33+
## Run Quarto with profiling
34+
35+
To get Lua profiling output from Quarto, use the `lua-profiler-output` metadata option to provide an output file name, and ensure that Quarto uses the
36+
`pandoc` binary you just compiled.
37+
38+
```
39+
$ QUARTO_PANDOC=<path-to-built-pandoc> quarto render ...
40+
```
41+
42+
The output will be written as JSON, in a format compatible with [Perfetto](https://ui.perfetto.dev).
43+
The default sampling interval is 5ms, but you can customize that by setting the `lua-profiler-interval-ms` metadata option.
44+
45+
### Analyze profile
46+
47+
The resulting profile can be visualized and analyzed as a trace file at <https://ui.perfetto.dev>.
48+
49+
### Profiling multiple-file projects
50+
51+
In multiple-file projects, you can get a summary of the runtime of individual filter steps by providing the `QUARTO_COMBINED_LUA_PROFILE` environment variable.
52+
At the end of rendering a project, the name of the file pointed to `QUARTO_COMBINED_LUA_PROFILE` will contain a CSV file with the columns `filter`, `filename`, and `time`, corresponding to an estimate of time (in microseconds) taken by each stage of Quarto's filtering pipeline.

news/changelog-1.7.md

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,42 @@ All changes included in 1.7:
66
- ([#11532](https://github.com/quarto-dev/quarto-cli/issues/11532)): Fix regression for [#660](https://github.com/quarto-dev/quarto-cli/issues/660), which causes files to have incorrect permissions when Quarto is installed in a location not writable by the current user.
77
- ([#11549](https://github.com/quarto-dev/quarto-cli/issues/11549)): Fix regression in rendering `dashboard` tabsets into cards without titles.
88
- ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with documents containing `categories` fields that are not strings.
9+
- ([#11752](https://github.com/quarto-dev/quarto-cli/issues/11752)): Fix regression with non-alphanumeric characters in `categories` preventing correct filtering of listing.
10+
- ([#11561](https://github.com/quarto-dev/quarto-cli/issues/11561)): Fix a regression with `$border-color` that impacted, callouts borders, tabset borders, and table borders of the defaults themes. `$border-color` is now correctly a mixed of `$body-color` and `$body-bg` even for the default theme.
911

1012
## YAML validation
1113

1214
- ([#11654](https://github.com/quarto-dev/quarto-cli/issues/11654)): Allow `page-inset` as value in `column` key for code cells.
1315

16+
## Website projects
17+
18+
- ([#11701](https://github.com/quarto-dev/quarto-cli/issues/11701)): Wrap HTML emitted by EJS templates in `{=html}` blocks to avoid memory blowup issues with Pandoc's parser.
19+
20+
## Blog projects
21+
22+
- ([#11745](https://github.com/quarto-dev/quarto-cli/issues/11745)): Fix categories links under post title in post with url encoded path (e.g. with space or other special characters).
23+
24+
## Book projects
25+
26+
- ([#11520](https://github.com/quarto-dev/quarto-cli/issues/11520)): Book's cover image now escapes lightbox treatment, which was incorrectly applied to it when `lightbox: true` was set in the book's configuration.
27+
1428
## `quarto check`
1529

1630
- ([#11608](https://github.com/quarto-dev/quarto-cli/pull/11608)): Do not issue error message when calling `quarto check info`.
1731

18-
## `typst` Format
32+
## `html` format
33+
34+
- ([#11860])(https://github.com/quarto-dev/quarto-cli/issues/11860)): ES6 modules that import other local JS modules in documents with `embed-resources: true` are now correctly embedded.
35+
36+
## `pdf` format
37+
38+
- ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
39+
40+
## `typst` format
1941

2042
- ([#11578](https://github.com/quarto-dev/quarto-cli/issues/11578)): Typst column layout widths use fractional `fr` units instead of percent `%` units for unitless and default widths in order to fill the enclosing block and not spill outside it.
2143
- ([#11676](https://github.com/quarto-dev/quarto-cli/pull/11676)): Convert unitless image widths from pixels to inches for column layouts.
44+
- ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
2245

2346
## Lua Filters and extensions
2447

@@ -27,9 +50,20 @@ All changes included in 1.7:
2750
This also provides a new public function `quarto.utils.is_empty_node`
2851
that allows to check whether a node is empty, i.e., whether it's an
2952
empty list, has no child nodes, and contains no text.
53+
- ([#11699](https://github.com/quarto-dev/quarto-cli/issues/11699)): Fix crash with `video` shortcode inside HTML comments.
54+
- Expose new `quarto.paths.tinytex_bin_dir` in Quarto's Lua API. If TinyTeX is found by Quarto, this will be set to the path to the `bin` directory of the TinyTeX installation where command line tool are located (e.g., `pdflatex`, `tlmgr`, etc.). If TinyTeX is not found, this will be `nil`, meaning Quarto will use the system PATH to find the command line tools.
55+
- Fix `pandoc.mediabag` Lua typings so autocompletions work with the Lua LSP integration.
56+
57+
## Engines
58+
59+
### `julia`
60+
61+
- ([#11659](https://github.com/quarto-dev/quarto-cli/pull/11659)): Fix escaping bug where paths containing spaces or backslashes break server startup on Windows.
3062

3163
## Other Fixes and Improvements
3264

65+
- ([#7260](https://github.com/quarto-dev/quarto-cli/issues/7260)): Add support for `active` class in tabsets so the `.active` tab shows up by default.
3366
- ([#8613](https://github.com/quarto-dev/quarto-cli/issues/8613)): Fix `giscus` color on load to support dark mode (by @kv9898).
3467
- ([#11441](https://github.com/quarto-dev/quarto-cli/issues/11441)): Don't add newlines around shortcodes during processing.
3568
- ([#11643](https://github.com/quarto-dev/quarto-cli/issues/11643)): Improve highlighting of nested code block inside markdown code block, i.e. using ` ```{{python}} ` or ` ```python ` inside ` ````markdown` fenced code block.
69+
- ([fb38eb5](https://github.com/quarto-dev/quarto-cli/commit/fb38eb56c11e09f44cef58fd3b697ff24bb5a3f3)) Use the `latest` parser for Acorn when analyzing JS code imported from OJS blocks.

package/src/common/patches/revealjs-plugin-0001-chakboard-backdrop-filter.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)