brand: also resolve logo paths directly on sizes

gordonwoodhull · gordonwoodhull · commit 9dd45106dd39 · 2025-09-25T17:28:16.000-04:00
fixes #13418
diff --git a/src/core/brand/brand.ts b/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);
   }
diff --git a/tests/docs/smoke-all/brand/logo/relative-logo-path-no-project/brand/_brand.yml b/tests/docs/smoke-all/brand/logo/relative-logo-path-no-project/brand/_brand.yml
@@ -0,0 +1,2 @@
+logo:
+  medium: ../logos/logo.png
diff --git a/tests/docs/smoke-all/brand/logo/relative-logo-path-no-project/index.qmd b/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
diff --git a/tests/docs/smoke-all/brand/logo/relative-logo-path-no-project/logos/logo.png b/tests/docs/smoke-all/brand/logo/relative-logo-path-no-project/logos/logo.png
diff --git a/tests/docs/smoke-all/brand/logo/relative-logo-path-project/.gitignore b/tests/docs/smoke-all/brand/logo/relative-logo-path-project/.gitignore
@@ -0,0 +1,2 @@
+/.quarto/
+**/*.quarto_ipynb
diff --git a/tests/docs/smoke-all/brand/logo/relative-logo-path-project/_quarto.yml b/tests/docs/smoke-all/brand/logo/relative-logo-path-project/_quarto.yml
@@ -0,0 +1,2 @@
+project:
+  type: default
diff --git a/tests/docs/smoke-all/brand/logo/relative-logo-path-project/brand/_brand.yml b/tests/docs/smoke-all/brand/logo/relative-logo-path-project/brand/_brand.yml
@@ -0,0 +1,2 @@
+logo:
+  medium: ../logos/logo.png
diff --git a/tests/docs/smoke-all/brand/logo/relative-logo-path-project/index.qmd b/tests/docs/smoke-all/brand/logo/relative-logo-path-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
diff --git a/tests/docs/smoke-all/brand/logo/relative-logo-path-project/logos/logo.png b/tests/docs/smoke-all/brand/logo/relative-logo-path-project/logos/logo.png

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ export class Brand {`
`259`	`259`	`getLogoResource(name: string): BrandLogoExplicitResource {`
`260`	`260`	`const entry = this.data.logo?.images?.[name];`
`261`	`261`	`if (!entry) {`
`262`		`- return { path: name };`
	`262`	`+ return this.resolvePath(name);`
`263`	`263`	`}`
`264`	`264`	`return this.resolvePath(entry);`
`265`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+logo:`
	`2`	`+ medium: ../logos/logo.png`