@openpresentation/opf 0.27.0 → 0.28.0

package/dist/{chunk-PAGVSTVF.js → chunk-WPKCWQ6W.js}

@@ -1,6 +1,6 @@
 import { original } from './chunk-JBARNYFR.js';
-import { schemas, schemaEntries } from './chunk-4ZM5G3XX.js';
-import { promotedRegionKeys, VARIABLE_KINDS, resolveChartData, chartPaletteForFill, chartSeriesPalette, chartLeadFromScheme, normalizeHexColor, resolveChartColors, colorContrast, imageBackground, tableGrid, timelineTextColor, LOGO_SHAPES, visitContentPayloads, readingRows, visualReadingOrder, intrinsicImageSize, resolveReference, textWidthMeasurer, resolveColorRef, resolveDesignRecords, resolveFontFamilies, checkCatalogsOption, provenanceOf, unresolvedReference, OPFUnresolvedReferenceError, resolveColorRoles, resolveCanvasDimensions, resolveSlideVariables, normalizeColorVariant, isRecord, hasContentVariables, isTemplate, instantiateForValidation, layoutTemplateIssues, resolveScriptFonts, defaultSlideBackground, catalogReferenceSites, parseReference, catalogGroupDeclared, pointerPath, unusedDatasets, MAX_COMPOSITION_DEPTH, datasetDiagnostics, pathFor, catalogRecords, collectCitations, numberingFindings, walkCitationRuns, resolveTableData, resolveChartOptions, chartOptionTarget, codeHighlightLines, chartNumberFixesByCell, catalogKinds, catalogGroupSource, registeredCatalog, OPFCompositionError, composeSlide } from './chunk-LRTQXGJO.js';
+import { schemas, schemaEntries } from './chunk-5Q4IYLMW.js';
+import { promotedRegionKeys, VARIABLE_KINDS, resolveChartData, chartPaletteForFill, chartSeriesPalette, chartLeadFromScheme, normalizeHexColor, resolveChartColors, colorContrast, imageBackground, tableGrid, timelineTextColor, LOGO_SHAPES, visitContentPayloads, readingRows, visualReadingOrder, intrinsicImageSize, resolveReference, textWidthMeasurer, resolveColorRef, resolveDesignRecords, resolveFontFamilies, checkCatalogsOption, provenanceOf, unresolvedReference, OPFUnresolvedReferenceError, resolveColorRoles, resolveCanvasDimensions, resolveSlideVariables, normalizeColorVariant, isRecord, hasContentVariables, isTemplate, instantiateForValidation, layoutTemplateIssues, resolveScriptFonts, defaultSlideBackground, catalogReferenceSites, parseReference, catalogGroupDeclared, pointerPath, unusedDatasets, MAX_COMPOSITION_DEPTH, datasetDiagnostics, pathFor, catalogRecords, collectCitations, numberingFindings, walkCitationRuns, resolveTableData, resolveChartOptions, chartOptionTarget, codeHighlightLines, chartNumberFixesByCell, catalogKinds, catalogGroupSource, registeredCatalog, OPFCompositionError, composeSlide } from './chunk-2CUCYENF.js';
 import { schemaEngine } from '#schema-engine';
 import { parseTree, printParseErrorCode, getNodePath } from 'jsonc-parser';
 
@@ -1572,7 +1572,7 @@ var formatRules = [
     "error",
     "The document breaks the OPF schema or a structural rule the schema cannot express.",
     "The schema is the contract every engine, exporter and editor relies on. A field of the wrong type, a missing required field, an unknown property or content fields that cannot be mixed make the document ambiguous or undrawable.",
-    { standard: SCHEMA, approximations: "All alternatives of a union are reported, with the failing schema location in `validation`. A required variable with no value is reported by `opf/variable-unfilled`, in the same category." }
+    { standard: SCHEMA, approximations: "All alternatives of a union are reported, with the failing schema location in `validation`. A required variable with no value is reported by `opf/variable-unfilled`, in the same category. A chart written in the Chart.js or ECharts shape (`categories` and `series`, or `labels` and `datasets`, and no `data`) is one finding on the chart whose hint shows its own values as `data: { columns, rows }`, with a patch fix; the additional-property findings that repeat it are dropped." }
   ),
   rule("reference-id-duplicate", "format", "error", "Two references share an id.", "A citation names a reference by id; a repeated id makes it ambiguous which entry is cited.", { standard: SCHEMA }),
   rule("cite-unknown-reference", "format", "error", "A citation names a reference that does not exist.", "A cited id with no entry in `references` has nothing to show in the footnote area.", { standard: SCHEMA }),
