RefTargets: Float

.gitignore

@@ -25,3 +25,7 @@ win_configuration.bat
 src/resources/preview/quarto-preview.js
 .prettierrc.json
 _manuscript
+
+# generated by coverage tools
+tests/docs/luacov/luacov.report.html
+tests/docs/luacov/report.html

dev-docs/lua-coverage-report.md

@@ -5,10 +5,7 @@ run the following commands:
 
 ```bash
 cd quarto-cli/tests
-export QUARTO_LUACOV=`pwd`/luacov.stats.out
-rm -f luacov.stats.out # to get a fresh report; otherwise it appends
-./run-tests.sh
-quarto render docs/luacov/report.qmd
+./run-tests-with-luacov.sh
 ```
 
 The report is an HTML file, and will be under `docs/luacov/luacov.report.html`.

news/changelog-1.4.md

@@ -166,6 +166,10 @@
 
 - ([#6766](https://github.com/quarto-dev/quarto-cli/issues/6766)): Add `id` as valid CSL property when specifying a documents citation metadata.
 
+## Crossrefs
+
+- ([#6620](https://github.com/quarto-dev/quarto-cli/issues/6620)): Introduce `FloatRefTarget` AST nodes that generalize crossref targets to include figures, tables, and custom floating elements.
+
 ## Other Fixes and Improvements
 
 - ([#2214](https://github.com/quarto-dev/quarto-cli/issues/2214), reopened): don't report a non-existing version of Google Chrome in macOS.
@@ -186,6 +190,7 @@
 - ([#6487](https://github.com/quarto-dev/quarto-cli/discussions/6487)): Fix `serviceworkers` check in `htmlDependency` to look at the correct key.
 - ([#6178](https://github.com/quarto-dev/quarto-cli/pull/6178)): When `QUARTO_LOG_LEVEL=DEBUG`, information about search for a R binary will be shown.
 - ([#5755](https://github.com/quarto-dev/quarto-cli/pull/5755)): Allow document metadata to control conditional content.
+- ([#6620](https://github.com/quarto-dev/quarto-cli/pull/6620)): Rewrite Crossreferenceable figure support. See the [prerelease documentation](https://quarto.org/docs/prerelease/1.4/) for more information.
 - ([#6697](https://github.com/quarto-dev/quarto-cli/pull/6697)): Fix issue with outputing to stdout (`quarto render <file> -o -`) on Windows.
 - ([#6705](https://github.com/quarto-dev/quarto-cli/pull/6705)): Fix issue with gfm output being removed when rendered with other formats.
 - ([#6746](https://github.com/quarto-dev/quarto-cli/issues/6746)): Let stdout and stderr finish independently to avoid deadlock.

src/command/render/filters.ts

@@ -97,6 +97,8 @@ const kQuartoVersion = "quarto-version";
 
 const kQuartoSource = "quarto-source";
 
+const kQuartoCustomFormat = "quarto-custom-format";
+
 export async function filterParamsJson(
   args: string[],
   options: PandocOptions,
@@ -127,6 +129,10 @@ export async function filterParamsJson(
     defaults,
   );
 
+  const customFormatParams = extractCustomFormatParams(
+    options.format.metadata,
+  );
+
   const params: Metadata = {
     ...includes,
     ...initFilterParams(dependenciesFile),
@@ -141,6 +147,7 @@ export async function filterParamsJson(
     ...jatsFilterParams(options),
     ...notebookContextFilterParams(options),
     ...filterParams,
+    ...customFormatParams,
     [kResultsFile]: pandocMetadataPath(resultsFile),
     [kTimingFile]: pandocMetadataPath(timingFile),
     [kQuartoFilters]: filterSpec,
@@ -161,6 +168,21 @@ export function quartoMainFilter() {
   return resourcePath("filters/main.lua");
 }
 
+function extractCustomFormatParams(
+  metadata: Metadata,
+) {
+  // pull out custom format spec if provided
+  const customFormatParams = metadata[kQuartoCustomFormat];
+  if (customFormatParams) {
+    delete metadata[kQuartoCustomFormat];
+    return {
+      [kQuartoCustomFormat]: customFormatParams,
+    };
+  } else {
+    return {};
+  }
+}
+
 function extractFilterSpecParams(
   metadata: Metadata,
 ) {

src/core/handlers/base.ts

@@ -1,9 +1,8 @@
 /*
-* base.ts
-*
-* Copyright (C) 2022 Posit Software, PBC
-*
-*/
+ * base.ts
+ *
+ * Copyright (C) 2022 Posit Software, PBC
+ */
 
 import {
   HandlerContextResults,
@@ -717,7 +716,7 @@ export function getDivAttributes(
     }
   }
   if (options?.[kCellLstCap]) {
-    attrs.push(`caption="${options?.[kCellLstCap]}"`);
+    attrs.push(`lst-cap="${options?.[kCellLstCap]}"`);
   }
   const classStr = (options?.classes as (string | undefined)) || "";
 

src/core/jupyter/jupyter.ts

@@ -1379,7 +1379,7 @@ async function mdFromCodeCell(
       }
 
       if (typeof cell.options[kCellLstCap] === "string") {
-        md.push(` caption=\"${cell.options[kCellLstCap]}\"`);
+        md.push(` lst-cap=\"${cell.options[kCellLstCap]}\"`);
       }
       if (typeof cell.options[kCodeFold] !== "undefined") {
         md.push(` code-fold=\"${cell.options[kCodeFold]}\"`);

src/dev_import_map.json

@@ -45,6 +45,8 @@
     "diff": "./vendor/cdn.skypack.dev/diff@5.0.0.js",
     "observablehq/parser": "./vendor/cdn.skypack.dev/@observablehq/parser@4.5.0.js",
     "js-yaml": "./vendor/cdn.skypack.dev/js-yaml@4.1.0.js",
+    "slimdom": "./vendor/cdn.skypack.dev/slimdom@4.2.0.js",
+    "fontoxpath": "./vendor/cdn.skypack.dev/fontoxpath@3.29.1.js",
     "https://deno.land/std@0.161.0/": "./vendor/deno.land/std@0.185.0/",
     "https://deno.land/std@0.101.0/": "./vendor/deno.land/std@0.185.0/",
     "https://deno.land/std@0.105.0/": "./vendor/deno.land/std@0.185.0/",
@@ -280,13 +282,17 @@
       "/-/acorn-walk@v7.2.0-HE7wS37ePcNncqJvsD8k/dist=es2019,mode=imports/optimized/acorn-walk.js": "./vendor/cdn.skypack.dev/-/acorn-walk@v7.2.0-HE7wS37ePcNncqJvsD8k/dist=es2019,mode=imports/optimized/acorn-walk.js",
       "/-/acorn-private-class-elements@v1.0.0-74UyKouPfmJKyVmXndKD/dist=es2019,mode=imports/optimized/acorn-private-class-elements.js": "./vendor/cdn.skypack.dev/-/acorn-private-class-elements@v1.0.0-74UyKouPfmJKyVmXndKD/dist=es2019,mode=imports/optimized/acorn-private-class-elements.js",
       "/-/acorn@v8.4.0-TUBEehokUmfefnUMjao9/dist=es2019,mode=imports/optimized/acorn.js": "./vendor/cdn.skypack.dev/-/acorn@v8.4.0-TUBEehokUmfefnUMjao9/dist=es2019,mode=imports/optimized/acorn.js",
+      "/-/xspattern@v3.1.0-ChOssaTvtX8cZQgPaNnM/dist=es2019,mode=imports/optimized/xspattern.js": "./vendor/cdn.skypack.dev/-/xspattern@v3.1.0-ChOssaTvtX8cZQgPaNnM/dist=es2019,mode=imports/optimized/xspattern.js",
+      "/-/prsc@v4.0.0-yiYip3qo0YwPataeg654/dist=es2019,mode=imports/optimized/prsc.js": "./vendor/cdn.skypack.dev/-/prsc@v4.0.0-yiYip3qo0YwPataeg654/dist=es2019,mode=imports/optimized/prsc.js",
+      "/-/whynot@v5.0.0-TIWeI93neceQKiPCfmA6/dist=es2019,mode=imports/optimized/whynot.js": "./vendor/cdn.skypack.dev/-/whynot@v5.0.0-TIWeI93neceQKiPCfmA6/dist=es2019,mode=imports/optimized/whynot.js",
       "/-/@observablehq/parser@v4.5.0-rWZiNfab8flhVomtfVvr/dist=es2019,mode=imports/optimized/@observablehq/parser.js": "./vendor/cdn.skypack.dev/-/@observablehq/parser@v4.5.0-rWZiNfab8flhVomtfVvr/dist=es2019,mode=imports/optimized/@observablehq/parser.js",
       "/-/acorn-class-fields@v1.0.0-VEggkLxq9gMrdwRuKkzZ/dist=es2019,mode=imports/optimized/acorn-class-fields.js": "./vendor/cdn.skypack.dev/-/acorn-class-fields@v1.0.0-VEggkLxq9gMrdwRuKkzZ/dist=es2019,mode=imports/optimized/acorn-class-fields.js",
       "/-/acorn-walk@v8.2.0-X811aiix0R2fkBGq305v/dist=es2019,mode=imports/optimized/acorn-walk.js": "./vendor/cdn.skypack.dev/-/acorn-walk@v8.2.0-X811aiix0R2fkBGq305v/dist=es2019,mode=imports/optimized/acorn-walk.js",
       "/-/ansi_up@v5.1.0-ifIRWFhqTFJbTEKi2tZH/dist=es2019,mode=imports/optimized/ansi_up.js": "./vendor/cdn.skypack.dev/-/ansi_up@v5.1.0-ifIRWFhqTFJbTEKi2tZH/dist=es2019,mode=imports/optimized/ansi_up.js",
       "/-/binary-search-bounds@v2.0.5-c8IgO4OqUhed8ANHQXKv/dist=es2019,mode=imports/optimized/binary-search-bounds.js": "./vendor/cdn.skypack.dev/-/binary-search-bounds@v2.0.5-c8IgO4OqUhed8ANHQXKv/dist=es2019,mode=imports/optimized/binary-search-bounds.js",
       "/-/blueimp-md5@v2.19.0-FsBtHB6ITwdC3L5Giq4Q/dist=es2019,mode=imports/optimized/blueimp-md5.js": "./vendor/cdn.skypack.dev/-/blueimp-md5@v2.19.0-FsBtHB6ITwdC3L5Giq4Q/dist=es2019,mode=imports/optimized/blueimp-md5.js",
       "/-/dayjs@v1.8.21-6syVEc6qGP8frQXKlmJD/dist=es2019,mode=imports/optimized/dayjs.js": "./vendor/cdn.skypack.dev/-/dayjs@v1.8.21-6syVEc6qGP8frQXKlmJD/dist=es2019,mode=imports/optimized/dayjs.js",
+      "/-/fontoxpath@v3.29.1-a0ohYsVP957eLX7RfgAa/dist=es2019,mode=imports/optimized/fontoxpath.js": "./vendor/cdn.skypack.dev/-/fontoxpath@v3.29.1-a0ohYsVP957eLX7RfgAa/dist=es2019,mode=imports/optimized/fontoxpath.js",
       "/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/cloneDeep.js": "./vendor/cdn.skypack.dev/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/cloneDeep.js",
       "/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/debounce.js": "./vendor/cdn.skypack.dev/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/debounce.js",
       "/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/difference.js": "./vendor/cdn.skypack.dev/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/difference.js",
@@ -303,7 +309,8 @@
       "/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/toString.js": "./vendor/cdn.skypack.dev/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/toString.js",
       "/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/uniq.js": "./vendor/cdn.skypack.dev/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/uniq.js",
       "/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/uniqBy.js": "./vendor/cdn.skypack.dev/-/lodash@v4.17.21-K6GEbP02mWFnLA45zAmi/dist=es2019,mode=imports/unoptimized/uniqBy.js",
-      "/-/moment-guess@v1.2.4-bDXl7KQy0hLGNuGhyGb4/dist=es2019,mode=imports/optimized/moment-guess.js": "./vendor/cdn.skypack.dev/-/moment-guess@v1.2.4-bDXl7KQy0hLGNuGhyGb4/dist=es2019,mode=imports/optimized/moment-guess.js"
+      "/-/moment-guess@v1.2.4-bDXl7KQy0hLGNuGhyGb4/dist=es2019,mode=imports/optimized/moment-guess.js": "./vendor/cdn.skypack.dev/-/moment-guess@v1.2.4-bDXl7KQy0hLGNuGhyGb4/dist=es2019,mode=imports/optimized/moment-guess.js",
+      "/-/slimdom@v4.2.0-QzuHPU3P67qdOzczKt6u/dist=es2019,mode=imports/optimized/slimdom.js": "./vendor/cdn.skypack.dev/-/slimdom@v4.2.0-QzuHPU3P67qdOzczKt6u/dist=es2019,mode=imports/optimized/slimdom.js"
     }
   }
 }

src/execute/ojs/compile.ts

@@ -424,9 +424,6 @@ export async function ojsCompile(
       if (outputVal === "all") {
         attrs.push(`output="all"`);
       }
-      if (cell.options?.[kCellLstCap]) {
-        attrs.push(`caption="${cell.options?.[kCellLstCap]}"`);
-      }
       const {
         classes,
         attrs: otherAttrs,

src/format/html/format-html-bootstrap.ts

@@ -277,10 +277,10 @@ function bootstrapHtmlPostprocessor(
       for (let j = 0; j < images.length; j++) {
         (images[j] as Element).classList.add("figure-img");
       }
-      const captions = figure.querySelectorAll("figcaption");
-      for (let j = 0; j < captions.length; j++) {
-        (captions[j] as Element).classList.add("figure-caption");
-      }
+      // const captions = figure.querySelectorAll("figcaption");
+      // for (let j = 0; j < captions.length; j++) {
+      //   (captions[j] as Element).classList.add("figure-caption");
+      // }
     }
 
     // move the toc if there is a sidebar