@openpresentation/opf-pptx 0.8.0 → 0.8.1

package/README.md

@@ -1,5 +1,9 @@
 # OPF PPTX
 
+Version 0.8.1 requires core 0.10.1, including metric, quote and timeline layout placeholders and the corrected text-bullet contract. It retains the existing PowerPoint export APIs.
+
+Unfinished prepared shaping work is preserved in the [September 15 roadmap](docs/roadmap-shaping-20260915.md); it is not part of the published runtime.
+
 Version 0.8.0 and this checkout require Node 24 (`24.x`). Use `.nvmrc` for local development. Earlier published versions retain their original engine declarations. Browser entrypoints remain browser-safe; native application compatibility is verified separately.
 
 Version 0.8.0 consumes shared heading/scalar/rich line placement, including `textRasterPadding`, through editable native line boxes without autofit. Complete heading tags retain title/subtitle/tag roles, line ordering and current edited text during import. Source boundary metadata also records hard-line separators, so complete scalar/heading groups recover current native text with spaces, tabs and exact authored line endings. Incomplete, duplicate, ambiguous or bulleted groups fall back to ordinary import with diagnostics. Legacy heading tags retain their prior native-line behavior; arbitrary formatting, nesting and geometry are not reconstructed. See the [source contract and limits](https://github.com/OpenPresentation/opf/blob/f94125a1ff95bf0974a055fe1c081d348dad54f2/docs/plans/text-placement.md). Native raster certification remains separate.
@@ -232,3 +236,7 @@ Export consumes the same core geometry as SVG. It writes native merged cells and
 Version 0.5.0 requires core 0.7.0 and renderer 0.5.0 for coordinated previews. `npm run test:styled-table` runs export/import regressions. For local browser verification, set `OPF_CORE_ROOT` to the core repository and `OPF_RENDER_ROOT` to the coordinated renderer worktree when running `npm run build:browser-check`. Serve the repository and open `/artifacts/native-styled-table-import/browser/index.html`. Omit those variables to exercise installed package dependencies.
 
 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.
+
+The unpublished furniture candidate exports core's accepted header/footer text and picture geometry. 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.
+
+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; this behavior is not yet published.

package/dist/code-provenance.js

@@ -24,9 +24,9 @@ export function attachCodeTags(entries, records) {
   return attachTextTags(entries,records,TAG,'opfCode','code');
 }
 
-export {unhex as decodeTextTag};
+export {unhex as decodeTextTag, hex as encodeTextTag};
 
-export function attachTextTags(entries, records, tagName, prefix, kind) {
+export function attachTextTags(entries, records, tagName, prefix, kind, {pictures = false} = {}) {
   if (!records.size) return;
   let count = 0;
   const seen = new Set(), types = [];
@@ -34,7 +34,8 @@ export function attachTextTags(entries, records, tagName, prefix, kind) {
     const relPath = path.replace('/slides/','/slides/_rels/') + '.rels';
     let rels = dec.decode(entries[relPath]);
     const ids = new Set([...rels.matchAll(/\bId="([^"]+)"/g)].map(match=>match[1]));
-    const xml = dec.decode(entries[path]).replace(/<p:sp>[\s\S]*?<\/p:sp>/g, shape=>{
+    const pattern = pictures ? /<p:(sp|pic)>[\s\S]*?<\/p:\1>/g : /<p:sp>[\s\S]*?<\/p:sp>/g;
+    const xml = dec.decode(entries[path]).replace(pattern, shape=>{
       const name = shape.match(/<p:cNvPr\b[^>]*\bname="([^"]+)"/)?.[1];
       if (!records.has(name)) return shape;
       if (seen.has(name)) throw new Error(`Duplicate generated ${kind} shape.`);

package/dist/furniture-provenance.js

@@ -0,0 +1,214 @@
+import {XMLParser} from 'fast-xml-parser';
+import {attachTextTags, decodeTextTag, encodeTextTag} from './code-provenance.js';
+import {sourceLineParagraphs} from './text-provenance.js';
+
+const TAG = 'OPF_FURNITURE_V1';
+const REL = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/tags';
+const NS = 'http://schemas.openxmlformats.org/presentationml/2006/main';
+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', 'section', 'slideNumber', 'date'];
+const object = value => value !== null && typeof value === 'object' && !Array.isArray(value);
+const key = part => `${part.kind}.${part.zone}.${part.field}`;
+const same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+const check = (condition, message) => { if (!condition) throw Error(message); };
+
+// This manifest contains topology, identities and inactive flags only. Current
+// native shapes supply all words, image bytes and alt text, even after edits.
+export function furnitureManifest(presentation, slide, layout, slideIndex) {
+  const definitions = {};
+  for (const kind of kinds) {
+    const local = slide.design?.[kind] !== undefined;
+    const source = local ? slide.design[kind] : presentation.design?.[kind];
+    if (source === undefined) continue;
+    const value = source === false ? false : {};
+    if (value !== false) for (const zone of zones) if (source[zone] !== undefined) {
+      value[zone] = {};
+      for (const field of fields) if (source[zone][field] !== undefined) {
+        const current = source[zone][field];
+        value[zone][field] = field === 'image' ? 'native' : typeof current === 'string' ? 'literal' : current;
+      }
+    }
+    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];
+  return {v: 1, role: 'slide', group: String(slideIndex), definitions,
+    ...(layout.parts.some(part => part.field === 'organization') ? {organizationId: organization?.id} : {}),
+    parts: layout.parts.map(part => ({kind: part.kind, zone: part.zone, field: part.field,
+      type: part.type, count: part.type === 'image' ? 1 : part.fit.lines.length}))};
+}
+
+export function attachFurnitureTags(entries, records, manifests) {
+  attachTextTags(entries, records, TAG, 'opfFurniture', 'furniture', {pictures: true});
+  const types = [];
+  for (const [path, manifest] of manifests) {
+    const part = `ppt/tags/opfFurnitureSlide${manifest.group}.xml`;
+    const relPath = path.replace('/slides/', '/slides/_rels/') + '.rels';
+    let xml = dec.decode(entries[path]), rels = dec.decode(entries[relPath]);
+    // Common-slide customer data follows spTree, before controls/extLst.
+    // No invisible/fake shape is necessary for false or empty definitions.
+    const ids = new Set([...rels.matchAll(/\bId="([^"]+)"/g)].map(match => match[1]));
+    let id = 'rIdOpfFurnitureSlide';
+    while (ids.has(id)) id += '_';
+    check(!entries[part] && xml.includes('</p:spTree>'), 'Missing slide tree or colliding furniture tag part.');
+    xml = xml.replace('</p:spTree>', `</p:spTree><p:custDataLst><p:tags r:id="${id}"/></p:custDataLst>`);
+    rels = rels.replace('</Relationships>', `<Relationship Id="${id}" Type="${REL}" Target="../tags/opfFurnitureSlide${manifest.group}.xml"/></Relationships>`);
+    entries[part] = enc.encode(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?><p:tagLst xmlns:p="${NS}"><p:tag name="${TAG}" val="${encodeTextTag(manifest)}"/></p:tagLst>`);
+    entries[path] = enc.encode(xml);
+    entries[relPath] = enc.encode(rels);
+    types.push(`<Override PartName="/${part}" ContentType="application/vnd.openxmlformats-officedocument.presentationml.tags+xml"/>`);
+  }
+  if (types.length) entries['[Content_Types].xml'] = enc.encode(dec.decode(entries['[Content_Types].xml']).replace('</Types>', types.join('') + '</Types>'));
+}
+
+function readTags(container, relationships, entries) {
+  const tags = [];
+  let unreadable = false;
+  for (const link of array(container?.['p:tags'])) {
+    const rel = relationships.get(link['r:id']);
+    try {
+      check(rel?.type === REL && rel.targetMode !== 'External' && entries[rel.path], 'Missing tag relationship.');
+      tags.push(...array(parser.parse(dec.decode(entries[rel.path]))['p:tagLst']?.['p:tag']));
+    } catch { unreadable = true; }
+  }
+  return {tags: tags.filter(tag => tag.name?.toUpperCase() === TAG),
+    ambiguous: unreadable || tags.filter(tag => /^OPF_/i.test(tag.name)).length !== 1};
+}
+
+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.');
+  check(Array.isArray(manifest.parts) && manifest.parts.length <= 36, 'Invalid furniture parts.');
+  const expected = new Map();
+  for (const [kind, definition] of Object.entries(manifest.definitions)) {
+    check(object(definition) && ['global', 'local'].includes(definition.scope), 'Invalid furniture scope.');
+    const value = definition.value;
+    check(value === false || object(value), 'Invalid furniture definition.');
+    if (value === false) continue;
+    check(Object.keys(value).every(zone => zones.includes(zone)), 'Invalid furniture zone.');
+    for (const [zone, content] of Object.entries(value)) {
+      check(object(content) && Object.keys(content).every(field => fields.includes(field)), 'Invalid furniture fields.');
+      for (const [field, flag] of Object.entries(content)) {
+        check(field === 'image' ? flag === 'native' : field === 'text' ? flag === 'literal' :
+          field === 'date' ? flag === false || flag === 'literal' : typeof flag === 'boolean', 'Invalid furniture field intent.');
+        if (flag !== false) expected.set(`${kind}.${zone}.${field}`, field === 'image' ? 'image' : 'text');
+      }
+    }
+  }
+  check(manifest.parts.length === expected.size, 'Incomplete furniture topology.');
+  for (const part of manifest.parts) {
+    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.');
+    expected.delete(key(part));
+  }
+  if (manifest.parts.some(part => part.field === 'organization')) check(typeof manifest.organizationId === 'string' && /^[a-zA-Z0-9_-]+$/.test(manifest.organizationId), 'Invalid organization identity.');
+}
+
+function readSlide(context, entries, slideIndex, report, taggedText) {
+  const {root, shapes, paragraphs, pictures, relationships, readPicture} = context;
+  const candidates = {};
+  const records = [];
+  let invalidRecord = false;
+  for (const [type, nodes, properties] of [['text', shapes, 'p:nvSpPr'], ['image', pictures, 'p:nvPicPr']]) {
+    for (const [index, node] of nodes.entries()) {
+      const result = readTags(node[properties]?.['p:nvPr']?.['p:custDataLst'], relationships, entries);
+      if (type === 'text' && result.tags.length) taggedText.add(index);
+      for (const tag of result.tags) try {
+        check(!result.ambiguous, 'Multiple identities on a furniture shape.');
+        records.push({type, index, data: decodeTextTag(tag.val)});
+      } catch { invalidRecord = true; }
+    }
+  }
+  const tags = readTags(root['p:cSld']?.['p:custDataLst'], relationships, entries);
+  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);
+    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; }
+  for (const kind of kinds) {
+    const definition = manifest.definitions[kind];
+    if (!definition) continue;
+    try {
+      const value = definition.value === false ? false : {};
+      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: [], sections: []};
+      for (const [partIndex, part] of manifest.parts.entries()) {
+        if (part.kind !== kind) continue;
+        const group = records.filter(record => record.data.part === partIndex);
+        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);
+        } else {
+          const ordered = Array(part.count);
+          for (const record of group) {
+            const {line, count} = record.data;
+            check(count === part.count && Number.isSafeInteger(line) && line >= 0 && line < part.count && !ordered[line], 'Ambiguous furniture line.');
+            ordered[line] = record;
+          }
+          const text = sourceLineParagraphs(ordered, paragraphs)[0].text;
+          if (part.field === 'slideNumber') check(text === String(slideIndex + 1), 'Current slide number differs from its position; retain the visible number as ordinary text.');
+          if (part.field === 'section') candidate.sections.push(text);
+          if (part.field === 'organization') candidate.organizations.push({id: manifest.organizationId, name: text});
+          value[part.zone][part.field] = ['text', 'date'].includes(part.field) ? text : true;
+          candidate.text.push(...ordered.map(record => record.index));
+        }
+      }
+      check(new Set(candidate.text).size === candidate.text.length && new Set(candidate.pictures).size === candidate.pictures.length, 'Repeated furniture shape identity.');
+      candidates[kind] = candidate;
+    } catch (error) { report(slideIndex, `${kind}: ${error.message}`); }
+  }
+  return candidates;
+}
+
+// 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) {
+  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, report, taggedText[index]));
+  const organizations = candidates.flatMap(slide => Object.values(slide).flatMap(candidate => candidate.organizations));
+  if (organizations.some(item => !same(item, organizations[0]))) {
+    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.`);
+    }
+  }
+  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.`);
+    }
+  }
+  const result = {design: {}, slides: candidates.map((slide, index) => {
+    const values = Object.values(slide), sections = values.flatMap(candidate => candidate.sections);
+    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];
+  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))) {
+      result.design[kind] = inherited[0].value;
+      candidates.forEach((slide, index) => { if (slide[kind].scope === 'global') delete result.slides[index].design[kind]; });
+    }
+  }
+  candidates.forEach((slide, index) => { if (Object.keys(slide).length) onDiagnostic?.({code: 'furniture-import-reflow', path: `slides.${index}.design`, message: 'Complete furniture roles retain current text, source line boundaries, image content and unambiguous metadata. Native formatting, positioning, crop and other presentation metadata are not reconstructed; review the reflowed furniture.'}); });
+  return result;
+}

package/dist/index.js

@@ -6,6 +6,7 @@ import {attachCardTags,importCardFrames} from './card-provenance.js';
 import {attachHeadingTags,importHeadingGroups} from './heading-provenance.js';
 import {attachPlainTextTags,importPlainTextGroups} from './text-provenance.js';
 import {attachTimelineTags,timelineManifest,importTimelineGroups} from './timeline-provenance.js';
+import {attachFurnitureTags, furnitureManifest, importFurniture} from './furniture-provenance.js';
 import {importImageOrientation} from './image-import.js';
 import {nativeBackgroundFill} from './background.js';
 import {importBackground} from './background-import.js';
@@ -181,6 +182,8 @@ export async function toPptx(input, options = {}) {
   context.headingTags = new Map();
   context.plainTextTags = new Map();
   context.timelineTags = new Map();
+  context.furnitureTags = new Map();
+  context.furnitureManifests = new Map();
   context.codeTags = new Map();
   context.metricTags = new Map();
   context.chartHeadings = new Map();
@@ -233,8 +236,21 @@ export async function fromPptx(input, options = {}) {
   if (core.author) imported.author = core.author;
   if (dimensions) imported.design = { dimensions };
 
+  const furnitureContexts = slidePaths.map((slidePath, index) => {
+    const root = parseRequiredXml(entries, slidePath)['p:sld'];
+    if (!root) throw new OPFPptxError('invalid-pptx', `PPTX slide is not a PresentationML slide: ${slidePath}.`, {path: slidePath});
+    const tree = root['p:cSld']?.['p:spTree'], relationships = parseRelationships(entries, slidePath);
+    return {root, relationships, shapes: nativeTextShapes(tree), pictures: nativePictures(tree),
+      paragraphs: nativeShapeParagraphs(decodeText(entries[slidePath])),
+      readPicture: picture => importPicture(entries, picture, slidePath, relationships,
+        diagnostic => options.onDiagnostic?.({...diagnostic, path: `slides.${index}.design`}))};
+  });
+  const furniture = importFurniture(furnitureContexts, entries, options.onDiagnostic);
+  if (Object.keys(furniture.design).length) imported.design = {...imported.design, ...furniture.design};
+  if (furniture.organization) imported.organization = furniture.organization;
+
   for (let index = 0; index < slidePaths.length; index += 1) {
-    imported.slides.push(importSlide(entries, slidePaths[index], index, dimensions, options));
+    imported.slides.push(importSlide(entries, slidePaths[index], index, dimensions, options, furniture.slides[index], furnitureContexts[index]));
   }
 
   const result = validatePresentation(imported);
@@ -375,16 +391,9 @@ function dimensionsFromPresentation(presentationRoot) {
   };
 }
 
-function importSlide(entries, slidePath, slideIndex, presentationDimensions, options) {
-  const doc = parseRequiredXml(entries, slidePath);
-  const slideRoot = doc["p:sld"];
-  if (!slideRoot) {
-    throw new OPFPptxError("invalid-pptx", `PPTX slide is not a PresentationML slide: ${slidePath}.`, {
-      path: slidePath
-    });
-  }
-
-  const relationships = parseRelationships(entries, slidePath);
+function importSlide(entries, slidePath, slideIndex, presentationDimensions, options, furniture, nativeContext) {
+  const slideRoot = nativeContext.root;
+  const relationships = nativeContext.relationships;
   const dimensions = presentationDimensions ?? DIMENSION_PRESETS.widescreen;
   const slide = {};
   if (slideRoot.show === "0") slide.hidden = true;
@@ -393,8 +402,10 @@ function importSlide(entries, slidePath, slideIndex, presentationDimensions, opt
     part: (path, parser) => parseRequiredXml(entries, path, parser), relationships: path => parseRelationships(entries, path), bytes: path => entries[path]
   }, diagnostic => options.onDiagnostic?.({...diagnostic, path: `slides.${slideIndex}.design.background`}));
   if (background) slide.design = {background};
+  if (Object.keys(furniture.design).length) slide.design = {...slide.design, ...furniture.design};
+  if (furniture.section !== undefined) slide.section = furniture.section;
 
-  const items = collectSlideItems(entries, slideRoot, slidePath, relationships, dimensions, options, slideIndex)
+  const items = collectSlideItems(entries, slideRoot, slidePath, relationships, dimensions, options, slideIndex, furniture, nativeContext)
     .sort(comparePositionedItems);
   // Complete OPF heading roles are authoritative. Nearby body lines must not
   // fill an absent role by geometry; explicit native placeholders still apply.
@@ -418,12 +429,14 @@ function importSlide(entries, slidePath, slideIndex, presentationDimensions, opt
   return slide;
 }
 
-function collectSlideItems(entries, slideRoot, slidePath, relationships, dimensions, options, slideIndex) {
+const nativePictures = tree => [...asArray(tree?.['p:pic']), ...asArray(tree?.['p:grpSp']).flatMap(nativePictures)];
+
+function collectSlideItems(entries, slideRoot, slidePath, relationships, dimensions, options, slideIndex, furniture, nativeContext) {
   const tree = slideRoot["p:cSld"]?.["p:spTree"];
   const items = [];
-  const shapes = nativeTextShapes(tree);
-  if (tree?.['p:grpSp']) options.onDiagnostic?.({code:'grouped-text-reflow',path:`slides.${slideIndex}`,message:'Grouped native text is retained, but group transforms and non-text group members are not reconstructed; review the reflowed OPF.'});
-  const paragraphs = nativeShapeParagraphs(decodeText(entries[slidePath]));
+  const shapes = nativeContext.shapes;
+  if (tree?.['p:grpSp']) options.onDiagnostic?.({code:'grouped-text-reflow',path:`slides.${slideIndex}`,message:'Grouped native text and pictures are retained, but group transforms and unsupported group members are not reconstructed; review the reflowed OPF.'});
+  const paragraphs = nativeContext.paragraphs;
   const code = importCodeGroups(shapes, paragraphs, relationships, entries, diagnostic => options.onDiagnostic?.({...diagnostic,path:`slides.${slideIndex}.code`}));
   const metric = importMetricGroups(shapes, paragraphs, relationships, entries, diagnostic => options.onDiagnostic?.({...diagnostic,path:`slides.${slideIndex}.metric`}));
   const cards = importCardFrames(shapes, paragraphs, relationships, entries, diagnostic => options.onDiagnostic?.({...diagnostic,path:`slides.${slideIndex}`}));
@@ -446,8 +459,12 @@ function collectSlideItems(entries, slideRoot, slidePath, relationships, dimensi
   for (const item of code.items) items.push({kind:'code',bounds:shapeBounds(item.shape['p:spPr']?.['a:xfrm']),payload:item.payload});
   for (const item of metric.items) items.push({kind:'metric',bounds:shapeBounds(item.shape['p:spPr']?.['a:xfrm']),payload:item.payload});
   for (const [index,shape] of shapes.entries()) {
+    if (furniture.text.has(index)) continue;
     if (code.consumed.has(shape)||metric.consumed.has(shape)||cards.has(shape)||headings.consumed.has(shape)||plainText.consumed.has(shape)||timelines.consumed.has(shape)) continue;
-    const item = importShape(shape, dimensions, paragraphs[index]);
+    const item = importShape(shape, dimensions, paragraphs[index], furniture.taggedText.has(index));
+    // A damaged/edited furniture group falls back to current native text,
+    // including cleared text boxes, without inventing a title or shape label.
+    if (item && furniture.taggedText.has(index)) item.sourceText = true;
     if (item) items.push(item);
   }
 
@@ -461,7 +478,8 @@ function collectSlideItems(entries, slideRoot, slidePath, relationships, dimensi
     if (item) items.push(item);
   }
 
-  for (const [index, picture] of asArray(tree?.["p:pic"]).entries()) {
+  for (const [index, picture] of nativeContext.pictures.entries()) {
+    if (furniture.pictures.has(index)) continue;
     const report = diagnostic => options.onDiagnostic?.({...diagnostic, path: `slides.${slideIndex}.pictures.${index}`});
     const item = importPicture(entries, picture, slidePath, relationships, report);
     if (item) items.push(item);
@@ -538,7 +556,7 @@ function importGraphicFrame(entries, frame, slidePath, relationships, importedTa
 function importPicture(entries, picture, slidePath, relationships, report) {
   const bounds = shapeBounds(picture["p:spPr"]?.["a:xfrm"]);
   const name = scalarText(picture["p:nvPicPr"]?.["p:cNvPr"]?.name).trim();
-  const alt = scalarText(picture["p:nvPicPr"]?.["p:cNvPr"]?.descr).trim();
+  const alt = scalarText(picture["p:nvPicPr"]?.["p:cNvPr"]?.descr);
   const relId = picture["p:blipFill"]?.["a:blip"]?.["r:embed"];
   const relationship = relationships.get(relId);
   let bytes = relationship?.path ? entries[relationship.path] : null;
@@ -926,8 +944,9 @@ async function addSlide(pptx, presentation, opfSlide, slideIndex, context, optio
   const { widthInches, heightInches } = slideContext.dimensions;
   const layout = resolveCatalogRecord(presentation, "layouts", opfSlide.layout, "blank") ?? {};
   if (opfSlide.layout && layout.id !== opfSlide.layout) throw new OPFPptxError("catalog-resolution-failed", `Layout '${opfSlide.layout}' needs an inline or bundled catalog record.`, { path: `slides.${slideIndex}.layout` });
-  const geometry = composeSlide(opfSlide, { width: widthInches * 96, height: heightInches * 96, layout, slideIndex, fonts: slideContext.fonts, contentAlignment:opfSlide.design?.contentAlignment??presentation.design?.contentAlignment, titleAlignment:opfSlide.design?.titleAlignment??presentation.design?.titleAlignment, textRasterPadding:options.textRasterPadding, contentBox:opfSlide.design?.contentBox??presentation.design?.contentBox, textMeasurement: options.textMeasurement });
+  const geometry = composeSlide(opfSlide, { width: widthInches * 96, height: heightInches * 96, layout, presentation, slideIndex, fonts: slideContext.fonts, contentAlignment:opfSlide.design?.contentAlignment??presentation.design?.contentAlignment, titleAlignment:opfSlide.design?.titleAlignment??presentation.design?.titleAlignment, textRasterPadding:options.textRasterPadding, contentBox:opfSlide.design?.contentBox??presentation.design?.contentBox, textMeasurement: options.textMeasurement });
   for (const diagnostic of geometry.diagnostics) options.onDiagnostic?.(diagnostic);
+  await addFurniture(slide,presentation,opfSlide,geometry.furniture,slideContext,options,slideIndex);
   for (const item of geometry.items) {
     const region = { x: item.box.x / 96, y: item.box.y / 96, w: item.box.width / 96, h: item.box.height / 96 };
     if (item.frameBox) {
@@ -1128,6 +1147,7 @@ async function addImagePayload(slide, presentation, asset, region, path, context
     h: region.h,
     altText: assetAlt(asset, presentation)
   });
+  return objectName;
 }
 
 function addChartPayload(slide, chart, region, context) {
@@ -1277,12 +1297,13 @@ function addMeasuredPayloadText(slide, text, box, context, options, config) {
     if (context.composition?.overflow === 'error') throw new OPFPptxError('layout-overflow', diagnostic.message, {path: config.path, issues: [diagnostic]});
   }
   for (const [index, line] of fit.lines.entries()) {
-    if (!line&&!config.heading&&!config.sourceText&&!config.timeline) continue;
+    if (!line&&!config.heading&&!config.sourceText&&!config.timeline&&!config.keepEmpty) continue;
     const alignment=fit.placement?.alignment??config.align??context.contentAlignment??'left',placed=fit.placement?.lines[index],factor=alignment==='right'?1:alignment==='center'?.5:0;
     const sourceLine=fit.sourceLines?.[index],boundary=sourceLine?{boundary:sourceLine.boundary,separator:String(text).slice(sourceLine.end,sourceLine.nextStart)}:{};
-    const objectName=config.heading?`OPF heading ${config.path} line ${index}`:config.timeline?`OPF timeline ${config.timeline.group} part ${config.timeline.part} line ${index}`:config.sourceText?`OPF text ${config.path} line ${index}`:undefined;
+    const objectName=config.heading?`OPF heading ${config.path} line ${index}`:config.timeline?`OPF timeline ${config.timeline.group} part ${config.timeline.part} line ${index}`:config.sourceText?`OPF text ${config.path} line ${index}`:config.objectName?`${config.objectName} line ${index}`:undefined;
     if(config.heading)context.headingTags.set(objectName,{v:1,group:config.path,field:config.heading,line:index,count:fit.lines.length,...boundary});
     else if(config.timeline)context.timelineTags.set(objectName,{v:1,role:'text',group:config.timeline.group,part:config.timeline.part,line:index,count:fit.lines.length,...boundary,...(config.timeline.part===0&&index===0?{anchor:config.timeline.anchor}:{})});
+    else if(config.furniture)context.furnitureTags.set(objectName,{v:1,role:'text',...config.furniture,line:index,count:fit.lines.length,...boundary});
     else if(config.sourceText)context.plainTextTags.set(objectName,{v:1,group:config.path,line:index,count:fit.lines.length,...boundary});
     const area=placed?{x:(placed.x+placed.width*factor-box.width*factor)/96,y:(placed.baseline-fit.fontSize)/96,w:box.width/96,h:placed.height/96}:{x:box.x/96,y:(box.y+index*fit.lineHeight)/96,w:box.width/96,h:fit.lineHeight/96};
     slide.addText(line, {
@@ -1296,6 +1317,27 @@ function addMeasuredPayloadText(slide, text, box, context, options, config) {
   }
 }
 
+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);
+    if (manifest) context.furnitureManifests.set(`ppt/slides/slide${slideIndex + 1}.xml`, manifest);
+    return;
+  }
+  for(const [index,part]of layout.parts.entries()){
+    if(part.type==='image'){
+      const region={x:part.box.x/96,y:part.box.y/96,w:part.box.width/96,h:part.box.height/96};
+      const objectName = await addImagePayload(slide,presentation,part.image,region,part.path,{...context,imageFill:'fit'},options);
+      if (objectName) context.furnitureTags.set(objectName, {v:1, role:'image', group:String(slideIndex), part:index});
+    }else{
+      if(!part.fit?.sourceLines)throw new OPFPptxError('missing-furniture-layout','Repeated text requires accepted source lines from core.',{path:part.path});
+      addMeasuredPayloadText(slide,part.text,part.box,context,options,{path:part.path,fit:part.fit,textStyle:part.style,align:part.alignment,diagnosticsHandled:true,color:context.colors.mutedText,keepEmpty:true,objectName:`OPF furniture ${slideIndex} part ${index}`,furniture:{group:String(slideIndex),part:index}});
+    }
+  }
+  const manifest = furnitureManifest(presentation, source, layout, slideIndex);
+  if (manifest) context.furnitureManifests.set(`ppt/slides/slide${slideIndex + 1}.xml`, manifest);
+}
+
 function addCodePayload(slide, value, layout, region, context, path) {
   if (!layout) throw new OPFPptxError('missing-code-layout', 'Code export requires a coordinated core build with shared code geometry.', {path});
   for (const part of layout.parts) {
@@ -1692,6 +1734,7 @@ async function normalizePptxZip(raw, context) {
   attachHeadingTags(entries,context.headingTags);
   attachPlainTextTags(entries,context.plainTextTags);
   attachTimelineTags(entries,context.timelineTags);
+  attachFurnitureTags(entries,context.furnitureTags,context.furnitureManifests);
   for(const [part,bytes]of Object.entries(entries)){
     if(!/^ppt\/slides\/slide\d+\.xml$/.test(part))continue;
     const relationships=parseRelationships(entries,part);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpresentation/opf-pptx",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Pure local OPF to PPTX export and PPTX to OPF import tooling.",
   "license": "MIT",
   "type": "module",
@@ -37,8 +37,8 @@
   "sideEffects": false,
   "scripts": {
     "build": "node scripts/build.mjs",
-    "typecheck": "node --check src/index.js && node --check scripts/build.mjs && node --check scripts/validate-package.mjs && node --check test/smoke.mjs && node --check src/image-geometry.js && node --check test/image-fit.mjs && node --check test/image-orientation.mjs && node --check test/table-layout.mjs && node --check test/table-import.mjs && node --check test/object-ids.mjs && node --check test/export-corpus.mjs && node --check test/image-media-type.mjs && node --check src/image-fallback-node.js && node --check src/image-fallback-browser.js && node --check test/webp-fallback.mjs && node --check scripts/build-browser-check.mjs && node --check test/webp-fallback-browser.js && node --check test/image-fallback-boundary.mjs && node --check src/background.js && node --check test/background.mjs && node --check src/image-import.js && node --check test/image-import.mjs && node --check test/native-background.mjs && node --check src/background-import.js && node --check test/background-inheritance.mjs && node --check test/rich-table.mjs && node --check src/table-import.js && node --check test/rich-table-import.mjs && node --check test/rich-table-import-browser.js && node --check test/table-row-sizing.mjs && node --check test/table-styles.mjs && node --check test/table-styles-browser.js && node --check test/styled-table.mjs && node --check src/table-cell-import.js && node --check test/styled-table-import.mjs && node --check test/styled-table-import-browser.js && node --check src/table-border-import.js && node --check test/table-border-styles.mjs && node --check src/card-provenance.js && node --check test/content-cards.mjs && node --check src/chart-workbook.js && node --check test/chart-colors.mjs && node --check test/chart-workbook.mjs && node --check test/native-chart-colors.mjs && node --check src/heading-provenance.js && node --check test/accepted-text.mjs && node --check test/heading-provenance.mjs && node --check src/text-provenance.js && node --check test/plain-whitespace.mjs && node --check src/timeline-provenance.js && node --check test/shared-timeline.mjs",
-    "test": "npm run build && node test/plain-whitespace.mjs && node test/accepted-text.mjs && node test/heading-provenance.mjs && node test/chart-colors.mjs && node test/content-cards.mjs && node test/chart-workbook.mjs && node test/dependency-boundary.mjs && npm run build:browser-check && npm run test:styled-table && node test/content-layout.mjs && node test/shared-quote.mjs && npm run test:timeline",
+    "typecheck": "node --check src/index.js && node --check scripts/build.mjs && node --check scripts/validate-package.mjs && node --check test/smoke.mjs && node --check src/image-geometry.js && node --check test/image-fit.mjs && node --check test/image-orientation.mjs && node --check test/table-layout.mjs && node --check test/table-import.mjs && node --check test/object-ids.mjs && node --check test/export-corpus.mjs && node --check test/image-media-type.mjs && node --check src/image-fallback-node.js && node --check src/image-fallback-browser.js && node --check test/webp-fallback.mjs && node --check scripts/build-browser-check.mjs && node --check test/webp-fallback-browser.js && node --check test/image-fallback-boundary.mjs && node --check src/background.js && node --check test/background.mjs && node --check src/image-import.js && node --check test/image-import.mjs && node --check test/native-background.mjs && node --check src/background-import.js && node --check test/background-inheritance.mjs && node --check test/rich-table.mjs && node --check src/table-import.js && node --check test/rich-table-import.mjs && node --check test/rich-table-import-browser.js && node --check test/table-row-sizing.mjs && node --check test/table-styles.mjs && node --check test/table-styles-browser.js && node --check test/styled-table.mjs && node --check src/table-cell-import.js && node --check test/styled-table-import.mjs && node --check test/styled-table-import-browser.js && node --check src/table-border-import.js && node --check test/table-border-styles.mjs && node --check src/card-provenance.js && node --check test/content-cards.mjs && node --check src/chart-workbook.js && node --check test/chart-colors.mjs && node --check test/chart-workbook.mjs && node --check test/native-chart-colors.mjs && node --check src/heading-provenance.js && node --check test/accepted-text.mjs && node --check test/heading-provenance.mjs && node --check src/text-provenance.js && node --check test/plain-whitespace.mjs && node --check src/timeline-provenance.js && node --check test/shared-timeline.mjs && node --check test/shared-furniture.mjs && node --check src/furniture-provenance.js && node --check test/furniture-provenance.mjs",
+    "test": "npm run build && npm run test:furniture && node test/plain-whitespace.mjs && node test/accepted-text.mjs && node test/heading-provenance.mjs && node test/chart-colors.mjs && node test/content-cards.mjs && node test/chart-workbook.mjs && node test/dependency-boundary.mjs && npm run build:browser-check && npm run test:styled-table && node test/content-layout.mjs && node test/shared-quote.mjs && npm run test:timeline",
     "validate": "node scripts/validate-package.mjs",
     "test:packed": "node test/packed-install.mjs",
     "test:compare-published": "node test/compare-published.mjs",
@@ -49,17 +49,18 @@
     "test:code": "node test/shared-code.mjs && node test/code-provenance.mjs",
     "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:timeline": "node test/shared-timeline.mjs",
+    "test:furniture": "node test/shared-furniture.mjs && node test/furniture-provenance.mjs"
   },
   "dependencies": {
-    "@openpresentation/opf": "^0.10.0",
+    "@openpresentation/opf": "^0.10.1",
     "fast-xml-parser": "^5.8.0",
     "fflate": "^0.8.3",
-    "jszip": "3.10.1",
+    "jszip": "3.10.2",
     "sharp": "0.35.4"
   },
   "peerDependencies": {
-    "@openpresentation/opf-render": "^0.8.0"
+    "@openpresentation/opf-render": "^0.8.1"
   },
   "peerDependenciesMeta": {
     "@openpresentation/opf-render": {
@@ -67,7 +68,7 @@
     }
   },
   "devDependencies": {
-    "@openpresentation/opf-render": "0.8.0",
+    "@openpresentation/opf-render": "0.8.1",
     "esbuild": "0.28.2",
     "playwright": "1.63.0"
   },