Merge branch 'main' into feature/improve-alias-warn

Author: cscheid

CITATION.cff

@@ -20,7 +20,7 @@ authors:
   given-names: "Gordon"
   orcid: "https://orcid.org/0009-0005-1809-8936"
 title: "Quarto"
-version: 1.6
+version: 1.7
 doi: 10.5281/zenodo.5960048
-date-released: 2024-11-27
+date-released: 2025-04-28
 url: "https://github.com/quarto-dev/quarto-cli"

configuration

@@ -61,7 +61,7 @@ export ALGOLIA_SEARCH_INSIGHTS_JS=2.0.3
 
 
 # Quarto Info Version
-export QUARTO_VERSION=1.7
+export QUARTO_VERSION=1.8
 export QUARTO_NAME=Quarto
 
 # Folder names. These are not the same as paths (those variable names end in _PATH).

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

@@ -2,22 +2,21 @@
 - [ ] create a branch `v1.x`, where x is the version being released
   - `git checkout -b v1.4`
   - `git push origin v1.4`
-- [ ] mark the current release as the stable release in the `main` branch
+- [ ] mark the current release as the new release in the `main` branch
   - [ ] edit QUARTO_VERSION line in `/configuration` to be the new version (e.g. `1.5`)
   - [ ] push the changes to the `main` branch
   - [ ] kick off a v1.5 build in GHA: https://github.com/quarto-dev/quarto-cli/actions/workflows/create-release.yml
     - [ ] ensure the build completes successfully
 - [ ] mark v1.4 release as stable
