brand yaml logo feature parity: dashboard, revealjs

src/format/reveal/format-reveal.ts

@@ -398,8 +398,25 @@ const determineRevealLogo = (format: Format): string | undefined => {
 function revealMarkdownAfterBody(format: Format) {
   const lines: string[] = [];
   lines.push("::: {.quarto-auto-generated-content style='display: none;'}\n");
-  const revealLogo = (format.metadata[kSlideLogo] as (string | undefined)) ??
-    determineRevealLogo(format);
+  let revealLogo = format
+    .metadata[kSlideLogo] as (string | { path: string } | undefined);
+  if (revealLogo) {
+    if (typeof revealLogo === "object") {
+      revealLogo = revealLogo.path;
+    }
+    if (["small", "medium", "large"].includes(revealLogo)) {
+      const brandData = format.render.brand?.processedData;
+      const logoInfo = brandData?.logo
+        ?.[revealLogo as ("medium" | "small" | "large")];
+      if (typeof logoInfo === "string") {
+        revealLogo = logoInfo;
+      } else {
+        revealLogo = logoInfo?.light.path ?? logoInfo?.dark.path;
+      }
+    }
+  } else {
+    revealLogo = determineRevealLogo(format);
+  }
   if (revealLogo) {
     lines.push(
       `<img src="${revealLogo}" class="slide-logo" />`,

src/resources/filters/quarto-post/dashboard.lua

@@ -737,6 +737,44 @@ function render_dashboard()
           return doc
         end
       end
+    }, {
+      -- todo: dark mode
+      Meta = function(meta)
+        local logo = meta.logo
+        local resolved
+        if logo then
+          local which
+          if pandoc.utils.type(logo) == 'Inlines' then 
+            which = logo[1].text
+            local brandLogo = _quarto.modules.brand.get_logo(logo[1].text)
+            resolved = brandLogo and brandLogo.light
+          elseif type(logo) == 'table' then
+            local brandLogo = _quarto.modules.brand.get_logo(logo.path[1].text)
+            if brandLogo then
+              resolved = brandLogo.light
+              if logo.alt then
+                resolved.alt = logo.alt
+              end
+            else
+              resolved = {
+                path = logo.path,
+                alt = logo.alt
+              }
+            end
+          end
+        else
+          logo = _quarto.modules.brand.get_logo('small')
+            or _quarto.modules.brand.get_logo('medium')
+            or _quarto.modules.brand.get_logo('large')
+          resolved = logo and logo.light
+        end
+        if resolved then
+          meta.logo = resolved.path
+          meta['logo-alt'] = resolved.alt
+        end
+
+        return meta
+      end
     }
   }
 end

tests/docs/smoke-all/brand/logo/choose-logo-resource.qmd

@@ -0,0 +1,31 @@
+---
+title: brand and base logo
+format:
+  dashboard: default
+brand:
+  logo:
+    images:
+      quarto:
+        path: quarto.png
+        alt: quarto logo
+      posit:
+        path: posit-logo-2024.svg
+        alt: posit logo
+    medium: quarto
+    large: posit
+logo: large
+_quarto:
+  tests:
+    dashboard:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" alt="posit logo"'
+        - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" class="slide-logo">'
+        - []
+---
+
+{{< lipsum 4 >}}

tests/docs/smoke-all/brand/logo/default-logo.qmd

@@ -0,0 +1,31 @@
+---
+title: brand and base logo
+format:
+  dashboard: default
+  revealjs: default
+brand:
+  logo:
+    images:
+      quarto:
+        path: quarto.png
+        alt: quarto logo
+      posit:
+        path: posit-logo-2024.svg
+        alt: posit logo
+    medium: quarto
+    large: posit
+_quarto:
+  tests:
+    dashboard:
+      ensureFileRegexMatches:
+        -
+          - '<img src="quarto\.png" alt="quarto logo"'
+        - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="quarto\.png" class="slide-logo">'
+        - []
+---
+
+{{< lipsum 4 >}}

tests/docs/smoke-all/brand/logo/override-logo-path-alt.qmd

@@ -0,0 +1,33 @@
+---
+title: brand and base logo
+format:
+  dashboard: default
+brand:
+  logo:
+    images:
+      quarto:
+        path: quarto.png
+        alt: quarto logo
+      posit:
+        path: posit-logo-2024.svg
+        alt: posit logo
+    medium: quarto
+    large: posit
+logo:
+  path: posit-logo-2024.svg
+  alt: posit logo
+_quarto:
+  tests:
+    dashboard:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" alt="posit logo"'
+        - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" class="slide-logo">'
+        - []
+---
+
+{{< lipsum 4 >}}

tests/docs/smoke-all/brand/logo/override-logo-path.qmd

@@ -0,0 +1,32 @@
+---
+title: brand and base logo
+format:
+  dashboard: default
+  revealjs: default
+brand:
+  logo:
+    images:
+      quarto:
+        path: quarto.png
+        alt: quarto logo
+      posit:
+        path: posit-logo-2024.svg
+        alt: posit logo
+    medium: quarto
+    large: posit
+logo: posit-logo-2024.svg
+_quarto:
+  tests:
+    dashboard:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" alt=""'
+        - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" class="slide-logo">'
+        - []
+---
+
+{{< lipsum 4 >}}

tests/docs/smoke-all/brand/logo/override-logo-resource-alt.qmd

@@ -0,0 +1,28 @@
+---
+title: brand and base logo
+format:
+  dashboard: default
+brand:
+  logo:
+    images:
+      quarto:
+        path: quarto.png
+        alt: quarto logo
+      posit:
+        path: posit-logo-2024.svg
+        alt: posit logo
+    medium: quarto
+    large: posit
+logo:
+  path: large
+  alt: logo of posit
+_quarto:
+  tests:
+    dashboard:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" alt="logo of posit"'
+        - []
+---
+
+{{< lipsum 4 >}}

tests/docs/smoke-all/brand/logo/override-logo-resource.qmd

@@ -0,0 +1,32 @@
+---
+title: brand and base logo
+format:
+  dashboard: default
+brand:
+  logo:
+    images:
+      quarto:
+        path: quarto.png
+        alt: quarto logo
+      posit:
+        path: posit-logo-2024.svg
+        alt: posit logo
+    medium: quarto
+    large: posit
+logo:
+  path: large
+_quarto:
+  tests:
+    dashboard:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" alt="posit logo"'
+        - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="posit-logo-2024\.svg" class="slide-logo">'
+        - []
+---
+
+{{< lipsum 4 >}}