@openpresentation/opf-pptx 0.16.1 → 0.17.0

package/README.md

@@ -155,7 +155,7 @@ The first importer is mechanical and schema-compatible:
 - Unknown non-text shapes and unsupported graphic frames become editable text fallback blocks instead of failing the import.
 - Catalog references (`design.theme`, `colorScheme`, `fontScheme`, `dimensions`, `background`, slide `layout`), slide ids and authoring metadata (`narrative`, `tone`, `audience`, `purpose`, `language`, `organization`, `speaker`, ...) are stored at export in `OPF_DOCUMENT_V1` / `OPF_SLIDE_V1` customer-data tags. Import restores a reference while the theme colors, theme fonts, slide size, background or slide arrangement it produced are unchanged. After an edit, the observed native values stay and `design-reference-changed` / `layout-reference-changed` name the reference. `toPptx` option `provenance: 'references-only' | false` limits or disables these invisible tags. In `full` mode the document tag also lists the document-level defaults the document left to the engine (`$schema`, `name`, `language`, the theme, colour scheme, font scheme and slide size), and import leaves them absent while the package still shows the default, so an untouched round trip is deep-equal to the source (RR-59); a value edited in PowerPoint imports as observed. Slide layout intent (layout reference, type, composition, composition hints and the embedded layout record with its catalogs group and source) lives in each `OPF_SLIDE_V1` record, so a slide keeps its layout even without the document tag, for example when it is pasted into another deck (FF-29). A layout that resolves only in a registered catalog stores no record and restores where `fromPptx` is given that catalog. See [document round trips](docs/document-roundtrip.md) for exactly what is embedded.
 - The slide's content structure is part of `OPF_SLIDE_V1` too (`full` mode): nested `group` blocks, promoted regions (`left`, `top:left`, ...), a root payload (`text`, `items`, `chart`, ...) versus `blocks`, block `id`s and `extensions`, group `composition`, with the reference-pixel box of every leaf from the same composition the export drew. Import matches the native shapes to those boxes and rebuilds the authored form while the slide's arrangement is unchanged, so `slide.type` validates again; a slide whose blocks no longer fit the stored boxes keeps its flat blocks and reports `content-structure-changed` at `slides.N`; a duplicated slide reports `duplicate-block-id` and drops the repeated id. The document tag also stores `filename`, root `extensions`, slide `section` and `extensions`, `design.logo` (deck and slide) and the whole `assets` registry; a `data:` source that is not an exported picture is stored inline up to 256 KiB, so an organization logo or speaker photo given as a data URI round-trips.
