@openpresentation/opf-pptx 0.16.1 → 0.18.0

package/dist/furniture-provenance.js

@@ -1,9 +1,10 @@
 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 {resolveLogo} from '@openpresentation/opf/composition';
+import {mediaKey} from './media-dedupe.js';
 import {NATIVE_PLACEHOLDERS, footerValue, isNativePlaceholderType, readNativePlaceholders} from './native-furniture.js';
 
 const TAG = 'OPF_FURNITURE_V1';
@@ -15,8 +16,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).
@@ -26,6 +27,8 @@ const platformId = new RegExp(schemas.presentation.$defs.Socials.propertyNames.p
 const socialLines = part => part.links.map(link => ({platform: link.platform,
   scheme: link.href && !/^[a-z][a-z0-9+.-]*:/i.test(link.text) ? 'https://' : ''}));
 const object = value => value !== null && typeof value === 'object' && !Array.isArray(value);
+const LOGO_REFERENCE = /^var:organization(?:\.[A-Za-z0-9_-]{1,64}){1,3}$/;
+const isLogoReference = value => typeof value === 'string' && value.length <= 200 && LOGO_REFERENCE.test(value);
 const key = part => `${part.kind}.${part.zone}.${part.field}`;
 // Key order is not meaning: a value merged from native placeholders equals the same value read from a manifest.
 const canonical = value => JSON.stringify(value, (key, item) => object(item) ? Object.fromEntries(Object.entries(item).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) : item);
@@ -72,12 +75,13 @@ 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, 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) and the
+// organization logo reference of a zone `image` (`images`, RR-71: `{reference, media?, drawn?}` per `kind.zone`). Current native
+// shapes supply all words, image bytes and alt text, even after edits; a recorded format, template or logo reference is kept
+// only while the current text or picture still matches it exactly.
+export function furnitureManifest(presentation, slide, layout, slideIndex, staticDates = new Map(), natives = new Map(), authored) {
+  const definitions = {}, formats = {}, templates = {}, images = {};
   for (const kind of kinds) {
     const local = slide.design?.[kind] !== undefined;
     const source = local ? slide.design[kind] : presentation.design?.[kind];
@@ -85,50 +89,44 @@ export function furnitureManifest(presentation, slide, layout, slideIndex, stati
     const value = source === false ? false : {};
     if (value !== false) for (const zone of zones) if (source[zone] !== undefined) {
       value[zone] = {};
+      // An organization logo reference (`var:organization.logo.icon`): core lays out an image part with `reference`; the manifest keeps
+      // the authored string. With no part (the organization has no logo) the reference is all there is, and import restores it.
+      const reference = isLogoReference(source[zone].image) ? source[zone].image : undefined;
+      const imagePart = layout.parts.find(part => part.kind === kind && part.zone === zone && part.type === 'image');
+      if (reference !== undefined) images[`${kind}.${zone}`] = imagePart ? {reference} : {reference, drawn: false};
       for (const field of fields) if (source[zone][field] !== undefined) {
         const current = source[zone][field];
+        if (field === 'image' && reference !== undefined && !imagePart) continue;
         value[zone][field] = field === 'image' ? 'native' : typeof current === 'string' ? 'literal' : current;
       }
       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.
-  const logos = [];
-  for (const kind of kinds) {
-    const source = (slide.design?.[kind] !== undefined ? slide.design : presentation.design)?.[kind];
-    for (const zone of zones) if (definitions[kind]?.value?.[zone] && source?.[zone]?.logo === true) {
-      logos.push({kind, zone, drawn: layout.parts.some(part => part.field === 'logo' && part.kind === kind && part.zone === zone)});
-    }
-  }
   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} : {}),
-    parts: layout.parts.flatMap((part, index) => part.field === 'logo' ? [] : [{kind: part.kind, zone: part.zone, field: part.field,
+    ...(Object.keys(templates).length ? {templates} : {}), ...(Object.keys(images).length ? {images} : {}),
+    ...(layout.parts.some(part => part.field === 'socials') ? {organizationId: organization?.id} : {}),
+    parts: layout.parts.map((part, index) => ({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)} : {})}]),
-    ...(logos.length ? {logos} : {})};
+      ...(natives.has(index) ? {ph: natives.get(index)} : {})}))};
 }
 
