@openpresentation/opf-pptx 0.12.4 → 0.13.0

package/dist/master-themes.js

@@ -9,7 +9,8 @@ const SLIDE_MASTER = /^ppt\/slideMasters\/slideMaster\d+\.xml$/;
 const relsOf = path => path.replace(/([^/]+)$/, '_rels/$1.rels');
 
 /**
- * FF-05 (font-fidelity-everywhere). PptxGenJS 4.0.1 points the notes master at the slide master's theme part
+ * FF-05 (font-fidelity-everywhere). PptxGenJS 4.0.1 points the notes master at the slide master's theme part (and
+ * vendor-compat.js points pptxgenjs-plus's notes master back there, replacing its default Office notes theme)
  * (`ppt/theme/theme1.xml`). Every master owns its theme part in a PowerPoint package (theme1 for the slide master,
  * theme2 for the notes master, theme3 for a handout master), and PowerPoint refuses to read a package whose notes
  * master it recognises when that master shares the slide theme ("The file or directory is corrupted and unreadable",
@@ -47,3 +48,86 @@ export function giveNotesMastersOwnThemes(output) {
   }
   if (overrides) output['[Content_Types].xml'] = [encoder.encode(text(types[0]).replace('</Types>', `${overrides}</Types>`)), types[1]];
 }
+
+const MASTER_TYPE = 'application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml';
+const LAYOUT_TYPE = 'application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml';
+const REL_MASTER = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster';
+const RELATIONSHIP = /<Relationship\b[^>]*\/>/g;
+const attribute = (xml, name) => new RegExp(`\\s${name}="([^"]*)"`).exec(xml)?.[1];
+const partNumber = (output, pattern) => Math.max(0, ...Object.keys(output).map(path => Number(pattern.exec(path)?.[1] ?? 0)));
+const read = (output, path) => text(output[path][0]);
+const write = (output, path, xml, options) => { output[path] = [encoder.encode(xml), options]; };
+
+/**
+ * opf-pptx#168 (FF-05). Slide runs name no East Asian / complex-script font (stripRunScriptFonts: PowerPoint lists an
+ * explicit run `ea`/`cs` as an empty-name font), so a slide's script fonts reach PowerPoint only through the theme of
+ * its slide master. `themes` and `assignment` come from planSlideThemes (script-fonts.js): theme 0 is the presentation
+ * theme of slide master 1, and each further theme gets its own slide master, a copy of master 1 with a copy of its
+ * layout, so the slides that select those script fonts are drawn with them while every other part stays as it was.
+ *
+ * Runs after giveNotesMastersOwnThemes (the notes master keeps its copy of the presentation theme) and before the
+ * fonts-used list and the document provenance, which read the finished parts. With one theme nothing changes, so a
+ * deck with a single script profile is byte-identical. New parts are numbered after the existing ones: slide masters
+ * and layouts, themes (`1_<name>`, `2_<name>`, ... as PowerPoint names a second master's theme), master and layout ids
+ * after the largest id in use, presentation relationship ids after the largest `rIdN`.
+ */
+export function giveSlidesScriptMasters(output, {themes, assignment}) {
+  if (themes.length < 2) return;
+  const presentation = 'ppt/presentation.xml', presentationRels = relsOf(presentation);
+  const master = 'ppt/slideMasters/slideMaster1.xml', masterRels = relsOf(master);
+  const masterRelsXml = read(output, masterRels);
+  const layoutTarget = [...masterRelsXml.matchAll(RELATIONSHIP)].map(([node]) => node).filter(node => attribute(node, 'Type')?.endsWith('/slideLayout'));
+  if (layoutTarget.length !== 1) throw new Error('Slide master 1 must have exactly one layout to copy for a script profile.');
+  const layout = `ppt/slideLayouts/${attribute(layoutTarget[0], 'Target').replace(/^\.\.\/slideLayouts\//, '')}`, layoutRels = relsOf(layout);
+  const theme = `ppt/theme/${THEME_TARGET.exec(masterRelsXml)?.[1]}`;
+  if (!output[layout] || !output[layoutRels] || !output[theme]) throw new Error('Slide master 1, its layout and its theme must exist.');
+  const options = output[master][1];
+  let presentationXml = read(output, presentation), presentationRelsXml = read(output, presentationRels), types = read(output, '[Content_Types].xml');
+  const ids = [...presentationXml.matchAll(/<p:sldMasterId\b[^>]*\bid="(\d+)"/g), ...Object.keys(output).filter(path => SLIDE_MASTER.test(path))
+    .flatMap(path => [...read(output, path).matchAll(/<p:sldLayoutId\b[^>]*\bid="(\d+)"/g)])].map(match => Number(match[1]));
+  let nextId = Math.max(2147483647, ...ids) + 1;
+  let nextRel = Math.max(0, ...[...presentationRelsXml.matchAll(/\bId="rId(\d+)"/g)].map(match => Number(match[1]))) + 1;
+  let nextMaster = partNumber(output, /^ppt\/slideMasters\/slideMaster(\d+)\.xml$/) + 1;
+  let nextLayout = partNumber(output, /^ppt\/slideLayouts\/slideLayout(\d+)\.xml$/) + 1;
+  let nextTheme = partNumber(output, /^ppt\/theme\/theme(\d+)\.xml$/) + 1;
+  const layoutFor = [layout];
+  let masterIds = '', overrides = '';
+  themes.forEach((themeXml, index) => {
+    if (index === 0) return;
+    const masterName = `slideMaster${nextMaster++}.xml`, layoutName = `slideLayout${nextLayout++}.xml`, themeName = `theme${nextTheme++}.xml`;
+    const masterId = nextId++, layoutId = nextId++, relId = `rId${nextRel++}`;
+    write(output, `ppt/theme/${themeName}`, themeXml.replace(/(<a:theme\b[^>]*\bname=")([^"]*)"/, (match, open, name) => `${open}${index}_${name}"`), output[theme][1]);
+    write(output, `ppt/slideMasters/${masterName}`, read(output, master).replace(/<p:sldLayoutIdLst>[\s\S]*?<\/p:sldLayoutIdLst>/,
+      list => list.replace(/(<p:sldLayoutId\b[^>]*\bid=")\d+"/, (match, open) => `${open}${layoutId}"`)), options);
+    write(output, `ppt/slideMasters/_rels/${masterName}.rels`, masterRelsXml.replace(RELATIONSHIP, node => {
+      const type = attribute(node, 'Type') ?? '';
+      if (type.endsWith('/slideLayout')) return node.replace(/\sTarget="[^"]*"/, ` Target="../slideLayouts/${layoutName}"`);
+      if (type.endsWith('/theme')) return node.replace(/\sTarget="[^"]*"/, ` Target="../theme/${themeName}"`);
+      return node;
+    }), output[masterRels][1]);
+    write(output, `ppt/slideLayouts/${layoutName}`, read(output, layout), output[layout][1]);
+    write(output, `ppt/slideLayouts/_rels/${layoutName}.rels`, read(output, layoutRels).replace(RELATIONSHIP, node =>
+      attribute(node, 'Type') === REL_MASTER ? node.replace(/\sTarget="[^"]*"/, ` Target="../slideMasters/${masterName}"`) : node), output[layoutRels][1]);
+    masterIds += `<p:sldMasterId id="${masterId}" r:id="${relId}"/>`;
+    presentationRelsXml = presentationRelsXml.replace('</Relationships>', `<Relationship Id="${relId}" Type="${REL_MASTER}" Target="slideMasters/${masterName}"/></Relationships>`);
+    overrides += `<Override PartName="/ppt/slideMasters/${masterName}" ContentType="${MASTER_TYPE}"/><Override PartName="/ppt/slideLayouts/${layoutName}" ContentType="${LAYOUT_TYPE}"/><Override PartName="/ppt/theme/${themeName}" ContentType="${THEME_TYPE}"/>`;
+    layoutFor.push(`ppt/slideLayouts/${layoutName}`);
+  });
+  if (!presentationXml.includes('</p:sldMasterIdLst>')) throw new Error('The presentation has no slide master list.');
+  presentationXml = presentationXml.replace('</p:sldMasterIdLst>', `${masterIds}</p:sldMasterIdLst>`);
+  write(output, presentation, presentationXml, output[presentation][1]);
+  write(output, presentationRels, presentationRelsXml, output[presentationRels][1]);
+  write(output, '[Content_Types].xml', types.replace('</Types>', `${overrides}</Types>`), output['[Content_Types].xml'][1]);
+  // Each slide's layout relationship points at the layout of its theme's master.
+  const slides = [...presentationXml.matchAll(/<p:sldId\b[^>]*\br:id="([^"]+)"/g)].map(match => {
+    const node = [...presentationRelsXml.matchAll(RELATIONSHIP)].map(([rel]) => rel).find(rel => attribute(rel, 'Id') === match[1]);
+    return `ppt/${attribute(node ?? '', 'Target')}`;
+  });
+  assignment.forEach((index, slideIndex) => {
+    if (!index) return;
+    const slide = slides[slideIndex], rels = slide && relsOf(slide);
+    if (!rels || !output[rels]) throw new Error(`Slide ${slideIndex + 1} has no relationships to point at its slide layout.`);
+    const target = layoutFor[index].replace(/^ppt\/slideLayouts\//, '../slideLayouts/');
+    write(output, rels, read(output, rels).replace(RELATIONSHIP, node => attribute(node, 'Type')?.endsWith('/slideLayout') ? node.replace(/\sTarget="[^"]*"/, ` Target="${target}"`) : node), output[rels][1]);
+  });
+}

package/dist/script-fonts.js

@@ -57,7 +57,104 @@ export function planScriptFonts(presentation, report) {
     report?.({code: "paragraph-direction-unavailable", path: "language",
       message: "The installed @openpresentation/opf has no paragraphDirection, so right-to-left paragraphs are not marked; the preview and export must share that rule. Use a core release that exports it."});
   }
-  return {deck, slides, lang: deck.lang, rtl, contentEastAsian: contentEastAsianFonts(presentation, deck, report)};
+  // opf-pptx#168: which slides have notes (a presentation has one notes master; see reportPerSlideNotesScriptFonts).
+  const notes = (presentation.slides ?? []).map(slide => typeof slide?.notes === "string" ? slide.notes.trim() !== "" : Boolean(slide?.notes));
+  return {deck, slides, notes, report, lang: deck.lang, rtl, contentEastAsian: contentEastAsianFonts(presentation, deck, report)};
+}
+
+// ---------------------------------------------------------------------------
+// Per-slide script profiles (opf-pptx#168)
+
+const FONT_GROUPS = [["majorFont", "heading"], ["minorFont", "body"]];
+
+/**
+ * The theme font slots a slide's resolved script fonts select: for the major (heading) and minor (body) font group,
+ * the `ea` / `cs` family when a script font is selected for that slot (its source is not `latin`), and core's
+ * per-script supplement entry. Values are escaped as in the theme XML. A slot with nothing selected is no requirement:
+ * the slide's script text then follows whatever the theme carries, as before.
+ */
+export function slideScriptSelections(resolved) {
+  const wanted = [];
+  for (const [tag, role] of FONT_GROUPS) {
+    for (const [element, slot] of SCRIPT_SLOTS) {
+      if (resolved.sources?.[slot] !== "latin" && resolved[role]?.[slot]) wanted.push({tag, element, value: escapeAttribute(resolved[role][slot])});
+    }
+    if (resolved.supplement?.script && resolved.supplement[role]) wanted.push({tag, script: resolved.supplement.script, value: escapeAttribute(resolved.supplement[role])});
+  }
+  return wanted;
+}
+
+/** The ea/cs typefaces and per-script entries of a theme part, as written: {majorFont: {ea, cs, scripts}, minorFont: ...}. */
+export function themeFontSlots(xml) {
+  const slots = {};
+  for (const [tag] of FONT_GROUPS) {
+    const block = new RegExp(`<a:${tag}>[\\s\\S]*?</a:${tag}>`).exec(xml)?.[0] ?? "";
+    const face = element => new RegExp(`<a:${element}\\b[^>]*?\\btypeface="([^"]*)"`).exec(block)?.[1];
+    slots[tag] = {ea: face("ea"), cs: face("cs"), scripts: Object.fromEntries([...block.matchAll(/<a:font script="([^"]*)" typeface="([^"]*)"\/>/g)].map(match => [match[1], match[2]]))};
+  }
+  return slots;
+}
+
+/** The selections a theme does not carry. */
+export function unmetSelections(wanted, slots) {
+  return wanted.filter(item => (item.script ? slots[item.tag]?.scripts[item.script] : slots[item.tag]?.[item.element]) !== item.value);
+}
+
+/** A theme part with the given selections written into its major/minor `ea`/`cs` slots and per-script entries. */
+export function themeWithSelections(xml, wanted) {
+  for (const [tag] of FONT_GROUPS) {
+    xml = xml.replace(new RegExp(`<a:${tag}>[\\s\\S]*?</a:${tag}>`), block => {
+      for (const item of wanted.filter(entry => entry.tag === tag)) {
+        if (item.element) {
+          block = block.replace(new RegExp(`<a:${item.element}\\b[^>]*/>`), () => `<a:${item.element} typeface="${item.value}"/>`);
+          continue;
+        }
+        const entry = `<a:font script="${item.script}" typeface="${item.value}"/>`;
+        const existing = new RegExp(`<a:font script="${item.script}" typeface="[^"]*"/>`);
+        block = existing.test(block) ? block.replace(existing, () => entry) : block.replace(`</a:${tag}>`, () => `${entry}</a:${tag}>`);
+      }
+      return block;
+    });
+  }
+  return xml;
+}
+
+/**
+ * opf-pptx#168: which theme each slide needs. Theme 0 is the finished presentation theme (`themeXml`, built from slide 1).
+ * Each slide uses the first theme that carries every script font it selects (slide 1 always uses theme 0); a slide that
+ * none carries gets a new theme: the presentation theme with that slide's selections written in. Slides that select no
+ * script font, or the same ones, share a theme, so a deck with one script profile keeps one theme. Returns
+ * `{themes: [xml], assignment: [theme index per slide]}`; deterministic in slide order.
+ */
+export function planSlideThemes(plan, themeXml) {
+  const themes = [{xml: themeXml, slots: themeFontSlots(themeXml)}];
+  const assignment = plan.slides.map((resolved, index) => {
+    if (index === 0) return 0;
+    const wanted = slideScriptSelections(resolved);
+    const found = themes.findIndex(theme => !unmetSelections(wanted, theme.slots).length);
+    if (found >= 0) return found;
+    const xml = themeWithSelections(themeXml, wanted);
+    themes.push({xml, slots: themeFontSlots(xml)});
+    return themes.length - 1;
+  });
+  return {themes: themes.map(theme => theme.xml), assignment};
+}
+
+/**
+ * A presentation has one notes master, whose theme is a copy of the presentation theme (FF-05). The notes of a slide
+ * that uses another theme (planSlideThemes) therefore draw their East Asian / complex-script text in the presentation
+ * theme's script fonts; that is reported for every such slide that has notes.
+ */
+export function reportPerSlideNotesScriptFonts(plan, {themes, assignment}) {
+  if (!plan?.report) return;
+  const deckSlots = themeFontSlots(themes[0]);
+  assignment.forEach((theme, index) => {
+    if (!theme || !plan.notes?.[index]) return;
+    const unmet = unmetSelections(slideScriptSelections(plan.slides[index]), deckSlots);
+    const families = [...new Set(unmet.map(item => item.value))].join(", ");
+    plan.report({code: "script-font-notes-not-exported", path: `slides.${index}.notes`,
+      message: `Slide ${index + 1} has its own script fonts (${families}) through its own slide master, but a presentation has one notes master, so PowerPoint draws this slide's notes in the presentation theme's East Asian/complex-script fonts.`});
+  });
 }
 
 // FF-05: East Asian characters in a deck whose own language has no East Asian font (an English deck with Japanese
@@ -331,7 +428,7 @@ export function matchCatalogLanguage(lang, catalogs) {
  * dominant run tag itself. Nothing is reported here: languageDiagnostics()
  * reports against the final imported document, after FF-32 provenance.
  */
-export function observeLanguage({slides, theme, catalogs}) {
+export function observeLanguage({slides, theme, themePath, slideThemes, catalogs}) {
   const counts = new Map();
   let rtlParagraphs = 0;
   for (const xml of slides) {
@@ -345,7 +442,7 @@ export function observeLanguage({slides, theme, catalogs}) {
   const ranked = [...counts].sort((left, right) => right[1] - left[1] || (left[0] < right[0] ? -1 : left[0] > right[0] ? 1 : 0));
   const lang = ranked[0]?.[0];
   const match = lang === undefined ? null : matchCatalogLanguage(lang, catalogs);
-  return {lang, language: lang === undefined ? undefined : match?.language ?? lang, match, ranked, rtlParagraphs, theme};
+  return {lang, language: lang === undefined ? undefined : match?.language ?? lang, match, ranked, rtlParagraphs, theme, themePath, slideThemes};
 }
 
 /**
@@ -404,19 +501,43 @@ export function languageDiagnostics(imported, observed, report) {
   if (rtlParagraphs && !rtl) {
     report({code: "rtl-language-mismatch", path: "language", message: `${rtlParagraphs} right-to-left paragraph(s) do not match the left-to-right language ${typeof imported.language === "string" ? imported.language : lang}; paragraph direction is not imported separately.`});
   }
-  if (theme && resolved) {
-    for (const [tag, role] of [["majorFont", "heading"], ["minorFont", "body"]]) {
-      const block = new RegExp(`<a:${tag}>[\\s\\S]*?</a:${tag}>`).exec(theme)?.[0];
-      if (!block) continue;
-      const latin = attribute(/<a:latin\b[^>]*\/>/.exec(block)?.[0] ?? "", "typeface");
-      for (const [element, slot] of SCRIPT_SLOTS) {
-        const face = attribute(new RegExp(`<a:${element}\\b[^>]*/>`).exec(block)?.[0] ?? "", "typeface");
-        if (!face || face.startsWith("+") || face === latin || face === escapeAttribute(resolved[role][slot])) continue;
-        report({code: "script-font-not-imported", path: "design.fontScheme",
-          message: `Theme ${tag} ${slot} font "${face}" differs from both its latin font and what the imported document resolves, and is not represented in the imported OPF.`});
+  // The presentation theme carries the first slide's script fonts (planScriptFonts), so it is compared with that slide.
+  let themeResolved = resolved;
+  if (resolver && imported.slides?.length) { try { themeResolved = resolver(imported, {slideIndex: 0}); } catch { themeResolved = resolved; } }
+  if (theme && themeResolved) {
+    for (const {tag, slot, face} of themeScriptMismatches(theme, themeResolved)) {
+      report({code: "script-font-not-imported", path: "design.fontScheme",
+        message: `Theme ${tag} ${slot} font "${face}" differs from both its latin font and what the imported document resolves, and is not represented in the imported OPF.`});
+    }
+  }
+  // opf-pptx#168: a slide on another slide master carries its own script fonts in that master's theme.
+  if (resolver && Array.isArray(observed.slideThemes)) {
+    observed.slideThemes.forEach((slideTheme, index) => {
+      if (!slideTheme || slideTheme.path === observed.themePath) return;
+      let slideResolved;
+      try { slideResolved = resolver(imported, {slideIndex: index}); } catch { return; }
+      for (const {tag, slot, face} of themeScriptMismatches(slideTheme.xml, slideResolved)) {
+        report({code: "script-font-not-imported", path: `slides.${index}.design.fontScheme`,
+          message: `Slide ${index + 1}'s master theme ${tag} ${slot} font "${face}" differs from both its latin font and what the imported slide resolves, and is not represented in the imported OPF.`});
       }
+    });
+  }
+}
+
+/** Theme ea/cs faces that neither repeat the latin font nor match the resolved slot: [{tag, slot, face}]. */
+function themeScriptMismatches(theme, resolved) {
+  const mismatches = [];
+  for (const [tag, role] of FONT_GROUPS) {
+    const block = new RegExp(`<a:${tag}>[\\s\\S]*?</a:${tag}>`).exec(theme)?.[0];
+    if (!block) continue;
+    const latin = attribute(/<a:latin\b[^>]*\/>/.exec(block)?.[0] ?? "", "typeface");
+    for (const [element, slot] of SCRIPT_SLOTS) {
+      const face = attribute(new RegExp(`<a:${element}\\b[^>]*/>`).exec(block)?.[0] ?? "", "typeface");
+      if (!face || face.startsWith("+") || face === latin || face === escapeAttribute(resolved[role][slot])) continue;
+      mismatches.push({tag, slot, face});
     }
   }
+  return mismatches;
 }
 
 /**

package/dist/theme-colors.js

@@ -26,7 +26,8 @@ const CONTENT_VALUES = Object.freeze({
   accent4: 'accent4', accent5: 'accent5', accent6: 'accent6',
   hyperlink: 'hlink', followedHyperlink: 'folHlink',
 });
-// PptxGenJS 4.0.1 createColorElement accepts only these scheme values.
+// PptxGenJS 4.0.1 createColorElement accepts only these scheme values (pptxgenjs-plus accepts more; the set is kept
+// so exported colours stay as they were).
 const VENDOR_VALUES = new Set(['tx1', 'tx2', 'bg1', 'bg2', 'accent1', 'accent2', 'accent3', 'accent4', 'accent5', 'accent6']);
 
 // Role names resolve through core resolveColorRef with the exporter's resolved

package/dist/typeface-inventory.js

@@ -20,7 +20,7 @@ const THEME_SLOT = {lt: 'latin', ea: 'ea', cs: 'cs'};
 const FIXED_PITCH = 1;
 
 // Per-script theme fonts (`<a:font script="…">`) written by the vendored
-// PptxGenJS 4.0.1 theme. They are Office's defaults for scripts the deck
+// PptxGenJS theme (4.0.1 and pptxgenjs-plus 4.3.4). They are Office's defaults for scripts the deck
 // declares no font for. PowerPoint uses one only for text in that script, and
 // it does not list them in "Fonts Used". The check allows exactly these
 // script/typeface pairs in the presentation theme; any other supplement fails
@@ -36,6 +36,9 @@ export const THEME_SCRIPT_SUPPLEMENTS = Object.freeze({
 export function inventoryPptxTypefaces(input, options = {}) {
   const typefaces = [];
   const themes = {};
+  // Every theme part's fonts, and the theme each part of the presentation package resolves its references against.
+  const themeParts = {};
+  let partTheme = () => undefined;
   let fontsUsed = null;
   const visit = (entries, prefix) => {
     const packageThemes = [];
@@ -53,20 +56,23 @@ export function inventoryPptxTypefaces(input, options = {}) {
       if (/^xl\/.*\.xml$/.test(path)) readSpreadsheetFonts(xml, part, typefaces);
       if (!prefix && path === 'docProps/app.xml') fontsUsed = readFontsUsed(xml);
     }
-    // Theme references resolve against the package theme. The exporter writes
-    // one theme per package; with several, the first (theme1) is used.
+    // Theme references resolve against the package theme (theme1). In the presentation package a part on another slide
+    // master (opf-pptx#168: one master per script profile) or the notes master resolves against that master's theme.
     const theme = packageThemes[0];
     if (theme) themes[prefix] = themeFonts(typefaces, theme);
+    for (const part of packageThemes) themeParts[part] = themeFonts(typefaces, part);
+    if (!prefix) partTheme = masterTheme(entries);
   };
   visit(toEntries(input), '');
   for (const entry of typefaces) {
     const reference = THEME_REFERENCE.exec(entry.typeface);
     if (!reference) continue;
     const prefix = entry.part.includes('!/') ? entry.part.slice(0, entry.part.lastIndexOf('!/') + 2) : '';
-    const resolved = themes[prefix]?.[reference[1] === 'mj' ? 'major' : 'minor']?.[THEME_SLOT[reference[2]]];
+    const own = prefix ? undefined : partTheme(entry.part);
+    const resolved = (own && themeParts[own] ? themeParts[own] : themes[prefix])?.[reference[1] === 'mj' ? 'major' : 'minor']?.[THEME_SLOT[reference[2]]];
     entry.resolved = resolved ?? null;
   }
-  return {typefaces, themes, fontsUsed};
+  return {typefaces, themes, themeParts, fontsUsed};
 }
 
 // Fonts a package uses, as PowerPoint lists them under "Fonts Used": the
@@ -99,8 +105,9 @@ export function checkPptxTypefaces(input, options = {}) {
   // FF-49: options.themeScripts names the East Asian / complex-script families the author selected for the
   // presentation theme, {major: {ea, cs}, minor: {ea, cs}}. A selected slot must carry exactly that family (an
   // empty or different one is a violation); a slot with nothing selected may stay empty, as in Office's own themes.
+  // options.themeScriptsByPart overrides it for the theme parts it names (opf-pptx#168: a slide master per script profile).
   const themeSlot = entry => entry.theme && !entry.part.includes('!/') && (entry.element === 'ea' || entry.element === 'cs')
-    ? options.themeScripts?.[entry.theme]?.[entry.element] || '' : '';
+    ? (options.themeScriptsByPart?.[entry.part] ?? options.themeScripts)?.[entry.theme]?.[entry.element] || '' : '';
   const pitches = new Map();
   for (const entry of inventory.typefaces) {
     const wanted = themeSlot(entry);
@@ -179,6 +186,43 @@ function readTypefaces(xml, part, isTheme, output) {
   }
 }
 
+// The theme part a slide, layout, master, notes slide or notes master uses: its own theme relationship, else its
+// layout's, master's or notes master's. Undefined for other parts (charts, the presentation part).
+function masterTheme(entries) {
+  const targets = new Map();
+  const related = path => {
+    if (!targets.has(path)) {
+      const rels = entries[path.replace(/([^/]+)$/, '_rels/$1.rels')];
+      const list = rels ? [...decoder.decode(rels).matchAll(/<Relationship\b[^>]*\/>/g)].map(([node]) => ({
+        type: /\sType="[^"]*\/([^"/]+)"/.exec(node)?.[1], target: /\sTarget="([^"]*)"/.exec(node)?.[1], external: /\sTargetMode="External"/.test(node)
+      })).filter(rel => rel.type && rel.target && !rel.external).map(rel => ({type: rel.type, path: resolvePart(path, rel.target)})) : [];
+      targets.set(path, list);
+    }
+    return targets.get(path);
+  };
+  return part => {
+    let path = part;
+    for (let depth = 0; depth < 4 && path; depth++) {
+      if (!/^ppt\/(?:slides|slideLayouts|slideMasters|notesSlides|notesMasters)\/[^/]+\.xml$/.test(path)) return undefined;
+      const rels = related(path);
+      const theme = rels.find(rel => rel.type === 'theme')?.path;
+      if (theme) return theme;
+      path = rels.find(rel => ['slideLayout', 'slideMaster', 'notesMaster'].includes(rel.type))?.path;
+    }
+    return undefined;
+  };
+}
+
+function resolvePart(source, target) {
+  if (target.startsWith('/')) return target.slice(1);
+  const parts = source.split('/').slice(0, -1);
+  for (const piece of target.split('/')) {
+    if (piece === '..') parts.pop();
+    else if (piece !== '.' && piece) parts.push(piece);
+  }
+  return parts.join('/');
+}
+
 function readSpreadsheetFonts(xml, part, output) {
   for (const match of xml.matchAll(/<(?:[\w.-]+:)?(name|rFont)\b[^<>]*?\bval="([^"]*)"[^<>]*>/g)) {
     output.push({part, kind: 'spreadsheetml', element: match[1], typeface: unescapeXml(match[2])});

package/dist/vendor-compat.js

@@ -0,0 +1,45 @@
+// RR-17 (opf-pptx#162): opf-pptx exports through pptxgenjs-plus 4.3.4 (vendor/pptxgenjs, UPSTREAM.json), the maintained
+// PptxGenJS fork. A few of its output changes are not correctness fixes for opf-pptx and would change what PowerPoint shows
+// or what the exporter's own contracts guarantee; this module puts those parts back to the PptxGenJS 4.0.1 output that the
+// native PowerPoint, Keynote and parity evidence was gathered on. It runs on the raw package, before any other
+// normalization. Every rule names the upstream change it undoes; docs/pptxgenjs-plus-migration.md lists all output changes.
+const decoder = new TextDecoder(), encoder = new TextEncoder();
+const text = bytes => decoder.decode(bytes);
+
+// 4.0.1 notes master (makeXmlNotesMaster, byte for byte). pptxgenjs-plus 2d3e872 ("emit a minimal notes master") drops
+// its header, date, slide image, body, footer and slide number placeholders, which sets the notes page layout in
+// PowerPoint (Notes Page view, printing). The repair it cites came from the notes master sharing the slide theme, which
+// opf-pptx already fixes (FF-05, master-themes.js), and PowerPoint opened this master in every native check.
+const LEGACY_NOTES_MASTER = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>${"\r\n"}<p:notesMaster xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main"><p:cSld><p:bg><p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef></p:bg><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Header Placeholder 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="hdr" sz="quarter"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="2971800" cy="458788"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="1200"/></a:lvl1pPr></a:lstStyle><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Date Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="3884613" y="0"/><a:ext cx="2971800" cy="458788"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"/><a:lstStyle><a:lvl1pPr algn="r"><a:defRPr sz="1200"/></a:lvl1pPr></a:lstStyle><a:p><a:fld id="{5282F153-3F37-0F45-9E97-73ACFA13230C}" type="datetimeFigureOut"><a:rPr lang="en-US"/><a:t>7/23/19</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Slide Image Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1" noRot="1" noChangeAspect="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldImg" idx="2"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="685800" y="1143000"/><a:ext cx="5486400" cy="3086100"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom><a:noFill/><a:ln w="12700"><a:solidFill><a:prstClr val="black"/></a:solidFill></a:ln></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr"/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Notes Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" sz="quarter" idx="3"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="685800" y="4400550"/><a:ext cx="5486400" cy="3600450"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0"/><a:lstStyle/><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US"/><a:t>Fifth level</a:t></a:r></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Footer Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="4"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="0" y="8685213"/><a:ext cx="2971800" cy="458787"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="b"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="1200"/></a:lvl1pPr></a:lstStyle><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="7" name="Slide Number Placeholder 6"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="5"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="3884613" y="8685213"/><a:ext cx="2971800" cy="458787"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></p:spPr><p:txBody><a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="b"/><a:lstStyle><a:lvl1pPr algn="r"><a:defRPr sz="1200"/></a:lvl1pPr></a:lstStyle><a:p><a:fld id="{CE5E9CC1-C706-0F49-92D6-E571CC5EEA8F}" type="slidenum"><a:rPr lang="en-US"/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree><p:extLst><p:ext uri="{BB962C8B-B14F-4D97-AF65-F5344CB8AC3E}"><p14:creationId xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="1024086991"/></p:ext></p:extLst></p:cSld><p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/><p:notesStyle><a:lvl1pPr marL="0" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl1pPr><a:lvl2pPr marL="457200" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl2pPr><a:lvl3pPr marL="914400" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl3pPr><a:lvl4pPr marL="1371600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl4pPr><a:lvl5pPr marL="1828800" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl5pPr><a:lvl6pPr marL="2286000" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl6pPr><a:lvl7pPr marL="2743200" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl7pPr><a:lvl8pPr marL="3200400" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl8pPr><a:lvl9pPr marL="3657600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1"><a:defRPr sz="1200" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr></a:lvl9pPr></p:notesStyle></p:notesMaster>`;
+
+// pptxgenjs-plus genXmlTextBody writes `<p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang=".."/></a:p></p:txBody>`
+// into every shape without text ("Shapes without text still require a <p:txBody>"); 4.0.1 wrote none. CT_Shape's txBody
+// is optional (ECMA-376 Part 1, 19.3.1.43, minOccurs 0) and PowerPoint opened text-less shapes in every native check;
+// an empty body would make every card frame, connector and marker an (empty) text shape for editors and importers.
+const EMPTY_SHAPE_TEXT = /<p:txBody><a:bodyPr\/><a:lstStyle\/><a:p><a:endParaRPr lang="[^"]*"\/><\/a:p><\/p:txBody>(?=<\/p:sp>)/g;
+
+/** Rewrites the raw pptxgenjs-plus entries in place (part name -> bytes). */
+export function legacyVendorOutput(entries) {
+  for (const part of Object.keys(entries)) {
+    if (/^ppt\/slides\/slide\d+\.xml$/.test(part)) {
+      const xml = text(entries[part]), output = xml.replace(EMPTY_SHAPE_TEXT, '');
+      if (output !== xml) entries[part] = encoder.encode(output);
+    }
+  }
+  if (entries['ppt/notesMasters/notesMaster1.xml']) entries['ppt/notesMasters/notesMaster1.xml'] = encoder.encode(LEGACY_NOTES_MASTER);
+  // pptxgenjs-plus 7c92136 ("spec-valid notes theme2") gives the notes master its own default Office theme (Office colours,
+  // Office font scheme). 4.0.1 pointed the notes master at theme1, and opf-pptx then gives it a copy of the finished deck
+  // theme (FF-05, giveNotesMastersOwnThemes), so PowerPoint lists only the deck's fonts. Point it back at theme1 and drop
+  // the vendor theme; the FF-05 copy replaces it after every theme rewrite.
+  const rels = 'ppt/notesMasters/_rels/notesMaster1.xml.rels';
+  if (entries[rels] && entries['ppt/theme/theme2.xml']) {
+    const relsXml = text(entries[rels]);
+    if (relsXml.includes('Target="../theme/theme2.xml"')) {
+      entries[rels] = encoder.encode(relsXml.replace('Target="../theme/theme2.xml"', 'Target="../theme/theme1.xml"'));
+      delete entries['ppt/theme/theme2.xml'];
+      const types = text(entries['[Content_Types].xml']);
+      entries['[Content_Types].xml'] = encoder.encode(types.replace(/<Override PartName="\/ppt\/theme\/theme2\.xml"[^>]*\/>/, ''));
+    }
+  }
+  return entries;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpresentation/opf-pptx",
-  "version": "0.12.4",
+  "version": "0.13.0",
   "description": "Pure local OPF to PPTX export and PPTX to OPF import tooling.",
   "license": "MIT",
   "type": "module",
@@ -64,14 +64,16 @@
     "test:determinism": "node test/determinism.mjs"
   },
   "dependencies": {
-    "@openpresentation/opf": "^0.12.2",
+    "@node-projects/jszip": "4.3.0",
+    "@openpresentation/opf": "^0.13.0",
+    "@rgrove/parse-xml": "4.2.3",
     "fast-xml-parser": "^5.8.0",
     "fflate": "^0.8.3",
-    "jszip": "3.10.2",
+    "pako": "3.0.2",
     "sharp": "0.35.4"
   },
   "peerDependencies": {
-    "@openpresentation/opf-render": "^0.12.2"
+    "@openpresentation/opf-render": "^0.13.0"
   },
   "peerDependenciesMeta": {
     "@openpresentation/opf-render": {
@@ -80,7 +82,7 @@
   },
   "devDependencies": {
     "@expo-google-fonts/carlito": "0.4.1",
-    "@openpresentation/opf-render": "0.12.2",
+    "@openpresentation/opf-render": "0.13.0",
     "esbuild": "0.28.2",
     "playwright": "1.63.0"
   },

package/vendor/pptxgenjs/LICENSE

@@ -1,21 +1,22 @@
-The MIT License (MIT)
-
-Copyright (c) 2015-2022 Brent Ely
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2015-2022 Brent Ely
+Copyright (c) 2026 lofcz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/vendor/pptxgenjs/UPSTREAM.json

@@ -1,19 +1,24 @@
 {
-  "name": "pptxgenjs",
-  "version": "4.0.1",
+  "name": "pptxgenjs-plus",
+  "version": "4.3.4",
   "license": "MIT",
-  "tarball": "https://registry.npmjs.org/pptxgenjs/-/pptxgenjs-4.0.1.tgz",
-  "integrity": "sha512-TeJISr8wouAuXw4C1F/mC33xbZs/FuEG6nH9FG1Zj+nuPcGMP5YRHl6X+j3HSUnS1f3at6k75ZZXPMZlA5Lj9A==",
+  "tarball": "https://registry.npmjs.org/pptxgenjs-plus/-/pptxgenjs-plus-4.3.4.tgz",
+  "integrity": "sha512-E4mu3Guf2O5CIzy6nS7tlAv55RyhPWinpsj2MdOM5QZ3XukkSne4oipE1HONTfaVLeJG4rkr2lOk6KhwbU/4mQ==",
+  "provenance": {
+    "repository": "https://github.com/lofcz/pptxgenjs-plus",
+    "ref": "refs/heads/next",
+    "commit": "ecfa5086a7a35dc8cc0faa502a61794a577554d5"
+  },
   "files": {
     "pptxgen.es.js": {
       "source": "package/dist/pptxgen.es.js",
-      "bytes": 516931,
-      "sha256": "05844c5625e2cda3b449eb967c2246dd57ca57341886a7c28eeebca263b29bd4"
+      "bytes": 1230609,
+      "sha256": "71f89c1bea86cee3c89f9ec948da99ef1f7dacf38fab33a21b6857ca6fb20dd1"
     },
     "LICENSE": {
       "source": "package/LICENSE",
-      "bytes": 1081,
-      "sha256": "7a2bfe96150786ed1908b8e63f98ebab88875c1e79e28faff6649e0f11f77e52"
+      "bytes": 1128,
+      "sha256": "09b419524813383278d9353e387b75abec06c184336e5c48974a377804b0239a"
     }
   }
 }