@openpresentation/opf 0.17.0 → 0.18.3

package/dist/{chunk-NLNYNBTS.js → chunk-KA3ZPFVT.js}

@@ -1,7 +1,7 @@
-import { promotedRegionKeys, VARIABLE_KINDS, resolveChartData, chartPaletteForFill, imageBackground, tableGrid, timelineTextColor, 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-CW7GEAV3.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-RA64UQKI.js';
+import { schemaEntries, schemas } from './chunk-2PEWUUBR.js';
 import Ajv2020 from 'ajv/dist/2020.js';
 import addFormats from 'ajv-formats';
 import { parseTree, printParseErrorCode, getNodePath } from 'jsonc-parser';
@@ -539,6 +539,50 @@ function slideThemeDimensionsWarnings(document, slide, index, catalogs) {
     { code: "slide-theme-dimensions", slideDimensions: slideSize, deckDimensions: deckSize }
   )];
 }
+var SLIDE_SIDE_MIN_EMU = 914400;
+var SLIDE_SIDE_MAX_EMU = 51206400;
+var EMU_PER_INCH = 914400;
+var EMU_PER_REFERENCE_PIXEL = EMU_PER_INCH / 96;
+function slideSizeRangeWarnings(document, catalogs) {
+  const design = isRecord(document.design) ? document.design : {};
+  const explicit = design.dimensions !== void 0;
+  let dimensions = design.dimensions;
+  if (!explicit) {
+    const theme = resolveDesignRecords(document, void 0, { catalogs: catalogs ?? [] }).theme;
+    dimensions = theme.dimensions;
+    if (dimensions === void 0) return [];
+  }
+  let size;
+  try {
+    size = resolveCanvasDimensions(dimensions);
+  } catch {
+    return [];
+  }
+  const sides = [["width", size.width], ["height", size.height]].map(([side, pixels]) => ({
+    side,
+    inches: pixels / 96,
+    emu: Math.round(pixels * EMU_PER_REFERENCE_PIXEL)
+  }));
+  const outside = sides.filter(({ emu }) => emu < SLIDE_SIDE_MIN_EMU || emu > SLIDE_SIDE_MAX_EMU);
+  if (outside.length === 0) return [];
+  const inches = (value) => String(Math.round(value * 1e4) / 1e4);
+  const detail = outside.map(({ side, inches: value, emu }) => `${side} ${inches(value)} in (${emu} EMU) is ${emu < SLIDE_SIDE_MIN_EMU ? "below 1 in" : "above 56 in"}`).join(", ");
+  const path = explicit ? "/design/dimensions" : typeof design.theme === "string" ? "/design/theme" : "/design";
+  return [semanticIssue(
+    path,
+    `the slide size ${inches(sides[0].inches)} x ${inches(sides[1].inches)} in is outside PowerPoint's 1 to 56 inch range per side (${detail}); the PPTX p:sldSz allows 914400 to 51206400 EMU${explicit ? "" : ", and the size comes from the deck's theme"}`,
+    {
+      code: "slide-size-out-of-range",
+      widthInches: sides[0].inches,
+      heightInches: sides[1].inches,
+      widthEmu: sides[0].emu,
+      heightEmu: sides[1].emu,
+      minEmu: SLIDE_SIDE_MIN_EMU,
+      maxEmu: SLIDE_SIDE_MAX_EMU,
+      sides: outside.map(({ side }) => side)
+    }
+  )];
+}
 function chartTypeWarnings(payload, path) {
   if (!isRecord(payload)) {
     return [];
@@ -726,6 +770,7 @@ function presentationReferenceWarnings(value, catalogs) {
   }
   const issues = [];
   issues.push(...variableReferenceWarnings(value));
+  issues.push(...slideSizeRangeWarnings(value, catalogs));
   value.slides.forEach((slide, index) => {
     if (!isRecord(slide)) {
       return;
@@ -1364,26 +1409,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 +1430,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 +1647,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 +1661,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 +1680,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 +2467,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.`, `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.", { 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(
@@ -2435,7 +2481,18 @@ var formatRules = [
     }
   ),
   rule("run-color-unrecognized", "format", "warning", "A text run colour is none of the documented forms.", "Run colours are open strings so imported decks stay valid, but a value that is not a hex colour, a colour-scheme name or a `var:` reference falls back to the theme colour.", { standard: SCHEMA }),
-  rule("numbering-start-ignored", "format", "warning", "A list entry sets `start` where nothing is numbered.", "A start value only restarts an auto-number; without `numbering` on the payload it has no effect.", { standard: SCHEMA })
+  rule("numbering-start-ignored", "format", "warning", "A list entry sets `start` where nothing is numbered.", "A start value only restarts an auto-number; without `numbering` on the payload it has no effect.", { standard: SCHEMA }),
+  rule(
+    "slide-size-out-of-range",
+    "format",
+    "warning",
+    "The slide size is outside PowerPoint's 1 to 56 inch range.",
+    "The schema accepts any positive custom `widthInches` and `heightInches`, but a PPTX stores the size as `p:sldSz` with each side between 914400 and 51206400 EMU, which is 1 to 56 inches. A custom size outside that range exports a file that does not conform to the standard, which PowerPoint may reject or clamp. It is a warning because the document is still correct OPF and the preview draws it.",
+    {
+      standard: "ECMA-376 / ISO/IEC 29500-1 section 19.2.1.39 (p:sldSz) and section 19.7.17 (ST_SlideSizeCoordinate): 914400 to 51206400 EMU",
+      approximations: "Checks the deck's resolved size: `design.dimensions`, else the resolved theme's `dimensions`. Inches are converted to EMU as the PPTX exporter does (`Math.round(inches * 914400)`), so a side of exactly 1 in or 56 in passes. A slide-level theme with another size is `opf/slide-theme-dimensions`. Presets are always in range. PowerPoint's own behaviour at the limits was not measured."
+    }
+  )
 ];
 var referenceRules = [
   rule(
@@ -2505,7 +2562,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. `{{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("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" })
 ];
@@ -2833,7 +2890,8 @@ var HELP = {
   "variable-unused": "Reference the variable as {{id}} or var:id where it belongs, or remove its declaration.",
   "variable-reference-unknown": "Declare the variable in the top-level variables map, or use another colour.",
   "run-color-unrecognized": "Use a #RRGGBB hex colour, a colour-scheme name or a var: reference to a declared colour variable.",
-  "numbering-start-ignored": "Add a 'numbering' field to the payload, or remove 'start'."
+  "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 engineFindings(document, engine, enabled) {
   const findings = [];
@@ -3341,7 +3399,7 @@ function resolveSlideContext(presentation, index, options = {}) {
     ...options.fonts?.textMeasurement ? { textMeasurement: options.fonts.textMeasurement } : {},
     ...options.date !== void 0 ? { date: options.date } : {}
   };
-  const resolvedSlide = resolveSlideVariables(slide, { slideNumber: composeOptions.slideNumber, slideCount: composeOptions.slideCount });
+  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 } } };
 }
 

package/dist/{chunk-M4UR3NPN.js → chunk-L5YACLWK.js}

@@ -1,5 +1,5 @@
-import { jsonEqual, formatPointer } from './chunk-O3CVNJTL.js';
-import { annotationText } from './chunk-CW7GEAV3.js';
+import { jsonEqual, formatPointer } from './chunk-WHHLGDCQ.js';
+import { annotationText } from './chunk-MBU42S5Y.js';
 
 // src/diff-match.ts
 var DEFAULT_MATCH_THRESHOLD = 0.5;