pptx-glimpse 3.1.0 → 3.2.0

package/dist/cli.cjs

@@ -6110,104 +6110,21 @@ init_warning_logger();
 
 // ../document/dist/index.js
 var import_fast_xml_parser = require("fast-xml-parser");
-var import_fflate = require("fflate");
 var import_fast_xml_parser2 = require("fast-xml-parser");
+var import_fflate = require("fflate");
 var import_fflate2 = require("fflate");
+var import_fast_xml_parser3 = require("fast-xml-parser");
 function unsafeOoxmlBoundaryAssertion(value) {
   return value;
 }
 function unsafeBrandAssertion2(value) {
   return value;
 }
-function asPartPath(value) {
-  return unsafeBrandAssertion2(value);
-}
-function asRelationshipId(value) {
-  return unsafeBrandAssertion2(value);
-}
-function asSourceNodeId(value) {
-  return unsafeBrandAssertion2(value);
-}
-function asRawSidecarId(value) {
-  return unsafeBrandAssertion2(value);
-}
-var RELS_SUFFIX = ".rels";
-var RELS_MARKER = "_rels/";
-var ABSOLUTE_URI_PATTERN = /^[a-zA-Z][a-zA-Z0-9+.-]*:/;
-function isRelationshipPart(path) {
-  return path.endsWith(RELS_SUFFIX) && path.includes(RELS_MARKER);
-}
-function relationshipsSourcePartPath(relsPath) {
-  const idx = relsPath.lastIndexOf(RELS_MARKER);
-  const dir = relsPath.slice(0, idx);
-  const file = relsPath.slice(idx + RELS_MARKER.length);
-  const base = file.endsWith(RELS_SUFFIX) ? file.slice(0, -RELS_SUFFIX.length) : file;
-  return asPartPath(dir + base);
-}
-function resolveRelationshipTarget(sourcePartPath, target) {
-  if (ABSOLUTE_URI_PATTERN.test(target)) return target;
-  const combined = target.startsWith("/") ? target.slice(1) : joinPackageRelativeTarget(sourcePartPath, target);
-  return normalizePackagePath(combined);
-}
-function resolveInternalRelationshipTarget(sourcePartPath, relationship) {
-  if (relationship.targetMode === "External") return void 0;
-  return asPartPath(resolveRelationshipTarget(sourcePartPath, relationship.target));
-}
-function parseRelationshipTargetMode(value) {
-  if (value === "Internal" || value === "External") return value;
-  return void 0;
-}
-function joinPackageRelativeTarget(sourcePartPath, target) {
-  const slash = sourcePartPath.lastIndexOf("/");
-  const baseDir = slash === -1 ? "" : sourcePartPath.slice(0, slash);
-  return baseDir === "" ? target : `${baseDir}/${target}`;
-}
-function normalizePackagePath(path) {
-  const segments = [];
-  for (const segment of path.split("/")) {
-    if (segment === "" || segment === ".") continue;
-    if (segment === "..") {
-      segments.pop();
-      continue;
-    }
-    segments.push(segment);
-  }
-  return segments.join("/");
-}
-var EDITABLE_TEXT_RUN_PROPERTIES = [
-  "bold",
-  "italic",
-  "underline",
-  "fontSize",
-  "color",
-  "typeface"
-];
-var EDITABLE_TEXT_RUN_PROPERTY_SET = new Set(EDITABLE_TEXT_RUN_PROPERTIES);
-function asEmu2(value) {
-  return unsafeBrandAssertion2(value);
-}
-function asPt(value) {
-  return unsafeBrandAssertion2(value);
-}
-function asHundredthPt2(value) {
-  return unsafeBrandAssertion2(value);
-}
-function asOoxmlPercent(value) {
-  return unsafeBrandAssertion2(value);
-}
-function asOoxmlAngle(value) {
-  return unsafeBrandAssertion2(value);
-}
-function parseEnumValue(value, allowed) {
-  return value !== void 0 && allowed.has(unsafeOoxmlBoundaryAssertion(value)) ? unsafeOoxmlBoundaryAssertion(value) : void 0;
-}
-function parseEnumValueWithDefault(value, allowed, fallback) {
-  return parseEnumValue(value, allowed) ?? fallback;
-}
 var parser = new import_fast_xml_parser.XMLParser({
   ignoreAttributes: false,
   attributeNamePrefix: "@_",
   parseAttributeValue: false,
+  parseTagValue: false,
   // Retain prefix. See the comment at the beginning of the file for the reason.
   removeNSPrefix: false,
   // Do not trim text run (`a:t`) to preserve significant white space at the beginning and end.
@@ -6320,6 +6237,62 @@ function scalarToString(value) {
   if (typeof value === "number" || typeof value === "boolean") return String(value);
   return void 0;
 }
+function asPartPath(value) {
+  return unsafeBrandAssertion2(value);
+}
+function asRelationshipId(value) {
+  return unsafeBrandAssertion2(value);
+}
+function asSourceNodeId(value) {
+  return unsafeBrandAssertion2(value);
+}
+function asRawSidecarId(value) {
+  return unsafeBrandAssertion2(value);
+}
+var RELS_SUFFIX = ".rels";
+var RELS_MARKER = "_rels/";
+var ABSOLUTE_URI_PATTERN = /^[a-zA-Z][a-zA-Z0-9+.-]*:/;
+function isRelationshipPart(path) {
+  return path.endsWith(RELS_SUFFIX) && path.includes(RELS_MARKER);
+}
+function relationshipsSourcePartPath(relsPath) {
+  const idx = relsPath.lastIndexOf(RELS_MARKER);
+  const dir = relsPath.slice(0, idx);
+  const file = relsPath.slice(idx + RELS_MARKER.length);
+  const base = file.endsWith(RELS_SUFFIX) ? file.slice(0, -RELS_SUFFIX.length) : file;
+  return asPartPath(dir + base);
+}
+function resolveRelationshipTarget(sourcePartPath, target) {
+  if (ABSOLUTE_URI_PATTERN.test(target)) return target;
+  const combined = target.startsWith("/") ? target.slice(1) : joinPackageRelativeTarget(sourcePartPath, target);
+  return normalizePackagePath(combined);
+}
+function resolveInternalRelationshipTarget(sourcePartPath, relationship) {
+  if (relationship.targetMode === "External") return void 0;
+  return asPartPath(resolveRelationshipTarget(sourcePartPath, relationship.target));
+}
+function parseRelationshipTargetMode(value) {
+  if (value === "Internal" || value === "External") return value;
+  return void 0;
+}
+function joinPackageRelativeTarget(sourcePartPath, target) {
+  const slash = sourcePartPath.lastIndexOf("/");
+  const baseDir = slash === -1 ? "" : sourcePartPath.slice(0, slash);
+  return baseDir === "" ? target : `${baseDir}/${target}`;
+}
+function normalizePackagePath(path) {
+  const segments = [];
+  for (const segment of path.split("/")) {
+    if (segment === "" || segment === ".") continue;
+    if (segment === "..") {
+      segments.pop();
+      continue;
+    }
+    segments.push(segment);
+  }
+  return segments.join("/");
+}
+var textDecoder = new TextDecoder();
 var ATTR_PREFIX = "@_";
 var TEXT_KEY = "#text";
 function createSidecarIdFactory(partPath) {
@@ -6389,211 +6362,449 @@ function scalarText(value) {
   if (typeof value === "number" || typeof value === "boolean") return String(value);
   return void 0;
 }
-var RECTANGLE_ALIGNMENT_TOKENS = /* @__PURE__ */ new Set([
-  "tl",
-  "t",
-  "tr",
-  "l",
-  "ctr",
-  "r",
-  "bl",
-  "b",
-  "br"
-]);
-var COLOR_TRANSFORM_KINDS = /* @__PURE__ */ new Set([
-  "lumMod",
-  "lumOff",
-  "tint",
-  "shade",
-  "alpha"
-]);
-var RAW_FILL_LOCAL_NAMES = ["grpFill"];
-var PRESET_COLOR_HEX = {
-  black: "000000",
-  white: "FFFFFF",
-  red: "FF0000",
-  green: "008000",
-  blue: "0000FF",
-  yellow: "FFFF00",
-  cyan: "00FFFF",
-  magenta: "FF00FF"
-};
-function parseColorElement(parent) {
-  if (!parent) return void 0;
-  const srgb = getChild(parent, "srgbClr");
-  if (srgb) {
-    const hex = getAttr(srgb, "val");
-    if (hex !== void 0) {
-      return withTransforms({ kind: "srgb", hex: hex.toUpperCase() }, srgb);
-    }
-  }
-  const scheme = getChild(parent, "schemeClr");
-  if (scheme) {
-    const name = getAttr(scheme, "val");
-    if (name !== void 0) {
-      return withTransforms({ kind: "scheme", scheme: name }, scheme);
-    }
-  }
-  const sys = getChild(parent, "sysClr");
-  if (sys) {
-    const val = getAttr(sys, "val");
-    if (val !== void 0) {
-      const lastClr = getAttr(sys, "lastClr");
-      return withTransforms(
-        {
-          kind: "system",
-          value: val,
-          ...lastClr !== void 0 ? { lastColor: lastClr.toUpperCase() } : {}
-        },
-        sys
-      );
-    }
+function parseCustomGeometry(custGeom, orderedCustGeom) {
+  const pathLst = getChild(custGeom, "pathLst");
+  const paths = getChildArray(pathLst, "path");
+  if (paths.length === 0) return void 0;
+  const avGuides = parseGuideList(getChild(custGeom, "avLst"));
+  const guides = parseGuideList(getChild(custGeom, "gdLst"));
+  const orderedPaths = orderedChildEntries(
+    orderedChildChildren(orderedCustGeom, "pathLst"),
+    "path"
+  );
+  const result = [];
+  for (const [index, path] of paths.entries()) {
+    const width = numericAttr(path, "w") ?? 0;
+    const height = numericAttr(path, "h") ?? 0;
+    if (width === 0 && height === 0) continue;
+    const variables = evaluateGuides(avGuides, guides, width, height);
+    const commands = buildPathCommands(path, variables, orderedNodeChildren(orderedPaths[index]));
+    if (commands !== void 0) result.push({ width, height, commands });
   }
-  return void 0;
-}
-function parseEffectList(effectList) {
-  if (effectList === void 0) return void 0;
-  const outerShadow = parseOuterShadow(getChild(effectList, "outerShdw"));
-  const innerShadow = parseInnerShadow(getChild(effectList, "innerShdw"));
-  const glow = parseGlow(getChild(effectList, "glow"));
-  const softEdge = parseSoftEdge(getChild(effectList, "softEdge"));
-  const parsed = {
-    ...outerShadow !== void 0 ? { outerShadow } : {},
-    ...innerShadow !== void 0 ? { innerShadow } : {},
-    ...glow !== void 0 ? { glow } : {},
-    ...softEdge !== void 0 ? { softEdge } : {}
-  };
-  return Object.keys(parsed).length > 0 ? parsed : void 0;
+  return result.length > 0 ? result : void 0;
 }
-function parseBlipEffects(blip) {
-  if (blip === void 0) return void 0;
-  const grayscale = getChild(blip, "grayscl") !== void 0;
-  const biLevel = parseBiLevel(getChild(blip, "biLevel"));
-  const blur = parseBlurEffect(getChild(blip, "blur"));
-  const lum = parseLumEffect(getChild(blip, "lum"));
-  const duotone = parseDuotoneEffect(getChild(blip, "duotone"));
-  const clrChange = parseColorChangeEffect(getChild(blip, "clrChange"));
-  const parsed = {
-    grayscale,
-    ...biLevel !== void 0 ? { biLevel } : {},
-    ...blur !== void 0 ? { blur } : {},
-    ...lum !== void 0 ? { lum } : {},
-    ...duotone !== void 0 ? { duotone } : {},
-    ...clrChange !== void 0 ? { clrChange } : {}
-  };
-  return grayscale || biLevel !== void 0 || blur !== void 0 || lum !== void 0 || duotone !== void 0 || clrChange !== void 0 ? parsed : void 0;
+function parseGuideList(parent) {
+  return getChildArray(parent, "gd").map((guide) => ({
+    name: getAttr(guide, "name") ?? "",
+    formula: getAttr(guide, "fmla") ?? ""
+  })).filter((guide) => guide.name !== "" && guide.formula !== "");
 }
-function parseOuterShadow(node) {
-  if (node === void 0) return void 0;
-  const color = parseColorElement(node);
-  if (color === void 0) return void 0;
-  return {
-    blurRadius: asEmu2(numericAttr(node, "blurRad") ?? 0),
-    distance: asEmu2(numericAttr(node, "dist") ?? 0),
-    direction: asOoxmlAngle(numericAttr(node, "dir") ?? 0),
-    color,
-    alignment: parseRectangleAlignment(getAttr(node, "algn"), "b"),
-    rotateWithShape: getAttr(node, "rotWithShape") !== "0"
-  };
+function buildPathCommands(path, variables, orderedCommands) {
+  const parts = [];
+  let currentX = 0;
+  let currentY = 0;
+  let startX = 0;
+  let startY = 0;
+  for (const { local, nodes } of pathCommandNodes(path, orderedCommands)) {
+    for (const node of nodes) {
+      if (local === "moveTo") {
+        const point = firstPoint(node, variables);
+        if (point !== void 0) {
+          parts.push(`M ${point.x} ${point.y}`);
+          currentX = point.x;
+          currentY = point.y;
+          startX = point.x;
+          startY = point.y;
+        }
+      } else if (local === "lnTo") {
+        const point = firstPoint(node, variables);
+        if (point !== void 0) {
+          parts.push(`L ${point.x} ${point.y}`);
+          currentX = point.x;
+          currentY = point.y;
+        }
+      } else if (local === "cubicBezTo") {
+        const points = allPoints(node, variables);
+        if (points.length >= 3) {
+          parts.push(`C ${points.map((point) => `${point.x} ${point.y}`).join(", ")}`);
+          currentX = points[points.length - 1].x;
+          currentY = points[points.length - 1].y;
+        }
+      } else if (local === "quadBezTo") {
+        const points = allPoints(node, variables);
+        if (points.length >= 2) {
+          parts.push(`Q ${points.map((point) => `${point.x} ${point.y}`).join(", ")}`);
+          currentX = points[points.length - 1].x;
+          currentY = points[points.length - 1].y;
+        }
+      } else if (local === "arcTo") {
+        const arc = convertArcTo(node, currentX, currentY, variables);
+        if (arc !== void 0) {
+          parts.push(arc.command);
+          currentX = arc.endX;
+          currentY = arc.endY;
+        }
+      } else if (local === "close") {
+        parts.push("Z");
+        currentX = startX;
+        currentY = startY;
+      }
+    }
+  }
+  return parts.length > 0 ? parts.join(" ") : void 0;
 }
-function parseInnerShadow(node) {
-  if (node === void 0) return void 0;
-  const color = parseColorElement(node);
-  if (color === void 0) return void 0;
-  return {
-    blurRadius: asEmu2(numericAttr(node, "blurRad") ?? 0),
-    distance: asEmu2(numericAttr(node, "dist") ?? 0),
-    direction: asOoxmlAngle(numericAttr(node, "dir") ?? 0),
-    color
-  };
+function pathCommandNodes(path, orderedCommands) {
+  if (orderedCommands === void 0) {
+    return Object.keys(path).filter((key) => !key.startsWith("@_")).map((key) => ({ local: localName(key), nodes: getChildArray(path, localName(key)) }));
+  }
+  const counters = {};
+  const result = [];
+  for (const command of orderedCommands) {
+    const key = orderedNodeKey(command);
+    if (key === void 0) continue;
+    const local = localName(key);
+    const index = counters[local] ?? 0;
+    counters[local] = index + 1;
+    const node = getChildArray(path, local)[index];
+    if (node !== void 0) result.push({ local, nodes: [node] });
+  }
+  return result;
 }
-function parseGlow(node) {
-  if (node === void 0) return void 0;
-  const color = parseColorElement(node);
-  if (color === void 0) return void 0;
-  return {
-    radius: asEmu2(numericAttr(node, "rad") ?? 0),
-    color
-  };
+function firstPoint(node, variables) {
+  return allPoints(node, variables)[0];
 }
-function parseSoftEdge(node) {
-  if (node === void 0) return void 0;
-  return {
-    radius: asEmu2(numericAttr(node, "rad") ?? 0)
-  };
+function allPoints(node, variables) {
+  return getChildArray(node, "pt").map((point) => ({
+    x: resolveValue(getAttr(point, "x") ?? "0", variables),
+    y: resolveValue(getAttr(point, "y") ?? "0", variables)
+  }));
 }
-function parseBiLevel(node) {
-  if (node === void 0) return void 0;
+function convertArcTo(arc, currentX, currentY, variables) {
+  const widthRadius = resolveValue(getAttr(arc, "wR") ?? "0", variables);
+  const heightRadius = resolveValue(getAttr(arc, "hR") ?? "0", variables);
+  const startAngle = resolveValue(getAttr(arc, "stAng") ?? "0", variables);
+  const sweepAngle = resolveValue(getAttr(arc, "swAng") ?? "0", variables);
+  if (widthRadius === 0 && heightRadius === 0 || sweepAngle === 0) return void 0;
+  const startRadians = startAngle / 6e4 * (Math.PI / 180);
+  const endRadians = (startAngle + sweepAngle) / 6e4 * (Math.PI / 180);
+  const centerX = currentX - widthRadius * Math.cos(startRadians);
+  const centerY = currentY - heightRadius * Math.sin(startRadians);
+  const endX = centerX + widthRadius * Math.cos(endRadians);
+  const endY = centerY + heightRadius * Math.sin(endRadians);
+  const largeArcFlag = Math.abs(sweepAngle / 6e4) > 180 ? 1 : 0;
+  const sweepFlag = sweepAngle > 0 ? 1 : 0;
   return {
-    threshold: (numericAttr(node, "thresh") ?? 5e4) / 1e5
+    command: `A ${round4(widthRadius)} ${round4(heightRadius)} 0 ${largeArcFlag} ${sweepFlag} ${round4(endX)} ${round4(endY)}`,
+    endX,
+    endY
   };
 }
-function parseBlurEffect(node) {
-  if (node === void 0) return void 0;
+function evaluateGuides(avGuides, guides, width, height) {
+  const variables = createBuiltinVariables(width, height);
+  for (const guide of avGuides) variables[guide.name] = evaluateFormula(guide.formula, variables);
+  for (const guide of guides) variables[guide.name] = evaluateFormula(guide.formula, variables);
+  return variables;
+}
+function createBuiltinVariables(width, height) {
   return {
-    radius: asEmu2(numericAttr(node, "rad") ?? 0),
-    grow: getAttr(node, "grow") !== "0"
+    w: width,
+    h: height,
+    l: 0,
+    t: 0,
+    r: width,
+    b: height,
+    wd2: width / 2,
+    hd2: height / 2,
+    wd4: width / 4,
+    hd4: height / 4,
+    ss: Math.min(width, height),
+    ls: Math.max(width, height),
+    cd2: 108e5,
+    cd4: 54e5,
+    cd8: 27e5,
+    "3cd4": 162e5
   };
 }
-function parseLumEffect(node) {
-  if (node === void 0) return void 0;
-  return {
-    brightness: (numericAttr(node, "bright") ?? 0) / 1e5,
-    contrast: (numericAttr(node, "contrast") ?? 0) / 1e5
+function evaluateFormula(formula, variables) {
+  const tokens = formula.trim().split(/\s+/);
+  const op = tokens[0];
+  const resolve2 = (token) => {
+    if (token === void 0) return 0;
+    const value = Number(token);
+    return Number.isNaN(value) ? variables[token] ?? 0 : value;
   };
+  if (op === "val") return resolve2(tokens[1]);
+  if (op === "+-") return resolve2(tokens[1]) + resolve2(tokens[2]) - resolve2(tokens[3]);
+  if (op === "*/")
+    return Math.round(resolve2(tokens[1]) * resolve2(tokens[2]) / (resolve2(tokens[3]) || 1));
+  if (op === "+/")
+    return Math.round((resolve2(tokens[1]) + resolve2(tokens[2])) / (resolve2(tokens[3]) || 1));
+  if (op === "pin")
+    return Math.max(resolve2(tokens[1]), Math.min(resolve2(tokens[2]), resolve2(tokens[3])));
+  if (op === "min") return Math.min(resolve2(tokens[1]), resolve2(tokens[2]));
+  if (op === "max") return Math.max(resolve2(tokens[1]), resolve2(tokens[2]));
+  if (op === "abs") return Math.abs(resolve2(tokens[1]));
+  if (op === "sqrt") return Math.round(Math.sqrt(resolve2(tokens[1])));
+  if (op === "sin") return Math.round(resolve2(tokens[1]) * Math.sin(toRadians(resolve2(tokens[2]))));
+  if (op === "cos") return Math.round(resolve2(tokens[1]) * Math.cos(toRadians(resolve2(tokens[2]))));
+  if (op === "tan") return Math.round(resolve2(tokens[1]) * Math.tan(toRadians(resolve2(tokens[2]))));
+  if (op === "at2")
+    return Math.round(Math.atan2(resolve2(tokens[2]), resolve2(tokens[1])) * (180 / Math.PI) * 6e4);
+  if (op === "mod") {
+    const a = resolve2(tokens[1]);
+    const b = resolve2(tokens[2]);
+    const c = resolve2(tokens[3]);
+    return Math.round(Math.sqrt(a * a + b * b + c * c));
+  }
+  if (op === "cat2") {
+    return Math.round(
+      resolve2(tokens[1]) * Math.cos(Math.atan2(resolve2(tokens[3]), resolve2(tokens[2])))
+    );
+  }
+  if (op === "sat2") {
+    return Math.round(
+      resolve2(tokens[1]) * Math.sin(Math.atan2(resolve2(tokens[3]), resolve2(tokens[2])))
+    );
+  }
+  if (op === "?:") return resolve2(tokens[1]) > 0 ? resolve2(tokens[2]) : resolve2(tokens[3]);
+  return 0;
 }
-function parseDuotoneEffect(node) {
-  if (node === void 0) return void 0;
-  const colors = collectColorChildren(node);
-  if (colors.length < 2) return void 0;
-  return { color1: colors[0], color2: colors[1] };
+function resolveValue(value, variables) {
+  const numeric = Number(value);
+  return Number.isNaN(numeric) ? variables[value] ?? 0 : numeric;
 }
-function parseColorChangeEffect(node) {
-  if (node === void 0) return void 0;
-  const from = firstColorChild(getChild(node, "clrFrom"));
-  const to = firstColorChild(getChild(node, "clrTo"));
-  return from !== void 0 && to !== void 0 ? { from, to } : void 0;
+function numericAttr(node, name) {
+  const raw = getAttr(node, name);
+  if (raw === void 0) return void 0;
+  const value = Number(raw);
+  return Number.isFinite(value) ? value : void 0;
 }
-function collectColorChildren(parent) {
-  const colors = [];
-  for (const [key, value] of Object.entries(parent)) {
-    if (key.startsWith("@_")) continue;
-    const nodes = Array.isArray(value) ? value : [value];
-    for (const node of nodes) {
-      if (!isXmlNode(node)) continue;
-      const color = parseColorChild(key, node);
-      if (color !== void 0) colors.push(color);
-    }
-  }
-  return colors;
+function round4(value) {
+  return Math.round(value * 1e3) / 1e3;
 }
-function firstColorChild(parent) {
-  return parent !== void 0 ? collectColorChildren(parent)[0] : void 0;
+function toRadians(ooxmlAngle) {
+  return ooxmlAngle / 6e4 * (Math.PI / 180);
 }
-function parseColorChild(key, node) {
-  const name = localName(key);
-  return name === "prstClr" ? parsePresetColor(node) : parseColorElement({ [name]: node });
+function orderedChildChildren(parent, childLocalName) {
+  const child = orderedChildEntries(parent, childLocalName)[0];
+  return orderedNodeChildren(child);
 }
-function isXmlNode(value) {
-  return typeof value === "object" && value !== null;
+function orderedChildEntries(parent, childLocalName) {
+  if (parent === void 0) return [];
+  return parent.filter((child) => {
+    const key = orderedNodeKey(child);
+    return key !== void 0 && localName(key) === childLocalName;
+  });
 }
-function parsePresetColor(node) {
-  const value = getAttr(node, "val");
-  const hex = value !== void 0 ? PRESET_COLOR_HEX[value] : void 0;
-  return hex !== void 0 ? withTransforms({ kind: "srgb", hex }, node) : void 0;
+function orderedNodeChildren(node) {
+  const key = node !== void 0 ? orderedNodeKey(node) : void 0;
+  const value = key !== void 0 ? node?.[key] : void 0;
+  return Array.isArray(value) ? value : void 0;
 }
-function parseFill(parent, nextId) {
-  if (!parent) return void 0;
-  const solid = getChild(parent, "solidFill");
-  if (solid) {
-    const color = parseColorElement(solid);
-    if (color) return { kind: "solid", color };
-    return { kind: "raw", raw: makeSidecar("a:solidFill", solid, nextId) };
-  }
-  if (hasChild(parent, "noFill")) return { kind: "none" };
-  const grad = getChild(parent, "gradFill");
-  if (grad) {
-    const fill = parseGradientFill(grad);
+function orderedNodeKey(node) {
+  return Object.keys(node).find((key) => key !== ":@");
+}
+function parseEnumValue(value, allowed) {
+  return value !== void 0 && allowed.has(unsafeOoxmlBoundaryAssertion(value)) ? unsafeOoxmlBoundaryAssertion(value) : void 0;
+}
+function parseEnumValueWithDefault(value, allowed, fallback) {
+  return parseEnumValue(value, allowed) ?? fallback;
+}
+var RECTANGLE_ALIGNMENT_TOKENS = /* @__PURE__ */ new Set([
+  "tl",
+  "t",
+  "tr",
+  "l",
+  "ctr",
+  "r",
+  "bl",
+  "b",
+  "br"
+]);
+var COLOR_TRANSFORM_KINDS = /* @__PURE__ */ new Set([
+  "lumMod",
+  "lumOff",
+  "tint",
+  "shade",
+  "alpha"
+]);
+var RAW_FILL_LOCAL_NAMES = ["grpFill"];
+var PRESET_COLOR_HEX = {
+  black: "000000",
+  white: "FFFFFF",
+  red: "FF0000",
+  green: "008000",
+  blue: "0000FF",
+  yellow: "FFFF00",
+  cyan: "00FFFF",
+  magenta: "FF00FF"
+};
+function parseColorElement(parent) {
+  if (!parent) return void 0;
+  const srgb = getChild(parent, "srgbClr");
+  if (srgb) {
+    const hex = getAttr(srgb, "val");
+    if (hex !== void 0) {
+      return withTransforms({ kind: "srgb", hex: hex.toUpperCase() }, srgb);
+    }
+  }
+  const scheme = getChild(parent, "schemeClr");
+  if (scheme) {
+    const name = getAttr(scheme, "val");
+    if (name !== void 0) {
+      return withTransforms({ kind: "scheme", scheme: name }, scheme);
+    }
+  }
+  const sys = getChild(parent, "sysClr");
+  if (sys) {
+    const val = getAttr(sys, "val");
+    if (val !== void 0) {
+      const lastClr = getAttr(sys, "lastClr");
+      return withTransforms(
+        {
+          kind: "system",
+          value: val,
+          ...lastClr !== void 0 ? { lastColor: lastClr.toUpperCase() } : {}
+        },
+        sys
+      );
+    }
+  }
+  return void 0;
+}
+function parseEffectList(effectList) {
+  if (effectList === void 0) return void 0;
+  const outerShadow = parseOuterShadow(getChild(effectList, "outerShdw"));
+  const innerShadow = parseInnerShadow(getChild(effectList, "innerShdw"));
+  const glow = parseGlow(getChild(effectList, "glow"));
+  const softEdge = parseSoftEdge(getChild(effectList, "softEdge"));
+  const parsed = {
+    ...outerShadow !== void 0 ? { outerShadow } : {},
+    ...innerShadow !== void 0 ? { innerShadow } : {},
+    ...glow !== void 0 ? { glow } : {},
+    ...softEdge !== void 0 ? { softEdge } : {}
+  };
+  return Object.keys(parsed).length > 0 ? parsed : void 0;
+}
+function parseBlipEffects(blip) {
+  if (blip === void 0) return void 0;
+  const grayscale = getChild(blip, "grayscl") !== void 0;
+  const biLevel = parseBiLevel(getChild(blip, "biLevel"));
+  const blur = parseBlurEffect(getChild(blip, "blur"));
+  const lum = parseLumEffect(getChild(blip, "lum"));
+  const duotone = parseDuotoneEffect(getChild(blip, "duotone"));
+  const clrChange = parseColorChangeEffect(getChild(blip, "clrChange"));
+  const parsed = {
+    grayscale,
+    ...biLevel !== void 0 ? { biLevel } : {},
+    ...blur !== void 0 ? { blur } : {},
+    ...lum !== void 0 ? { lum } : {},
+    ...duotone !== void 0 ? { duotone } : {},
+    ...clrChange !== void 0 ? { clrChange } : {}
+  };
+  return grayscale || biLevel !== void 0 || blur !== void 0 || lum !== void 0 || duotone !== void 0 || clrChange !== void 0 ? parsed : void 0;
+}
+function parseOuterShadow(node) {
+  if (node === void 0) return void 0;
+  const color = parseColorElement(node);
+  if (color === void 0) return void 0;
+  return {
+    blurRadius: asEmu2(numericAttr2(node, "blurRad") ?? 0),
+    distance: asEmu2(numericAttr2(node, "dist") ?? 0),
+    direction: asOoxmlAngle(numericAttr2(node, "dir") ?? 0),
+    color,
+    alignment: parseRectangleAlignment(getAttr(node, "algn"), "b"),
+    rotateWithShape: getAttr(node, "rotWithShape") !== "0"
+  };
+}
+function parseInnerShadow(node) {
+  if (node === void 0) return void 0;
+  const color = parseColorElement(node);
+  if (color === void 0) return void 0;
+  return {
+    blurRadius: asEmu2(numericAttr2(node, "blurRad") ?? 0),
+    distance: asEmu2(numericAttr2(node, "dist") ?? 0),
+    direction: asOoxmlAngle(numericAttr2(node, "dir") ?? 0),
+    color
+  };
+}
+function parseGlow(node) {
+  if (node === void 0) return void 0;
+  const color = parseColorElement(node);
+  if (color === void 0) return void 0;
+  return {
+    radius: asEmu2(numericAttr2(node, "rad") ?? 0),
+    color
+  };
+}
+function parseSoftEdge(node) {
+  if (node === void 0) return void 0;
+  return {
+    radius: asEmu2(numericAttr2(node, "rad") ?? 0)
+  };
+}
+function parseBiLevel(node) {
+  if (node === void 0) return void 0;
+  return {
+    threshold: (numericAttr2(node, "thresh") ?? 5e4) / 1e5
+  };
+}
+function parseBlurEffect(node) {
+  if (node === void 0) return void 0;
+  return {
+    radius: asEmu2(numericAttr2(node, "rad") ?? 0),
+    grow: getAttr(node, "grow") !== "0"
+  };
+}
+function parseLumEffect(node) {
+  if (node === void 0) return void 0;
+  return {
+    brightness: (numericAttr2(node, "bright") ?? 0) / 1e5,
+    contrast: (numericAttr2(node, "contrast") ?? 0) / 1e5
+  };
+}
+function parseDuotoneEffect(node) {
+  if (node === void 0) return void 0;
+  const colors = collectColorChildren(node);
+  if (colors.length < 2) return void 0;
+  return { color1: colors[0], color2: colors[1] };
+}
+function parseColorChangeEffect(node) {
+  if (node === void 0) return void 0;
+  const from = firstColorChild(getChild(node, "clrFrom"));
+  const to = firstColorChild(getChild(node, "clrTo"));
+  return from !== void 0 && to !== void 0 ? { from, to } : void 0;
+}
+function collectColorChildren(parent) {
+  const colors = [];
+  for (const [key, value] of Object.entries(parent)) {
+    if (key.startsWith("@_")) continue;
+    const nodes = Array.isArray(value) ? value : [value];
+    for (const node of nodes) {
+      if (!isXmlNode(node)) continue;
+      const color = parseColorChild(key, node);
+      if (color !== void 0) colors.push(color);
+    }
+  }
+  return colors;
+}
+function firstColorChild(parent) {
+  return parent !== void 0 ? collectColorChildren(parent)[0] : void 0;
+}
+function parseColorChild(key, node) {
+  const name = localName(key);
+  return name === "prstClr" ? parsePresetColor(node) : parseColorElement({ [name]: node });
+}
+function isXmlNode(value) {
+  return typeof value === "object" && value !== null;
+}
+function parsePresetColor(node) {
+  const value = getAttr(node, "val");
+  const hex = value !== void 0 ? PRESET_COLOR_HEX[value] : void 0;
+  return hex !== void 0 ? withTransforms({ kind: "srgb", hex }, node) : void 0;
+}
+function parseFill(parent, nextId) {
+  if (!parent) return void 0;
+  const solid = getChild(parent, "solidFill");
+  if (solid) {
+    const color = parseColorElement(solid);
+    if (color) return { kind: "solid", color };
+    return { kind: "raw", raw: makeSidecar("a:solidFill", solid, nextId) };
+  }
+  if (hasChild(parent, "noFill")) return { kind: "none" };
+  const grad = getChild(parent, "gradFill");
+  if (grad) {
+    const fill = parseGradientFill(grad);
     return fill ?? { kind: "raw", raw: makeSidecar("a:gradFill", grad, nextId) };
   }
   const blip = getChild(parent, "blipFill");
@@ -6618,7 +6829,7 @@ function parseGradientFill(grad) {
     const color = parseColorElement(gs);
     if (color === void 0) continue;
     stops.push({
-      position: (numericAttr(gs, "pos") ?? 0) / 1e5,
+      position: (numericAttr2(gs, "pos") ?? 0) / 1e5,
       color
     });
   }
@@ -6626,10 +6837,10 @@ function parseGradientFill(grad) {
   const path = getChild(grad, "path");
   if (path !== void 0) {
     const fillToRect = getChild(path, "fillToRect");
-    const l = numericAttr(fillToRect, "l") ?? 0;
-    const t = numericAttr(fillToRect, "t") ?? 0;
-    const r = numericAttr(fillToRect, "r") ?? 0;
-    const b = numericAttr(fillToRect, "b") ?? 0;
+    const l = numericAttr2(fillToRect, "l") ?? 0;
+    const t = numericAttr2(fillToRect, "t") ?? 0;
+    const r = numericAttr2(fillToRect, "r") ?? 0;
+    const b = numericAttr2(fillToRect, "b") ?? 0;
     return {
       kind: "gradient",
       gradientType: "radial",
@@ -6642,7 +6853,7 @@ function parseGradientFill(grad) {
     kind: "gradient",
     gradientType: "linear",
     stops,
-    angle: asOoxmlAngle(numericAttr(getChild(grad, "lin"), "ang") ?? 0)
+    angle: asOoxmlAngle(numericAttr2(getChild(grad, "lin"), "ang") ?? 0)
   };
 }
 function parseBlipFill(blipFill) {
@@ -6658,368 +6869,101 @@ function parseBlipFill(blipFill) {
 }
 function parseImageFillTile(tile) {
   if (tile === void 0) return void 0;
-  const flip = getAttr(tile, "flip") ?? "none";
-  return {
-    tx: asEmu2(numericAttr(tile, "tx") ?? 0),
-    ty: asEmu2(numericAttr(tile, "ty") ?? 0),
-    sx: (numericAttr(tile, "sx") ?? 1e5) / 1e5,
-    sy: (numericAttr(tile, "sy") ?? 1e5) / 1e5,
-    flip: flip === "x" || flip === "y" || flip === "xy" ? flip : "none",
-    align: parseRectangleAlignment(getAttr(tile, "algn"), "tl")
-  };
-}
-function parseRectangleAlignment(value, fallback) {
-  return parseEnumValueWithDefault(value, RECTANGLE_ALIGNMENT_TOKENS, fallback);
-}
-function parsePatternFill(pattern) {
-  const foregroundColor = parseColorElement(getChild(pattern, "fgClr"));
-  const backgroundColor = parseColorElement(getChild(pattern, "bgClr"));
-  if (foregroundColor === void 0 || backgroundColor === void 0) return void 0;
-  return {
-    kind: "pattern",
-    preset: getAttr(pattern, "prst") ?? "ltDnDiag",
-    foregroundColor,
-    backgroundColor
-  };
-}
-function parseOutline(spPr, nextId) {
-  const ln = getChild(spPr, "ln");
-  return parseLine(ln, nextId);
-}
-function parseLine(ln, nextId) {
-  if (!ln) return void 0;
-  const width = numericAttr(ln, "w");
-  const fill = parseFill(ln, nextId);
-  const dashStyle = parseDashStyle(getChild(ln, "prstDash"));
-  const customDash = parseCustomDash(ln);
-  const lineCap = parseLineCap(getAttr(ln, "cap"));
-  const lineJoin = parseLineJoin(ln);
-  const headEnd = parseArrowEndpoint(getChild(ln, "headEnd"));
-  const tailEnd = parseArrowEndpoint(getChild(ln, "tailEnd"));
-  return {
-    ...width !== void 0 ? { width: asEmu2(width) } : {},
-    ...fill !== void 0 ? { fill } : {},
-    ...dashStyle !== void 0 ? { dashStyle } : {},
-    ...customDash !== void 0 ? { customDash } : {},
-    ...lineCap !== void 0 ? { lineCap } : {},
-    ...lineJoin !== void 0 ? { lineJoin } : {},
-    ...headEnd !== void 0 ? { headEnd } : {},
-    ...tailEnd !== void 0 ? { tailEnd } : {}
-  };
-}
-function parseTransform(spPr) {
-  const xfrm = getChild(spPr, "xfrm");
-  if (!xfrm) return void 0;
-  const off = getChild(xfrm, "off");
-  const ext = getChild(xfrm, "ext");
-  const offsetX = numericAttr(off, "x");
-  const offsetY = numericAttr(off, "y");
-  const width = numericAttr(ext, "cx");
-  const height = numericAttr(ext, "cy");
-  if (offsetX === void 0 || offsetY === void 0 || width === void 0 || height === void 0) {
-    return void 0;
-  }
-  const rotation = numericAttr(xfrm, "rot");
-  const flipH = getAttr(xfrm, "flipH");
-  const flipV = getAttr(xfrm, "flipV");
-  return {
-    offsetX: asEmu2(offsetX),
-    offsetY: asEmu2(offsetY),
-    width: asEmu2(width),
-    height: asEmu2(height),
-    ...rotation !== void 0 ? { rotation: asOoxmlAngle(rotation) } : {},
-    ...isTrue(flipH) ? { flipHorizontal: true } : {},
-    ...isTrue(flipV) ? { flipVertical: true } : {}
-  };
-}
-function withTransforms(base, colorNode) {
-  const transforms = [];
-  for (const key of Object.keys(colorNode)) {
-    if (key.startsWith("@_")) continue;
-    const kind = localName(key);
-    const transformKind = parseEnumValue(kind, COLOR_TRANSFORM_KINDS);
-    if (transformKind === void 0) continue;
-    const value = colorNode[key];
-    const items = Array.isArray(value) ? value : [value];
-    for (const item of items) {
-      const raw = getAttr(unsafeOoxmlBoundaryAssertion(item), "val");
-      if (raw === void 0) continue;
-      const numeric = Number(raw);
-      if (!Number.isFinite(numeric)) continue;
-      transforms.push({
-        kind: transformKind,
-        value: asOoxmlPercent(numeric)
-      });
-    }
-  }
-  return transforms.length > 0 ? { ...base, transforms } : base;
-}
-function numericAttr(node, name) {
-  const raw = getAttr(node, name);
-  if (raw === void 0) return void 0;
-  const value = Number(raw);
-  return Number.isFinite(value) ? value : void 0;
-}
-function isTrue(value) {
-  return value === "1" || value === "true";
-}
-function parseDashStyle(prstDash) {
-  const value = getAttr(prstDash, "val");
-  return parseEnumValue(value, DASH_STYLES);
-}
-function parseCustomDash(ln) {
-  const custDash = getChild(ln, "custDash");
-  const segments = getChildArray(custDash, "ds");
-  if (segments.length === 0) return void 0;
-  return segments.flatMap((segment) => [
-    (numericAttr(segment, "d") ?? 1e5) / 1e5,
-    (numericAttr(segment, "sp") ?? 1e5) / 1e5
-  ]);
-}
-var LINE_CAP_MAP = {
-  flat: "butt",
-  sq: "square",
-  rnd: "round"
-};
-function parseLineCap(value) {
-  return value !== void 0 ? LINE_CAP_MAP[value] : void 0;
-}
-function parseLineJoin(ln) {
-  if (hasChild(ln, "round")) return "round";
-  if (hasChild(ln, "bevel")) return "bevel";
-  if (hasChild(ln, "miter")) return "miter";
-  return void 0;
-}
-function parseArrowEndpoint(node) {
-  if (!node) return void 0;
-  const type = parseEnumValue(getAttr(node, "type"), ARROW_TYPES2);
-  if (type === void 0) return void 0;
-  const width = getAttr(node, "w") ?? "med";
-  const length = getAttr(node, "len") ?? "med";
-  return {
-    type,
-    width: parseEnumValueWithDefault(width, ARROW_SIZES2, "med"),
-    length: parseEnumValueWithDefault(length, ARROW_SIZES2, "med")
-  };
-}
-var DASH_STYLES = /* @__PURE__ */ new Set([
-  "solid",
-  "dash",
-  "dot",
-  "dashDot",
-  "lgDash",
-  "lgDashDot",
-  "sysDash",
-  "sysDot"
-]);
-var ARROW_TYPES2 = /* @__PURE__ */ new Set([
-  "triangle",
-  "stealth",
-  "diamond",
-  "oval",
-  "arrow"
-]);
-var ARROW_SIZES2 = /* @__PURE__ */ new Set(["sm", "med", "lg"]);
-function parseCustomGeometry(custGeom, orderedCustGeom) {
-  const pathLst = getChild(custGeom, "pathLst");
-  const paths = getChildArray(pathLst, "path");
-  if (paths.length === 0) return void 0;
-  const avGuides = parseGuideList(getChild(custGeom, "avLst"));
-  const guides = parseGuideList(getChild(custGeom, "gdLst"));
-  const orderedPaths = orderedChildEntries(
-    orderedChildChildren(orderedCustGeom, "pathLst"),
-    "path"
-  );
-  const result = [];
-  for (const [index, path] of paths.entries()) {
-    const width = numericAttr2(path, "w") ?? 0;
-    const height = numericAttr2(path, "h") ?? 0;
-    if (width === 0 && height === 0) continue;
-    const variables = evaluateGuides(avGuides, guides, width, height);
-    const commands = buildPathCommands(path, variables, orderedNodeChildren(orderedPaths[index]));
-    if (commands !== void 0) result.push({ width, height, commands });
-  }
-  return result.length > 0 ? result : void 0;
-}
-function parseGuideList(parent) {
-  return getChildArray(parent, "gd").map((guide) => ({
-    name: getAttr(guide, "name") ?? "",
-    formula: getAttr(guide, "fmla") ?? ""
-  })).filter((guide) => guide.name !== "" && guide.formula !== "");
-}
-function buildPathCommands(path, variables, orderedCommands) {
-  const parts = [];
-  let currentX = 0;
-  let currentY = 0;
-  let startX = 0;
-  let startY = 0;
-  for (const { local, nodes } of pathCommandNodes(path, orderedCommands)) {
-    for (const node of nodes) {
-      if (local === "moveTo") {
-        const point = firstPoint(node, variables);
-        if (point !== void 0) {
-          parts.push(`M ${point.x} ${point.y}`);
-          currentX = point.x;
-          currentY = point.y;
-          startX = point.x;
-          startY = point.y;
-        }
-      } else if (local === "lnTo") {
-        const point = firstPoint(node, variables);
-        if (point !== void 0) {
-          parts.push(`L ${point.x} ${point.y}`);
-          currentX = point.x;
-          currentY = point.y;
-        }
-      } else if (local === "cubicBezTo") {
-        const points = allPoints(node, variables);
-        if (points.length >= 3) {
-          parts.push(`C ${points.map((point) => `${point.x} ${point.y}`).join(", ")}`);
-          currentX = points[points.length - 1].x;
-          currentY = points[points.length - 1].y;
-        }
-      } else if (local === "quadBezTo") {
-        const points = allPoints(node, variables);
-        if (points.length >= 2) {
-          parts.push(`Q ${points.map((point) => `${point.x} ${point.y}`).join(", ")}`);
-          currentX = points[points.length - 1].x;
-          currentY = points[points.length - 1].y;
-        }
-      } else if (local === "arcTo") {
-        const arc = convertArcTo(node, currentX, currentY, variables);
-        if (arc !== void 0) {
-          parts.push(arc.command);
-          currentX = arc.endX;
-          currentY = arc.endY;
-        }
-      } else if (local === "close") {
-        parts.push("Z");
-        currentX = startX;
-        currentY = startY;
-      }
-    }
-  }
-  return parts.length > 0 ? parts.join(" ") : void 0;
-}
-function pathCommandNodes(path, orderedCommands) {
-  if (orderedCommands === void 0) {
-    return Object.keys(path).filter((key) => !key.startsWith("@_")).map((key) => ({ local: localName(key), nodes: getChildArray(path, localName(key)) }));
-  }
-  const counters = {};
-  const result = [];
-  for (const command of orderedCommands) {
-    const key = orderedNodeKey(command);
-    if (key === void 0) continue;
-    const local = localName(key);
-    const index = counters[local] ?? 0;
-    counters[local] = index + 1;
-    const node = getChildArray(path, local)[index];
-    if (node !== void 0) result.push({ local, nodes: [node] });
-  }
-  return result;
-}
-function firstPoint(node, variables) {
-  return allPoints(node, variables)[0];
-}
-function allPoints(node, variables) {
-  return getChildArray(node, "pt").map((point) => ({
-    x: resolveValue(getAttr(point, "x") ?? "0", variables),
-    y: resolveValue(getAttr(point, "y") ?? "0", variables)
-  }));
-}
-function convertArcTo(arc, currentX, currentY, variables) {
-  const widthRadius = resolveValue(getAttr(arc, "wR") ?? "0", variables);
-  const heightRadius = resolveValue(getAttr(arc, "hR") ?? "0", variables);
-  const startAngle = resolveValue(getAttr(arc, "stAng") ?? "0", variables);
-  const sweepAngle = resolveValue(getAttr(arc, "swAng") ?? "0", variables);
-  if (widthRadius === 0 && heightRadius === 0 || sweepAngle === 0) return void 0;
-  const startRadians = startAngle / 6e4 * (Math.PI / 180);
-  const endRadians = (startAngle + sweepAngle) / 6e4 * (Math.PI / 180);
-  const centerX = currentX - widthRadius * Math.cos(startRadians);
-  const centerY = currentY - heightRadius * Math.sin(startRadians);
-  const endX = centerX + widthRadius * Math.cos(endRadians);
-  const endY = centerY + heightRadius * Math.sin(endRadians);
-  const largeArcFlag = Math.abs(sweepAngle / 6e4) > 180 ? 1 : 0;
-  const sweepFlag = sweepAngle > 0 ? 1 : 0;
+  const flip = getAttr(tile, "flip") ?? "none";
   return {
-    command: `A ${round4(widthRadius)} ${round4(heightRadius)} 0 ${largeArcFlag} ${sweepFlag} ${round4(endX)} ${round4(endY)}`,
-    endX,
-    endY
+    tx: asEmu2(numericAttr2(tile, "tx") ?? 0),
+    ty: asEmu2(numericAttr2(tile, "ty") ?? 0),
+    sx: (numericAttr2(tile, "sx") ?? 1e5) / 1e5,
+    sy: (numericAttr2(tile, "sy") ?? 1e5) / 1e5,
+    flip: flip === "x" || flip === "y" || flip === "xy" ? flip : "none",
+    align: parseRectangleAlignment(getAttr(tile, "algn"), "tl")
   };
 }
-function evaluateGuides(avGuides, guides, width, height) {
-  const variables = createBuiltinVariables(width, height);
-  for (const guide of avGuides) variables[guide.name] = evaluateFormula(guide.formula, variables);
-  for (const guide of guides) variables[guide.name] = evaluateFormula(guide.formula, variables);
-  return variables;
+function parseRectangleAlignment(value, fallback) {
+  return parseEnumValueWithDefault(value, RECTANGLE_ALIGNMENT_TOKENS, fallback);
 }
-function createBuiltinVariables(width, height) {
+function parsePatternFill(pattern) {
+  const foregroundColor = parseColorElement(getChild(pattern, "fgClr"));
+  const backgroundColor = parseColorElement(getChild(pattern, "bgClr"));
+  if (foregroundColor === void 0 || backgroundColor === void 0) return void 0;
   return {
-    w: width,
-    h: height,
-    l: 0,
-    t: 0,
-    r: width,
-    b: height,
-    wd2: width / 2,
-    hd2: height / 2,
-    wd4: width / 4,
-    hd4: height / 4,
-    ss: Math.min(width, height),
-    ls: Math.max(width, height),
-    cd2: 108e5,
-    cd4: 54e5,
-    cd8: 27e5,
-    "3cd4": 162e5
+    kind: "pattern",
+    preset: getAttr(pattern, "prst") ?? "ltDnDiag",
+    foregroundColor,
+    backgroundColor
   };
 }
-function evaluateFormula(formula, variables) {
-  const tokens = formula.trim().split(/\s+/);
-  const op = tokens[0];
-  const resolve2 = (token) => {
-    if (token === void 0) return 0;
-    const value = Number(token);
-    return Number.isNaN(value) ? variables[token] ?? 0 : value;
+function parseOutline(spPr, nextId) {
+  const ln = getChild(spPr, "ln");
+  return parseLine(ln, nextId);
+}
+function parseLine(ln, nextId) {
+  if (!ln) return void 0;
+  const width = numericAttr2(ln, "w");
+  const fill = parseFill(ln, nextId);
+  const dashStyle = parseDashStyle(getChild(ln, "prstDash"));
+  const customDash = parseCustomDash(ln);
+  const lineCap = parseLineCap(getAttr(ln, "cap"));
+  const lineJoin = parseLineJoin(ln);
+  const headEnd = parseArrowEndpoint(getChild(ln, "headEnd"));
+  const tailEnd = parseArrowEndpoint(getChild(ln, "tailEnd"));
+  return {
+    ...width !== void 0 ? { width: asEmu2(width) } : {},
+    ...fill !== void 0 ? { fill } : {},
+    ...dashStyle !== void 0 ? { dashStyle } : {},
+    ...customDash !== void 0 ? { customDash } : {},
+    ...lineCap !== void 0 ? { lineCap } : {},
+    ...lineJoin !== void 0 ? { lineJoin } : {},
+    ...headEnd !== void 0 ? { headEnd } : {},
+    ...tailEnd !== void 0 ? { tailEnd } : {}
   };
-  if (op === "val") return resolve2(tokens[1]);
-  if (op === "+-") return resolve2(tokens[1]) + resolve2(tokens[2]) - resolve2(tokens[3]);
-  if (op === "*/")
-    return Math.round(resolve2(tokens[1]) * resolve2(tokens[2]) / (resolve2(tokens[3]) || 1));
-  if (op === "+/")
-    return Math.round((resolve2(tokens[1]) + resolve2(tokens[2])) / (resolve2(tokens[3]) || 1));
-  if (op === "pin")
-    return Math.max(resolve2(tokens[1]), Math.min(resolve2(tokens[2]), resolve2(tokens[3])));
-  if (op === "min") return Math.min(resolve2(tokens[1]), resolve2(tokens[2]));
-  if (op === "max") return Math.max(resolve2(tokens[1]), resolve2(tokens[2]));
-  if (op === "abs") return Math.abs(resolve2(tokens[1]));
-  if (op === "sqrt") return Math.round(Math.sqrt(resolve2(tokens[1])));
-  if (op === "sin") return Math.round(resolve2(tokens[1]) * Math.sin(toRadians(resolve2(tokens[2]))));
-  if (op === "cos") return Math.round(resolve2(tokens[1]) * Math.cos(toRadians(resolve2(tokens[2]))));
-  if (op === "tan") return Math.round(resolve2(tokens[1]) * Math.tan(toRadians(resolve2(tokens[2]))));
-  if (op === "at2")
-    return Math.round(Math.atan2(resolve2(tokens[2]), resolve2(tokens[1])) * (180 / Math.PI) * 6e4);
-  if (op === "mod") {
-    const a = resolve2(tokens[1]);
-    const b = resolve2(tokens[2]);
-    const c = resolve2(tokens[3]);
-    return Math.round(Math.sqrt(a * a + b * b + c * c));
-  }
-  if (op === "cat2") {
-    return Math.round(
-      resolve2(tokens[1]) * Math.cos(Math.atan2(resolve2(tokens[3]), resolve2(tokens[2])))
-    );
-  }
-  if (op === "sat2") {
-    return Math.round(
-      resolve2(tokens[1]) * Math.sin(Math.atan2(resolve2(tokens[3]), resolve2(tokens[2])))
-    );
+}
+function parseTransform(spPr) {
+  const xfrm = getChild(spPr, "xfrm");
+  if (!xfrm) return void 0;
+  const off = getChild(xfrm, "off");
+  const ext = getChild(xfrm, "ext");
+  const offsetX = numericAttr2(off, "x");
+  const offsetY = numericAttr2(off, "y");
+  const width = numericAttr2(ext, "cx");
+  const height = numericAttr2(ext, "cy");
+  if (offsetX === void 0 || offsetY === void 0 || width === void 0 || height === void 0) {
+    return void 0;
   }
-  if (op === "?:") return resolve2(tokens[1]) > 0 ? resolve2(tokens[2]) : resolve2(tokens[3]);
-  return 0;
+  const rotation = numericAttr2(xfrm, "rot");
+  const flipH = getAttr(xfrm, "flipH");
+  const flipV = getAttr(xfrm, "flipV");
+  return {
+    offsetX: asEmu2(offsetX),
+    offsetY: asEmu2(offsetY),
+    width: asEmu2(width),
+    height: asEmu2(height),
+    ...rotation !== void 0 ? { rotation: asOoxmlAngle(rotation) } : {},
+    ...isTrue(flipH) ? { flipHorizontal: true } : {},
+    ...isTrue(flipV) ? { flipVertical: true } : {}
+  };
 }
-function resolveValue(value, variables) {
-  const numeric = Number(value);
-  return Number.isNaN(numeric) ? variables[value] ?? 0 : numeric;
+function withTransforms(base, colorNode) {
+  const transforms = [];
+  for (const key of Object.keys(colorNode)) {
+    if (key.startsWith("@_")) continue;
+    const kind = localName(key);
+    const transformKind = parseEnumValue(kind, COLOR_TRANSFORM_KINDS);
+    if (transformKind === void 0) continue;
+    const value = colorNode[key];
+    const items = Array.isArray(value) ? value : [value];
+    for (const item of items) {
+      const raw = getAttr(unsafeOoxmlBoundaryAssertion(item), "val");
+      if (raw === void 0) continue;
+      const numeric = Number(raw);
+      if (!Number.isFinite(numeric)) continue;
+      transforms.push({
+        kind: transformKind,
+        value: asOoxmlPercent(numeric)
+      });
+    }
+  }
+  return transforms.length > 0 ? { ...base, transforms } : base;
 }
 function numericAttr2(node, name) {
   const raw = getAttr(node, name);
@@ -7027,31 +6971,66 @@ function numericAttr2(node, name) {
   const value = Number(raw);
   return Number.isFinite(value) ? value : void 0;
 }
-function round4(value) {
-  return Math.round(value * 1e3) / 1e3;
+function isTrue(value) {
+  return value === "1" || value === "true";
 }
-function toRadians(ooxmlAngle) {
-  return ooxmlAngle / 6e4 * (Math.PI / 180);
+function parseDashStyle(prstDash) {
+  const value = getAttr(prstDash, "val");
+  return parseEnumValue(value, DASH_STYLES);
 }
-function orderedChildChildren(parent, childLocalName) {
-  const child = orderedChildEntries(parent, childLocalName)[0];
-  return orderedNodeChildren(child);
+function parseCustomDash(ln) {
+  const custDash = getChild(ln, "custDash");
+  const segments = getChildArray(custDash, "ds");
+  if (segments.length === 0) return void 0;
+  return segments.flatMap((segment) => [
+    (numericAttr2(segment, "d") ?? 1e5) / 1e5,
+    (numericAttr2(segment, "sp") ?? 1e5) / 1e5
+  ]);
 }
-function orderedChildEntries(parent, childLocalName) {
-  if (parent === void 0) return [];
-  return parent.filter((child) => {
-    const key = orderedNodeKey(child);
-    return key !== void 0 && localName(key) === childLocalName;
-  });
+var LINE_CAP_MAP = {
+  flat: "butt",
+  sq: "square",
+  rnd: "round"
+};
+function parseLineCap(value) {
+  return value !== void 0 ? LINE_CAP_MAP[value] : void 0;
 }
-function orderedNodeChildren(node) {
-  const key = node !== void 0 ? orderedNodeKey(node) : void 0;
-  const value = key !== void 0 ? node?.[key] : void 0;
-  return Array.isArray(value) ? value : void 0;
+function parseLineJoin(ln) {
+  if (hasChild(ln, "round")) return "round";
+  if (hasChild(ln, "bevel")) return "bevel";
+  if (hasChild(ln, "miter")) return "miter";
+  return void 0;
 }
-function orderedNodeKey(node) {
-  return Object.keys(node).find((key) => key !== ":@");
+function parseArrowEndpoint(node) {
+  if (!node) return void 0;
+  const type = parseEnumValue(getAttr(node, "type"), ARROW_TYPES);
+  if (type === void 0) return void 0;
+  const width = getAttr(node, "w") ?? "med";
+  const length = getAttr(node, "len") ?? "med";
+  return {
+    type,
+    width: parseEnumValueWithDefault(width, ARROW_SIZES, "med"),
+    length: parseEnumValueWithDefault(length, ARROW_SIZES, "med")
+  };
 }
+var DASH_STYLES = /* @__PURE__ */ new Set([
+  "solid",
+  "dash",
+  "dot",
+  "dashDot",
+  "lgDash",
+  "lgDashDot",
+  "sysDash",
+  "sysDot"
+]);
+var ARROW_TYPES = /* @__PURE__ */ new Set([
+  "triangle",
+  "stealth",
+  "diamond",
+  "oval",
+  "arrow"
+]);
+var ARROW_SIZES = /* @__PURE__ */ new Set(["sm", "med", "lg"]);
 var KNOWN_TXBODY_CHILDREN = /* @__PURE__ */ new Set(["bodyPr", "lstStyle", "p"]);
 var KNOWN_PARAGRAPH_CHILDREN = /* @__PURE__ */ new Set([
   "pPr",
@@ -7273,20 +7252,20 @@ function splitInterleavedParagraph(p, orderedChildren, partPath, nextId, ownerNo
 }
 function parseBodyProperties(bodyPr) {
   if (!bodyPr) return void 0;
-  const marginLeft = numericAttr(bodyPr, "lIns");
-  const marginRight = numericAttr(bodyPr, "rIns");
-  const marginTop = numericAttr(bodyPr, "tIns");
-  const marginBottom = numericAttr(bodyPr, "bIns");
+  const marginLeft = numericAttr2(bodyPr, "lIns");
+  const marginRight = numericAttr2(bodyPr, "rIns");
+  const marginTop = numericAttr2(bodyPr, "tIns");
+  const marginBottom = numericAttr2(bodyPr, "bIns");
   const anchorToken = getAttr(bodyPr, "anchor");
   const anchor = anchorToken !== void 0 ? ANCHOR_MAP[anchorToken] : void 0;
   const wrap = parseWrap(getAttr(bodyPr, "wrap"));
   const vert = parseVerticalType(getAttr(bodyPr, "vert"));
-  const numCol = numericAttr(bodyPr, "numCol");
+  const numCol = numericAttr2(bodyPr, "numCol");
   const normAutofit = getChild(bodyPr, "normAutofit");
   const hasSpAutofit = getChild(bodyPr, "spAutoFit") !== void 0;
   const hasNoAutofit = getChild(bodyPr, "noAutofit") !== void 0;
-  const fontScale = numericAttr(normAutofit, "fontScale");
-  const lnSpcReduction = numericAttr(normAutofit, "lnSpcReduction");
+  const fontScale = numericAttr2(normAutofit, "fontScale");
+  const lnSpcReduction = numericAttr2(normAutofit, "lnSpcReduction");
   const properties = {
     ...marginLeft !== void 0 ? { marginLeft: emu(marginLeft) } : {},
     ...marginRight !== void 0 ? { marginRight: emu(marginRight) } : {},
@@ -7418,16 +7397,16 @@ function parseParagraphProperties(pPr) {
   if (!pPr) return void 0;
   const alignToken = getAttr(pPr, "algn");
   const align = alignToken !== void 0 ? ALIGN_MAP[alignToken] : void 0;
-  const level = numericAttr(pPr, "lvl");
+  const level = numericAttr2(pPr, "lvl");
   const lineSpacing = parseSpacing(getChild(pPr, "lnSpc"));
   const spaceBefore = parseSpacing(getChild(pPr, "spcBef"));
   const spaceAfter = parseSpacing(getChild(pPr, "spcAft"));
-  const marginLeft = numericAttr(pPr, "marL");
-  const indent = numericAttr(pPr, "indent");
+  const marginLeft = numericAttr2(pPr, "marL");
+  const indent = numericAttr2(pPr, "indent");
   const bullet = parseBullet(pPr);
   const bulletFont = getAttr(getChild(pPr, "buFont"), "typeface");
   const bulletColor = parseColorElement(getChild(pPr, "buClr"));
-  const bulletSizePct = numericAttr(getChild(pPr, "buSzPct"), "val");
+  const bulletSizePct = numericAttr2(getChild(pPr, "buSzPct"), "val");
   const tabStops = parseTabStops(pPr);
   const defaultRunProperties = parseRunProperties(getChild(pPr, "defRPr"));
   const properties = {
@@ -7449,14 +7428,14 @@ function parseParagraphProperties(pPr) {
 }
 function parseTabStops(pPr) {
   return getChildArray(getChild(pPr, "tabLst"), "tab").map((tab) => ({
-    position: emu(numericAttr(tab, "pos") ?? 0),
+    position: emu(numericAttr2(tab, "pos") ?? 0),
     alignment: unsafeOoxmlBoundaryAssertion(getAttr(tab, "algn")) ?? "l"
   }));
 }
 function parseSpacing(node) {
-  const points = numericAttr(getChild(node, "spcPts"), "val");
+  const points = numericAttr2(getChild(node, "spcPts"), "val");
   if (points !== void 0) return { type: "pts", value: asHundredthPt2(points) };
-  const percent = numericAttr(getChild(node, "spcPct"), "val");
+  const percent = numericAttr2(getChild(node, "spcPct"), "val");
   if (percent !== void 0) return { type: "pct", value: percent };
   return void 0;
 }
@@ -7473,7 +7452,7 @@ function parseBullet(pPr) {
     return {
       type: "autoNum",
       scheme: parseEnumValueWithDefault(scheme, VALID_AUTO_NUM_SCHEMES, "arabicPeriod"),
-      startAt: numericAttr(buAutoNum, "startAt") ?? 1
+      startAt: numericAttr2(buAutoNum, "startAt") ?? 1
     };
   }
   return void 0;
@@ -7518,8 +7497,8 @@ function parseRunProperties(rPr) {
   const italic = getAttr(rPr, "i");
   const underline = getAttr(rPr, "u");
   const strike = getAttr(rPr, "strike");
-  const baseline = numericAttr(rPr, "baseline");
-  const size = numericAttr(rPr, "sz");
+  const baseline = numericAttr2(rPr, "baseline");
+  const size = numericAttr2(rPr, "sz");
   const typeface = getAttr(getChild(rPr, "latin"), "typeface");
   const typefaceEa = getAttr(getChild(rPr, "ea"), "typeface");
   const typefaceCs = getAttr(getChild(rPr, "cs"), "typeface");
@@ -7797,7 +7776,7 @@ function parseConnectorConnection(cNvCxnSpPr) {
 }
 function parseConnectorConnectionEndpoint(node) {
   const shapeId = getAttr(node, "id");
-  const connectionSiteIndex = numericAttr(node, "idx");
+  const connectionSiteIndex = numericAttr2(node, "idx");
   if (shapeId === void 0 || connectionSiteIndex === void 0) return void 0;
   return {
     shapeId: asSourceNodeId(shapeId),
@@ -7818,7 +7797,7 @@ function parseShapeStyle(style) {
 }
 function parseStyleReference(ref) {
   if (ref === void 0) return void 0;
-  const index = numericAttr(ref, "idx") ?? 0;
+  const index = numericAttr2(ref, "idx") ?? 0;
   const color = parseColorElement(ref);
   return {
     index,
@@ -8153,8 +8132,8 @@ function parseTableCell(tc, partPath, nextId, tableNodeId, tableOrderingSlot, ro
     ...textBody !== void 0 ? { textBody } : {},
     ...fill !== void 0 ? { fill } : {},
     ...borders !== void 0 ? { borders } : {},
-    gridSpan: numericAttr(tc, "gridSpan") ?? 1,
-    rowSpan: numericAttr(tc, "rowSpan") ?? 1,
+    gridSpan: numericAttr2(tc, "gridSpan") ?? 1,
+    rowSpan: numericAttr2(tc, "rowSpan") ?? 1,
     hMerge: isTrue(getAttr(tc, "hMerge") ?? getAttr(tcPr, "hMerge")),
     vMerge: isTrue(getAttr(tc, "vMerge") ?? getAttr(tcPr, "vMerge")),
     ...rawSidecars.length > 0 ? { rawSidecars } : {}
@@ -8187,7 +8166,7 @@ function parseRawShapeNode(key, node, partPath, nextId, orderingSlot) {
 function parsePlaceholder(ph) {
   if (!ph) return void 0;
   const type = getAttr(ph, "type");
-  const index = numericAttr(ph, "idx");
+  const index = numericAttr2(ph, "idx");
   if (type === void 0 && index === void 0) return void 0;
   return {
     ...type !== void 0 ? { type } : {},
@@ -8227,10 +8206,10 @@ function parseChildTransform(grpSpPr, fallback) {
   const xfrm = getChild(grpSpPr, "xfrm");
   const childOff = getChild(xfrm, "chOff");
   const childExt = getChild(xfrm, "chExt");
-  const offsetX = numericAttr(childOff, "x") ?? 0;
-  const offsetY = numericAttr(childOff, "y") ?? 0;
-  const width = numericAttr(childExt, "cx") ?? fallback?.width;
-  const height = numericAttr(childExt, "cy") ?? fallback?.height;
+  const offsetX = numericAttr2(childOff, "x") ?? 0;
+  const offsetY = numericAttr2(childOff, "y") ?? 0;
+  const width = numericAttr2(childExt, "cx") ?? fallback?.width;
+  const height = numericAttr2(childExt, "cy") ?? fallback?.height;
   if (width === void 0 || height === void 0) return void 0;
   return {
     offsetX: asEmu2(offsetX),
@@ -8241,10 +8220,10 @@ function parseChildTransform(grpSpPr, fallback) {
 }
 function parseCrop(srcRect) {
   if (!srcRect) return void 0;
-  const left = numericAttr(srcRect, "l");
-  const top = numericAttr(srcRect, "t");
-  const right = numericAttr(srcRect, "r");
-  const bottom = numericAttr(srcRect, "b");
+  const left = numericAttr2(srcRect, "l");
+  const top = numericAttr2(srcRect, "t");
+  const right = numericAttr2(srcRect, "r");
+  const bottom = numericAttr2(srcRect, "b");
   const crop = {
     ...left !== void 0 ? { left: asOoxmlPercent(left) } : {},
     ...top !== void 0 ? { top: asOoxmlPercent(top) } : {},
@@ -8256,10 +8235,10 @@ function parseCrop(srcRect) {
 function parseStretch(stretch) {
   const fillRect = getChild(stretch, "fillRect");
   if (fillRect === void 0) return void 0;
-  const left = (numericAttr(fillRect, "l") ?? 0) / 1e5;
-  const top = (numericAttr(fillRect, "t") ?? 0) / 1e5;
-  const right = (numericAttr(fillRect, "r") ?? 0) / 1e5;
-  const bottom = (numericAttr(fillRect, "b") ?? 0) / 1e5;
+  const left = (numericAttr2(fillRect, "l") ?? 0) / 1e5;
+  const top = (numericAttr2(fillRect, "t") ?? 0) / 1e5;
+  const right = (numericAttr2(fillRect, "r") ?? 0) / 1e5;
+  const bottom = (numericAttr2(fillRect, "b") ?? 0) / 1e5;
   if (left === 0 && top === 0 && right === 0 && bottom === 0) return void 0;
   return { left, top, right, bottom };
 }
@@ -8268,7 +8247,7 @@ function sourceNodeId(cNvPr) {
   return id !== void 0 ? asSourceNodeId(id) : void 0;
 }
 function emuAttr(node, attrName) {
-  return asEmu2(numericAttr(node, attrName) ?? 0);
+  return asEmu2(numericAttr2(node, attrName) ?? 0);
 }
 var EMPTY_KNOWN = /* @__PURE__ */ new Set();
 function orderedChildChildren2(parent, childLocalName) {
@@ -8300,6 +8279,75 @@ function orderedNestedChildChildren(node, parentLocalName, childLocalName) {
     childLocalName
   );
 }
+var xmlBuilder = new import_fast_xml_parser2.XMLBuilder({
+  ignoreAttributes: false,
+  attributeNamePrefix: "@_",
+  format: false,
+  suppressEmptyNode: true
+});
+var EDITABLE_TEXT_RUN_PROPERTY_VALIDATORS = {
+  bold: (value) => requireBooleanOrUndefined(value, "bold"),
+  italic: (value) => requireBooleanOrUndefined(value, "italic"),
+  underline: (value) => requireBooleanOrUndefined(value, "underline"),
+  fontSize: (value) => {
+    if (value !== void 0 && (!Number.isFinite(value) || value <= 0)) {
+      throw new Error("updateTextRunProperties: fontSize must be a finite positive pt value");
+    }
+  },
+  color: (value) => {
+    if (value === void 0) return;
+    if (value.kind !== "srgb") {
+      throw new Error("updateTextRunProperties: only srgb text run color is supported");
+    }
+    if (!/^[0-9A-Fa-f]{6}$/.test(value.hex)) {
+      throw new Error("updateTextRunProperties: srgb text run color must be a 6-digit hex value");
+    }
+  },
+  typeface: (value) => {
+    if (value !== void 0 && value.trim() === "") {
+      throw new Error("updateTextRunProperties: typeface must be a non-empty string");
+    }
+  }
+};
+var EDITABLE_TEXT_RUN_PROPERTIES = Object.keys(EDITABLE_TEXT_RUN_PROPERTY_VALIDATORS).filter(
+  (property) => property in EDITABLE_TEXT_RUN_PROPERTY_VALIDATORS
+);
+var EDITABLE_TEXT_RUN_PROPERTY_SET = new Set(EDITABLE_TEXT_RUN_PROPERTIES);
+var EDITABLE_PARAGRAPH_PROPERTIES = [
+  "align",
+  "level",
+  "bullet"
+];
+var EDITABLE_PARAGRAPH_PROPERTY_SET = new Set(EDITABLE_PARAGRAPH_PROPERTIES);
+function requireBooleanOrUndefined(value, fieldName) {
+  if (value !== void 0 && typeof value !== "boolean") {
+    throw new Error(`updateTextRunProperties: ${fieldName} must be a boolean value`);
+  }
+}
+function asEmu2(value) {
+  return unsafeBrandAssertion2(value);
+}
+function asPt(value) {
+  return unsafeBrandAssertion2(value);
+}
+function asHundredthPt2(value) {
+  return unsafeBrandAssertion2(value);
+}
+function asOoxmlPercent(value) {
+  return unsafeBrandAssertion2(value);
+}
+function asOoxmlAngle(value) {
+  return unsafeBrandAssertion2(value);
+}
+var textEncoder = new TextEncoder();
+var ROOT_PART = asPartPath("");
+var PRESENTATION_PART = asPartPath("ppt/presentation.xml");
+var SLIDE_PART = asPartPath("ppt/slides/slide1.xml");
+var SLIDE_LAYOUT_PART = asPartPath("ppt/slideLayouts/slideLayout1.xml");
+var SLIDE_MASTER_PART = asPartPath("ppt/slideMasters/slideMaster1.xml");
+var THEME_PART = asPartPath("ppt/theme/theme1.xml");
+var APP_PROPS_PART = asPartPath("docProps/app.xml");
+var CORE_PROPS_PART = asPartPath("docProps/core.xml");
 var DEFAULT_COLOR_MAP = {
   bg1: "lt1",
   tx1: "dk1",
@@ -8718,7 +8766,7 @@ var DIAGRAM_DRAWING_REL_TYPES = /* @__PURE__ */ new Set([
   "http://schemas.microsoft.com/office/2007/relationships/diagramDrawing",
   "http://purl.oclc.org/ooxml/officeDocument/relationships/diagramDrawing"
 ]);
-var textDecoder = new TextDecoder();
+var textDecoder2 = new TextDecoder();
 var DEFAULT_TABLE_STYLE_BORDERS = {
   top: {
     width: asEmu2(12700),
@@ -8863,7 +8911,7 @@ function computeConnectorElement(context, connector, layer, partPath) {
     sourceNode: connector,
     ...connector.transform !== void 0 ? { transform: connector.transform } : {},
     ...connector.geometry !== void 0 ? { geometry: connector.geometry } : {},
-    ...connector.outline !== void 0 ? { outline: computeOutline(context, connector.outline, partPath) } : connector.style?.lineRef !== void 0 ? { outline: resolveLineReference(context, connector.style.lineRef, partPath) } : {},
+    ...computedOutlineProperty(context, connector.outline, connector.style?.lineRef, partPath),
     ...effects !== void 0 ? { effects } : {}
   };
 }
@@ -8907,7 +8955,7 @@ function computeShapeElement(context, shape, layer, partPath) {
     ...transform !== void 0 ? { transform } : {},
     ...geometry !== void 0 ? { geometry } : {},
     ...shape.fill !== void 0 ? { fill: computeFill(context, shape.fill, partPath) } : shape.style?.fillRef !== void 0 ? { fill: resolveFillReference(context, shape.style.fillRef, partPath) } : {},
-    ...shape.outline !== void 0 ? { outline: computeOutline(context, shape.outline, partPath) } : shape.style?.lineRef !== void 0 ? { outline: resolveLineReference(context, shape.style.lineRef, partPath) } : {},
+    ...computedOutlineProperty(context, shape.outline, shape.style?.lineRef, partPath),
     ...effects !== void 0 ? { effects } : {},
     ...shape.textBody !== void 0 ? {
       textBody: computeTextBody(
@@ -8922,7 +8970,7 @@ function computeShapeElement(context, shape, layer, partPath) {
 }
 function computeImageElement(context, image, layer, partPath) {
   const relationship = resolveComputedRelationships(context.source, partPath).find(
-    (rel) => rel.id === image.blipRelationshipId && rel.type === IMAGE_REL_TYPE2
+    (rel2) => rel2.id === image.blipRelationshipId && rel2.type === IMAGE_REL_TYPE2
   );
   const effects = image.effects !== void 0 ? computeEffectList(context, image.effects) : void 0;
   const blipEffects = image.blipEffects !== void 0 ? computeBlipEffects(context, image.blipEffects) : void 0;
@@ -8953,7 +9001,7 @@ function computeTableElement(context, table, layer, partPath) {
 }
 function computeChartElement(context, chart, layer, partPath) {
   const relationship = context.relationships.find(
-    (rel) => rel.id === chart.chartRelationshipId && CHART_REL_TYPES.has(rel.type)
+    (rel2) => rel2.id === chart.chartRelationshipId && CHART_REL_TYPES.has(rel2.type)
   );
   const chartXml = relationship?.targetPartPath !== void 0 ? readRawPackageText(context.source, relationship.targetPartPath) : void 0;
   const chartData = chartXml !== void 0 ? parseComputedChartData(chartXml, context) : void 0;
@@ -8970,11 +9018,11 @@ function computeChartElement(context, chart, layer, partPath) {
 }
 function computeSmartArtElement(context, smartArt, layer, partPath) {
   const dataRelationship = context.relationships.find(
-    (rel) => rel.id === smartArt.dataRelationshipId && DIAGRAM_DATA_REL_TYPES.has(rel.type)
+    (rel2) => rel2.id === smartArt.dataRelationshipId && DIAGRAM_DATA_REL_TYPES.has(rel2.type)
   );
   const dataRelationships = dataRelationship?.targetPartPath !== void 0 ? resolveComputedRelationships(context.source, dataRelationship.targetPartPath) : [];
   const drawingRelationship = dataRelationships.find(
-    (rel) => DIAGRAM_DRAWING_REL_TYPES.has(rel.type)
+    (rel2) => DIAGRAM_DRAWING_REL_TYPES.has(rel2.type)
   );
   const drawingPartPath = drawingRelationship?.targetPartPath;
   const drawingXml = drawingPartPath !== void 0 ? readRawPackageText(context.source, drawingPartPath) : void 0;
@@ -9120,7 +9168,7 @@ function computeFill(context, fill, partPath) {
       };
     case "image": {
       const relationship = resolveComputedRelationships(context.source, partPath).find(
-        (rel) => rel.id === fill.blipRelationshipId && rel.type === IMAGE_REL_TYPE2
+        (rel2) => rel2.id === fill.blipRelationshipId && rel2.type === IMAGE_REL_TYPE2
       );
       return {
         kind: "image",
@@ -9145,6 +9193,24 @@ function computeOutline(context, outline, partPath) {
     ...outline.fill !== void 0 ? { fill: computeFill(context, outline.fill, partPath) } : {}
   };
 }
+function computedOutlineProperty(context, outline, lineRef, partPath) {
+  const styleOutline = lineRef !== void 0 ? resolveLineReference(context, lineRef, partPath) : void 0;
+  if (outline === void 0) {
+    return styleOutline !== void 0 ? { outline: styleOutline } : {};
+  }
+  const computed = mergeComputedOutline(styleOutline, computeOutline(context, outline, partPath));
+  return { outline: computed };
+}
+function mergeComputedOutline(base, override) {
+  if (base === void 0) return override;
+  const width = override.width ?? base.width;
+  const fill = override.fill ?? base.fill;
+  return {
+    source: { ...base.source, ...override.source },
+    ...width !== void 0 ? { width } : {},
+    ...fill !== void 0 ? { fill } : {}
+  };
+}
 function resolveFillReference(context, ref, partPath) {
   if (ref.index === 0) return void 0;
   const list = ref.index >= 1e3 ? context.theme?.formatScheme?.backgroundFillStyles : context.theme?.formatScheme?.fillStyles;
@@ -9429,7 +9495,7 @@ function isEmptyPlaceholder(shape) {
 }
 function readRawPackageText(source, partPath) {
   const rawPart = source.packageGraph.rawParts?.find((part) => part.partPath === partPath);
-  if (rawPart?.kind === "binary") return textDecoder.decode(rawPart.bytes);
+  if (rawPart?.kind === "binary") return textDecoder2.decode(rawPart.bytes);
   return void 0;
 }
 function numericAttr3(node, attrName) {
@@ -9556,7 +9622,7 @@ function parseBackground(bg, nextId) {
   const bgRef = getChild(bg, "bgRef");
   if (bgRef) {
     const color = parseColorElement(bgRef);
-    const index = numericAttr(bgRef, "idx");
+    const index = numericAttr2(bgRef, "idx");
     if (color !== void 0) {
       return { kind: "styleReference", index: index ?? 0, color };
     }
@@ -9686,9 +9752,9 @@ function parseOuterShadow2(node) {
   const color = parseColorElement(node);
   if (node === void 0 || color === void 0) return void 0;
   return {
-    blurRadius: asEmu2(numericAttr(node, "blurRad") ?? 0),
-    distance: asEmu2(numericAttr(node, "dist") ?? 0),
-    direction: asOoxmlAngle(numericAttr(node, "dir") ?? 0),
+    blurRadius: asEmu2(numericAttr2(node, "blurRad") ?? 0),
+    distance: asEmu2(numericAttr2(node, "dist") ?? 0),
+    direction: asOoxmlAngle(numericAttr2(node, "dir") ?? 0),
     color,
     alignment: parseRectangleAlignment(getAttr(node, "algn"), "b"),
     rotateWithShape: getAttr(node, "rotWithShape") !== "0"
@@ -9698,9 +9764,9 @@ function parseInnerShadow2(node) {
   const color = parseColorElement(node);
   if (node === void 0 || color === void 0) return void 0;
   return {
-    blurRadius: asEmu2(numericAttr(node, "blurRad") ?? 0),
-    distance: asEmu2(numericAttr(node, "dist") ?? 0),
-    direction: asOoxmlAngle(numericAttr(node, "dir") ?? 0),
+    blurRadius: asEmu2(numericAttr2(node, "blurRad") ?? 0),
+    distance: asEmu2(numericAttr2(node, "dist") ?? 0),
+    direction: asOoxmlAngle(numericAttr2(node, "dir") ?? 0),
     color
   };
 }
@@ -9708,14 +9774,14 @@ function parseGlow2(node) {
   const color = parseColorElement(node);
   if (node === void 0 || color === void 0) return void 0;
   return {
-    radius: asEmu2(numericAttr(node, "rad") ?? 0),
+    radius: asEmu2(numericAttr2(node, "rad") ?? 0),
     color
   };
 }
 function parseSoftEdge2(node) {
   if (node === void 0) return void 0;
   return {
-    radius: asEmu2(numericAttr(node, "rad") ?? 0)
+    radius: asEmu2(numericAttr2(node, "rad") ?? 0)
   };
 }
 function booleanAttr(node, name) {
@@ -9733,8 +9799,8 @@ var SLIDE_REL_TYPE2 = "http://schemas.openxmlformats.org/officeDocument/2006/rel
 var SLIDE_LAYOUT_REL_TYPE2 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout";
 var SLIDE_MASTER_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster";
 var THEME_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";
-var PRESENTATION_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml";
-var textDecoder2 = new TextDecoder();
+var PRESENTATION_CONTENT_TYPE2 = "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml";
+var textDecoder3 = new TextDecoder();
 function readPptx(input) {
   const entries = unzipPackage(input);
   const diagnostics = [];
@@ -9885,7 +9951,7 @@ function parsePartRoot(entries, partPath, rootLocalName, diagnostics, includeOrd
     });
     return void 0;
   }
-  const xml = textDecoder2.decode(bytes);
+  const xml = textDecoder3.decode(bytes);
   const root = getChild(parseXml(xml), rootLocalName);
   if (root === void 0) {
     diagnostics.push({
@@ -9900,15 +9966,15 @@ function parsePartRoot(entries, partPath, rootLocalName, diagnostics, includeOrd
   return { root, orderedRoot };
 }
 function resolveSingleRel(relationships, sourcePart, relType) {
-  const rels = relationships.find((rel) => rel.sourcePartPath === sourcePart)?.relationships;
-  const match = rels?.find((rel) => rel.type === relType && rel.targetMode !== "External");
+  const rels = relationships.find((rel2) => rel2.sourcePartPath === sourcePart)?.relationships;
+  const match = rels?.find((rel2) => rel2.type === relType && rel2.targetMode !== "External");
   if (match === void 0) return void 0;
   return resolveInternalRelationshipTarget(sourcePart, match);
 }
 function resolveAllRels(relationships, sourcePart, relType) {
-  const rels = relationships.find((rel) => rel.sourcePartPath === sourcePart)?.relationships ?? [];
-  return rels.filter((rel) => rel.type === relType && rel.targetMode !== "External").flatMap((rel) => {
-    const target = resolveInternalRelationshipTarget(sourcePart, rel);
+  const rels = relationships.find((rel2) => rel2.sourcePartPath === sourcePart)?.relationships ?? [];
+  return rels.filter((rel2) => rel2.type === relType && rel2.targetMode !== "External").flatMap((rel2) => {
+    const target = resolveInternalRelationshipTarget(sourcePart, rel2);
     return target === void 0 ? [] : [target];
   });
 }
@@ -9936,7 +10002,7 @@ function unzipPackage(input) {
 function readContentTypes(entries) {
   const bytes = entries.get(CONTENT_TYPES_PART);
   if (!bytes) return { defaults: [], overrides: [] };
-  const root = getChild(parseXml(textDecoder2.decode(bytes)), "Types");
+  const root = getChild(parseXml(textDecoder3.decode(bytes)), "Types");
   const defaults = [];
   for (const node of getChildArray(root, "Default")) {
     const extension = getAttr(node, "Extension");
@@ -9957,7 +10023,7 @@ function readRelationships(entries) {
   const result = [];
   for (const [path, bytes] of entries) {
     if (!isRelationshipPart(path)) continue;
-    const root = getChild(parseXml(textDecoder2.decode(bytes)), "Relationships");
+    const root = getChild(parseXml(textDecoder3.decode(bytes)), "Relationships");
     const relationships = [];
     for (const node of getChildArray(root, "Relationship")) {
       const id = getAttr(node, "Id");
@@ -9988,7 +10054,7 @@ function readPresentation(entries, relationships, overrides, diagnostics) {
     );
   }
   const presentationPartPath = asPartPath(presentationPath);
-  const root = getChild(parseXml(textDecoder2.decode(bytes)), "presentation");
+  const root = getChild(parseXml(textDecoder3.decode(bytes)), "presentation");
   if (root === void 0) {
     throw new Error(
       `readPptx: part '${presentationPath}' is not a presentation part (missing p:presentation root)`
@@ -9997,7 +10063,7 @@ function readPresentation(entries, relationships, overrides, diagnostics) {
   const slideSize = readSlideSize(root);
   const defaultTextStyle = parseTextStyle(getChild(root, "defaultTextStyle"));
   const presentationRels = relationships.find(
-    (rel) => rel.sourcePartPath === presentationPath
+    (rel2) => rel2.sourcePartPath === presentationPath
   )?.relationships;
   const slidePartPaths = [];
   const sldIdLst = getChild(root, "sldIdLst");
@@ -10005,7 +10071,7 @@ function readPresentation(entries, relationships, overrides, diagnostics) {
     const relId = getNamespacedAttr(sldId, "id");
     if (relId === void 0) continue;
     const handle = { partPath: presentationPartPath, relationshipId: asRelationshipId(relId) };
-    const relationship = presentationRels?.find((rel) => rel.id === relId);
+    const relationship = presentationRels?.find((rel2) => rel2.id === relId);
     if (relationship === void 0) {
       diagnostics.push({
         severity: "warning",
@@ -10048,15 +10114,15 @@ function readSlideSize(presentationRoot) {
 }
 function locatePresentationPart(relationships, overrides) {
   const rootRels = relationships.find(
-    (rel) => rel.sourcePartPath === PACKAGE_ROOT_PART
+    (rel2) => rel2.sourcePartPath === PACKAGE_ROOT_PART
   )?.relationships;
   const officeDocumentRel = rootRels?.find(
-    (rel) => rel.type === OFFICE_DOCUMENT_REL_TYPE && rel.targetMode !== "External"
+    (rel2) => rel2.type === OFFICE_DOCUMENT_REL_TYPE && rel2.targetMode !== "External"
   );
   if (officeDocumentRel !== void 0) {
     return resolveRelationshipTarget(PACKAGE_ROOT_PART, officeDocumentRel.target);
   }
-  const override = overrides.find((entry) => entry.contentType === PRESENTATION_CONTENT_TYPE);
+  const override = overrides.find((entry) => entry.contentType === PRESENTATION_CONTENT_TYPE2);
   return override?.partName;
 }
 var MEDIA_CONTENT_TYPE_PREFIXES = ["image/", "audio/", "video/"];
@@ -10084,9 +10150,9 @@ function extensionOf(path) {
 function stripLeadingSlash(path) {
   return path.startsWith("/") ? path.slice(1) : path;
 }
-var textEncoder = new TextEncoder();
-var textDecoder3 = new TextDecoder();
-var xmlBuilder = new import_fast_xml_parser2.XMLBuilder({
+var textEncoder2 = new TextEncoder();
+var textDecoder4 = new TextDecoder();
+var xmlBuilder2 = new import_fast_xml_parser3.XMLBuilder({
   ignoreAttributes: false,
   attributeNamePrefix: "@_",
   format: false,