@openpresentation/opf 0.16.0 → 0.17.0

package/dist/{chunk-5UEUAW57.js → chunk-IS5H5JKH.js}

@@ -1,4 +1,4 @@
-import { isRecord, same } from './chunk-5TO6I3GB.js';
+import { isRecord, same } from './chunk-PPROJP2E.js';
 import { parseDocument, YAMLMap, Scalar, stringify } from 'yaml';
 
 // src/not-checked.ts

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

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

package/dist/{chunk-KINQFU6X.js → chunk-N4EVOFEA.js}

@@ -1,10 +1,10 @@
-import { fromMarkdown, toMarkdown } from './chunk-FQSIIADJ.js';
-import { fromYaml, toYaml } from './chunk-K4DQQIT4.js';
-import { NOT_CHECKED } from './chunk-5UEUAW57.js';
-import { parseSource, validate } from './chunk-PX5AWL7Y.js';
+import { fromMarkdown, toMarkdown } from './chunk-BIC3SWPK.js';
+import { fromYaml, toYaml } from './chunk-TCD2FB2K.js';
+import { NOT_CHECKED } from './chunk-IS5H5JKH.js';
+import { parseSource, validate, OPFValidationError } from './chunk-NLNYNBTS.js';
 import { checkCatalogsOption } from './chunk-SPFV27O5.js';
 
