Skip to content

Commit 876d3a2

Browse files
authored
Merge branch 'main' into fix/issue10251
2 parents 5c5db1b + 7bacf5f commit 876d3a2

File tree

79 files changed

+3084
-2019
lines changed

Some content is hidden

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

79 files changed

+3084
-2019
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
Welcome to the quarto GitHub repository!
9+
Welcome to the Quarto CLI GitHub repository!
1010
We are always happy to hear feedback from our users.
1111
1212
This is the repository for the command-line program `quarto`:
1313
1414
- If you're reporting an issue with the VS Code extension, please visit https://github.com/quarto-dev/quarto
1515
- If you're reporting an issue inside RStudio, please visit https://github.com/rstudio/rstudio
16+
- If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron
17+
- If you want to ask for a feature, please use the [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests).
18+
- If you want to ask for help, please use the [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a).
1619
1720
Quarto is under active development!
1821
If convenient, we'd appreciate if you could check that the issue persists on the [latest pre-release](https://github.com/quarto-dev/quarto-cli/releases).
1922
2023
Finally, so that we can get the most out of your bug report, consider reading our ["Bug Reports" guide](https://quarto.org/bug-reports.html).
2124
22-
If you want to ask for a feature, please use the [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests).
23-
If you want to ask for help, please use the [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a).
24-
2525
Thank you for using Quarto!
2626
2727
---
@@ -96,13 +96,13 @@ body:
9696
9797
- type: textarea
9898
attributes:
99-
label: Expected behavior
100-
description: Tell us what should happen.
99+
label: Actual behavior
100+
description: Tell us what happens instead.
101101

102102
- type: textarea
103103
attributes:
104-
label: Actual behavior
105-
description: Tell us what happens instead.
104+
label: Expected behavior
105+
description: Tell us what should happen.
106106

107107
- type: textarea
108108
attributes:

.github/actions/cache-typst/action.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ outputs:
99
value: ${{ steps.cache-typst-restore.outputs.cache-primary-key }}
1010
cache-matched-key:
1111
description: "Key of the cache found and used."
12-
value: ${{ steps.cache-typst-restore.outputs.cache-primary-key }}
12+
value: ${{ steps.cache-typst-restore.outputs.cache-matched-key }}
1313
cache-path:
1414
description: "where is the packages cache for typst ?"
1515
value: ${{ steps.cache-typst-path.outputs.TYPST_CACHE }}
@@ -22,20 +22,21 @@ runs:
2222
run: |
2323
case $RUNNER_OS in
2424
"Linux")
25-
echo "TYPST_CACHE=${XDG_CACHE_HOME:-~/.cache}/typst/packages/" >> $GITHUB_ENV
25+
typst_cache="${XDG_CACHE_HOME:-~/.cache}/typst/packages/"
2626
;;
2727
"macOS")
28-
echo "TYPST_CACHE=~/Library/Caches/typst/packages/" >> $GITHUB_ENV
28+
typst_cache="~/Library/Caches/typst/packages/"
2929
;;
3030
"Windows")
31-
echo "TYPST_CACHE=$LOCALAPPDATA/typst/packages/" >> $GITHUB_ENV
31+
typst_cache="$LOCALAPPDATA/typst/packages/"
3232
;;
3333
*)
3434
echo "$RUNNER_OS not supported"
3535
exit 1
3636
;;
3737
esac
38-
echo "TYPST_CACHE=${TYPST_CACHE}" >> $GITHUB_OUTPUT
38+
echo "TYPST_CACHE=${typst_cache}" >> $GITHUB_ENV
39+
echo "TYPST_CACHE=${typst_cache}" >> $GITHUB_OUTPUT
3940
shell: bash
4041

4142
- name: Cache Typst package folder

.github/workflows/test-smokes.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,16 @@ jobs:
105105
cat("r-version=", R.Version()$version.string, "\n", file = Sys.getenv("GITHUB_OUTPUT"), sep = "", append = TRUE)
106106
shell: Rscript {0}
107107

