pptx-viewer-core 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project are documented here.
 This file is generated from [Conventional Commits](https://www.conventionalcommits.org)
 by [git-cliff](https://git-cliff.org); do not edit it by hand.
 
+## [1.3.1](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-viewer-core@1.3.1) - 2026-07-13
+
+## [1.3.0](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-viewer-core@1.3.0) - 2026-07-11
+
+### Other
+
+- Reconcile with origin/main before push (by @ChristopherVR) ([0ecd3d9](https://github.com/ChristopherVR/pptx-viewer/commit/0ecd3d935f97c78e8b0a62bebc8bf610c42414ab))
+
 ## [1.2.8](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-viewer-core@1.2.8) - 2026-07-10
 
 ## [1.2.7](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-viewer-core@1.2.7) - 2026-07-09

package/dist/index.d.mts

@@ -2958,7 +2958,7 @@ declare function hasNonTrivialOverride(override: Record<string, string> | null |
  * (which indicates an encrypted OOXML package) rather than a normal ZIP.
  *
  * Encrypted OOXML files are wrapped in OLE structured storage format.
- * The OLE magic bytes are: D0 CF 11 E0 A1 1B 1A E1
+ * The OLE magic bytes are: D0 CF 11 E0 A1 B1 1A E1
  * Normal PPTX files start with ZIP magic: 50 4B (PK)
  */
 type FileFormatDetection = {
@@ -6571,7 +6571,7 @@ declare class PptxHandlerRuntime$10 extends PptxHandlerRuntime$11 {
 }
 
 declare class PptxHandlerRuntime$$ extends PptxHandlerRuntime$10 {
-    protected extractTextRunStyle(runProperties: XmlObject | undefined, align: TextStyle['align'], relationshipMap?: Map<string, string>): TextStyle;
+    protected extractTextRunStyle(runProperties: XmlObject | undefined, align: TextStyle['align'], relationshipMap?: Map<string, string>, includeDefaultAlignment?: boolean): TextStyle;
     /**
      * Copy `@panose` / `@pitchFamily` / `@charset` from a font child node
      * (`a:latin`, `a:ea`, `a:cs`, `a:sym`) onto the matching `*Font*`
@@ -7570,6 +7570,7 @@ declare class PptxHandlerRuntime$D extends PptxHandlerRuntime$E {
      * merges them so that layout values take priority over master values.
      */
     protected lookupPlaceholderDefaults(slidePath: string, phInfo: PlaceholderInfo): PlaceholderDefaults | undefined;
+    private mergePlaceholderLevelStyles;
 }
 
 declare class PptxHandlerRuntime$C extends PptxHandlerRuntime$D {
@@ -8721,7 +8722,7 @@ declare class PptxHandlerRuntime$2 extends PptxHandlerRuntime$3 {
         notesWidthEmu: number;
         notesHeightEmu: number;
         orderedSections: PptxSection[];
-    }, slidesWithWarnings: PptxSlide[]): Promise<PptxData>;
+    }, slidesWithWarnings: PptxSlide[], slideMasters: PptxSlideMaster[]): Promise<PptxData>;
     /**
      * Walk the raw XML of every slide to find the highest numeric `@_id`
      * attribute on `p:cNvPr` / `p:cNvCxnSpPr` / `p:cNvPicPr` nodes.

package/dist/index.d.ts

@@ -2958,7 +2958,7 @@ declare function hasNonTrivialOverride(override: Record<string, string> | null |
  * (which indicates an encrypted OOXML package) rather than a normal ZIP.
  *
  * Encrypted OOXML files are wrapped in OLE structured storage format.
- * The OLE magic bytes are: D0 CF 11 E0 A1 1B 1A E1
+ * The OLE magic bytes are: D0 CF 11 E0 A1 B1 1A E1
  * Normal PPTX files start with ZIP magic: 50 4B (PK)
  */
 type FileFormatDetection = {
@@ -6571,7 +6571,7 @@ declare class PptxHandlerRuntime$10 extends PptxHandlerRuntime$11 {
 }
 
 declare class PptxHandlerRuntime$$ extends PptxHandlerRuntime$10 {
-    protected extractTextRunStyle(runProperties: XmlObject | undefined, align: TextStyle['align'], relationshipMap?: Map<string, string>): TextStyle;
+    protected extractTextRunStyle(runProperties: XmlObject | undefined, align: TextStyle['align'], relationshipMap?: Map<string, string>, includeDefaultAlignment?: boolean): TextStyle;
     /**
      * Copy `@panose` / `@pitchFamily` / `@charset` from a font child node
      * (`a:latin`, `a:ea`, `a:cs`, `a:sym`) onto the matching `*Font*`
@@ -7570,6 +7570,7 @@ declare class PptxHandlerRuntime$D extends PptxHandlerRuntime$E {
      * merges them so that layout values take priority over master values.
      */
     protected lookupPlaceholderDefaults(slidePath: string, phInfo: PlaceholderInfo): PlaceholderDefaults | undefined;
+    private mergePlaceholderLevelStyles;
 }
 
 declare class PptxHandlerRuntime$C extends PptxHandlerRuntime$D {
@@ -8721,7 +8722,7 @@ declare class PptxHandlerRuntime$2 extends PptxHandlerRuntime$3 {
         notesWidthEmu: number;
         notesHeightEmu: number;
         orderedSections: PptxSection[];
-    }, slidesWithWarnings: PptxSlide[]): Promise<PptxData>;
+    }, slidesWithWarnings: PptxSlide[], slideMasters: PptxSlideMaster[]): Promise<PptxData>;
     /**
      * Walk the raw XML of every slide to find the highest numeric `@_id`
      * attribute on `p:cNvPr` / `p:cNvCxnSpPr` / `p:cNvPicPr` nodes.

package/dist/index.js

@@ -12801,7 +12801,7 @@ function stripParentDirSegments(path) {
 }
 
 // src/core/utils/ole2-parser-types.ts
-var OLE_MAGIC = new Uint8Array([208, 207, 17, 224, 161, 27, 26, 225]);
+var OLE_MAGIC = new Uint8Array([208, 207, 17, 224, 161, 177, 26, 225]);
 var ENDOFCHAIN = 4294967294;
 var FREESECT = 4294967295;
 var FATSECT = 4294967293;
@@ -19333,7 +19333,7 @@ function resolveLayoutCategory(layoutType) {
 }
 
 // src/core/utils/encryption-detection.ts
-var OLE_MAGIC2 = new Uint8Array([208, 207, 17, 224, 161, 27, 26, 225]);
+var OLE_MAGIC2 = new Uint8Array([208, 207, 17, 224, 161, 177, 26, 225]);
 var ZIP_MAGIC = new Uint8Array([80, 75]);
 function detectFileFormat(data) {
   if (data.byteLength < 8) {
@@ -20027,15 +20027,9 @@ async function verifyAgilePassword(info, password) {
     pke.keyBits,
     pke.hashSize
   );
-  const iv1 = generateIV(
-    pke.hashAlgorithm,
-    pke.saltValue,
-    BLOCK_KEYS.verifierHashInput,
-    pke.blockSize
-  );
   const verifierHashInput = await aesCbcDecryptRaw(
     verifierInputKey,
-    await iv1,
+    pke.saltValue,
     pke.encryptedVerifierHashInput
   );
   const verifierHashKey = await deriveAgileKey(
@@ -20047,15 +20041,9 @@ async function verifyAgilePassword(info, password) {
     pke.keyBits,
     pke.hashSize
   );
-  const iv2 = generateIV(
-    pke.hashAlgorithm,
-    pke.saltValue,
-    BLOCK_KEYS.verifierHashValue,
-    pke.blockSize
-  );
   const verifierHashValue = await aesCbcDecryptRaw(
     verifierHashKey,
-    await iv2,
+    pke.saltValue,
     pke.encryptedVerifierHashValue
   );
   const computedHash = await hash(pke.hashAlgorithm, verifierHashInput.subarray(0, pke.saltSize));
@@ -20080,13 +20068,7 @@ async function verifyAgilePassword(info, password) {
     pke.keyBits,
     pke.hashSize
   );
-  const iv3 = await generateIV(
-    pke.hashAlgorithm,
-    pke.saltValue,
-    BLOCK_KEYS.encryptedKeyValue,
-    pke.blockSize
-  );
-  const decryptedKey = await aesCbcDecryptRaw(encKeyKey, iv3, pke.encryptedKeyValue);
+  const decryptedKey = await aesCbcDecryptRaw(encKeyKey, pke.saltValue, pke.encryptedKeyValue);
   return decryptedKey.subarray(0, info.keyData.keyBits / 8);
 }
 async function verifyStandardPassword(info, password) {
@@ -20139,8 +20121,7 @@ async function verifyAgileDataIntegrity(info, key, encryptedPackage) {
     info.dataIntegrity.encryptedHmacValue
   );
   const expectedHmac = decryptedHmacValue.subarray(0, keyData.hashSize);
-  const encryptedContent = encryptedPackage.subarray(8);
-  const computedHmac = await hmac(keyData.hashAlgorithm, hmacKey, encryptedContent);
+  const computedHmac = await hmac(keyData.hashAlgorithm, hmacKey, encryptedPackage);
   let match = true;
   if (computedHmac.length < keyData.hashSize) {
     match = false;
@@ -20294,14 +20275,13 @@ async function encryptPptx(pptxBuffer, password, options) {
     keyBits,
     hashSize
   );
-  const iv1 = await generateIV(hashAlgorithm, pkeSalt, BLOCK_KEYS.verifierHashInput, blockSize);
   const paddedVerifierInput = new Uint8Array(
     Math.ceil(verifierHashInput.length / blockSize) * blockSize
   );
   paddedVerifierInput.set(verifierHashInput);
   const encryptedVerifierHashInput = await aesCbcEncryptNoPad(
     verifierInputKey,
-    iv1,
+    pkeSalt,
     paddedVerifierInput
   );
   const verifierHashKey = await deriveAgileKey(
@@ -20313,12 +20293,11 @@ async function encryptPptx(pptxBuffer, password, options) {
     keyBits,
     hashSize
   );
-  const iv2 = await generateIV(hashAlgorithm, pkeSalt, BLOCK_KEYS.verifierHashValue, blockSize);
   const paddedVerifierHash = new Uint8Array(Math.ceil(verifierHash.length / blockSize) * blockSize);
   paddedVerifierHash.set(verifierHash);
   const encryptedVerifierHashValue = await aesCbcEncryptNoPad(
     verifierHashKey,
-    iv2,
+    pkeSalt,
     paddedVerifierHash
   );
   const encKeyKey = await deriveAgileKey(
@@ -20330,10 +20309,9 @@ async function encryptPptx(pptxBuffer, password, options) {
     keyBits,
     hashSize
   );
-  const iv3 = await generateIV(hashAlgorithm, pkeSalt, BLOCK_KEYS.encryptedKeyValue, blockSize);
   const paddedDocumentKey = new Uint8Array(Math.ceil(documentKey.length / blockSize) * blockSize);
   paddedDocumentKey.set(documentKey);
-  const encryptedKeyValue = await aesCbcEncryptNoPad(encKeyKey, iv3, paddedDocumentKey);
+  const encryptedKeyValue = await aesCbcEncryptNoPad(encKeyKey, pkeSalt, paddedDocumentKey);
   const encInfo = {
     keyData: {
       saltSize: 16,
@@ -20369,7 +20347,7 @@ async function encryptPptx(pptxBuffer, password, options) {
   const encryptedPackage = await encryptAgilePackage(packageData, documentKey, encInfo);
   const hmacKeyRandom = new Uint8Array(hashSize);
   crypto2.getRandomValues(hmacKeyRandom);
-  const hmacValue = await hmac(hashAlgorithm, hmacKeyRandom, encryptedPackage.subarray(8));
+  const hmacValue = await hmac(hashAlgorithm, hmacKeyRandom, encryptedPackage);
   const hmacKeyIV = await generateIV(
     hashAlgorithm,
     keyDataSalt,
@@ -21530,6 +21508,7 @@ var FONT_SUBSTITUTION_MAP = {
   MoolBoran: ["Noto Sans Khmer", "sans-serif"],
   // Decorative / Display
   "Century Gothic": ["URW Gothic", "Futura", "sans-serif"],
+  Oswald: ["Agency FB", "Arial Narrow", "sans-serif"],
   "Franklin Gothic": ["Liberation Sans", "Helvetica Neue", "sans-serif"],
   "Franklin Gothic Medium": ["Liberation Sans", "Helvetica Neue", "sans-serif"],
   Garamond: ["EB Garamond", "Cormorant Garamond", "serif"],
@@ -31440,8 +31419,8 @@ var PptxHandlerRuntime18 = class extends PptxHandlerRuntime17 {
 
 // src/core/core/runtime/PptxHandlerRuntimeTextRunStyleExtraction.ts
 var PptxHandlerRuntime19 = class _PptxHandlerRuntime extends PptxHandlerRuntime18 {
-  extractTextRunStyle(runProperties, align, relationshipMap) {
-    const style = { align };
+  extractTextRunStyle(runProperties, align, relationshipMap, includeDefaultAlignment = true) {
+    const style = includeDefaultAlignment ? { align } : {};
     if (!runProperties) {
       return style;
     }
@@ -38755,11 +38734,12 @@ var PptxHandlerRuntime42 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
     if (!source) {
       return true;
     }
+    const typesMatch = source.type === target.type || source.type === "ctrtitle" && target.type === "title" || source.type === "subtitle" && target.type === "body";
     if (source.idx !== void 0 && target.idx !== void 0) {
       if (source.idx !== target.idx) {
         return false;
       }
-      if (source.type && target.type && source.type !== target.type) {
+      if (source.type && target.type && !typesMatch) {
         return false;
       }
       return true;
@@ -38767,11 +38747,11 @@ var PptxHandlerRuntime42 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
     if (source.idx !== void 0 && target.idx === void 0) {
       const singletonTypes = /* @__PURE__ */ new Set(["title", "ctrtitle", "subtitle", "dt", "ftr", "sldnum"]);
       if (source.type && singletonTypes.has(source.type)) {
-        return target.type === source.type;
+        return typesMatch;
       }
       return false;
     }
-    if (source.type && target.type && source.type !== target.type) {
+    if (source.type && target.type && !typesMatch) {
       return false;
     }
     if (source.type && !target.type) {
@@ -38815,18 +38795,21 @@ var PptxHandlerRuntime43 = class extends PptxHandlerRuntime42 {
       xmlPath(layoutXmlObj, "p:sldLayout", "p:cSld", "p:spTree"),
       expected
     );
-    if (layoutContext) {
-      return layoutContext;
-    }
     const masterPath = this.resolveMasterPathForLayout(layoutPath);
-    if (!masterPath) {
-      return void 0;
-    }
-    const masterXmlObj = this.masterXmlMap.get(masterPath);
-    return this.findPlaceholderInShapeTree(
-      xmlPath(masterXmlObj, "p:sldMaster", "p:cSld", "p:spTree"),
+    const masterContext = masterPath ? this.findPlaceholderInShapeTree(
+      xmlPath(this.masterXmlMap.get(masterPath), "p:sldMaster", "p:cSld", "p:spTree"),
       expected
-    );
+    ) : void 0;
+    if (!layoutContext) {
+      return masterContext;
+    }
+    if (!masterContext) {
+      return layoutContext;
+    }
+    return {
+      shape: layoutContext.shape || masterContext.shape ? this.mergeXmlObjects(masterContext.shape, layoutContext.shape) : void 0,
+      picture: layoutContext.picture || masterContext.picture ? this.mergeXmlObjects(masterContext.picture, layoutContext.picture) : void 0
+    };
   }
   mergeXmlObjects(base, override, depth = 0) {
     const MAX_MERGE_DEPTH = 64;
@@ -38879,10 +38862,11 @@ var PptxHandlerRuntime43 = class extends PptxHandlerRuntime42 {
    * otherwise falls back to `type`.
    */
   buildPlaceholderDefaultsKey(phInfo) {
+    const normalizedType = phInfo.type === "ctrtitle" ? "title" : phInfo.type === "subtitle" ? "body" : phInfo.type;
     if (phInfo.idx !== void 0) {
-      return phInfo.type ? `${phInfo.type}_${phInfo.idx}` : `_${phInfo.idx}`;
+      return normalizedType ? `${normalizedType}_${phInfo.idx}` : `_${phInfo.idx}`;
     }
-    return phInfo.type ?? "body";
+    return normalizedType ?? "body";
   }
   /**
    * Look up merged {@link PlaceholderDefaults} for a shape's placeholder
@@ -38900,44 +38884,52 @@ var PptxHandlerRuntime43 = class extends PptxHandlerRuntime42 {
     const masterPath = this.resolveMasterPathForLayout(layoutPath);
     const masterMap = masterPath ? this.masterPlaceholderDefaultsCache.get(masterPath) : void 0;
     const masterDefaults = masterMap?.get(phKey);
-    if (!layoutDefaults && !masterDefaults) {
+    const normalizedType = this.buildPlaceholderDefaultsKey(phInfo).split("_")[0];
+    const masterTextStyleType = phInfo.type === "title" || phInfo.type === "ctrtitle" ? "title" : phInfo.type === "body" || phInfo.type === "obj" || phInfo.type === "subtitle" ? "body" : "other";
+    const masterTextStyles = masterPath ? this.masterTxStylesCache.get(masterPath) : void 0;
+    const masterTextLevels = masterTextStyleType === "title" ? masterTextStyles?.titleStyle : masterTextStyleType === "body" ? masterTextStyles?.bodyStyle : masterTextStyles?.otherStyle;
+    const resolvedMasterDefaults = masterTextLevels ? {
+      type: masterDefaults?.type ?? normalizedType,
+      ...masterDefaults,
+      levelStyles: this.mergePlaceholderLevelStyles(
+        masterTextLevels,
+        masterDefaults?.levelStyles
+      )
+    } : masterDefaults;
+    if (!layoutDefaults && !resolvedMasterDefaults) {
       return void 0;
     }
-    if (!masterDefaults) {
+    if (!resolvedMasterDefaults) {
       return layoutDefaults;
     }
     if (!layoutDefaults) {
-      return masterDefaults;
+      return resolvedMasterDefaults;
     }
     const merged = {
       type: layoutDefaults.type,
-      idx: layoutDefaults.idx ?? masterDefaults.idx,
-      bodyInsetLeft: layoutDefaults.bodyInsetLeft ?? masterDefaults.bodyInsetLeft,
-      bodyInsetTop: layoutDefaults.bodyInsetTop ?? masterDefaults.bodyInsetTop,
-      bodyInsetRight: layoutDefaults.bodyInsetRight ?? masterDefaults.bodyInsetRight,
-      bodyInsetBottom: layoutDefaults.bodyInsetBottom ?? masterDefaults.bodyInsetBottom,
-      textAnchor: layoutDefaults.textAnchor ?? masterDefaults.textAnchor,
-      autoFit: layoutDefaults.autoFit ?? masterDefaults.autoFit,
-      textWrap: layoutDefaults.textWrap ?? masterDefaults.textWrap,
-      promptText: layoutDefaults.promptText ?? masterDefaults.promptText
+      idx: layoutDefaults.idx ?? resolvedMasterDefaults.idx,
+      bodyInsetLeft: layoutDefaults.bodyInsetLeft ?? resolvedMasterDefaults.bodyInsetLeft,
+      bodyInsetTop: layoutDefaults.bodyInsetTop ?? resolvedMasterDefaults.bodyInsetTop,
+      bodyInsetRight: layoutDefaults.bodyInsetRight ?? resolvedMasterDefaults.bodyInsetRight,
+      bodyInsetBottom: layoutDefaults.bodyInsetBottom ?? resolvedMasterDefaults.bodyInsetBottom,
+      textAnchor: layoutDefaults.textAnchor ?? resolvedMasterDefaults.textAnchor,
+      autoFit: layoutDefaults.autoFit ?? resolvedMasterDefaults.autoFit,
+      textWrap: layoutDefaults.textWrap ?? resolvedMasterDefaults.textWrap,
+      promptText: layoutDefaults.promptText ?? resolvedMasterDefaults.promptText
     };
-    if (layoutDefaults.levelStyles || masterDefaults.levelStyles) {
-      const mergedLevels = {};
-      const allLevelKeys = /* @__PURE__ */ new Set([
-        ...Object.keys(layoutDefaults.levelStyles ?? {}),
-        ...Object.keys(masterDefaults.levelStyles ?? {})
-      ]);
-      for (const keyStr of allLevelKeys) {
-        const key = Number.parseInt(keyStr, 10);
-        const layoutLevel = layoutDefaults.levelStyles?.[key];
-        const masterLevel = masterDefaults.levelStyles?.[key];
-        if (layoutLevel && masterLevel) {
-          mergedLevels[key] = { ...masterLevel, ...layoutLevel };
-        } else {
-          mergedLevels[key] = layoutLevel ?? masterLevel;
-        }
-      }
-      merged.levelStyles = mergedLevels;
+    if (layoutDefaults.levelStyles || resolvedMasterDefaults.levelStyles) {
+      merged.levelStyles = this.mergePlaceholderLevelStyles(
+        resolvedMasterDefaults.levelStyles,
+        layoutDefaults.levelStyles
+      );
+    }
+    return merged;
+  }
+  mergePlaceholderLevelStyles(base, override) {
+    const merged = {};
+    for (const key of /* @__PURE__ */ new Set([...Object.keys(base ?? {}), ...Object.keys(override ?? {})])) {
+      const level = Number.parseInt(key, 10);
+      merged[level] = { ...base?.[level], ...override?.[level] };
     }
     return merged;
   }
@@ -40235,7 +40227,11 @@ var PptxHandlerRuntime49 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
    * for "first-wins" shape-level properties.
    */
   resolveShapeParagraphStyle(p, textStyle, ctx) {
-    const pPr = p["a:pPr"];
+    const inheritedParagraph = this.ensureArray(ctx.inheritedTxBody?.["a:p"])[0];
+    const pPr = this.mergeXmlObjects(
+      inheritedParagraph?.["a:pPr"],
+      p["a:pPr"]
+    );
     const paragraphRtl = this.parseOptionalBooleanAttr(pPr?.["@_rtl"]);
     if (paragraphRtl !== void 0 && textStyle.rtl === void 0) {
       textStyle.rtl = paragraphRtl;
@@ -40351,24 +40347,28 @@ var PptxHandlerRuntime49 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
     const defaultRunStyle = this.extractTextRunStyle(
       pPr?.["a:defRPr"],
       paraAlign,
-      ctx.slideRelationshipMap
+      ctx.slideRelationshipMap,
+      false
     );
-    const level = Number.parseInt(String(pPr?.["@_lvl"] || "0"), 10);
-    const levelKey = `a:lvl${Number.isFinite(level) ? Math.min(Math.max(level + 1, 1), 9) : 1}pPr`;
+    const level = pPr?.["@_lvl"] === void 0 ? -1 : Number.parseInt(String(pPr["@_lvl"]), 10);
+    const levelKey = level === -1 ? "a:defPPr" : `a:lvl${Number.isFinite(level) ? Math.min(Math.max(level + 1, 1), 9) : 1}pPr`;
     const inheritedLevelStyle = this.extractTextRunStyle(
       ctx.inheritedTxBody?.["a:lstStyle"]?.[levelKey]?.["a:defRPr"],
       paraAlign,
-      ctx.slideRelationshipMap
+      ctx.slideRelationshipMap,
+      false
     );
     const bodyLevelStyle = this.extractTextRunStyle(
       ctx.txBody?.["a:lstStyle"]?.[levelKey]?.["a:defRPr"],
       paraAlign,
-      ctx.slideRelationshipMap
+      ctx.slideRelationshipMap,
+      false
     );
     const endParagraphStyle = this.extractTextRunStyle(
       p?.["a:endParaRPr"],
       paraAlign,
-      ctx.slideRelationshipMap
+      ctx.slideRelationshipMap,
+      false
     );
     const mergedDefaultRunStyle = {
       ...ctx.bodyDefaultRunStyle,
@@ -40378,20 +40378,23 @@ var PptxHandlerRuntime49 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
       ...defaultRunStyle
     };
     if (ctx.effectiveLevelStyles) {
-      const normalizedLevel = Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
-      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1];
+      const normalizedLevel = level === -1 ? -1 : Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
+      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1] ?? (normalizedLevel === -1 ? ctx.effectiveLevelStyles[0] : void 0);
       if (phLevel) {
         this.applyPlaceholderLevelDefaults(mergedDefaultRunStyle, phLevel);
         this.applyPlaceholderLevelDefaults(textStyle, phLevel);
       }
     }
+    if (pPr?.["@_algn"] === void 0 && textStyle.align !== void 0) {
+      paraAlign = textStyle.align;
+    }
     const parMarginLeft = pPr?.["@_marL"] !== void 0 ? Number.parseInt(String(pPr["@_marL"]), 10) / _PptxHandlerRuntime.EMU_PER_PX : void 0;
     const parIndent = pPr?.["@_indent"] !== void 0 ? Number.parseInt(String(pPr["@_indent"]), 10) / _PptxHandlerRuntime.EMU_PER_PX : void 0;
     let effectiveMarginLeft = parMarginLeft;
     let effectiveIndent = parIndent;
     if (ctx.effectiveLevelStyles) {
-      const normalizedLevel = Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
-      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1];
+      const normalizedLevel = level === -1 ? -1 : Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
+      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1] ?? (normalizedLevel === -1 ? ctx.effectiveLevelStyles[0] : void 0);
       if (phLevel) {
         if (effectiveMarginLeft === void 0 && phLevel.marginLeft !== void 0) {
           effectiveMarginLeft = phLevel.marginLeft;
@@ -40557,11 +40560,23 @@ var PptxHandlerRuntime50 = class extends PptxHandlerRuntime49 {
         continue;
       }
       const items = this.ensureArray(p[key]);
-      for (const item of items) {
+      const rawBreaks = p["a:br"];
+      const breakCount = Array.isArray(rawBreaks) ? rawBreaks.length : rawBreaks === void 0 ? 0 : 1;
+      const insertCollapsedBreaks = key === "a:r" && items.length > 1 && breakCount > 0;
+      for (const [itemIndex, item] of items.entries()) {
         switch (key) {
-          case "a:r":
+          case "a:r": {
             processRun(item);
+            if (insertCollapsedBreaks && itemIndex < Math.min(items.length - 1, breakCount)) {
+              parts.push("\n");
+              segments.push({
+                text: "\n",
+                style: { ...mergedDefaultRunStyle },
+                isLineBreak: true
+              });
+            }
             break;
+          }
           case "a:fld":
             processField(item);
             break;
@@ -40579,6 +40594,9 @@ var PptxHandlerRuntime50 = class extends PptxHandlerRuntime49 {
             processAlternateContent(item);
             break;
           case "a:br": {
+            if (insertCollapsedBreaks) {
+              break;
+            }
             const brNode = item ?? {};
             const brRunProps = brNode["a:rPr"];
             const brStyle = {
@@ -40741,7 +40759,13 @@ var PptxHandlerRuntime51 = class _PptxHandlerRuntime extends PptxHandlerRuntime5
       );
       const inheritedPlaceholder = slidePath && placeholderInfo ? this.findPlaceholderContext(slidePath, placeholderInfo) : void 0;
       const inheritedSpPr = inheritedPlaceholder?.shape?.["p:spPr"] || inheritedPlaceholder?.picture?.["p:spPr"];
-      const effectiveSpPr = this.mergeXmlObjects(inheritedSpPr, spPr);
+      const effectiveSpPr = spPr ? {
+        ...spPr,
+        "a:xfrm": this.mergeXmlObjects(
+          inheritedSpPr?.["a:xfrm"],
+          spPr["a:xfrm"]
+        )
+      } : inheritedSpPr;
       const xfrm = effectiveSpPr?.["a:xfrm"] || spPr?.["a:xfrm"] || inheritedSpPr?.["a:xfrm"];
       if (!xfrm) {
         return null;
@@ -40819,14 +40843,16 @@ var PptxHandlerRuntime51 = class _PptxHandlerRuntime extends PptxHandlerRuntime5
       const inheritedBodyDefaultRunStyle = this.extractTextRunStyle(
         xmlPath(inheritedTxBody, "a:lstStyle", "a:defPPr", "a:defRPr"),
         "left",
-        slideRelationshipMap
+        slideRelationshipMap,
+        false
       );
       const bodyDefaultRunStyle = {
         ...inheritedBodyDefaultRunStyle,
         ...this.extractTextRunStyle(
           xmlPath(txBody, "a:lstStyle", "a:defPPr", "a:defRPr"),
           "left",
-          slideRelationshipMap
+          slideRelationshipMap,
+          false
         )
       };
       Object.assign(textStyle, bodyDefaultRunStyle);
@@ -43213,6 +43239,21 @@ var PptxHandlerRuntime61 = class extends PptxHandlerRuntime60 {
             element.id = `master-${element.id}`;
             elements.push(element);
           }
+        } else if (entry.tag === "p:cxnSp") {
+          const connectors = this.ensureArray(spTree["p:cxnSp"]);
+          const connector = connectors[entry.indexInType];
+          if (!connector) {
+            continue;
+          }
+          const element = this.parseConnector(
+            connector,
+            `master-conn-${masterToken}-${entry.indexInType}`,
+            masterPath
+          );
+          if (element) {
+            element.id = `master-${element.id}`;
+            elements.push(element);
+          }
         }
       }
       this.masterCache.set(masterPath, elements);
@@ -43351,6 +43392,21 @@ var PptxHandlerRuntime62 = class extends PptxHandlerRuntime61 {
             element.id = `layout-${element.id}`;
             elements.push(element);
           }
+        } else if (entry.tag === "p:cxnSp") {
+          const connectors = this.ensureArray(spTree["p:cxnSp"]);
+          const connector = connectors[entry.indexInType];
+          if (!connector) {
+            continue;
+          }
+          const element = this.parseConnector(
+            connector,
+            `layout-conn-${layoutToken}-${entry.indexInType}`,
+            layoutPath
+          );
+          if (element) {
+            element.id = `layout-${element.id}`;
+            elements.push(element);
+          }
         }
       }
       const layoutShowMasterSp = xmlAttr(
@@ -47054,6 +47110,7 @@ var PptxHandlerRuntime79 = class _PptxHandlerRuntime extends PptxHandlerRuntime7
     this.masterCache.clear();
     this.layoutXmlMap.clear();
     this.masterXmlMap.clear();
+    this.masterTxStylesCache.clear();
     if (typeof globalThis.URL?.revokeObjectURL === "function" && this.blobUrlCache.size > 0) {
       for (const url of this.blobUrlCache) {
         URL.revokeObjectURL(url);
@@ -47338,7 +47395,7 @@ var PptxHandlerRuntime79 = class _PptxHandlerRuntime extends PptxHandlerRuntime7
 
 // src/core/core/runtime/PptxHandlerRuntimeLoadPipeline.ts
 var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
-  async buildLoadData(presentationState, slidesWithWarnings) {
+  async buildLoadData(presentationState, slidesWithWarnings, slideMasters) {
     const headerFooter = this.extractHeaderFooter();
     const presentationProperties = await this.parsePresentationProperties();
     const customShows = this.parseCustomShows();
@@ -47348,8 +47405,6 @@ var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
     const themeOptions = await this.parseThemeOptions();
     const notesMaster = await this.parseNotesMaster();
     const handoutMaster = await this.parseHandoutMaster();
-    const slideMasters = await this.parseSlideMasters();
-    await this.enrichSlideMastersWithTxStyles(slideMasters);
     const tags = await this.parseTags();
     const customProperties = await this.parseCustomProperties();
     const coreProperties = await this.parseCoreProperties();
@@ -47469,6 +47524,7 @@ var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
     this.masterCache.clear();
     this.layoutXmlMap.clear();
     this.masterXmlMap.clear();
+    this.masterTxStylesCache.clear();
     this.layoutPlaceholderDefaultsCache.clear();
     this.masterPlaceholderDefaultsCache.clear();
     this.themeOverrideCache.clear();
@@ -47489,10 +47545,12 @@ var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
     this.detectDigitalSignatureParts();
     await this.parseCustomXmlParts();
     const presentationState = await this.loadPresentationState();
+    const slideMasters = await this.parseSlideMasters();
+    await this.enrichSlideMastersWithTxStyles(slideMasters);
     const slides = await this.loadSlidesForPresentation(presentationState.sectionBySlideId);
     const slidesWithWarnings = this.attachSlideWarnings(slides);
     this.resetElementIdCounter(slides);
-    return this.buildLoadData(presentationState, slidesWithWarnings);
+    return this.buildLoadData(presentationState, slidesWithWarnings, slideMasters);
   }
   /**
    * Retrieve the current background colour for a layout or master.

package/dist/index.mjs

@@ -12796,7 +12796,7 @@ function stripParentDirSegments(path) {
 }
 
 // src/core/utils/ole2-parser-types.ts
-var OLE_MAGIC = new Uint8Array([208, 207, 17, 224, 161, 27, 26, 225]);
+var OLE_MAGIC = new Uint8Array([208, 207, 17, 224, 161, 177, 26, 225]);
 var ENDOFCHAIN = 4294967294;
 var FREESECT = 4294967295;
 var FATSECT = 4294967293;
@@ -19328,7 +19328,7 @@ function resolveLayoutCategory(layoutType) {
 }
 
 // src/core/utils/encryption-detection.ts
-var OLE_MAGIC2 = new Uint8Array([208, 207, 17, 224, 161, 27, 26, 225]);
+var OLE_MAGIC2 = new Uint8Array([208, 207, 17, 224, 161, 177, 26, 225]);
 var ZIP_MAGIC = new Uint8Array([80, 75]);
 function detectFileFormat(data) {
   if (data.byteLength < 8) {
@@ -20022,15 +20022,9 @@ async function verifyAgilePassword(info, password) {
     pke.keyBits,
     pke.hashSize
   );
-  const iv1 = generateIV(
-    pke.hashAlgorithm,
-    pke.saltValue,
-    BLOCK_KEYS.verifierHashInput,
-    pke.blockSize
-  );
   const verifierHashInput = await aesCbcDecryptRaw(
     verifierInputKey,
-    await iv1,
+    pke.saltValue,
     pke.encryptedVerifierHashInput
   );
   const verifierHashKey = await deriveAgileKey(
@@ -20042,15 +20036,9 @@ async function verifyAgilePassword(info, password) {
     pke.keyBits,
     pke.hashSize
   );
-  const iv2 = generateIV(
-    pke.hashAlgorithm,
-    pke.saltValue,
-    BLOCK_KEYS.verifierHashValue,
-    pke.blockSize
-  );
   const verifierHashValue = await aesCbcDecryptRaw(
     verifierHashKey,
-    await iv2,
+    pke.saltValue,
     pke.encryptedVerifierHashValue
   );
   const computedHash = await hash(pke.hashAlgorithm, verifierHashInput.subarray(0, pke.saltSize));
@@ -20075,13 +20063,7 @@ async function verifyAgilePassword(info, password) {
     pke.keyBits,
     pke.hashSize
   );
-  const iv3 = await generateIV(
-    pke.hashAlgorithm,
-    pke.saltValue,
-    BLOCK_KEYS.encryptedKeyValue,
-    pke.blockSize
-  );
-  const decryptedKey = await aesCbcDecryptRaw(encKeyKey, iv3, pke.encryptedKeyValue);
+  const decryptedKey = await aesCbcDecryptRaw(encKeyKey, pke.saltValue, pke.encryptedKeyValue);
   return decryptedKey.subarray(0, info.keyData.keyBits / 8);
 }
 async function verifyStandardPassword(info, password) {
@@ -20134,8 +20116,7 @@ async function verifyAgileDataIntegrity(info, key, encryptedPackage) {
     info.dataIntegrity.encryptedHmacValue
   );
   const expectedHmac = decryptedHmacValue.subarray(0, keyData.hashSize);
-  const encryptedContent = encryptedPackage.subarray(8);
-  const computedHmac = await hmac(keyData.hashAlgorithm, hmacKey, encryptedContent);
+  const computedHmac = await hmac(keyData.hashAlgorithm, hmacKey, encryptedPackage);
   let match = true;
   if (computedHmac.length < keyData.hashSize) {
     match = false;
@@ -20289,14 +20270,13 @@ async function encryptPptx(pptxBuffer, password, options) {
     keyBits,
     hashSize
   );
-  const iv1 = await generateIV(hashAlgorithm, pkeSalt, BLOCK_KEYS.verifierHashInput, blockSize);
   const paddedVerifierInput = new Uint8Array(
     Math.ceil(verifierHashInput.length / blockSize) * blockSize
   );
   paddedVerifierInput.set(verifierHashInput);
   const encryptedVerifierHashInput = await aesCbcEncryptNoPad(
     verifierInputKey,
-    iv1,
+    pkeSalt,
     paddedVerifierInput
   );
   const verifierHashKey = await deriveAgileKey(
@@ -20308,12 +20288,11 @@ async function encryptPptx(pptxBuffer, password, options) {
     keyBits,
     hashSize
   );
-  const iv2 = await generateIV(hashAlgorithm, pkeSalt, BLOCK_KEYS.verifierHashValue, blockSize);
   const paddedVerifierHash = new Uint8Array(Math.ceil(verifierHash.length / blockSize) * blockSize);
   paddedVerifierHash.set(verifierHash);
   const encryptedVerifierHashValue = await aesCbcEncryptNoPad(
     verifierHashKey,
-    iv2,
+    pkeSalt,
     paddedVerifierHash
   );
   const encKeyKey = await deriveAgileKey(
@@ -20325,10 +20304,9 @@ async function encryptPptx(pptxBuffer, password, options) {
     keyBits,
     hashSize
   );
-  const iv3 = await generateIV(hashAlgorithm, pkeSalt, BLOCK_KEYS.encryptedKeyValue, blockSize);
   const paddedDocumentKey = new Uint8Array(Math.ceil(documentKey.length / blockSize) * blockSize);
   paddedDocumentKey.set(documentKey);
-  const encryptedKeyValue = await aesCbcEncryptNoPad(encKeyKey, iv3, paddedDocumentKey);
+  const encryptedKeyValue = await aesCbcEncryptNoPad(encKeyKey, pkeSalt, paddedDocumentKey);
   const encInfo = {
     keyData: {
       saltSize: 16,
@@ -20364,7 +20342,7 @@ async function encryptPptx(pptxBuffer, password, options) {
   const encryptedPackage = await encryptAgilePackage(packageData, documentKey, encInfo);
   const hmacKeyRandom = new Uint8Array(hashSize);
   crypto2.getRandomValues(hmacKeyRandom);
-  const hmacValue = await hmac(hashAlgorithm, hmacKeyRandom, encryptedPackage.subarray(8));
+  const hmacValue = await hmac(hashAlgorithm, hmacKeyRandom, encryptedPackage);
   const hmacKeyIV = await generateIV(
     hashAlgorithm,
     keyDataSalt,
@@ -21525,6 +21503,7 @@ var FONT_SUBSTITUTION_MAP = {
   MoolBoran: ["Noto Sans Khmer", "sans-serif"],
   // Decorative / Display
   "Century Gothic": ["URW Gothic", "Futura", "sans-serif"],
+  Oswald: ["Agency FB", "Arial Narrow", "sans-serif"],
   "Franklin Gothic": ["Liberation Sans", "Helvetica Neue", "sans-serif"],
   "Franklin Gothic Medium": ["Liberation Sans", "Helvetica Neue", "sans-serif"],
   Garamond: ["EB Garamond", "Cormorant Garamond", "serif"],
@@ -31435,8 +31414,8 @@ var PptxHandlerRuntime18 = class extends PptxHandlerRuntime17 {
 
 // src/core/core/runtime/PptxHandlerRuntimeTextRunStyleExtraction.ts
 var PptxHandlerRuntime19 = class _PptxHandlerRuntime extends PptxHandlerRuntime18 {
-  extractTextRunStyle(runProperties, align, relationshipMap) {
-    const style = { align };
+  extractTextRunStyle(runProperties, align, relationshipMap, includeDefaultAlignment = true) {
+    const style = includeDefaultAlignment ? { align } : {};
     if (!runProperties) {
       return style;
     }
@@ -38750,11 +38729,12 @@ var PptxHandlerRuntime42 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
     if (!source) {
       return true;
     }
+    const typesMatch = source.type === target.type || source.type === "ctrtitle" && target.type === "title" || source.type === "subtitle" && target.type === "body";
     if (source.idx !== void 0 && target.idx !== void 0) {
       if (source.idx !== target.idx) {
         return false;
       }
-      if (source.type && target.type && source.type !== target.type) {
+      if (source.type && target.type && !typesMatch) {
         return false;
       }
       return true;
@@ -38762,11 +38742,11 @@ var PptxHandlerRuntime42 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
     if (source.idx !== void 0 && target.idx === void 0) {
       const singletonTypes = /* @__PURE__ */ new Set(["title", "ctrtitle", "subtitle", "dt", "ftr", "sldnum"]);
       if (source.type && singletonTypes.has(source.type)) {
-        return target.type === source.type;
+        return typesMatch;
       }
       return false;
     }
-    if (source.type && target.type && source.type !== target.type) {
+    if (source.type && target.type && !typesMatch) {
       return false;
     }
     if (source.type && !target.type) {
@@ -38810,18 +38790,21 @@ var PptxHandlerRuntime43 = class extends PptxHandlerRuntime42 {
       xmlPath(layoutXmlObj, "p:sldLayout", "p:cSld", "p:spTree"),
       expected
     );
-    if (layoutContext) {
-      return layoutContext;
-    }
     const masterPath = this.resolveMasterPathForLayout(layoutPath);
-    if (!masterPath) {
-      return void 0;
-    }
-    const masterXmlObj = this.masterXmlMap.get(masterPath);
-    return this.findPlaceholderInShapeTree(
-      xmlPath(masterXmlObj, "p:sldMaster", "p:cSld", "p:spTree"),
+    const masterContext = masterPath ? this.findPlaceholderInShapeTree(
+      xmlPath(this.masterXmlMap.get(masterPath), "p:sldMaster", "p:cSld", "p:spTree"),
       expected
-    );
+    ) : void 0;
+    if (!layoutContext) {
+      return masterContext;
+    }
+    if (!masterContext) {
+      return layoutContext;
+    }
+    return {
+      shape: layoutContext.shape || masterContext.shape ? this.mergeXmlObjects(masterContext.shape, layoutContext.shape) : void 0,
+      picture: layoutContext.picture || masterContext.picture ? this.mergeXmlObjects(masterContext.picture, layoutContext.picture) : void 0
+    };
   }
   mergeXmlObjects(base, override, depth = 0) {
     const MAX_MERGE_DEPTH = 64;
@@ -38874,10 +38857,11 @@ var PptxHandlerRuntime43 = class extends PptxHandlerRuntime42 {
    * otherwise falls back to `type`.
    */
   buildPlaceholderDefaultsKey(phInfo) {
+    const normalizedType = phInfo.type === "ctrtitle" ? "title" : phInfo.type === "subtitle" ? "body" : phInfo.type;
     if (phInfo.idx !== void 0) {
-      return phInfo.type ? `${phInfo.type}_${phInfo.idx}` : `_${phInfo.idx}`;
+      return normalizedType ? `${normalizedType}_${phInfo.idx}` : `_${phInfo.idx}`;
     }
-    return phInfo.type ?? "body";
+    return normalizedType ?? "body";
   }
   /**
    * Look up merged {@link PlaceholderDefaults} for a shape's placeholder
@@ -38895,44 +38879,52 @@ var PptxHandlerRuntime43 = class extends PptxHandlerRuntime42 {
     const masterPath = this.resolveMasterPathForLayout(layoutPath);
     const masterMap = masterPath ? this.masterPlaceholderDefaultsCache.get(masterPath) : void 0;
     const masterDefaults = masterMap?.get(phKey);
-    if (!layoutDefaults && !masterDefaults) {
+    const normalizedType = this.buildPlaceholderDefaultsKey(phInfo).split("_")[0];
+    const masterTextStyleType = phInfo.type === "title" || phInfo.type === "ctrtitle" ? "title" : phInfo.type === "body" || phInfo.type === "obj" || phInfo.type === "subtitle" ? "body" : "other";
+    const masterTextStyles = masterPath ? this.masterTxStylesCache.get(masterPath) : void 0;
+    const masterTextLevels = masterTextStyleType === "title" ? masterTextStyles?.titleStyle : masterTextStyleType === "body" ? masterTextStyles?.bodyStyle : masterTextStyles?.otherStyle;
+    const resolvedMasterDefaults = masterTextLevels ? {
+      type: masterDefaults?.type ?? normalizedType,
+      ...masterDefaults,
+      levelStyles: this.mergePlaceholderLevelStyles(
+        masterTextLevels,
+        masterDefaults?.levelStyles
+      )
+    } : masterDefaults;
+    if (!layoutDefaults && !resolvedMasterDefaults) {
       return void 0;
     }
-    if (!masterDefaults) {
+    if (!resolvedMasterDefaults) {
       return layoutDefaults;
     }
     if (!layoutDefaults) {
-      return masterDefaults;
+      return resolvedMasterDefaults;
     }
     const merged = {
       type: layoutDefaults.type,
-      idx: layoutDefaults.idx ?? masterDefaults.idx,
-      bodyInsetLeft: layoutDefaults.bodyInsetLeft ?? masterDefaults.bodyInsetLeft,
-      bodyInsetTop: layoutDefaults.bodyInsetTop ?? masterDefaults.bodyInsetTop,
-      bodyInsetRight: layoutDefaults.bodyInsetRight ?? masterDefaults.bodyInsetRight,
-      bodyInsetBottom: layoutDefaults.bodyInsetBottom ?? masterDefaults.bodyInsetBottom,
-      textAnchor: layoutDefaults.textAnchor ?? masterDefaults.textAnchor,
-      autoFit: layoutDefaults.autoFit ?? masterDefaults.autoFit,
-      textWrap: layoutDefaults.textWrap ?? masterDefaults.textWrap,
-      promptText: layoutDefaults.promptText ?? masterDefaults.promptText
+      idx: layoutDefaults.idx ?? resolvedMasterDefaults.idx,
+      bodyInsetLeft: layoutDefaults.bodyInsetLeft ?? resolvedMasterDefaults.bodyInsetLeft,
+      bodyInsetTop: layoutDefaults.bodyInsetTop ?? resolvedMasterDefaults.bodyInsetTop,
+      bodyInsetRight: layoutDefaults.bodyInsetRight ?? resolvedMasterDefaults.bodyInsetRight,
+      bodyInsetBottom: layoutDefaults.bodyInsetBottom ?? resolvedMasterDefaults.bodyInsetBottom,
+      textAnchor: layoutDefaults.textAnchor ?? resolvedMasterDefaults.textAnchor,
+      autoFit: layoutDefaults.autoFit ?? resolvedMasterDefaults.autoFit,
+      textWrap: layoutDefaults.textWrap ?? resolvedMasterDefaults.textWrap,
+      promptText: layoutDefaults.promptText ?? resolvedMasterDefaults.promptText
     };
-    if (layoutDefaults.levelStyles || masterDefaults.levelStyles) {
-      const mergedLevels = {};
-      const allLevelKeys = /* @__PURE__ */ new Set([
-        ...Object.keys(layoutDefaults.levelStyles ?? {}),
-        ...Object.keys(masterDefaults.levelStyles ?? {})
-      ]);
-      for (const keyStr of allLevelKeys) {
-        const key = Number.parseInt(keyStr, 10);
-        const layoutLevel = layoutDefaults.levelStyles?.[key];
-        const masterLevel = masterDefaults.levelStyles?.[key];
-        if (layoutLevel && masterLevel) {
-          mergedLevels[key] = { ...masterLevel, ...layoutLevel };
-        } else {
-          mergedLevels[key] = layoutLevel ?? masterLevel;
-        }
-      }
-      merged.levelStyles = mergedLevels;
+    if (layoutDefaults.levelStyles || resolvedMasterDefaults.levelStyles) {
+      merged.levelStyles = this.mergePlaceholderLevelStyles(
+        resolvedMasterDefaults.levelStyles,
+        layoutDefaults.levelStyles
+      );
+    }
+    return merged;
+  }
+  mergePlaceholderLevelStyles(base, override) {
+    const merged = {};
+    for (const key of /* @__PURE__ */ new Set([...Object.keys(base ?? {}), ...Object.keys(override ?? {})])) {
+      const level = Number.parseInt(key, 10);
+      merged[level] = { ...base?.[level], ...override?.[level] };
     }
     return merged;
   }
@@ -40230,7 +40222,11 @@ var PptxHandlerRuntime49 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
    * for "first-wins" shape-level properties.
    */
   resolveShapeParagraphStyle(p, textStyle, ctx) {
-    const pPr = p["a:pPr"];
+    const inheritedParagraph = this.ensureArray(ctx.inheritedTxBody?.["a:p"])[0];
+    const pPr = this.mergeXmlObjects(
+      inheritedParagraph?.["a:pPr"],
+      p["a:pPr"]
+    );
     const paragraphRtl = this.parseOptionalBooleanAttr(pPr?.["@_rtl"]);
     if (paragraphRtl !== void 0 && textStyle.rtl === void 0) {
       textStyle.rtl = paragraphRtl;
@@ -40346,24 +40342,28 @@ var PptxHandlerRuntime49 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
     const defaultRunStyle = this.extractTextRunStyle(
       pPr?.["a:defRPr"],
       paraAlign,
-      ctx.slideRelationshipMap
+      ctx.slideRelationshipMap,
+      false
     );
-    const level = Number.parseInt(String(pPr?.["@_lvl"] || "0"), 10);
-    const levelKey = `a:lvl${Number.isFinite(level) ? Math.min(Math.max(level + 1, 1), 9) : 1}pPr`;
+    const level = pPr?.["@_lvl"] === void 0 ? -1 : Number.parseInt(String(pPr["@_lvl"]), 10);
+    const levelKey = level === -1 ? "a:defPPr" : `a:lvl${Number.isFinite(level) ? Math.min(Math.max(level + 1, 1), 9) : 1}pPr`;
     const inheritedLevelStyle = this.extractTextRunStyle(
       ctx.inheritedTxBody?.["a:lstStyle"]?.[levelKey]?.["a:defRPr"],
       paraAlign,
-      ctx.slideRelationshipMap
+      ctx.slideRelationshipMap,
+      false
     );
     const bodyLevelStyle = this.extractTextRunStyle(
       ctx.txBody?.["a:lstStyle"]?.[levelKey]?.["a:defRPr"],
       paraAlign,
-      ctx.slideRelationshipMap
+      ctx.slideRelationshipMap,
+      false
     );
     const endParagraphStyle = this.extractTextRunStyle(
       p?.["a:endParaRPr"],
       paraAlign,
-      ctx.slideRelationshipMap
+      ctx.slideRelationshipMap,
+      false
     );
     const mergedDefaultRunStyle = {
       ...ctx.bodyDefaultRunStyle,
@@ -40373,20 +40373,23 @@ var PptxHandlerRuntime49 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
       ...defaultRunStyle
     };
     if (ctx.effectiveLevelStyles) {
-      const normalizedLevel = Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
-      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1];
+      const normalizedLevel = level === -1 ? -1 : Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
+      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1] ?? (normalizedLevel === -1 ? ctx.effectiveLevelStyles[0] : void 0);
       if (phLevel) {
         this.applyPlaceholderLevelDefaults(mergedDefaultRunStyle, phLevel);
         this.applyPlaceholderLevelDefaults(textStyle, phLevel);
       }
     }
+    if (pPr?.["@_algn"] === void 0 && textStyle.align !== void 0) {
+      paraAlign = textStyle.align;
+    }
     const parMarginLeft = pPr?.["@_marL"] !== void 0 ? Number.parseInt(String(pPr["@_marL"]), 10) / _PptxHandlerRuntime.EMU_PER_PX : void 0;
     const parIndent = pPr?.["@_indent"] !== void 0 ? Number.parseInt(String(pPr["@_indent"]), 10) / _PptxHandlerRuntime.EMU_PER_PX : void 0;
     let effectiveMarginLeft = parMarginLeft;
     let effectiveIndent = parIndent;
     if (ctx.effectiveLevelStyles) {
-      const normalizedLevel = Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
-      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1];
+      const normalizedLevel = level === -1 ? -1 : Number.isFinite(level) ? Math.min(Math.max(level, 0), 8) : 0;
+      const phLevel = ctx.effectiveLevelStyles[normalizedLevel] ?? ctx.effectiveLevelStyles[-1] ?? (normalizedLevel === -1 ? ctx.effectiveLevelStyles[0] : void 0);
       if (phLevel) {
         if (effectiveMarginLeft === void 0 && phLevel.marginLeft !== void 0) {
           effectiveMarginLeft = phLevel.marginLeft;
@@ -40552,11 +40555,23 @@ var PptxHandlerRuntime50 = class extends PptxHandlerRuntime49 {
         continue;
       }
       const items = this.ensureArray(p[key]);
-      for (const item of items) {
+      const rawBreaks = p["a:br"];
+      const breakCount = Array.isArray(rawBreaks) ? rawBreaks.length : rawBreaks === void 0 ? 0 : 1;
+      const insertCollapsedBreaks = key === "a:r" && items.length > 1 && breakCount > 0;
+      for (const [itemIndex, item] of items.entries()) {
         switch (key) {
-          case "a:r":
+          case "a:r": {
             processRun(item);
+            if (insertCollapsedBreaks && itemIndex < Math.min(items.length - 1, breakCount)) {
+              parts.push("\n");
+              segments.push({
+                text: "\n",
+                style: { ...mergedDefaultRunStyle },
+                isLineBreak: true
+              });
+            }
             break;
+          }
           case "a:fld":
             processField(item);
             break;
@@ -40574,6 +40589,9 @@ var PptxHandlerRuntime50 = class extends PptxHandlerRuntime49 {
             processAlternateContent(item);
             break;
           case "a:br": {
+            if (insertCollapsedBreaks) {
+              break;
+            }
             const brNode = item ?? {};
             const brRunProps = brNode["a:rPr"];
             const brStyle = {
@@ -40736,7 +40754,13 @@ var PptxHandlerRuntime51 = class _PptxHandlerRuntime extends PptxHandlerRuntime5
       );
       const inheritedPlaceholder = slidePath && placeholderInfo ? this.findPlaceholderContext(slidePath, placeholderInfo) : void 0;
       const inheritedSpPr = inheritedPlaceholder?.shape?.["p:spPr"] || inheritedPlaceholder?.picture?.["p:spPr"];
-      const effectiveSpPr = this.mergeXmlObjects(inheritedSpPr, spPr);
+      const effectiveSpPr = spPr ? {
+        ...spPr,
+        "a:xfrm": this.mergeXmlObjects(
+          inheritedSpPr?.["a:xfrm"],
+          spPr["a:xfrm"]
+        )
+      } : inheritedSpPr;
       const xfrm = effectiveSpPr?.["a:xfrm"] || spPr?.["a:xfrm"] || inheritedSpPr?.["a:xfrm"];
       if (!xfrm) {
         return null;
@@ -40814,14 +40838,16 @@ var PptxHandlerRuntime51 = class _PptxHandlerRuntime extends PptxHandlerRuntime5
       const inheritedBodyDefaultRunStyle = this.extractTextRunStyle(
         xmlPath(inheritedTxBody, "a:lstStyle", "a:defPPr", "a:defRPr"),
         "left",
-        slideRelationshipMap
+        slideRelationshipMap,
+        false
       );
       const bodyDefaultRunStyle = {
         ...inheritedBodyDefaultRunStyle,
         ...this.extractTextRunStyle(
           xmlPath(txBody, "a:lstStyle", "a:defPPr", "a:defRPr"),
           "left",
-          slideRelationshipMap
+          slideRelationshipMap,
+          false
         )
       };
       Object.assign(textStyle, bodyDefaultRunStyle);
@@ -43208,6 +43234,21 @@ var PptxHandlerRuntime61 = class extends PptxHandlerRuntime60 {
             element.id = `master-${element.id}`;
             elements.push(element);
           }
+        } else if (entry.tag === "p:cxnSp") {
+          const connectors = this.ensureArray(spTree["p:cxnSp"]);
+          const connector = connectors[entry.indexInType];
+          if (!connector) {
+            continue;
+          }
+          const element = this.parseConnector(
+            connector,
+            `master-conn-${masterToken}-${entry.indexInType}`,
+            masterPath
+          );
+          if (element) {
+            element.id = `master-${element.id}`;
+            elements.push(element);
+          }
         }
       }
       this.masterCache.set(masterPath, elements);
@@ -43346,6 +43387,21 @@ var PptxHandlerRuntime62 = class extends PptxHandlerRuntime61 {
             element.id = `layout-${element.id}`;
             elements.push(element);
           }
+        } else if (entry.tag === "p:cxnSp") {
+          const connectors = this.ensureArray(spTree["p:cxnSp"]);
+          const connector = connectors[entry.indexInType];
+          if (!connector) {
+            continue;
+          }
+          const element = this.parseConnector(
+            connector,
+            `layout-conn-${layoutToken}-${entry.indexInType}`,
+            layoutPath
+          );
+          if (element) {
+            element.id = `layout-${element.id}`;
+            elements.push(element);
+          }
         }
       }
       const layoutShowMasterSp = xmlAttr(
@@ -47049,6 +47105,7 @@ var PptxHandlerRuntime79 = class _PptxHandlerRuntime extends PptxHandlerRuntime7
     this.masterCache.clear();
     this.layoutXmlMap.clear();
     this.masterXmlMap.clear();
+    this.masterTxStylesCache.clear();
     if (typeof globalThis.URL?.revokeObjectURL === "function" && this.blobUrlCache.size > 0) {
       for (const url of this.blobUrlCache) {
         URL.revokeObjectURL(url);
@@ -47333,7 +47390,7 @@ var PptxHandlerRuntime79 = class _PptxHandlerRuntime extends PptxHandlerRuntime7
 
 // src/core/core/runtime/PptxHandlerRuntimeLoadPipeline.ts
 var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
-  async buildLoadData(presentationState, slidesWithWarnings) {
+  async buildLoadData(presentationState, slidesWithWarnings, slideMasters) {
     const headerFooter = this.extractHeaderFooter();
     const presentationProperties = await this.parsePresentationProperties();
     const customShows = this.parseCustomShows();
@@ -47343,8 +47400,6 @@ var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
     const themeOptions = await this.parseThemeOptions();
     const notesMaster = await this.parseNotesMaster();
     const handoutMaster = await this.parseHandoutMaster();
-    const slideMasters = await this.parseSlideMasters();
-    await this.enrichSlideMastersWithTxStyles(slideMasters);
     const tags = await this.parseTags();
     const customProperties = await this.parseCustomProperties();
     const coreProperties = await this.parseCoreProperties();
@@ -47464,6 +47519,7 @@ var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
     this.masterCache.clear();
     this.layoutXmlMap.clear();
     this.masterXmlMap.clear();
+    this.masterTxStylesCache.clear();
     this.layoutPlaceholderDefaultsCache.clear();
     this.masterPlaceholderDefaultsCache.clear();
     this.themeOverrideCache.clear();
@@ -47484,10 +47540,12 @@ var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
     this.detectDigitalSignatureParts();
     await this.parseCustomXmlParts();
     const presentationState = await this.loadPresentationState();
+    const slideMasters = await this.parseSlideMasters();
+    await this.enrichSlideMastersWithTxStyles(slideMasters);
     const slides = await this.loadSlidesForPresentation(presentationState.sectionBySlideId);
     const slidesWithWarnings = this.attachSlideWarnings(slides);
     this.resetElementIdCounter(slides);
-    return this.buildLoadData(presentationState, slidesWithWarnings);
+    return this.buildLoadData(presentationState, slidesWithWarnings, slideMasters);
   }
   /**
    * Retrieve the current background colour for a layout or master.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptx-viewer-core",
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"description": "PowerPoint PPTX engine: parse, edit, serialize, and convert .pptx files. Framework-agnostic TypeScript SDK.",
 	"keywords": [
 		"angular",
@@ -77,7 +77,7 @@
 	},
 	"dependencies": {
 		"emf-converter": "^1.5.0",
-		"fast-xml-parser": "^5.9.3",
+		"fast-xml-parser": "^5.10.0",
 		"jszip": "^3.10.1",
 		"mtx-decompressor": "^1.4.2"
 	},