@@ -1654,7 +1654,7 @@ var referenceRules = [
     "warning",
     "A content reference resolves nowhere.",
     "A layout, theme, colour scheme, font scheme, narrative, audience, purpose or tone reference that neither the document embeds nor a registered catalog defines falls back: a slide composes automatically, a design uses the engine default. A strict export fails instead. A slide with no layout is automatic composition and is never reported.",
-    { standard: SCHEMA, approximations: "Resolved like every engine resolves it: catalogs.custom, then the records embedded under catalogs.default, then the catalog registered for its source (the first registered catalog when `default` is omitted); `name:id` in catalogs.<name>, then the catalog registered for its source. Nothing is fetched. Free-form audience and purpose text is not a reference." }
+    { standard: SCHEMA, approximations: 'Resolved like every engine resolves it: catalogs.custom, then the records embedded under catalogs.default, then the catalog registered for its source (the first registered catalog when `default` is omitted); `name:id` in catalogs.<name>, then the catalog registered for its source. Nothing is fetched. Free-form audience and purpose text is not a reference. It is a warning, not an error, because catalogs are open and a host may register the id; `--fail-on warning` is the check that a deck is done. With a catalog registered, the hint names the nearest records that exist ("Did you mean `two-column`?").' }
   ),
   rule(
     "catalog-record-not-in-source",
@@ -1772,7 +1772,7 @@ var readingOrderRule = rule(
   {
     standard: 'WCAG 2.2 SC 1.3.2 Meaningful Sequence, level A (PowerPoint: "Check reading order")',
     cost: "composition",
-    approximations: "Compares the composed content order with a visual order recomputed from the composed boxes: items whose vertical centres fall in the same row are ordered along the reading direction (a right-to-left deck is checked by rows only), rows from top to bottom. Headings are expected first. Free-form overlap is not analysed. On a slide with a template layout (OPF 0.19) the expected order is the binding order instead (the regions in reading order, then the blocks of each region), and items outside a region (placed images, the row below the grid) are not compared."
+    approximations: "Compares the composed content order with a visual order recomputed from the composed boxes: items whose vertical centres fall in the same row are ordered along the reading direction (a right-to-left deck is checked by rows only), rows from top to bottom. Headings are expected first. Content drawn entirely above the title, over the columns of the title, is reported; content in a column beside the title is read after it. Free-form overlap is not analysed. On a slide with a template layout (OPF 0.19) the expected order is the binding order instead (the regions in reading order, then the blocks of each region), and items outside a region (placed images, the row below the grid) are not compared."
   }
 );
 var linkRule = rule(
@@ -2305,8 +2305,9 @@ var readingOrderRules = [
         if (!composition) continue;
         const body = composition.items.filter((item) => !["title", "subtitle", "tag"].includes(item.field));
         const title = composition.items.find((item) => item.field === "title");
-        if (title && body.some((item) => item.box.y + item.box.height <= title.box.y + 1)) {
-          const above = body.find((item) => item.box.y + item.box.height <= title.box.y + 1);
+        const isAbove = (item) => item.box.y + item.box.height <= title.box.y + 1 && item.box.x < title.box.x + title.box.width && title.box.x < item.box.x + item.box.width;
+        if (title && body.some(isAbove)) {
+          const above = body.find(isAbove);
           context.report(readingOrderRule, {
             path: pointerOfDotted(above.path),
             slide,
@@ -2845,6 +2846,60 @@ var layoutContentRules = [
 // src/validation-rules.ts
 var ruleImplementations = [...accessibilityRules, ...layoutContentRules, ...languageTagRules];
 
+// src/chart-shape.ts
+var FOREIGN_CHART_KEYS = ["categories", "series", "labels", "datasets"];
+var CHART_DEFINITION = "https://openpresentation.org/schema/opf/v1#/$defs/Chart";
+var isRecord2 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isCell = (value) => value === null || ["string", "number", "boolean"].includes(typeof value);
+function foreignChartKeys(chart) {
+  if (!isRecord2(chart) || Object.hasOwn(chart, "data")) return [];
+  return FOREIGN_CHART_KEYS.filter((key2) => Object.hasOwn(chart, key2));
+}
+function convertChartData(chart) {
+  const labels = chart.categories ?? chart.labels;
+  const series = chart.series ?? chart.datasets;
+  if (!Array.isArray(labels) || !labels.length || !labels.every(isCell) || !Array.isArray(series) || !series.length) return void 0;
+  const columns = ["Category"];
+  const values = [];
+  for (const [index, entry2] of series.entries()) {
+    if (!isRecord2(entry2)) return void 0;
+    const list = entry2.values ?? entry2.data;
+    const name = entry2.name ?? entry2.label;
+    if (!Array.isArray(list) || list.length !== labels.length || !list.every(isCell)) return void 0;
+    columns.push(typeof name === "string" && name ? name : `Series ${index + 1}`);
+    values.push(list);
+  }
+  if (new Set(columns).size !== columns.length) return void 0;
+  return { columns, rows: labels.map((label, row) => [label, ...values.map((list) => list[row])]) };
+}
+function chartShapePatch(chart, path) {
+  if (!isRecord2(chart)) return void 0;
+  const data = convertChartData(chart);
+  const keys = foreignChartKeys(chart);
+  if (!data || !keys.length) return void 0;
+  return [{ op: "add", path: `${path}/data`, value: data }, ...keys.map((key2) => ({ op: "remove", path: `${path}/${key2}` }))];
+}
+var SHOWN_ROWS = 3;
+var json = (value) => JSON.stringify(value);
+function dataExample(chart) {
+  const data = convertChartData(chart);
+  if (!data) return '"data": { "columns": ["Category", "Series name"], "rows": [["Q1", 3], ["Q2", 8]] }';
+  const rows = data.rows.slice(0, SHOWN_ROWS).map(json);
+  return `"data": { "columns": ${json(data.columns)}, "rows": [${rows.join(",")}${data.rows.length > SHOWN_ROWS ? ",..." : ""}] }`;
+}
+function chartShapeHelp(chart) {
+  const keys = foreignChartKeys(chart);
+  if (!keys.length || !isRecord2(chart)) return void 0;
+  const names2 = keys.map((key2) => `"${key2}"`).join(" and ");
+  const example = dataExample(chart);
+  const next = `replace ${names2} with ${example}. The first column holds the category labels and each further column is one series.`;
+  return {
+    message: `The chart has ${names2} (the Chart.js and ECharts shape), but an OPF chart keeps its values in "data": { "columns", "rows" }.`,
+    next,
+    help: `OPF charts use "data": { "columns", "rows" }, not ${names2}. Replace ${names2} with ${example}; the first column holds the category labels and each further column is one series. See the Chart definition: ${CHART_DEFINITION} (opf schema presentation '/$defs/Chart').`
+  };
+}
+
 // src/check-document.ts
 var own = (value, key2) => Object.hasOwn(value, key2);
 var object = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
@@ -3167,12 +3222,42 @@ var HELP = {
   "numbering-start-ignored": "Add a 'numbering' field to the payload, or remove 'start'.",
   "slide-size-out-of-range": "Use a custom widthInches and heightInches between 1 and 56, or a preset. PowerPoint stores the slide size in 914400 to 51206400 EMU per side."
 };
+function collapseChartShape(document, findings) {
+  const chartAt = (path) => {
+    let node = document;
+    for (const segment of splitPointer(path)) node = Array.isArray(node) ? node[Number(segment)] : isRecord(node) ? node[segment] : void 0;
+    return node;
+  };
+  const collapsed = /* @__PURE__ */ new Set();
+  for (const [index, entry2] of findings.entries()) {
+    if (entry2.ruleId !== "opf/schema" || entry2.validation?.keyword !== "required" || entry2.validation.params.missingProperty !== "data") continue;
+    const chart = chartAt(entry2.path);
+    const hint = chartShapeHelp(chart);
+    if (!hint) continue;
+    const patch2 = chartShapePatch(chart, entry2.path);
+    findings[index] = {
+      ...entry2,
+      message: hint.message,
+      help: hint.help,
+      ...patch2 ? { fixes: [{ id: "convert-chart-data", title: "Convert to data: { columns, rows }", kind: "patch", safe: false, patch: patch2 }] } : {}
+    };
+    collapsed.add(entry2.path);
+  }
+  if (!collapsed.size) return;
+  for (let index = findings.length - 1; index >= 0; index--) {
+    const entry2 = findings[index];
+    if (entry2?.ruleId !== "opf/schema" || entry2.validation?.keyword !== "additionalProperties") continue;
+    const at2 = entry2.path.lastIndexOf("/");
+    if (collapsed.has(entry2.path.slice(0, at2)) && FOREIGN_CHART_KEYS.includes(entry2.path.slice(at2 + 1))) findings.splice(index, 1);
+  }
+}
 function engineFindings(document, engine, enabled) {
   const findings = [];
   for (const issue2 of engine.errors) {
     const ruleId = issueRuleId(issue2);
     if (enabled(ruleId)) findings.push(issueFinding(issue2, ruleId));
   }
+  collapseChartShape(document, findings);
   let numberFixes;
   for (const issue2 of engine.warnings) {
     const code2 = issue2.params.code;
@@ -3274,6 +3359,13 @@ function undeclaredCatalogFindings(document) {
   }
   return findings;
 }
+var KIND_PLURAL = { layouts: "layouts", themes: "themes", colorSchemes: "color schemes", fontSchemes: "font schemes", narratives: "narratives", audiences: "audiences", purposes: "purposes", tones: "tones" };
+function nearestRecords(kind, reference, candidates) {
+  if (!candidates.length) return "";
+  const close = candidates.filter((value) => distance(reference, value) <= Math.max(2, Math.floor(reference.length / 4))).slice(0, 3);
+  const quote = (values) => values.map((value) => `'${value}'`).join(", ");
+  return close.length ? `Did you mean ${quote(close)}? ` : `The nearest ${KIND_PLURAL[kind]} that exist: ${quote(candidates.slice(0, 3))}. `;
+}
 function contentReferenceFindings(document, options2, findings) {
   const invalid = embeddedRecordFindings(document, options2, findings);
   const registeredChecked = /* @__PURE__ */ new Set();
@@ -3294,7 +3386,7 @@ function contentReferenceFindings(document, options2, findings) {
       finding("opf/unresolved-reference", {
         path,
         message: diagnostic.message,
-        help: site.kind === "layouts" ? "Embed the layout record (embed(), or opf embed), register the catalog that defines it, choose one of the suggested layouts, or remove the reference to compose the slide automatically." : "Embed the record (embed(), or opf embed), register the catalog that defines it, or choose one of the suggested records.",
+        help: `${nearestRecords(site.kind, site.reference, suggestions.map((entry2) => entry2.value))}${site.kind === "layouts" ? "Embed the layout record (embed(), or opf embed), register the catalog that defines it, choose one of the suggested layouts, or remove the reference to compose the slide automatically." : "Embed the record (embed(), or opf embed), register the catalog that defines it, or choose one of the suggested records."}`,
         definition: `${schemas.presentation.$id}#/$defs/Catalogs`,
         lookup: ["opf", "catalog", site.kind],
         suggestions
@@ -5724,12 +5816,12 @@ function asNext(text2) {
   const trimmed = text2.trim();
   return /^[A-Z][a-z]/.test(trimmed) ? trimmed.charAt(0).toLowerCase() + trimmed.slice(1) : trimmed;
 }
-var isRecord2 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+var isRecord3 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 function readAt(document, segments) {
   let value = document;
   for (const segment of segments) {
     if (Array.isArray(value)) value = value[Number(segment)];
-    else if (isRecord2(value)) value = value[segment];
+    else if (isRecord3(value)) value = value[segment];
     else return void 0;
   }
   return value;
@@ -5794,11 +5886,11 @@ function dotted(segments) {
 }
 function keysAt(helpers, path) {
   const value = helpers.valueAt(path);
-  return isRecord2(value) ? Object.keys(value) : [];
+  return isRecord3(value) ? Object.keys(value) : [];
 }
 function idsAt(helpers, path) {
   const value = helpers.valueAt(path);
-  return Array.isArray(value) ? value.flatMap((entry2) => isRecord2(entry2) && typeof entry2.id === "string" ? [entry2.id] : []) : [];
+  return Array.isArray(value) ? value.flatMap((entry2) => isRecord3(entry2) && typeof entry2.id === "string" ? [entry2.id] : []) : [];
 }
 function codeList(names2, max = 5, joiner = "and") {
   const shown = names2.slice(0, max).map(code);
@@ -5839,7 +5931,7 @@ function freshName(base, taken = []) {
 }
 var BLOCK_KINDS = ["chart", "image", "video", "table", "code", "metric", "quote", "timeline", "items", "bullets", "text"];
 function blockKind(node) {
-  if (!isRecord2(node)) return void 0;
+  if (!isRecord3(node)) return void 0;
   if (typeof node.type === "string" && node.type !== "group") return node.type;
   const found = BLOCK_KINDS.find((key2) => node[key2] !== void 0);
   if (found === "items" || found === "bullets") return "list";
@@ -6048,13 +6140,13 @@ function regionNamesOf(slideLayout, helpers) {
   const colon = slideLayout.indexOf(":");
   const group = colon > 0 ? slideLayout.slice(0, colon) : void 0;
   const id = colon > 0 ? slideLayout.slice(colon + 1) : slideLayout;
-  const record = (group ? [group] : ["custom", "default"]).map((name) => helpers.valueAt(["catalogs", name, "layouts", id])).find(isRecord2);
+  const record = (group ? [group] : ["custom", "default"]).map((name) => helpers.valueAt(["catalogs", name, "layouts", id])).find(isRecord3);
   if (!record) return void 0;
   const names2 = [];
   const walk2 = (list) => {
     if (!Array.isArray(list)) return;
     for (const entry2 of list) {
-      if (!isRecord2(entry2)) continue;
+      if (!isRecord3(entry2)) continue;
       if (typeof entry2.name === "string" && !["title", "subtitle", "tag"].includes(entry2.name)) names2.push(entry2.name);
       walk2(entry2.regions);
     }
@@ -6168,7 +6260,7 @@ var codeHighlightRangeReversed = (finding2) => {
   };
 };
 var variableBuiltinMissing = (finding2, _context, helpers) => {
-  const idParam = isRecord2(finding2.validation?.params) ? finding2.validation.params.id : void 0;
+  const idParam = isRecord3(finding2.validation?.params) ? finding2.validation.params.id : void 0;
   const id = (typeof idParam === "string" ? idParam : void 0) ?? match(finding2.message, /^Built-in '(.+?)' has no value/)?.[1] ?? match(finding2.message, /'\{\{(.+?)\}\}'/)?.[1];
   if (!id) return void 0;
   const root = id.split(".")[0];
@@ -6190,7 +6282,7 @@ var durationOutsideNarrative2 = (finding2) => {
 };
 var narrativeDurationRange = (_finding, _context, helpers) => {
   const range = helpers.valueAt(helpers.segments);
-  if (isRecord2(range) && typeof range.min === "number" && typeof range.max === "number") {
+  if (isRecord3(range) && typeof range.min === "number" && typeof range.max === "number") {
     return {
       message: `The duration range has min ${range.min} greater than max ${range.max}.`,
       next: `swap them: ${code(`min: ${range.max}`)} and ${code(`max: ${range.min}`)}.`
@@ -6283,7 +6375,7 @@ var AUDIT_TEXT = {
 };
 
 // src/finding-text-format.ts
-var params = (finding2) => isRecord2(finding2.validation?.params) ? finding2.validation.params : {};
+var params = (finding2) => isRecord3(finding2.validation?.params) ? finding2.validation.params : {};
 var text = (value) => typeof value === "string" ? value : void 0;
 var jsonSyntax = (finding2) => ({
   message: keep(finding2.message),
@@ -6404,7 +6496,7 @@ var dataColumnDuplicate = (finding2, _context, helpers) => {
   const name = unquote(match(finding2.message, /^column name ("(?:[^"\\]|\\.)*") is used by an earlier column/)?.[1]);
   if (!name) return void 0;
   const columns = helpers.valueAt(helpers.segments.slice(0, -1));
-  const taken = Array.isArray(columns) ? columns.map((entry2) => isRecord2(entry2) ? String(entry2.name) : String(entry2)) : [];
+  const taken = Array.isArray(columns) ? columns.map((entry2) => isRecord3(entry2) ? String(entry2.name) : String(entry2)) : [];
   return {
     message: `Two columns are named ${code(name)}. Series and mappings address columns by name.`,
     next: `rename the second one (for example ${code(freshName(name, taken))}).`
@@ -6682,7 +6774,7 @@ var unresolvedReference2 = (finding2, _context, helpers) => {
   const group = colon > 0 ? reference.slice(0, colon) : void 0;
   const bare = colon > 0 ? reference.slice(colon + 1) : reference;
   const embeddedIn = group ? [group] : ["custom", "default"];
-  const embedded = kind && embeddedIn.some((name) => isRecord2(helpers.valueAt(["catalogs", name, kind, bare])));
+  const embedded = kind && embeddedIn.some((name) => isRecord3(helpers.valueAt(["catalogs", name, kind, bare])));
   const suggestions = (finding2.suggestions ?? []).slice(0, 5).map((entry2) => String(entry2.value));
   if (embedded) {
     return {
@@ -7047,6 +7139,8 @@ function describeSchema(finding2, context, helpers) {
     case "required": {
       const property = String(params2.missingProperty ?? "");
       const where = containerName(segments);
+      const shape = property === "data" ? chartShapeHelp(actual) : void 0;
+      if (shape) return { message: shape.message, next: shape.next };
       const schema = context.schemaAt ? context.schemaAt([...segments, property]) : attempt(() => schemaAtPath(context.document, [...segments, property]), void 0);
       if (format === "json") {
         const sample2 = property === "slides" ? '[ { "title": "\u2026" } ]' : starterText(schema, property, "json");
@@ -7187,7 +7281,7 @@ function schemaFixes(finding2, document) {
   switch (validation.keyword) {
     case "required": {
       const property = String(params2.missingProperty ?? "");
-      if (!property || !isRecord2(readAt(document, segments)) || Object.hasOwn(readAt(document, segments), property)) return [];
+      if (!property || !isRecord3(readAt(document, segments)) || Object.hasOwn(readAt(document, segments), property)) return [];
       const value = starterValue(document, segments, property);
       if (value === void 0) return [];
       return [patch(`add:${property}`, `Add \`${property}\``, [{ op: "add", path: pointerOf([...segments, property]), value }])];
@@ -7203,7 +7297,7 @@ function schemaFixes(finding2, document) {
       const name = String(params2.additionalProperty ?? segments.at(-1) ?? "");
       const parent = segments.slice(0, -1);
       const owner = readAt(document, parent);
-      if (!name || !isRecord2(owner) || !Object.hasOwn(owner, name)) return [];
+      if (!name || !isRecord3(owner) || !Object.hasOwn(owner, name)) return [];
       const fixes = [];
       for (const suggestion of finding2.suggestions ?? []) {
         const target = String(suggestion.value);
@@ -7212,14 +7306,14 @@ function schemaFixes(finding2, document) {
       if (allowsKey(document, parent, "extensions") && name !== "extensions") {
         const existing = owner.extensions;
         if (existing === void 0) fixes.push(patch("move-to-extensions", "Move into extensions", [{ op: "add", path: pointerOf([...parent, "extensions"]), value: {} }, { op: "move", from: finding2.path, path: pointerOf([...parent, "extensions", name]) }]));
-        else if (isRecord2(existing) && !Object.hasOwn(existing, name)) fixes.push(patch("move-to-extensions", "Move into extensions", [{ op: "move", from: finding2.path, path: pointerOf([...parent, "extensions", name]) }]));
+        else if (isRecord3(existing) && !Object.hasOwn(existing, name)) fixes.push(patch("move-to-extensions", "Move into extensions", [{ op: "move", from: finding2.path, path: pointerOf([...parent, "extensions", name]) }]));
       }
       return fixes;
     }
     case "type": {
       const current = readAt(document, segments);
       if (current === void 0) return [];
-      if (params2.type === "array" && (typeof current === "string" || isRecord2(current))) return [patch("wrap-in-list", "Wrap in a list", [{ op: "replace", path: finding2.path, value: [current] }], typeof current === "string")];
+      if (params2.type === "array" && (typeof current === "string" || isRecord3(current))) return [patch("wrap-in-list", "Wrap in a list", [{ op: "replace", path: finding2.path, value: [current] }], typeof current === "string")];
       if (params2.type === "string" && (typeof current === "number" || typeof current === "boolean")) return [patch("convert-to-string", "Convert to string", [{ op: "replace", path: finding2.path, value: String(current) }], true)];
       return [];
     }
@@ -7238,6 +7332,30 @@ function schemaFixes(finding2, document) {
   }
 }
 
+// src/drawn-font-families.ts
+function resolveDrawnFontFamilies(families, measurement, keepsName) {
+  const resolve2 = measurement?.resolveStyle;
+  if (typeof resolve2 !== "function") return families;
+  const drawn = { ...families };
+  for (const role of ["heading", "body", "code", "accent"]) {
+    const named = families[role];
+    if (typeof named !== "string" || !named) continue;
+    try {
+      const resolved = resolve2.call(measurement, { fontFamily: named, fontWeight: role === "heading" ? 700 : 400 });
+      let keep3;
+      if (keepsName) keep3 = keepsName(named, resolved.fontFamily);
+      else {
+        const regular = role === "heading" ? resolve2.call(measurement, { fontFamily: named, fontWeight: 400 }) : resolved;
+        const encoded = resolved.symbolEncoding != null;
+        keep3 = encoded || regular.fontWeight !== void 0 && regular.fontWeight !== 400 && resolved.fontFamily.toLowerCase() !== named.toLowerCase();
+      }
+      if (!keep3) drawn[role] = resolved.fontFamily;
+    } catch {
+    }
+  }
+  return drawn;
+}
+
 // src/script-measurement.ts
 function scriptProfile(presentation, slideIndex, options2, language) {
   let resolved;
@@ -7390,7 +7508,12 @@ function buildSlides(document, options2) {
     const layout = lazy(() => resolved().options.layout);
     const composed = lazy(() => {
       const result = { layoutDiagnostics: [] };
-      const compose = (input, withLayout) => composeSlide(input, { ...resolved().options, layout: withLayout });
+      let fontFamilies;
+      const compose = (input, withLayout) => {
+        const options3 = resolved().options;
+        fontFamilies ??= options3.fontFamilies && resolveDrawnFontFamilies(options3.fontFamilies, options3.textMeasurement);
+        return composeSlide(input, { ...options3, ...fontFamilies ? { fontFamilies } : {}, layout: withLayout });
+      };
       try {
         result.composition = compose(resolved().slide, layout());
         result.layoutDiagnostics.push(...result.composition.diagnostics.map((diagnostic) => ({ diagnostic, strict: false })));
@@ -7708,4 +7831,4 @@ function assertValidCatalogRecord(kind, value) {
   if (!report2.valid) throw new OPFValidationError(report2);
 }
 
-export { BLOCK_AS_VALUES, BLOCK_OPTION_KEYS, CATALOG_SCHEMA, COMMON_KEYS, DEFAULT_VALIDATION_THRESHOLDS, FENCE_ATTRIBUTES, FENCE_KINDS, LINE_KEYWORDS, METRIC_KEYS, OPFPatchError, OPFPatchHashError, OPFPatchValidationError, OPFValidationError, PATTERN_PHRASES, SLIDE_OPTION_KEYS, SOURCE_EXPLAIN, SPAN_FLAGS, SPAN_VALUES, UNRANKED_PRIORITY, activeSchema, analyzeJsonSyntax, applyPatch, applyPatchWithInverse, applyTextEdits, assertValid, assertValidCatalogRecord, catalogDisplayKinds, catalogKindAt, catalogSchemaNames, createLocator, createSchemaValue, describeField, describeFinding, distance2 as distance, documentHash, escapePointerToken, findValidationRule, formatPointer, getAtPointer, hasPointer, idToken, invertPatch, isIdToken, isPromotedRegionKey, jsonEqual, listSchemaFields, nearest, normalizePatch, parsePointer, parseSource, pointerFromPath, readPointer, rememberByText, resolveIdPatch, resolveIdPointer, resolveSchema, resolveSlideContext, resolveSlideScriptMeasurement, ruleDocumentation, schemaAtPath, schemaCatalogKinds, schemaLabel, schemaType, schemaVariants, segmentsOf, splitOpfPath, splitPointer2 as splitPointer, starterValue, toIdPatch, toIdPointer, unescapePointerToken, us, validate, validateCatalogRecord, validationCategories, validationRules, walkPatch };
+export { BLOCK_AS_VALUES, BLOCK_OPTION_KEYS, CATALOG_SCHEMA, COMMON_KEYS, DEFAULT_VALIDATION_THRESHOLDS, FENCE_ATTRIBUTES, FENCE_KINDS, LINE_KEYWORDS, METRIC_KEYS, OPFPatchError, OPFPatchHashError, OPFPatchValidationError, OPFValidationError, PATTERN_PHRASES, SLIDE_OPTION_KEYS, SOURCE_EXPLAIN, SPAN_FLAGS, SPAN_VALUES, UNRANKED_PRIORITY, activeSchema, analyzeJsonSyntax, applyPatch, applyPatchWithInverse, applyTextEdits, assertValid, assertValidCatalogRecord, catalogDisplayKinds, catalogKindAt, catalogSchemaNames, createLocator, createSchemaValue, describeField, describeFinding, distance2 as distance, documentHash, escapePointerToken, findValidationRule, formatPointer, getAtPointer, hasPointer, idToken, invertPatch, isIdToken, isPromotedRegionKey, jsonEqual, listSchemaFields, nearest, normalizePatch, parsePointer, parseSource, pointerFromPath, readPointer, rememberByText, resolveDrawnFontFamilies, resolveIdPatch, resolveIdPointer, resolveSchema, resolveSlideContext, resolveSlideScriptMeasurement, ruleDocumentation, schemaAtPath, schemaCatalogKinds, schemaLabel, schemaType, schemaVariants, segmentsOf, splitOpfPath, splitPointer2 as splitPointer, starterValue, toIdPatch, toIdPointer, unescapePointerToken, us, validate, validateCatalogRecord, validationCategories, validationRules, walkPatch };

package/dist/{chunk-KZPZRHL6.js → chunk-XZ23FORL.js}

@@ -1,10 +1,10 @@
-import { sortPresentationKeys } from './chunk-O3SA5SJ4.js';
+import { sortPresentationKeys } from './chunk-KELC4K62.js';
 import { NOT_CHECKED } from './chunk-RYZPBJLB.js';
-import { Ctx, describeYamlErrors } from './chunk-SYW4BCGZ.js';
-import { same } from './chunk-ABFDFZIW.js';
-import { validate } from './chunk-PAGVSTVF.js';
-import { presentation } from './chunk-4ZM5G3XX.js';
-import { checkCatalogsOption } from './chunk-LRTQXGJO.js';
+import { Ctx, describeYamlErrors } from './chunk-SEZ4EPW6.js';
+import { same } from './chunk-TNUTRV6E.js';
+import { validate } from './chunk-WPKCWQ6W.js';
+import { presentation } from './chunk-5Q4IYLMW.js';
+import { checkCatalogsOption } from './chunk-2CUCYENF.js';
 import { Parser, parseDocument, isMap, isSeq, Document, visit, isScalar, isAlias } from 'yaml';
 
 var MAX_ALIAS_COUNT = 100;