Merge branch 'main' into typst/template-update

Author: cderv

news/changelog-1.9.md

@@ -14,3 +14,17 @@ All changes included in 1.9:
 ### `typst`
 
 - ([#13362](https://github.com/quarto-dev/quarto-cli/issues/13362)): Remove unused `blockquote` definitions from template.
+
+### `gfm`
+
+- ([#13421](https://github.com/quarto-dev/quarto-cli/issues/13421)): Do not word-wrap titles in header.
+
+### `html`
+
+- ([#13413](https://github.com/quarto-dev/quarto-cli/issues/13413)): Fix uncentered play button in `video` shortcodes from cross-reference divs. (author: @bruvellu)
+
+## `publish`
+
+### Confluence
+
+- ([#13414](https://github.com/quarto-dev/quarto-cli/issues/13414)): Be more forgiving when Confluence server returns malformed JSON response. (author: @m1no)

src/core/brand/brand.ts

@@ -259,7 +259,7 @@ export class Brand {
   getLogoResource(name: string): BrandLogoExplicitResource {
     const entry = this.data.logo?.images?.[name];
     if (!entry) {
-      return { path: name };
+      return this.resolvePath(name);
     }
     return this.resolvePath(entry);
   }

src/publish/confluence/api/index.ts

@@ -381,10 +381,19 @@ export class ConfluenceClient {
     };
   }
 
-  private handleResponse<T>(response: Response) {
+  private async handleResponse<T>(response: Response) {
     if (response.ok) {
       if (response.body) {
-        return response.json() as unknown as T;
+        // Some Confluence API endpoints return successfull calls with no body while using content-type "application/json"
+        // example: https://developer.atlassian.com/cloud/confluence/rest/v1/api-group-content-restrictions/#api-wiki-rest-api-content-id-restriction-byoperation-operationkey-bygroupid-groupid-get
+        // To prevent JSON parsing errors we have to return null for empty bodies and only parse when there is content
+        let data = await response.text();
+
+        if (data === "") {
+          return null as unknown as T;
+        } else {
+          return JSON.parse(data) as unknown as T;
+        }
       } else {
         return response as unknown as T;
       }

src/resources/extensions/quarto/video/video.lua

@@ -160,7 +160,7 @@ local videoJSBuilder = function(params)
   VIDEO_SHORTCODE_NUM_VIDEOJS = VIDEO_SHORTCODE_NUM_VIDEOJS + 1
   local id = "video_shortcode_videojs_video" .. VIDEO_SHORTCODE_NUM_VIDEOJS
 
-  local SNIPPET = [[<video id="{id}"{width}{height} class="video-js vjs-default-skin {fluid}" controls preload="auto" data-setup='{}' title="{title}"><source src="{src}"></video>]]
+  local SNIPPET = [[<video id="{id}"{width}{height} class="video-js vjs-default-skin vjs-big-play-centered {fluid}" controls preload="auto" data-setup='{}' title="{title}"><source src="{src}"></video>]]
   local snippet = params.snippet or SNIPPET
   snippet = replaceCommonAttributes(snippet, params)
   snippet = interpolate {

src/resources/pandoc/templates/default.markdown

@@ -1,5 +1,5 @@
 $if(title)$
-# $title$
+# $title/nowrap$
 $endif$
 $for(by-author)$$it.name.literal$$sep$, $endfor$
 $if(date)$

tests/docs/smoke-all/2025/09/26/issue-13421.qmd

@@ -0,0 +1,12 @@
+---
+format: gfm
+title: "0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789 0123456789"
+_quarto:
+  tests:
+    gfm:
+      ensureFileRegexMatches:
+        - []
+        - ["\n012345"]
+---
+
+Do not wrap.

tests/docs/smoke-all/brand/logo/relative-logo-path-no-project/brand/_brand.yml

@@ -0,0 +1,2 @@
+logo:
+  medium: ../logos/logo.png

tests/docs/smoke-all/brand/logo/relative-logo-path-no-project/index.qmd

@@ -0,0 +1,29 @@
+---
+format:
+  dashboard: default
+  revealjs: default
+  typst:
+    keep-typ: true
+brand: brand/_brand.yml
+_quarto:
+  tests:
+    dashboard:
+      ensureFileRegexMatches:
+        -
+          - '<img src="logos(/|\\)logo.png"'
+        - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="logos(/|\\)logo.png"'
+        - []
+    typst:
+      ensureTypstFileRegexMatches:
+        -
+          - 'background: align\(left\+top, box\(inset: 0\.75in, image\("logos(/|\\\\)logo\.png", width: 1\.5in\)\)'
+        - []
+---
+
+# Test
+
+Some text

tests/docs/smoke-all/brand/logo/relative-logo-path-no-project/logos/logo.png

@@ -0,0 +1,2 @@
+/.quarto/
+**/*.quarto_ipynb