@openpresentation/opf 0.16.0 → 0.18.1

package/dist/{chunk-BSYQDWT4.js → chunk-64YSJZDH.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-JT3QXA22.js';
+import { resolveSlideVariables, usesSlideBuiltin, composeSlide, codeHighlightSlice, tableRowBoundaries, visitContentPayloads, slideTokenSpans, sliceNumberedItems } from './chunk-MBU42S5Y.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,13 @@ 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 logoContext = options.presentation !== void 0 ? { presentation: options.presentation, darkBackground: options.darkBackground === true } : {};
   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 } : {}, ...logoContext }), { ...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 +142,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, ...logoContext }) !== 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 +272,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 +292,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,16 +303,17 @@ 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);
   }
   const { output, pages } = result;
   presentation.slides = output;
   assertValid(presentation, { only: ["format"] });
-  return { presentation, pages };
+  return { presentation, pages, layout: options.fonts ? "measured" : "estimated" };
 }
 
 export { OPFPaginationError, paginate, paginateSlide };

package/dist/{chunk-WEDGVC5W.js → chunk-6WW2EDUW.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 cover and section 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 cover and section logo (unless design.logo overrides it) and the 'socials' header/footer field (its socials). Every field is also a built-in variable ('{{organization.name}}', 'organization.<id>.<field>'), and every logo a slide-scoped image ('var:organization.logo.icon', 'var:organization.<id>.logo'). 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",
@@ -809,12 +809,29 @@ var presentation = {
           ]
         },
         "logo": {
-          "$ref": "#/$defs/Asset",
-          "description": "Source for the organization's logo image. Accepts an HTTPS URL, data URI, relative path (resolved against the OPF file location), local path, or 'asset:<id>' reference. Common formats are SVG (preferred for vector logos), PNG (with transparency), or JPG. The primary organization's logo (role 'primary', else the first organization) is the fallback source wherever the deck logo is drawn: a slide's design.logo, then design.logo, then this value. It is therefore drawn on cover and section slides and by header/footer zones with logo: true, exactly as design.logo would be (see design.logo and docs/design-resolution.md). It is also the built-in image variable 'organization.logo' (or 'organization.<id>.logo'), placed with 'var:organization.logo' in an image field.",
+          "oneOf": [
+            {
+              "$ref": "#/$defs/Asset"
+            },
+            {
+              "$ref": "#/$defs/OrganizationLogo"
+            }
+          ],
+          "description": "The organization's logo. A path, URL or Asset is one logo for every shape; an object gives up to four shapes (full, stacked, icon, wordmark), each a path or Asset, or { onLight, onDark } for the two backgrounds. A path is resolved against the OPF file location; an HTTPS URL, data URI or 'asset:<id>' reference works too. SVG (preferred for vector logos) or PNG with transparency are typical. The primary organization's full logo (role 'primary', else the first organization) is drawn on cover and section slides unless design.logo names another or is false. Every logo is also a slide-scoped built-in image, placed with a whole-field reference in any image field: 'var:organization.logo' (the full logo), 'var:organization.logo.icon' (likewise stacked, wordmark, full), and 'var:organization.<id>.logo' or 'var:organization.<id>.logo.<shape>' for another organization. A missing shape falls back to full, and full to the first defined of wordmark, stacked and icon. The onLight or onDark value is chosen for each slide's background; a missing one uses the other. See docs/templates-and-variables.md and docs/design-resolution.md.",
           "examples": [
+            "./assets/acme-logo.svg",
+            {
+              "full": "./assets/acme-logo.svg",
+              "icon": "./assets/acme-mark.svg"
+            },
+            {
+              "full": {
+                "onLight": "./assets/acme-logo.svg",
+                "onDark": "./assets/acme-logo-white.svg"
+              },
+              "icon": "./assets/acme-mark.svg"
+            },
             "https://cdn.acme.com/logo.svg",
-            "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9V3iWggAAAAASUVORK5CYII=",
-            "./assets/logo.jpg",
             "asset:acme-logo"
           ]
         },
