@openpresentation/opf 0.16.0 → 0.18.1

package/dist/{chunk-PX5AWL7Y.js → chunk-JT3QXA22.js}

@@ -1,7 +1,7 @@
-import { promotedRegionKeys, VARIABLE_KINDS, resolveChartData, chartPaletteForFill, imageBackground, tableGrid, timelineTextColor, visitContentPayloads, readingRows, visualReadingOrder, intrinsicImageSize, textWidthMeasurer, normalizeHexColor, resolveColorRef, resolveDesignRecords, resolveColorRoles, resolveFontFamilies, resolveCanvasDimensions, defaultSlideBackground, isRecord, hasContentVariables, isTemplate, instantiateForValidation, unusedDatasets, MAX_COMPOSITION_DEPTH, datasetDiagnostics, pathFor, collectCitations, numberingFindings, walkCitationRuns, resolveTableData, resolveChartOptions, chartOptionTarget, codeHighlightLines, chartNumberFixesByCell, MAX_PLACEHOLDER_GROUP_DEPTH, OPFCompositionError, composeSlide, resolveScriptFonts } from './chunk-5PDN7BN6.js';
+import { promotedRegionKeys, VARIABLE_KINDS, resolveChartData, chartPaletteForFill, imageBackground, tableGrid, timelineTextColor, LOGO_SHAPES, visitContentPayloads, readingRows, visualReadingOrder, intrinsicImageSize, textWidthMeasurer, normalizeHexColor, resolveColorRef, resolveDesignRecords, resolveFontFamilies, resolveColorRoles, resolveCanvasDimensions, resolveSlideVariables, defaultSlideBackground, isRecord, hasContentVariables, isTemplate, instantiateForValidation, resolveScriptFonts, unusedDatasets, MAX_COMPOSITION_DEPTH, datasetDiagnostics, pathFor, collectCitations, numberingFindings, walkCitationRuns, resolveTableData, resolveChartOptions, chartOptionTarget, codeHighlightLines, chartNumberFixesByCell, MAX_PLACEHOLDER_GROUP_DEPTH, OPFCompositionError, composeSlide } from './chunk-MBU42S5Y.js';
 import { catalogSchemaNames } from './chunk-TRDXRRQK.js';
 import { resolveReference, checkCatalogsOption, provenanceOf, unresolvedReference, OPFUnresolvedReferenceError, catalogReferenceSites, parseReference, catalogGroupDeclared, pointerPath, catalogRecords, catalogKinds, catalogGroupSource, registeredCatalog } from './chunk-SPFV27O5.js';
-import { schemaEntries, schemas } from './chunk-WEDGVC5W.js';
+import { schemaEntries, schemas } from './chunk-6WW2EDUW.js';
 import Ajv2020 from 'ajv/dist/2020.js';
 import addFormats from 'ajv-formats';
 import { parseTree, printParseErrorCode, getNodePath } from 'jsonc-parser';
@@ -1364,26 +1364,20 @@ var sourceOfAsset = (value) => {
   const source = typeof value === "string" ? value : rec(value).src;
   return typeof source === "string" ? source : void 0;
 };
