pptx-viewer-core 1.6.6 → 1.6.8

package/dist/index.js

@@ -497,14 +497,52 @@ function extractSourceOrders(xml) {
   }
   return orders;
 }
+function ensureArrayLocal(value) {
+  return Array.isArray(value) ? value : value === void 0 ? [] : [value];
+}
+function countsSignature(counts) {
+  return [...counts.entries()].sort((a, b) => a[0] < b[0] ? -1 : 1).map(([name, count]) => `${name}:${count}`).join(",");
+}
+function pathSignature(path) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const key of Object.keys(path)) {
+    const name = localName(key);
+    if (!PATH_COMMANDS.has(name)) {
+      continue;
+    }
+    counts.set(name, (counts.get(name) ?? 0) + ensureArrayLocal(path[key]).length);
+  }
+  return countsSignature(counts);
+}
+function orderSignature(order) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const name of order) {
+    counts.set(name, (counts.get(name) ?? 0) + 1);
+  }
+  return countsSignature(counts);
+}
 function annotateCustomGeometryCommandOrder(xml, parsed) {
   const orders = extractSourceOrders(xml);
   if (orders.length === 0) {
     return;
   }
   const paths = collectParsedPaths(parsed);
-  for (let index = 0; index < Math.min(paths.length, orders.length); index++) {
-    commandOrder.set(paths[index], orders[index]);
+  const ordersBySignature = /* @__PURE__ */ new Map();
+  for (const order of orders) {
+    const signature = orderSignature(order);
+    const bucket = ordersBySignature.get(signature);
+    if (bucket) {
+      bucket.push(order);
+    } else {
+      ordersBySignature.set(signature, [order]);
+    }
+  }
+  for (const path of paths) {
+    const bucket = ordersBySignature.get(pathSignature(path));
+    const order = bucket?.shift();
+    if (order) {
+      commandOrder.set(path, order);
+    }
   }
 }
 function orderedPathCommandEntries(path, ensureArray16) {
@@ -23135,15 +23173,15 @@ function getConnectorPathGeometry(element) {
 // src/core/geometry/transform-utils.ts
 function getElementTransform(element) {
   const transforms = [];
+  if (element.rotation) {
+    transforms.push(`rotate(${element.rotation}deg)`);
+  }
   if (element.flipHorizontal) {
     transforms.push("scaleX(-1)");
   }
   if (element.flipVertical) {
     transforms.push("scaleY(-1)");
   }
-  if (element.rotation) {
-    transforms.push(`rotate(${element.rotation}deg)`);
-  }
   return transforms.length > 0 ? transforms.join(" ") : void 0;
 }
 function getTextCompensationTransform(element) {
@@ -61737,7 +61775,7 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
   pointsToPixels(points3) {
     return points3 * (96 / 72);
   }
-  parseParagraphSpacingPx(spacingNode) {
+  parseParagraphSpacingPx(spacingNode, basisFontSizePx) {
     if (!spacingNode) {
       return void 0;
     }
@@ -61748,6 +61786,13 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     if (Number.isFinite(spacingPointsRaw)) {
       return this.pointsToPixels(spacingPointsRaw / 100);
     }
+    const spacingPercentRaw = Number.parseInt(
+      String(spacingNode["a:spcPct"]?.["@_val"] || ""),
+      10
+    );
+    if (Number.isFinite(spacingPercentRaw) && typeof basisFontSizePx === "number" && basisFontSizePx > 0) {
+      return spacingPercentRaw / 1e5 * basisFontSizePx;
+    }
     return void 0;
   }
   parseLineSpacingMultiplier(lineSpacingNode) {
@@ -61827,7 +61872,7 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
 
 // src/core/core/runtime/PptxHandlerRuntimeBulletParsing.ts
 var PptxHandlerRuntime60 = class extends PptxHandlerRuntime59 {
-  resolveParagraphBulletInfo(paragraph, paragraphIndex, txBody, inheritedTxBody, isBodyPlaceholder = false, slidePath) {
+  resolveParagraphBulletInfo(paragraph, paragraphIndex, txBody, inheritedTxBody, isBodyPlaceholder = false, slidePath, effectiveLevelStyles) {
     if (!paragraph) {
       return null;
     }
@@ -61863,11 +61908,8 @@ var PptxHandlerRuntime60 = class extends PptxHandlerRuntime59 {
       }
     }
     if (!resolvedBulletProps) {
-      if (isBodyPlaceholder) {
-        const presentationLevelStyle = this.presentationDefaultTextStyle?.levelStyles?.[normalizedLevel - 1] ?? this.presentationDefaultTextStyle?.levelStyles?.[-1];
-        return this.createBulletInfoFromLevelStyle(presentationLevelStyle, paragraphIndex);
-      }
-      return null;
+      const fallbackLevelStyle = effectiveLevelStyles?.[normalizedLevel - 1] ?? effectiveLevelStyles?.[-1] ?? (isBodyPlaceholder ? this.presentationDefaultTextStyle?.levelStyles?.[normalizedLevel - 1] ?? this.presentationDefaultTextStyle?.levelStyles?.[-1] : void 0);
+      return this.createBulletInfoFromLevelStyle(fallbackLevelStyle, paragraphIndex);
     }
     const buFont = resolvedBulletProps["a:buFont"];
     const fontFamily = buFont?.["@_typeface"] ? String(buFont["@_typeface"]) : void 0;
@@ -62357,16 +62399,21 @@ var PptxHandlerRuntime62 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
         textStyle.align = paraAlign;
       }
     }
+    const spacingBasisPx = typeof textStyle.fontSize === "number" ? textStyle.fontSize : void 0;
     if (textStyle.paragraphSpacingBefore === void 0) {
       const spacingBefore = this.parseParagraphSpacingPx(
-        pPr?.["a:spcBef"]
+        pPr?.["a:spcBef"],
+        spacingBasisPx
       );
       if (spacingBefore !== void 0) {
         textStyle.paragraphSpacingBefore = spacingBefore;
       }
     }
     if (textStyle.paragraphSpacingAfter === void 0) {
-      const spacingAfter = this.parseParagraphSpacingPx(pPr?.["a:spcAft"]);
+      const spacingAfter = this.parseParagraphSpacingPx(
+        pPr?.["a:spcAft"],
+        spacingBasisPx
+      );
       if (spacingAfter !== void 0) {
         textStyle.paragraphSpacingAfter = spacingAfter;
       }
@@ -62540,7 +62587,8 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
       ctx.txBody,
       ctx.inheritedTxBody,
       isBodyPlaceholder,
-      ctx.slidePath
+      ctx.slidePath,
+      ctx.effectiveLevelStyles
     );
     if (paragraphBulletInfo && !paragraphBulletInfo.none) {
       let bulletText;
@@ -64143,6 +64191,7 @@ var PptxHandlerRuntime69 = class extends PptxHandlerRuntime68 {
     if (!normalized) {
       return void 0;
     }
+    const canon = (key) => key.toLowerCase() === "folhlink" ? "folHlink" : key;
     if (normalized === "phclr") {
       const injected = this.themeColorMap["phclr"];
       if (injected) {
@@ -64152,17 +64201,18 @@ var PptxHandlerRuntime69 = class extends PptxHandlerRuntime68 {
     }
     const overrideMap = this.currentSlideClrMapOverride ?? this.currentMasterClrMap;
     if (overrideMap) {
-      const remapped = overrideMap[normalized];
+      const remapped = overrideMap[canon(normalized)];
       if (remapped) {
-        return this.themeColorMap[remapped] || this.getDefaultSchemeColorMap()[remapped];
+        const target = canon(remapped);
+        return this.themeColorMap[target] || this.getDefaultSchemeColorMap()[target];
       }
     } else {
       const defaultAliasTarget = DEFAULT_CLR_MAP_ALIAS[normalized];
       if (defaultAliasTarget) {
-        return this.themeColorMap[defaultAliasTarget] || this.themeColorMap[normalized] || this.getDefaultSchemeColorMap()[normalized];
+        return this.themeColorMap[defaultAliasTarget] || this.themeColorMap[canon(normalized)] || this.getDefaultSchemeColorMap()[canon(normalized)];
       }
     }
-    return this.themeColorMap[normalized] || this.getDefaultSchemeColorMap()[normalized];
+    return this.themeColorMap[canon(normalized)] || this.getDefaultSchemeColorMap()[canon(normalized)];
   }
   normalizeStrokeDashType(value) {
     const normalized = String(value ?? "").trim();
@@ -64451,6 +64501,40 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
     }
     return void 0;
   }
+  /**
+   * Reuse the cached parse of a layout XML part, parsing (and caching) on a
+   * miss. Background resolution runs per slide but the layout/master parts are
+   * large (a themed master can be ~200 KB); re-parsing them for every slide
+   * dominated load time, so share the same parsed object `getLayoutElements`
+   * already populated.
+   */
+  async resolveCachedLayoutXml(layoutPath) {
+    const cached = this.layoutXmlMap.get(layoutPath);
+    if (cached) {
+      return cached;
+    }
+    const xml = await this.zip.file(layoutPath)?.async("string");
+    if (!xml) {
+      return void 0;
+    }
+    const parsed = this.parser.parse(xml);
+    this.layoutXmlMap.set(layoutPath, parsed);
+    return parsed;
+  }
+  /** Reuse the cached parse of a master XML part, parsing (and caching) on a miss. */
+  async resolveCachedMasterXml(masterPath) {
+    const cached = this.masterXmlMap.get(masterPath);
+    if (cached) {
+      return cached;
+    }
+    const xml = await this.zip.file(masterPath)?.async("string");
+    if (!xml) {
+      return void 0;
+    }
+    const parsed = this.parser.parse(xml);
+    this.masterXmlMap.set(masterPath, parsed);
+    return parsed;
+  }
   async getMasterBackgroundImage(layoutPath) {
     const layoutRels = this.slideRelsMap.get(layoutPath);
     if (!layoutRels) {
@@ -64461,9 +64545,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             const masterRelsPath = `${masterPath.replace("slideMasters/", "slideMasters/_rels/")}.rels`;
             await this.loadSlideRelationships(masterPath, masterRelsPath);
             return this.extractBackgroundImage(masterXmlObj, masterPath, "p:sldMaster");
@@ -64485,9 +64568,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutRelsPath = `${layoutPath.replace("slideLayouts/", "slideLayouts/_rels/")}.rels`;
             await this.loadSlideRelationships(layoutPath, layoutRelsPath);
             const bg = this.extractBackgroundImage(layoutXmlObj, layoutPath, "p:sldLayout");
@@ -64513,9 +64595,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutBg = this.extractBackgroundColor(layoutXmlObj, "p:sldLayout");
             if (layoutBg) {
               return layoutBg;
@@ -64542,9 +64623,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             return this.extractBackgroundColor(masterXmlObj, "p:sldMaster");
           }
         } catch {
@@ -64571,9 +64651,8 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutGrad = this.extractBackgroundGradient(layoutXmlObj, "p:sldLayout");
             if (layoutGrad) {
               return layoutGrad;
@@ -64600,9 +64679,8 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             return this.extractBackgroundGradient(masterXmlObj, "p:sldMaster");
           }
         } catch {
@@ -64917,11 +64995,24 @@ var PptxHandlerRuntime72 = class _PptxHandlerRuntime extends PptxHandlerRuntime7
         }
       }
     }
-    const spcBef = this.parseParagraphSpacingPx(levelProps["a:spcBef"]);
+    const defRPrSzRaw = Number.parseInt(
+      String(
+        levelProps["a:defRPr"]?.["@_sz"] || ""
+      ),
+      10
+    );
+    const basisFontSizePx = Number.isFinite(defRPrSzRaw) ? this.pointsToPixels(defRPrSzRaw / 100) : void 0;
+    const spcBef = this.parseParagraphSpacingPx(
+      levelProps["a:spcBef"],
+      basisFontSizePx
+    );
     if (spcBef !== void 0) {
       style.spaceBefore = spcBef;
     }
-    const spcAft = this.parseParagraphSpacingPx(levelProps["a:spcAft"]);
+    const spcAft = this.parseParagraphSpacingPx(
+      levelProps["a:spcAft"],
+      basisFontSizePx
+    );
     if (spcAft !== void 0) {
       style.spaceAfter = spcAft;
     }

package/dist/index.mjs

@@ -492,14 +492,52 @@ function extractSourceOrders(xml) {
   }
   return orders;
 }
+function ensureArrayLocal(value) {
+  return Array.isArray(value) ? value : value === void 0 ? [] : [value];
+}
+function countsSignature(counts) {
+  return [...counts.entries()].sort((a, b) => a[0] < b[0] ? -1 : 1).map(([name, count]) => `${name}:${count}`).join(",");
+}
+function pathSignature(path) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const key of Object.keys(path)) {
+    const name = localName(key);
+    if (!PATH_COMMANDS.has(name)) {
+      continue;
+    }
+    counts.set(name, (counts.get(name) ?? 0) + ensureArrayLocal(path[key]).length);
+  }
+  return countsSignature(counts);
+}
+function orderSignature(order) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const name of order) {
+    counts.set(name, (counts.get(name) ?? 0) + 1);
+  }
+  return countsSignature(counts);
+}
 function annotateCustomGeometryCommandOrder(xml, parsed) {
   const orders = extractSourceOrders(xml);
   if (orders.length === 0) {
     return;
   }
   const paths = collectParsedPaths(parsed);
-  for (let index = 0; index < Math.min(paths.length, orders.length); index++) {
-    commandOrder.set(paths[index], orders[index]);
+  const ordersBySignature = /* @__PURE__ */ new Map();
+  for (const order of orders) {
+    const signature = orderSignature(order);
+    const bucket = ordersBySignature.get(signature);
+    if (bucket) {
+      bucket.push(order);
+    } else {
+      ordersBySignature.set(signature, [order]);
+    }
+  }
+  for (const path of paths) {
+    const bucket = ordersBySignature.get(pathSignature(path));
+    const order = bucket?.shift();
+    if (order) {
+      commandOrder.set(path, order);
+    }
   }
 }
 function orderedPathCommandEntries(path, ensureArray16) {
@@ -23130,15 +23168,15 @@ function getConnectorPathGeometry(element) {
 // src/core/geometry/transform-utils.ts
 function getElementTransform(element) {
   const transforms = [];
+  if (element.rotation) {
+    transforms.push(`rotate(${element.rotation}deg)`);
+  }
   if (element.flipHorizontal) {
     transforms.push("scaleX(-1)");
   }
   if (element.flipVertical) {
     transforms.push("scaleY(-1)");
   }
-  if (element.rotation) {
-    transforms.push(`rotate(${element.rotation}deg)`);
-  }
   return transforms.length > 0 ? transforms.join(" ") : void 0;
 }
 function getTextCompensationTransform(element) {
@@ -61732,7 +61770,7 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
   pointsToPixels(points3) {
     return points3 * (96 / 72);
   }
-  parseParagraphSpacingPx(spacingNode) {
+  parseParagraphSpacingPx(spacingNode, basisFontSizePx) {
     if (!spacingNode) {
       return void 0;
     }
@@ -61743,6 +61781,13 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     if (Number.isFinite(spacingPointsRaw)) {
       return this.pointsToPixels(spacingPointsRaw / 100);
     }
+    const spacingPercentRaw = Number.parseInt(
+      String(spacingNode["a:spcPct"]?.["@_val"] || ""),
+      10
+    );
+    if (Number.isFinite(spacingPercentRaw) && typeof basisFontSizePx === "number" && basisFontSizePx > 0) {
+      return spacingPercentRaw / 1e5 * basisFontSizePx;
+    }
     return void 0;
   }
   parseLineSpacingMultiplier(lineSpacingNode) {
@@ -61822,7 +61867,7 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
 
 // src/core/core/runtime/PptxHandlerRuntimeBulletParsing.ts
 var PptxHandlerRuntime60 = class extends PptxHandlerRuntime59 {
-  resolveParagraphBulletInfo(paragraph, paragraphIndex, txBody, inheritedTxBody, isBodyPlaceholder = false, slidePath) {
+  resolveParagraphBulletInfo(paragraph, paragraphIndex, txBody, inheritedTxBody, isBodyPlaceholder = false, slidePath, effectiveLevelStyles) {
     if (!paragraph) {
       return null;
     }
@@ -61858,11 +61903,8 @@ var PptxHandlerRuntime60 = class extends PptxHandlerRuntime59 {
       }
     }
     if (!resolvedBulletProps) {
-      if (isBodyPlaceholder) {
-        const presentationLevelStyle = this.presentationDefaultTextStyle?.levelStyles?.[normalizedLevel - 1] ?? this.presentationDefaultTextStyle?.levelStyles?.[-1];
-        return this.createBulletInfoFromLevelStyle(presentationLevelStyle, paragraphIndex);
-      }
-      return null;
+      const fallbackLevelStyle = effectiveLevelStyles?.[normalizedLevel - 1] ?? effectiveLevelStyles?.[-1] ?? (isBodyPlaceholder ? this.presentationDefaultTextStyle?.levelStyles?.[normalizedLevel - 1] ?? this.presentationDefaultTextStyle?.levelStyles?.[-1] : void 0);
+      return this.createBulletInfoFromLevelStyle(fallbackLevelStyle, paragraphIndex);
     }
     const buFont = resolvedBulletProps["a:buFont"];
     const fontFamily = buFont?.["@_typeface"] ? String(buFont["@_typeface"]) : void 0;
@@ -62352,16 +62394,21 @@ var PptxHandlerRuntime62 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
         textStyle.align = paraAlign;
       }
     }
+    const spacingBasisPx = typeof textStyle.fontSize === "number" ? textStyle.fontSize : void 0;
     if (textStyle.paragraphSpacingBefore === void 0) {
       const spacingBefore = this.parseParagraphSpacingPx(
-        pPr?.["a:spcBef"]
+        pPr?.["a:spcBef"],
+        spacingBasisPx
       );
       if (spacingBefore !== void 0) {
         textStyle.paragraphSpacingBefore = spacingBefore;
       }
     }
     if (textStyle.paragraphSpacingAfter === void 0) {
-      const spacingAfter = this.parseParagraphSpacingPx(pPr?.["a:spcAft"]);
+      const spacingAfter = this.parseParagraphSpacingPx(
+        pPr?.["a:spcAft"],
+        spacingBasisPx
+      );
       if (spacingAfter !== void 0) {
         textStyle.paragraphSpacingAfter = spacingAfter;
       }
@@ -62535,7 +62582,8 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
       ctx.txBody,
       ctx.inheritedTxBody,
       isBodyPlaceholder,
-      ctx.slidePath
+      ctx.slidePath,
+      ctx.effectiveLevelStyles
     );
     if (paragraphBulletInfo && !paragraphBulletInfo.none) {
       let bulletText;
@@ -64138,6 +64186,7 @@ var PptxHandlerRuntime69 = class extends PptxHandlerRuntime68 {
     if (!normalized) {
       return void 0;
     }
+    const canon = (key) => key.toLowerCase() === "folhlink" ? "folHlink" : key;
     if (normalized === "phclr") {
       const injected = this.themeColorMap["phclr"];
       if (injected) {
@@ -64147,17 +64196,18 @@ var PptxHandlerRuntime69 = class extends PptxHandlerRuntime68 {
     }
     const overrideMap = this.currentSlideClrMapOverride ?? this.currentMasterClrMap;
     if (overrideMap) {
-      const remapped = overrideMap[normalized];
+      const remapped = overrideMap[canon(normalized)];
       if (remapped) {
-        return this.themeColorMap[remapped] || this.getDefaultSchemeColorMap()[remapped];
+        const target = canon(remapped);
+        return this.themeColorMap[target] || this.getDefaultSchemeColorMap()[target];
       }
     } else {
       const defaultAliasTarget = DEFAULT_CLR_MAP_ALIAS[normalized];
       if (defaultAliasTarget) {
-        return this.themeColorMap[defaultAliasTarget] || this.themeColorMap[normalized] || this.getDefaultSchemeColorMap()[normalized];
+        return this.themeColorMap[defaultAliasTarget] || this.themeColorMap[canon(normalized)] || this.getDefaultSchemeColorMap()[canon(normalized)];
       }
     }
-    return this.themeColorMap[normalized] || this.getDefaultSchemeColorMap()[normalized];
+    return this.themeColorMap[canon(normalized)] || this.getDefaultSchemeColorMap()[canon(normalized)];
   }
   normalizeStrokeDashType(value) {
     const normalized = String(value ?? "").trim();
@@ -64446,6 +64496,40 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
     }
     return void 0;
   }
+  /**
+   * Reuse the cached parse of a layout XML part, parsing (and caching) on a
+   * miss. Background resolution runs per slide but the layout/master parts are
+   * large (a themed master can be ~200 KB); re-parsing them for every slide
+   * dominated load time, so share the same parsed object `getLayoutElements`
+   * already populated.
+   */
+  async resolveCachedLayoutXml(layoutPath) {
+    const cached = this.layoutXmlMap.get(layoutPath);
+    if (cached) {
+      return cached;
+    }
+    const xml = await this.zip.file(layoutPath)?.async("string");
+    if (!xml) {
+      return void 0;
+    }
+    const parsed = this.parser.parse(xml);
+    this.layoutXmlMap.set(layoutPath, parsed);
+    return parsed;
+  }
+  /** Reuse the cached parse of a master XML part, parsing (and caching) on a miss. */
+  async resolveCachedMasterXml(masterPath) {
+    const cached = this.masterXmlMap.get(masterPath);
+    if (cached) {
+      return cached;
+    }
+    const xml = await this.zip.file(masterPath)?.async("string");
+    if (!xml) {
+      return void 0;
+    }
+    const parsed = this.parser.parse(xml);
+    this.masterXmlMap.set(masterPath, parsed);
+    return parsed;
+  }
   async getMasterBackgroundImage(layoutPath) {
     const layoutRels = this.slideRelsMap.get(layoutPath);
     if (!layoutRels) {
@@ -64456,9 +64540,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             const masterRelsPath = `${masterPath.replace("slideMasters/", "slideMasters/_rels/")}.rels`;
             await this.loadSlideRelationships(masterPath, masterRelsPath);
             return this.extractBackgroundImage(masterXmlObj, masterPath, "p:sldMaster");
@@ -64480,9 +64563,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutRelsPath = `${layoutPath.replace("slideLayouts/", "slideLayouts/_rels/")}.rels`;
             await this.loadSlideRelationships(layoutPath, layoutRelsPath);
             const bg = this.extractBackgroundImage(layoutXmlObj, layoutPath, "p:sldLayout");
@@ -64508,9 +64590,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutBg = this.extractBackgroundColor(layoutXmlObj, "p:sldLayout");
             if (layoutBg) {
               return layoutBg;
@@ -64537,9 +64618,8 @@ var PptxHandlerRuntime70 = class extends PptxHandlerRuntime69 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             return this.extractBackgroundColor(masterXmlObj, "p:sldMaster");
           }
         } catch {
@@ -64566,9 +64646,8 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
         const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
-          if (layoutXmlStr) {
-            const layoutXmlObj = this.parser.parse(layoutXmlStr);
+          const layoutXmlObj = await this.resolveCachedLayoutXml(layoutPath);
+          if (layoutXmlObj) {
             const layoutGrad = this.extractBackgroundGradient(layoutXmlObj, "p:sldLayout");
             if (layoutGrad) {
               return layoutGrad;
@@ -64595,9 +64674,8 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
         const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
-          const masterXmlStr = await this.zip.file(masterPath)?.async("string");
-          if (masterXmlStr) {
-            const masterXmlObj = this.parser.parse(masterXmlStr);
+          const masterXmlObj = await this.resolveCachedMasterXml(masterPath);
+          if (masterXmlObj) {
             return this.extractBackgroundGradient(masterXmlObj, "p:sldMaster");
           }
         } catch {
@@ -64912,11 +64990,24 @@ var PptxHandlerRuntime72 = class _PptxHandlerRuntime extends PptxHandlerRuntime7
         }
       }
     }
-    const spcBef = this.parseParagraphSpacingPx(levelProps["a:spcBef"]);
+    const defRPrSzRaw = Number.parseInt(
+      String(
+        levelProps["a:defRPr"]?.["@_sz"] || ""
+      ),
+      10
+    );
+    const basisFontSizePx = Number.isFinite(defRPrSzRaw) ? this.pointsToPixels(defRPrSzRaw / 100) : void 0;
+    const spcBef = this.parseParagraphSpacingPx(
+      levelProps["a:spcBef"],
+      basisFontSizePx
+    );
     if (spcBef !== void 0) {
       style.spaceBefore = spcBef;
     }
-    const spcAft = this.parseParagraphSpacingPx(levelProps["a:spcAft"]);
+    const spcAft = this.parseParagraphSpacingPx(
+      levelProps["a:spcAft"],
+      basisFontSizePx
+    );
     if (spcAft !== void 0) {
       style.spaceAfter = spcAft;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptx-viewer-core",
-	"version": "1.6.6",
+	"version": "1.6.8",
 	"description": "PowerPoint PPTX engine: parse, edit, serialize, and convert .pptx files. Framework-agnostic TypeScript SDK.",
 	"keywords": [
 		"angular",