@@ -863,7 +880,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 (cover and section 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 +890,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 +908,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 +917,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",
@@ -1086,20 +1103,19 @@ var presentation = {
         "logo": {
           "oneOf": [
             {
-              "$ref": "#/$defs/Asset"
+              "type": "string",
+              "pattern": "^var:organization(\\.[A-Za-z0-9_-]+)?\\.logo(\\.(full|stacked|icon|wordmark))?$"
             },
             {
-              "$ref": "#/$defs/LogoSet"
+              "type": "boolean",
+              "const": false
             }
           ],
-          "description": "Deck logo assets used by covers, section dividers, headers, footers and picture bullets. A string or Asset object is the default logo source; the LogoSet object form provides light/dark, stacked, icon, and wordmark variants (see LogoSet for the selection order). Source precedence: a slide's design.logo, then this value, then the primary organization's logo; absence inherits. Placement (reference engines, vetoable): on a cover or section slide (no body payload on a heading-only layout such as title, title-subtitle or section-divider, or no layout) the lockup variant is drawn at the top-left of the free area, inside the slide padding and below any header furniture, in a box 56 reference pixels tall and at most four times as wide; the tag/title/subtitle group then centers in the remaining span. Content slides never get an automatic logo. Header and footer zones draw the icon variant when they set logo: true, and design.listBullet 'image' draws it as the picture bullet. composeSlide returns the cover box as geometry.logo.",
+          "description": "Which logo covers, section dividers and picture bullets draw. Logos live on the organization (Organization.logo); without this field covers and sections draw the primary organization's full logo and picture bullets its icon. A logo reference overrides that: 'var:organization.beta.logo' draws organization beta's logo, and a reference that names a shape ('var:organization.logo.wordmark') draws that shape everywhere this field applies. false draws no logo. A slide's design.logo overrides the deck's; absence inherits. An override naming an organization without a logo draws nothing (validation warns). Placement (reference engines, vetoable): on a cover or section slide (no body payload on a heading-only layout such as title, title-subtitle or section-divider, or no layout) the logo is drawn at the top-left of the free area, inside the slide padding and below any header furniture, in a box 56 reference pixels tall and at most four times as wide; the tag/title/subtitle group then centers in the remaining span. Content slides never get an automatic logo; a header or footer zone places one with image: 'var:organization.logo.icon'. composeSlide returns the cover box as geometry.logo.",
           "examples": [
-            "asset:acme-logo",
-            {
-              "default": "asset:acme-logo",
-              "light": "asset:acme-logo-white",
-              "icon": "asset:acme-icon"
-            }
+            "var:organization.logo.wordmark",
+            "var:organization.beta.logo",
+            false
           ]
         },
         "watermark": {
@@ -1144,10 +1160,10 @@ var presentation = {
             false,
             {
               "left": {
-                "section": true
+                "text": "{{slide.section}}"
               },
               "right": {
-                "image": "asset:acme-logo"
+                "image": "var:organization.logo.icon"
               }
             }
           ]
@@ -1167,13 +1183,13 @@ var presentation = {
             false,
             {
               "left": {
-                "image": "asset:acme-logo"
+                "image": "var:organization.logo.icon"
               },
               "center": {
                 "text": "Confidential"
               },
               "right": {
-                "slideNumber": true
+                "text": "{{slide.number}}"
               }
             }
           ]
@@ -1234,7 +1250,7 @@ var presentation = {
             "character",
             "image"
           ],
-          "description": "Marker style for items and bullets lists. Effective value: the slide's design, then the deck's design, then the layout record's design.listBullet, then 'character'. 'character' (the default) draws the glyph marker. 'image' draws the deck's icon logo (a slide's design.logo, then design.logo, then the primary organization's logo; light variants on dark backgrounds) as a picture bullet: a square of the marker's font size whose bottom sits on the marker baseline, so list geometry does not change. Without a logo the glyph is drawn and the engine reports unresolved-content at this field."
+          "description": "Marker style for items and bullets lists. Effective value: the slide's design, then the deck's design, then the layout record's design.listBullet, then 'character'. 'character' (the default) draws the glyph marker. 'image' draws the primary organization's icon logo (or the organization and shape design.logo names; the onDark value on dark backgrounds) as a picture bullet: a square of the marker's font size whose bottom sits on the marker baseline, so list geometry does not change. Without a logo the glyph is drawn and the engine reports unresolved-content at this field."
         }
       }
     },