-var LOGO_VARIANTS = ["default", "light", "dark", "stacked", "stackedLight", "stackedDark", "icon", "iconLight", "iconDark", "wordmark", "wordmarkLight", "wordmarkDark"];
+var isLogoReference = (value) => typeof value === "string" && value.startsWith("var:organization.");
 function assetRefs(document, slide, slidePath, includeDeck) {
   const out = [];
   for (const payload of slidePayloads(slide, slidePath)) {
     const at2 = (...tail) => pointer2(...splitPointer(payload.path), ...tail);
-    if (payload.node.image !== void 0) out.push({ path: at2("image"), value: payload.node.image, kind: "image" });
+    if (payload.node.image !== void 0 && !isLogoReference(payload.node.image)) out.push({ path: at2("image"), value: payload.node.image, kind: "image" });
     if (payload.node.video !== void 0) out.push({ path: at2("video"), value: payload.node.video, kind: "video" });
     if (rec(payload.node.quote).photo !== void 0) out.push({ path: at2("quote", "photo"), value: rec(payload.node.quote).photo, kind: "quote-photo" });
   }
   const designRefs = (design, base) => {
-    const logo = design.logo;
-    if (typeof logo === "string" || logo && typeof logo.src === "string") out.push({ path: `${base}/logo`, value: logo, kind: "logo" });
-    else if (logo && typeof logo === "object") {
-      for (const variant of LOGO_VARIANTS)
-        if (logo[variant] !== void 0) out.push({ path: `${base}/logo/${variant}`, value: logo[variant], kind: "logo" });
-    }
     for (const kind of ["header", "footer"])
       for (const zone of ["left", "center", "right"]) {
         const item = rec(rec(design[kind])[zone]);
-        if (item.image !== void 0) out.push({ path: `${base}/${kind}/${zone}/image`, value: item.image, kind: "furniture" });
+        if (item.image !== void 0 && !isLogoReference(item.image)) out.push({ path: `${base}/${kind}/${zone}/image`, value: item.image, kind: "furniture" });
       }
   };
   designRefs(rec(slide.design), `${slidePath}/design`);
@@ -1391,12 +1385,19 @@ function assetRefs(document, slide, slidePath, includeDeck) {
     designRefs(rec(document.design), "/design");
     const organizations = Array.isArray(document.organization) ? document.organization : document.organization ? [document.organization] : [];
     organizations.forEach((organization, index) => {
-      if (organization?.logo !== void 0)
-        out.push({
-          path: Array.isArray(document.organization) ? `/organization/${index}/logo` : "/organization/logo",
-          value: organization.logo,
-          kind: "organization"
-        });
+      const logo = organization?.logo;
+      if (logo === void 0) return;
+      const base = Array.isArray(document.organization) ? `/organization/${index}/logo` : "/organization/logo";
+      if (typeof logo === "string" || logo && typeof logo === "object" && "src" in logo) {
+        out.push({ path: base, value: logo, kind: "organization" });
+        return;
+      }
+      for (const shape of LOGO_SHAPES) {
+        const entry = rec(logo)[shape];
+        if (entry === void 0) continue;
+        if (typeof entry === "string" || entry && typeof entry === "object" && "src" in entry) out.push({ path: `${base}/${shape}`, value: entry, kind: "organization" });
+        else for (const tone of ["onLight", "onDark"]) if (rec(entry)[tone] !== void 0) out.push({ path: `${base}/${shape}/${tone}`, value: rec(entry)[tone], kind: "organization" });
+      }
     });
     const speakers = Array.isArray(document.speaker) ? document.speaker : document.speaker ? [document.speaker] : [];
     speakers.forEach((speaker, index) => {
@@ -1601,7 +1602,7 @@ var altRule = rule(
   'People using a screen reader get nothing for a picture without alternative text. A picture that is purely decorative should say so with an empty alt (alt: ""), which is an explicit, reviewed choice instead of an omission.',
   {
     standard: "WCAG 2.2 SC 1.1.1 Non-text Content, level A",
-    approximations: "Checks the alt field of images (image blocks, Slide.image and region images, placed or not), video, logos (design.logo and each LogoSet variant, organization.logo), header/footer images, quote photos and speaker photos, following asset: references to the assets registry. Whether the text describes the picture well is not judged here (see opf/poor-alt-text). Charts carry `chart.alt` and are checked by opf/chart-text-alternative. Picture backgrounds are decorative unless they carry their own alt, and watermarks are decorative, so neither is checked."
+    approximations: "Checks the alt field of images (image blocks, Slide.image and region images, placed or not), video, organization logos (each shape and background), header/footer images (a logo reference such as var:organization.logo.icon is checked on the organization), quote photos and speaker photos, following asset: references to the assets registry. Whether the text describes the picture well is not judged here (see opf/poor-alt-text). Charts carry `chart.alt` and are checked by opf/chart-text-alternative. Picture backgrounds are decorative unless they carry their own alt, and watermarks are decorative, so neither is checked."
   }
 );
 var poorAltRule = rule(
@@ -1615,7 +1616,7 @@ var poorAltRule = rule(
 var GENERIC_ALT = /^(image|picture|photo|photograph|graphic|img|icon|figure|screenshot|untitled|alt|alt text|logo)$/i;
 var FILE_ALT = /(\.(png|jpe?g|gif|svg|webp|bmp|tiff?|heic|avif)$)|^(img|dsc|image|screenshot|screen shot|photo|pic)[ _-]?\d+/i;
 var GENERIC_CHART_ALT = /^((a|an|the)\s+)?([a-z-]+\s+){0,2}(chart|graph|plot|diagram|figure)$/i;
-var kindLabel = (kind) => ({ chart: "Chart", image: "Image", video: "Video", logo: "Logo", furniture: "Header/footer image", speaker: "Speaker photo", "quote-photo": "Quote photo", organization: "Organization logo" })[kind] ?? "Picture";
+var kindLabel = (kind) => ({ chart: "Chart", image: "Image", video: "Video", furniture: "Header/footer image", speaker: "Speaker photo", "quote-photo": "Quote photo", organization: "Organization logo" })[kind] ?? "Picture";
 function altFixes(path, value) {
   const decorative = typeof value === "string" ? { id: "mark-decorative", title: "Mark as decorative (empty alt)", kind: "patch", safe: false, patch: [{ op: "replace", path, value: { src: value, alt: "" } }] } : { id: "mark-decorative", title: "Mark as decorative (empty alt)", kind: "patch", safe: false, patch: [{ op: "add", path: `${path}/alt`, value: "" }] };
   return [{ id: "focus-alt", title: "Write alt text", kind: "focus", safe: true, focus: { path, field: "alt", value } }, decorative];
@@ -1634,12 +1635,12 @@ var altRules = [
           if (alt !== void 0 && alt.trim() !== "") continue;
           if (alt === "") continue;
           const hasText = alt !== void 0;
-          const organization = ref.kind === "organization" || ref.kind === "logo" ? rec(Array.isArray(context.document.organization) ? context.document.organization[0] : context.document.organization).name : void 0;
+          const organization = ref.kind === "organization" ? rec(Array.isArray(context.document.organization) ? context.document.organization[0] : context.document.organization).name : void 0;
           context.report(altRule, {
             path: ref.path,
             slide: ref.path.startsWith("/slides/") ? slide : void 0,
             message: `${kindLabel(ref.kind)} has ${hasText ? "blank" : "no"} alt text.`,
-            help: `Describe what the ${ref.kind === "logo" || ref.kind === "organization" ? "logo shows" : "picture shows or why it is here"}${typeof organization === "string" ? ` (for a logo, the organization name, ${organization}, is usually right)` : ""}, or set alt to "" if it is purely decorative.`,
+            help: `Describe what the ${ref.kind === "organization" ? "logo shows" : "picture shows or why it is here"}${typeof organization === "string" ? ` (for a logo, the organization name, ${organization}, is usually right)` : ""}, or set alt to "" if it is purely decorative.`,
             fixes: altFixes(ref.path, ref.value)
           });
         }
@@ -2421,7 +2422,7 @@ var formatRules = [
   rule("chart-mapping-unknown-column", "format", "error", "A chart mapping names a column the data does not have.", "The series cannot be built from a column that is not there.", { standard: SCHEMA }),
   rule("number-format-invalid", "format", "error", "A number format cannot be read.", "A format code that no engine can parse is drawn as the plain number or fails to export.", { standard: "Excel number format codes, as far as OPF supports them" }),
   rule("variable-invalid-value", "format", "error", "A variable value does not match its declared type.", "A number variable given text, or a date given a non-date, cannot be filled into the deck.", { standard: SCHEMA }),
-  rule("variable-unknown-builtin", "format", "error", "A token names a built-in variable that does not exist.", "The `deck.`, `speaker.` and `organization.` names (and `speakers`) are reserved for built-in variables; a name under them that is not a built-in can never be filled, so the token would show literally.", { standard: SCHEMA }),
+  rule("variable-unknown-builtin", "format", "error", "A token names a built-in variable that does not exist.", "The `deck.`, `speaker.`, `organization.` and `slide.` names (and `speakers`) are reserved for built-in variables; a name under them that is not a built-in can never be filled, so the token would show literally. The slide-scoped `slide.number`, `slide.section` and `deck.slideCount` are inline tokens only, so `var:slide.*` and `var:deck.slideCount` are reported too; organization logos are whole-field references only (`var:organization.logo.icon`), so a `{{organization.logo}}` token, an unknown logo shape or an unknown organization id is reported.", { standard: SCHEMA }),
   rule("chart-highlight-unknown-name", "format", "error", "A chart highlight names a series or category the chart does not have.", "`chart.highlight` emphasises marks by name; a name that matches no series or category in the chart data highlights nothing, so the chart is not drawn as authored.", { standard: SCHEMA }),
   rule("variable-format", "format", "error", "A variable cannot be formatted.", "A number or date format that does not apply to the value leaves the token unreadable.", { standard: SCHEMA }),
   rule(
@@ -2505,7 +2506,7 @@ var dataRules = [
   rule("chart-highlight-adapted", "content", "warning", "A chart highlight is adapted by the chart type.", "A highlight the chart type cannot show as authored (a category highlight on a chart without categories, for example) is adapted by every engine, so the emphasis is not exactly what was written.", { standard: SCHEMA }),
   rule("code-highlight-out-of-range", "content", "warning", "A code highlight marks a line the code does not have.", "Marked lines count from 1 by line break in code.source; an entry past the last line marks nothing.", { standard: SCHEMA }),
   rule("code-highlight-range-reversed", "content", "warning", "A code highlight range ends before it starts.", "A range written end before start marks nothing; write the smaller line number first.", { standard: SCHEMA }),
-  rule("variable-builtin-missing", "content", "warning", "A built-in variable has no value in this document.", "A `{{deck.*}}`, `{{speaker.*}}` or `{{organization.*}}` token whose field the document does not set resolves to nothing, so the text shows a gap.", { standard: SCHEMA }),
+  rule("variable-builtin-missing", "content", "warning", "A built-in variable has no value in this document.", "A `{{deck.*}}`, `{{speaker.*}}` or `{{organization.*}}` token whose field the document does not set resolves to nothing, so the text shows a gap; a `var:organization.logo` reference to an organization without a logo draws no image. `{{slide.section}}` is checked per slide: a slide without a `section` that uses it, in its own text or in the header or footer it inherits, is reported at that slide.", { standard: SCHEMA }),
   rule("duration-outside-narrative", "content", "warning", "The target duration is outside the range the narrative suits.", "A narrative records the talk lengths it suits. A deck whose duration is outside that range probably needs a different narrative or a different length; nothing is drawn or exported differently.", { standard: SCHEMA }),
   rule("narrative-duration-range", "content", "warning", "An inline narrative duration range has min greater than max.", "A range with its bounds swapped matches no duration, so the duration check cannot help.", { standard: "spec/schemas/narrative.schema.json" })
 ];
@@ -3245,6 +3246,67 @@ function parseSource(source) {
   };
 }
 
+// src/script-measurement.ts
+function scriptProfile(presentation, slideIndex, options, language) {
+  let resolved;
+  try {
+    resolved = resolveScriptFonts(presentation, { slideIndex, ...options.catalogs !== void 0 ? { catalogs: options.catalogs } : {}, ...language === void 0 ? {} : { language } });
+  } catch {
+    resolved = void 0;
+  }
+  const slots = (role) => {
+    const latin = options.fontFamilies[role];
+    const slot = (key) => !resolved || resolved.sources[key] === "latin" || resolved.sources[key] === "schemeFamily" ? latin : resolved[role][key] ?? latin;
+    return { latin, eastAsian: slot("eastAsian"), complexScript: slot("complexScript") };
+  };
+  return {
+    heading: slots("heading"),
+    body: slots("body"),
+    ...resolved?.supplement ? { supplement: resolved.supplement } : {},
+    script: resolved?.script ?? "Zzzz",
+    ...resolved ? { scriptRole: resolved.scriptRole, bcp47: resolved.bcp47, lang: resolved.lang, languageSource: resolved.languageSource, direction: resolved.direction } : {},
+    rtl: resolved?.rtl === true,
+    serif: options.serif
+  };
+}
+function slideScriptMeasurement(presentation, slideIndex, measurement, options) {
+  const forScripts = measurement.forScripts;
+  if (typeof forScripts !== "function") return measurement;
+  const deckProfile = scriptProfile(presentation, slideIndex, options);
+  const deck = forScripts.call(measurement, deckProfile);
+  const languages = /* @__PURE__ */ new Map();
+  const forLanguage = (lang) => {
+    if (typeof lang !== "string" || !lang) return void 0;
+    if (!languages.has(lang)) {
+      let own2;
+      try {
+        const profile = scriptProfile(presentation, slideIndex, options, lang);
+        own2 = profile.languageSource === "option" && profile.bcp47?.toLowerCase() !== deckProfile.bcp47?.toLowerCase() ? forScripts.call(measurement, profile) : void 0;
+      } catch {
+        own2 = void 0;
+      }
+      languages.set(lang, own2);
+    }
+    return languages.get(lang);
+  };
+  const pick = (style) => forLanguage(style?.lang) ?? deck;
+  const scripted = { ...deck, measure: (text, size, style) => pick(style).measure(text, size, style) };
+  if (typeof deck.resolveStyle === "function") scripted.resolveStyle = (style) => deck.resolveStyle.call(deck, style);
+  if (typeof deck.outlineBounds === "function")
+    scripted.outlineBounds = (text, size, style) => {
+      const own2 = pick(style);
+      return typeof own2.outlineBounds === "function" ? own2.outlineBounds(text, size, style) : deck.outlineBounds.call(deck, text, size, style);
+    };
+  return scripted;
+}
+function resolveSlideScriptMeasurement(presentation, slideIndex, measurement, options = {}) {
+  if (typeof measurement.forScripts !== "function") return measurement;
+  const { fontScheme } = resolveDesignRecords(presentation, slideIndex, options.catalogs !== void 0 ? { catalogs: options.catalogs } : {});
+  const resolved = resolveFontFamilies(fontScheme);
+  const fontFamilies = { heading: options.fontFamilies?.heading ?? resolved.heading, body: options.fontFamilies?.body ?? resolved.body };
+  return slideScriptMeasurement(presentation, slideIndex, measurement, { ...options.catalogs !== void 0 ? { catalogs: options.catalogs } : {}, fontFamilies, serif: fontScheme.type === "serif" });
+}
+
 // src/slide-context.ts
 var rec2 = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : {};
 function resolveSlideContext(presentation, index, options = {}) {
@@ -3280,7 +3342,8 @@ function resolveSlideContext(presentation, index, options = {}) {
     ...options.fonts?.textMeasurement ? { textMeasurement: options.fonts.textMeasurement } : {},
     ...options.date !== void 0 ? { date: options.date } : {}
   };
-  return { options: composeOptions, diagnostics, resolved: { theme, colorScheme, fontScheme, fontSchemePath: records.fontSchemePath, ...layout ? { layout } : {}, provenance: { ...layoutProvenance ? { layout: layoutProvenance } : {}, ...records.provenance } } };
+  const resolvedSlide = resolveSlideVariables(slide, { slideNumber: composeOptions.slideNumber, slideCount: composeOptions.slideCount, presentation, darkBackground: composeOptions.darkBackground === true });
+  return { slide: resolvedSlide, options: composeOptions, diagnostics, resolved: { theme, colorScheme, fontScheme, fontSchemePath: records.fontSchemePath, ...layout ? { layout } : {}, provenance: { ...layoutProvenance ? { layout: layoutProvenance } : {}, ...records.provenance } } };
 }
 
 // src/rule-slides.ts
@@ -3316,10 +3379,17 @@ function buildSlides(document, options) {
   const slides = Array.isArray(document.slides) ? document.slides : [];
   return slides.map((slide, index) => {
     const path = pointer2("slides", index);
-    const measurement = lazy(() => measurementFor(options, index));
+    const baseContext = lazy(() => resolveSlideContext(document, index, { catalogs: options.catalogs, date: "2000-01-01" }));
+    const measurement = lazy(() => {
+      const host = measurementFor(options, index);
+      if (!host) return void 0;
+      const { resolved: resolved2 } = baseContext();
+      return slideScriptMeasurement(document, index, host, { catalogs: options.catalogs, fontFamilies: resolveFontFamilies(resolved2.fontScheme), serif: resolved2.fontScheme.type === "serif" });
+    });
     const resolved = lazy(() => {
       const textMeasurement = measurement();
-      return resolveSlideContext(document, index, { catalogs: options.catalogs, ...textMeasurement ? { fonts: { textMeasurement } } : {}, date: "2000-01-01" });
+      const slideContext = baseContext();
+      return textMeasurement ? { ...slideContext, options: { ...slideContext.options, textMeasurement } } : slideContext;
     });
     const design = lazy(() => resolveDesign(document, index, resolved()));
     const layout = lazy(() => resolved().options.layout);
@@ -3327,14 +3397,14 @@ function buildSlides(document, options) {
       const result = { layoutDiagnostics: [] };
       const compose = (input, withLayout) => composeSlide(input, { ...resolved().options, layout: withLayout });
       try {
-        result.composition = compose(slide, layout());
+        result.composition = compose(resolved().slide, layout());
         result.layoutDiagnostics.push(...result.composition.diagnostics.map((diagnostic) => ({ diagnostic, strict: false })));
       } catch (error) {
         if (error instanceof OPFCompositionError) {
           result.layoutDiagnostics.push(...error.diagnostics.map((diagnostic) => ({ diagnostic, strict: true })));
           try {
             const relaxedLayout = layout();
-            result.composition = compose(relax(slide), relaxedLayout ? relax(relaxedLayout) : void 0);
+            result.composition = compose(relax(resolved().slide), relaxedLayout ? relax(relaxedLayout) : void 0);
           } catch (second) {
             result.layoutError = second instanceof Error ? second.message : String(second);
           }
@@ -3640,4 +3710,4 @@ function assertValidCatalogRecord(kind, value) {
   if (!report2.valid) throw new OPFValidationError(report2);
 }
 
-export { DEFAULT_CHART_PALETTE, DEFAULT_VALIDATION_THRESHOLDS, OPFValidationError, assertValid, assertValidCatalogRecord, findValidationRule, parseSource, resolveSlideContext, validate, validateCatalogRecord, validationCategories, validationRules };
+export { DEFAULT_CHART_PALETTE, DEFAULT_VALIDATION_THRESHOLDS, OPFValidationError, assertValid, assertValidCatalogRecord, findValidationRule, parseSource, resolveSlideContext, resolveSlideScriptMeasurement, validate, validateCatalogRecord, validationCategories, validationRules };

package/dist/{chunk-6OR326EA.js → chunk-JXVS7BJK.js}

@@ -1,4 +1,4 @@
-import { presentation } from './chunk-WEDGVC5W.js';
+import { presentation } from './chunk-6WW2EDUW.js';
 
 // src/format.ts
 var OPFFormatError = class extends Error {