-- Slide `section` labels are written as PowerPoint's native section list (`p14:sectionLst` in `ppt/presentation.xml`, whatever the `provenance` option): one section per run of consecutive slides with the same label, runs without a label as `Default Section`, with deterministic ids. Import reads the list back (`Default Section` means no section); it wins over the stored value and over the section text a footer shows (`section-reference-changed` at `slides.N.section`), except that an edited footer line keeps its text while the list still equals the stored value. The native PowerPoint check of the sections pane and save/reopen is a separate gate (`scratchpad/spec-gaps-native/`).
+- Slide `section` labels are written as PowerPoint's native section list (`p14:sectionLst` in `ppt/presentation.xml`, whatever the `provenance` option): one section per run of consecutive slides with the same label, runs without a label as `Default Section`, with deterministic ids. Import reads the list back (`Default Section` means no section); it wins over the stored value (a footer's `{{slide.section}}` is only the token, so no footer text names the section), except that the stored label stands while the list still names it. The native PowerPoint check of the sections pane and save/reopen is a separate gate (`scratchpad/spec-gaps-native/`).
 
 There is no AI classification pass in the OSS runtime. Hosts can run optional cleanup or semantic remapping after `fromPptx` returns. A host that wants to rebuild structure (code, metrics, quotes, timelines, regions) in a deck that did not come from OPF can ask for the raw shape facts such a step needs; see [Import signals](#import-signals).
 
@@ -453,12 +453,12 @@ Version 0.5.0 requires core 0.7.0 and renderer 0.5.0 for coordinated previews. `
 
 Version 0.8.0 exports editable native lines with explicit four-space tab stops. Boundary tags contain no original source words, so native edits and deletions remain authoritative. XML-unrepresentable scalar controls reject with an actionable path rather than silently losing characters. Twenty wide/portrait measured/estimated export cases, current-text mutation controls and damaged-tag fallbacks pass; native Office acceptance remains separate. The coordinated core browser workflow also verifies editing, undo and exact reimport.
 
-Version 0.9.1 exports core's accepted header/footer text and picture geometry as editable tagged slide shapes. Since RR-11 the footer's first text, date and slide number are native PowerPoint Header & Footer placeholders ([core issue87](https://github.com/OpenPresentation/opf/issues/87), [native header and footer](docs/native-header-footer.md)); releases up to 0.11.7 wrote every part as a tagged shape. Dedicated `OPF_FURNITURE_V1` tags describe roles, line boundaries, inactive flags and global/local scope. A slide manifest represents empty or disabled definitions without adding a visible shape. Tags contain no original text, image bytes or alt text. Reimport reads those values from current native shapes; complete groups recover literal dates, section/organization metadata and page-number intent when the current number matches the current slide position.
+Version 0.9.1 exports core's accepted header/footer text and picture geometry as editable tagged slide shapes. Since RR-11 the footer's first text, date and slide number are native PowerPoint Header & Footer placeholders ([core issue87](https://github.com/OpenPresentation/opf/issues/87), [native header and footer](docs/native-header-footer.md)); releases up to 0.11.7 wrote every part as a tagged shape. Dedicated `OPF_FURNITURE_V1` tags describe roles, line boundaries, inactive flags and global/local scope. A slide manifest represents empty or disabled definitions without adding a visible shape. Tags contain no original text, image bytes or alt text. Reimport reads those values from current native shapes; complete groups recover literal dates and the authored zone `text` with its slide-scoped tokens while the current words still match this slide.
 
-Slide numbers inside those shapes are native PowerPoint slide-number fields (`<a:fld type="slidenum">`), so PowerPoint renumbers them when slides move. A `slideNumberFormat` such as `"A-{current}"` or `"{current} / {total}"` keeps its literal text and `{total}` (the exported slide count) as fixed runs around the field; PowerPoint has no slide-count field. A current date (`date: true`) needs the host's `date` option (ISO `YYYY-MM-DD`); it becomes a native `datetime1`–`datetime7` field when its `dateFormat` matches that en-US field type, and otherwise fixed text with a `furniture-date-fixed` diagnostic. An eligible date or number range that spans accepted text lines stays static and reports `furniture-field-fixed` at its source path; no native field is created by merging shapes. A string date with `dateFormat` is fixed text. The slide manifest records `slideNumberFormat`/`dateFormat` settings, never their rendered words: reimport keeps a format only while the current native text still matches it (a slide number at its current position, a fixed date that parses back to the same ISO date), and a live date keeps the pattern of its current field type. Otherwise the current words import as literal text. Hiding furniture on a title slide is a slide-level `design.footer: false`/`design.header: false`, which round-trips as before.
+A header or footer zone's `text` is the author's own string (FA-31): generated values are `{{ }}` variables in it. Each `{{slide.number}}` is a native PowerPoint slide-number field (`<a:fld type="slidenum">`) when its line fits one accepted text line, so PowerPoint renumbers it when slides move; the text around it (`"A-{{slide.number}}"`, `"Page {{slide.number}} of {{deck.slideCount}}"`) is ordinary runs. `{{deck.slideCount}}` (the exported slide count after pagination) and `{{slide.section}}` are fixed text, because PowerPoint has no slide-count or section field; the deck-wide variables (`{{organization.name}}`, `{{customer}}`) resolve before export like any other string. In body text every slide-scoped token is fixed text with the slide's value. Each slide is composed and drawn from core's substituted slide, so text is measured with the real value. A current date (`date: true`) needs the host's `date` option (ISO `YYYY-MM-DD`); it becomes a native `datetime1`–`datetime7` field when its `dateFormat` matches that en-US field type, and otherwise fixed text with a `furniture-date-fixed` diagnostic. An eligible date or number range that spans accepted text lines stays static and reports `furniture-field-fixed` at its source path; no native field is created by merging shapes. A string date with `dateFormat` is fixed text. The slide manifest records `dateFormat` settings and, for a zone whose `{{ }}` tokens are all built-in variables, that authored text as given to `toPptx`, before the deck-wide pass (`templates`); it never records rendered dates. Reimport keeps a format or the authored text only while the current native text still matches it (a fixed date that parses back to the same ISO date; the authored text drawn for this slide equals the current words: deck-wide built-ins resolved from the stored organization and speakers, then the slide's number, count and section), and a live date keeps the pattern of its current field type. Otherwise the current words import as literal text, with each native slide-number field as `{{slide.number}}` (typed words that spell a token are escaped as `\{{`). Hiding furniture on a title slide is a slide-level `design.footer: false`/`design.header: false`, which round-trips as before.
 
 When a supported current-date field wraps across lines, full provenance records a versioned static-date reason, its format and exact line fingerprints, without cached date words. Complete unchanged soft-wrapped lines can then recover `date: true` and the authored format on reimport, so a later OPF export can use a new host date. The original PPTX date remains static: this does not establish native refresh or Office compatibility. Actual current native date fields take precedence. Edited or cleared text, damaged evidence, older unmarked exports, `references-only` and `provenance: false` remain literal/current-content fallbacks. Fingerprints detect changed text; writable tags are not authentication. Native formatting and geometry are not reconstructed.
 
-Missing, duplicated or inconsistent furniture tags fall back to current native content with an `invalid-furniture-provenance` diagnostic. Conflicting organization or section values also fall back. Inherited definitions become global only when every slide has a valid definition/override and all inherited values agree; otherwise recovered definitions stay local. Reordering slides with unchanged visible page numbers preserves those numbers as ordinary text instead of silently renumbering them. Native typography, positioning, crop and unrelated metadata are not reconstructed; `furniture-import-reflow` requests review. `npm run test:furniture` exercises XML conversion and mutation controls. Native Office, visual corpus and clean installed-package acceptance remain separate gates; published tagged-shape furniture (0.9.1 to 0.11.7) does not establish native Header/Footer support.
+Missing, duplicated or inconsistent furniture tags fall back to current native content with an `invalid-furniture-provenance` diagnostic. Social profiles (`socials: true`) belong to the organization the manifest names by id, which only the stored document record can supply, so a file without it (`provenance: false`, another tool) imports the profile lines as ordinary text with an `invalid-furniture-provenance` diagnostic. Inherited definitions become global only when every slide has a valid definition/override and all inherited values agree; otherwise recovered definitions stay local. A moved slide keeps its live slide-number field (it imports as `{{slide.number}}` and renumbers in PowerPoint). Native typography, positioning, crop and unrelated metadata are not reconstructed; `furniture-import-reflow` requests review. `npm run test:furniture` exercises XML conversion and mutation controls. Native Office, visual corpus and clean installed-package acceptance remain separate gates; published tagged-shape furniture (0.9.1 to 0.11.7) does not establish native Header/Footer support.
 
-Native header and footer placeholders (RR-11): the first footer text becomes a `ftr` placeholder, the first footer date a `dt` placeholder (a live `datetime1`-`datetime7` field for `date: true`) and the first footer slide number an `sldNum` placeholder, each at core's exact box with its furniture tag; the slide master and layout carry the three placeholders and `p:hf` flags, and the notes master records that notes pages carry a page number only. Header parts, organization, section, socials, images, second text/date/number parts and multi-line text stay tagged shapes (PowerPoint has no object for them). `fromPptx` reads the placeholders back with or without provenance, and a deck changed through PowerPoint's Insert > Header & Footer dialog imports the change. Every deck, with or without a footer, carries the three master and layout placeholders (flags off when unused), so Insert > Header & Footer works on a deck with no footer. The mapping table, the dialog-edit table and the vetoable decisions are in [docs/native-header-footer.md](docs/native-header-footer.md).
+Native header and footer placeholders (RR-11): the first footer text becomes a `ftr` placeholder, the first footer date a `dt` placeholder (a live `datetime1`-`datetime7` field for `date: true`) and the first footer slide number an `sldNum` placeholder, each at core's exact box with its furniture tag; the slide master and layout carry the three placeholders and `p:hf` flags, and the notes master records that notes pages carry a page number only. A zone `text` with a `{{slide.number}}` is the `sldNum` placeholder (its other words are fixed runs); any other zone `text` is the `ftr` placeholder. Header parts, socials, images, second text/date/number parts and multi-line text stay tagged shapes (PowerPoint has no object for them). `fromPptx` reads the placeholders back with or without provenance, and a deck changed through PowerPoint's Insert > Header & Footer dialog imports the change. Every deck, with or without a footer, carries the three master and layout placeholders (flags off when unused), so Insert > Header & Footer works on a deck with no footer. The mapping table, the dialog-edit table and the vetoable decisions are in [docs/native-header-footer.md](docs/native-header-footer.md).

package/dist/code-provenance.js

@@ -91,7 +91,7 @@ export function nativeShapeParagraphs(xml, rootElement = 'p:sld') {
     };
     for (const child of paragraph) {
       if (child['a:br'] !== undefined) text += '\n';
-      if (child['a:fld'] !== undefined) fields.push({type: String(child[':@']?.type ?? ''), text: children(child['a:fld'],'a:t').map(plainText).join('')});
+      if (child['a:fld'] !== undefined) fields.push({type: String(child[':@']?.type ?? ''), text: children(child['a:fld'],'a:t').map(plainText).join(''), start: text.length});
       text += readRuns(child);
       if (child['mc:AlternateContent'] !== undefined) {
         // FF-45: an a14:m math zone (an OMML equation, m:oMathPara) has no OPF model. Its mc:Fallback runs (the text PowerPoint

package/dist/document-provenance.js

@@ -928,6 +928,20 @@ export function slideListBreaks(entries, path, root, rels) {
   }
 }
 
+/**
+ * The authoring metadata the stored document record (OPF_DOCUMENT_V1) holds (organization, speaker, ...), or {} when it is missing
+ * or unreadable. Furniture import reads it before the slides: a socials part belongs to an organization by id, and a stored
+ * header or footer text with built-in variables ({{organization.name}}) is drawn from it. Read only; nothing is restored here.
+ */
+export function storedMetadata(entries, presentationRoot, presentationRels) {
+  try {
+    const found = readTag(entries, presentationRoot?.['p:custDataLst'], presentationRels, DOCUMENT_TAG);
+    if (found.missing) return {};
+    const metadata = validateDocument(found.value).metadata;
+    return object(metadata) ? metadata : {};
+  } catch { return {}; }
+}
+
 /**
  * Read OPF_DOCUMENT_V1 / OPF_SLIDE_V1 and decide what still matches the
  * package. Nothing is modified here: the result lists restore groups (one per
@@ -949,7 +963,7 @@ export function slideListBreaks(entries, path, root, rels) {
  * `nativeSections` is the package's native section list as one name (or
  * undefined) per slide, or null when the package has no list.
  */
-export function restoreDocumentProvenance(imported, {entries, presentationRoot, presentationRels, slides, organizationConflict = false, speakerConflict = false, catalogs: hostCatalogs, nativeSections = null, schemaOption = false}, report) {
+export function restoreDocumentProvenance(imported, {entries, presentationRoot, presentationRels, slides, catalogs: hostCatalogs, nativeSections = null, schemaOption = false}, report) {
   const invalid = message => report({code: 'invalid-document-provenance', path: '', message: `${message} Ordinary import keeps the values observed in the PPTX.`});
   let document;
   try {
@@ -1018,27 +1032,24 @@ export function restoreDocumentProvenance(imported, {entries, presentationRoot,
     return true;
   };
 
-  // Sections: three sources can name a slide's section. The native section
-  // list (PowerPoint's sections pane), the section text a footer shows, and the
-  // stored OPF_SLIDE_V1 value. The list is native data and wins, except when
-  // the list still equals the stored value and the footer text differs: then
-  // the footer was edited and its text is kept, as before. Without a list the
-  // stored value is the fallback for a slide whose footer shows none.
-  // Labels compare the way the native list stores them: tab, LF and CR are
-  // spaces in an XML attribute, and a blank label is no section.
-  const blank = value => typeof value !== 'string' || value.trim() === '';
-  const normalized = value => blank(value) ? '' : value.replace(/[\t\n\r]/g, ' ');
-  const sameSection = (a, b) => normalized(a) === normalized(b);
+  // Sections: two sources name a slide's section, the native section list (PowerPoint's sections pane) and the stored
+  // OPF_SLIDE_V1 value. The list is native data and wins, except that the stored label stands while the list still names it:
+  // a label is an XML attribute, so tab, LF and CR come back from the list as spaces (src/sections.js) and compare as such.
+  // Without a list the stored value is the fallback. (A footer's `{{slide.section}}` is only the token, FA-31: no footer
+  // shows the section text any more.)
+  const spaced = value => (typeof value !== 'string' || value.trim() === '') ? '' : value.replace(/[\t\n\r]/g, ' ');
   const reconcileSection = (index, stored) => {
-    const shown = imported.slides[index]?.section;
     if (!nativeSections) {
-      if (stored !== undefined && shown === undefined) group(`slides.${index}.section`, [set(['slides', index, 'section'], clone(stored))]);
+      if (stored !== undefined) group(`slides.${index}.section`, [set(['slides', index, 'section'], clone(stored))]);
       return;
     }
     const listed = nativeSections[index];
-    if (sameSection(shown, listed) || (stored !== undefined && sameSection(listed, stored) && shown !== undefined)) return;
-    if (shown !== undefined) report({code: 'section-reference-changed', path: `slides.${index}.section`, message: `The footer of slides.${index} shows section '${shown}' but PowerPoint's section list ${listed === undefined ? 'has the slide in no named section' : `names '${listed}'`}; the section list wins and the footer keeps its current text.`});
-    group(`slides.${index}.section`, [listed === undefined ? remove(['slides', index, 'section']) : set(['slides', index, 'section'], listed)]);
+    // A slide in no named section: the list cannot say a blank label, so the stored blank one (if authored) returns.
+    if (listed === undefined) {
+      if (stored !== undefined && spaced(stored) === '') group(`slides.${index}.section`, [set(['slides', index, 'section'], clone(stored))]);
+      return;
+    }
+    group(`slides.${index}.section`, [set(['slides', index, 'section'], stored !== undefined && spaced(stored) === spaced(listed) ? clone(stored) : listed)]);
   };
 
   // Without document provenance (a slide pasted into another deck, or a
@@ -1189,21 +1200,13 @@ export function restoreDocumentProvenance(imported, {entries, presentationRoot,
   }
 
   // Authoring metadata has no native counterpart. Fields read from native
-  // content (the furniture organization name, linked socials) win over their
-  // stored values; stored-only fields (logo, role ...) return.
+  // content (linked socials) win over their stored values; stored-only fields
+  // (name, logo, role ...) return.
   const metadata = document.metadata ?? {};
   // The exporter writes the default creator when no author was authored: with the document record present, that default is not the author.
   if (metadata.author === undefined && imported.author === DEFAULT_AUTHOR) group('author', [remove(['author'])]);
   for (const key of METADATA) {
     if (metadata[key] === undefined) continue;
-    if (key === 'organization' && organizationConflict) {
-      report({code: 'metadata-reference-changed', path: 'organization', message: 'Slides now show different organization names in their furniture, so the stored organization was not restored; each slide keeps its visible text.'});
-      continue;
-    }
-    if (key === 'speaker' && speakerConflict) {
-      report({code: 'metadata-reference-changed', path: 'speaker', message: 'Slides now show different speaker names in their furniture, so the stored speaker was not restored; each slide keeps its visible text.'});
-      continue;
-    }
     if (key === 'author') {
       // Native evidence: the stored authored form only stands for the creator it was joined into.
       if (joinAuthors(imported.author) === joinAuthors(metadata.author)) group('author', [set(['author'], clone(metadata.author))]);
@@ -1222,14 +1225,6 @@ export function restoreDocumentProvenance(imported, {entries, presentationRoot,
       else if (Array.isArray(value)) value[index] = {...list[index], ...merge(list[index], clone(observed))};
       else value = {...value, ...merge(value, clone(observed))};
     }
-    if (key === 'speaker' && object(imported.speaker)) {
-      // The furniture speaker line (name and title) is native content and wins over the stored speaker with the same id.
-      const observed = imported.speaker, list = array(value), index = list.findIndex(item => object(item) && item.id === observed.id);
-      const merged = stored => { const {title: _title, ...rest} = stored; return {...rest, ...clone(observed)}; };
-      if (index < 0) value = clone(observed);
-      else if (Array.isArray(value)) value[index] = merged(list[index]);
-      else value = merged(value);
-    }
     group(key, [set([key], value)]);
   }
 

package/dist/furniture-fields.js

@@ -107,19 +107,51 @@ export function parseDate(text, pattern) {
   return formatDate(iso, pattern) === text ? iso : null;
 }
 
-export function formatSlideNumber(format, current, total) {
-  if (typeof format !== 'string' || !format.includes('{current}') || (format.includes('{total}') && !Number.isSafeInteger(total))) return null;
-  return format.split(/(\{current\}|\{total\})/).map(piece => piece === '{current}' ? String(current) : piece === '{total}' ? String(total) : piece).join('');
+/**
+ * Live field ranges for one accepted furniture text part: core's `part.fields` (one `slideNumber` per substituted
+ * `{{slide.number}}`, one `date` for a current date), as half-open UTF-16 offsets into `part.text`.
+ */
+export function furniturePartFields(part) {
+  return Array.isArray(part.fields) ? part.fields : [];
 }
 
+/** True when a core text part carries at least one slide-number field. */
+export const hasSlideNumberField = part => furniturePartFields(part).some(field => field.type === 'slideNumber');
+
+export const SLIDE_NUMBER_TOKEN = '{{slide.number}}';
+// The slide-scoped tokens core substitutes per slide (core SLIDE_TOKEN_BODY): typed text that spells one must be
+// escaped, or the next export would turn it into a live value.
+const literalSlideToken = /\{\{(?=\s*(?:slide(?:\.[A-Za-z0-9_-]+){1,2}|deck\.slideCount)\s*(?:\|[^{}]*)?\}\})/g;
+const slideTokenUsed = /\{\{\s*(?:slide\.|deck\.slideCount)/;
+/** True when a string mentions a slide-scoped token (escaped or not). */
+export const mentionsSlideToken = text => typeof text === 'string' && slideTokenUsed.test(text);
+const anyToken = /(\\)?\{\{\s*([^{}|]*?)\s*(?:\|[^{}]*)?\}\}/g;
+const builtinName = /^(?:speakers|(?:deck|speaker|organization|slide)(?:\.[A-Za-z0-9_-]+){1,2})$/;
 /**
- * Live field ranges for one accepted furniture text part. Core >= FF-27 supplies
- * `part.fields`; earlier cores only supply a bare generated number, which is
- * still a whole slide-number field.
+ * True when a zone text uses {{ }} and every unescaped token in it is a built-in variable (core's pattern: deck.*, speaker.*,
+ * speakers, organization.*, slide.*, deck.slideCount). Such an authored text is stored in the furniture manifest because the deck-wide
+ * pass resolves its built-ins before export; a text with a user variable ({{customer}}) is not: the filled deck is what round-trips.
  */
-export function furniturePartFields(part) {
-  if (Array.isArray(part.fields)) return part.fields;
-  return part.field === 'slideNumber' && /^\d+$/.test(part.text) ? [{type: 'slideNumber', start: 0, end: part.text.length}] : [];
+export function isBuiltinTemplate(text) {
+  if (typeof text !== 'string' || !text.includes('{{')) return false;
+  for (const match of text.matchAll(anyToken)) if (!match[1] && !builtinName.test(match[2])) return false;
+  return true;
+}
+export const escapeSlideTokens = text => text.replace(literalSlideToken, '\\{{');
+
+/**
+ * The zone `text` a native footer or header line stands for: every native slide-number field (`{type, text, start}`,
+ * `start` an offset into `text`) becomes `{{slide.number}}`, and typed words that spell a slide-scoped token stay
+ * literal. A field whose words are not at its recorded offset is left as the words it shows.
+ */
+export function slideNumberTemplate(text, nativeFields) {
+  let cursor = 0, out = '';
+  for (const field of [...nativeFields].filter(field => field.type === 'slidenum').sort((a, b) => a.start - b.start)) {
+    if (!(field.start >= cursor) || text.slice(field.start, field.start + field.text.length) !== field.text) continue;
+    out += escapeSlideTokens(text.slice(cursor, field.start)) + SLIDE_NUMBER_TOKEN;
+    cursor = field.start + field.text.length;
+  }
+  return out + escapeSlideTokens(text.slice(cursor));
 }
 
 /** Native <a:fld> type for a core field, or null when the value must stay fixed text. */

package/dist/furniture-provenance.js

@@ -1,7 +1,7 @@
 import {XMLParser} from 'fast-xml-parser';
 import {attachTextTags, decodeTextTag, encodeTextTag} from './code-provenance.js';
 import {sourceLineParagraphs} from './text-provenance.js';
-import {DEFAULT_DATE_FORMAT, NATIVE_DATE_FIELDS, formatSlideNumber, parseDate} from './furniture-fields.js';
+import {DEFAULT_DATE_FORMAT, NATIVE_DATE_FIELDS, isBuiltinTemplate, mentionsSlideToken, parseDate, slideNumberTemplate} from './furniture-fields.js';
 import {schemas} from '@openpresentation/opf';
 import {LOGO_TAG} from './logo-provenance.js';
 import {NATIVE_PLACEHOLDERS, footerValue, isNativePlaceholderType, readNativePlaceholders} from './native-furniture.js';
@@ -15,8 +15,8 @@ const enc = new TextEncoder(), dec = new TextDecoder('utf-8', {fatal: true});
 const parser = new XMLParser({ignoreAttributes: false, attributeNamePrefix: '', parseTagValue: false, trimValues: false});
 const array = value => value === undefined ? [] : Array.isArray(value) ? value : [value];
 const kinds = ['header', 'footer'], zones = ['left', 'center', 'right'];
-const fields = ['text', 'image', 'organization', 'speaker', 'socials', 'section', 'slideNumber', 'date'];
-const settings = ['slideNumberFormat', 'dateFormat'];
+const fields = ['text', 'image', 'socials', 'date'];
+const settings = ['dateFormat'];
 const dateFormatForField = Object.fromEntries(Object.entries(NATIVE_DATE_FIELDS).map(([format, type]) => [type, format]));
 // Platform keys follow the Socials schema's propertyNames pattern exactly, so
 // every key a valid document can carry re-imports (and nothing else does).
@@ -72,12 +72,11 @@ function unchangedStaticDate(marker, format, ordered, paragraphs) {
   }), 'Current static date text or boundaries differ from the exported lines.');
 }
 
-// This manifest contains topology, identities, inactive flags and format
-// settings only. Current native shapes supply all words, image bytes and alt
-// text, even after edits; a recorded format is kept only while the current text
-// still matches it exactly.
-export function furnitureManifest(presentation, slide, layout, slideIndex, staticDates = new Map(), natives = new Map()) {
-  const definitions = {}, formats = {};
+// This manifest contains topology, identities, inactive flags, format settings and the authored text of a zone whose
+// `text` uses built-in variables (`templates`, FA-31; `authored` is the document as given to toPptx, before the deck-wide pass). Current native shapes supply all words, image bytes and
+// alt text, even after edits; a recorded format or template is kept only while the current text still matches it exactly.
+export function furnitureManifest(presentation, slide, layout, slideIndex, staticDates = new Map(), natives = new Map(), authored) {
+  const definitions = {}, formats = {}, templates = {};
   for (const kind of kinds) {
     const local = slide.design?.[kind] !== undefined;
     const source = local ? slide.design[kind] : presentation.design?.[kind];
@@ -91,13 +90,19 @@ export function furnitureManifest(presentation, slide, layout, slideIndex, stati
       }
       const format = Object.fromEntries(settings.filter(setting => typeof source[zone][setting] === 'string').map(setting => [setting, source[zone][setting]]));
       if (Object.keys(format).length) formats[`${kind}.${zone}`] = format;
+      // The authored text with its built-in tokens, so import restores them while the words still match this slide:
+      // {{slide.number}} is a native field; {{deck.slideCount}} and {{slide.section}} are fixed words; the deck-wide built-ins
+      // ({{organization.name}}) were resolved before export. A text that also uses a user variable is not stored (the filled deck
+      // round-trips); then only a slide-scoped token in the resolved text is.
+      const original = (local ? authored?.slide?.design?.[kind] : authored?.presentation?.design?.[kind])?.[zone]?.text;
+      if (isBuiltinTemplate(original)) templates[`${kind}.${zone}`] = original;
+      else if (mentionsSlideToken(source[zone].text)) templates[`${kind}.${zone}`] = source[zone].text;
     }
     definitions[kind] = {scope: local ? 'local' : 'global', value};
   }
   if (!Object.keys(definitions).length) return null;
   const organizations = array(presentation.organization);
   const organization = organizations.find(item => item.role === 'primary') ?? organizations[0];
-  const speaker = array(presentation.speaker)[0];
   // Generated deck logos (logo: true) are listed beside the topology, never inside it: the part list and the field
   // definitions are validated strictly by every released importer (0.11.6 and earlier reject an unknown field there),
   // so they keep describing only what those importers know. `drawn` is false when no logo resolved at export.
@@ -109,13 +114,11 @@ export function furnitureManifest(presentation, slide, layout, slideIndex, stati
     }
   }
   return {v: 1, role: 'slide', group: String(slideIndex), definitions, ...(Object.keys(formats).length ? {formats} : {}),
-    ...(layout.parts.some(part => part.field === 'organization' || part.field === 'socials') ? {organizationId: organization?.id} : {}),
-    ...(layout.parts.some(part => part.field === 'speaker') ? {speakerId: speaker?.id} : {}),
+    ...(Object.keys(templates).length ? {templates} : {}),
+    ...(layout.parts.some(part => part.field === 'socials') ? {organizationId: organization?.id} : {}),
     parts: layout.parts.flatMap((part, index) => part.field === 'logo' ? [] : [{kind: part.kind, zone: part.zone, field: part.field,
       type: part.type, count: part.type === 'image' ? 1 : part.fit.lines.length,
       ...(part.field === 'socials' ? {socials: socialLines(part)} : {}),
-      // The speaker part is one line, "Name, Title" or "Name": the name's length lets import split it again (lengths, never words).
-      ...(part.field === 'speaker' ? {nameLength: speaker.name.length} : {}),
       ...(staticDates.has(index) ? {staticDate: staticDates.get(index)} : {}),
       // RR-11: this part is a native PowerPoint placeholder (dt, ftr or sldNum); deleting it in PowerPoint's dialog is then intent.
       ...(natives.has(index) ? {ph: natives.get(index)} : {})}]),
@@ -194,6 +197,14 @@ function validateManifest(manifest) {
       seen.add(slot);
     }
   }
+  if (manifest.templates !== undefined) {
+    check(object(manifest.templates), 'Invalid furniture texts.');
+    for (const [slot, template] of Object.entries(manifest.templates)) {
+      const [kind, zone, extra] = slot.split('.');
+      check(extra === undefined && manifest.definitions[kind]?.value?.[zone]?.text === 'literal' && typeof template === 'string' &&
+        template.length <= 100000 && template.includes('{{'), 'Invalid furniture text.');
+    }
+  }
   if (manifest.formats !== undefined) {
     check(object(manifest.formats), 'Invalid furniture formats.');
     for (const [slot, format] of Object.entries(manifest.formats)) {
@@ -213,13 +224,9 @@ function validateManifest(manifest) {
       && part.socials.every(line => object(line) && platformId.test(line.platform) && schemes.includes(line.scheme))
       && new Set(part.socials.map(line => line.platform)).size === part.socials.length, 'Invalid social profile lines.');
     else check(part.socials === undefined, 'Unexpected social profile lines.');
-    if (part.field === 'speaker') check(Number.isSafeInteger(part.nameLength) && part.nameLength >= 1 && part.nameLength <= 100000, 'Invalid speaker name length.');
-    else check(part.nameLength === undefined, 'Unexpected speaker name length.');
     expected.delete(key(part));
   }
-  if (manifest.parts.some(part => part.field === 'speaker')) check(typeof manifest.speakerId === 'string' && /^[a-zA-Z0-9_-]+$/.test(manifest.speakerId), 'Invalid speaker identity.');
-  else check(manifest.speakerId === undefined, 'Unexpected speaker identity.');
-  if (manifest.parts.some(part => part.field === 'organization' || part.field === 'socials')) check(typeof manifest.organizationId === 'string' && /^[a-zA-Z0-9_-]+$/.test(manifest.organizationId), 'Invalid organization identity.');
+  if (manifest.parts.some(part => part.field === 'socials')) check(typeof manifest.organizationId === 'string' && /^[a-zA-Z0-9_-]+$/.test(manifest.organizationId), 'Invalid organization identity.');
 }
 
 // The logo tags of a picture: any other OPF tag next to one is not an identity conflict for the furniture reader.
@@ -233,7 +240,37 @@ function readLogoTags(container, relationships, entries) {
   return found;
 }
 
-function readSlide(context, entries, slideIndex, slideCount, report, taggedText) {
+// The native fields of the lines of one tagged text part, with offsets into the text sourceLineParagraphs joins from them.
+function orderedFields(ordered, paragraphs) {
+  const fields = [];
+  let base = 0;
+  for (const item of ordered) {
+    const current = paragraphs[item.index] ?? [];
+    let at = base;
+    for (const paragraph of current) {
+      for (const field of paragraph.fields ?? []) fields.push({...field, start: at + field.start});
+      at += paragraph.text.length + 1;
+    }
+    base += current.map(paragraph => paragraph.text).join('\n').length + item.data.separator.length;
+  }
+  return fields;
+}
+
+// A zone `text`: the stored template while it still draws exactly the words now on the slide (`position.draw` resolves its
+// deck-wide built-ins from the document's own metadata and its slide-scoped tokens for this slide); otherwise the words as they
+// stand, with each native slide-number field as `{{slide.number}}`.
+function importedZoneText(text, nativeFields, template, position) {
+  if (template !== undefined) {
+    const drawn = position.draw(template, position);
+    if (typeof drawn !== 'string') return slideNumberTemplate(text, nativeFields);
+    // A section name is an XML attribute in the native list: tab, LF and CR come back as spaces (src/sections.js).
+    const spaced = value => value.replace(/[\t\n\r]/g, ' ');
+    if (drawn === text || (position.section !== undefined && spaced(drawn) === spaced(text))) return template;
+  }
+  return slideNumberTemplate(text, nativeFields);
+}
+
+function readSlide(context, entries, slideIndex, slideCount, report, taggedText, section, draw) {
   const {root, shapes, paragraphs, pictures, relationships, readPicture} = context;
   const candidates = {};
   const records = [];
@@ -277,7 +314,7 @@ function readSlide(context, entries, slideIndex, slideCount, report, taggedText)
       if (value !== false) for (const zone of zones) if (definition.value[zone] !== undefined) {
         value[zone] = Object.fromEntries(Object.entries(definition.value[zone]).filter(([, flag]) => flag === false));
       }
-      const candidate = {scope: definition.scope, value, text: [], pictures: [], organizations: [], speakers: [], socials: [], sections: []};
+      const candidate = {scope: definition.scope, value, text: [], pictures: [], socials: []};
       // logo: true returns as its flag; the generated picture is consumed, never content or an image field.
       for (const logo of (manifest.logos ?? []).filter(item => item.kind === kind)) {
         const found = logoPictures.filter(item => item.data.v === 1 && item.data.group === manifest.group && item.data.furniture === kind && item.data.zone === logo.zone);
@@ -305,21 +342,12 @@ function readSlide(context, entries, slideIndex, slideCount, report, taggedText)
           }
           const text = sourceLineParagraphs(ordered, paragraphs)[0].text;
           const format = manifest.formats?.[`${kind}.${part.zone}`] ?? {};
-          if (part.field === 'slideNumber') {
-            // The live field renumbers in PowerPoint; any fixed text around it
-            // must still match the recorded format at this slide's position.
-            check(text === formatSlideNumber(format.slideNumberFormat ?? '{current}', slideIndex + 1, slideCount), 'Current slide number differs from its position; retain the visible number as ordinary text.');
-            if (format.slideNumberFormat !== undefined) value[part.zone].slideNumberFormat = format.slideNumberFormat;
-          }
-          if (part.field === 'section') candidate.sections.push(text);
-          if (part.field === 'organization') candidate.organizations.push({id: manifest.organizationId, name: text});
-          if (part.field === 'speaker') candidate.speakers.push(importedSpeaker(manifest.speakerId, text, part.nameLength));
           if (part.field === 'socials') {
             const lines = text.split('\n');
             check(lines.length === part.socials.length && lines.every(line => line.trim()), 'Current social profile lines no longer match their platforms.');
             candidate.socials.push({id: manifest.organizationId, socials: Object.fromEntries(part.socials.map((line, index) => [line.platform, line.scheme + lines[index]]))});
           }
-          value[part.zone][part.field] = part.field === 'text' ? text : part.field === 'date' ? importedDate(definition.value[part.zone].date, format, text, ordered.flatMap(record => (paragraphs[record.index] ?? []).flatMap(paragraph => paragraph.fields ?? [])), value[part.zone], part.staticDate, ordered, paragraphs, message => report(slideIndex, `${kind}.${part.zone}.date: ${message}`)) : true;
+          value[part.zone][part.field] = part.field === 'text' ? importedZoneText(text, orderedFields(ordered, paragraphs), manifest.templates?.[`${kind}.${part.zone}`], {index: slideIndex, count: slideCount, section, draw}) : part.field === 'date' ? importedDate(definition.value[part.zone].date, format, text, ordered.flatMap(record => (paragraphs[record.index] ?? []).flatMap(paragraph => paragraph.fields ?? [])), value[part.zone], part.staticDate, ordered, paragraphs, message => report(slideIndex, `${kind}.${part.zone}.date: ${message}`)) : true;
           candidate.text.push(...ordered.map(record => record.index));
         }
       }
@@ -339,14 +367,6 @@ function readSlide(context, entries, slideIndex, slideCount, report, taggedText)
   return candidates;
 }
 
-// The generated speaker line is "Name, Title" (or "Name"). The recorded name length splits it again; a line edited in
-// PowerPoint that no longer has the separator at that position is the visible text as the name, with no title.
-function importedSpeaker(id, text, nameLength) {
-  const rest = text.slice(nameLength);
-  if (text.length > nameLength && rest.startsWith(', ') && rest.length > 2) return {id, name: text.slice(0, nameLength), title: rest.slice(2)};
-  return {id, name: text};
-}
-
 // A current native date field wins. Full-mode static-wrap evidence can recover
 // generated OPF intent without turning the existing PPTX text into a live field. A fixed
 // date keeps its ISO value and pattern only when the current text round-trips.
@@ -374,37 +394,21 @@ function importedDate(flag, format, text, nativeFields, zone, marker, ordered, p
 // Reconcile metadata before consuming any shapes. Global inheritance is promoted
 // only when every slide has a valid definition/override and all inherited values
 // agree. A missing tag must never cause another slide's furniture to reappear.
-export function importFurniture(contexts, entries, onDiagnostic) {
+// `options.sections` are the native section names by slide index (a slide's `{{slide.section}}` is checked against them),
+// `options.organizations` the stored organizations (OPF_DOCUMENT_V1) a socials part can name by id, and `options.draw(template,
+// {index, count, section})` draws a stored zone text for a slide (its built-in variables resolved from the document's metadata).
+export function importFurniture(contexts, entries, onDiagnostic, {sections = [], organizations = [], draw = () => undefined} = {}) {
   const report = (index, message) => onDiagnostic?.({code: 'invalid-furniture-provenance', path: `slides.${index}.design`, message: `${message} Ordinary import retains current native content; no old source words are restored.`});
   const taggedText = contexts.map(() => new Set());
-  const candidates = contexts.map((context, index) => readSlide(context, entries, index, contexts.length, report, taggedText[index]));
-  const organizations = candidates.flatMap(slide => Object.values(slide).flatMap(candidate => candidate.organizations));
-  const organizationConflict = organizations.some(item => !same(item, organizations[0]));
-  if (organizationConflict) {
-    for (const [index, slide] of candidates.entries()) for (const kind of kinds) if (slide[kind]?.organizations.length) {
-      delete slide[kind]; report(index, `${kind}: Current organization metadata disagrees across repeated fields.`);
-    }
-  }
-  const speakers = candidates.flatMap(slide => Object.values(slide).flatMap(candidate => candidate.speakers));
-  const speakerConflict = speakers.some(item => !same(item, speakers[0]));
-  if (speakerConflict) {
-    for (const [index, slide] of candidates.entries()) for (const kind of kinds) if (slide[kind]?.speakers.length) {
-      delete slide[kind]; report(index, `${kind}: Current speaker metadata disagrees across repeated fields.`);
-    }
-  }
-  for (const [index, slide] of candidates.entries()) {
-    const sections = Object.values(slide).flatMap(candidate => candidate.sections);
-    if (sections.some(section => section !== sections[0])) for (const kind of kinds) if (slide[kind]?.sections.length) {
-      delete slide[kind]; report(index, `${kind}: Current section metadata disagrees on this slide.`);
-    }
-  }
-  // Social profiles belong to the organization named by repeated furniture; without
-  // that name (or with disagreeing values) the lines stay ordinary current text.
-  const owner = candidates.flatMap(slide => Object.values(slide).flatMap(candidate => candidate.organizations))[0];
+  const candidates = contexts.map((context, index) => readSlide(context, entries, index, contexts.length, report, taggedText[index], sections[index], draw));
+  // Social profiles belong to the organization the manifest names by id, which only the stored document metadata can supply
+  // (no furniture part shows the organization's name any more); without it (or with disagreeing values) the lines stay
+  // ordinary current text.
   const socials = candidates.flatMap(slide => Object.values(slide).flatMap(candidate => candidate.socials));
+  const owner = socials.length ? organizations.find(item => item.id === socials[0].id) : undefined;
   if (socials.length && (!owner || socials.some(item => item.id !== owner.id || !same(item, socials[0])))) {
     for (const [index, slide] of candidates.entries()) for (const kind of kinds) if (slide[kind]?.socials.length) {
-      delete slide[kind]; report(index, `${kind}: ${owner ? 'Current social profile metadata disagrees across repeated fields.' : 'Social profiles need a repeated organization name to rebuild organization metadata.'}`);
+      delete slide[kind]; report(index, `${kind}: ${owner ? 'Current social profile metadata disagrees across repeated fields.' : 'Social profiles need the stored organization metadata to rebuild organization.socials.'}`);
     }
   }
   // RR-11: PowerPoint's own date, footer and slide-number placeholders that no OPF tag claims (a deck authored in
@@ -422,7 +426,7 @@ export function importFurniture(contexts, entries, onDiagnostic) {
     }
     if (!accepted.length) return;
     const merged = footerValue(accepted), indexes = accepted.map(item => item.index);
-    if (!existing) slide.footer = {scope: 'native', value: merged, text: indexes, pictures: [], organizations: [], speakers: [], socials: [], sections: []};
+    if (!existing) slide.footer = {scope: 'native', value: merged, text: indexes, pictures: [], socials: []};
     else {
       if (existing.value === false) existing.value = {};
       for (const zone of Object.keys(merged)) existing.value[zone] = {...existing.value[zone], ...merged[zone]};
@@ -430,20 +434,13 @@ export function importFurniture(contexts, entries, onDiagnostic) {
     }
   });
   const result = {design: {}, slides: candidates.map((slide, index) => {
-    const values = Object.values(slide), sections = values.flatMap(candidate => candidate.sections);
+    const values = Object.values(slide);
     return {design: Object.fromEntries(Object.entries(slide).map(([kind, candidate]) => [kind, candidate.value])),
-      ...(sections.length ? {section: sections[0]} : {}),
       text: new Set(values.flatMap(candidate => candidate.text)), pictures: new Set(values.flatMap(candidate => candidate.pictures)), taggedText: taggedText[index]};
   })};
-  const validOrganizations = candidates.flatMap(slide => Object.values(slide).flatMap(candidate => candidate.organizations));
-  if (validOrganizations.length) result.organization = validOrganizations[0];
+  // The organization the socials belong to: its stored identity, with the profiles the slides show now.
   const validSocials = candidates.flatMap(slide => Object.values(slide).flatMap(candidate => candidate.socials));
-  if (result.organization && validSocials.length) result.organization = {...result.organization, socials: validSocials[0].socials};
-  // Stored document metadata (FF-32) must not override disagreeing visible names.
-  if (organizationConflict) result.organizationConflict = true;
-  const validSpeakers = candidates.flatMap(slide => Object.values(slide).flatMap(candidate => candidate.speakers));
-  if (validSpeakers.length) result.speaker = validSpeakers[0];
-  if (speakerConflict) result.speakerConflict = true;
+  if (owner && validSocials.length) result.organization = {id: owner.id, name: owner.name, socials: validSocials[0].socials};
   for (const kind of kinds) {
     const inherited = candidates.map(slide => slide[kind]).filter(candidate => candidate?.scope === 'global');
     if (inherited.length && candidates.every(slide => slide[kind]) && inherited.every(candidate => same(candidate.value, inherited[0].value))) {

package/dist/index.d.ts

@@ -172,7 +172,7 @@ export interface ToPptxOptions {
 }
 
 export interface FromPptxOptions {
-  /** Reports native details that import cannot preserve, including code provenance fallback/reflow and grouped text transforms. Table paths identify native frame and row/cell indexes (including headers). Stored catalog references that no longer match the package report `design-reference-changed` / `layout-reference-changed` at the reference path; a stored slide layout reference that resolves neither in the stored document catalogs, nor in the slide's own stored record, nor in `catalogs` reports `unresolved-reference`; a slide whose imported blocks no longer fit the stored content structure reports `content-structure-changed` at `slides.N`, a block id repeated by a duplicated slide `duplicate-block-id`, and a footer section text that disagrees with PowerPoint's section list `section-reference-changed` (docs/document-roundtrip.md). */
+  /** Reports native details that import cannot preserve, including code provenance fallback/reflow and grouped text transforms. Table paths identify native frame and row/cell indexes (including headers). Stored catalog references that no longer match the package report `design-reference-changed` / `layout-reference-changed` at the reference path; a stored slide layout reference that resolves neither in the stored document catalogs, nor in the slide's own stored record, nor in `catalogs` reports `unresolved-reference`; a slide whose imported blocks no longer fit the stored content structure reports `content-structure-changed` at `slides.N`, a block id repeated by a duplicated slide `duplicate-block-id` (docs/document-roundtrip.md). */
   onDiagnostic?: (diagnostic: {code: string; path: string; message: string}) => void;
   fallbackName?: string;
   schema?: string;

package/dist/index.js

@@ -27,10 +27,10 @@ import {attachQuoteTags,quoteManifest,importQuoteGroups,quotePhotoName} from './
 import {attachFurnitureTags, furnitureManifest, importFurniture, manifestPartIndex, staticDateFallback} from './furniture-provenance.js';
 import {restoreRunColors} from './run-colors.js';
 import {joinWrappedText} from './content-topology.js';
-import {applyDocumentProvenance, attachDocumentProvenance, documentProvenance, recordContentTopology, restoreDocumentProvenance, joinAuthors, splitAuthors, slideListBreaks, DEFAULT_AUTHOR} from './document-provenance.js';
+import {applyDocumentProvenance, attachDocumentProvenance, documentProvenance, recordContentTopology, restoreDocumentProvenance, joinAuthors, splitAuthors, slideListBreaks, storedMetadata, DEFAULT_AUTHOR, DEFAULT_TITLE} from './document-provenance.js';
 import {INVALID_XML_CHARACTER, nativeSections, writeSectionList} from './sections.js';
 import {attachFurnitureFields, furniturePartFields, lineFields, nativeFieldType} from './furniture-fields.js';
-import {attachNativePlaceholders, defaultPlaceholderGeometry, nativeDateText, nativeFurnitureParts, writeNativeMasters} from './native-furniture.js';
+import {attachNativePlaceholders, defaultPlaceholderGeometry, nativeDateText, nativeFurnitureParts, nativePlaceholderForPart, writeNativeMasters} from './native-furniture.js';
 import {importImageOrientation} from './image-import.js';
 import {extractSignals, normalizeSignalOptions, themeFactsFor} from './import-signals.js';
 import {placeImages, importImages, imageName, imageOverlayName, backgroundImageName, backgroundOverlayName, IMAGE_TREATMENT_KEYS, BACKGROUND_IMAGE_KEYS} from './image-provenance.js';
@@ -59,6 +59,7 @@ import {
   isTemplate,
   OPFCatalogsOptionError,
   resolveSlideContext as resolveCoreSlideContext,
+  resolveSlideVariables,
   resolveVariables,
   validate
 } from "@openpresentation/opf";
@@ -236,7 +237,9 @@ export async function toPptx(input, options = {}) {
   // resolves nowhere instead of composing automatically or drawing with the engine default.
   checkCatalogs('toPptx', options.catalogs);
   options = {...options, strictReferences: options.strictReferences ?? options.strictAssets === true};
-  const presentation = resolveTemplateInput(parseInput(input), options);
+  // The document as given, before the deck-wide variable pass: the furniture manifest records the authored header and footer text.
+  const authored = parseInput(input);
+  const presentation = resolveTemplateInput(authored, options);
   assertValidBoundary(presentation);
   // `options.fonts` is the fonts handle (the renderer's loadFonts()); the exporter reads its measurement, wrapped so the package names the
   // chosen family (FF-31). Internally `options.textMeasurement` is that wrapped measurement; it is not a public option.
@@ -280,6 +283,7 @@ export async function toPptx(input, options = {}) {
   context.furnitureManifests = new Map();
   context.nativeFurniture = new Map();
   context.hostDate = options.date;
+  context.authored = authored;
   context.codeTags = new Map();
   context.captionTags = new Map();
   context.footnoteTags = new Map();
@@ -415,10 +419,23 @@ export async function fromPptx(input, options = {}) {
       readPicture: picture => importPicture(entries, picture, slidePath, relationships,
         diagnostic => options.onDiagnostic?.({...diagnostic, path: `slides.${index}.design`}))};
   });
-  const furniture = importFurniture(furnitureContexts, entries, options.onDiagnostic);
+  // Native sections (PowerPoint's own section list, `Default Section` = none) name each slide's `{{slide.section}}` for the footer text check
+  // and, after the slides, are reconciled with the stored value in restoreDocumentProvenance.
+  const slideSections = nativeSections(presentationRoot, slideIdsInOrder(presentationRoot, presentationRels, entries, slidePaths));
+  const stored = storedMetadata(entries, presentationRoot, presentationRels);
+  // A stored zone text with built-in variables is drawn from the document's own metadata, as toPptx resolved it: the stored record
+  // (organization, speaker ...) and the observed name, description and author (a default the exporter writes is no value).
+  const importedMetadata = {
+    ...(imported.name && imported.name !== DEFAULT_TITLE ? {name: imported.name} : {}),
+    ...(imported.description ? {description: imported.description} : {}),
+    ...(imported.author && joinAuthors(imported.author) !== DEFAULT_AUTHOR ? {author: imported.author} : {}),
+    ...(stored.organization !== undefined ? {organization: stored.organization} : {}),
+    ...(stored.speaker !== undefined ? {speaker: stored.speaker} : {}),
+  };
+  const furniture = importFurniture(furnitureContexts, entries, options.onDiagnostic, {sections: slideSections ?? [], organizations: asArray(stored.organization).filter(item => isPlainObject(item) && typeof item.id === 'string' && typeof item.name === 'string').map(item => ({id: item.id, name: item.name})),
+    draw: (template, {index, count, section}) => drawFurnitureText(template, {index, count, section}, importedMetadata)});
   if (Object.keys(furniture.design).length) imported.design = {...imported.design, ...furniture.design};
   if (furniture.organization) imported.organization = furniture.organization;
-  if (furniture.speaker) imported.speaker = furniture.speaker;
 
   // RR-54: the datasets recorded at export (OPF_DATASETS_V1). Chart and table frames restore their dataset references against
   // them, so the document carries them before document provenance validates the restored document.
@@ -429,9 +446,6 @@ export async function fromPptx(input, options = {}) {
     imported.slides.push(importSlide(entries, slidePaths[index], index, dimensions, {...options, rtlDeck: observedRtl(observedLanguage), deckLang: observedLanguage.lang, codeFamily: Object.keys(entries).some(path => /^ppt\/tags\/opf/i.test(path)) ? importedCodeFamily(imported, options.catalogs) : undefined, dataProvenance: {datasets}}, furniture.slides[index], furnitureContexts[index]));
   }
   if (datasets) imported.datasets = datasets;
-  // Native sections (PowerPoint's own section list, `Default Section` = none)
-  // are reconciled with the footer text and the stored value in restoreDocumentProvenance.
-  const slideSections = nativeSections(presentationRoot, slideIdsInOrder(presentationRoot, presentationRels, entries, slidePaths));
   // A watermark carried identically by every slide is the deck's design.watermark.
   const carried = imported.slides.map(slide => slide.design?.watermark);
   if (carried.length && carried[0] && carried.every(value => JSON.stringify(value) === JSON.stringify(carried[0]))) {
@@ -456,7 +470,7 @@ export async function fromPptx(input, options = {}) {
   let slideProvenance = slidePaths.map(() => ({structure: "untagged"}));
   let restoredGroups = [];
   try {
-    const restored = restoreDocumentProvenance(imported, {entries, presentationRoot, presentationRels, organizationConflict: furniture.organizationConflict === true, speakerConflict: furniture.speakerConflict === true,
+    const restored = restoreDocumentProvenance(imported, {entries, presentationRoot, presentationRels,
       // Stored layout ids also resolve in the host's registered catalogs (FA-23).
       catalogs: options.catalogs,
       nativeSections: slideSections,
@@ -614,6 +628,17 @@ function resolveRelationshipTarget(sourcePartPath, target) {
   return parts.join("/");
 }
 
+// A header or footer text as the exporter drew it for one slide: deck-wide built-ins resolved from `metadata` (core
+// resolveVariables), then the slide-scoped tokens for the slide's position, count and section. undefined when core refuses.
+function drawFurnitureText(template, {index, count, section}, metadata) {
+  try {
+    const slide = resolveVariables({...metadata, slides: [{...(section !== undefined ? {section} : {}), text: template}]}).presentation.slides[0];
+    return resolveSlideVariables(slide, {slideNumber: index + 1, slideCount: count}).text;
+  } catch {
+    return undefined;
+  }
+}
+
 function resolveSlidePaths(entries, presentationRoot, relationships) {
   const slideIds = asArray(presentationRoot["p:sldIdLst"]?.["p:sldId"]);
   const paths = [];
@@ -709,7 +734,6 @@ function importSlide(entries, slidePath, slideIndex, presentationDimensions, opt
   }
   if (imageBackground) slide.design = {background: imageBackground};
   if (Object.keys(furniture.design).length) slide.design = {...slide.design, ...furniture.design};
-  if (furniture.section !== undefined) slide.section = furniture.section;
   nativeContext.imageBlocks = images.blocks;
   nativeContext.imagePictures = images.consumed;
   // An overlay of a background that was not recovered stays an ordinary shape.
@@ -1903,10 +1927,15 @@ function configurePresentation(pptx, presentation, context) {
   };
 }
 
-async function addSlide(pptx, presentation, opfSlide, slideIndex, context, options) {
+async function addSlide(pptx, presentation, authoredSlide, slideIndex, context, options) {
   options = {...options, textMeasurement: slideTextMeasurement(presentation, slideIndex, options)};
   const slide = pptx.addSlide();
   const slideContext = exportSlideContext(presentation, slideIndex, context, options);
+  // FA-31: the slide is composed and drawn with its slide-scoped variables substituted ({{slide.number}}, {{slide.section}},
+  // {{deck.slideCount}} for this position in the exported deck, in body text as fixed text). The authored slide still holds the
+  // tokens: header and footer text is substituted by core's furniture layout (a slide number stays a native field), and the
+  // furniture manifest records the authored text.
+  const opfSlide = slideContext.core.slide;
   const { widthInches, heightInches } = slideContext.dimensions;
   // A slide with no layout, or one whose layout resolves nowhere, is composed with no layout record (automatic composition),
   // as in the preview; core reports the reference as unresolved-reference.
@@ -2009,7 +2038,7 @@ async function addSlide(pptx, presentation, opfSlide, slideIndex, context, optio
   // Core composes furniture above all content and opf-render paints it last, so
   // spTree order (PowerPoint's z-order) matches: header/footer parts come after
   // every content item, and an overlapping footer stays visible over content.
-  await addFurniture(slide,presentation,opfSlide,geometry.furniture,slideContext,options,slideIndex);
+  await addFurniture(slide,presentation,authoredSlide,geometry.furniture,slideContext,options,slideIndex);
 
   if (opfSlide.notes) {
     const notes = String(opfSlide.notes);
@@ -2772,7 +2801,7 @@ function addMeasuredPayloadText(slide, text, box, context, options, config) {
 // The default footer band core composes for a deck with no footer of its own: where a footer added natively lands.
 function defaultFooterParts(composeOptions) {
   try {
-    const slide = {design: {footer: {left: {date: '2026-01-01'}, center: {text: 'Footer'}, right: {slideNumber: true}}}};
+    const slide = {design: {footer: {left: {date: '2026-01-01'}, center: {text: 'Footer'}, right: {text: '{{slide.number}}'}}}};
     // Only the zone boxes and line height are used, and they do not depend on text widths: estimated measurement keeps the host's measurer (and its call count) out of this.
     return (composeSlide(slide, {...composeOptions, textMeasurement: undefined}).furniture?.parts ?? []).filter(part => part.kind === 'footer' && part.type === 'text');
   } catch {
@@ -2780,10 +2809,13 @@ function defaultFooterParts(composeOptions) {
   }
 }
 
+// The slide and deck as given to toPptx (variables not yet resolved), for the furniture manifest's authored header and footer text.
+const authoredFurniture = (context, slideIndex) => ({presentation: context.authored, slide: context.authored?.slides?.[slideIndex]});
+
 async function addFurniture(slide,presentation,source,layout,context,options,slideIndex) {
   if(!layout){
     if(['header','footer'].some(kind=>(source.design?.[kind]??presentation.design?.[kind])))throw new OPFPptxError('missing-furniture-layout','Header/footer export requires coordinated core furniture geometry.',{path:`slides.${slideIndex}.design`});
-    const manifest = furnitureManifest(presentation, source, {parts: []}, slideIndex);
+    const manifest = furnitureManifest(presentation, source, {parts: []}, slideIndex, undefined, undefined, authoredFurniture(context, slideIndex));
     if (manifest) context.furnitureManifests.set(`ppt/slides/slide${slideIndex + 1}.xml`, manifest);
     return;
   }
@@ -2799,8 +2831,8 @@ async function addFurniture(slide,presentation,source,layout,context,options,sli
       else if (objectName) context.furnitureTags.set(objectName, {v:1, role:'image', group:String(slideIndex), part:manifestPartIndex(layout.parts, index)});
     }else{
       if(!part.fit?.sourceLines)throw new OPFPptxError('missing-furniture-layout','Repeated text requires accepted source lines from core.',{path:part.path});
-      // Slide numbers and current dates become native PowerPoint fields; {total}
-      // and fixed dates stay fixed text. A current date whose pattern has no
+      // Slide numbers ({{slide.number}}) and current dates become native PowerPoint fields; {{deck.slideCount}},
+      // {{slide.section}} and fixed dates stay fixed text. A current date whose pattern has no
       // en-US field type is written as its laid-out text.
       const fields=[];
       for(const field of furniturePartFields(part)){
@@ -2820,7 +2852,7 @@ async function addFurniture(slide,presentation,source,layout,context,options,sli
       if(natives.has(index))context.nativeFurniture.set(`OPF furniture ${slideIndex} part ${index} line 0`,natives.get(index));
     }
   }
-  const manifest = furnitureManifest(presentation, source, layout, slideIndex, staticDates, natives);
+  const manifest = furnitureManifest(presentation, source, layout, slideIndex, staticDates, natives, authoredFurniture(context, slideIndex));
   if (manifest) context.furnitureManifests.set(`ppt/slides/slide${slideIndex + 1}.xml`, manifest);
 }
 
@@ -3730,7 +3762,7 @@ function normalizeHex(value, fallback = "000000") {
 function writeNativeFurnitureMasters(output, context) {
   const size = /<p:sldSz\b[^>]*\bcx="(\d+)"[^>]*\bcy="(\d+)"/.exec(decodeText(output['ppt/presentation.xml'][0]));
   const defaults = new Map((context.defaultFooterOptions ? defaultFooterParts(context.defaultFooterOptions) ?? [] : []).flatMap(part => {
-    const ph = {date: 'dt', text: 'ftr', slideNumber: 'sldNum'}[part.field];
+    const ph = nativePlaceholderForPart(part);
     const geometry = ph && defaultPlaceholderGeometry(part);
     return geometry ? [[ph, geometry]] : [];
   }));

package/dist/native-furniture.js

@@ -16,7 +16,7 @@
 // or where core would draw a default footer when no slide has one.
 
 import {XMLParser} from 'fast-xml-parser';
-import {DEFAULT_DATE_FORMAT, NATIVE_DATE_FIELDS, formatDate} from './furniture-fields.js';
+import {DEFAULT_DATE_FORMAT, NATIVE_DATE_FIELDS, formatDate, hasSlideNumberField, slideNumberTemplate} from './furniture-fields.js';
 
 const enc = new TextEncoder(), dec = new TextDecoder('utf-8', {fatal: true});
 const parser = new XMLParser({ignoreAttributes: false, attributeNamePrefix: '', parseTagValue: false, trimValues: false});
@@ -28,25 +28,33 @@ const EMU = 9525;
 export const NATIVE_PLACEHOLDERS = Object.freeze({
   dt: {field: 'date', name: 'Date Placeholder', sz: 'half', idx: 10, masterIdx: 2, zone: 'left', align: 'l'},
   ftr: {field: 'text', name: 'Footer Placeholder', sz: 'quarter', idx: 11, masterIdx: 3, zone: 'center', align: 'ctr'},
-  sldNum: {field: 'slideNumber', name: 'Slide Number Placeholder', sz: 'quarter', idx: 12, masterIdx: 4, zone: 'right', align: 'r'},
+  sldNum: {field: 'text', name: 'Slide Number Placeholder', sz: 'quarter', idx: 12, masterIdx: 4, zone: 'right', align: 'r'},
 });
 const ORDER = ['dt', 'ftr', 'sldNum'];
-const phByField = {date: 'dt', text: 'ftr', slideNumber: 'sldNum'};
 export const isNativePlaceholderType = value => Object.hasOwn(NATIVE_PLACEHOLDERS, value);
-export const nativePlaceholderForField = field => phByField[field];
+/**
+ * The placeholder type a core footer part maps to: a date is `dt`; a zone `text` with a slide-number field
+ * (`{{slide.number}}`) is `sldNum`, its words around the field fixed runs; any other zone `text` is `ftr`.
+ */
+export function nativePlaceholderForPart(part) {
+  if (part.type !== 'text') return undefined;
+  if (part.field === 'date') return 'dt';
+  if (part.field !== 'text') return undefined;
+  return hasSlideNumberField(part) ? 'sldNum' : 'ftr';
+}
 const ZONES = ['left', 'center', 'right'];
 const ALIGN = {left: 'l', center: 'ctr', right: 'r'};
 
 /**
  * Which accepted core parts of one slide become native placeholders: the first
- * footer text, the first footer date and the first footer slide number whose
- * text fits one accepted line. Returns Map<partIndex, 'dt'|'ftr'|'sldNum'>.
+ * footer text, the first footer date and the first footer text with a slide-number
+ * field whose text fits one accepted line. Returns Map<partIndex, 'dt'|'ftr'|'sldNum'>.
  */
 export function nativeFurnitureParts(layout) {
   const chosen = new Map(), taken = new Set();
   for (const [index, part] of (layout?.parts ?? []).entries()) {
-    const ph = phByField[part.field];
-    if (part.kind !== 'footer' || part.type !== 'text' || !ph || taken.has(ph)) continue;
+    const ph = nativePlaceholderForPart(part);
+    if (part.kind !== 'footer' || !ph || taken.has(ph)) continue;
     // One native shape holds one line; a part that wraps or breaks stays tagged shapes.
     if (part.fit?.sourceLines?.length !== 1 || part.fit.lines?.length !== 1 || !part.text || part.links?.length) continue;
     taken.add(ph);
@@ -252,8 +260,9 @@ function zoneOf(bounds, slideWidth, fallback) {
 /**
  * The footer one slide's native placeholders describe. `claimed` is the set of
  * shape indexes OPF provenance already consumed or reserved. Returns
- * {fields: [{zone, field, value, settings, index}], skipped: [index]} where `value`
- * is the OPF field value and `settings` the zone's `dateFormat`/`slideNumberFormat`.
+ * [{zone, field, value, settings, index, ph}] where `value` is the OPF field value (a zone
+ * `text` carries `{{slide.number}}` where the placeholder holds a native slide-number field)
+ * and `settings` the zone's `dateFormat`.
  */
 export function readNativePlaceholders(context, claimed, relationships, readPart) {
   const fields = [];
@@ -262,36 +271,44 @@ export function readNativePlaceholders(context, claimed, relationships, readPart
     if (!isNativePlaceholderType(ph) || claimed.has(index)) continue;
     const paragraphs = context.paragraphs[index] ?? [];
     const text = paragraphs.map(paragraph => paragraph.text).join('\n');
-    const nativeFields = paragraphs.flatMap(paragraph => paragraph.fields ?? []);
+    // The native fields with their offsets into `text` (the paragraphs are joined by a newline).
+    const nativeFields = [];
+    let base = 0;
+    for (const paragraph of paragraphs) {
+      for (const field of paragraph.fields ?? []) nativeFields.push({...field, start: base + (field.start ?? text.indexOf(field.text, base) - base)});
+      base += paragraph.text.length + 1;
+    }
     const zone = zoneOf(inheritedBounds(shape, ph, context.path, relationships, readPart), context.slideWidth, NATIVE_PLACEHOLDERS[ph].zone);
     const properties = NATIVE_PLACEHOLDERS[ph];
     if (ph === 'sldNum') {
-      const live = nativeFields.filter(field => field.type === 'slidenum');
-      if (live.length !== 1) continue;
-      const at = text.indexOf(live[0].text);
-      const format = at < 0 ? undefined : text.slice(0, at) + '{current}' + text.slice(at + live[0].text.length);
-      fields.push({index, zone, field: properties.field, value: true, settings: format && format !== '{current}' ? {slideNumberFormat: format} : {}});
+      // The words around a native slide-number field are the zone text and the field is `{{slide.number}}`.
+      if (!nativeFields.some(field => field.type === 'slidenum')) continue;
+      fields.push({index, zone, ph, field: properties.field, value: slideNumberTemplate(text, nativeFields), settings: {}});
     } else if (ph === 'dt') {
       if (!text.trim()) continue;
       const pattern = nativeFields.length === 1 && nativeFields[0].text === text ? dateFormatForField[nativeFields[0].type] : undefined;
-      if (pattern) fields.push({index, zone, field: properties.field, value: true, settings: pattern === DEFAULT_DATE_FORMAT ? {} : {dateFormat: pattern}});
+      if (pattern) fields.push({index, zone, ph, field: properties.field, value: true, settings: pattern === DEFAULT_DATE_FORMAT ? {} : {dateFormat: pattern}});
       // A fixed date, or a field with no OPF pattern (a time, the master's datetimeFigureOut), keeps its current words.
-      else fields.push({index, zone, field: properties.field, value: text, settings: {}});
+      else fields.push({index, zone, ph, field: properties.field, value: text, settings: {}});
     } else {
       if (!text.trim()) continue;
-      fields.push({index, zone, field: properties.field, value: text, settings: {}});
+      fields.push({index, zone, ph, field: properties.field, value: slideNumberTemplate(text, nativeFields), settings: {}});
     }
   }
   return fields;
 }
 
-/** The OPF footer value for native placeholder fields: zones keyed left/center/right. */
+/**
+ * The OPF footer value for native placeholder fields: zones keyed left/center/right. A footer text and a slide
+ * number in one zone are one `text`: the footer words, then the number's line (the zone stack's order).
+ */
 export function footerValue(fields) {
   const value = {};
-  for (const item of fields) {
+  for (const item of [...fields].sort((a, b) => ORDER.indexOf(a.ph) - ORDER.indexOf(b.ph))) {
     value[item.zone] ??= {};
-    value[item.zone][item.field] = item.value;
-    Object.assign(value[item.zone], item.settings);
+    const zone = value[item.zone];
+    zone[item.field] = item.field === 'text' && typeof zone.text === 'string' ? `${zone.text}\n${item.value}` : item.value;
+    Object.assign(zone, item.settings);
   }
   return Object.fromEntries(ZONES.filter(zone => value[zone]).map(zone => [zone, value[zone]]));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpresentation/opf-pptx",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "description": "Pure local OPF to PPTX export and PPTX to OPF import tooling.",
   "license": "MIT",
   "type": "module",
@@ -54,7 +54,7 @@
     "test:metric": "node test/shared-metric.mjs && node test/metric-provenance.mjs",
     "test:font-variants": "node test/font-variants.mjs",
     "test:timeline": "node test/shared-timeline.mjs",
-    "test:furniture": "node test/shared-furniture.mjs && node test/furniture-provenance.mjs && node test/furniture-fields.mjs && node test/furniture-wrapped-date.mjs && node test/socials-furniture.mjs && node test/native-furniture.mjs",
+    "test:furniture": "node test/shared-furniture.mjs && node test/furniture-provenance.mjs && node test/slide-variables.mjs && node test/furniture-fields.mjs && node test/furniture-wrapped-date.mjs && node test/socials-furniture.mjs && node test/native-furniture.mjs",
     "test:native-picture-edit-controls": "node test/compare-native-picture-edit-controls.mjs",
     "test:native-font-embed-controls": "node test/native-font-embed-controls.mjs",
     "test:native-mixed-edit-controls": "node test/native-mixed-edit-controls.mjs",
@@ -65,7 +65,7 @@
   },
   "dependencies": {
     "@node-projects/jszip": "4.3.0",
-    "@openpresentation/opf": "^0.16.0",
+    "@openpresentation/opf": "^0.17.0",
     "@rgrove/parse-xml": "4.2.3",
     "fast-xml-parser": "^5.8.0",
     "fflate": "^0.8.3",
@@ -73,7 +73,7 @@
     "sharp": "0.35.5"
   },
   "peerDependencies": {
-    "@openpresentation/opf-render": "^0.16.0"
+    "@openpresentation/opf-render": "^0.17.0"
   },
   "peerDependenciesMeta": {
     "@openpresentation/opf-render": {
@@ -92,7 +92,7 @@
     "@expo-google-fonts/roboto": "0.4.3",
     "@expo-google-fonts/roboto-mono": "0.4.2",
     "@expo-google-fonts/tinos": "0.4.2",
-    "@openpresentation/opf-render": "0.16.0",
+    "@openpresentation/opf-render": "0.17.0",
     "@resvg/resvg-js": "2.6.2",
     "esbuild": "0.28.2",
     "playwright": "1.63.0"