@aixa-transformation/pptx-viewer 2.0.2 → 2.0.15

package/dist/{chunk-2TOLRBFU.js → chunk-IVCWQLQK.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkAD2CLKY6_js = require('./chunk-AD2CLKY6.js');
+var chunkKAP5TS7O_js = require('./chunk-KAP5TS7O.js');
 var DOMPurify = require('dompurify');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -238,7 +238,7 @@ function resolveThemeCatalogEntry(key, catalog = THEME_CATALOG) {
   return catalog.find((entry) => entry.key === key)?.theme;
 }
 function corePreset(id) {
-  const preset = chunkAD2CLKY6_js.THEME_PRESETS.find((p) => p.id === id);
+  const preset = chunkKAP5TS7O_js.THEME_PRESETS.find((p) => p.id === id);
   if (!preset) {
     throw new Error(`theme-gallery-presets: core THEME_PRESETS is missing "${id}"`);
   }
@@ -414,7 +414,7 @@ function buildInitialGuides(presentationGuides, firstSlideGuides) {
       guides.push({
         id: g.id,
         axis: g.orientation === "horz" ? "h" : "v",
-        position: chunkAD2CLKY6_js.guideEmuToPx(g.positionEmu)
+        position: chunkKAP5TS7O_js.guideEmuToPx(g.positionEmu)
       });
     }
   }
@@ -423,7 +423,7 @@ function buildInitialGuides(presentationGuides, firstSlideGuides) {
       guides.push({
         id: g.id,
         axis: g.orientation === "horz" ? "h" : "v",
-        position: chunkAD2CLKY6_js.guideEmuToPx(g.positionEmu)
+        position: chunkKAP5TS7O_js.guideEmuToPx(g.positionEmu)
       });
     }
   }
@@ -436,23 +436,23 @@ function getResolvedShapeClipPathFor(shapeType, width, height, adjustments) {
     return void 0;
   }
   if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) {
-    return chunkAD2CLKY6_js.getShapeClipPath(shapeType);
+    return chunkKAP5TS7O_js.getShapeClipPath(shapeType);
   }
   if (adjustments && Object.keys(adjustments).length > 0) {
-    const adjusted = chunkAD2CLKY6_js.getAdjustmentAwareShapeClipPath(shapeType, width, height, adjustments);
+    const adjusted = chunkKAP5TS7O_js.getAdjustmentAwareShapeClipPath(shapeType, width, height, adjustments);
     if (adjusted !== void 0) {
       return adjusted;
     }
   }
-  const fromPreset = chunkAD2CLKY6_js.getShapeClipPathFromPreset(shapeType, width, height, adjustments);
+  const fromPreset = chunkKAP5TS7O_js.getShapeClipPathFromPreset(shapeType, width, height, adjustments);
   if (fromPreset !== void 0) {
     return fromPreset;
   }
-  const cloud = chunkAD2CLKY6_js.getCloudPathForRendering(shapeType, width, height);
+  const cloud = chunkKAP5TS7O_js.getCloudPathForRendering(shapeType, width, height);
   if (cloud !== void 0) {
     return cloud;
   }