108-
- name: Cache R packages
109-
uses: actions/cache@v4
108+
- name: Restore Renv package cache
109+
id: cache-renv-packages-restore
110+
uses: actions/cache/restore@v4
110111
with:
111-
path: ${{ env.RENV_PATHS_ROOT }}
112-
key: ${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-2-${{ hashFiles('tests/renv.lock') }}
112+
path: |
113+
${{ env.RENV_PATHS_ROOT }}
114+
renv/library
115+
key: ${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-3-${{ hashFiles('tests/renv.lock') }}
113116
restore-keys: |
114-
${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-2-
115-
save-always: ${{ inputs.extra-r-packages == '' }} # don't save cache if we have extra R packages
117+
${{ steps.get-version.outputs.os-version }}-${{ steps.get-version.outputs.r-version }}-renv-3-
116118
117119
- name: Install missing system deps
118120
if: runner.os == 'Linux'
@@ -291,15 +293,25 @@ jobs:
291293
path: tests/timing-for-ci.txt
292294

293295
- name: Save Typst cache
294-
if: always()
296+
if: always() && steps.cache-typst.outputs.cache-hit != 'true'
295297
uses: actions/cache/save@v4
296298
with:
297299
key: ${{ steps.cache-typst.outputs.cache-primary-key }}
298300
path: ${{ steps.cache-typst.outputs.cache-path }}
299301

302+
- name: Save Renv package cache
303+
# don't save cache if we have extra R packages
304+
if: ${{ always() && steps.cache-renv-packages-restore.outputs.cache-hit != 'true' && inputs.extra-r-packages == '' }}
305+
uses: actions/cache/save@v4
306+
with:
307+
path: |
308+
${{ env.RENV_PATHS_ROOT }}
309+
renv/library
310+
key: ${{ steps.cache-renv-packages-restore.outputs.cache-primary-key }}
311+
300312
- uses: actions/upload-artifact@v4
301-
# PLaywright test only runs on Linux for now
302-
if: ${{ !cancelled() && runner.os != 'Windows' }}
313+
# Upload pLaywright test report if they exists (playwright is only running on Linux for now)
314+
if: ${{ !cancelled() && runner.os != 'Windows' && hashFiles('tests/integration/playwright/playwright-report/**/*') != '' }}
303315
with:
304316
name: playwright-report
305317
path: ./tests/integration/playwright/playwright-report/

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
You can contribute to Quarto in many ways:
44

55
- By opening issues to provide feedback and share ideas.
6-
- By submitting Pull Request (PR) to fix opened issues
6+
- By submitting Pull Request (PR) to fix open issues
77
- By submitting Pull Request (PR) to suggest new features (it is considered good practice to open an issue for discussion before working on a pull request for a new feature).
88

99
Please be mindful of our [code of conduct](https://github.com/quarto-dev/quarto-cli/blob/main/.github/CODE_OF_CONDUCT.md) as you interact with other community members.
@@ -26,8 +26,8 @@ Pull requests are very welcome! Here's how to contribute via PR:
2626
$ git checkout -b feature/newthing
2727
```
2828

29-
2. For significant changes (e.g more than small bug fixes), ensure that you have signed the [individual](https://posit.co/wp-content/uploads/2023/04/2023-03-13_TC_Indiv_contrib_agreement.pdf) or [corporate](https://posit.co/wp-content/uploads/2023/04/2023-03-13_TC_Corp_contrib_agreement.pdf) contributor agreement as appropriate. You can send the signed copy to [jj\@rstudio.com](mailto:[email protected]){.email}.
29+
2. For significant changes (e.g., more than small bug fixes), ensure that you have signed the [individual](https://posit.co/wp-content/uploads/2023/04/2023-03-13_TC_Indiv_contrib_agreement.pdf) or [corporate](https://posit.co/wp-content/uploads/2023/04/2023-03-13_TC_Corp_contrib_agreement.pdf) contributor agreement as appropriate. You can send the signed copy to [jj\@rstudio.com](mailto:[email protected]){.email}.
3030

31-
3. Submit the [pull request](https://help.github.com/articles/using-pull-requests). It is ok to submit as draft in your are still working on it but would like some feedback from us. It always good to share in the open that you are working on it.
31+
3. Submit the [pull request](https://help.github.com/articles/using-pull-requests). It is ok to submit as draft if your are still working on it but would like some feedback from us. It is always good to share in the open that you are working on it.
3232

3333
We'll try to be as responsive as possible in reviewing and accepting pull requests.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22

33
# Quarto
44

5-
Quarto is an open-source scientific and technical publishing system built on [Pandoc](https://pandoc.org). Quarto documents are authored using [markdown](https://en.wikipedia.org/wiki/Markdown), an easy to write plain text format.
5+
Quarto is an open-source scientific and technical publishing system built on [Pandoc](https://pandoc.org). Quarto documents are authored using [Markdown](https://en.wikipedia.org/wiki/Markdown), an easy to write plain text format.
66

77
In addition to the core capabilities of Pandoc, Quarto includes:
88

99
1. Embedding code and output from Python, R, Julia, and JavaScript via integration with [Jupyter](https://jupyter.org/), [Knitr](https://yihui.org/knitr/), and [Observable](https://github.com/observablehq/).
1010

11-
2. A variety of extensions to Pandoc markdown useful for technical writing including cross-references, sub-figures, layout panels, hoverable citations and footnotes, callouts, and more.
11+
2. A variety of extensions to Pandoc Markdown useful for technical writing including cross-references, sub-figures, layout panels, hoverable citations and footnotes, callouts, and more.
1212

1313
3. A project system for rendering groups of documents at once, sharing options across documents, and producing aggregate output like [websites](https://quarto.org/docs/websites/) and [books](https://quarto.org/docs/books/).
1414

1515
4. Authoring using a wide variety of editors and notebooks including [JupyterLab](https://quarto.org/docs/tools/jupyter-lab.html), [RStudio](https://quarto.org/docs/tools/rstudio.html), and [VS Code](https://quarto.org/docs/tools/vscode.html).
1616

17-
5. A [visual markdown editor](https://quarto.org/docs/visual-editor/) that provides a productive writing interface for composing long-form documents.
17+
5. A [visual Markdown editor](https://quarto.org/docs/visual-editor/) that provides a productive writing interface for composing long-form documents.
1818

1919
Learn more about Quarto at <https://quarto.org>.
2020

2121
## Development Version
2222

23-
To install the development version of the Quarto CLI, clone the quarto-cli repository then run the configure script for your platform (`configure.sh` for Linux/macOS or `configure.cmd` for Windows). For example:
23+
To install the development version of the Quarto CLI, clone the `quarto-cli` repository then run the configure script for your platform (`configure.sh` for Linux/macOS or `configure.cmd` for Windows). For example:
2424

2525
```bash
2626
git clone https://github.com/quarto-dev/quarto-cli
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
- [ ] ensure tests pass on stable branch
2+
- Actions -> Parallel Smokes Tests -> Run Workflow ->
3+
- Select the current stable branch in the "Use workflow from... v1.x" dropdown
4+
- [ ] Click "Run Workflow"
5+
- [ ] create new stable installers
6+
- Click Actions -> Build Installers -> "Run Workflow" Dropdown Menu
7+
- Select the current stable branch in the "Use workflow from..." dropdown
8+
- Uncheck "Pre-release" (or ensure it's unchecked)
9+
- Check "Publish release" (or ensure it's checked)
10+
- [ ] Click "Run Workflow"
11+
- [ ] update release on pypi repo
12+
- Goto the [quarto-cli-pypi repo](https://github.com/quarto-dev/quarto-cli-pypi)
13+
- Update `version.txt` to be the version you'd like to publish and commit
14+
- Go to actions
15+
- Select 'Publish Quarto PyPi'
16+
- [ ] Click "Run Workflow"
17+
- **Publishing Test**: You may elect to publish to test.pypi first by _unchecking_ the `Production Release` option
18+
- Once complete, trest using
19+
```bash
20+
python3 -m pip install --index-url https://test.pypi.org/ --extra-index-url https://pypi.org/ quarto-cli
21+
```
22+
- You may have to run this command twice as the first time may report the package not found and cause cache invalidation. The next try should succeed.
23+
- Published to: <https://test.pypi.org/project/quarto-cli/>
24+
- **Publishing Production**: You may elect to publish to production pypyi by checking the `Production Release` option
25+
- Published to: <https://pypi.org/project/quarto-cli/>
26+
- Take a sip of tea ☕, bask in the glory of automation.
27+
- [ ] Update the stable changelog by moving entries to the "in previous release"

news/changelog-1.7.md

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ All changes included in 1.7:
1414

1515
- ([#11654](https://github.com/quarto-dev/quarto-cli/issues/11654)): Allow `page-inset` as value in `column` key for code cells.
1616
- ([#10251](https://github.com/quarto-dev/quarto-cli/issues/10251)): EJS template for website now uses proper object to get alt text for logo in sidebar.
17+
- ([#12151](https://github.com/quarto-dev/quarto-cli/issues/12151)): Fix YAML validation in computations cell on Windows.
18+
- ([#12151](https://github.com/quarto-dev/quarto-cli/pull/12151)): Basic YAML validation is now active in cell for document using Julia engine.
1719

1820
## Website projects
1921

2022
- ([#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.
23+
- ([#12134](https://github.com/quarto-dev/quarto-cli/issues/12134)): Forward `logo.small` images in `_brand.yml` files to a website `favicon`.
2124

2225
## Blog projects
2326

@@ -26,20 +29,21 @@ All changes included in 1.7:
2629
## Book projects
2730

2831
- ([#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.
32+
- ([#12134](https://github.com/quarto-dev/quarto-cli/issues/12134)): Forward `logo.small` images in `_brand.yml` files to the `favicon` of the book's website.
2933

3034
## `quarto check`
3135

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

3438
## `html` format
3539

36-
- ([#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.
40+
- ([#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.
3741

3842
## `pdf` format
3943

4044
- ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
4145
- ([#11903](https://github.com/quarto-dev/quarto-cli/issues/11903)): `crossref` configuration like `fig-title` or `tbl-title` now correctly supports multi word values, e.g. `fig-title: 'Supplementary Figure'`.
42-
- ([#11878](https://github.com/quarto-dev/quarto-cli/issues/11878)): Correctly fixup raw LaTeX table having an unexpected table env with options (e.g `\begin{table}[c]`) to be handled as crossref table.
46+
- ([#11878](https://github.com/quarto-dev/quarto-cli/issues/11878), [#12085](https://github.com/quarto-dev/quarto-cli/issues/12085)): Correctly fixup raw LaTeX table having an unexpected table env with options (e.g `\begin{table}[!ht]`) to be handled as crossref table.
4347

4448
## `typst` format
4549

@@ -48,6 +52,14 @@ All changes included in 1.7:
4852
- ([#11835](https://github.com/quarto-dev/quarto-cli/issues/11835)): Take markdown structure into account when detecting minimum heading level.
4953
- ([#11964](https://github.com/quarto-dev/quarto-cli/issues/11964)): Using panel layout without a crossref label now correctly do not add an empty `#block[]` that was leading to an unnecessary space in output.
5054

55+
## `revealjs` format
56+
57+
- ([#12147](https://github.com/quarto-dev/quarto-cli/issues/12147)): `serif` and `simple` themes defaults back to have their heading color (`$presentation-heading-color`) to be the same as the body color (`$body-color`) as in Quarto 1.5.
58+
59+
## Interactive Shiny Document
60+
61+
- ([#12059](https://github.com/quarto-dev/quarto-cli/issues/12059)): `quarto preview` now correctly run on Windows an interactive Quarto doc with Jupyter engine and py-shiny, when using a `*.py` file as resource.
62+
5163
## Lua Filters and extensions
5264

5365
- ([#11526](https://github.com/quarto-dev/quarto-cli/pull/11526)):
@@ -58,13 +70,20 @@ All changes included in 1.7:
5870
- ([#11699](https://github.com/quarto-dev/quarto-cli/issues/11699)): Fix crash with `video` shortcode inside HTML comments.
5971
- 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.
6072
- Fix `pandoc.mediabag` Lua typings so autocompletions work with the Lua LSP integration.
73+
- ([#11896](https://github.com/quarto-dev/quarto-cli/pull/11896)): fix `\f` (`{{< pagebreak >}}`) form feed character not valid in PowerPoint (`pptx`).
74+
- ([#11664](https://github.com/quarto-dev/quarto-cli/issues/11664)): `lipsum` shortcode is no longer randomly generated by default, use `{{< lipsum random=true >}}` to restore randomness.
6175

6276
## Engines
6377

6478
### `julia`
6579

6680
- ([#11659](https://github.com/quarto-dev/quarto-cli/pull/11659)): Fix escaping bug where paths containing spaces or backslashes break server startup on Windows.
67-
- ([#11928](https://github.com/quarto-dev/quarto-cli/pull/11928)): Update QuartoNotebookRunner to 0.12.0.
81+
- ([#12121](https://github.com/quarto-dev/quarto-cli/pull/12121)): Update QuartoNotebookRunner to 0.13.1. Support for evaluating Python cells via [PythonCall.jl](https://github.com/JuliaPy/PythonCall.jl) added.
82+
- ([#12151](https://github.com/quarto-dev/quarto-cli/pull/12151)): Basic YAML validation is now active for document using Julia engine.
83+
84+
### `jupyter`
85+
86+
- ([#12114](https://github.com/quarto-dev/quarto-cli/issues/12114)): `JUPYTERCACHE` environment variable from [Jupyter cache CLI](https://jupyter-cache.readthedocs.io/en/latest/using/cli.html) is now respected by Quarto when `cache: true` is used. This environment variable allows to change the path of the cache directory.
6887

6988
## Other Fixes and Improvements
7089

@@ -75,3 +94,5 @@ All changes included in 1.7:
7594
- ([fb38eb5](https://github.com/quarto-dev/quarto-cli/commit/fb38eb56c11e09f44cef58fd3b697ff24bb5a3f3)) Use the `latest` parser for Acorn when analyzing JS code imported from OJS blocks.
7695
- ([#10532](https://github.com/quarto-dev/quarto-cli/issues/10532)): Quarto changed default of `--headless=old` to `--headless` as [Chrome 132 has removed old headless mode](https://developer.chrome.com/blog/removing-headless-old-from-chrome) and only support new mode. For using old mode, `QUARTO_CHROMIUM` could be set to a [new `chrome-headless-shell` binary](https://developer.chrome.com/blog/chrome-headless-shell) or too an older chrome version (between 128 and 132) and `QUARTO_CHROMIUM_HEADLESS_MODE` set to `old` for using old headless mode with that compatabitle version.
7796
- ([#10961](https://github.com/quarto-dev/quarto-cli/issues/10961)): Add more information on which Chrome Headless will be used in `quarto check install`. This is helpful to help debug mermaid issues.
97+
- ([#11951](https://github.com/quarto-dev/quarto-cli/issues/11951)): Raw LaTeX table without `tbl-` prefix label for using Quarto crossref are now correctly passed through unmodified.
98+
- ([#12117](https://github.com/quarto-dev/quarto-cli/issues/12117)): Color output to stdout and stderr is now correctly rendered for `html` format in the Jupyter and Julia engines.

package/src/common/patches/revealjs-theme-0001-simple.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ index f0472d7b9..3b1e3cbdc 100644
2828
+$font-family-sans-serif: "Lato", sans-serif !default;
2929
+$body-color: #000 !default;
3030
+$presentation-heading-font: "News Cycle", sans-serif !default;
31-
+$presentation-heading-color: #000 !default;
31+
+$presentation-heading-color: $body-color !default;
3232
+$presentation-heading-text-shadow: none !default;
3333
+$presentation-heading-text-transform: none !default;
3434
+$body-bg: #fff !default;

0 commit comments

Comments
 (0)