Merge branch 'main' into feature/cliffy-info

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.8.md

@@ -0,0 +1,14 @@
+All changes included in 1.8:
+
+## Formats
+
+### `revealjs`
+
+- ([#12598](https://github.com/quarto-dev/quarto-cli/pull/12598)): Ensure `.fragment` on an image with caption applies to whole figure.
+
+## Projects
+
+### `website`
+
+- ([#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.

src/core/author.ts

@@ -29,99 +29,92 @@ const kOrcid = "orcid";
 const kUrl = "url";
 
 export function cslNameToString(cslName: string | CSLName) {
-  if (typeof cslName === "string") {
-    return cslName;
-  } else {
-    if (cslName.literal) {
-      return cslName.literal;
-    } else {
-      const parts: string[] = [];
-
-      if (cslName.given) {
-        parts.push(cslName.given);
-      }
+  if (typeof cslName === "string") return cslName;
+  if (cslName.literal) return cslName.literal;
+  const parts: string[] = [];
 
-      if (cslName["dropping-particle"]) {
-        parts.push(cslName["dropping-particle"]);
-      }
-      if (cslName["non-dropping-particle"]) {
-        parts.push(cslName["non-dropping-particle"]);
-      }
-      if (cslName.family) {
-        parts.push(cslName.family);
-      }
+  if (cslName.given) {
+    parts.push(cslName.given);
+  }
 
-      return parts.join(" ");
-    }
+  if (cslName["dropping-particle"]) {
+    parts.push(cslName["dropping-particle"]);
+  }
+  if (cslName["non-dropping-particle"]) {
+    parts.push(cslName["non-dropping-particle"]);
   }
+  if (cslName.family) {
+    parts.push(cslName.family);
+  }
+
+  return parts.join(" ");
 }
 
 export function parseAuthor(authorRaw: unknown, strict?: boolean) {
-  if (authorRaw) {
-    const parsed: Author[] = [];
-    const authors = Array.isArray(authorRaw) ? authorRaw : [authorRaw];
-    let unrecognized = 0;
-    authors.forEach((author) => {
-      if (typeof author === "string") {
-        // Its a string, so make it a name
-        parsed.push({
-          name: author,
-        });
-      } else if (typeof author === "object") {
-        // Parse the author object
-        // Currently this only supports simple 'Distill Style'
-        // authors and affiliations
-        const name = author[kName];
-        if (name) {
-          const auth: Author = {
-            name,
-          };
-          const affilation = author[kAffiliation];
-          if (affilation) {
-            auth.affilliation = { name: affilation };
-            if (author[kAfilliationUrl]) {
-              auth.affilliation.url = author[kAfilliationUrl];
-            }
-          }
-
-          const orcid = author[kOrcid];
-          if (orcid) {
-            auth.orcid = orcid;
+  if (!authorRaw) {
+    return undefined;
+  }
+  const parsed: Author[] = [];
+  const authors = Array.isArray(authorRaw) ? authorRaw : [authorRaw];
+  let unrecognized = false;
+  authors.forEach((author) => {
+    if (typeof author === "string") {
+      // Its a string, so make it a name
+      parsed.push({
+        name: author,
+      });
+    } else if (typeof author === "object") {
+      // Parse the author object
+      // Currently this only supports simple 'Distill Style'
+      // authors and affiliations
+      const name = author[kName];
+      if (name) {
+        const auth: Author = {
+          name,
+        };
+        const affilation = author[kAffiliation];
+        if (affilation) {
+          auth.affilliation = { name: affilation };
+          if (author[kAfilliationUrl]) {
+            auth.affilliation.url = author[kAfilliationUrl];
           }
+        }
 
-          const url = author[kUrl];
-          if (url) {
-            auth.url = url;
-          }
+        const orcid = author[kOrcid];
+        if (orcid) {
+          auth.orcid = orcid;
+        }
 
-          parsed.push(auth);
-        } else if (author[kFamily]) {
-          const given = author[kGiven];
-          const family = author[kFamily];
-          const dropping = author[kDropping];
-          const nonDropping = author[kNonDropping];
-          parsed.push({
-            name: {
-              [kGiven]: given,
-              [kFamily]: family,
-              [kDropping]: dropping,
-              [kNonDropping]: nonDropping,
-            },
-          });
-        } else {
-          unrecognized = unrecognized + 1;
+        const url = author[kUrl];
+        if (url) {
+          auth.url = url;
         }
-      }
-    });
 
-    // If we didn't know how to parse this author
-    // just stand down - we just don't recognize this.
-    if (strict && unrecognized > 0) {
-      return undefined;
-    } else {
-      return parsed;
+        parsed.push(auth);
+      } else if (author[kFamily]) {
+        const given = author[kGiven];
+        const family = author[kFamily];
+        const dropping = author[kDropping];
+        const nonDropping = author[kNonDropping];
+        parsed.push({
+          name: {
+            [kGiven]: given,
+            [kFamily]: family,
+            [kDropping]: dropping,
+            [kNonDropping]: nonDropping,
+          },
+        });
+      } else {
+        unrecognized = true;
+      }
     }
-  } else {
+  });
+
+  // If we didn't know how to parse this author
+  // just stand down - we just don't recognize this.
+  if (strict && unrecognized) {
     return undefined;
+  } else {
+    return parsed;
   }
 }

src/project/types/website/listing/website-listing-read.ts

@@ -1159,7 +1159,7 @@ async function listItemFromFile(
       )
       : [];
 
-    const readingContext = target?.markdown
+    const readingContext = target?.markdown?.markdown
       ? estimateReadingTimeMinutes(target.markdown.markdown)
       : undefined;
     let readingtime = undefined;

src/project/types/website/util/discover-meta.ts

@@ -1,11 +1,10 @@
 /*
  * discover-meta.ts
  *
- * Copyright (C) 2020-2022 Posit Software, PBC
+ * Copyright (C) 2020-2025 Posit Software, PBC
  */
 
 import { Document, Element } from "deno_dom/deno-dom-wasm-noinit.ts";
-
 import { getDecodedAttribute } from "../../../../core/html.ts";
 
 // Image discovery happens by either:
@@ -15,16 +14,8 @@ import { getDecodedAttribute } from "../../../../core/html.ts";
 
 const kPreviewImgClass = "preview-image";
 const kNamedFilePattern =
-  "(.*?(?:preview|feature|cover|thumbnail).*?(?:\\.png|\\.gif|\\.jpg|\\.jpeg|\\.webp))";
-const kPreviewClassPattern =
-  `!\\[[^\\]]*\\]\\((.*?)(?:\\".*\\")?\\)\\{[^\\|]*\\.${kPreviewImgClass}[\\s\\}]+`;
-const kMdNamedImagePattern =
-  `!\\[[^\\]]*\\]\\(${kNamedFilePattern}(?:\\".*\\")?\\)(?:\\{[^\\|]*\.*[\\s\\}]+)?`;
-
+  "(.*?(?:preview|feature|cover|thumbnail).*?(?:\\.png|\\.gif|\\.jpg|\\.jpeg|\\.webp|\\.svg))";
 const kNamedFileRegex = RegExp(kNamedFilePattern, "l");
-const kMdPreviewClassRegex = RegExp(kPreviewClassPattern, "l");
-const kMdNamedImageRegex = RegExp(kMdNamedImagePattern, "l");
-const kMarkdownImg = /!\[[^\]]*\]\((.*?)(?:\".*\")?\)(?:\{(?:[^\|]*)\})?/;
 
 export function findDescription(doc: Document): string | undefined {
   const paras = doc.querySelectorAll(
@@ -43,20 +34,16 @@ export function findPreviewImg(
   doc: Document,
 ): { src: string; alt?: string } | undefined {
   const imgEl = findPreviewImgEl(doc);
-  if (imgEl) {
-    const src = getDecodedAttribute(imgEl, "src");
-    const alt = getDecodedAttribute(imgEl, "alt");
-    if (src !== null) {
-      return {
-        src,
-        alt: alt ?? undefined,
-      };
-    } else {
-      return undefined;
-    }
-  } else {
-    return undefined;
-  }
+  if (!imgEl) return undefined;
+
+  const src = getDecodedAttribute(imgEl, "src");
+  if (src === null) return undefined;
+
+  const alt = getDecodedAttribute(imgEl, "alt");
+  return {
+    src,
+    alt: alt ?? undefined,
+  };
 }
 
 export function findPreviewImgEl(
@@ -107,34 +94,8 @@ export function findPreviewImgEl(
 // So 200 is a good middle ground estimate.
 const kWpm = 200;
 export function estimateReadingTimeMinutes(
-  markdown?: string,
-): { wordCount: number; readingTime: number } | undefined {
-  if (markdown) {
-    const wordCount = markdown.split(" ").length;
-    return { wordCount, readingTime: Math.ceil(wordCount / kWpm) };
-  }
-  return undefined;
-}
-
-export function findPreviewImgMd(markdown?: string): string | undefined {
-  if (markdown) {
-    // Look for an explictly tagged image
-    const explicitMatch = markdown.match(kMdPreviewClassRegex);
-    if (explicitMatch) {
-      return explicitMatch[1];
-    }
-
-    // Look for an image with a 'magic' name
-    const fileNameMatch = markdown.match(kMdNamedImageRegex);
-    if (fileNameMatch) {
-      return fileNameMatch[1];
-    }
-
-    // Otherwise select the first image
-    const match = markdown.match(kMarkdownImg);
-    if (match) {
-      return match[1];
-    }
-  }
-  return undefined;
+  markdown: string,
+): { wordCount: number; readingTime: number } {
+  const wordCount = markdown.split(" ").length;
+  return { wordCount, readingTime: Math.ceil(wordCount / kWpm) };
 }