-// The manifest index of a layout part: logo parts are not in the manifest, so later parts shift down.
-export const manifestPartIndex = (parts, index) => parts.slice(0, index).filter(part => part.field !== 'logo').length;
-
-export function attachFurnitureTags(entries, records, manifests, logoRecords = new Map()) {
+export function attachFurnitureTags(entries, records, manifests) {
   attachTextTags(entries, records, TAG, 'opfFurniture', 'furniture', {pictures: true});
-  // A generated logo picture carries the logo tag (never the furniture tag): see logo-provenance.js.
-  attachTextTags(entries, logoRecords, LOGO_TAG, 'opfFurnitureLogo', 'furniture logo', {pictures: true});
   const types = [];
   for (const [path, manifest] of manifests) {
     const part = `ppt/tags/opfFurnitureSlide${manifest.group}.xml`;
@@ -150,6 +148,49 @@ export function attachFurnitureTags(entries, records, manifests, logoRecords = n
   if (types.length) entries['[Content_Types].xml'] = enc.encode(dec.decode(entries['[Content_Types].xml']).replace('</Types>', types.join('') + '</Types>'));
 }
 
+/**
+ * An organization `logo` value reduced to what logo resolution needs (RR-71): the shapes and tones that exist, each as a
+ * placeholder string (a stored picture, an asset reference and a path all count), or undefined when it has none.
+ */
+export function logoShape(value) {
+  if (typeof value === 'string') return value.trim() ? 'x' : undefined;
+  if (!object(value)) return undefined;
+  if (typeof value.src === 'string') return value.src.trim() ? 'x' : undefined;
+  if (typeof value.$opfMedia === 'string') return 'x';
+  const kept = Object.fromEntries(Object.entries(value).map(([name, item]) => [name, logoShape(item)]).filter(([, item]) => item !== undefined));
+  return Object.keys(kept).length ? kept : undefined;
+}
+
+// The content key of the embedded bytes of a picture: its main blip's media part.
+function pictureKey(picture, relationships, entries) {
+  const target = relationships.get(picture?.['p:blipFill']?.['a:blip']?.['r:embed'])?.path;
+  return target && entries[target] ? mediaKey(entries[target]) : undefined;
+}
+
+/**
+ * Finish the `images` of each slide manifest once the package is final (SVG parts, format conversion and media de-duplication
+ * change what a picture embeds): the media key of every logo-reference picture, or `drawn: false` when the picture could not be
+ * embedded. Rewrites the slide's furniture tag part. `names` maps `<slide part>|<kind>.<zone>` to the picture's object name.
+ */
+export function stampFurnitureImageKeys(entries, manifests, names, relationshipsOf) {
+  for (const [path, manifest] of manifests) {
+    if (!manifest.images) continue;
+    const xml = dec.decode(entries[path]), relationships = relationshipsOf(entries, path);
+    const pictures = [...xml.matchAll(/<p:pic>[\s\S]*?<\/p:pic>/g)].map(match => match[0]);
+    for (const [slot, entry] of Object.entries(manifest.images)) {
+      if (entry.drawn === false) continue;
+      const name = names.get(`${path}|${slot}`);
+      const embed = name === undefined ? undefined : pictures.find(picture => picture.match(/<p:cNvPr\b[^>]*\bname="([^"]+)"/)?.[1] === name)?.match(/<a:blip\b[^>]*r:embed="([^"]+)"/)?.[1];
+      const target = embed === undefined ? undefined : relationships.get(embed)?.path;
+      if (target && entries[target]) entry.media = mediaKey(entries[target]);
+      else entry.drawn = false;
+    }
+    const part = `ppt/tags/opfFurnitureSlide${manifest.group}.xml`;
+    if (!entries[part]) throw Error('Missing furniture tag part.');
+    entries[part] = enc.encode(dec.decode(entries[part]).replace(/\bval="[^"]*"/, () => `val="${encodeTextTag(manifest)}"`));
+  }
+}
+
 function readTags(container, relationships, entries) {
   const tags = [];
   let unreadable = false;
@@ -164,6 +205,29 @@ function readTags(container, relationships, entries) {
     ambiguous: unreadable || tags.filter(tag => /^OPF_/i.test(tag.name) && tag.name.toUpperCase() !== SLIDE_TAG).length !== 1};
 }
 
+// RR-72: a part written once on the slide master or a layout is stored under `shared` (keyed by slot, with `on`, the definition's
+// flag and its text template or logo reference), so importers that read only slide shapes ignore it. Put it back in place, as a
+// part marked `on`, before the manifest is validated as one record.
+function withSharedParts(manifest) {
+  if (manifest?.shared === undefined) return manifest;
+  check(object(manifest.shared) && object(manifest.definitions) && Array.isArray(manifest.parts), 'Invalid shared furniture.');
+  const result = {...manifest, definitions: structuredClone(manifest.definitions), parts: [...manifest.parts],
+    ...(manifest.templates ? {templates: {...manifest.templates}} : {}), ...(manifest.images ? {images: {...manifest.images}} : {})};
+  delete result.shared;
+  for (const [slot, entry] of Object.entries(manifest.shared)) {
+    check(object(entry) && ['master', 'layout'].includes(entry.on) && slot === key(entry) && entry.ph === undefined, 'Invalid shared furniture part.');
+    const {on, flag, template, image, ...part} = entry;
+    const zone = result.definitions[entry.kind]?.value?.[entry.zone];
+    check(object(zone) && zone[entry.field] === undefined && flag !== undefined, 'Invalid shared furniture part.');
+    zone[entry.field] = flag;
+    const place = `${entry.kind}.${entry.zone}`;
+    if (template !== undefined) { check(entry.field === 'text' && result.templates?.[place] === undefined, 'Invalid shared furniture text.'); (result.templates ??= {})[place] = template; }
+    if (image !== undefined) { check(entry.field === 'image' && result.images?.[place] === undefined, 'Invalid shared furniture image.'); (result.images ??= {})[place] = image; }
+    result.parts.push({...part, on});
+  }
+  return result;
+}
+
 function validateManifest(manifest) {
   check(manifest?.v === 1 && manifest.role === 'slide' && /^\d{1,10}$/.test(manifest.group), 'Invalid slide identity.');
   check(object(manifest.definitions) && Object.keys(manifest.definitions).length > 0 && Object.keys(manifest.definitions).every(kind => kinds.includes(kind)), 'Invalid furniture definitions.');
@@ -184,14 +248,24 @@ function validateManifest(manifest) {
       }
     }
   }
-  if (manifest.logos !== undefined) {
-    check(Array.isArray(manifest.logos) && manifest.logos.length <= 6, 'Invalid furniture logos.');
-    const seen = new Set();
-    for (const logo of manifest.logos) {
-      const slot = `${logo?.kind}.${logo?.zone}`;
-      check(object(logo) && kinds.includes(logo.kind) && zones.includes(logo.zone) && typeof logo.drawn === 'boolean' && Object.keys(logo).length === 3 &&
-        object(manifest.definitions[logo.kind]?.value?.[logo.zone]) && !seen.has(slot), 'Invalid furniture logo.');
-      seen.add(slot);
+  if (manifest.images !== undefined) {
+    check(object(manifest.images), 'Invalid furniture images.');
+    for (const [slot, entry] of Object.entries(manifest.images)) {
+      const [kind, zone, extra] = slot.split('.');
+      const flag = manifest.definitions[kind]?.value?.[zone]?.image;
+      check(extra === undefined && object(manifest.definitions[kind]?.value?.[zone]) && object(entry) && Object.keys(entry).every(name => ['reference', 'media', 'drawn'].includes(name)) &&
+        isLogoReference(entry.reference) && (entry.media === undefined || (typeof entry.media === 'string' && /^\d{1,12}:[0-9a-f]{1,32}$/.test(entry.media))) &&
+        (entry.drawn === undefined || (entry.drawn === false && entry.media === undefined)) &&
+        // A reference with no part at all has no image flag; one with a part has the part's flag.
+        (flag === 'native' || (flag === undefined && entry.drawn === false)), 'Invalid furniture image.');
+    }
+  }
+  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) {
@@ -207,34 +281,80 @@ function validateManifest(manifest) {
     check(object(part) && expected.get(key(part)) === part.type, 'Ambiguous furniture part.');
     check(Number.isSafeInteger(part.count) && part.count >= 1 && part.count <= 10000 && (part.type !== 'image' || part.count === 1), 'Invalid furniture line count.');
     // RR-11: a footer part that is a native PowerPoint placeholder (dt, ftr, sldNum), unique per slide.
+    // RR-72: a part drawn once on the slide master or a layout.
+    check(part.on === undefined || (['master', 'layout'].includes(part.on) && part.ph === undefined), 'Invalid shared furniture part.');
     if (part.ph !== undefined) check(isNativePlaceholderType(part.ph) && part.kind === 'footer' && part.type === 'text' && part.count === 1 &&
       NATIVE_PLACEHOLDERS[part.ph].field === part.field && manifest.parts.filter(other => other.ph === part.ph).length === 1, 'Invalid native placeholder part.');
     if (part.field === 'socials') check(Array.isArray(part.socials) && part.socials.length >= 1 && part.socials.length <= 100
       && 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.
-function readLogoTags(container, relationships, entries) {
-  const found = [];
-  for (const link of array(container?.['p:tags'])) {
-    const rel = relationships.get(link['r:id']);
-    if (rel?.type !== REL || rel.targetMode === 'External' || !entries[rel.path]) continue;
-    found.push(...array(parser.parse(dec.decode(entries[rel.path]))['p:tagLst']?.['p:tag']).filter(tag => tag.name?.toUpperCase() === LOGO_TAG));
+// 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);
+}
+
+// RR-72: the tagged furniture shapes of the slide's layout and master, by `on` and slot, and whether the slide shows them: a slide
+// whose "Hide background graphics" is on (showMasterSp="0") shows neither; a layout with it hides the master's.
+function inheritedRecords(context, entries) {
+  const inherited = context.inherited?.() ?? {};
+  const records = new Map(), damaged = {};
+  for (const on of ['layout', 'master']) {
+    const source = inherited[on];
+    if (!source) continue;
+    for (const [type, nodes, properties] of [['text', source.shapes, 'p:nvSpPr'], ['image', source.pictures, 'p:nvPicPr']]) {
+      for (const [index, node] of nodes.entries()) {
+        const container = node[properties]?.['p:nvPr']?.['p:custDataLst'];
+        const result = readTags(container, source.relationships, entries);
+        // A tag that cannot be read (a missing part, two identities) leaves the part's shape unknown: that is damage, not a removal.
+        if (array(container?.['p:tags']).length && result.tags.length !== 1 && result.ambiguous) damaged[on] = true;
+        for (const tag of result.tags) {
+          let data;
+          try { data = decodeTextTag(tag.val); } catch { damaged[on] = true; continue; }
+          if (result.ambiguous || data?.v !== 1 || typeof data.slot !== 'string' || data.role !== type) { damaged[on] = true; continue; }
+          const slot = `${on}|${data.slot}`;
+          records.set(slot, [...(records.get(slot) ?? []), {type, index, data}]);
+        }
+      }
+    }
   }
-  return found;
+  const hiddenSlide = context.root?.showMasterSp === '0' || context.root?.showMasterSp === 'false';
+  const hiddenLayout = inherited.layout?.root?.showMasterSp === '0' || inherited.layout?.root?.showMasterSp === 'false';
+  return {sources: inherited, records, damaged, hidden: {layout: hiddenSlide, master: hiddenSlide || hiddenLayout}};
 }
 
-function readSlide(context, entries, slideIndex, slideCount, report, taggedText) {
-  const {root, shapes, paragraphs, pictures, relationships, readPicture} = context;
+function readSlide(context, entries, slideIndex, slideCount, report, taggedText, section, draw, logoOwner) {
+  const {root, shapes, pictures, relationships} = context;
   const candidates = {};
   const records = [];
   let invalidRecord = false;
@@ -248,26 +368,19 @@ function readSlide(context, entries, slideIndex, slideCount, report, taggedText)
       } catch { invalidRecord = true; }
     }
   }
-  // Generated logo pictures: identity only, the bytes come from design.logo.
-  const logoPictures = [];
-  for (const [index, node] of pictures.entries()) try {
-    for (const tag of readLogoTags(node['p:nvPicPr']?.['p:nvPr']?.['p:custDataLst'], relationships, entries)) {
-      const data = decodeTextTag(tag.val);
-      if (data?.role === 'furniture') logoPictures.push({index, data});
-    }
-  } catch { invalidRecord = true; }
   const tags = readTags(root['p:cSld']?.['p:custDataLst'], relationships, entries);
-  if (!tags.tags.length && !records.length && !invalidRecord && !logoPictures.length) return candidates;
+  if (!tags.tags.length && !records.length && !invalidRecord) return candidates;
   let manifest;
   try {
     check(!tags.ambiguous && tags.tags.length === 1 && !invalidRecord, 'Missing or ambiguous furniture manifest/shape tags.');
-    manifest = decodeTextTag(tags.tags[0].val);
+    manifest = withSharedParts(decodeTextTag(tags.tags[0].val));
     validateManifest(manifest);
     for (const record of records) {
       const data = record.data, part = manifest.parts[data?.part];
       check(data?.v === 1 && data.group === manifest.group && Number.isSafeInteger(data.part) && part && data.role === record.type && part.type === record.type, 'Unmatched furniture identity.');
     }
   } catch (error) { report(slideIndex, error.message); return candidates; }
+  const inherited = manifest.parts.some(part => part.on) ? inheritedRecords(context, entries) : undefined;
   for (const kind of kinds) {
     const definition = manifest.definitions[kind];
     if (!definition) continue;
@@ -277,25 +390,42 @@ 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: []};
-      // 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);
-        check(found.length <= 1, 'Duplicated furniture logo.');
-        if (found.length) { candidate.pictures.push(found[0].index); value[logo.zone].logo = true; }
-        else if (!logo.drawn) value[logo.zone].logo = true;
+      const candidate = {scope: definition.scope, value, text: [], pictures: [], socials: []};
+      // A logo reference with no part (the organization had no logo to draw) returns as the reference.
+      for (const [slot, entry] of Object.entries(manifest.images ?? {})) {
+        const [slotKind, slotZone] = slot.split('.');
+        if (slotKind === kind && entry.drawn === false && !definition.value?.[slotZone]?.image && value !== false) value[slotZone].image = entry.reference;
       }
       for (const [partIndex, part] of manifest.parts.entries()) {
         if (part.kind !== kind) continue;
-        const group = records.filter(record => record.data.part === partIndex);
+        // A part on the master or a layout is read there; the slide's own shapes otherwise.
+        const source = part.on ? inherited.sources[part.on] : context;
+        const group = part.on ? (inherited.hidden[part.on] || !source ? [] : inherited.records.get(`${part.on}|${key(part)}`) ?? []) : records.filter(record => record.data.part === partIndex);
+        const {paragraphs, relationships} = source ?? context;
+        const logo = part.type === 'image' ? manifest.images?.[`${kind}.${part.zone}`] : undefined;
+        // The picture of a logo reference could not be embedded at export: the reference is all there is.
+        if (logo?.drawn === false && group.length === 0) { value[part.zone].image = logo.reference; continue; }
         // A native placeholder PowerPoint's Header & Footer dialog removed is a deliberate removal, not damage.
         if (part.ph !== undefined && group.length === 0) { removedNative = true; continue; }
+        // So is a master or layout part the slide no longer shows (deleted there, another layout, or the slide's background graphics hidden).
+        if (part.on !== undefined && group.length === 0) {
+          check(inherited.hidden[part.on] || !inherited.damaged[part.on], 'Damaged furniture tags on the slide master or layout.');
+          removedNative = true;
+          continue;
+        }
+        try {
         check(group.length === part.count, 'Incomplete or duplicated furniture part.');
         if (part.type === 'image') {
-          const current = readPicture(pictures[group[0].index]);
-          check(current?.kind === 'image', 'Furniture image is no longer recoverable.');
-          value[part.zone].image = current.payload.image;
-          candidate.pictures.push(group[0].index);
+          // An unchanged picture of an organization logo returns as its reference (the organization is stored with its logo, and the
+          // picture still embeds the bytes export drew); an edited, replaced or foreign one is an ordinary image.
+          const picture = source.pictures[group[0].index];
+          if (logo && logoOwner(logo.reference) && logo.media !== undefined && logo.media === pictureKey(picture, relationships, entries)) value[part.zone].image = logo.reference;
+          else {
+            const current = source.readPicture(picture);
+            check(current?.kind === 'image', 'Furniture image is no longer recoverable.');
+            value[part.zone].image = current.payload.image;
+          }
+          if (!part.on) candidate.pictures.push(group[0].index);
         } else {
           const ordered = Array(part.count);
           for (const record of group) {
@@ -305,22 +435,26 @@ 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;
-          candidate.text.push(...ordered.map(record => record.index));
+          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;
+          if (!part.on) candidate.text.push(...ordered.map(record => record.index));
+        }
+        } catch (error) {
+          // A part on the slide master or a layout is never slide content: when its record no longer reads, its current words (or
+          // picture) stay the part's value, as literal text, and the damage is reported.
+          if (!part.on) throw error;
+          report(slideIndex, `${kind}.${part.zone}.${part.field}: ${error.message} The current ${part.type === 'image' ? 'picture' : 'words'} on the slide master or layout are kept.`);
+          if (part.type === 'image') {
+            const current = source.readPicture(source.pictures[group[0].index]);
+            if (current?.kind === 'image') value[part.zone].image = current.payload.image;
+          } else if (part.field !== 'socials') {
+            const lines = [...group].sort((a, b) => (Number.isSafeInteger(a.data.line) ? a.data.line : 0) - (Number.isSafeInteger(b.data.line) ? b.data.line : 0) || a.index - b.index);
+            value[part.zone][part.field] = lines.map(record => (paragraphs[record.index] ?? []).map(paragraph => paragraph.text).join('\n')).join('\n');
+          }
         }
       }
       check(new Set(candidate.text).size === candidate.text.length && new Set(candidate.pictures).size === candidate.pictures.length, 'Repeated furniture shape identity.');
@@ -339,14 +473,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 +500,25 @@ 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} = {}) {
+  // A logo reference returns only while the stored organizations still give it a logo (RR-71): `organizations` carry `logo`.
+  const logoOwner = reference => {
+    try { return resolveLogo({organization: organizations.filter(item => item.logo !== undefined)}, {}, {reference}) !== null; } catch { return false; }
+  };
   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, logoOwner));
+  // 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 +536,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 +544,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/image-fallback-node.js

@@ -13,12 +13,12 @@ export async function webpToPng(bytes) {
 // not installed, and also when it is installed but its PNG converter (`@resvg/resvg-js`, an optional peer of opf-render
 // 0.16) is not: opf-render's `converter-missing` error maps to the same code, with its install command on `install`.
 //
-// This is the one place the exporter calls the renderer. opf-render's svgToPng(svg, {fonts, scale, background}) takes the
+// This is the one place the exporter calls the renderer. opf-render's toPng(svg, {fonts, scale, background}) takes the
 // fonts handle for the faces it may draw with: here only the bundled ones, never the system's.
 export async function svgToPng(svg, {scale, text}) {
   let render;
   try {
-    ({svgToPng: render} = await import('@openpresentation/opf-render'));
+    ({toPng: render} = await import('@openpresentation/opf-render'));
   } catch (error) {
     const unavailable = new Error('SVG pictures need the optional peer @openpresentation/opf-render (or an options.svgRasterizer).', {cause: error});
     unavailable.code = 'svg-rasterizer-unavailable';

package/dist/index.d.ts

@@ -97,7 +97,7 @@ export interface ToPptxOptions {
   /**
    * OPF_DOCUMENT_V1 / OPF_SLIDE_V1 customer-data tags that let fromPptx restore
    * catalog references, layout ids, authoring metadata (`filename` and `extensions`
-   * included), `design.logo`, the asset registry, slide `section`/`extensions` and
+   * included), `design.logo` (a logo reference or `false`), the organizations with their logos, the asset registry, slide `section`/`extensions` and
    * the slide content structure: nested groups, promoted regions, the root payload
    * form, block ids and extensions, group composition (docs/document-roundtrip.md).
    * Tags are not shown in PowerPoint's UI. Default "full"; "references-only"
@@ -131,7 +131,7 @@ export interface ToPptxOptions {
   /**
    * Draws the PNG fallback of an SVG picture (the raster older viewers show; PowerPoint 2016 and Microsoft 365 draw the SVG itself). It receives the
    * sanitized SVG text and the pixel size to draw (the SVG's own aspect, about 192 dpi of the displayed size) and returns PNG bytes with a transparent
-   * background. It must be deterministic for the export to be. Default in Node: opf-render's `svgToPng` (resvg with the bundled fonts), loaded only when an
+   * background. It must be deterministic for the export to be. Default in Node: opf-render's `toPng` (resvg with the bundled fonts), loaded only when an
    * SVG is exported (optional peer `@openpresentation/opf-render`). Without it, and without opf-render, an SVG picture exports as the "Image unavailable"
    * placeholder with an `unresolved-asset` diagnostic (`reason: "svg-rasterizer-unavailable"`); a browser build has no default.
    */
@@ -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;