Merge branch 'main' into dependencies/1.8-mermaidjs

Author: cderv

news/changelog-1.8.md

@@ -20,6 +20,7 @@ All changes included in 1.8:
 - ([#12747](https://github.com/quarto-dev/quarto-cli/issues/12747)): Ensure `th` elements are properly restored when Quarto's HTML table processing is happening.
 - ([#12766](https://github.com/quarto-dev/quarto-cli/issues/12766)): Use consistent equation numbering display for `html-math-method` and `html-math-method.method` for MathJax and KaTeX (author: @mcanouil)
 - ([#12797](https://github.com/quarto-dev/quarto-cli/issues/12797)): Allow light and dark brands to be specified in one file, by specializing colors with `light:` and `dark:`.
+- ([#12919](https://github.com/quarto-dev/quarto-cli/issues/12919)): Ensure `kbd` shortcode output has hover tooltip.
 
 ### `revealjs`
 
@@ -51,6 +52,7 @@ All changes included in 1.8:
 - ([#12551](https://github.com/quarto-dev/quarto-cli/pull/12551)): Improve warning issued when `aliases` would overwrite an existing document.
 - ([#12616](https://github.com/quarto-dev/quarto-cli/issues/12616)): find SVG images in image discovery for listings.
 - ([#12693](https://github.com/quarto-dev/quarto-cli/issues/12693)): Prevent resource exhaustion on large websites by serializing `NotebookContext` information to file instead of the environment.
+- ([#12949](https://github.com/quarto-dev/quarto-cli/issues/12949)): Ensure redirects preserve `hash` and `search` when possible.
 
 ## Crossrefs
 
@@ -68,6 +70,10 @@ All changes included in 1.8:
 
 - ([#12733](https://github.com/quarto-dev/quarto-cli/issues/12733)): Add installed extensions to `quarto inspect` project report.
 
+### `add`
+
+- ([#12627](https://github.com/quarto-dev/quarto-cli/issues/12627)): Don't actually install extension when user responds `yes` to first prompt but `no` to second.
+
 ## Engines
 
 ### `jupyter`

src/extension/install.ts

@@ -78,6 +78,7 @@ export async function installExtension(
   if (!confirmed) {
     // Not confirmed, cancel the installation
     cancelInstallation();
+    return false;
   }
 
   // Complete the installation

src/resources/extensions/quarto/kbd/kbd.lua

@@ -13,8 +13,10 @@ return {
         stylesheets = { 'resources/kbd.css' }
       })
       local kwargs_strs = {}
+      local title_strs = {}
       for k, v in pairs(kwargs) do
         table.insert(kwargs_strs, string.format('data-%s="%s"', osname(k), pandoc.utils.stringify(v)))
+        table.insert(title_strs, osname(k) .. ': ' .. pandoc.utils.stringify(v))
       end
       table.sort(kwargs_strs) -- sort so that the output is deterministic
       local kwargs_str = table.concat(kwargs_strs)
@@ -29,9 +31,14 @@ return {
         default_arg_str = ""
       else
         default_arg_str = pandoc.utils.stringify(args[1])
+        table.insert(title_strs, default_arg_str)
       end
-
-      return pandoc.RawInline('html', '<kbd aria-hidden="true" ' .. kwargs_str .. '>' .. default_arg_str .. '</kbd><span class="visually-hidden">' .. default_arg_str .. '</span>')
+      table.sort(title_strs) -- sort so that the output is deterministic
+      local title_str = table.concat(title_strs, ', ')
+      if title_str == "" then
+        title_str = default_arg_str
+      end
+      return pandoc.RawInline('html', '<kbd title="' .. title_str .. '" aria-hidden="true" ' .. kwargs_str .. '>' .. default_arg_str .. '</kbd><span class="visually-hidden">' .. default_arg_str .. '</span>')
     elseif quarto.doc.isFormat("asciidoc") then
       if args and #args == 1 then
         -- https://docs.asciidoctor.org/asciidoc/latest/macros/keyboard-macro/

src/resources/projects/website/templates/redirect-map.ejs

@@ -7,6 +7,10 @@
     var hash = window.location.hash.startsWith('#') ? window.location.hash.slice(1) : window.location.hash;
     var redirect = redirects[hash] || redirects[""] || "/";
     window.document.title = 'Redirect to  ' +  redirect;
+    if (!redirects[hash]) {
+      redirect = redirect + window.location.hash;
+    }
+    redirect = redirect + window.location.search;
     window.location.replace(redirect);
   </script>
 </head>

src/webui/quarto-preview/package-lock.json

@@ -18,7 +18,7 @@
     "dev": "tsc --noEmit && vite build --mode=development"
   },
   "dependencies": {
-    "@fluentui/react-icons": "^2.0.300",
+    "@fluentui/react-icons": "^2.0.301",
     "@fluentui/react-components": "~9.48.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

src/webui/quarto-preview/package.json

@@ -0,0 +1,12 @@
+---
+format: html
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - ['kbd[title="Shift-K"]','kbd[title="linux: Shift-Ctrl-L, mac: Shift-Command-O, windows: Shift-Control-O"]']
+---
+
+{{< kbd mac=Shift-Command-O win=Shift-Control-O linux=Shift-Ctrl-L >}}
+
+{{< kbd Shift-K >}}