@@ -1666,7 +1682,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' (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. Organization logos are slide-scoped whole-field images: 'var:organization.logo', 'var:organization.logo.<shape>' (full, stacked, icon, wordmark), 'var:organization.<id>.logo' and 'var:organization.<id>.logo.<shape>' resolve per slide to the onLight or onDark asset for its background. See docs/templates-and-variables.md.",
       "examples": [
         {
           "risk": "#B42318",
@@ -2509,60 +2525,71 @@ var presentation = {
         }
       }
     },
-    "LogoSet": {
+    "OrganizationLogo": {
       "type": "object",
-      "description": "Deck logo variants surfaced by covers, section dividers, headers, footers and picture bullets. Organization identity lives in organization; this object only controls visual rendering assets. Engines select one variant per slot and background tone (resolveLogo in @openpresentation/opf): same-tone variants first, neutral ones next, the opposite tone last. Lockup on a dark background: light, default, stackedLight, stacked, wordmarkLight, wordmark, iconLight, icon, then dark, stackedDark, wordmarkDark, iconDark; on a light background: dark, default, stackedDark, stacked, wordmarkDark, wordmark, iconDark, icon, then light, stackedLight, wordmarkLight, iconLight. The icon slot (headers, footers, picture bullets) tries iconLight or iconDark for the tone, then icon, then the lockup chain; the stacked slot tries stackedLight or stackedDark, then stacked, then the lockup chain.",
+      "description": "An organization's logo in up to four shapes. Each shape is a path or Asset, or { onLight, onDark } for the two backgrounds. A missing shape falls back to full, and full to the first defined of wordmark, stacked and icon; within a shape a missing onLight or onDark uses the other. Shapes are placed with slide-scoped references such as 'var:organization.logo.icon'.",
       "additionalProperties": false,
+      "minProperties": 1,
       "properties": {
-        "default": {
-          "$ref": "#/$defs/Asset",
-          "description": "Default full-lockup logo. Used as fallback when no more specific variant is set."
-        },
-        "light": {
-          "$ref": "#/$defs/Asset",
-          "description": "Light-colored full-lockup logo intended for rendering on dark backgrounds."
-        },
-        "dark": {
-          "$ref": "#/$defs/Asset",
-          "description": "Dark-colored full-lockup logo intended for rendering on light backgrounds."
+        "full": {
+          "$ref": "#/$defs/LogoSource",
+          "description": "The full logo (lockup): mark and name side by side. Drawn on cover and section slides, and placed by 'var:organization.logo'."
         },
         "stacked": {
-          "$ref": "#/$defs/Asset",
-          "description": "Stacked vertical logo lockup, suited to portrait or square brand-mark slots."
-        },
-        "stackedLight": {
-          "$ref": "#/$defs/Asset",
-          "description": "Light-colored stacked logo variant intended for rendering on dark backgrounds."
-        },
-        "stackedDark": {
-          "$ref": "#/$defs/Asset",
-          "description": "Dark-colored stacked logo variant intended for rendering on light backgrounds."
+          "$ref": "#/$defs/LogoSource",
+          "description": "The stacked lockup: mark above the name, for portrait or square slots. Placed by 'var:organization.logo.stacked'."
         },
         "icon": {
-          "$ref": "#/$defs/Asset",
-          "description": "Default icon, mark, or symbol without wordmark. Useful for tight spaces such as footers, badges, and slide-corner marks."
-        },
-        "iconLight": {
-          "$ref": "#/$defs/Asset",
-          "description": "Light-colored icon variant intended for rendering on dark backgrounds."
-        },
-        "iconDark": {
-          "$ref": "#/$defs/Asset",
-          "description": "Dark-colored icon variant intended for rendering on light backgrounds."
+          "$ref": "#/$defs/LogoSource",
+          "description": "The mark or symbol without the name, for tight spaces such as header and footer zones and picture bullets. Placed by 'var:organization.logo.icon'."
         },
         "wordmark": {
-          "$ref": "#/$defs/Asset",
-          "description": "Default wordmark: the organization name set in branded typography, without icon."
+          "$ref": "#/$defs/LogoSource",
+          "description": "The name set in the brand's lettering, without the mark. Placed by 'var:organization.logo.wordmark'."
+        }
+      },
+      "examples": [
+        {
+          "full": "./assets/acme-logo.svg",
+          "icon": "./assets/acme-mark.svg"
         },
-        "wordmarkLight": {
-          "$ref": "#/$defs/Asset",
-          "description": "Light-colored wordmark variant intended for rendering on dark backgrounds."
+        {
+          "full": {
+            "onLight": "./assets/acme-logo.svg",
+            "onDark": "./assets/acme-logo-white.svg"
+          }
+        }
+      ]
+    },
+    "LogoSource": {
+      "description": "One logo shape: a path or Asset for every background, or { onLight, onDark }. onLight is drawn on light backgrounds (usually dark artwork) and onDark on dark backgrounds (usually light artwork), by each slide's background; a missing one uses the other.",
+      "oneOf": [
+        {
+          "$ref": "#/$defs/Asset"
         },
-        "wordmarkDark": {
-          "$ref": "#/$defs/Asset",
-          "description": "Dark-colored wordmark variant intended for rendering on light backgrounds."
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "minProperties": 1,
+          "properties": {
+            "onLight": {
+              "$ref": "#/$defs/Asset",
+              "description": "The logo for light backgrounds, usually dark artwork."
+            },
+            "onDark": {
+              "$ref": "#/$defs/Asset",
+              "description": "The logo for dark backgrounds, usually light or white artwork."
+            }
+          }
         }
-      }
+      ],
+      "examples": [
+        "./assets/acme-mark.svg",
+        {
+          "onLight": "./assets/acme-logo.svg",
+          "onDark": "./assets/acme-logo-white.svg"
+        }
+      ]
     },
     "Watermark": {
       "type": "object",
@@ -2625,41 +2652,26 @@ 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, side by side in one row in the order image, text, socials, date (mirrored in a right-to-left deck), aligned to the zone's edge (left, center or right) and vertically centered on each other; a line break inside text or socials ('\\n') stacks lines within that part. When the parts are wider than the zone their text wraps, and a row that cannot fit even so is reported as overflow. 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. An organization logo is image: 'var:organization.logo.icon'. See docs/templates-and-variables.md.",
+      "additionalProperties": false,
       "properties": {
-        "logo": {
-          "type": "boolean",
-          "description": "Whether to render the deck's icon logo in this zone: a slide's design.logo, then design.logo, then the primary organization's logo (LogoSet icon variants first, light ones on dark backgrounds). It is a generated image part in the same box as image; without a logo the engine reports unresolved-content at this field. Use image for a literal picture that is not the deck logo."
-        },
         "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": {
           "$ref": "#/$defs/Asset",
-          "description": "Generic image rendered in this zone, such as a logo, partner mark, certification badge, or icon.",
+          "description": "Image rendered first in this zone's row, such as a logo, partner mark, certification badge, or icon: a path, URL or Asset, or an organization logo reference ('var:organization.logo.icon', 'var:organization.<id>.logo.wordmark'), which resolves for each slide's background (onLight or onDark).",
           "examples": [
-            "asset:acme-logo",
-            "./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}"
+            "var:organization.logo.icon",
+            "./assets/footer-badge.svg",
+            "var:organization.beta.logo"
           ]
         },
         "date": {
@@ -2689,18 +2701,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 +3100,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",
@@ -3111,7 +3111,7 @@ var presentation = {
         },
         "hidden": {
           "type": "boolean",
-          "description": "Whether the slide is hidden from the presented sequence. The player skips it, the PPTX export writes it as a hidden slide, and per-slide image and PDF output skips it unless the caller asks to include hidden slides (opf CLI: --include-hidden; the deck-level renderSvg: the opt-in skipHidden). A slide named explicitly (opf render --slides, renderSvg slideIndex) is still rendered."
+          "description": "Whether the slide is hidden from the presented sequence. The player skips it, the PPTX export writes it as a hidden slide, and per-slide image and PDF output skips it unless the caller asks to include hidden slides (opf CLI: --include-hidden; the deck-level toSvg: the opt-in skipHidden). A slide named explicitly (opf convert --slides, toSvg with a slide number) is still rendered."
         },
         "composition": {
           "$ref": "#/$defs/Composition"

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

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

package/dist/{chunk-FQSIIADJ.js → chunk-DBYZI75U.js}

@@ -1,7 +1,7 @@
-import { Ctx, splitLines, lineRange, readYamlMapping, NOT_CHECKED, OPFMarkdownError, writeYaml, readCsv, DECIMAL, csvField, scalarText } from './chunk-5UEUAW57.js';
-import { parseQuoteLines, levelsFromIndents, parseCodeFence, splitWhen, fenceCode } from './chunk-NAWQR7MN.js';
-import { same, isRecord, runText, isPlainRun, FORMATTING } from './chunk-5TO6I3GB.js';
-import { validate } from './chunk-PX5AWL7Y.js';
+import { Ctx, splitLines, lineRange, readYamlMapping, NOT_CHECKED, OPFMarkdownError, writeYaml, readCsv, DECIMAL, csvField, scalarText } from './chunk-CJPDTLGD.js';
+import { parseQuoteLines, levelsFromIndents, parseCodeFence, splitWhen, fenceCode } from './chunk-VCGRMNY2.js';
+import { same, isRecord, runText, isPlainRun, FORMATTING } from './chunk-RAKEVM52.js';
+import { validate } from './chunk-JT3QXA22.js';
 import { checkCatalogsOption } from './chunk-SPFV27O5.js';
 
 // src/markdown/canon.ts
@@ -789,6 +789,30 @@ function splitSegments(lines, split) {
   }
   return segments;
 }
+function isOutline(lines) {
+  let fence;
+  let comment = false;
+  let notes = false;
+  let headings = 0;
+  for (const { text } of lines) {
+    if (fence !== void 0) {
+      if (fenceClose(fence).test(text)) fence = void 0;
+      continue;
+    }
+    if (comment) {
+      if (text.includes("-->")) comment = false;
+      continue;
+    }
+    if (SEPARATOR.test(text)) return false;
+    if (notes) continue;
+    if (/^#(?:[ \t]|$)/.test(text)) headings++;
+    const open = fenceStart(text);
+    if (open) fence = open.fence;
+    else if (COMMENT.test(text) && !text.includes("-->", text.indexOf("<!--") + 4)) comment = true;
+    else if (NOTES.test(text)) notes = true;
+  }
+  return headings >= 2;
+}
 function joinParagraph(lines) {
   let out = "";
   lines.forEach((raw, k) => {
@@ -1776,7 +1800,8 @@ function fromMarkdown(markdown, options = {}) {
     body = lines.slice(matter.end);
   }
   const document = { ...options.defaults ?? {}, ...front };
-  const segments = splitSegments(body, options.split ?? "rules");
+  const split = options.split ?? "auto";
+  const segments = splitSegments(body, split === "headings" || split === "auto" && isOutline(body) ? "headings" : "rules");
   const slides = [];
   segments.forEach((segment, index) => {
     if (emptySegment(segment)) {