pptx-viewer-core 1.6.7 → 1.6.9

package/dist/cli/index.mjs

@@ -7227,36 +7227,200 @@ async function fetchUrlToBytes(url, options = {}) {
   }
 }
 
+// src/core/utils/inkml-trace-decode.ts
+function resolveChannelOrder(root) {
+  const traceFormat = findFirstByLocalName(root, "traceFormat");
+  if (!traceFormat) {
+    return ["X", "Y"];
+  }
+  const channels = ensureArray(nsGet(traceFormat, "channel"));
+  const names = channels.map(
+    (channel) => String(nsAttr(channel, "name") ?? "").trim().toUpperCase()
+  ).filter((name) => name.length > 0);
+  return names.length > 0 ? names : ["X", "Y"];
+}
+function decodeTracePoints(text2, channelOrder) {
+  const points3 = [];
+  const modes = channelOrder.map(() => "explicit");
+  const lastValue = channelOrder.map(() => 0);
+  const lastVelocity = channelOrder.map(() => 0);
+  for (const rawPoint of text2.split(",")) {
+    const tokens = rawPoint.trim().split(/\s+/u).filter((token2) => token2.length > 0);
+    if (tokens.length === 0) {
+      continue;
+    }
+    const decoded = [];
+    for (let i = 0; i < tokens.length && i < channelOrder.length; i++) {
+      const parsed = parseValueToken(tokens[i], modes[i]);
+      if (parsed === void 0) {
+        decoded.push(lastValue[i]);
+        continue;
+      }
+      modes[i] = parsed.mode;
+      const value = applyDiffMode(parsed, i, lastValue, lastVelocity);
+      decoded.push(value);
+    }
+    if (decoded.length >= 2) {
+      points3.push(decoded);
+    }
+  }
+  return points3;
+}
+function parseValueToken(token2, currentMode) {
+  let mode = currentMode;
+  let body = token2;
+  const prefix = token2[0];
+  if (prefix === "!") {
+    mode = "explicit";
+    body = token2.slice(1);
+  } else if (prefix === "'") {
+    mode = "single";
+    body = token2.slice(1);
+  } else if (prefix === '"') {
+    mode = "double";
+    body = token2.slice(1);
+  }
+  if (body.length === 0) {
+    return void 0;
+  }
+  const value = Number(body);
+  return Number.isFinite(value) ? { value, mode } : void 0;
+}
+function applyDiffMode(parsed, index, lastValue, lastVelocity) {
+  if (parsed.mode === "single") {
+    lastVelocity[index] = parsed.value;
+    lastValue[index] += parsed.value;
+  } else if (parsed.mode === "double") {
+    lastVelocity[index] += parsed.value;
+    lastValue[index] += lastVelocity[index];
+  } else {
+    lastValue[index] = parsed.value;
+    lastVelocity[index] = 0;
+  }
+  return lastValue[index];
+}
+function pointsToSvgPath(points3, channelOrder) {
+  const xi = channelOrder.indexOf("X");
+  const yi = channelOrder.indexOf("Y");
+  const xIndex = xi >= 0 ? xi : 0;
+  const yIndex = yi >= 0 ? yi : 1;
+  const segments = [];
+  for (const point of points3) {
+    const x = point[xIndex];
+    const y = point[yIndex];
+    if (!Number.isFinite(x) || !Number.isFinite(y)) {
+      continue;
+    }
+    segments.push(`${segments.length === 0 ? "M" : "L"} ${x} ${y}`);
+  }
+  return segments.join(" ");
+}
+function pointsToPressures(points3, channelOrder) {
+  const fIndex = channelOrder.indexOf("F");
+  if (fIndex < 0) {
+    return [];
+  }
+  const pressures = [];
+  for (const point of points3) {
+    const raw = point[fIndex];
+    if (Number.isFinite(raw)) {
+      const normalised = raw > 1 ? raw / 32767 : raw;
+      pressures.push(Math.max(0, Math.min(1, normalised)));
+    }
+  }
+  return pressures;
+}
+function nsGet(obj, localName21) {
+  if (localName21 in obj) {
+    return obj[localName21];
+  }
+  for (const key of Object.keys(obj)) {
+    if (localNameOf(key) === localName21 && !key.startsWith("@_")) {
+      return obj[key];
+    }
+  }
+  return void 0;
+}
+function nsAttr(obj, localName21) {
+  const direct = obj[`@_${localName21}`];
+  if (direct !== void 0) {
+    return direct;
+  }
+  for (const key of Object.keys(obj)) {
+    if (key.startsWith("@_") && localNameOf(key.slice(2)) === localName21) {
+      return obj[key];
+    }
+  }
+  return void 0;
+}
+function localNameOf(key) {
+  const colon = key.indexOf(":");
+  return colon >= 0 ? key.slice(colon + 1) : key;
+}
+function findFirstByLocalName(node, localName21) {
+  const direct = nsGet(node, localName21);
+  if (direct && typeof direct === "object") {
+    return Array.isArray(direct) ? direct[0] : direct;
+  }
+  for (const key of Object.keys(node)) {
+    if (key.startsWith("@_") || key === "#text") {
+      continue;
+    }
+    for (const child20 of ensureArray(node[key])) {
+      if (typeof child20 !== "object") {
+        continue;
+      }
+      const found = findFirstByLocalName(child20, localName21);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return void 0;
+}
+function ensureArray(value) {
+  if (value === void 0 || value === null) {
+    return [];
+  }
+  return Array.isArray(value) ? value : [value];
+}
+
 // src/core/utils/inkml-content-part.ts
 var INKML_NAMESPACE = "http://www.w3.org/2003/InkML";
 var METADATA_NAMESPACE = "https://pptx-viewer.dev/inkml/metadata";
 function parseInkMlContent(data) {
-  const root = data["ink:ink"] ?? data["ink"];
+  const root = nsGet(data, "ink") ?? data["ink"];
   if (!root) {
     return { strokes: [], rawXml: data };
   }
   const brushes = /* @__PURE__ */ new Map();
-  for (const brush of ensureArray(root["ink:brush"] ?? root["brush"])) {
-    const properties = ensureArray(brush["ink:brushProperty"] ?? brush["brushProperty"]);
+  for (const brush of ensureArray(nsGet(root, "brush"))) {
+    const properties = ensureArray(nsGet(brush, "brushProperty"));
     const valueByName = new Map(
-      properties.map((property) => [String(property["@_name"] ?? ""), property["@_value"]])
+      properties.map((property) => [
+        String(nsAttr(property, "name") ?? ""),
+        nsAttr(property, "value")
+      ])
     );
-    brushes.set(String(brush["@_id"] ?? ""), {
+    brushes.set(String(nsAttr(brush, "id") ?? ""), {
       color: String(valueByName.get("color") ?? "#000000"),
       width: finiteNumber(valueByName.get("width"), 1),
       opacity: finiteNumber(valueByName.get("opacity"), 1)
     });
   }
+  const channelOrder = resolveChannelOrder(root);
   const strokes = [];
-  for (const trace of ensureArray(root["ink:trace"] ?? root["trace"])) {
+  for (const trace of ensureArray(nsGet(root, "trace"))) {
     const text2 = typeof trace === "string" ? trace : String(trace["#text"] ?? "").trim();
-    const path2 = typeof trace === "string" ? text2 : String(trace["@_pva:path"] ?? "").trim() || text2;
+    const authored = typeof trace === "string" ? "" : String(nsAttr(trace, "path") ?? "").trim();
+    const points3 = authored ? [] : decodeTracePoints(text2, channelOrder);
+    const path2 = authored || pointsToSvgPath(points3, channelOrder);
     if (!path2) {
       continue;
     }
-    const brushRef = typeof trace === "string" ? "" : String(trace["@_brushRef"] ?? "").replace("#", "");
+    const brushRef = typeof trace === "string" ? "" : String(nsAttr(trace, "brushRef") ?? "").replace("#", "");
     const brush = brushes.get(brushRef) ?? { color: "#000000", width: 1, opacity: 1 };
-    const pressures = tracePressures(text2);
+    const pressures = authored ? tracePressures(text2) : pointsToPressures(points3, channelOrder);
     strokes.push({ ...brush, path: path2, ...pressures.length > 0 ? { pressures } : {} });
   }
   return { strokes, rawXml: data };
@@ -7315,12 +7479,6 @@ function finiteNumber(value, fallback) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
-function ensureArray(value) {
-  if (value === void 0 || value === null) {
-    return [];
-  }
-  return Array.isArray(value) ? value : [value];
-}
 
 // src/core/utils/strip-parent-dir-segments.ts
 function stripParentDirSegments(path2) {
@@ -17240,7 +17398,7 @@ var MEDIA_REFERENCE_NAMES = [
   "videoFile",
   "quickTimeFile"
 ];
-function parseDrawingMediaReference(container) {
+function parseDrawingMediaReference(container, externalRelIds) {
   if (!container) {
     return void 0;
   }
@@ -17249,11 +17407,17 @@ function parseDrawingMediaReference(container) {
     if (!node) {
       continue;
     }
+    const linkId = String(attribute2(node, "link") ?? "").trim() || void 0;
+    const embedId = String(attribute2(node, "embed") ?? "").trim() || void 0;
     return {
       kind,
       mediaType: kind === "videoFile" || kind === "quickTimeFile" ? "video" : "audio",
-      relationshipId: String(attribute2(node, "link") ?? attribute2(node, "embed") ?? "").trim() || void 0,
-      isLinked: attribute2(node, "link") !== void 0,
+      relationshipId: linkId ?? embedId,
+      // Embedded media legitimately uses r:link pointing at an INTERNAL
+      // media part, so link presence alone does not imply a linked clip.
+      // It is only truly linked when the referenced relationship is
+      // external (TargetMode="External"), mirroring the OLE parser.
+      isLinked: linkId !== void 0 && externalRelIds?.has(linkId) === true,
       name: kind === "wavAudioFile" ? String(attribute2(node, "name") ?? "") || void 0 : void 0,
       contentType: kind === "audioFile" ? String(attribute2(node, "contentType") ?? "") || void 0 : void 0,
       audioCdStart: kind === "audioCd" ? parseAudioCdPosition(child11(node, "st")) : void 0,
@@ -23584,26 +23748,49 @@ function applyScene3dStyle(shapeProps, style) {
   const camera = scene3dNode["a:camera"];
   const lightRig = scene3dNode["a:lightRig"];
   const cameraRot = camera?.["a:rot"];
+  const lightRigRot = lightRig?.["a:rot"];
   style.scene3d = {
     cameraPreset: String(camera?.["@_prst"] || "").trim() || void 0,
-    cameraRotX: cameraRot?.["@_lat"] !== void 0 ? parseInt(String(cameraRot["@_lat"]), 10) : void 0,
-    cameraRotY: cameraRot?.["@_lon"] !== void 0 ? parseInt(String(cameraRot["@_lon"]), 10) : void 0,
-    cameraRotZ: cameraRot?.["@_rev"] !== void 0 ? parseInt(String(cameraRot["@_rev"]), 10) : void 0,
+    cameraFieldOfView: intAttr(camera?.["@_fov"]),
+    cameraZoom: floatAttr(camera?.["@_zoom"]),
+    cameraRotX: intAttr(cameraRot?.["@_lat"]),
+    cameraRotY: intAttr(cameraRot?.["@_lon"]),
+    cameraRotZ: intAttr(cameraRot?.["@_rev"]),
     lightRigType: String(lightRig?.["@_rig"] || "").trim() || void 0,
-    lightRigDirection: String(lightRig?.["@_dir"] || "").trim() || void 0
+    lightRigDirection: String(lightRig?.["@_dir"] || "").trim() || void 0,
+    lightRigRotX: intAttr(lightRigRot?.["@_lat"]),
+    lightRigRotY: intAttr(lightRigRot?.["@_lon"]),
+    lightRigRotZ: intAttr(lightRigRot?.["@_rev"])
   };
   const backdrop = scene3dNode["a:backdrop"];
   if (backdrop) {
     style.scene3d.hasBackdrop = true;
     const anchor = backdrop["a:anchor"];
-    const anchorAttrs = anchor;
-    if (anchorAttrs) {
-      style.scene3d.backdropAnchorX = parseInt(String(anchorAttrs["@_x"] || "0"), 10);
-      style.scene3d.backdropAnchorY = parseInt(String(anchorAttrs["@_y"] || "0"), 10);
-      style.scene3d.backdropAnchorZ = parseInt(String(anchorAttrs["@_z"] || "0"), 10);
+    if (anchor) {
+      style.scene3d.backdropAnchorX = intAttr(anchor["@_x"]) ?? 0;
+      style.scene3d.backdropAnchorY = intAttr(anchor["@_y"]) ?? 0;
+      style.scene3d.backdropAnchorZ = intAttr(anchor["@_z"]) ?? 0;
+    }
+    const norm = backdrop["a:norm"];
+    if (norm) {
+      style.scene3d.backdropNormalX = intAttr(norm["@_dx"]) ?? 0;
+      style.scene3d.backdropNormalY = intAttr(norm["@_dy"]) ?? 0;
+      style.scene3d.backdropNormalZ = intAttr(norm["@_dz"]) ?? 0;
+    }
+    const up = backdrop["a:up"];
+    if (up) {
+      style.scene3d.backdropUpX = intAttr(up["@_dx"]) ?? 0;
+      style.scene3d.backdropUpY = intAttr(up["@_dy"]) ?? 0;
+      style.scene3d.backdropUpZ = intAttr(up["@_dz"]) ?? 0;
     }
   }
 }
+function intAttr(value) {
+  return value !== void 0 ? parseInt(String(value), 10) : void 0;
+}
+function floatAttr(value) {
+  return value !== void 0 ? parseFloat(String(value)) : void 0;
+}
 function applyShape3dStyle(shapeProps, style, context) {
   const shape3dNode = shapeProps["a:sp3d"];
   if (!shape3dNode) {
@@ -24486,7 +24673,10 @@ var PptxMediaDataParser = class {
   parseMediaData(graphicData, slidePath) {
     const result = {};
     try {
-      const reference = parseDrawingMediaReference(graphicData);
+      const reference = parseDrawingMediaReference(
+        graphicData,
+        this.context.externalRelsMap.get(slidePath)
+      );
       if (reference) {
         result.mediaType = reference.mediaType;
         result.mediaReferenceKind = reference.kind;
@@ -28139,6 +28329,7 @@ var PptxNativeAnimationService = class {
       const nodeType = String(cTn["@_nodeType"] || "");
       const presetClass = cTn["@_presetClass"];
       const presetId = cTn["@_presetID"] ? Number.parseInt(String(cTn["@_presetID"]), 10) : void 0;
+      const presetSubtype = cTn["@_presetSubtype"] !== void 0 ? Number.parseInt(String(cTn["@_presetSubtype"]), 10) : void 0;
       const durationMs = cTn["@_dur"] ? Number.parseInt(String(cTn["@_dur"]), 10) : void 0;
       const delayMs = cTn["@_delay"] ? Number.parseInt(String(cTn["@_delay"]), 10) : void 0;
       let trigger = currentTrigger;
@@ -28190,6 +28381,7 @@ var PptxNativeAnimationService = class {
           trigger,
           presetClass: validPresetClass,
           presetId,
+          presetSubtype,
           durationMs,
           delayMs,
           triggerDelayMs: trigger === "afterDelay" ? delayMs : void 0,
@@ -28500,6 +28692,74 @@ function buildP14ExtLst(transitionType, direction, orient, pattern, rawExtLst, x
   return { "p:ext": transitionExt };
 }
 
+// src/core/services/p15-transition-parser.ts
+var P15_TRANSITION_PRESETS = /* @__PURE__ */ new Set([
+  "fallOver",
+  "drape",
+  "curtains",
+  "wind",
+  "prestige",
+  "fracture",
+  "crush",
+  "peelOff",
+  "pageCurlDouble",
+  "pageCurlSingle",
+  "airplane",
+  "origami"
+]);
+var PRSTTRANS_EXT_URI = "{D42A27DB-BD31-4B8C-83A1-F6EECF244321}";
+function optionalBoolean(value) {
+  const valueToken = value === void 0 || value === null ? "" : String(value).trim().toLowerCase();
+  if (valueToken === "1" || valueToken === "true") {
+    return true;
+  }
+  if (valueToken === "0" || valueToken === "false") {
+    return false;
+  }
+  return void 0;
+}
+function parseP15FromExtLst(extLstNode, xmlLookupService, getXmlLocalName) {
+  const extEntries = xmlLookupService.getChildrenArrayByLocalName(extLstNode, "ext");
+  for (const ext of extEntries) {
+    if (!ext) {
+      continue;
+    }
+    for (const [key, value] of Object.entries(ext)) {
+      if (key.startsWith("@_")) {
+        continue;
+      }
+      if (getXmlLocalName(key) !== "prstTrans") {
+        continue;
+      }
+      if (!value || typeof value !== "object" || Array.isArray(value)) {
+        continue;
+      }
+      const detail = value;
+      const prst = String(detail["@_prst"] || "").trim();
+      if (!P15_TRANSITION_PRESETS.has(prst)) {
+        continue;
+      }
+      return {
+        type: prst,
+        invX: optionalBoolean(detail["@_invX"]),
+        invY: optionalBoolean(detail["@_invY"])
+      };
+    }
+  }
+  return void 0;
+}
+function buildP15ExtLst(transitionType, invX, invY) {
+  const prstTrans = {
+    "@_xmlns:p15": "http://schemas.microsoft.com/office/powerpoint/2012/main",
+    "@_prst": transitionType
+  };
+  const ext = {
+    "@_uri": PRSTTRANS_EXT_URI,
+    "p15:prstTrans": prstTrans
+  };
+  return { "p:ext": ext };
+}
+
 // src/core/services/slide-transition-xml.ts
 var STANDARD_TRANSITION_TYPES = /* @__PURE__ */ new Set([
   "fade",
@@ -28565,7 +28825,7 @@ function parseTransitionDetails(node, localName21) {
     if (pattern) {
       result.pattern = pattern;
     }
-    const thruBlk = optionalBoolean(detail["@_thruBlk"]);
+    const thruBlk = optionalBoolean2(detail["@_thruBlk"]);
     if (thruBlk !== void 0) {
       result.thruBlk = thruBlk;
     }
@@ -28576,7 +28836,7 @@ function parseTransitionAttributes(node) {
   const speedToken = token(node["@_spd"]);
   const speed = SPEEDS.has(speedToken) ? speedToken : void 0;
   const durationMs = unsignedInteger2(node["@_dur"] ?? node["@_p14:dur"], 1);
-  const advanceOnClick = optionalBoolean(node["@_advClick"]);
+  const advanceOnClick = optionalBoolean2(node["@_advClick"]);
   const advanceAfterMs = unsignedInteger2(node["@_advTm"]);
   return { speed, durationMs, advanceOnClick, advanceAfterMs };
 }
@@ -28590,7 +28850,7 @@ function parseTransitionSound(raw, lookup, localName21) {
     return {
       soundRId: sound ? attributeByLocalName(sound, "embed", localName21) : void 0,
       soundName: sound ? attributeByLocalName(sound, "name", localName21) : void 0,
-      soundLoop: optionalBoolean(start["@_loop"])
+      soundLoop: optionalBoolean2(start["@_loop"])
     };
   }
   const stopSound = Object.keys(raw).some(
@@ -28699,7 +28959,7 @@ function attributeByLocalName(node, name, localName21) {
 function token(value) {
   return value === void 0 || value === null ? "" : String(value).trim();
 }
-function optionalBoolean(value) {
+function optionalBoolean2(value) {
   const valueToken = token(value).toLowerCase();
   if (!valueToken) {
     return void 0;
@@ -28745,6 +29005,7 @@ var PptxSlideTransitionService = class {
     const { spokes, thruBlk, rawSoundAction, rawExtLst } = details;
     if (rawExtLst && transitionType === "cut") {
       const p14Result = parseP14FromExtLst(rawExtLst, this.xmlLookupService, this.getXmlLocalName);
+      const p15Result = p14Result ? void 0 : parseP15FromExtLst(rawExtLst, this.xmlLookupService, this.getXmlLocalName);
       if (p14Result) {
         transitionType = p14Result.type;
         if (p14Result.direction) {
@@ -28756,6 +29017,8 @@ var PptxSlideTransitionService = class {
         if (p14Result.pattern) {
           pattern = p14Result.pattern;
         }
+      } else if (p15Result) {
+        transitionType = p15Result.type;
       } else if (this.parseMorphFromExtLst(rawExtLst)) {
         transitionType = "morph";
       }
@@ -28837,6 +29100,7 @@ var PptxSlideTransitionService = class {
     }
     const transitionType = transition.type || "cut";
     const isP14Type = P14_TRANSITION_TYPES.has(transitionType);
+    const isP15Type = P15_TRANSITION_PRESETS.has(transitionType);
     const isMorphType = transitionType === "morph";
     const node = createPreservedTransitionNode(transition.rawTransition, this.getXmlLocalName);
     if (isP14Type) {
@@ -28849,6 +29113,8 @@ var PptxSlideTransitionService = class {
         this.xmlLookupService,
         this.getXmlLocalName
       );
+    } else if (isP15Type) {
+      node["p:extLst"] = transition.rawExtLst ?? buildP15ExtLst(transitionType);
     } else if (isMorphType) {
       node["p:extLst"] = this.buildMorphExtLst(transition.rawExtLst);
     } else {
@@ -28859,7 +29125,7 @@ var PptxSlideTransitionService = class {
     if (soundAction) {
       node["p:sndAc"] = soundAction;
     }
-    if (transition.rawExtLst && !isP14Type && !isMorphType) {
+    if (transition.rawExtLst && !isP14Type && !isP15Type && !isMorphType) {
       node["p:extLst"] = transition.rawExtLst;
     }
     return node;
@@ -36743,6 +37009,93 @@ var PptxHandlerRuntime = class {
   }
 };
 
+// src/core/core/runtime/table-style-border-parse.ts
+var EMU_PER_PIXEL = 9525;
+var BORDER_SIDES = [
+  "left",
+  "right",
+  "top",
+  "bottom",
+  "insideH",
+  "insideV",
+  "tl2br",
+  "bl2tr"
+];
+function parseSolidFillStyle(solidFill2) {
+  if (!solidFill2) {
+    return void 0;
+  }
+  const schemeClr = solidFill2["a:schemeClr"];
+  if (!schemeClr) {
+    return void 0;
+  }
+  const schemeColor = String(schemeClr["@_val"] || "").trim() || void 0;
+  if (!schemeColor) {
+    return void 0;
+  }
+  const tintRaw = schemeClr["a:tint"];
+  const tint = tintRaw ? parseInt(String(tintRaw["@_val"] || "0"), 10) || void 0 : void 0;
+  const shadeRaw = schemeClr["a:shade"];
+  const shade = shadeRaw ? parseInt(String(shadeRaw["@_val"] || "0"), 10) || void 0 : void 0;
+  return { schemeColor, tint, shade };
+}
+function parseBorderSide(side) {
+  if (!side) {
+    return void 0;
+  }
+  const ln = side["a:ln"];
+  if (!ln) {
+    return void 0;
+  }
+  const border = {};
+  let has = false;
+  if (ln["a:noFill"] !== void 0) {
+    border.noFill = true;
+    has = true;
+  }
+  const widthEmu = parseInt(String(ln["@_w"] || "0"), 10);
+  if (widthEmu > 0) {
+    border.width = Math.max(1, Math.round(widthEmu / EMU_PER_PIXEL));
+    has = true;
+  }
+  const prstDash = ln["a:prstDash"];
+  const dashVal = prstDash ? String(prstDash["@_val"] || "").trim() : "";
+  if (dashVal) {
+    border.dash = dashVal;
+    has = true;
+  }
+  const solidFill2 = ln["a:solidFill"];
+  const fill = parseSolidFillStyle(solidFill2);
+  if (fill) {
+    border.fill = fill;
+    has = true;
+  } else {
+    const srgb = solidFill2?.["a:srgbClr"];
+    const hex10 = srgb ? String(srgb["@_val"] || "").trim() : "";
+    if (hex10) {
+      border.color = hex10.startsWith("#") ? hex10 : `#${hex10}`;
+      has = true;
+    }
+  }
+  return has ? border : void 0;
+}
+function parseTableStyleBorders(tcStyle) {
+  const tcBdr = tcStyle?.["a:tcBdr"];
+  if (!tcBdr) {
+    return void 0;
+  }
+  const result = {};
+  let has = false;
+  for (const name of BORDER_SIDES) {
+    const border = parseBorderSide(tcBdr[`a:${name}`]);
+    if (border) {
+      result[name] = border;
+      has = true;
+    }
+  }
+  return has ? result : void 0;
+}
+
 // src/core/core/runtime/PptxHandlerRuntimeTableStyles.ts
 var PptxHandlerRuntime2 = class extends PptxHandlerRuntime {
   /**
@@ -36827,30 +37180,15 @@ var PptxHandlerRuntime2 = class extends PptxHandlerRuntime {
       return void 0;
     }
     const tcStyle = section["a:tcStyle"];
-    if (!tcStyle) {
-      return void 0;
-    }
-    const fill = tcStyle["a:fill"];
-    if (!fill) {
-      return void 0;
-    }
-    const solidFill2 = fill["a:solidFill"];
-    if (!solidFill2) {
-      return void 0;
-    }
-    const schemeClr = solidFill2["a:schemeClr"];
-    if (!schemeClr) {
-      return void 0;
-    }
-    const schemeColor = String(schemeClr["@_val"] || "").trim() || void 0;
-    if (!schemeColor) {
-      return void 0;
-    }
-    const tintRaw = schemeClr["a:tint"];
-    const tint = tintRaw ? parseInt(String(tintRaw["@_val"] || "0"), 10) || void 0 : void 0;
-    const shadeRaw = schemeClr["a:shade"];
-    const shade = shadeRaw ? parseInt(String(shadeRaw["@_val"] || "0"), 10) || void 0 : void 0;
-    return { schemeColor, tint, shade };
+    const fill = tcStyle?.["a:fill"];
+    return parseSolidFillStyle(fill?.["a:solidFill"]);
+  }
+  /**
+   * Extract border styling from a table style section's
+   * `a:tcStyle/a:tcBdr` (per-side line width, dash, and colour).
+   */
+  extractTableStyleSectionBorders(section) {
+    return parseTableStyleBorders(section?.["a:tcStyle"]);
   }
   /**
    * Extract text properties from a:tcTxStyle in a table style section.
@@ -36997,6 +37335,15 @@ var PptxHandlerRuntime2 = class extends PptxHandlerRuntime {
             textProps[`${name}Text`] = text2;
           }
         }
+        const borderProps = {};
+        for (const name of sectionNames) {
+          const borders = this.extractTableStyleSectionBorders(
+            style[`a:${name}`]
+          );
+          if (borders) {
+            borderProps[`${name}Borders`] = borders;
+          }
+        }
         const entry = {
           styleId,
           styleName,
@@ -37015,7 +37362,8 @@ var PptxHandlerRuntime2 = class extends PptxHandlerRuntime {
           ...swCellFill ? { swCellFill } : {},
           ...neCellFill ? { neCellFill } : {},
           ...nwCellFill ? { nwCellFill } : {},
-          ...textProps
+          ...textProps,
+          ...borderProps
         };
         map[styleId] = entry;
       }
@@ -38826,6 +39174,15 @@ var PptxHandlerRuntime11 = class extends PptxHandlerRuntime10 {
     if (align === "justify") {
       return "just";
     }
+    if (align === "justLow") {
+      return "justLow";
+    }
+    if (align === "dist") {
+      return "dist";
+    }
+    if (align === "thaiDist") {
+      return "thaiDist";
+    }
     return void 0;
   }
   pixelsToPoints(px) {
@@ -39880,6 +40237,16 @@ var PptxHandlerRuntime15 = class _PptxHandlerRuntime extends PptxHandlerRuntime1
     const chOffY = 0;
     const chExtCx = extCx;
     const chExtCy = extCy;
+    const xfrmAttrs = {};
+    if (typeof group.rotation === "number" && group.rotation !== 0) {
+      xfrmAttrs["@_rot"] = String(Math.round(group.rotation * 6e4));
+    }
+    if (group.flipHorizontal) {
+      xfrmAttrs["@_flipH"] = "1";
+    }
+    if (group.flipVertical) {
+      xfrmAttrs["@_flipV"] = "1";
+    }
     const grpXml = {
       "p:nvGrpSpPr": {
         "p:cNvPr": { "@_id": "0", "@_name": group.id },
@@ -39888,6 +40255,7 @@ var PptxHandlerRuntime15 = class _PptxHandlerRuntime extends PptxHandlerRuntime1
       },
       "p:grpSpPr": {
         "a:xfrm": {
+          ...xfrmAttrs,
           "a:off": {
             "@_x": String(offX),
             "@_y": String(offY)
@@ -45635,45 +46003,18 @@ var PptxHandlerRuntime29 = class extends PptxHandlerRuntime28 {
       const s3d = shapeStyle.scene3d;
       const hasData = s3d.cameraPreset || s3d.lightRigType;
       if (hasData) {
-        const cameraObj = {};
-        if (s3d.cameraPreset) {
-          cameraObj["@_prst"] = s3d.cameraPreset;
-        }
-        if (s3d.cameraRotX !== void 0 || s3d.cameraRotY !== void 0 || s3d.cameraRotZ !== void 0) {
-          const rot = {};
-          if (s3d.cameraRotX !== void 0) {
-            rot["@_lat"] = String(s3d.cameraRotX);
-          }
-          if (s3d.cameraRotY !== void 0) {
-            rot["@_lon"] = String(s3d.cameraRotY);
-          }
-          if (s3d.cameraRotZ !== void 0) {
-            rot["@_rev"] = String(s3d.cameraRotZ);
-          }
-          cameraObj["a:rot"] = rot;
-        }
-        const lightRigObj = {};
-        if (s3d.lightRigType) {
-          lightRigObj["@_rig"] = s3d.lightRigType;
-        }
-        if (s3d.lightRigDirection) {
-          lightRigObj["@_dir"] = s3d.lightRigDirection;
-        }
-        const scene3dXml = {};
-        scene3dXml["a:camera"] = cameraObj;
-        if (Object.keys(lightRigObj).length > 0) {
-          scene3dXml["a:lightRig"] = lightRigObj;
-        }
-        if (s3d.hasBackdrop) {
-          const backdropObj = {};
-          if (s3d.backdropAnchorX !== void 0 || s3d.backdropAnchorY !== void 0 || s3d.backdropAnchorZ !== void 0) {
-            backdropObj["a:anchor"] = {
-              "@_x": String(s3d.backdropAnchorX ?? 0),
-              "@_y": String(s3d.backdropAnchorY ?? 0),
-              "@_z": String(s3d.backdropAnchorZ ?? 0)
-            };
-          }
-          scene3dXml["a:backdrop"] = backdropObj;
+        const source = spPr["a:scene3d"] ?? {};
+        const scene3dXml = { ...source };
+        scene3dXml["a:camera"] = buildScene3dCamera(s3d, source);
+        const lightRig = buildScene3dLightRig(s3d, source);
+        if (lightRig) {
+          scene3dXml["a:lightRig"] = lightRig;
+        }
+        const backdrop = buildScene3dBackdrop(s3d);
+        if (backdrop) {
+          scene3dXml["a:backdrop"] = backdrop;
+        } else {
+          delete scene3dXml["a:backdrop"];
         }
         spPr["a:scene3d"] = scene3dXml;
       } else {
@@ -45718,12 +46059,12 @@ var PptxHandlerRuntime29 = class extends PptxHandlerRuntime28 {
         }
         if (sh3d.extrusionColor) {
           sp3dXml["a:extrusionClr"] = {
-            "a:srgbClr": { "@_val": sh3d.extrusionColor }
+            "a:srgbClr": { "@_val": sh3d.extrusionColor.replace("#", "") }
           };
         }
         if (sh3d.contourColor) {
           sp3dXml["a:contourClr"] = {
-            "a:srgbClr": { "@_val": sh3d.contourColor }
+            "a:srgbClr": { "@_val": sh3d.contourColor.replace("#", "") }
           };
         }
         spPr["a:sp3d"] = sp3dXml;
@@ -45735,6 +46076,77 @@ var PptxHandlerRuntime29 = class extends PptxHandlerRuntime28 {
     }
   }
 };
+function buildSphereRot(lat, lon, rev) {
+  if (lat === void 0 && lon === void 0 && rev === void 0) {
+    return void 0;
+  }
+  const rot = {};
+  if (lat !== void 0) {
+    rot["@_lat"] = String(lat);
+  }
+  if (lon !== void 0) {
+    rot["@_lon"] = String(lon);
+  }
+  if (rev !== void 0) {
+    rot["@_rev"] = String(rev);
+  }
+  return rot;
+}
+function buildScene3dCamera(s3d, source) {
+  const camera = { ...source["a:camera"] ?? {} };
+  if (s3d.cameraPreset) {
+    camera["@_prst"] = s3d.cameraPreset;
+  }
+  if (s3d.cameraFieldOfView !== void 0) {
+    camera["@_fov"] = String(s3d.cameraFieldOfView);
+  }
+  if (s3d.cameraZoom !== void 0) {
+    camera["@_zoom"] = String(s3d.cameraZoom);
+  }
+  const rot = buildSphereRot(s3d.cameraRotX, s3d.cameraRotY, s3d.cameraRotZ);
+  if (rot) {
+    camera["a:rot"] = rot;
+  }
+  return camera;
+}
+function buildScene3dLightRig(s3d, source) {
+  const lightRig = { ...source["a:lightRig"] ?? {} };
+  if (s3d.lightRigType) {
+    lightRig["@_rig"] = s3d.lightRigType;
+  }
+  if (s3d.lightRigDirection) {
+    lightRig["@_dir"] = s3d.lightRigDirection;
+  }
+  const rot = buildSphereRot(s3d.lightRigRotX, s3d.lightRigRotY, s3d.lightRigRotZ);
+  if (rot) {
+    lightRig["a:rot"] = rot;
+  }
+  return Object.keys(lightRig).length > 0 ? lightRig : void 0;
+}
+function buildScene3dBackdrop(s3d) {
+  const hasNorm = s3d.backdropNormalX !== void 0 || s3d.backdropNormalY !== void 0 || s3d.backdropNormalZ !== void 0;
+  const hasUp = s3d.backdropUpX !== void 0 || s3d.backdropUpY !== void 0 || s3d.backdropUpZ !== void 0;
+  if (!s3d.hasBackdrop || !hasNorm || !hasUp) {
+    return void 0;
+  }
+  return {
+    "a:anchor": {
+      "@_x": String(s3d.backdropAnchorX ?? 0),
+      "@_y": String(s3d.backdropAnchorY ?? 0),
+      "@_z": String(s3d.backdropAnchorZ ?? 0)
+    },
+    "a:norm": {
+      "@_dx": String(s3d.backdropNormalX ?? 0),
+      "@_dy": String(s3d.backdropNormalY ?? 0),
+      "@_dz": String(s3d.backdropNormalZ ?? 0)
+    },
+    "a:up": {
+      "@_dx": String(s3d.backdropUpX ?? 0),
+      "@_dy": String(s3d.backdropUpY ?? 0),
+      "@_dz": String(s3d.backdropUpZ ?? 0)
+    }
+  };
+}
 
 // src/core/core/runtime/PptxHandlerRuntimeSaveTextWriter.ts
 var PptxHandlerRuntime30 = class _PptxHandlerRuntime extends PptxHandlerRuntime29 {
@@ -50742,7 +51154,7 @@ var PptxHandlerRuntime59 = class extends PptxHandlerRuntime58 {
   pointsToPixels(points3) {
     return points3 * (96 / 72);
   }
-  parseParagraphSpacingPx(spacingNode) {
+  parseParagraphSpacingPx(spacingNode, basisFontSizePx) {
     if (!spacingNode) {
       return void 0;
     }
@@ -50753,6 +51165,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) {
@@ -50832,7 +51251,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;
     }
@@ -50868,11 +51287,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;
@@ -51362,16 +51778,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;
       }
@@ -51545,7 +51966,8 @@ var PptxHandlerRuntime63 = class extends PptxHandlerRuntime62 {
       ctx.txBody,
       ctx.inheritedTxBody,
       isBodyPlaceholder,
-      ctx.slidePath
+      ctx.slidePath,
+      ctx.effectiveLevelStyles
     );
     if (paragraphBulletInfo && !paragraphBulletInfo.none) {
       let bulletText;
@@ -52154,7 +52576,7 @@ var PptxHandlerRuntime65 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
       const skewY = xfrm["@_skewY"] ? parseEmuInt(xfrm["@_skewY"]) / 6e4 : void 0;
       const { flipHorizontal, flipVertical } = this.readFlipState(xfrm);
       const nvPr = pic?.["p:nvPicPr"]?.["p:nvPr"];
-      const mediaReference = parseDrawingMediaReference(nvPr);
+      const mediaReference = parseDrawingMediaReference(nvPr, this.externalRelsMap.get(slidePath));
       if (mediaReference) {
         this.compatibilityService.inspectMediaReferenceCompatibility(
           mediaReference.kind,
@@ -52922,6 +53344,9 @@ var PptxHandlerRuntime67 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
     const grpSpPr = group["p:grpSpPr"];
     const xfrm = grpSpPr?.["a:xfrm"];
     let parentX = 0, parentY = 0, parentW = 0, parentH = 0;
+    let groupRotation;
+    let flipHorizontal = false;
+    let flipVertical = false;
     if (xfrm) {
       const off = xfrm["a:off"];
       if (off) {
@@ -52933,6 +53358,12 @@ var PptxHandlerRuntime67 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
         parentW = Math.round(parseEmuInt2(ext["@_cx"]) / _PptxHandlerRuntime.EMU_PER_PX);
         parentH = Math.round(parseEmuInt2(ext["@_cy"]) / _PptxHandlerRuntime.EMU_PER_PX);
       }
+      if (xfrm["@_rot"] !== void 0 && xfrm["@_rot"] !== null) {
+        const rot = parseInt(String(xfrm["@_rot"]), 10) / 6e4;
+        groupRotation = Number.isFinite(rot) && rot !== 0 ? rot : void 0;
+      }
+      flipHorizontal = this.parseBooleanAttr(xfrm["@_flipH"]);
+      flipVertical = this.parseBooleanAttr(xfrm["@_flipV"]);
     }
     const grpFillStyle = grpSpPr ? this.extractShapeStyle(grpSpPr) : void 0;
     const hasGroupFill = grpFillStyle && grpFillStyle.fillMode && grpFillStyle.fillMode !== "none";
@@ -52978,6 +53409,9 @@ var PptxHandlerRuntime67 = class _PptxHandlerRuntime extends PptxHandlerRuntime6
       y: parentY,
       width: parentW || Math.max(...children9.map((c) => c.x + c.width)),
       height: parentH || Math.max(...children9.map((c) => c.y + c.height)),
+      rotation: groupRotation,
+      flipHorizontal: flipHorizontal || void 0,
+      flipVertical: flipVertical || void 0,
       children: children9,
       rawXml: group,
       actionClick: grpActionClick,
@@ -53148,6 +53582,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) {
@@ -53157,17 +53592,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();
@@ -53950,11 +54386,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;
     }
@@ -53979,9 +54428,9 @@ var PptxHandlerRuntime72 = class _PptxHandlerRuntime extends PptxHandlerRuntime7
     }
     const buClr = levelProps["a:buClr"];
     if (buClr) {
-      const srgb = buClr["a:srgbClr"];
-      if (srgb?.["@_val"]) {
-        style.bulletColor = String(srgb["@_val"]);
+      const bulletColor = this.parseColor(buClr);
+      if (bulletColor) {
+        style.bulletColor = bulletColor;
       }
     }
     const buSzPts = levelProps["a:buSzPts"];
@@ -56483,6 +56932,89 @@ var PptxHandlerRuntime83 = class extends PptxHandlerRuntime82 {
   }
 };
 
+// src/core/core/runtime/smartart-drawing-shape-style.ts
+function extractDrawingShapeFill(spPr, deps) {
+  const result = {};
+  const solidFill2 = deps.getChild(spPr, "solidFill");
+  if (solidFill2) {
+    result.fillColor = deps.parseColor(solidFill2) ?? void 0;
+  }
+  const gradFill = !solidFill2 ? deps.getChild(spPr, "gradFill") : void 0;
+  if (gradFill) {
+    const stops = deps.extractGradientStops(gradFill).map((stop) => ({
+      color: stop.color,
+      position: stop.position,
+      ...stop.opacity !== void 0 ? { opacity: stop.opacity } : {}
+    }));
+    if (stops.length > 0) {
+      result.fillGradientStops = stops;
+      result.fillGradientType = deps.extractGradientType(gradFill);
+      result.fillGradientAngle = deps.extractGradientAngle(gradFill);
+      result.fillColor ??= stops[Math.floor(stops.length / 2)]?.color;
+    }
+  }
+  const pattFill = !solidFill2 && !gradFill ? deps.getChild(spPr, "pattFill") : void 0;
+  if (pattFill) {
+    const preset = String(pattFill["@_prst"] || "").trim();
+    if (preset) {
+      result.fillPatternPreset = preset;
+    }
+    const fg = deps.parseColor(deps.getChild(pattFill, "fgClr"));
+    const bg = deps.parseColor(deps.getChild(pattFill, "bgClr"));
+    if (fg) {
+      result.fillPatternForegroundColor = fg;
+    }
+    if (bg) {
+      result.fillPatternBackgroundColor = bg;
+    }
+    result.fillColor ??= fg ?? bg;
+  }
+  const blipFill = !solidFill2 && !gradFill && !pattFill ? deps.getChild(spPr, "blipFill") : void 0;
+  if (blipFill) {
+    const blip = deps.getChild(blipFill, "blip");
+    const embed = String(
+      blip?.["@_r:embed"] || blip?.["@_embed"] || blip?.["@_r:link"] || ""
+    ).trim();
+    if (embed) {
+      result.fillBlipEmbedId = embed;
+    }
+  }
+  const shadowColor = deps.extractShadowColor(spPr);
+  if (shadowColor) {
+    result.hasShadow = true;
+    result.shadowColor = shadowColor;
+  }
+  return result;
+}
+function extractDrawingShapeTextStyle(txBody, deps) {
+  let fontSize;
+  let fontColor;
+  if (!txBody) {
+    return { fontSize, fontColor };
+  }
+  const paragraphs = deps.getChildren(txBody, "p");
+  for (const p of paragraphs) {
+    const runs = deps.getChildren(p, "r");
+    for (const r of runs) {
+      const rPr = deps.getChild(r, "rPr");
+      if (rPr && !fontSize) {
+        const szRaw = parseInt(String(rPr["@_sz"] || ""), 10);
+        if (Number.isFinite(szRaw) && szRaw > 0) {
+          fontSize = szRaw / 100;
+        }
+        fontColor = deps.parseColor(deps.getChild(rPr, "solidFill")) ?? void 0;
+      }
+      if (fontSize) {
+        break;
+      }
+    }
+    if (fontSize) {
+      break;
+    }
+  }
+  return { fontSize, fontColor };
+}
+
 // src/core/core/runtime/smartart-text-style-resolution.ts
 function resolveSmartArtTextStyles(paragraphs, resolve2) {
   for (const paragraph of paragraphs ?? []) {
@@ -56658,8 +57190,7 @@ var PptxHandlerRuntime84 = class _PptxHandlerRuntime extends PptxHandlerRuntime8
         };
       }
     }
-    const solidFill2 = this.xmlLookupService.getChildByLocalName(spPr, "solidFill");
-    const fillColor = this.parseColor(solidFill2);
+    const fill = extractDrawingShapeFill(spPr, this.drawingShapeStyleDeps());
     const lnNode = this.xmlLookupService.getChildByLocalName(spPr, "ln");
     const lnFill = lnNode ? this.xmlLookupService.getChildByLocalName(lnNode, "solidFill") : void 0;
     const strokeColor = this.parseColor(lnFill);
@@ -56671,7 +57202,10 @@ var PptxHandlerRuntime84 = class _PptxHandlerRuntime extends PptxHandlerRuntime8
       this.collectLocalTextValues(txBody, "t", textValues2);
     }
     const text2 = textValues2.join("").trim() || void 0;
-    const { fontSize, fontColor } = this.extractDrawingShapeTextStyle(txBody);
+    const { fontSize, fontColor } = extractDrawingShapeTextStyle(
+      txBody,
+      this.drawingShapeStyleDeps()
+    );
     const paragraphs = txBody ? resolveSmartArtTextStyles(
       parseSmartArtTextParagraphs({ "dgm:t": txBody }),
       (rPr) => this.extractTextRunStyle(rPr, void 0, void 0, false)
@@ -56697,7 +57231,8 @@ var PptxHandlerRuntime84 = class _PptxHandlerRuntime extends PptxHandlerRuntime8
       rotation,
       skewX,
       skewY,
-      fillColor: fillColor ?? void 0,
+      ...fill,
+      fillColor: fill.fillColor ?? void 0,
       strokeColor: strokeColor ?? void 0,
       strokeWidth,
       text: structuredText,
@@ -56707,34 +57242,21 @@ var PptxHandlerRuntime84 = class _PptxHandlerRuntime extends PptxHandlerRuntime8
       ...customGeometry
     };
   }
-  extractDrawingShapeTextStyle(txBody) {
-    let fontSize;
-    let fontColor;
-    if (!txBody) {
-      return { fontSize, fontColor };
-    }
-    const paragraphs = this.xmlLookupService.getChildrenArrayByLocalName(txBody, "p");
-    for (const p of paragraphs) {
-      const runs = this.xmlLookupService.getChildrenArrayByLocalName(p, "r");
-      for (const r of runs) {
-        const rPr = this.xmlLookupService.getChildByLocalName(r, "rPr");
-        if (rPr && !fontSize) {
-          const szRaw = parseInt(String(rPr["@_sz"] || ""), 10);
-          if (Number.isFinite(szRaw) && szRaw > 0) {
-            fontSize = szRaw / 100;
-          }
-          const rprFill = this.xmlLookupService.getChildByLocalName(rPr, "solidFill");
-          fontColor = this.parseColor(rprFill) ?? void 0;
-        }
-        if (fontSize) {
-          break;
-        }
-      }
-      if (fontSize) {
-        break;
-      }
-    }
-    return { fontSize, fontColor };
+  /**
+   * Build the injected accessor bundle used by the pure drawing-shape style
+   * helpers, binding the shared XML-lookup / colour / gradient / shadow codec
+   * methods so no new colour logic is duplicated here.
+   */
+  drawingShapeStyleDeps() {
+    return {
+      getChild: (node, local) => this.xmlLookupService.getChildByLocalName(node, local),
+      getChildren: (node, local) => this.xmlLookupService.getChildrenArrayByLocalName(node, local),
+      parseColor: (node) => this.parseColor(node),
+      extractGradientStops: (gradFill) => this.extractGradientStops(gradFill),
+      extractGradientType: (gradFill) => this.extractGradientType(gradFill),
+      extractGradientAngle: (gradFill) => this.extractGradientAngle(gradFill),
+      extractShadowColor: (spPr) => this.extractShadowStyle(spPr).shadowColor
+    };
   }
 };
 
@@ -59208,6 +59730,7 @@ var PptxHandlerRuntime95 = class _PptxHandlerRuntime extends PptxHandlerRuntime9
     });
     this.mediaDataParser = new PptxMediaDataParser({
       slideRelsMap: this.slideRelsMap,
+      externalRelsMap: this.externalRelsMap,
       resolvePath: (base, relative) => this.resolvePath(base, relative),
       getPathExtension: (pathValue) => this.getPathExtension(pathValue)
     });