pptx-glimpse 0.3.1 → 0.4.1

package/dist/index.cjs

@@ -1540,8 +1540,8 @@ var standardParser = new import_fast_xml_parser.XMLParser({
   attributeNamePrefix: "@_",
   removeNSPrefix: true,
   htmlEntities: true,
-  isArray: (_name, jpath) => {
-    const tag = jpath.split(".").pop() ?? "";
+  isArray: (_name, jpath, _isLeafNode, _isAttribute) => {
+    const tag = String(jpath).split(".").pop() ?? "";
     return ARRAY_TAGS.has(tag);
   }
 });
@@ -1819,18 +1819,48 @@ function extractAlpha(node) {
 
 // src/parser/pptx-reader.ts
 var import_fflate = require("fflate");
+var LazyMediaMap = class {
+  rawInput;
+  cache = /* @__PURE__ */ new Map();
+  entryIndex;
+  constructor(rawInput, mediaEntryNames) {
+    this.rawInput = rawInput;
+    this.entryIndex = mediaEntryNames;
+  }
+  get(path) {
+    if (!this.entryIndex.has(path)) return void 0;
+    const cached = this.cache.get(path);
+    if (cached) return cached;
+    const result = (0, import_fflate.unzipSync)(this.rawInput, {
+      filter: (file) => file.name === path
+    });
+    const data = result[path];
+    if (data) {
+      this.cache.set(path, data);
+    }
+    return data;
+  }
+};
 function readPptx(input) {
-  const unzipped = (0, import_fflate.unzipSync)(new Uint8Array(input));
+  const rawInput = new Uint8Array(input);
+  const mediaEntryNames = /* @__PURE__ */ new Set();
+  const unzipped = (0, import_fflate.unzipSync)(rawInput, {
+    filter: (file) => {
+      if (file.name.startsWith("ppt/media/")) {
+        mediaEntryNames.add(file.name);
+        return false;
+      }
+      return true;
+    }
+  });
   const files = /* @__PURE__ */ new Map();
-  const media = /* @__PURE__ */ new Map();
   for (const [relativePath, data] of Object.entries(unzipped)) {
     if (relativePath.endsWith("/")) continue;
-    if (relativePath.startsWith("ppt/media/")) {
-      media.set(relativePath, data);
-    } else if (relativePath.endsWith(".xml") || relativePath.endsWith(".rels") || relativePath === "[Content_Types].xml") {
+    if (relativePath.endsWith(".xml") || relativePath.endsWith(".rels") || relativePath === "[Content_Types].xml") {
       files.set(relativePath, (0, import_fflate.strFromU8)(data));
     }
   }
+  const media = new LazyMediaMap(rawInput, mediaEntryNames);
   return { files, media };
 }
 
@@ -2270,13 +2300,11 @@ function parseBlipEffects(blipNode, colorResolver) {
   const blur = parseBlur(blipNode.blur);
   const lum = parseLum(blipNode.lum);
   const duotone = parseDuotone(blipNode.duotone, colorResolver);
-  if (blipNode.clrChange !== void 0) {
-    warn("blip.clrChange", "color change effect not implemented");
-  }
-  if (!grayscale && !biLevel && !blur && !lum && !duotone) {
+  const clrChange = parseClrChange(blipNode.clrChange, colorResolver);
+  if (!grayscale && !biLevel && !blur && !lum && !duotone && !clrChange) {
     return null;
   }
-  return { grayscale, biLevel, blur, lum, duotone };
+  return { grayscale, biLevel, blur, lum, duotone, clrChange };
 }
 function parseBiLevel(node) {
   if (!node) return null;
@@ -2312,6 +2340,16 @@ function parseDuotone(node, colorResolver) {
   if (colors.length < 2) return null;
   return { color1: colors[0], color2: colors[1] };
 }
+function parseClrChange(node, colorResolver) {
+  if (!node) return null;
+  const clrFrom = node.clrFrom;
+  const clrTo = node.clrTo;
+  if (!clrFrom || !clrTo) return null;
+  const from = colorResolver.resolve(clrFrom);
+  const to = colorResolver.resolve(clrTo);
+  if (!from || !to) return null;
+  return { clrFrom: from, clrTo: to };
+}
 function resolveColorNode(key, node, colorResolver) {
   if (key === "prstClr") {
     const val = node["@_val"];
@@ -4586,38 +4624,21 @@ function parsePptxData(input) {
       break;
     }
   }
-  let colorMap = defaultColorMap2();
-  let masterPath = null;
+  const masterCache = /* @__PURE__ */ new Map();
+  let firstMasterPath = null;
   for (const [, rel] of presRels) {
     if (rel.type.includes("slideMaster")) {
-      masterPath = resolveRelationshipTarget("ppt/presentation.xml", rel.target);
-      const masterXml2 = archive.files.get(masterPath);
-      if (masterXml2) {
-        colorMap = parseSlideMasterColorMap(masterXml2);
-      }
-      break;
+      const mPath = resolveRelationshipTarget("ppt/presentation.xml", rel.target);
+      if (!firstMasterPath) firstMasterPath = mPath;
+      parseMasterDataCached(mPath, archive, theme, masterCache);
     }
   }
-  const colorResolver = new ColorResolver(theme.colorScheme, colorMap);
-  const masterXml = masterPath ? archive.files.get(masterPath) : void 0;
-  let masterFillContext;
-  if (masterPath) {
-    const masterRelsPath = buildRelsPath(masterPath);
-    const masterRelsXml = archive.files.get(masterRelsPath);
-    const masterRels = masterRelsXml ? parseRelationships(masterRelsXml) : /* @__PURE__ */ new Map();
-    masterFillContext = { rels: masterRels, archive, basePath: masterPath };
-  }
-  const masterBackground = masterXml ? parseSlideMasterBackground(masterXml, colorResolver, masterFillContext) : null;
-  const masterElements = masterPath && masterXml ? parseSlideMasterElements(
-    masterXml,
-    masterPath,
-    archive,
-    colorResolver,
-    theme.fontScheme,
-    theme.fmtScheme
-  ) : [];
-  const masterTxStyles = masterXml ? parseSlideMasterTxStyles(masterXml, colorResolver) : void 0;
-  const masterPlaceholderStyles = masterXml ? parseSlideMasterPlaceholderStyles(masterXml, colorResolver) : [];
+  const defaultMaster = firstMasterPath ? masterCache.get(firstMasterPath) : void 0;
+  const colorResolver = defaultMaster?.colorResolver ?? new ColorResolver(theme.colorScheme, defaultColorMap2());
+  const masterBackground = defaultMaster?.background ?? null;
+  const masterElements = defaultMaster?.elements ?? [];
+  const masterTxStyles = defaultMaster?.txStyles;
+  const masterPlaceholderStyles = defaultMaster?.placeholderStyles ?? [];
   const slidePaths = [];
   for (let i = 0; i < presInfo.slideRIds.length; i++) {
     const rId = presInfo.slideRIds[i];
@@ -4636,77 +4657,100 @@ function parsePptxData(input) {
     masterTxStyles,
     masterPlaceholderStyles,
     slidePaths,
-    archive
+    archive,
+    masterCache
   };
 }
 function parseSlideWithLayout(slideNumber, path, data) {
   const slideXml = data.archive.files.get(path);
   if (!slideXml) return null;
+  const slideRelsPath = buildRelsPath(path);
+  const slideRelsXml = data.archive.files.get(slideRelsPath);
+  const slideRels = slideRelsXml ? parseRelationships(slideRelsXml) : /* @__PURE__ */ new Map();
+  let layoutPath = null;
+  let layoutXml;
+  let layoutRels = /* @__PURE__ */ new Map();
+  for (const [, rel] of slideRels) {
+    if (rel.type.includes("slideLayout")) {
+      layoutPath = resolveRelationshipTarget(path, rel.target);
+      layoutXml = data.archive.files.get(layoutPath);
+      if (layoutXml) {
+        const layoutRelsPath = buildRelsPath(layoutPath);
+        const layoutRelsXml = data.archive.files.get(layoutRelsPath);
+        layoutRels = layoutRelsXml ? parseRelationships(layoutRelsXml) : /* @__PURE__ */ new Map();
+      }
+      break;
+    }
+  }
+  let slideMasterData;
+  for (const [, rel] of layoutRels) {
+    if (rel.type.includes("slideMaster") && layoutPath) {
+      const masterPath = resolveRelationshipTarget(layoutPath, rel.target);
+      slideMasterData = parseMasterDataCached(
+        masterPath,
+        data.archive,
+        data.theme,
+        data.masterCache
+      );
+      break;
+    }
+  }
+  const slideColorResolver = resolveSlideColorResolver(
+    slideXml,
+    layoutXml,
+    slideMasterData,
+    data.theme
+  );
   const slide = parseSlide(
     slideXml,
     path,
     slideNumber,
     data.archive,
-    data.colorResolver,
+    slideColorResolver,
     data.theme.fontScheme,
     data.theme.fmtScheme
   );
   let layoutElements = [];
   let layoutPlaceholderStyles = [];
   let layoutShowMasterSp = true;
-  const slideRelsPath = buildRelsPath(path);
-  const slideRelsXml = data.archive.files.get(slideRelsPath);
-  if (slideRelsXml) {
-    const slideRels = parseRelationships(slideRelsXml);
-    for (const [, rel] of slideRels) {
-      if (rel.type.includes("slideLayout")) {
-        const layoutPath = resolveRelationshipTarget(path, rel.target);
-        const layoutXml = data.archive.files.get(layoutPath);
-        if (layoutXml) {
-          if (!slide.background) {
-            const layoutRelsPath = buildRelsPath(layoutPath);
-            const layoutRelsXml = data.archive.files.get(layoutRelsPath);
-            const layoutRels = layoutRelsXml ? parseRelationships(layoutRelsXml) : /* @__PURE__ */ new Map();
-            const layoutFillContext = {
-              rels: layoutRels,
-              archive: data.archive,
-              basePath: layoutPath
-            };
-            slide.background = parseSlideLayoutBackground(
-              layoutXml,
-              data.colorResolver,
-              layoutFillContext
-            );
-          }
-          layoutElements = parseSlideLayoutElements(
-            layoutXml,
-            layoutPath,
-            data.archive,
-            data.colorResolver,
-            data.theme.fontScheme,
-            data.theme.fmtScheme
-          );
-          layoutPlaceholderStyles = parseSlideLayoutPlaceholderStyles(
-            layoutXml,
-            data.colorResolver
-          );
-          layoutShowMasterSp = parseSlideLayoutShowMasterSp(layoutXml);
-        }
-        break;
-      }
+  if (layoutXml && layoutPath) {
+    if (!slide.background) {
+      const layoutFillContext = {
+        rels: layoutRels,
+        archive: data.archive,
+        basePath: layoutPath
+      };
+      slide.background = parseSlideLayoutBackground(
+        layoutXml,
+        slideColorResolver,
+        layoutFillContext
+      );
     }
+    layoutElements = parseSlideLayoutElements(
+      layoutXml,
+      layoutPath,
+      data.archive,
+      slideColorResolver,
+      data.theme.fontScheme,
+      data.theme.fmtScheme
+    );
+    layoutPlaceholderStyles = parseSlideLayoutPlaceholderStyles(layoutXml, slideColorResolver);
+    layoutShowMasterSp = parseSlideLayoutShowMasterSp(layoutXml);
   }
   if (!slide.background) {
-    slide.background = data.masterBackground;
+    slide.background = slideMasterData?.background ?? data.masterBackground;
   }
+  const masterPlaceholderStyles = slideMasterData?.placeholderStyles ?? data.masterPlaceholderStyles;
+  const masterTxStyles = slideMasterData?.txStyles ?? data.masterTxStyles;
   applyTextStyleInheritance(slide.elements, {
     layoutPlaceholderStyles,
-    masterPlaceholderStyles: data.masterPlaceholderStyles,
-    txStyles: data.masterTxStyles,
+    masterPlaceholderStyles,
+    txStyles: masterTxStyles,
     defaultTextStyle: data.presInfo.defaultTextStyle,
     fontScheme: data.theme.fontScheme
   });
-  return { slide, layoutElements, layoutShowMasterSp };
+  const masterElements = slideMasterData?.elements ?? data.masterElements;
+  return { slide, layoutElements, layoutShowMasterSp, masterElements };
 }
 function defaultColorScheme2() {
   return {
@@ -4740,6 +4784,88 @@ function defaultColorMap2() {
     folHlink: "folHlink"
   };
 }
+function parseMasterDataCached(masterPath, archive, theme, cache) {
+  const cached = cache.get(masterPath);
+  if (cached) return cached;
+  const masterXml = archive.files.get(masterPath);
+  if (!masterXml) return void 0;
+  const colorMap = parseSlideMasterColorMap(masterXml);
+  const colorResolver = new ColorResolver(theme.colorScheme, colorMap);
+  const masterRelsPath = buildRelsPath(masterPath);
+  const masterRelsXml = archive.files.get(masterRelsPath);
+  const masterRels = masterRelsXml ? parseRelationships(masterRelsXml) : /* @__PURE__ */ new Map();
+  const masterFillContext = { rels: masterRels, archive, basePath: masterPath };
+  const background = parseSlideMasterBackground(masterXml, colorResolver, masterFillContext);
+  const elements = parseSlideMasterElements(
+    masterXml,
+    masterPath,
+    archive,
+    colorResolver,
+    theme.fontScheme,
+    theme.fmtScheme
+  );
+  const txStyles = parseSlideMasterTxStyles(masterXml, colorResolver);
+  const placeholderStyles = parseSlideMasterPlaceholderStyles(masterXml, colorResolver);
+  const data = {
+    colorMap,
+    colorResolver,
+    background,
+    elements,
+    txStyles,
+    placeholderStyles
+  };
+  cache.set(masterPath, data);
+  return data;
+}
+function resolveSlideColorResolver(slideXml, layoutXml, masterData, theme) {
+  const baseColorMap = masterData?.colorMap ?? defaultColorMap2();
+  const layoutOverride = layoutXml ? parseClrMapOverride(layoutXml) : null;
+  const slideOverride = parseClrMapOverride(slideXml);
+  let effectiveColorMap = baseColorMap;
+  if (layoutOverride) {
+    effectiveColorMap = { ...effectiveColorMap, ...layoutOverride };
+  }
+  if (slideOverride) {
+    effectiveColorMap = { ...effectiveColorMap, ...slideOverride };
+  }
+  if (!layoutOverride && !slideOverride && masterData) {
+    return masterData.colorResolver;
+  }
+  return new ColorResolver(theme.colorScheme, effectiveColorMap);
+}
+function parseClrMapOverride(xml) {
+  if (!xml.includes("clrMapOvr")) return null;
+  const parsed = parseXml(xml);
+  const root = parsed.sld ?? parsed.sldLayout;
+  if (!root) return null;
+  const clrMapOvr = root.clrMapOvr;
+  if (!clrMapOvr) return null;
+  if (clrMapOvr.masterClrMapping !== void 0) return null;
+  const override = clrMapOvr.overrideClrMapping;
+  if (!override) return null;
+  const result = {};
+  const keys = [
+    "bg1",
+    "tx1",
+    "bg2",
+    "tx2",
+    "accent1",
+    "accent2",
+    "accent3",
+    "accent4",
+    "accent5",
+    "accent6",
+    "hlink",
+    "folHlink"
+  ];
+  for (const key of keys) {
+    const val = override[`@_${key}`];
+    if (val) {
+      result[key] = val;
+    }
+  }
+  return Object.keys(result).length > 0 ? result : null;
+}
 
 // src/renderer/transform.ts
 function buildTransformAttr(t) {
@@ -5906,6 +6032,15 @@ function renderBlipEffects(blipEffects) {
     );
     lastResult = "duotoneResult";
   }
+  if (blipEffects.clrChange && blipEffects.clrChange.clrTo.alpha === 0) {
+    const { clrFrom } = blipEffects.clrChange;
+    const [rf, gf, bf] = hexToRgbNorm(clrFrom.hex);
+    const scale = 20;
+    primitives.push(
+      `<feColorMatrix in="${lastResult}" type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 ${round2(scale)} ${round2(scale)} ${round2(scale)} 0 ${round2(-scale * (rf + gf + bf))}" result="clrChangeResult"/>`
+    );
+    lastResult = "clrChangeResult";
+  }
   if (primitives.length === 0) return { filterAttr: "", filterDefs: "" };
   const id = `blip-effect-${crypto.randomUUID()}`;
   const filterDefs = [
@@ -6141,7 +6276,8 @@ var presetGeometries = {
   rect: (w, h) => `<rect width="${w}" height="${h}"/>`,
   ellipse: (w, h) => `<ellipse cx="${w / 2}" cy="${h / 2}" rx="${w / 2}" ry="${h / 2}"/>`,
   roundRect: (w, h, adj) => {
-    const r = (adj["adj"] ?? 16667) / 1e5 * Math.min(w, h);
+    const a = Math.min(5e4, Math.max(0, adj["adj"] ?? 16667));
+    const r = a / 1e5 * Math.min(w, h);
     return `<rect width="${w}" height="${h}" rx="${r}" ry="${r}"/>`;
   },
   triangle: (w, h, adj) => {
@@ -6787,17 +6923,22 @@ var presetGeometries = {
     return `<path d="M ${r} 0 L ${w - d} 0 L ${w} ${d} L ${w} ${h} L 0 ${h} L 0 ${r} A ${r} ${r} 0 0 1 ${r} 0 Z"/>`;
   },
   round1Rect: (w, h, adj) => {
-    const r = (adj["adj"] ?? 16667) / 1e5 * Math.min(w, h);
+    const a = Math.min(5e4, Math.max(0, adj["adj"] ?? 16667));
+    const r = a / 1e5 * Math.min(w, h);
     return `<path d="M 0 0 L ${w - r} 0 A ${r} ${r} 0 0 1 ${w} ${r} L ${w} ${h} L 0 ${h} Z"/>`;
   },
   round2SameRect: (w, h, adj) => {
-    const r1 = (adj["adj1"] ?? 16667) / 1e5 * Math.min(w, h);
-    const r2 = (adj["adj2"] ?? 0) / 1e5 * Math.min(w, h);
+    const a1 = Math.min(5e4, Math.max(0, adj["adj1"] ?? 16667));
+    const a2 = Math.min(5e4, Math.max(0, adj["adj2"] ?? 0));
+    const r1 = a1 / 1e5 * Math.min(w, h);
+    const r2 = a2 / 1e5 * Math.min(w, h);
     return `<path d="M ${r1} 0 L ${w - r1} 0 A ${r1} ${r1} 0 0 1 ${w} ${r1} L ${w} ${h - r2} A ${r2} ${r2} 0 0 1 ${w - r2} ${h} L ${r2} ${h} A ${r2} ${r2} 0 0 1 0 ${h - r2} L 0 ${r1} A ${r1} ${r1} 0 0 1 ${r1} 0 Z"/>`;
   },
   round2DiagRect: (w, h, adj) => {
-    const r1 = (adj["adj1"] ?? 16667) / 1e5 * Math.min(w, h);
-    const r2 = (adj["adj2"] ?? 0) / 1e5 * Math.min(w, h);
+    const a1 = Math.min(5e4, Math.max(0, adj["adj1"] ?? 16667));
+    const a2 = Math.min(5e4, Math.max(0, adj["adj2"] ?? 0));
+    const r1 = a1 / 1e5 * Math.min(w, h);
+    const r2 = a2 / 1e5 * Math.min(w, h);
     return `<path d="M ${r1} 0 L ${w} 0 L ${w} ${h - r2} A ${r2} ${r2} 0 0 1 ${w - r2} ${h} L 0 ${h} L 0 ${r1} A ${r1} ${r1} 0 0 1 ${r1} 0 Z"/>`;
   },
   // Brackets and braces
@@ -8458,8 +8599,8 @@ async function convertPptxToSvg(input, options) {
     for (const { slideNumber, path } of targetSlides) {
       const parsed = parseSlideWithLayout(slideNumber, path, data);
       if (!parsed) continue;
-      const { slide, layoutElements, layoutShowMasterSp } = parsed;
-      const effectiveMasterElements = slide.showMasterSp && layoutShowMasterSp ? data.masterElements : [];
+      const { slide, layoutElements, layoutShowMasterSp, masterElements } = parsed;
+      const effectiveMasterElements = slide.showMasterSp && layoutShowMasterSp ? masterElements : [];
       slide.elements = mergeElements(effectiveMasterElements, layoutElements, slide.elements);
       const svg = renderSlideToSvg(slide, data.presInfo.slideSize);
       results.push({ slideNumber, svg });
@@ -8508,12 +8649,16 @@ function collectUsedFonts(input) {
     const fontScheme = data.theme.fontScheme;
     const fonts = /* @__PURE__ */ new Set();
     collectThemeFonts(fontScheme, fonts);
+    const collectedMasters = /* @__PURE__ */ new Set();
     for (const { slideNumber, path } of data.slidePaths) {
       const parsed = parseSlideWithLayout(slideNumber, path, data);
       if (!parsed) continue;
       collectFontsFromElements(parsed.slide.elements, fonts);
+      if (!collectedMasters.has(parsed.masterElements)) {
+        collectedMasters.add(parsed.masterElements);
+        collectFontsFromElements(parsed.masterElements, fonts);
+      }
     }
-    collectFontsFromElements(data.masterElements, fonts);
     return {
       theme: {
         majorFont: fontScheme.majorFont,

package/dist/index.js

@@ -1495,8 +1495,8 @@ var standardParser = new XMLParser({
   attributeNamePrefix: "@_",
   removeNSPrefix: true,
   htmlEntities: true,
-  isArray: (_name, jpath) => {
-    const tag = jpath.split(".").pop() ?? "";
+  isArray: (_name, jpath, _isLeafNode, _isAttribute) => {
+    const tag = String(jpath).split(".").pop() ?? "";
     return ARRAY_TAGS.has(tag);
   }
 });
@@ -1774,18 +1774,48 @@ function extractAlpha(node) {
 
 // src/parser/pptx-reader.ts
 import { strFromU8, unzipSync } from "fflate";
+var LazyMediaMap = class {
+  rawInput;
+  cache = /* @__PURE__ */ new Map();
+  entryIndex;
+  constructor(rawInput, mediaEntryNames) {
+    this.rawInput = rawInput;
+    this.entryIndex = mediaEntryNames;
+  }
+  get(path) {
+    if (!this.entryIndex.has(path)) return void 0;
+    const cached = this.cache.get(path);
+    if (cached) return cached;
+    const result = unzipSync(this.rawInput, {
+      filter: (file) => file.name === path
+    });
+    const data = result[path];
+    if (data) {
+      this.cache.set(path, data);
+    }
+    return data;
+  }
+};
 function readPptx(input) {
-  const unzipped = unzipSync(new Uint8Array(input));
+  const rawInput = new Uint8Array(input);
+  const mediaEntryNames = /* @__PURE__ */ new Set();
+  const unzipped = unzipSync(rawInput, {
+    filter: (file) => {
+      if (file.name.startsWith("ppt/media/")) {
+        mediaEntryNames.add(file.name);
+        return false;
+      }
+      return true;
+    }
+  });
   const files = /* @__PURE__ */ new Map();
-  const media = /* @__PURE__ */ new Map();
   for (const [relativePath, data] of Object.entries(unzipped)) {
     if (relativePath.endsWith("/")) continue;
-    if (relativePath.startsWith("ppt/media/")) {
-      media.set(relativePath, data);
-    } else if (relativePath.endsWith(".xml") || relativePath.endsWith(".rels") || relativePath === "[Content_Types].xml") {
+    if (relativePath.endsWith(".xml") || relativePath.endsWith(".rels") || relativePath === "[Content_Types].xml") {
       files.set(relativePath, strFromU8(data));
     }
   }
+  const media = new LazyMediaMap(rawInput, mediaEntryNames);
   return { files, media };
 }
 
@@ -2225,13 +2255,11 @@ function parseBlipEffects(blipNode, colorResolver) {
   const blur = parseBlur(blipNode.blur);
   const lum = parseLum(blipNode.lum);
   const duotone = parseDuotone(blipNode.duotone, colorResolver);
-  if (blipNode.clrChange !== void 0) {
-    warn("blip.clrChange", "color change effect not implemented");
-  }
-  if (!grayscale && !biLevel && !blur && !lum && !duotone) {
+  const clrChange = parseClrChange(blipNode.clrChange, colorResolver);
+  if (!grayscale && !biLevel && !blur && !lum && !duotone && !clrChange) {
     return null;
   }
-  return { grayscale, biLevel, blur, lum, duotone };
+  return { grayscale, biLevel, blur, lum, duotone, clrChange };
 }
 function parseBiLevel(node) {
   if (!node) return null;
@@ -2267,6 +2295,16 @@ function parseDuotone(node, colorResolver) {
   if (colors.length < 2) return null;
   return { color1: colors[0], color2: colors[1] };
 }
+function parseClrChange(node, colorResolver) {
+  if (!node) return null;
+  const clrFrom = node.clrFrom;
+  const clrTo = node.clrTo;
+  if (!clrFrom || !clrTo) return null;
+  const from = colorResolver.resolve(clrFrom);
+  const to = colorResolver.resolve(clrTo);
+  if (!from || !to) return null;
+  return { clrFrom: from, clrTo: to };
+}
 function resolveColorNode(key, node, colorResolver) {
   if (key === "prstClr") {
     const val = node["@_val"];
@@ -4541,38 +4579,21 @@ function parsePptxData(input) {
       break;
     }
   }
-  let colorMap = defaultColorMap2();
-  let masterPath = null;
+  const masterCache = /* @__PURE__ */ new Map();
+  let firstMasterPath = null;
   for (const [, rel] of presRels) {
     if (rel.type.includes("slideMaster")) {
-      masterPath = resolveRelationshipTarget("ppt/presentation.xml", rel.target);
-      const masterXml2 = archive.files.get(masterPath);
-      if (masterXml2) {
-        colorMap = parseSlideMasterColorMap(masterXml2);
-      }
-      break;
+      const mPath = resolveRelationshipTarget("ppt/presentation.xml", rel.target);
+      if (!firstMasterPath) firstMasterPath = mPath;
+      parseMasterDataCached(mPath, archive, theme, masterCache);
     }
   }
-  const colorResolver = new ColorResolver(theme.colorScheme, colorMap);
-  const masterXml = masterPath ? archive.files.get(masterPath) : void 0;
-  let masterFillContext;
-  if (masterPath) {
-    const masterRelsPath = buildRelsPath(masterPath);
-    const masterRelsXml = archive.files.get(masterRelsPath);
-    const masterRels = masterRelsXml ? parseRelationships(masterRelsXml) : /* @__PURE__ */ new Map();
-    masterFillContext = { rels: masterRels, archive, basePath: masterPath };
-  }
-  const masterBackground = masterXml ? parseSlideMasterBackground(masterXml, colorResolver, masterFillContext) : null;
-  const masterElements = masterPath && masterXml ? parseSlideMasterElements(
-    masterXml,
-    masterPath,
-    archive,
-    colorResolver,
-    theme.fontScheme,
-    theme.fmtScheme
-  ) : [];
-  const masterTxStyles = masterXml ? parseSlideMasterTxStyles(masterXml, colorResolver) : void 0;
-  const masterPlaceholderStyles = masterXml ? parseSlideMasterPlaceholderStyles(masterXml, colorResolver) : [];
+  const defaultMaster = firstMasterPath ? masterCache.get(firstMasterPath) : void 0;
+  const colorResolver = defaultMaster?.colorResolver ?? new ColorResolver(theme.colorScheme, defaultColorMap2());
+  const masterBackground = defaultMaster?.background ?? null;
+  const masterElements = defaultMaster?.elements ?? [];
+  const masterTxStyles = defaultMaster?.txStyles;
+  const masterPlaceholderStyles = defaultMaster?.placeholderStyles ?? [];
   const slidePaths = [];
   for (let i = 0; i < presInfo.slideRIds.length; i++) {
     const rId = presInfo.slideRIds[i];
@@ -4591,77 +4612,100 @@ function parsePptxData(input) {
     masterTxStyles,
     masterPlaceholderStyles,
     slidePaths,
-    archive
+    archive,
+    masterCache
   };
 }
 function parseSlideWithLayout(slideNumber, path, data) {
   const slideXml = data.archive.files.get(path);
   if (!slideXml) return null;
+  const slideRelsPath = buildRelsPath(path);
+  const slideRelsXml = data.archive.files.get(slideRelsPath);
+  const slideRels = slideRelsXml ? parseRelationships(slideRelsXml) : /* @__PURE__ */ new Map();
+  let layoutPath = null;
+  let layoutXml;
+  let layoutRels = /* @__PURE__ */ new Map();
+  for (const [, rel] of slideRels) {
+    if (rel.type.includes("slideLayout")) {
+      layoutPath = resolveRelationshipTarget(path, rel.target);
+      layoutXml = data.archive.files.get(layoutPath);
+      if (layoutXml) {
+        const layoutRelsPath = buildRelsPath(layoutPath);
+        const layoutRelsXml = data.archive.files.get(layoutRelsPath);
+        layoutRels = layoutRelsXml ? parseRelationships(layoutRelsXml) : /* @__PURE__ */ new Map();
+      }
+      break;
+    }
+  }
+  let slideMasterData;
+  for (const [, rel] of layoutRels) {
+    if (rel.type.includes("slideMaster") && layoutPath) {
+      const masterPath = resolveRelationshipTarget(layoutPath, rel.target);
+      slideMasterData = parseMasterDataCached(
+        masterPath,
+        data.archive,
+        data.theme,
+        data.masterCache
+      );
+      break;
+    }
+  }
+  const slideColorResolver = resolveSlideColorResolver(
+    slideXml,
+    layoutXml,
+    slideMasterData,
+    data.theme
+  );
   const slide = parseSlide(
     slideXml,
     path,
     slideNumber,
     data.archive,
-    data.colorResolver,
+    slideColorResolver,
     data.theme.fontScheme,
     data.theme.fmtScheme
   );
   let layoutElements = [];
   let layoutPlaceholderStyles = [];
   let layoutShowMasterSp = true;
-  const slideRelsPath = buildRelsPath(path);
-  const slideRelsXml = data.archive.files.get(slideRelsPath);
-  if (slideRelsXml) {
-    const slideRels = parseRelationships(slideRelsXml);
-    for (const [, rel] of slideRels) {
-      if (rel.type.includes("slideLayout")) {
-        const layoutPath = resolveRelationshipTarget(path, rel.target);
-        const layoutXml = data.archive.files.get(layoutPath);
-        if (layoutXml) {
-          if (!slide.background) {
-            const layoutRelsPath = buildRelsPath(layoutPath);
-            const layoutRelsXml = data.archive.files.get(layoutRelsPath);
-            const layoutRels = layoutRelsXml ? parseRelationships(layoutRelsXml) : /* @__PURE__ */ new Map();
-            const layoutFillContext = {
-              rels: layoutRels,
-              archive: data.archive,
-              basePath: layoutPath
-            };
-            slide.background = parseSlideLayoutBackground(
-              layoutXml,
-              data.colorResolver,
-              layoutFillContext
-            );
-          }
-          layoutElements = parseSlideLayoutElements(
-            layoutXml,
-            layoutPath,
-            data.archive,
-            data.colorResolver,
-            data.theme.fontScheme,
-            data.theme.fmtScheme
-          );
-          layoutPlaceholderStyles = parseSlideLayoutPlaceholderStyles(
-            layoutXml,
-            data.colorResolver
-          );
-          layoutShowMasterSp = parseSlideLayoutShowMasterSp(layoutXml);
-        }
-        break;
-      }
+  if (layoutXml && layoutPath) {
+    if (!slide.background) {
+      const layoutFillContext = {
+        rels: layoutRels,
+        archive: data.archive,
+        basePath: layoutPath
+      };
+      slide.background = parseSlideLayoutBackground(
+        layoutXml,
+        slideColorResolver,
+        layoutFillContext
+      );
     }
+    layoutElements = parseSlideLayoutElements(
+      layoutXml,
+      layoutPath,
+      data.archive,
+      slideColorResolver,
+      data.theme.fontScheme,
+      data.theme.fmtScheme
+    );
+    layoutPlaceholderStyles = parseSlideLayoutPlaceholderStyles(layoutXml, slideColorResolver);
+    layoutShowMasterSp = parseSlideLayoutShowMasterSp(layoutXml);
   }
   if (!slide.background) {
-    slide.background = data.masterBackground;
+    slide.background = slideMasterData?.background ?? data.masterBackground;
   }
+  const masterPlaceholderStyles = slideMasterData?.placeholderStyles ?? data.masterPlaceholderStyles;
+  const masterTxStyles = slideMasterData?.txStyles ?? data.masterTxStyles;
   applyTextStyleInheritance(slide.elements, {
     layoutPlaceholderStyles,
-    masterPlaceholderStyles: data.masterPlaceholderStyles,
-    txStyles: data.masterTxStyles,
+    masterPlaceholderStyles,
+    txStyles: masterTxStyles,
     defaultTextStyle: data.presInfo.defaultTextStyle,
     fontScheme: data.theme.fontScheme
   });
-  return { slide, layoutElements, layoutShowMasterSp };
+  const masterElements = slideMasterData?.elements ?? data.masterElements;
+  return { slide, layoutElements, layoutShowMasterSp, masterElements };
 }
 function defaultColorScheme2() {
   return {
@@ -4695,6 +4739,88 @@ function defaultColorMap2() {
     folHlink: "folHlink"
   };
 }
+function parseMasterDataCached(masterPath, archive, theme, cache) {
+  const cached = cache.get(masterPath);
+  if (cached) return cached;
+  const masterXml = archive.files.get(masterPath);
+  if (!masterXml) return void 0;
+  const colorMap = parseSlideMasterColorMap(masterXml);
+  const colorResolver = new ColorResolver(theme.colorScheme, colorMap);
+  const masterRelsPath = buildRelsPath(masterPath);
+  const masterRelsXml = archive.files.get(masterRelsPath);
+  const masterRels = masterRelsXml ? parseRelationships(masterRelsXml) : /* @__PURE__ */ new Map();
+  const masterFillContext = { rels: masterRels, archive, basePath: masterPath };
+  const background = parseSlideMasterBackground(masterXml, colorResolver, masterFillContext);
+  const elements = parseSlideMasterElements(
+    masterXml,
+    masterPath,
+    archive,
+    colorResolver,
+    theme.fontScheme,
+    theme.fmtScheme
+  );
+  const txStyles = parseSlideMasterTxStyles(masterXml, colorResolver);
+  const placeholderStyles = parseSlideMasterPlaceholderStyles(masterXml, colorResolver);
+  const data = {
+    colorMap,
+    colorResolver,
+    background,
+    elements,
+    txStyles,
+    placeholderStyles
+  };
+  cache.set(masterPath, data);
+  return data;
+}
+function resolveSlideColorResolver(slideXml, layoutXml, masterData, theme) {
+  const baseColorMap = masterData?.colorMap ?? defaultColorMap2();
+  const layoutOverride = layoutXml ? parseClrMapOverride(layoutXml) : null;
+  const slideOverride = parseClrMapOverride(slideXml);
+  let effectiveColorMap = baseColorMap;
+  if (layoutOverride) {
+    effectiveColorMap = { ...effectiveColorMap, ...layoutOverride };
+  }
+  if (slideOverride) {
+    effectiveColorMap = { ...effectiveColorMap, ...slideOverride };
+  }
+  if (!layoutOverride && !slideOverride && masterData) {
+    return masterData.colorResolver;
+  }
+  return new ColorResolver(theme.colorScheme, effectiveColorMap);
+}
+function parseClrMapOverride(xml) {
+  if (!xml.includes("clrMapOvr")) return null;
+  const parsed = parseXml(xml);
+  const root = parsed.sld ?? parsed.sldLayout;
+  if (!root) return null;
+  const clrMapOvr = root.clrMapOvr;
+  if (!clrMapOvr) return null;
+  if (clrMapOvr.masterClrMapping !== void 0) return null;
+  const override = clrMapOvr.overrideClrMapping;
+  if (!override) return null;
+  const result = {};
+  const keys = [
+    "bg1",
+    "tx1",
+    "bg2",
+    "tx2",
+    "accent1",
+    "accent2",
+    "accent3",
+    "accent4",
+    "accent5",
+    "accent6",
+    "hlink",
+    "folHlink"
+  ];
+  for (const key of keys) {
+    const val = override[`@_${key}`];
+    if (val) {
+      result[key] = val;
+    }
+  }
+  return Object.keys(result).length > 0 ? result : null;
+}
 
 // src/renderer/transform.ts
 function buildTransformAttr(t) {
@@ -5861,6 +5987,15 @@ function renderBlipEffects(blipEffects) {
     );
     lastResult = "duotoneResult";
   }
+  if (blipEffects.clrChange && blipEffects.clrChange.clrTo.alpha === 0) {
+    const { clrFrom } = blipEffects.clrChange;
+    const [rf, gf, bf] = hexToRgbNorm(clrFrom.hex);
+    const scale = 20;
+    primitives.push(
+      `<feColorMatrix in="${lastResult}" type="matrix" values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 ${round2(scale)} ${round2(scale)} ${round2(scale)} 0 ${round2(-scale * (rf + gf + bf))}" result="clrChangeResult"/>`
+    );
+    lastResult = "clrChangeResult";
+  }
   if (primitives.length === 0) return { filterAttr: "", filterDefs: "" };
   const id = `blip-effect-${crypto.randomUUID()}`;
   const filterDefs = [
@@ -6096,7 +6231,8 @@ var presetGeometries = {
   rect: (w, h) => `<rect width="${w}" height="${h}"/>`,
   ellipse: (w, h) => `<ellipse cx="${w / 2}" cy="${h / 2}" rx="${w / 2}" ry="${h / 2}"/>`,
   roundRect: (w, h, adj) => {
-    const r = (adj["adj"] ?? 16667) / 1e5 * Math.min(w, h);
+    const a = Math.min(5e4, Math.max(0, adj["adj"] ?? 16667));
+    const r = a / 1e5 * Math.min(w, h);
     return `<rect width="${w}" height="${h}" rx="${r}" ry="${r}"/>`;
   },
   triangle: (w, h, adj) => {
@@ -6742,17 +6878,22 @@ var presetGeometries = {
     return `<path d="M ${r} 0 L ${w - d} 0 L ${w} ${d} L ${w} ${h} L 0 ${h} L 0 ${r} A ${r} ${r} 0 0 1 ${r} 0 Z"/>`;
   },
   round1Rect: (w, h, adj) => {
-    const r = (adj["adj"] ?? 16667) / 1e5 * Math.min(w, h);
+    const a = Math.min(5e4, Math.max(0, adj["adj"] ?? 16667));
+    const r = a / 1e5 * Math.min(w, h);
     return `<path d="M 0 0 L ${w - r} 0 A ${r} ${r} 0 0 1 ${w} ${r} L ${w} ${h} L 0 ${h} Z"/>`;
   },
   round2SameRect: (w, h, adj) => {
-    const r1 = (adj["adj1"] ?? 16667) / 1e5 * Math.min(w, h);
-    const r2 = (adj["adj2"] ?? 0) / 1e5 * Math.min(w, h);
+    const a1 = Math.min(5e4, Math.max(0, adj["adj1"] ?? 16667));
+    const a2 = Math.min(5e4, Math.max(0, adj["adj2"] ?? 0));
+    const r1 = a1 / 1e5 * Math.min(w, h);
+    const r2 = a2 / 1e5 * Math.min(w, h);
     return `<path d="M ${r1} 0 L ${w - r1} 0 A ${r1} ${r1} 0 0 1 ${w} ${r1} L ${w} ${h - r2} A ${r2} ${r2} 0 0 1 ${w - r2} ${h} L ${r2} ${h} A ${r2} ${r2} 0 0 1 0 ${h - r2} L 0 ${r1} A ${r1} ${r1} 0 0 1 ${r1} 0 Z"/>`;
   },
   round2DiagRect: (w, h, adj) => {
-    const r1 = (adj["adj1"] ?? 16667) / 1e5 * Math.min(w, h);
-    const r2 = (adj["adj2"] ?? 0) / 1e5 * Math.min(w, h);
+    const a1 = Math.min(5e4, Math.max(0, adj["adj1"] ?? 16667));
+    const a2 = Math.min(5e4, Math.max(0, adj["adj2"] ?? 0));
+    const r1 = a1 / 1e5 * Math.min(w, h);
+    const r2 = a2 / 1e5 * Math.min(w, h);
     return `<path d="M ${r1} 0 L ${w} 0 L ${w} ${h - r2} A ${r2} ${r2} 0 0 1 ${w - r2} ${h} L 0 ${h} L 0 ${r1} A ${r1} ${r1} 0 0 1 ${r1} 0 Z"/>`;
   },
   // Brackets and braces
@@ -8413,8 +8554,8 @@ async function convertPptxToSvg(input, options) {
     for (const { slideNumber, path } of targetSlides) {
       const parsed = parseSlideWithLayout(slideNumber, path, data);
       if (!parsed) continue;
-      const { slide, layoutElements, layoutShowMasterSp } = parsed;
-      const effectiveMasterElements = slide.showMasterSp && layoutShowMasterSp ? data.masterElements : [];
+      const { slide, layoutElements, layoutShowMasterSp, masterElements } = parsed;
+      const effectiveMasterElements = slide.showMasterSp && layoutShowMasterSp ? masterElements : [];
       slide.elements = mergeElements(effectiveMasterElements, layoutElements, slide.elements);
       const svg = renderSlideToSvg(slide, data.presInfo.slideSize);
       results.push({ slideNumber, svg });
@@ -8463,12 +8604,16 @@ function collectUsedFonts(input) {
     const fontScheme = data.theme.fontScheme;
     const fonts = /* @__PURE__ */ new Set();
     collectThemeFonts(fontScheme, fonts);
+    const collectedMasters = /* @__PURE__ */ new Set();
     for (const { slideNumber, path } of data.slidePaths) {
       const parsed = parseSlideWithLayout(slideNumber, path, data);
       if (!parsed) continue;
       collectFontsFromElements(parsed.slide.elements, fonts);
+      if (!collectedMasters.has(parsed.masterElements)) {
+        collectedMasters.add(parsed.masterElements);
+        collectFontsFromElements(parsed.masterElements, fonts);
+      }
     }
-    collectFontsFromElements(data.masterElements, fonts);
     return {
       theme: {
         majorFont: fontScheme.majorFont,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-glimpse",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "A lightweight JavaScript library for rendering PowerPoint (.pptx) files as SVG or PNG in Node.js. No LibreOffice required.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -42,6 +42,7 @@
   "files": [
     "dist"
   ],
+  "packageManager": "npm@10.9.6",
   "engines": {
     "node": ">=20"
   },