-// src/deck.ts
+// src/deck-report.ts
 var DECK_FORMATS = ["json", "yaml", "markdown"];
 function deckFormatOf(filename) {
   if (filename === void 0) return "json";
@@ -17,10 +17,10 @@ function resolveFormat(caller, options) {
   if (!DECK_FORMATS.includes(options.format)) throw new TypeError(`${caller}: unknown format ${JSON.stringify(options.format)}. Formats: ${DECK_FORMATS.join(", ")}.`);
   return options.format;
 }
-function readDeck(text, options = {}) {
-  if (typeof text !== "string") throw new TypeError("readDeck expects a string.");
-  checkCatalogsOption(options.catalogs, "readDeck");
-  const format = resolveFormat("readDeck", options);
+function readDeckReport(text, options = {}, caller = "parse") {
+  if (typeof text !== "string") throw new TypeError(`${caller} expects a string.`);
+  checkCatalogsOption(options.catalogs, caller);
+  const format = resolveFormat(caller, options);
   const { catalogs } = options;
   const check = options.validate ?? true;
   const validateOptions = typeof check === "object" ? { ...catalogs && check.catalogs === void 0 ? { catalogs } : {}, ...check } : { only: ["format", "references"], ...catalogs ? { catalogs } : {} };
@@ -40,12 +40,19 @@ function report(findings) {
   for (const found of findings) counts[found.severity]++;
   return { valid: counts.error === 0, schemaValid: null, findings, counts, checks: NOT_CHECKED };
 }
-function writeDeck(presentation, options = {}) {
-  const format = resolveFormat("writeDeck", options);
+
+// src/deck.ts
+function parse(text, options = {}) {
+  const { presentation, format: _format, ...result } = readDeckReport(text, { ...options, validate: true }, "parse");
+  if (!result.valid) throw new OPFValidationError(result);
+  return presentation;
+}
+function stringify(presentation, options = {}) {
+  const format = resolveFormat("stringify", options);
   if (format === "yaml") return toYaml(presentation, { schemaComment: options.schemaComment === true }).yaml;
   if (format === "markdown") return toMarkdown(presentation).markdown;
   return `${JSON.stringify(presentation, null, 2)}
 `;
 }
 
-export { DECK_FORMATS, deckFormatOf, readDeck, writeDeck };
+export { DECK_FORMATS, deckFormatOf, parse, readDeckReport, stringify };

package/dist/{chunk-PX5AWL7Y.js → chunk-NLNYNBTS.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, 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 { 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-RA64UQKI.js';
 import Ajv2020 from 'ajv/dist/2020.js';
 import addFormats from 'ajv-formats';
 import { parseTree, printParseErrorCode, getNodePath } from 'jsonc-parser';
@@ -2421,7 +2421,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.", { 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 +2505,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. `{{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 +3245,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 +3341,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 });
+  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 +3378,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 +3396,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 +3709,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-SMLMI6IZ.js → chunk-O263APNI.js}

@@ -1,4 +1,4 @@
-import { chartNumber } from './chunk-5PDN7BN6.js';
+import { chartNumber } from './chunk-CW7GEAV3.js';
 
 // src/data.ts
 var OPFDataImportError = class extends Error {

package/dist/{chunk-BSYQDWT4.js → chunk-O2CX5NEH.js}

@@ -1,5 +1,5 @@
-import { assertValid, resolveSlideContext } from './chunk-PX5AWL7Y.js';
-import { composeSlide, codeHighlightSlice, tableRowBoundaries, visitContentPayloads, sliceNumberedItems } from './chunk-5PDN7BN6.js';
+import { assertValid, resolveSlideScriptMeasurement, resolveSlideContext } from './chunk-NLNYNBTS.js';
+import { resolveSlideVariables, usesSlideBuiltin, composeSlide, codeHighlightSlice, tableRowBoundaries, visitContentPayloads, slideTokenSpans, sliceNumberedItems } from './chunk-CW7GEAV3.js';
 import { checkCatalogsOption } from './chunk-SPFV27O5.js';
 
 // src/pagination.ts
@@ -39,6 +39,10 @@ var deckContext = (presentation) => {
   const deck = isRecord(presentation) ? presentation : {};
   return { ...Array.isArray(deck.references) ? { references: deck.references } : {}, ...isRecord(deck.datasets) ? { datasets: deck.datasets } : {} };
 };
+function keepTokensWhole(boundaries, text) {
+  const spans = slideTokenSpans(text);
+  return spans.length ? boundaries.filter((boundary) => !spans.some(([start, end]) => boundary > start && boundary < end)) : boundaries;
+}
 function leafFor(path, field, value) {
   const leaf = { path, field, value };
   let text;
@@ -62,7 +66,7 @@ function leafFor(path, field, value) {
   }
   if (text !== void 0) {
     leaf.unit = "utf16";
-    leaf.boundaries = [0, ...Array.from(graphemes.segment(text), (segment) => segment.index + segment.segment.length)];
+    leaf.boundaries = keepTokensWhole([0, ...Array.from(graphemes.segment(text), (segment) => segment.index + segment.segment.length)], text);
   } else if (field === "items" || field === "bullets") {
     leaf.unit = "items";
     leaf.boundaries = Array.from({ length: value.length + 1 }, (_, i) => i);
@@ -103,8 +107,9 @@ function paginateSlide(input, options = {}) {
   };
   source = withReadability(source);
   let evaluations = 0;
-  const { fonts, minFontSize: _minFontSize, maxSlides: _maxSlides, reservedIds: _reservedIds, ...engineOptions } = options;
-  const composeOptions = { ...engineOptions, ...fonts?.textMeasurement ? { textMeasurement: fonts.textMeasurement } : {} };
+  const { fonts, catalogs, minFontSize: _minFontSize, maxSlides: _maxSlides, reservedIds: _reservedIds, ...engineOptions } = options;
+  const textMeasurement = fonts?.textMeasurement && options.presentation !== void 0 ? resolveSlideScriptMeasurement(options.presentation, sourceIndex, fonts.textMeasurement, { ...catalogs !== void 0 ? { catalogs } : {}, ...options.fontFamilies ? { fontFamilies: options.fontFamilies } : {} }) : fonts?.textMeasurement;
+  const composeOptions = { ...engineOptions, ...textMeasurement ? { textMeasurement } : {} };
   const readableLayout = (layout) => {
     if (!isRecord(layout) || !Array.isArray(layout.placeholders) || !layout.placeholders.some((entry) => isRecord(entry) && entry.type === "group")) return layout;
     const visit = (entries) => entries.map((entry) => {
@@ -115,9 +120,12 @@ function paginateSlide(input, options = {}) {
     return { ...layout, placeholders: visit(layout.placeholders) };
   };
   if (options.layout !== void 0) composeOptions.layout = readableLayout(options.layout);
+  const presentationSlides = options.presentation?.slides;
+  const slideCount = options.slideCount ?? (Array.isArray(presentationSlides) && presentationSlides.length ? presentationSlides.length : void 0);
   const geometry = (slide, pageIndex = 0) => {
     if (++evaluations > 2e4) throw new OPFPaginationError("Pagination exceeded its layout evaluation limit. Split the input into smaller sections.");
-    return composeSlide(withReadability(slide, true), { ...composeOptions, slideNumber: (options.slideNumber ?? sourceIndex + 1) + pageIndex });
+    const slideNumber = (options.slideNumber ?? sourceIndex + 1) + pageIndex;
+    return composeSlide(resolveSlideVariables(withReadability(slide, true), { slideNumber, ...slideCount !== void 0 ? { slideCount } : {} }), { ...composeOptions, slideNumber });
   };
   const initial = geometry(source);
   const fit = (diagnostics) => diagnostics.filter((issue) => issue.code === "text-overflow" || issue.code === "small-cell" || !!initial.furniture?.diagnostics.includes(issue));
@@ -133,7 +141,14 @@ function paginateSlide(input, options = {}) {
   if (!fit(initial.diagnostics).length) return { slides: [source], pages: [{ slideIndex: sourceIndex, mappings: initial.items.map((item) => ({ sourcePath: item.path, outputPath: item.path })), ...initial.furniture ? { repeatedMappings: repeatedMappings(0) } : {} }] };
   const headerIssues = initial.diagnostics.filter((issue) => headingFields.has(issue.path.slice(sourceBase.length + 1)) || initial.furniture?.diagnostics.includes(issue));
   if (headerIssues.length) throw new OPFPaginationError("Repeated headings or header/footer content cannot fit or resolve. Change the repeated content or slide design before pagination.", headerIssues);
-  const leaves = initial.items.filter((item) => !headingFields.has(item.field)).map((item) => leafFor(item.path, item.field, item.value));
+  const tokens = resolveSlideVariables(source, { slideNumber: 1, slideCount: 1 }) !== source;
+  const sourceValue = (path, fallback) => {
+    if (!tokens || !path.startsWith(`${sourceBase}.`)) return fallback;
+    let node = source;
+    for (const key of path.slice(sourceBase.length + 1).split(".")) node = isRecord(node) || Array.isArray(node) ? node[key] : void 0;
+    return node === void 0 ? fallback : node;
+  };
+  const leaves = initial.items.filter((item) => !headingFields.has(item.field)).map((item) => leafFor(item.path, item.field, sourceValue(item.path, item.value)));
   const leafPaths = new Set(leaves.map((leaf) => leaf.path));
   const slides = [], pages = [];
   let selected = /* @__PURE__ */ new Map();
@@ -256,10 +271,6 @@ function paginateSlide(input, options = {}) {
   if (!slides.length) throw new OPFPaginationError("No body content can be paginated.", initial.diagnostics);
   return { slides, pages };
 }
-var usesSlideTotal = (presentation) => [presentation, ...presentation.slides].some((owner) => ["header", "footer"].some((kind) => ["left", "center", "right"].some((zone) => {
-  const content = owner?.design?.[kind]?.[zone];
-  return content?.slideNumber === true && typeof content.slideNumberFormat === "string" && content.slideNumberFormat.includes("{total}");
-})));
 function paginate(input, options = {}) {
   checkCatalogsOption(options.catalogs, "paginate");
   assertValid(input, { only: ["format"] });
@@ -280,7 +291,7 @@ function paginate(input, options = {}) {
         }
       }
       if (output2.length >= maxSlides) throw new OPFPaginationError(`Pagination needs more than ${maxSlides} slides. No partial result was returned.`);
-      const result2 = paginateSlide(slide, { ...context.options, textRasterPadding: options.textRasterPadding, fonts: options.fonts, presentation, slideIndex: index, slideNumber: output2.length + 1, slideCount: slideCount2, date: options.date, maxSlides: maxSlides - output2.length, minFontSize: options.minFontSize, reservedIds });
+      const result2 = paginateSlide(slide, { ...context.options, textRasterPadding: options.textRasterPadding, fonts: options.fonts, ...options.catalogs ? { catalogs: options.catalogs } : {}, presentation, slideIndex: index, slideNumber: output2.length + 1, slideCount: slideCount2, date: options.date, maxSlides: maxSlides - output2.length, minFontSize: options.minFontSize, reservedIds });
       const outputStart = output2.length;
       result2.pages.forEach((page, pageIndex) => {
         const remap = (mapping) => ({ ...mapping, outputPath: mapping.outputPath.replace(/^slides\.\d+/, `slides.${outputStart + pageIndex}`) });
@@ -291,9 +302,10 @@ function paginate(input, options = {}) {
     });
     return { output: output2, pages: pages2 };
   };
+  const usesSlideCount = usesSlideBuiltin(presentation, "deck.slideCount");
   let slideCount = presentation.slides.length, result = run(slideCount);
-  for (let attempt = 0; usesSlideTotal(presentation) && result.output.length !== slideCount; attempt++) {
-    if (attempt >= 3) throw new OPFPaginationError("Slide-number totals did not converge. Change the slide-number format or split the input.");
+  for (let attempt = 0; usesSlideCount && result.output.length !== slideCount; attempt++) {
+    if (attempt >= 3) throw new OPFPaginationError("The slide count did not converge. Change the text around {{deck.slideCount}} or split the input.");
     slideCount = result.output.length;
     result = run(slideCount);
   }

package/dist/{chunk-3XDRQYWZ.js → chunk-O3CVNJTL.js}

@@ -1,4 +1,4 @@
-import { validate } from './chunk-PX5AWL7Y.js';
+import { validate } from './chunk-NLNYNBTS.js';
 
 // src/patch.ts
 var OPFPatchError = class extends Error {

package/dist/{chunk-5TO6I3GB.js → chunk-PPROJP2E.js}

@@ -1,4 +1,4 @@
-import { validate } from './chunk-PX5AWL7Y.js';
+import { validate } from './chunk-NLNYNBTS.js';
 
 // src/convert/shared.ts
 var CONTENT_KEYS = ["text", "items", "bullets", "image", "video", "chart", "table", "code", "metric", "quote", "timeline"];

package/dist/{chunk-WEDGVC5W.js → chunk-RA64UQKI.js}

@@ -52,7 +52,7 @@ var presentation = {
           "minItems": 1
         }
       ],
-      "description": "Organization associated with the presentation, usually the presenting company. Array form supports hosts, partners, clients, and sponsors. The primary organization (Organization.role 'primary', else the first item) supplies the default deck logo, the 'organization' and 'socials' header/footer fields and the 'organization.<field>' built-in variables; the others are available by id as 'organization.<id>.<field>' and are not drawn automatically."
+      "description": "Organization associated with the presentation, usually the presenting company. Array form supports hosts, partners, clients, and sponsors. The primary organization (Organization.role 'primary', else the first item) supplies the default deck logo, the 'socials' header/footer field and the 'organization.<field>' built-in variables; the others are available by id as 'organization.<id>.<field>' and are not drawn automatically."
     },
     "speaker": {
       "oneOf": [
@@ -67,7 +67,7 @@ var presentation = {
           "minItems": 1
         }
       ],
-      "description": "Person presenting the deck. Array form supports panels and multi-speaker decks. The first speaker is the primary speaker: the built-in variables 'speaker.<field>' and the 'speaker' header/footer field read it, 'speakers' lists every name, and 'speaker.<id>.<field>' addresses one by id. A speaker is drawn nowhere else."
+      "description": "Person presenting the deck. Array form supports panels and multi-speaker decks. The first speaker is the primary speaker: the built-in variables 'speaker.<field>' read it, 'speakers' lists every name, and 'speaker.<id>.<field>' addresses one by id. A speaker is drawn nowhere else."
     },
     "author": {
       "oneOf": [
@@ -775,7 +775,7 @@ var presentation = {
     },
     "Organization": {
       "type": "object",
-      "description": "An organization associated with the presentation, typically the presenting company, but also hosts, partners, clients, or sponsors. The primary organization (role 'primary', else the first one) supplies the default deck logo (unless design.logo overrides it), the 'organization' header/footer field (its name) and the 'socials' field (its socials). Every field is also a built-in variable ('{{organization.name}}', 'var:organization.logo', 'organization.<id>.<field>'). Nothing else about an organization is drawn automatically. See docs/templates-and-variables.md.",
+      "description": "An organization associated with the presentation, typically the presenting company, but also hosts, partners, clients, or sponsors. The primary organization (role 'primary', else the first one) supplies the default deck logo (unless design.logo overrides it) and the 'socials' header/footer field (its socials). Every field is also a built-in variable ('{{organization.name}}', 'var:organization.logo', 'organization.<id>.<field>'). Nothing else about an organization is drawn automatically. See docs/templates-and-variables.md.",
       "required": [
         "id",
         "name"
@@ -793,7 +793,7 @@ var presentation = {
         },
         "name": {
           "type": "string",
-          "description": "Display name. Drawn by the 'organization' header/footer field for the primary organization; the built-in variable 'organization.name' (or 'organization.<id>.name') carries it into any string.",
+          "description": "Display name. The built-in variable 'organization.name' (primary organization) or 'organization.<id>.name' carries it into any string, such as a header or footer text of '{{organization.name}}'.",
           "examples": [
             "Acme Corp",
             "DevConf 2026",
@@ -863,7 +863,7 @@ var presentation = {
             "sponsor",
             "host"
           ],
-          "description": "Role of the organization relative to the presentation. Only 'primary' has behavior: it selects the primary organization (deck logo, 'organization' and 'socials' header/footer fields, and the 'organization.<field>' built-ins). When no organization has role 'primary', the first one is primary. 'partner', 'client', 'sponsor' and 'host' are descriptive labels that change nothing."
+          "description": "Role of the organization relative to the presentation. Only 'primary' has behavior: it selects the primary organization (deck logo, the 'socials' header/footer field, and the 'organization.<field>' built-ins). When no organization has role 'primary', the first one is primary. 'partner', 'client', 'sponsor' and 'host' are descriptive labels that change nothing."
         },
         "socials": {
           "$ref": "#/$defs/Socials",
@@ -873,7 +873,7 @@ var presentation = {
     },
     "Speaker": {
       "type": "object",
-      "description": "A person presenting the deck. A speaker is drawn only through built-in variables ('{{speaker.name}}' inside any string, 'var:speaker.photo' as a whole image field) and the 'speaker' header/footer field (the first speaker's name and title). No layout, cover or bio slide places a speaker on its own. See docs/templates-and-variables.md.",
+      "description": "A person presenting the deck. A speaker is drawn only through built-in variables ('{{speaker.name}}' inside any string, a header or footer text included, and 'var:speaker.photo' as a whole image field). No layout, cover or bio slide places a speaker on its own. See docs/templates-and-variables.md.",
       "required": [
         "id",
         "name"
@@ -891,7 +891,7 @@ var presentation = {
         },
         "name": {
           "type": "string",
-          "description": "Display name. Built-in variable 'speaker.name' (first speaker) or 'speaker.<id>.name'; the first speaker's name is also drawn by the 'speaker' header/footer field and every name is listed by 'speakers'.",
+          "description": "Display name. Built-in variable 'speaker.name' (first speaker) or 'speaker.<id>.name'; every name is listed by 'speakers'.",
           "examples": [
             "Alice Chen",
             "Bob Lee",
@@ -900,7 +900,7 @@ var presentation = {
         },
         "title": {
           "type": "string",
-          "description": "Role or title. Built-in variable 'speaker.title'; the 'speaker' header/footer field draws it after the name ('Alice Chen, VP of Engineering').",
+          "description": "Role or title. Built-in variable 'speaker.title' (or 'speaker.<id>.title'), for example in a footer text of '{{speaker.name}}, {{speaker.title}}'.",
           "examples": [
             "VP of Engineering",
             "Founder & CEO",
@@ -1144,7 +1144,7 @@ var presentation = {
             false,
             {
               "left": {
-                "section": true
+                "text": "{{slide.section}}"
               },
               "right": {
                 "image": "asset:acme-logo"
@@ -1173,7 +1173,7 @@ var presentation = {
                 "text": "Confidential"
               },
               "right": {
-                "slideNumber": true
+                "text": "{{slide.number}}"
               }
             }
           ]
@@ -1666,7 +1666,7 @@ var presentation = {
       "additionalProperties": {
         "$ref": "#/$defs/Variable"
       },
-      "description": "Named variables, keyed by stable kebab-case id. A variable is a typed, named value the deck declares once and uses in many places: a color ('var:<id>' in color fields, the original use), or content that fills a template (text, number, date, image, url, list). Content is referenced inline as '{{<id>}}' inside any string, or whole as 'var:<id>' in a field of the matching type; '\\{{' writes a literal '{{'. A hex string is shorthand for a color variable. A variable with no 'value' is unfilled: expected in a template (root 'template': true), an error in a normal deck. Engines resolve variables with resolveVariables() before composing, rendering or exporting, so a template plus its values previews and exports exactly like the equivalent hand-written deck. Read-only built-in variables come from the deck's own metadata and use dotted names that a user id can never take: 'deck.name', 'deck.description', 'deck.author', 'speaker.name|title|email|phone|bio|photo' (first speaker), 'speakers' (every speaker's name, a list), 'organization.name|legalName|tagline|domain|email|phone|logo' (primary organization), and 'speaker.<id>.<field>' / 'organization.<id>.<field>' by id. They are written the same two ways ('{{speaker.name}}', 'var:speaker.photo'), are never declared, and an unknown built-in path is a validation error; a known one with no source value resolves to nothing with a warning. The id 'speakers' is reserved. See docs/templates-and-variables.md.",
+      "description": "Named variables, keyed by stable kebab-case id. A variable is a typed, named value the deck declares once and uses in many places: a color ('var:<id>' in color fields, the original use), or content that fills a template (text, number, date, image, url, list). Content is referenced inline as '{{<id>}}' inside any string, or whole as 'var:<id>' in a field of the matching type; '\\{{' writes a literal '{{'. A hex string is shorthand for a color variable. A variable with no 'value' is unfilled: expected in a template (root 'template': true), an error in a normal deck. Engines resolve variables with resolveVariables() before composing, rendering or exporting, so a template plus its values previews and exports exactly like the equivalent hand-written deck. Read-only built-in variables come from the deck's own metadata and use dotted names that a user id can never take: 'deck.name', 'deck.description', 'deck.author', 'speaker.name|title|email|phone|bio|photo' (first speaker), 'speakers' (every speaker's name, a list), 'organization.name|legalName|tagline|domain|email|phone|logo' (primary organization), and 'speaker.<id>.<field>' / 'organization.<id>.<field>' by id. They are written the same two ways ('{{speaker.name}}', 'var:speaker.photo'), are never declared, and an unknown built-in path is a validation error; a known one with no source value resolves to nothing with a warning. The id 'speakers' is reserved. Three built-ins are slide-scoped and written only as inline tokens: '{{slide.number}}' (the displayed slide number after pagination), '{{slide.section}}' (the slide's section) and '{{deck.slideCount}}' (the number of slides after pagination). resolveVariables() leaves them as written; they resolve per slide as it is composed (resolveSlideVariables(), and header/footer text in layoutFurniture()), so every 'slide.' name is reserved and 'var:slide.*' or 'var:deck.slideCount' is a validation error. See docs/templates-and-variables.md.",
       "examples": [
         {
           "risk": "#B42318",
@@ -2625,7 +2625,8 @@ var presentation = {
     },
     "HeaderFooterItem": {
       "type": "object",
-      "description": "One header/footer zone. Every configured field renders; fields in one zone stack top to bottom in the order logo, image, text, organization, speaker, socials, section, slide number, date. Put a date and a slide number in different zones to keep each on the zone's single line.",
+      "description": "One header/footer zone. Every configured field renders; fields in one zone stack top to bottom in the order logo, image, text, socials, date. Generated values such as the slide number, the slide count, the section, the organization or the speaker are variables inside text ('{{slide.number}} / {{deck.slideCount}}', '{{organization.name}}'), so one text writes several values in the author's order; a line break is '\\n'. Put a date and a slide number in different zones to keep each on the zone's single line. See docs/templates-and-variables.md.",
+      "additionalProperties": false,
       "properties": {
         "logo": {
           "type": "boolean",
@@ -2633,10 +2634,12 @@ var presentation = {
         },
         "text": {
           "type": "string",
-          "description": "Literal text rendered in this zone.",
+          "description": "Text rendered in this zone. Variables resolve inside it like any string: deck-wide ones ('{{organization.name}}', '{{speaker.name}}, {{speaker.title}}', '{{customer}}') before composition, and the slide-scoped built-ins '{{slide.number}}', '{{slide.section}}' and '{{deck.slideCount}}' for each slide as it is laid out. Each '{{slide.number}}' is a live slide-number field: PPTX export writes it as a native field when its value fits within one accepted text line, and as static text with a diagnostic otherwise. '{{deck.slideCount}}' is fixed text, because PowerPoint has no slide-count field. Write '\\{{' for literal braces.",
           "examples": [
             "Confidential",
-            "Q4 Business Review"
+            "Q4 Business Review",
+            "{{slide.number}} / {{deck.slideCount}}",
+            "{{organization.name}}\n{{slide.section}}"
           ]
         },
         "image": {
@@ -2647,21 +2650,6 @@ var presentation = {
             "./assets/footer-badge.svg"
           ]
         },
-        "slideNumber": {
-          "type": "boolean",
-          "description": "Whether to render the current slide number in this zone. PPTX export writes a native slide-number field when its value fits within one accepted text line; a value split across lines exports as static text with a diagnostic."
-        },
-        "slideNumberFormat": {
-          "type": "string",
-          "pattern": "[{]current[}]",
-          "description": 'Template for the slide number when slideNumber is true. {current} is the displayed slide number (a native PPTX field when its value fits within one accepted text line); {total} is the number of slides in the rendered or exported deck, written as fixed text because PowerPoint has no slide-count field. Other characters are literal. Defaults to "{current}".',
-          "examples": [
-            "{current}",
-            "{current} / {total}",
-            "A-{current}",
-            "Page {current} of {total}"
-          ]
-        },
         "date": {
           "oneOf": [
             {
@@ -2689,18 +2677,6 @@ var presentation = {
             "MMMM d, yyyy"
           ]
         },
-        "organization": {
-          "type": "boolean",
-          "description": "Whether to render the primary organization's name from organization (role 'primary', else the first organization)."
-        },
-        "speaker": {
-          "type": "boolean",
-          "description": "Whether to render the primary (first) speaker's name and title from speaker, joined as 'Ada Lovelace, CTO' (just the name when the speaker has no title). It is generated text: without a named speaker the engine reports unresolved-content at this field. PPTX export writes it as static text and import restores the flag from the file's furniture provenance."
-        },
-        "section": {
-          "type": "boolean",
-          "description": "Whether to render the current slide section label."
-        },
         "socials": {
           "type": "boolean",
           "description": "Whether to render the primary organization's social profiles from organization.socials, one line per platform in key order. A handle is formatted through the platform's socialPlatforms record (companyUrlPattern, else profileUrlPattern, else baseUrl, with handlePrefix stripped) and shown as that profile URL without its 'https://' scheme; a value that is already a URL is shown without an 'https://' scheme; an unknown platform key shows the raw value. Exporters link each line to its full URL when one exists. Speaker socials are not rendered by this field."
@@ -3100,7 +3076,7 @@ var presentation = {
         },
         "section": {
           "type": "string",
-          "description": "PowerPoint-style slide section label. Consecutive slides with the same value belong to the same section in presenter view, outlines, and PowerPoint section-aware exports.",
+          "description": "PowerPoint-style slide section label. Consecutive slides with the same value belong to the same section in presenter view, outlines, and PowerPoint section-aware exports. Also the slide-scoped built-in variable '{{slide.section}}', for example in a header text.",
           "examples": [
             "Intro",
             "Problem",

package/dist/{chunk-K4DQQIT4.js → chunk-TCD2FB2K.js}

@@ -1,9 +1,9 @@
-import { NOT_CHECKED, Ctx } from './chunk-5UEUAW57.js';
-import { sortPresentationKeys } from './chunk-6OR326EA.js';
-import { same } from './chunk-5TO6I3GB.js';
-import { validate } from './chunk-PX5AWL7Y.js';
+import { NOT_CHECKED, Ctx } from './chunk-IS5H5JKH.js';
+import { sortPresentationKeys } from './chunk-YT7FMQER.js';
+import { same } from './chunk-PPROJP2E.js';
+import { validate } from './chunk-NLNYNBTS.js';
 import { checkCatalogsOption } from './chunk-SPFV27O5.js';
-import { presentation } from './chunk-WEDGVC5W.js';
+import { presentation } from './chunk-RA64UQKI.js';
 import { Parser, parseDocument, isMap, Document, visit, isScalar, isAlias, isSeq } from 'yaml';
 
 var MAX_ALIAS_COUNT = 100;