-  return chunkAD2CLKY6_js.getShapeClipPath(shapeType);
+  return chunkKAP5TS7O_js.getShapeClipPath(shapeType);
 }
 function buildCustomGeometryClipPath(pathData, pathWidth, pathHeight, elemWidth, elemHeight) {
   if (!pathData || !Number.isFinite(pathWidth) || !Number.isFinite(pathHeight) || pathWidth <= 0 || pathHeight <= 0 || !Number.isFinite(elemWidth) || !Number.isFinite(elemHeight) || elemWidth <= 0 || elemHeight <= 0) {
@@ -1101,7 +1101,7 @@ var OOXML_PATTERN_PRESETS = [
   "zigZag"
 ];
 function getComputedFillStyle(element, parentGroupFill) {
-  if (!chunkAD2CLKY6_js.hasShapeProperties(element)) {
+  if (!chunkKAP5TS7O_js.hasShapeProperties(element)) {
     return void 0;
   }
   const ss = element.shapeStyle;
@@ -1170,7 +1170,7 @@ function getGroupChildParentFill(group) {
   return group.type === "group" ? group.groupFill : void 0;
 }
 function resolveGroupChildFill(child2, parentGroupFill) {
-  if (!parentGroupFill || !chunkAD2CLKY6_js.hasShapeProperties(child2) || child2.shapeStyle?.fillMode !== "group") {
+  if (!parentGroupFill || !chunkKAP5TS7O_js.hasShapeProperties(child2) || child2.shapeStyle?.fillMode !== "group") {
     return void 0;
   }
   return getComputedFillStyle(child2, parentGroupFill);
@@ -1373,7 +1373,7 @@ var DEFAULT_SCHEME_COLOR_MAP = {
   phclr: "#4472C4"
 };
 function applyDrawingColorTransforms2(baseColor, colorNode) {
-  return chunkAD2CLKY6_js.applyDrawingColorTransforms(baseColor, colorNode);
+  return chunkKAP5TS7O_js.applyDrawingColorTransforms(baseColor, colorNode);
 }
 function parseDrawingColorChoice(colorNode, schemeColorOverrides) {
   if (!colorNode) {
@@ -1425,7 +1425,7 @@ function parseDrawingColorChoice(colorNode, schemeColorOverrides) {
       const h = hueRaw / 6e4;
       const s = clampUnitInterval(satRaw / 1e5);
       const l = clampUnitInterval(lumRaw / 1e5);
-      const rgb = chunkAD2CLKY6_js.hslToRgb(h, s, l);
+      const rgb = chunkKAP5TS7O_js.hslToRgb(h, s, l);
       const toHex2 = (value) => Math.min(255, Math.max(0, Math.round(value))).toString(16).padStart(2, "0").toUpperCase();
       const base = `#${toHex2(rgb.r)}${toHex2(rgb.g)}${toHex2(rgb.b)}`;
       return applyDrawingColorTransforms2(base, hslNode);
@@ -1435,7 +1435,7 @@ function parseDrawingColorChoice(colorNode, schemeColorOverrides) {
     const preset = String(
       colorNode["a:prstClr"]?.["@_val"] || ""
     ).toLowerCase();
-    const mapped = chunkAD2CLKY6_js.PRESET_COLOR_MAP[preset];
+    const mapped = chunkKAP5TS7O_js.PRESET_COLOR_MAP[preset];
     if (!mapped) {
       return void 0;
     }
@@ -1978,7 +1978,7 @@ function hexToRgbUnit2(hex) {
   };
 }
 function getEffects(element) {
-  if (!chunkAD2CLKY6_js.isImageLikeElement(element)) {
+  if (!chunkKAP5TS7O_js.isImageLikeElement(element)) {
     return void 0;
   }
   return element.imageEffects;
@@ -2167,7 +2167,7 @@ function buildDuotoneFilterMarkup(color1, color2) {
   const c2 = hexToRgbUnit2(color2);
   return `<feColorMatrix type="matrix" values="${GRAYSCALE_LUMINANCE_MATRIX}"/><feComponentTransfer><feFuncR type="linear" slope="${c2.r - c1.r}" intercept="${c1.r}"/><feFuncG type="linear" slope="${c2.g - c1.g}" intercept="${c1.g}"/><feFuncB type="linear" slope="${c2.b - c1.b}" intercept="${c1.b}"/></feComponentTransfer>`;
 }
-function getDuotoneImageFilter(element, elementId = chunkAD2CLKY6_js.isImageLikeElement(element) ? element.id : "") {
+function getDuotoneImageFilter(element, elementId = chunkKAP5TS7O_js.isImageLikeElement(element) ? element.id : "") {
   const effects = getEffects(element);
   if (!effects?.duotone) {
     return void 0;
@@ -2269,7 +2269,7 @@ function buildImageAlphaFilterMarkup(effects) {
   }
   return parts.length > 0 ? parts.join("") : void 0;
 }
-function getImageAlphaFilter(element, elementId = chunkAD2CLKY6_js.isImageLikeElement(element) ? element.id : "") {
+function getImageAlphaFilter(element, elementId = chunkKAP5TS7O_js.isImageLikeElement(element) ? element.id : "") {
   const effects = getEffects(element);
   if (!effects || !hasAdvancedImageAlphaEffects(element)) {
     return void 0;
@@ -2359,7 +2359,7 @@ function buildArtisticFilterMarkup(effectName, radius) {
       return void 0;
   }
 }
-function getArtisticImageFilter(element, elementId = chunkAD2CLKY6_js.isImageLikeElement(element) ? element.id : "") {
+function getArtisticImageFilter(element, elementId = chunkKAP5TS7O_js.isImageLikeElement(element) ? element.id : "") {
   const effects = getEffects(element);
   if (!effects?.artisticEffect || !needsSvgArtisticFilter(effects.artisticEffect)) {
     return void 0;
@@ -3318,7 +3318,7 @@ function convertChildren(node) {
     if (key.startsWith("@_")) {
       continue;
     }
-    const tag = chunkAD2CLKY6_js.stripXmlOrderSuffix(key);
+    const tag = chunkKAP5TS7O_js.stripXmlOrderSuffix(key);
     if (tag === "m:oMathPara") {
       continue;
     }
@@ -3390,7 +3390,7 @@ function findOmathRoots(node) {
     }
   }
   const contentTags = /* @__PURE__ */ new Set(["m:r", "m:f", "m:rad", "m:sSup", "m:sSub", "m:box"]);
-  if (Object.keys(node).some((key) => contentTags.has(chunkAD2CLKY6_js.stripXmlOrderSuffix(key)))) {
+  if (Object.keys(node).some((key) => contentTags.has(chunkKAP5TS7O_js.stripXmlOrderSuffix(key)))) {
     return [node];
   }
   return [];
@@ -3600,7 +3600,7 @@ function mergeSiblings(nodes) {
     }
     const ordered2 = {};
     for (const [position, [key, value]] of entries.entries()) {
-      ordered2[(counts.get(key) ?? 0) > 1 ? chunkAD2CLKY6_js.orderedXmlKey(key, position) : key] = value;
+      ordered2[(counts.get(key) ?? 0) > 1 ? chunkKAP5TS7O_js.orderedXmlKey(key, position) : key] = value;
     }
     return ordered2;
   }
@@ -4004,7 +4004,7 @@ function ommlChildrenToLatex(node) {
     if (key.startsWith("@_")) {
       continue;
     }
-    const tag = chunkAD2CLKY6_js.stripXmlOrderSuffix(key);
+    const tag = chunkKAP5TS7O_js.stripXmlOrderSuffix(key);
     const items = ensureArr(node[key]);
     for (const item of items) {
       const result = ommlElementToLatex(tag, item);
@@ -12185,7 +12185,7 @@ function buildSegmentCounts(slide, nativeAnims) {
   for (const anim of nativeAnims) {
     if (anim.buildType && anim.buildType !== "allAtOnce" && anim.targetId) {
       const el = slide.elements.find((e) => e.id === anim.targetId);
-      if (el && chunkAD2CLKY6_js.hasTextProperties(el) && el.textSegments && el.textSegments.length > 0) {
+      if (el && chunkKAP5TS7O_js.hasTextProperties(el) && el.textSegments && el.textSegments.length > 0) {
         segmentCounts.set(anim.targetId, countTextSegments(el.textSegments));
       }
     }
@@ -14403,7 +14403,7 @@ function rotateDelta(dx, dy, rotationDeg) {
 }
 function applyResize(box, handle, dxScreen, dyScreen, zoom, opts = {}) {
   const scale = zoom || 1;
-  const minSize = opts.minSize ?? chunkAD2CLKY6_js.MIN_ELEMENT_SIZE;
+  const minSize = opts.minSize ?? chunkKAP5TS7O_js.MIN_ELEMENT_SIZE;
   const rotation = rotationOf(box);
   const local = rotateDelta(dxScreen / scale, dyScreen / scale, rotation);
   const dx = local.x;
@@ -14430,7 +14430,7 @@ function applyResize(box, handle, dxScreen, dyScreen, zoom, opts = {}) {
   }
   return { x: newX, y: newY, width: newW, height: newH, rotation };
 }
-function snapBoxToGrid(box, handle, gridSpacingPx, minSize = chunkAD2CLKY6_js.MIN_ELEMENT_SIZE) {
+function snapBoxToGrid(box, handle, gridSpacingPx, minSize = chunkKAP5TS7O_js.MIN_ELEMENT_SIZE) {
   if (handle === null || gridSpacingPx <= 0) {
     return box;
   }
@@ -14460,7 +14460,7 @@ function snapBoxToGrid(box, handle, gridSpacingPx, minSize = chunkAD2CLKY6_js.MI
   }
   return { x, y, width, height };
 }
-function computeMarqueeHitIds(marquee, elements, minSize = chunkAD2CLKY6_js.MIN_ELEMENT_SIZE) {
+function computeMarqueeHitIds(marquee, elements, minSize = chunkKAP5TS7O_js.MIN_ELEMENT_SIZE) {
   const minX = Math.min(marquee.startX, marquee.currentX);
   const minY = Math.min(marquee.startY, marquee.currentY);
   const maxX = Math.max(marquee.startX, marquee.currentX);
@@ -16016,7 +16016,7 @@ var THEME_COLOR_LABELS = {
 };
 function buildThemeColorGrid(colorScheme) {
   return THEME_COLOR_TINT_ROWS.map(
-    (row) => chunkAD2CLKY6_js.THEME_COLOR_SCHEME_KEYS.map((key) => ({
+    (row) => chunkKAP5TS7O_js.THEME_COLOR_SCHEME_KEYS.map((key) => ({
       hex: row.transform(colorScheme[key]),
       schemeKey: key,
       rowLabel: row.label,
@@ -16352,12 +16352,12 @@ function getShapeConnectionSites(shape) {
   }
   const pathW = geo.pathWidth && geo.pathWidth > 0 ? geo.pathWidth : shape.width;
   const pathH = geo.pathHeight && geo.pathHeight > 0 ? geo.pathHeight : shape.height;
-  const vars = chunkAD2CLKY6_js.createBuiltinVariables({ w: pathW, h: pathH });
+  const vars = chunkKAP5TS7O_js.createBuiltinVariables({ w: pathW, h: pathH });
   const scaleX = pathW > 0 ? shape.width / pathW : 1;
   const scaleY = pathH > 0 ? shape.height / pathH : 1;
   return cxn.map((site, index) => ({
-    x: chunkAD2CLKY6_js.resolveCoordinate(site.posX, vars) * scaleX,
-    y: chunkAD2CLKY6_js.resolveCoordinate(site.posY, vars) * scaleY,
+    x: chunkKAP5TS7O_js.resolveCoordinate(site.posX, vars) * scaleX,
+    y: chunkKAP5TS7O_js.resolveCoordinate(site.posY, vars) * scaleY,
     index
   }));
 }
@@ -16520,7 +16520,7 @@ function svgLineCap(lineCap) {
 }
 function copyFormatFromElement(element) {
   const result = {};
-  if (chunkAD2CLKY6_js.hasShapeProperties(element) && element.shapeStyle) {
+  if (chunkKAP5TS7O_js.hasShapeProperties(element) && element.shapeStyle) {
     const s = element.shapeStyle;
     result.shapeStyle = {
       fillColor: s.fillColor,
@@ -16549,7 +16549,7 @@ function copyFormatFromElement(element) {
       softEdgeRadius: s.softEdgeRadius
     };
   }
-  if (chunkAD2CLKY6_js.hasTextProperties(element) && element.textStyle) {
+  if (chunkKAP5TS7O_js.hasTextProperties(element) && element.textStyle) {
     const t = element.textStyle;
     result.textStyle = {
       fontFamily: t.fontFamily,
@@ -16580,7 +16580,7 @@ function definedEntries(obj) {
 }
 function applyFormatToElement(element, format) {
   let updated = { ...element };
-  if (format.shapeStyle && chunkAD2CLKY6_js.hasShapeProperties(updated)) {
+  if (format.shapeStyle && chunkKAP5TS7O_js.hasShapeProperties(updated)) {
     updated = {
       ...updated,
       shapeStyle: {
@@ -16589,7 +16589,7 @@ function applyFormatToElement(element, format) {
       }
     };
   }
-  if (format.textStyle && chunkAD2CLKY6_js.hasTextProperties(updated)) {
+  if (format.textStyle && chunkKAP5TS7O_js.hasTextProperties(updated)) {
     updated = {
       ...updated,
       textStyle: {
@@ -16604,7 +16604,7 @@ function hasCopyableFormat(element) {
   if (!element) {
     return false;
   }
-  return chunkAD2CLKY6_js.hasShapeProperties(element) || chunkAD2CLKY6_js.hasTextProperties(element);
+  return chunkKAP5TS7O_js.hasShapeProperties(element) || chunkKAP5TS7O_js.hasTextProperties(element);
 }
 function copySegmentMetadata(from, to) {
   if (from.equationXml !== void 0) {
@@ -16741,7 +16741,7 @@ function getRoundRectRadiusPx(element) {
   return Math.min(Math.max(element.width, 1), Math.max(element.height, 1)) * 0.5 * normalizedAdjustment;
 }
 function getShapeAdjustmentHandleDescriptor(element) {
-  if (!chunkAD2CLKY6_js.hasShapeProperties(element)) {
+  if (!chunkKAP5TS7O_js.hasShapeProperties(element)) {
     return null;
   }
   const normalizedShapeType = String(element.shapeType || "").toLowerCase();
@@ -17750,7 +17750,7 @@ function createSyncGate(onOpen, graceMs = INITIAL_SYNC_GRACE_MS) {
 var POSITION_THRESHOLD = 2;
 var SIZE_THRESHOLD = 2;
 function getElementText(element) {
-  if (!chunkAD2CLKY6_js.hasTextProperties(element)) {
+  if (!chunkKAP5TS7O_js.hasTextProperties(element)) {
     return "";
   }
   if (element.textSegments && element.textSegments.length > 0) {
@@ -23102,7 +23102,7 @@ function getAriaRole(element) {
     case "model3d":
       return "img";
     case "shape": {
-      if (chunkAD2CLKY6_js.hasTextProperties(element) && element.text) {
+      if (chunkKAP5TS7O_js.hasTextProperties(element) && element.text) {
         return "group";
       }
       return "img";
@@ -23115,7 +23115,7 @@ function getAriaLabel(element) {
   if ((element.type === "image" || element.type === "picture") && "altText" in element && typeof element.altText === "string" && element.altText.trim()) {
     return element.altText.trim();
   }
-  if (chunkAD2CLKY6_js.hasTextProperties(element) && element.text) {
+  if (chunkKAP5TS7O_js.hasTextProperties(element) && element.text) {
     const text = element.text.trim();
     if (text) {
       return text.length > 120 ? `${text.slice(0, 117)}...` : text;
@@ -23522,7 +23522,7 @@ var DEFAULT_CHART_POSITION = { x: 120, y: 120, width: 480, height: 320 };
 var DEFAULT_CATEGORIES = ["Category 1", "Category 2", "Category 3"];
 var DEFAULT_SERIES_VALUES = [4, 3, 5];
 function createDefaultChartElement(chartType = DEFAULT_INSERT_CHART_TYPE, position) {
-  return chunkAD2CLKY6_js.createChartElement(
+  return chunkKAP5TS7O_js.createChartElement(
     chartType,
     {
       categories: [...DEFAULT_CATEGORIES],
@@ -24446,6 +24446,12 @@ var BACKSTAGE_TEMPLATES = [
     name: "Future Forward",
     description: "Clean technology storytelling",
     preview: "repeating-radial-gradient(ellipse at bottom, #111 0 3px, #fff 4px 13px)"
+  },
+  {
+    id: "oasis",
+    name: "Oasis",
+    description: "56 editorial layouts with marble imagery",
+    preview: "linear-gradient(90deg, #111111 0 48%, transparent 48%), radial-gradient(ellipse at 78% 38%, #e8c7b4 0 18%, #91b9b4 42%, #c8a38f 67%, #eee6df 100%)"
   }
 ];
 var TEMPLATE_BACKGROUNDS = {
@@ -24551,7 +24557,7 @@ function computeVirtualRange(totalItems, itemHeight, scrollTop, viewportHeight,
   };
 }
 function collectFontsFromElement(element, fonts) {
-  if (chunkAD2CLKY6_js.hasTextProperties(element)) {
+  if (chunkKAP5TS7O_js.hasTextProperties(element)) {
     if (element.textStyle?.fontFamily) {
       fonts.add(element.textStyle.fontFamily);
     }

package/dist/{chunk-AD2CLKY6.js → chunk-KAP5TS7O.js}

@@ -42214,6 +42214,11 @@ function getSectionSlideRange(zoomElement, slides) {
 }
 var FONT_SUBSTITUTION_MAP = {
   // Microsoft Office default fonts
+  // Aptos replaced Calibri as Office's default and is intentionally close in
+  // metrics. Calibri/Calibri Light are better fidelity fallbacks than Segoe UI
+  // (which is wider and makes authored one-line titles wrap).
+  Aptos: ["Calibri", "Arial", "sans-serif"],
+  "Aptos Display": ["Calibri Light", "Calibri", "Arial", "sans-serif"],
   Calibri: ["Carlito", "Liberation Sans", "Arial", "sans-serif"],
   "Calibri Light": ["Carlito", "Liberation Sans", "Arial", "sans-serif"],
   Cambria: ["Caladea", "Liberation Serif", "Times New Roman", "serif"],
@@ -55224,6 +55229,28 @@ var PptxHandlerRuntime9 = class _PptxHandlerRuntime extends PptxHandlerRuntime8
       if (!this.layoutXmlMap.has(layoutPath)) {
         this.layoutXmlMap.set(layoutPath, data);
       }
+      if (!this.slideRelsMap.has(layoutPath)) {
+        const layoutRelsPath = `${layoutPath.replace(
+          "slideLayouts/",
+          "slideLayouts/_rels/"
+        )}.rels`;
+        const layoutRelsXml2 = await this.zip.file(layoutRelsPath)?.async("string");
+        if (layoutRelsXml2) {
+          const layoutRelsData = this.parser.parse(layoutRelsXml2);
+          const relationships = this.ensureArray(
+            xmlChild(layoutRelsData, "Relationships")?.["Relationship"]
+          );
+          const relationshipMap = /* @__PURE__ */ new Map();
+          for (const relationship of relationships) {
+            const id = String(relationship["@_Id"] || "").trim();
+            const target = String(relationship["@_Target"] || "").trim();
+            if (id && target) {
+              relationshipMap.set(id, target);
+            }
+          }
+          this.slideRelsMap.set(layoutPath, relationshipMap);
+        }
+      }
       const layout = { path: layoutPath };
       const cSldName = (xmlAttr(xmlChild(sldLayout, "p:cSld"), "name") ?? "").trim();
       if (cSldName) {
@@ -58130,6 +58157,16 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
     }
     return type;
   }
+  placeholderRole(phInfo) {
+    const type = phInfo.type || "body";
+    if (type === "title" || type === "ctrtitle") {
+      return "title";
+    }
+    if (type === "body" || type === "obj" || type === "subtitle") {
+      return "content";
+    }
+    return type;
+  }
   // ── Core layout switching logic ─────────────────────────────────────
   /**
    * Re-map slide elements to a new layout's placeholders.
@@ -58168,6 +58205,15 @@ var PptxHandlerRuntime21 = class extends PptxHandlerRuntime20 {
           }
         }
       }
+      if (!resolvedLayoutPh) {
+        const sourceRole = this.placeholderRole(phInfo);
+        for (const [, lp] of layoutPhMap.entries()) {
+          if (!lp.matched && this.placeholderRole(lp.phInfo) === sourceRole) {
+            resolvedLayoutPh = lp;
+            break;
+          }
+        }
+      }
       if (resolvedLayoutPh) {
         resolvedLayoutPh.matched = true;
         const updatedElement = { ...element };
@@ -67557,12 +67603,20 @@ var PptxHandlerRuntime56 = class extends PptxHandlerRuntime55 {
     }
     const phKey = this.buildPlaceholderDefaultsKey(phInfo);
     const layoutMap = this.layoutPlaceholderDefaultsCache.get(layoutPath);
-    const layoutDefaults = layoutMap?.get(phKey);
+    const lookupDefaults = (map) => {
+      const exact = map?.get(phKey);
+      if (exact || phInfo.type !== void 0 || phInfo.idx === void 0) {
+        return exact;
+      }
+      return map?.get(`obj_${phInfo.idx}`) ?? map?.get(`body_${phInfo.idx}`);
+    };
+    const layoutDefaults = lookupDefaults(layoutMap);
     const masterPath = this.resolveMasterPathForLayout(layoutPath);
     const masterMap = masterPath ? this.masterPlaceholderDefaultsCache.get(masterPath) : void 0;
-    const masterDefaults = masterMap?.get(phKey);
+    const masterDefaults = lookupDefaults(masterMap);
     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 effectivePlaceholderType = phInfo.type ?? "obj";
+    const masterTextStyleType = effectivePlaceholderType === "title" || effectivePlaceholderType === "ctrtitle" ? "title" : effectivePlaceholderType === "body" || effectivePlaceholderType === "obj" || effectivePlaceholderType === "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 ? {
@@ -68246,6 +68300,17 @@ var PptxHandlerRuntime58 = class _PptxHandlerRuntime24 extends PptxHandlerRuntim
     return void 0;
   }
 };
+function parseOoxmlPercentage(value) {
+  const raw = String(value ?? "").trim();
+  if (!raw) {
+    return void 0;
+  }
+  const numeric = Number.parseFloat(raw.endsWith("%") ? raw.slice(0, -1) : raw);
+  if (!Number.isFinite(numeric)) {
+    return void 0;
+  }
+  return raw.endsWith("%") ? numeric / 100 : numeric / 1e5;
+}
 var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
   /**
    * Apply {@link PlaceholderDefaults} body-level properties to a
@@ -68292,12 +68357,11 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     if (Number.isFinite(spacingPointsRaw)) {
       return this.pointsToPixels(spacingPointsRaw / 100);
     }
-    const spacingPercentRaw = Number.parseInt(
-      String(spacingNode["a:spcPct"]?.["@_val"] || ""),
-      10
+    const spacingPercent = parseOoxmlPercentage(
+      spacingNode["a:spcPct"]?.["@_val"]
     );
-    if (Number.isFinite(spacingPercentRaw) && typeof basisFontSizePx === "number" && basisFontSizePx > 0) {
-      return spacingPercentRaw / 1e5 * basisFontSizePx;
+    if (spacingPercent !== void 0 && typeof basisFontSizePx === "number" && basisFontSizePx > 0) {
+      return spacingPercent * basisFontSizePx;
     }
     return void 0;
   }
@@ -68305,12 +68369,11 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     if (!lineSpacingNode) {
       return void 0;
     }
-    const spacingPercentRaw = Number.parseInt(
-      String(lineSpacingNode["a:spcPct"]?.["@_val"] || ""),
-      10
+    const spacingPercent = parseOoxmlPercentage(
+      lineSpacingNode["a:spcPct"]?.["@_val"]
     );
-    if (Number.isFinite(spacingPercentRaw)) {
-      return Math.max(0.1, Math.min(5, spacingPercentRaw / 1e5));
+    if (spacingPercent !== void 0) {
+      return Math.max(0.1, Math.min(5, spacingPercent));
     }
     return void 0;
   }
@@ -68348,8 +68411,13 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
     if (textStyle.italic === void 0 && levelStyle.italic !== void 0) {
       textStyle.italic = levelStyle.italic;
     }
-    if (textStyle.color === void 0 && levelStyle.color !== void 0) {
-      textStyle.color = levelStyle.color;
+    if (textStyle.color === void 0) {
+      const currentSlideColor = levelStyle.colorXml ? this.parseColor(levelStyle.colorXml) : void 0;
+      if (currentSlideColor !== void 0) {
+        textStyle.color = currentSlideColor;
+      } else if (levelStyle.color !== void 0) {
+        textStyle.color = levelStyle.color;
+      }
     }
     if (textStyle.paragraphMarginLeft === void 0 && levelStyle.marginLeft !== void 0) {
       textStyle.paragraphMarginLeft = levelStyle.marginLeft;
@@ -69163,7 +69231,30 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
         bulletText = `${paragraphBulletInfo.char} `;
       } else if (paragraphBulletInfo.autoNumType) {
         const startAt = paragraphBulletInfo.autoNumStartAt ?? 1;
-        bulletText = this.formatAutoNumber(paragraphBulletInfo.autoNumType, startAt + pIdx);
+        const paragraphs = this.ensureArray(
+          ctx.txBody?.["a:p"]
+        );
+        let sequenceOffset = 0;
+        for (let priorIndex = pIdx - 1; priorIndex >= 0; priorIndex--) {
+          const priorBullet = this.resolveParagraphBulletInfo(
+            paragraphs[priorIndex],
+            priorIndex,
+            ctx.txBody,
+            ctx.inheritedTxBody,
+            isBodyPlaceholder,
+            ctx.slidePath,
+            ctx.effectiveLevelStyles
+          );
+          if (priorBullet?.none || priorBullet?.autoNumType !== paragraphBulletInfo.autoNumType) {
+            break;
+          }
+          sequenceOffset++;
+        }
+        bulletText = this.formatAutoNumber(
+          paragraphBulletInfo.autoNumType,
+          startAt + sequenceOffset
+        );
+        paragraphBulletInfo.paragraphIndex = sequenceOffset;
       } else if (paragraphBulletInfo.imageRelId) {
         bulletText = "\u{1F4CE} ";
       } else {
@@ -69291,25 +69382,31 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
       "mc:AlternateContent",
       "a:br"
     ]);
+    const paragraphRuns = this.ensureArray(p["a:r"]);
+    const paragraphBreaks = this.ensureArray(p["a:br"]);
+    const hasCollapsedRunBreakOrder = paragraphRuns.length > 1 && paragraphBreaks.length > 0;
     for (const key of Object.keys(p)) {
       if (!contentTagSet.has(key)) {
         continue;
       }
       const items = this.ensureArray(p[key]);
-      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;
+      const breakCount = paragraphBreaks.length;
+      const insertCollapsedBreaks = key === "a:r" && hasCollapsedRunBreakOrder;
       for (const [itemIndex, item] of items.entries()) {
         switch (key) {
           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
-              });
+            if (insertCollapsedBreaks && itemIndex < items.length - 1) {
+              const gapCount = items.length - 1;
+              const breaksHere = Math.floor(breakCount / gapCount) + (itemIndex < breakCount % gapCount ? 1 : 0);
+              for (let breakIndex = 0; breakIndex < breaksHere; breakIndex++) {
+                parts.push("\n");
+                segments.push({
+                  text: "\n",
+                  style: { ...mergedDefaultRunStyle },
+                  isLineBreak: true
+                });
+              }
             }
             break;
           }
@@ -69330,7 +69427,7 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
             processAlternateContent(item);
             break;
           case "a:br": {
-            if (insertCollapsedBreaks) {
+            if (hasCollapsedRunBreakOrder) {
               break;
             }
             const brNode = item ?? {};
@@ -69354,6 +69451,14 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
         }
       }
     }
+    const markerSegment = segments.find((segment) => segment.bulletInfo);
+    const firstVisibleRun = segments.find(
+      (segment) => !segment.bulletInfo && segment.text !== "\n" && segment.text.length > 0
+    );
+    if (markerSegment && firstVisibleRun) {
+      markerSegment.style = { ...firstVisibleRun.style };
+      seedStyle = { ...firstVisibleRun.style };
+    }
     if (pIdx < paraCount - 1) {
       parts.push("\n");
       segments.push({ text: "\n", style: { ...mergedDefaultRunStyle } });
@@ -71653,10 +71758,14 @@ var PptxHandlerRuntime72 = class _PptxHandlerRuntime31 extends PptxHandlerRuntim
       if (defRPr["@_i"] !== void 0) {
         style.italic = defRPr["@_i"] === "1";
       }
-      const color2 = this.parseColor(defRPr["a:solidFill"]);
+      const colorXml2 = defRPr["a:solidFill"];
+      const color2 = this.parseColor(colorXml2);
       if (color2) {
         style.color = color2;
       }
+      if (colorXml2) {
+        style.colorXml = colorXml2;
+      }
       const latin = defRPr["a:latin"];
       if (latin?.["@_typeface"]) {
         const typeface = String(latin["@_typeface"]);
@@ -74111,6 +74220,11 @@ var PptxHandlerRuntime83 = class extends PptxHandlerRuntime82 {
 };
 function extractDrawingShapeFill(spPr, deps) {
   const result = {};
+  if (Object.keys(spPr).some(
+    (key) => !key.startsWith("@_") && (key.split(":").at(-1) ?? key) === "noFill"
+  )) {
+    result.fillNone = true;
+  }
   const solidFill2 = deps.getChild(spPr, "solidFill");
   if (solidFill2) {
     result.fillColor = deps.parseColor(solidFill2) ?? void 0;