-  - go to https://github.com/quarto-dev/quarto-cli/releases
-  - find the latest v1.4 release and edit, (eg https://github.com/quarto-dev/quarto-cli/releases/edit/v1.4.549)
-  - at the bottom of the page, there will be two checkboxes, "Set as pre-release" and "Set as latest release":
-    - "Set as pre-release" should be unchecked, and
-    - "Set as latest release" should be checked.
+  - [ ] go to https://github.com/quarto-dev/quarto-cli/releases
+  - [ ] find the latest v1.4 release and edit, (eg https://github.com/quarto-dev/quarto-cli/releases/edit/v1.4.549)
+  - [ ] at the bottom of the page, there will be two checkboxes, "Set as pre-release" and "Set as latest release":
+    - [ ] "Set as pre-release" should be unchecked, and
+    - [ ] "Set as latest release" should be checked.
 - [ ] once the v1.5 build completes, edit the quarto.org website configuration on https://github.com/quarto-dev/quarto-web to reflect the new version
   - this means flipping the profile group configuration in `_quarto.yml` from `[rc,prelease]` to `[prerelease,rc]`
     - [ ] push the changes to the `main` branch
 - [ ] quarto-dev/quarto-web changes
-
   - wait for the downloads file to be automatically updated by the GitHub Action on https://github.com/quarto-dev/quarto-web
     - [ ] wait for https://github.com/quarto-dev/quarto-web/actions/workflows/update-downloads.yml to run (it runs every 15 minutes, or you can manually trigger it)
       - This workflow run rendered the website: https://github.com/quarto-dev/quarto-web/actions/runs/12016407762
@@ -30,20 +29,22 @@
       - [ ] create `docs/prerelease/1.5/{_highlights, index, _pre-release-feature}.qmd` files based on the ones from the previous release
       - [ ] change `docs/prerelease/_highlights.qmd` so its include points to the new version-specific `_highlights.qmd` file (here, 1.5)
       - [ ] change `docs/prerelease/_highlights-release.qmd` so its include points to the new version-specific `_highlights.qmd` file (here, 1.4)
-    - [ ] add the stable version to the older downloads list, like [this example](https://github.com/quarto-dev/quarto-web/commit/85ef62ec5036026d62d57f9cfb190d8b923b2d43)
-      - [ ] run `quarto run tools/release-notes.R` to generate the release notes
+    - [ ] add the stable version to the older downloads list by editing /docs/download/_download-older.yml
+    - [ ] run `quarto run tools/release-notes.R` to generate the release notes
   - [ ] push the changes to `prerelease` branch, ensure they build correctly
-  - [ ] Merge the `prerelease` branch into `main`
+  - [ ] Merge the `prerelease` branch into `main`, push to `main`
     - [ ] ensure the build completes successfully
-  - [ ] Merge `main` into `prerelease`
+  - [ ] Merge `main` into `prerelease`, push to `prerelease`
     - [ ] ensure the build completes successfully
-  - [ ] Create new tag on `main` (here, `v1.5`)
-    - [ ] `git tag -a v1.5 -m "v1.5"`
-    - [ ] `git push origin v1.5`
+  - [ ] Create new tag on `main` with stable release version number (here, `v1.4`) to mark when the new main site version went live
+    - [ ] `git tag -a v1.4 -m "v1.4"`
+    - [ ] `git push origin v1.4`
   - [ ] Update `prerelease` version number (here, `v1.5`)
     - [ ] edit `_quarto-prerelease-docs.yml` to point to the new version
   - [ ] publish the release blog post that should exist in https://github.com/quarto-dev/quarto-web/tree/main/docs/blog/posts
-        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`.
+    - [ ] Create a branch off of `main` (to trigger our PR automation to make the corresponding change to `prerelease`).
+    - [ ] Removing the `draft: true` line in the metadata 
+    - [ ] Change the date to match the release date. 
 
 - [ ] Update https://github.com/quarto-dev/quarto-cli/blob/main/CITATION.cff
 - [ ] Packaging and package managers, etc
@@ -55,8 +56,8 @@
       - Check the "Whether to publish or not the package on chocolatey" checkbox
     - Wait for @cderv to receive email confirmation, no action needed
   - [ ] pypi
-    - Goto the [quarto-cli-pypi repo](https://github.com/quarto-dev/quarto-cli-pypi)
-    - Update `version.txt` to be the version you'd like to publish and commit
+    - Go to the [quarto-cli-pypi repo](https://github.com/quarto-dev/quarto-cli-pypi)
+    - [ ] Update `version.txt` to be the version you'd like to publish and commit
     - Go to actions
       - Select 'Publish Quarto PyPi'
       - [ ] Click "Run Workflow"

news/changelog-1.7.md

@@ -122,7 +122,7 @@ All changes included in 1.7:
 ### `julia`
 
 - ([#11803](https://github.com/quarto-dev/quarto-cli/pull/11803)): Added subcommands `status`, `kill`, `close [--force]` and `log` under the new CLI command `quarto call engine julia`.
-- ([#12121](https://github.com/quarto-dev/quarto-cli/pull/12121)): Update QuartoNotebookRunner to 0.16.0. Support for evaluating Python cells via [PythonCall.jl](https://github.com/JuliaPy/PythonCall.jl) added. Support for notebook caching via `execute.cache` added.
+- ([#12121](https://github.com/quarto-dev/quarto-cli/pull/12121)): Update QuartoNotebookRunner to 0.17.0. Support for evaluating Python cells via [PythonCall.jl](https://github.com/JuliaPy/PythonCall.jl) added. Support for notebook caching via `execute.cache` added.
 - ([#12151](https://github.com/quarto-dev/quarto-cli/pull/12151)): Basic YAML validation is now active for documents using Julia engine.
 
 ### `jupyter`
@@ -153,9 +153,15 @@ All changes included in 1.7:
 - ([#12326](https://github.com/quarto-dev/quarto-cli/issues/12326)): Add `quarto.shortcode.*` API entry points for shortcode developers.
 - ([#12365](https://github.com/quarto-dev/quarto-cli/pull/12365)): `brand color` shortcode takes an optional `brandMode` second parameter, default `light`.
 - ([#12453](https://github.com/quarto-dev/quarto-cli/issues/12453)): Expose `_quarto.modules.brand` as `quarto.brand` and add `has_mode()` function.
+- ([#12564](https://github.com/quarto-dev/quarto-cli/issues/12564)): `brand logo` shortcode also takes an optional `brandMode` second parameter, default `light`.
 
-## Lua API
+### Conditional Content
 
+- ([#4411](https://github.com/quarto-dev/quarto-cli/issues/12462)): Added support for new format and aliases in `when-format` and `unless-format`: `confluence`, `docusaurus` (and `docusaurus-md`), `email`, `dashboard`, `gfm`, `hugo` (and `hugo-md`).
+
+### Quarto Lua API
+
+- ([#4411](https://github.com/quarto-dev/quarto-cli/issues/12462)): `quarto.format.is_format` is now working as expected with support of more aliases: `confluence`, `docusaurus` (and `docusaurus-md`), `email`, `dashboard`, `gfm`, `hugo` (and `hugo-md`)
 - ([#12299](https://github.com/quarto-dev/quarto-cli/issues/12299)): `quarto.doc.pdf_engine()` now correctly returns the PDF engine used for the document. `quarto.doc.cite_method()` now returns `nil` if no citation method will be used (i.e. no references is the document set).
 
 ## Languages

news/changelog-1.8.md

@@ -0,0 +1,3 @@
+All changes included in 1.8:
+
+

src/core/brand/brand.ts

@@ -158,12 +158,12 @@ export class Brand {
       if (v) {
         logo[size] = v;
       }
-      for (const [key, value] of Object.entries(data.logo?.images ?? {})) {
-        if (typeof value === "string") {
-          logo.images[key] = { path: value };
-        } else {
-          logo.images[key] = value;
-        }
+    }
+    for (const [key, value] of Object.entries(data.logo?.images ?? {})) {
+      if (typeof value === "string") {
+        logo.images[key] = { path: value };
+      } else {
+        logo.images[key] = value;
       }
     }
 

src/resources/create/extensions/format-typst/_extensions/qstart-filesafename-qend/typst-show.typ

@@ -52,7 +52,7 @@ $endif$
 $if(mainfont)$
   font: ("$mainfont$",),
 $elseif(brand.typography.base.family)$
-  font: ("$brand.typography.base.family$",),
+  font: $brand.typography.base.family$,
 $endif$
 $if(fontsize)$
   fontsize: $fontsize$,
@@ -61,7 +61,7 @@ $elseif(brand.typography.base.size)$
 $endif$
 $if(title)$
 $if(brand.typography.headings.family)$
-  heading-family: ("$brand.typography.headings.family$",),
+  heading-family: $brand.typography.headings.family$,
 $endif$
 $if(brand.typography.headings.weight)$
   heading-weight: $brand.typography.headings.weight$,

src/resources/editor/tools/vs-code.mjs

@@ -16798,13 +16798,6 @@ var require_yaml_intelligence_resources = __commonJS({
           },
           description: "Theme name, theme scss file, or a mix of both."
         },
-        {
-          name: "renderings",
-          schema: {
-            arrayOf: "string"
-          },
-          description: "Array of rendering names, e.g. `[light, dark]`"
-        },
         {
           name: "body-classes",
           tags: {
@@ -24305,12 +24298,12 @@ var require_yaml_intelligence_resources = __commonJS({
         mermaid: "%%"
       },
       "handlers/mermaid/schema.yml": {
-        _internalId: 195005,
+        _internalId: 195e3,
         type: "object",
         description: "be an object",
         properties: {
           "mermaid-format": {
-            _internalId: 194997,
+            _internalId: 194992,
             type: "enum",
             enum: [
               "png",
@@ -24326,7 +24319,7 @@ var require_yaml_intelligence_resources = __commonJS({
             exhaustiveCompletions: true
           },
           theme: {
-            _internalId: 195004,
+            _internalId: 194999,
             type: "anyOf",
             anyOf: [
               {

src/resources/editor/tools/yaml/web-worker.js

@@ -9770,13 +9770,6 @@
       },
       "description": "Theme name, theme scss file, or a mix of both."
     },
-    {
-      "name": "renderings",
-      "schema": {
-        "arrayOf": "string"
-      },
-      "description": "Array of rendering names, e.g. `[light, dark]`"
-    },
     {
       "name": "body-classes",
       "tags": {
@@ -17277,12 +17270,12 @@
     "mermaid": "%%"
   },
   "handlers/mermaid/schema.yml": {
-    "_internalId": 195005,
+    "_internalId": 195000,
     "type": "object",
     "description": "be an object",
     "properties": {
       "mermaid-format": {
-        "_internalId": 194997,
+        "_internalId": 194992,
         "type": "enum",
         "enum": [
           "png",
@@ -17298,7 +17291,7 @@
         "exhaustiveCompletions": true
       },
       "theme": {
-        "_internalId": 195004,
+        "_internalId": 194999,
         "type": "anyOf",
         "anyOf": [
           {

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

@@ -183,8 +183,8 @@ function propertiesMatch(properties, profiles)
   local tests = {
     { constants.kWhenMeta, check_meta, false },
     { constants.kUnlessMeta, check_meta, true },
-    { constants.kWhenFormat, _quarto.format.isFormat, false },
-    { constants.kUnlessFormat, _quarto.format.isFormat, true },
+    { constants.kWhenFormat, quarto.format.is_format, false },
+    { constants.kUnlessFormat, quarto.format.is_format, true },
     { constants.kWhenProfile, check_profile, false },
     { constants.kUnlessProfile, check_profile, true }
   }

src/resources/filters/customnodes/content-hidden.lua

@@ -636,6 +636,28 @@ local function translate_font_weight(w, warnings)
   end
 end
 
+local function dequote(s)
+  return s:gsub('^["\']', ''):gsub('["\']$', '')
+end
+
+local function quote(s)
+  return '"' .. s .. '"'
+end
+
+local function translate_font_family_list(sl)
+  if sl == nil then
+    return '()'
+  end
+  local strings = {}
+  for s in sl:gmatch('([^,]+)') do
+    s = s:gsub('^%s+', '')
+    table.insert(strings, quote(dequote(s)))
+  end
+  local trailcomma = #strings == 1 and ',' or ''
+  return '(' .. table.concat(strings, ', ') .. trailcomma .. ')'
+end
+
+
 local function translate_border_style(v, _warnings)
   local dash
   if v == 'none' then
@@ -763,6 +785,7 @@ return {
   translate_border_style = translate_border_style,
   translate_border_color = translate_border_color,
   translate_font_weight = translate_font_weight,
+  translate_font_family_list = translate_font_family_list,
   consume_width = consume_width,
   consume_style = consume_style,
   consume_color = consume_color

src/resources/filters/modules/typst_css.lua

@@ -195,9 +195,6 @@ function compute_flags()
       elseif lightbox_auto == false then
         flags.has_lightbox = false
       end
-      if el.renderings then
-        flags.has_renderings = true
-      end
     end,
   }}
 end

src/resources/filters/normalize/flags.lua

@@ -8,39 +8,23 @@ function choose_cell_renderings()
       return {json}
     end
   end
-
-  local documentRenderings
 
   return {
-    traverse = "topdown",
-    Meta = function(meta)
-      if meta.renderings then
-        documentRenderings = {}
-        for _, inlines in ipairs(meta.renderings) do
-          table.insert(documentRenderings, inlines[1].text)
-        end
-      end
-    end,
     Div = function(div)
       -- Only process cell div with renderings attr
-      if not div.classes:includes("cell") or (not documentRenderings and not div.attributes["renderings"]) then
+      if not div.classes or not div.classes:includes("cell") or not div.attributes["renderings"] then
         return nil
       end
-      local renderings
-      if div.attributes['renderings'] then
-        local renderingsJson = div.attributes['renderings']
-        renderings = jsonDecodeArray(renderingsJson)
-      else
-        renderings = documentRenderings
-      end
+      local renderingsJson = div.attributes['renderings']
+      local renderings = jsonDecodeArray(renderingsJson)
       if not type(renderings) == "table" or #renderings == 0 then
         quarto.log.warning("renderings expected array of rendering names, got", renderings)
         return nil
       end
       local cods = {}
       local firstCODIndex = nil
       for i, cellOutput in ipairs(div.content) do
-        if cellOutput.classes:includes("cell-output-display") then
+        if cellOutput.classes and cellOutput.classes:includes("cell-output-display") then
           if not firstCODIndex then
             firstCODIndex = i
           end