pptx-glimpse 3.1.0 → 3.1.1

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,790 +6362,365 @@ 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);
-    return fill ?? { kind: "raw", raw: makeSidecar("a:gradFill", grad, nextId) };
-  }
-  const blip = getChild(parent, "blipFill");
-  if (blip) {
-    return parseBlipFill(blip) ?? { kind: "raw", raw: makeSidecar("a:blipFill", blip, nextId) };
-  }
-  const pattern = getChild(parent, "pattFill");
-  if (pattern) {
-    const fill = parsePatternFill(pattern);
-    return fill ?? { kind: "raw", raw: makeSidecar("a:pattFill", pattern, nextId) };
-  }
-  for (const name of RAW_FILL_LOCAL_NAMES) {
-    if (hasChild(parent, name)) {
-      return { kind: "raw", raw: makeSidecar(`a:${name}`, getChild(parent, name) ?? {}, nextId) };
-    }
-  }
-  return void 0;
-}
-function parseGradientFill(grad) {
-  const stops = [];
-  for (const gs of getChildArray(getChild(grad, "gsLst"), "gs")) {
-    const color = parseColorElement(gs);
-    if (color === void 0) continue;
-    stops.push({
-      position: (numericAttr(gs, "pos") ?? 0) / 1e5,
-      color
-    });
-  }
-  if (stops.length === 0) return void 0;
-  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;
-    return {
-      kind: "gradient",
-      gradientType: "radial",
-      stops,
-      centerX: (l + (1e5 - r)) / 2 / 1e5,
-      centerY: (t + (1e5 - b)) / 2 / 1e5
-    };
-  }
-  return {
-    kind: "gradient",
-    gradientType: "linear",
-    stops,
-    angle: asOoxmlAngle(numericAttr(getChild(grad, "lin"), "ang") ?? 0)
-  };
-}
-function parseBlipFill(blipFill) {
-  const blip = getChild(blipFill, "blip");
-  const embed = getNamespacedAttr(blip, "embed");
-  if (embed === void 0) return void 0;
-  const tile = parseImageFillTile(getChild(blipFill, "tile"));
-  return {
-    kind: "image",
-    blipRelationshipId: asRelationshipId(embed),
-    ...tile !== void 0 ? { tile } : {}
-  };
-}
-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 orderedNodeKey(node) {
+  return Object.keys(node).find((key) => key !== ":@");
 }
-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 parseEnumValue(value, allowed) {
+  return value !== void 0 && allowed.has(unsafeOoxmlBoundaryAssertion(value)) ? unsafeOoxmlBoundaryAssertion(value) : void 0;
 }
-function parseOutline(spPr, nextId) {
-  const ln = getChild(spPr, "ln");
-  return parseLine(ln, nextId);
+function parseEnumValueWithDefault(value, allowed, fallback) {
+  return parseEnumValue(value, allowed) ?? fallback;
 }
-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"));
+var KNOWN_TXBODY_CHILDREN = /* @__PURE__ */ new Set(["bodyPr", "lstStyle", "p"]);
+var KNOWN_PARAGRAPH_CHILDREN = /* @__PURE__ */ new Set([
+  "pPr",
+  "r",
+  "fld",
+  "br",
+  "endParaRPr"
+]);
+var KNOWN_RUN_CHILDREN = /* @__PURE__ */ new Set(["rPr", "t"]);
+var KNOWN_RUN_PROPERTY_CHILDREN = /* @__PURE__ */ new Set([
+  "latin",
+  "ea",
+  "cs",
+  "solidFill"
+]);
+var ALIGN_MAP = {
+  l: "left",
+  ctr: "center",
+  r: "right",
+  just: "justify"
+};
+var ANCHOR_MAP = {
+  t: "top",
+  ctr: "middle",
+  b: "bottom"
+};
+var WRAP_VALUES = /* @__PURE__ */ new Set(["square", "none"]);
+var VERTICAL_VALUES = /* @__PURE__ */ new Set([
+  "horz",
+  "vert",
+  "vert270",
+  "eaVert",
+  "wordArtVert",
+  "mongolianVert"
+]);
+var VALID_AUTO_NUM_SCHEMES = /* @__PURE__ */ new Set([
+  "arabicPeriod",
+  "arabicParenR",
+  "romanUcPeriod",
+  "romanLcPeriod",
+  "alphaUcPeriod",
+  "alphaLcPeriod",
+  "alphaLcParenR",
+  "alphaUcParenR",
+  "arabicPlain"
+]);
+function parseTextBody(txBody, partPath, nextId, ownerNodeId, ownerOrderingSlot, orderedTxBody) {
+  if (!txBody) return void 0;
+  const properties = parseBodyProperties(getChild(txBody, "bodyPr"));
+  const listStyle = parseTextStyle(getChild(txBody, "lstStyle"));
+  const orderedParagraphs = orderedTxBody?.filter((child) => orderedLocalName(child) === "p").map((child) => {
+    const key = orderedKey(child);
+    const value = key !== void 0 ? child[key] : void 0;
+    return Array.isArray(value) ? value : void 0;
+  });
+  const paragraphs = [];
+  let logicalParagraphIndex = 0;
+  getChildArray(txBody, "p").forEach((p, paragraphIndex) => {
+    const orderedChildren = orderedParagraphs?.[paragraphIndex];
+    if (orderedChildren !== void 0 && hasMultipleBulletPPr(p, orderedChildren)) {
+      const split = splitInterleavedParagraph(
+        p,
+        orderedChildren,
+        partPath,
+        nextId,
+        ownerNodeId,
+        ownerOrderingSlot,
+        logicalParagraphIndex
+      );
+      paragraphs.push(...split);
+      logicalParagraphIndex += split.length;
+      return;
+    }
+    paragraphs.push(
+      parseParagraph(
+        p,
+        partPath,
+        nextId,
+        ownerNodeId,
+        ownerOrderingSlot,
+        logicalParagraphIndex,
+        orderedChildren
+      )
+    );
+    logicalParagraphIndex++;
+  });
+  const rawSidecars = collectUnknownSidecars(txBody, KNOWN_TXBODY_CHILDREN, nextId);
   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 } : {}
+    paragraphs,
+    ...properties !== void 0 ? { properties } : {},
+    ...listStyle !== void 0 ? { listStyle } : {},
+    handle: { partPath },
+    ...rawSidecars.length > 0 ? { rawSidecars } : {}
   };
 }
-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) {
+function parseTextStyle(node) {
+  if (node === void 0) return void 0;
+  const defaultParagraph = parseParagraphProperties(getChild(node, "defPPr"));
+  const levels = Array.from(
+    { length: 9 },
+    (_, index) => parseParagraphProperties(getChild(node, `lvl${index + 1}pPr`))
+  );
+  if (defaultParagraph === void 0 && levels.every((level) => level === 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 } : {}
-  };
+  return { ...defaultParagraph !== void 0 ? { defaultParagraph } : {}, levels };
 }
-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)
-      });
+function hasMultipleBulletPPr(p, orderedChildren) {
+  const pPrList = getChildArray(p, "pPr");
+  let bulletPPrCount = 0;
+  let pPrCounter = 0;
+  for (const child of orderedChildren) {
+    if (orderedLocalName(child) !== "pPr") continue;
+    const pPr = pPrList[pPrCounter];
+    if (pPr !== void 0 && (getChild(pPr, "buChar") !== void 0 || getChild(pPr, "buAutoNum") !== void 0)) {
+      bulletPPrCount++;
+      if (bulletPPrCount >= 2) return true;
     }
+    pPrCounter++;
   }
-  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;
-  return {
-    command: `A ${round4(widthRadius)} ${round4(heightRadius)} 0 ${largeArcFlag} ${sweepFlag} ${round4(endX)} ${round4(endY)}`,
-    endX,
-    endY
-  };
-}
-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 {
-    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 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 resolveValue(value, variables) {
-  const numeric = Number(value);
-  return Number.isNaN(numeric) ? variables[value] ?? 0 : numeric;
-}
-function numericAttr2(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 round4(value) {
-  return Math.round(value * 1e3) / 1e3;
-}
-function toRadians(ooxmlAngle) {
-  return ooxmlAngle / 6e4 * (Math.PI / 180);
-}
-function orderedChildChildren(parent, childLocalName) {
-  const child = orderedChildEntries(parent, childLocalName)[0];
-  return orderedNodeChildren(child);
-}
-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 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 orderedNodeKey(node) {
-  return Object.keys(node).find((key) => key !== ":@");
-}
-var KNOWN_TXBODY_CHILDREN = /* @__PURE__ */ new Set(["bodyPr", "lstStyle", "p"]);
-var KNOWN_PARAGRAPH_CHILDREN = /* @__PURE__ */ new Set([
-  "pPr",
-  "r",
-  "fld",
-  "br",
-  "endParaRPr"
-]);
-var KNOWN_RUN_CHILDREN = /* @__PURE__ */ new Set(["rPr", "t"]);
-var KNOWN_RUN_PROPERTY_CHILDREN = /* @__PURE__ */ new Set([
-  "latin",
-  "ea",
-  "cs",
-  "solidFill"
-]);
-var ALIGN_MAP = {
-  l: "left",
-  ctr: "center",
-  r: "right",
-  just: "justify"
-};
-var ANCHOR_MAP = {
-  t: "top",
-  ctr: "middle",
-  b: "bottom"
-};
-var WRAP_VALUES = /* @__PURE__ */ new Set(["square", "none"]);
-var VERTICAL_VALUES = /* @__PURE__ */ new Set([
-  "horz",
-  "vert",
-  "vert270",
-  "eaVert",
-  "wordArtVert",
-  "mongolianVert"
-]);
-var VALID_AUTO_NUM_SCHEMES = /* @__PURE__ */ new Set([
-  "arabicPeriod",
-  "arabicParenR",
-  "romanUcPeriod",
-  "romanLcPeriod",
-  "alphaUcPeriod",
-  "alphaLcPeriod",
-  "alphaLcParenR",
-  "alphaUcParenR",
-  "arabicPlain"
-]);
-function parseTextBody(txBody, partPath, nextId, ownerNodeId, ownerOrderingSlot, orderedTxBody) {
-  if (!txBody) return void 0;
-  const properties = parseBodyProperties(getChild(txBody, "bodyPr"));
-  const listStyle = parseTextStyle(getChild(txBody, "lstStyle"));
-  const orderedParagraphs = orderedTxBody?.filter((child) => orderedLocalName(child) === "p").map((child) => {
-    const key = orderedKey(child);
-    const value = key !== void 0 ? child[key] : void 0;
-    return Array.isArray(value) ? value : void 0;
-  });
-  const paragraphs = [];
-  let logicalParagraphIndex = 0;
-  getChildArray(txBody, "p").forEach((p, paragraphIndex) => {
-    const orderedChildren = orderedParagraphs?.[paragraphIndex];
-    if (orderedChildren !== void 0 && hasMultipleBulletPPr(p, orderedChildren)) {
-      const split = splitInterleavedParagraph(
-        p,
-        orderedChildren,
-        partPath,
-        nextId,
-        ownerNodeId,
-        ownerOrderingSlot,
-        logicalParagraphIndex
-      );
-      paragraphs.push(...split);
-      logicalParagraphIndex += split.length;
-      return;
-    }
-    paragraphs.push(
-      parseParagraph(
-        p,
-        partPath,
-        nextId,
-        ownerNodeId,
-        ownerOrderingSlot,
-        logicalParagraphIndex,
-        orderedChildren
-      )
-    );
-    logicalParagraphIndex++;
-  });
-  const rawSidecars = collectUnknownSidecars(txBody, KNOWN_TXBODY_CHILDREN, nextId);
-  return {
-    paragraphs,
-    ...properties !== void 0 ? { properties } : {},
-    ...listStyle !== void 0 ? { listStyle } : {},
-    handle: { partPath },
-    ...rawSidecars.length > 0 ? { rawSidecars } : {}
-  };
-}
-function parseTextStyle(node) {
-  if (node === void 0) return void 0;
-  const defaultParagraph = parseParagraphProperties(getChild(node, "defPPr"));
-  const levels = Array.from(
-    { length: 9 },
-    (_, index) => parseParagraphProperties(getChild(node, `lvl${index + 1}pPr`))
-  );
-  if (defaultParagraph === void 0 && levels.every((level) => level === void 0)) {
-    return void 0;
-  }
-  return { ...defaultParagraph !== void 0 ? { defaultParagraph } : {}, levels };
-}
-function hasMultipleBulletPPr(p, orderedChildren) {
-  const pPrList = getChildArray(p, "pPr");
-  let bulletPPrCount = 0;
-  let pPrCounter = 0;
-  for (const child of orderedChildren) {
-    if (orderedLocalName(child) !== "pPr") continue;
-    const pPr = pPrList[pPrCounter];
-    if (pPr !== void 0 && (getChild(pPr, "buChar") !== void 0 || getChild(pPr, "buAutoNum") !== void 0)) {
-      bulletPPrCount++;
-      if (bulletPPrCount >= 2) return true;
-    }
-    pPrCounter++;
-  }
-  return false;
+  return false;
 }
 function splitInterleavedParagraph(p, orderedChildren, partPath, nextId, ownerNodeId, ownerOrderingSlot, paragraphIndex) {
   const pPrList = getChildArray(p, "pPr");
@@ -7273,20 +6821,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 +6966,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 = {
@@ -7447,859 +6995,1344 @@ function parseParagraphProperties(pPr) {
   };
   return Object.keys(properties).length > 0 ? properties : void 0;
 }
-function parseTabStops(pPr) {
-  return getChildArray(getChild(pPr, "tabLst"), "tab").map((tab) => ({
-    position: emu(numericAttr(tab, "pos") ?? 0),
-    alignment: unsafeOoxmlBoundaryAssertion(getAttr(tab, "algn")) ?? "l"
-  }));
+function parseTabStops(pPr) {
+  return getChildArray(getChild(pPr, "tabLst"), "tab").map((tab) => ({
+    position: emu(numericAttr2(tab, "pos") ?? 0),
+    alignment: unsafeOoxmlBoundaryAssertion(getAttr(tab, "algn")) ?? "l"
+  }));
+}
+function parseSpacing(node) {
+  const points = numericAttr2(getChild(node, "spcPts"), "val");
+  if (points !== void 0) return { type: "pts", value: asHundredthPt2(points) };
+  const percent = numericAttr2(getChild(node, "spcPct"), "val");
+  if (percent !== void 0) return { type: "pct", value: percent };
+  return void 0;
+}
+function parseBullet(pPr) {
+  if (pPr === void 0) return void 0;
+  if (getChild(pPr, "buNone") !== void 0) return { type: "none" };
+  const buChar = getChild(pPr, "buChar");
+  if (buChar !== void 0) {
+    return { type: "char", char: decodeXmlCharRef(getAttr(buChar, "char") ?? "\u2022") };
+  }
+  const buAutoNum = getChild(pPr, "buAutoNum");
+  if (buAutoNum !== void 0) {
+    const scheme = getAttr(buAutoNum, "type") ?? "arabicPeriod";
+    return {
+      type: "autoNum",
+      scheme: parseEnumValueWithDefault(scheme, VALID_AUTO_NUM_SCHEMES, "arabicPeriod"),
+      startAt: numericAttr2(buAutoNum, "startAt") ?? 1
+    };
+  }
+  return void 0;
+}
+function decodeXmlCharRef(value) {
+  return value.replace(
+    /&#x([0-9a-fA-F]+);|&#([0-9]+);/g,
+    (_match, hex, decimal) => String.fromCodePoint(parseInt(hex ?? decimal ?? "0", hex !== void 0 ? 16 : 10))
+  );
+}
+function parseRun(r, partPath, nextId, ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex) {
+  const properties = parseRunProperties(getChild(r, "rPr"));
+  const rawSidecars = collectRunSidecars(r, nextId);
+  return {
+    kind: "textRun",
+    text: decodeXmlCharRef(getChildText(r, "t") ?? ""),
+    ...properties !== void 0 ? { properties } : {},
+    handle: {
+      partPath,
+      nodeId: textNodeId("run", ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex),
+      orderingSlot: runIndex
+    },
+    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+  };
+}
+function parseBreakRun(br, partPath, nextId, ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex) {
+  const properties = parseRunProperties(getChild(br, "rPr"));
+  return {
+    kind: "textRun",
+    text: "\n",
+    ...properties !== void 0 ? { properties } : {},
+    handle: {
+      partPath,
+      nodeId: textNodeId("run", ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex),
+      orderingSlot: runIndex
+    }
+  };
+}
+function parseRunProperties(rPr) {
+  if (!rPr) return void 0;
+  const bold = getAttr(rPr, "b");
+  const italic = getAttr(rPr, "i");
+  const underline = getAttr(rPr, "u");
+  const strike = getAttr(rPr, "strike");
+  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");
+  const hasHyperlink = getChild(rPr, "hlinkClick") !== void 0;
+  const color = parseColorElement(getChild(rPr, "solidFill"));
+  const properties = {
+    ...bold !== void 0 ? { bold: isTrue(bold) } : {},
+    ...italic !== void 0 ? { italic: isTrue(italic) } : {},
+    ...underline !== void 0 ? { underline: underline !== "none" } : hasHyperlink ? { underline: true } : {},
+    ...strike !== void 0 ? { strikethrough: strike !== "noStrike" } : {},
+    ...baseline !== void 0 ? { baseline: baseline / 1e3 } : {},
+    // `a:rPr@sz` is in 1/100 pt unit. Convert to pt and save.
+    ...size !== void 0 ? { fontSize: asPt(size / 100) } : {},
+    ...typeface !== void 0 ? { typeface } : {},
+    ...typefaceEa !== void 0 ? { typefaceEa } : {},
+    ...typefaceCs !== void 0 ? { typefaceCs } : {},
+    ...color !== void 0 ? { color } : hasHyperlink ? { color: { kind: "scheme", scheme: "hlink" } } : {}
+  };
+  return Object.keys(properties).length > 0 ? properties : void 0;
+}
+function collectRunSidecars(r, nextId) {
+  const runLevel = collectUnknownSidecars(r, KNOWN_RUN_CHILDREN, nextId);
+  const propLevel = collectUnknownSidecars(getChild(r, "rPr"), KNOWN_RUN_PROPERTY_CHILDREN, nextId);
+  return [...runLevel, ...propLevel];
 }
-function parseSpacing(node) {
-  const points = numericAttr(getChild(node, "spcPts"), "val");
-  if (points !== void 0) return { type: "pts", value: asHundredthPt2(points) };
-  const percent = numericAttr(getChild(node, "spcPct"), "val");
-  if (percent !== void 0) return { type: "pct", value: percent };
-  return void 0;
+function emu(value) {
+  return asEmu2(value);
 }
-function parseBullet(pPr) {
-  if (pPr === void 0) return void 0;
-  if (getChild(pPr, "buNone") !== void 0) return { type: "none" };
-  const buChar = getChild(pPr, "buChar");
-  if (buChar !== void 0) {
-    return { type: "char", char: decodeXmlCharRef(getAttr(buChar, "char") ?? "\u2022") };
+function textNodeId(kind, ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex) {
+  const owner = ownerNodeId !== void 0 ? `shape:${ownerNodeId}` : `shapeSlot:${ownerOrderingSlot}`;
+  const suffix = kind === "paragraph" ? `p:${paragraphIndex}` : `p:${paragraphIndex}:r:${runIndex}`;
+  return asSourceNodeId(`text:${owner}:${suffix}`);
+}
+function orderedKey(node) {
+  return Object.keys(node).find((key) => key !== ":@");
+}
+function orderedLocalName(node) {
+  const key = orderedKey(node);
+  return key !== void 0 ? localName(key) : void 0;
+}
+var KNOWN_SHAPE_CHILDREN = /* @__PURE__ */ new Set(["nvSpPr", "spPr", "style", "txBody"]);
+var KNOWN_CONNECTOR_CHILDREN = /* @__PURE__ */ new Set(["nvCxnSpPr", "spPr", "style"]);
+var KNOWN_GROUP_CHILDREN = /* @__PURE__ */ new Set(["nvGrpSpPr", "grpSpPr"]);
+var KNOWN_PICTURE_CHILDREN = /* @__PURE__ */ new Set(["nvPicPr", "blipFill", "spPr"]);
+var KNOWN_BLIP_FILL_CHILDREN = /* @__PURE__ */ new Set([
+  "blip",
+  "srcRect",
+  "stretch",
+  "tile"
+]);
+var KNOWN_BLIP_CHILDREN = /* @__PURE__ */ new Set([
+  "grayscl",
+  "biLevel",
+  "blur",
+  "lum",
+  "duotone",
+  "clrChange"
+]);
+var KNOWN_EFFECT_CHILDREN = /* @__PURE__ */ new Set([
+  "outerShdw",
+  "innerShdw",
+  "glow",
+  "softEdge"
+]);
+var KNOWN_GRAPHIC_FRAME_CHILDREN = /* @__PURE__ */ new Set([
+  "nvGraphicFramePr",
+  "xfrm",
+  "graphic"
+]);
+var KNOWN_GRAPHIC_CHILDREN = /* @__PURE__ */ new Set(["graphicData"]);
+var KNOWN_GRAPHIC_DATA_CHILDREN = /* @__PURE__ */ new Set(["tbl"]);
+var KNOWN_TABLE_CHILDREN = /* @__PURE__ */ new Set(["tblPr", "tblGrid", "tr"]);
+var KNOWN_TABLE_CELL_CHILDREN = /* @__PURE__ */ new Set(["txBody", "tcPr"]);
+var KNOWN_TABLE_CELL_PROPERTIES_CHILDREN = /* @__PURE__ */ new Set([
+  "lnL",
+  "lnR",
+  "lnT",
+  "lnB",
+  "solidFill",
+  "noFill",
+  "gradFill",
+  "blipFill",
+  "pattFill",
+  "grpFill"
+]);
+var KNOWN_SP_PR_CHILDREN = /* @__PURE__ */ new Set([
+  "xfrm",
+  "prstGeom",
+  "solidFill",
+  "noFill",
+  "gradFill",
+  "blipFill",
+  "pattFill",
+  "grpFill",
+  "ln",
+  "effectLst"
+]);
+var SHAPE_TREE_NODE_TAGS = /* @__PURE__ */ new Set([
+  "sp",
+  "pic",
+  "cxnSp",
+  "grpSp",
+  "graphicFrame"
+]);
+var CHART_GRAPHIC_DATA_URIS = /* @__PURE__ */ new Set([
+  "http://schemas.openxmlformats.org/drawingml/2006/chart",
+  "http://purl.oclc.org/ooxml/drawingml/chart"
+]);
+var SMARTART_DIAGRAM_URIS = /* @__PURE__ */ new Set([
+  "http://schemas.openxmlformats.org/drawingml/2006/diagram",
+  "http://purl.oclc.org/ooxml/drawingml/diagram"
+]);
+function parseShapeTree(spTree, partPath, nextId, orderedChildren) {
+  if (!spTree) return [];
+  if (orderedChildren !== void 0) {
+    return parseShapeTreeOrdered(spTree, partPath, nextId, orderedChildren);
   }
-  const buAutoNum = getChild(pPr, "buAutoNum");
-  if (buAutoNum !== void 0) {
-    const scheme = getAttr(buAutoNum, "type") ?? "arabicPeriod";
-    return {
-      type: "autoNum",
-      scheme: parseEnumValueWithDefault(scheme, VALID_AUTO_NUM_SCHEMES, "arabicPeriod"),
-      startAt: numericAttr(buAutoNum, "startAt") ?? 1
-    };
+  const nodes = [];
+  let orderingSlot = 0;
+  for (const key of Object.keys(spTree)) {
+    if (key.startsWith("@_")) continue;
+    if (key === "#text") continue;
+    const local = localName(key);
+    if (local === "nvGrpSpPr" || local === "grpSpPr") continue;
+    const value = spTree[key];
+    const items = Array.isArray(value) ? value : [value];
+    for (const item of items) {
+      const node = unsafeOoxmlBoundaryAssertion(item);
+      if (local === "sp") {
+        nodes.push(parseShape(node, partPath, nextId, orderingSlot));
+      } else if (local === "pic") {
+        nodes.push(parseImage(node, partPath, nextId, orderingSlot));
+      } else if (local === "cxnSp") {
+        nodes.push(parseConnector(node, partPath, nextId, orderingSlot));
+      } else if (local === "grpSp") {
+        nodes.push(parseGroup(node, partPath, nextId, orderingSlot));
+      } else if (local === "graphicFrame") {
+        nodes.push(parseGraphicFrame(node, partPath, nextId, orderingSlot));
+      } else if (local === "AlternateContent") {
+        const parsed = parseAlternateContent(node, partPath, nextId, orderingSlot);
+        nodes.push(...parsed);
+      } else {
+        nodes.push(parseRawShapeNode(key, node, partPath, nextId, orderingSlot));
+      }
+      orderingSlot++;
+    }
   }
-  return void 0;
+  return nodes;
 }
-function decodeXmlCharRef(value) {
-  return value.replace(
-    /&#x([0-9a-fA-F]+);|&#([0-9]+);/g,
-    (_match, hex, decimal) => String.fromCodePoint(parseInt(hex ?? decimal ?? "0", hex !== void 0 ? 16 : 10))
+function parseShapeTreeOrdered(spTree, partPath, nextId, orderedChildren) {
+  const nodes = [];
+  const tagCounters = {};
+  let orderingSlot = 0;
+  for (const child of orderedChildren) {
+    const key = Object.keys(child).find((candidate) => candidate !== ":@");
+    if (key === void 0) continue;
+    const local = localName(key);
+    if (local === "AlternateContent") {
+      const index2 = tagCounters[local] ?? 0;
+      tagCounters[local] = index2 + 1;
+      const alternateContents = getChildArray(spTree, "AlternateContent");
+      const alternateContent = alternateContents[index2];
+      if (alternateContent !== void 0) {
+        nodes.push(...parseAlternateContent(alternateContent, partPath, nextId, orderingSlot));
+        orderingSlot++;
+      }
+      continue;
+    }
+    if (!SHAPE_TREE_NODE_TAGS.has(local)) continue;
+    const index = tagCounters[local] ?? 0;
+    tagCounters[local] = index + 1;
+    const node = getChildArray(spTree, local)[index];
+    if (node === void 0) continue;
+    nodes.push(parseShapeTreeNode(local, node, child, partPath, nextId, orderingSlot));
+    orderingSlot++;
+  }
+  return nodes;
+}
+function parseShapeTreeNode(local, node, orderedNode, partPath, nextId, orderingSlot) {
+  if (local === "sp") return parseShape(node, partPath, nextId, orderingSlot, orderedNode);
+  if (local === "pic") return parseImage(node, partPath, nextId, orderingSlot);
+  if (local === "cxnSp") {
+    return parseConnector(node, partPath, nextId, orderingSlot, orderedNode);
+  }
+  if (local === "grpSp") {
+    const orderedGroupChildren = unsafeOoxmlBoundaryAssertion(orderedNode?.[local]);
+    return parseGroup(node, partPath, nextId, orderingSlot, orderedGroupChildren);
+  }
+  if (local === "graphicFrame") {
+    return parseGraphicFrame(node, partPath, nextId, orderingSlot, orderedNode);
+  }
+  return parseRawShapeNode(`p:${local}`, node, partPath, nextId, orderingSlot);
+}
+function parseShape(sp, partPath, nextId, orderingSlot, orderedNode) {
+  const nvSpPr = getChild(sp, "nvSpPr");
+  const cNvPr = getChild(nvSpPr, "cNvPr");
+  const nodeId = sourceNodeId(cNvPr);
+  const name = getAttr(cNvPr, "name");
+  const placeholder = parsePlaceholder(getChild(getChild(nvSpPr, "nvPr"), "ph"));
+  const spPr = getChild(sp, "spPr");
+  const transform = parseTransform(spPr);
+  const geometry = parseGeometry(spPr, orderedNestedChildChildren(orderedNode, "sp", "spPr"));
+  const fill = parseFill(spPr, nextId);
+  const outline = parseOutline(spPr, nextId);
+  const effects = parseEffectList(getChild(spPr, "effectLst"));
+  const style = parseShapeStyle(getChild(sp, "style"));
+  const textBody = parseTextBody(
+    getChild(sp, "txBody"),
+    partPath,
+    nextId,
+    nodeId,
+    orderingSlot,
+    orderedNestedChildChildren(orderedNode, "sp", "txBody")
   );
+  const rawSidecars = [
+    ...collectUnknownSidecars(sp, KNOWN_SHAPE_CHILDREN, nextId),
+    ...collectUnknownSidecars(spPr, KNOWN_SP_PR_CHILDREN, nextId),
+    ...collectEffectSidecars(spPr, effects, nextId)
+  ];
+  return {
+    kind: "shape",
+    ...nodeId !== void 0 ? { nodeId } : {},
+    ...name !== void 0 ? { name } : {},
+    ...transform !== void 0 ? { transform } : {},
+    ...geometry !== void 0 ? { geometry } : {},
+    ...fill !== void 0 ? { fill } : {},
+    ...outline !== void 0 ? { outline } : {},
+    ...effects !== void 0 ? { effects } : {},
+    ...style !== void 0 ? { style } : {},
+    ...textBody !== void 0 ? { textBody } : {},
+    ...placeholder !== void 0 ? { placeholder } : {},
+    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot },
+    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+  };
 }
-function parseRun(r, partPath, nextId, ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex) {
-  const properties = parseRunProperties(getChild(r, "rPr"));
-  const rawSidecars = collectRunSidecars(r, nextId);
+function parseConnector(cxnSp, partPath, nextId, orderingSlot, orderedNode) {
+  const nvCxnSpPr = getChild(cxnSp, "nvCxnSpPr");
+  const cNvPr = getChild(nvCxnSpPr, "cNvPr");
+  const cNvCxnSpPr = getChild(nvCxnSpPr, "cNvCxnSpPr");
+  const nodeId = sourceNodeId(cNvPr);
+  const name = getAttr(cNvPr, "name");
+  const connection = parseConnectorConnection(cNvCxnSpPr);
+  const spPr = getChild(cxnSp, "spPr");
+  const transform = parseTransform(spPr);
+  const geometry = parseGeometry(spPr, orderedNestedChildChildren(orderedNode, "cxnSp", "spPr"));
+  const outline = parseOutline(spPr, nextId);
+  const effects = parseEffectList(getChild(spPr, "effectLst"));
+  const style = parseShapeStyle(getChild(cxnSp, "style"));
+  const rawSidecars = [
+    ...collectUnknownSidecars(cxnSp, KNOWN_CONNECTOR_CHILDREN, nextId),
+    ...collectUnknownSidecars(spPr, KNOWN_SP_PR_CHILDREN, nextId),
+    ...collectEffectSidecars(spPr, effects, nextId)
+  ];
   return {
-    kind: "textRun",
-    text: decodeXmlCharRef(getChildText(r, "t") ?? ""),
-    ...properties !== void 0 ? { properties } : {},
-    handle: {
-      partPath,
-      nodeId: textNodeId("run", ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex),
-      orderingSlot: runIndex
-    },
+    kind: "connector",
+    ...nodeId !== void 0 ? { nodeId } : {},
+    ...name !== void 0 ? { name } : {},
+    ...connection !== void 0 ? { connection } : {},
+    ...transform !== void 0 ? { transform } : {},
+    ...geometry !== void 0 ? { geometry } : {},
+    ...outline !== void 0 ? { outline } : {},
+    ...effects !== void 0 ? { effects } : {},
+    ...style !== void 0 ? { style } : {},
+    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot },
     ...rawSidecars.length > 0 ? { rawSidecars } : {}
   };
 }
-function parseBreakRun(br, partPath, nextId, ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex) {
-  const properties = parseRunProperties(getChild(br, "rPr"));
+function parseConnectorConnection(cNvCxnSpPr) {
+  const start = parseConnectorConnectionEndpoint(getChild(cNvCxnSpPr, "stCxn"));
+  const end = parseConnectorConnectionEndpoint(getChild(cNvCxnSpPr, "endCxn"));
+  return start !== void 0 || end !== void 0 ? {
+    ...start !== void 0 ? { start } : {},
+    ...end !== void 0 ? { end } : {}
+  } : void 0;
+}
+function parseConnectorConnectionEndpoint(node) {
+  const shapeId = getAttr(node, "id");
+  const connectionSiteIndex = numericAttr2(node, "idx");
+  if (shapeId === void 0 || connectionSiteIndex === void 0) return void 0;
   return {
-    kind: "textRun",
-    text: "\n",
-    ...properties !== void 0 ? { properties } : {},
-    handle: {
-      partPath,
-      nodeId: textNodeId("run", ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex),
-      orderingSlot: runIndex
-    }
+    shapeId: asSourceNodeId(shapeId),
+    connectionSiteIndex
   };
 }
-function parseRunProperties(rPr) {
-  if (!rPr) return void 0;
-  const bold = getAttr(rPr, "b");
-  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 typeface = getAttr(getChild(rPr, "latin"), "typeface");
-  const typefaceEa = getAttr(getChild(rPr, "ea"), "typeface");
-  const typefaceCs = getAttr(getChild(rPr, "cs"), "typeface");
-  const hasHyperlink = getChild(rPr, "hlinkClick") !== void 0;
-  const color = parseColorElement(getChild(rPr, "solidFill"));
-  const properties = {
-    ...bold !== void 0 ? { bold: isTrue(bold) } : {},
-    ...italic !== void 0 ? { italic: isTrue(italic) } : {},
-    ...underline !== void 0 ? { underline: underline !== "none" } : hasHyperlink ? { underline: true } : {},
-    ...strike !== void 0 ? { strikethrough: strike !== "noStrike" } : {},
-    ...baseline !== void 0 ? { baseline: baseline / 1e3 } : {},
-    // `a:rPr@sz` is in 1/100 pt unit. Convert to pt and save.
-    ...size !== void 0 ? { fontSize: asPt(size / 100) } : {},
-    ...typeface !== void 0 ? { typeface } : {},
-    ...typefaceEa !== void 0 ? { typefaceEa } : {},
-    ...typefaceCs !== void 0 ? { typefaceCs } : {},
-    ...color !== void 0 ? { color } : hasHyperlink ? { color: { kind: "scheme", scheme: "hlink" } } : {}
+function parseShapeStyle(style) {
+  if (style === void 0) return void 0;
+  const fillRef = parseStyleReference(getChild(style, "fillRef"));
+  const lineRef = parseStyleReference(getChild(style, "lnRef"));
+  const effectRef = parseStyleReference(getChild(style, "effectRef"));
+  const parsed = {
+    ...fillRef !== void 0 ? { fillRef } : {},
+    ...lineRef !== void 0 ? { lineRef } : {},
+    ...effectRef !== void 0 ? { effectRef } : {}
   };
-  return Object.keys(properties).length > 0 ? properties : void 0;
-}
-function collectRunSidecars(r, nextId) {
-  const runLevel = collectUnknownSidecars(r, KNOWN_RUN_CHILDREN, nextId);
-  const propLevel = collectUnknownSidecars(getChild(r, "rPr"), KNOWN_RUN_PROPERTY_CHILDREN, nextId);
-  return [...runLevel, ...propLevel];
-}
-function emu(value) {
-  return asEmu2(value);
+  return Object.keys(parsed).length > 0 ? parsed : void 0;
 }
-function textNodeId(kind, ownerNodeId, ownerOrderingSlot, paragraphIndex, runIndex) {
-  const owner = ownerNodeId !== void 0 ? `shape:${ownerNodeId}` : `shapeSlot:${ownerOrderingSlot}`;
-  const suffix = kind === "paragraph" ? `p:${paragraphIndex}` : `p:${paragraphIndex}:r:${runIndex}`;
-  return asSourceNodeId(`text:${owner}:${suffix}`);
+function parseStyleReference(ref) {
+  if (ref === void 0) return void 0;
+  const index = numericAttr2(ref, "idx") ?? 0;
+  const color = parseColorElement(ref);
+  return {
+    index,
+    ...color !== void 0 ? { color } : {}
+  };
 }
-function orderedKey(node) {
-  return Object.keys(node).find((key) => key !== ":@");
+function parseGroup(grpSp, partPath, nextId, orderingSlot, orderedChildren) {
+  const nvGrpSpPr = getChild(grpSp, "nvGrpSpPr");
+  const cNvPr = getChild(nvGrpSpPr, "cNvPr");
+  const nodeId = sourceNodeId(cNvPr);
+  const name = getAttr(cNvPr, "name");
+  const grpSpPr = getChild(grpSp, "grpSpPr");
+  const transform = parseTransform(grpSpPr);
+  const childTransform = parseChildTransform(grpSpPr, transform);
+  const fill = parseFill(grpSpPr, nextId);
+  const effects = parseEffectList(getChild(grpSpPr, "effectLst"));
+  const rawSidecars = [
+    ...collectUnknownSidecars(grpSp, KNOWN_GROUP_CHILDREN, nextId),
+    ...collectUnknownSidecars(grpSpPr, KNOWN_SP_PR_CHILDREN, nextId),
+    ...collectEffectSidecars(grpSpPr, effects, nextId)
+  ];
+  return {
+    kind: "group",
+    ...nodeId !== void 0 ? { nodeId } : {},
+    ...name !== void 0 ? { name } : {},
+    ...transform !== void 0 ? { transform } : {},
+    ...childTransform !== void 0 ? { childTransform } : {},
+    ...fill !== void 0 ? { fill } : {},
+    ...effects !== void 0 ? { effects } : {},
+    children: parseShapeTree(grpSp, partPath, nextId, orderedChildren),
+    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot },
+    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+  };
 }
-function orderedLocalName(node) {
-  const key = orderedKey(node);
-  return key !== void 0 ? localName(key) : void 0;
+function parseImage(pic, partPath, nextId, orderingSlot) {
+  const cNvPr = getChild(getChild(pic, "nvPicPr"), "cNvPr");
+  const nodeId = sourceNodeId(cNvPr);
+  const name = getAttr(cNvPr, "name");
+  const blipFill = getChild(pic, "blipFill");
+  const blip = getChild(blipFill, "blip");
+  const embed = getNamespacedAttr(blip, "embed");
+  const crop = parseCrop(getChild(blipFill, "srcRect"));
+  const stretch = parseStretch(getChild(blipFill, "stretch"));
+  const tile = parseImageFillTile(getChild(blipFill, "tile"));
+  const blipEffects = parseBlipEffects(blip);
+  const spPr = getChild(pic, "spPr");
+  const transform = parseTransform(spPr);
+  const effects = parseEffectList(getChild(spPr, "effectLst"));
+  const rawSidecars = [
+    ...collectUnknownSidecars(pic, KNOWN_PICTURE_CHILDREN, nextId),
+    ...collectUnknownSidecars(spPr, KNOWN_SP_PR_CHILDREN, nextId),
+    ...collectEffectSidecars(spPr, effects, nextId),
+    // Retains fill mode such as `a:stretch` / `a:tile` and recolor operation under blip.
+    ...collectUnknownSidecars(blipFill, KNOWN_BLIP_FILL_CHILDREN, nextId),
+    ...collectBlipEffectSidecars(blip, blipEffects, nextId)
+  ];
+  return {
+    kind: "image",
+    ...nodeId !== void 0 ? { nodeId } : {},
+    ...name !== void 0 ? { name } : {},
+    ...transform !== void 0 ? { transform } : {},
+    ...embed !== void 0 ? { blipRelationshipId: asRelationshipId(embed) } : {},
+    ...crop !== void 0 ? { crop } : {},
+    ...stretch !== void 0 ? { stretch } : {},
+    ...tile !== void 0 ? { tile } : {},
+    ...effects !== void 0 ? { effects } : {},
+    ...blipEffects !== void 0 ? { blipEffects } : {},
+    handle: {
+      partPath,
+      ...nodeId !== void 0 ? { nodeId } : {},
+      ...embed !== void 0 ? { relationshipId: asRelationshipId(embed) } : {},
+      orderingSlot
+    },
+    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+  };
 }
-var KNOWN_SHAPE_CHILDREN = /* @__PURE__ */ new Set(["nvSpPr", "spPr", "style", "txBody"]);
-var KNOWN_CONNECTOR_CHILDREN = /* @__PURE__ */ new Set(["nvCxnSpPr", "spPr", "style"]);
-var KNOWN_GROUP_CHILDREN = /* @__PURE__ */ new Set(["nvGrpSpPr", "grpSpPr"]);
-var KNOWN_PICTURE_CHILDREN = /* @__PURE__ */ new Set(["nvPicPr", "blipFill", "spPr"]);
-var KNOWN_BLIP_FILL_CHILDREN = /* @__PURE__ */ new Set([
-  "blip",
-  "srcRect",
-  "stretch",
-  "tile"
-]);
-var KNOWN_BLIP_CHILDREN = /* @__PURE__ */ new Set([
-  "grayscl",
-  "biLevel",
-  "blur",
-  "lum",
-  "duotone",
-  "clrChange"
-]);
-var KNOWN_EFFECT_CHILDREN = /* @__PURE__ */ new Set([
-  "outerShdw",
-  "innerShdw",
-  "glow",
-  "softEdge"
-]);
-var KNOWN_GRAPHIC_FRAME_CHILDREN = /* @__PURE__ */ new Set([
-  "nvGraphicFramePr",
-  "xfrm",
-  "graphic"
-]);
-var KNOWN_GRAPHIC_CHILDREN = /* @__PURE__ */ new Set(["graphicData"]);
-var KNOWN_GRAPHIC_DATA_CHILDREN = /* @__PURE__ */ new Set(["tbl"]);
-var KNOWN_TABLE_CHILDREN = /* @__PURE__ */ new Set(["tblPr", "tblGrid", "tr"]);
-var KNOWN_TABLE_CELL_CHILDREN = /* @__PURE__ */ new Set(["txBody", "tcPr"]);
-var KNOWN_TABLE_CELL_PROPERTIES_CHILDREN = /* @__PURE__ */ new Set([
-  "lnL",
-  "lnR",
-  "lnT",
-  "lnB",
-  "solidFill",
-  "noFill",
-  "gradFill",
-  "blipFill",
-  "pattFill",
-  "grpFill"
-]);
-var KNOWN_SP_PR_CHILDREN = /* @__PURE__ */ new Set([
-  "xfrm",
-  "prstGeom",
-  "solidFill",
-  "noFill",
-  "gradFill",
-  "blipFill",
-  "pattFill",
-  "grpFill",
-  "ln",
-  "effectLst"
-]);
-var SHAPE_TREE_NODE_TAGS = /* @__PURE__ */ new Set([
-  "sp",
-  "pic",
-  "cxnSp",
-  "grpSp",
-  "graphicFrame"
-]);
-var CHART_GRAPHIC_DATA_URIS = /* @__PURE__ */ new Set([
-  "http://schemas.openxmlformats.org/drawingml/2006/chart",
-  "http://purl.oclc.org/ooxml/drawingml/chart"
-]);
-var SMARTART_DIAGRAM_URIS = /* @__PURE__ */ new Set([
-  "http://schemas.openxmlformats.org/drawingml/2006/diagram",
-  "http://purl.oclc.org/ooxml/drawingml/diagram"
-]);
-function parseShapeTree(spTree, partPath, nextId, orderedChildren) {
-  if (!spTree) return [];
-  if (orderedChildren !== void 0) {
-    return parseShapeTreeOrdered(spTree, partPath, nextId, orderedChildren);
+function collectEffectSidecars(spPr, effects, nextId) {
+  const effectList = getChild(spPr, "effectLst");
+  if (effectList === void 0) return [];
+  const sidecars = collectUnknownSidecars(effectList, KNOWN_EFFECT_CHILDREN, nextId);
+  const supportedChildren = [
+    ["outerShdw", effects?.outerShadow],
+    ["innerShdw", effects?.innerShadow],
+    ["glow", effects?.glow],
+    ["softEdge", effects?.softEdge]
+  ];
+  for (const [name, parsed] of supportedChildren) {
+    const node = getChild(effectList, name);
+    if (node !== void 0 && parsed === void 0) {
+      sidecars.push(makeSidecar(`a:${name}`, node, nextId));
+    }
+  }
+  return sidecars;
+}
+function collectBlipEffectSidecars(blip, effects, nextId) {
+  if (blip === void 0) return [];
+  const sidecars = collectUnknownSidecars(blip, KNOWN_BLIP_CHILDREN, nextId);
+  const supportedChildren = [
+    ["grayscl", effects?.grayscale === true],
+    ["biLevel", effects?.biLevel],
+    ["blur", effects?.blur],
+    ["lum", effects?.lum],
+    ["duotone", effects?.duotone],
+    ["clrChange", effects?.clrChange]
+  ];
+  for (const [name, parsed] of supportedChildren) {
+    const node = getChild(blip, name);
+    if (node !== void 0 && (parsed === void 0 || parsed === false)) {
+      sidecars.push(makeSidecar(`a:${name}`, node, nextId));
+    }
+  }
+  return sidecars;
+}
+function parseGraphicFrame(graphicFrame, partPath, nextId, orderingSlot, orderedNode) {
+  const graphic = getChild(graphicFrame, "graphic");
+  const graphicData = getChild(graphic, "graphicData");
+  const uri = getAttr(graphicData, "uri");
+  if (uri !== void 0 && CHART_GRAPHIC_DATA_URIS.has(uri)) {
+    const parsedChart = parseChartGraphicFrame(graphicFrame, partPath, nextId, orderingSlot);
+    if (parsedChart !== void 0) return parsedChart;
+  }
+  if (uri !== void 0 && SMARTART_DIAGRAM_URIS.has(uri)) {
+    const parsedSmartArt = parseSmartArtGraphicFrame(graphicFrame, partPath, nextId, orderingSlot);
+    if (parsedSmartArt !== void 0) return parsedSmartArt;
+  }
+  const table = getChild(graphicData, "tbl");
+  if (table === void 0) {
+    return parseRawShapeNode("p:graphicFrame", graphicFrame, partPath, nextId, orderingSlot);
+  }
+  const orderedGraphicChildren = orderedNestedChildChildren(orderedNode, "graphicFrame", "graphic");
+  const orderedGraphicDataChildren = orderedChildChildren2(orderedGraphicChildren, "graphicData");
+  const orderedTableChildren = orderedChildChildren2(orderedGraphicDataChildren, "tbl");
+  const parsedTable = parseTable(
+    table,
+    graphicFrame,
+    partPath,
+    nextId,
+    orderingSlot,
+    orderedTableChildren
+  );
+  if (parsedTable === void 0) {
+    return parseRawShapeNode("p:graphicFrame", graphicFrame, partPath, nextId, orderingSlot);
+  }
+  return parsedTable;
+}
+function parseAlternateContent(alternateContent, partPath, nextId, orderingSlot) {
+  const branches = [
+    ...getChildArray(alternateContent, "Choice"),
+    ...getChildArray(alternateContent, "Fallback")
+  ];
+  for (const branch of branches) {
+    const parsed = parseAlternateContentBranch(branch, partPath, nextId, orderingSlot);
+    if (parsed.length > 0) {
+      if (parsed.every((node) => node.kind === "raw")) {
+        continue;
+      }
+      return parsed.map(
+        (node) => attachRawSidecar(node, makeSidecar("mc:AlternateContent", alternateContent, nextId))
+      );
+    }
   }
+  return [
+    parseRawShapeNode("mc:AlternateContent", alternateContent, partPath, nextId, orderingSlot)
+  ];
+}
+function attachRawSidecar(node, sidecar) {
+  if (node.kind === "raw") return node;
+  return {
+    ...node,
+    rawSidecars: [...node.rawSidecars ?? [], sidecar]
+  };
+}
+function parseAlternateContentBranch(branch, partPath, nextId, orderingSlot) {
   const nodes = [];
-  let orderingSlot = 0;
-  for (const key of Object.keys(spTree)) {
-    if (key.startsWith("@_")) continue;
-    if (key === "#text") continue;
+  for (const key of Object.keys(branch)) {
+    if (key.startsWith("@_") || key === "#text") continue;
     const local = localName(key);
-    if (local === "nvGrpSpPr" || local === "grpSpPr") continue;
-    const value = spTree[key];
+    const value = branch[key];
     const items = Array.isArray(value) ? value : [value];
     for (const item of items) {
       const node = unsafeOoxmlBoundaryAssertion(item);
-      if (local === "sp") {
-        nodes.push(parseShape(node, partPath, nextId, orderingSlot));
-      } else if (local === "pic") {
-        nodes.push(parseImage(node, partPath, nextId, orderingSlot));
-      } else if (local === "cxnSp") {
+      if (local === "sp") nodes.push(parseShape(node, partPath, nextId, orderingSlot));
+      else if (local === "pic") nodes.push(parseImage(node, partPath, nextId, orderingSlot));
+      else if (local === "cxnSp") {
         nodes.push(parseConnector(node, partPath, nextId, orderingSlot));
       } else if (local === "grpSp") {
         nodes.push(parseGroup(node, partPath, nextId, orderingSlot));
       } else if (local === "graphicFrame") {
         nodes.push(parseGraphicFrame(node, partPath, nextId, orderingSlot));
-      } else if (local === "AlternateContent") {
-        const parsed = parseAlternateContent(node, partPath, nextId, orderingSlot);
-        nodes.push(...parsed);
       } else {
         nodes.push(parseRawShapeNode(key, node, partPath, nextId, orderingSlot));
       }
-      orderingSlot++;
     }
   }
   return nodes;
 }
-function parseShapeTreeOrdered(spTree, partPath, nextId, orderedChildren) {
-  const nodes = [];
-  const tagCounters = {};
-  let orderingSlot = 0;
-  for (const child of orderedChildren) {
-    const key = Object.keys(child).find((candidate) => candidate !== ":@");
-    if (key === void 0) continue;
-    const local = localName(key);
-    if (local === "AlternateContent") {
-      const index2 = tagCounters[local] ?? 0;
-      tagCounters[local] = index2 + 1;
-      const alternateContents = getChildArray(spTree, "AlternateContent");
-      const alternateContent = alternateContents[index2];
-      if (alternateContent !== void 0) {
-        nodes.push(...parseAlternateContent(alternateContent, partPath, nextId, orderingSlot));
-        orderingSlot++;
-      }
-      continue;
-    }
-    if (!SHAPE_TREE_NODE_TAGS.has(local)) continue;
-    const index = tagCounters[local] ?? 0;
-    tagCounters[local] = index + 1;
-    const node = getChildArray(spTree, local)[index];
-    if (node === void 0) continue;
-    nodes.push(parseShapeTreeNode(local, node, child, partPath, nextId, orderingSlot));
-    orderingSlot++;
-  }
-  return nodes;
+function parseChartGraphicFrame(graphicFrame, partPath, nextId, orderingSlot) {
+  const graphic = getChild(graphicFrame, "graphic");
+  const graphicData = getChild(graphic, "graphicData");
+  const chart = getChild(graphicData, "chart");
+  const rId = getNamespacedAttr(chart, "id") ?? getAttr(chart, "id");
+  if (rId === void 0) return void 0;
+  const nvGraphicFramePr = getChild(graphicFrame, "nvGraphicFramePr");
+  const cNvPr = getChild(nvGraphicFramePr, "cNvPr");
+  const nodeId = sourceNodeId(cNvPr);
+  const name = getAttr(cNvPr, "name");
+  const transform = parseTransform(graphicFrame);
+  const rawSidecars = [
+    ...collectUnknownSidecars(graphicFrame, KNOWN_GRAPHIC_FRAME_CHILDREN, nextId),
+    ...collectUnknownSidecars(graphic, KNOWN_GRAPHIC_CHILDREN, nextId),
+    ...collectUnknownSidecars(graphicData, EMPTY_KNOWN, nextId)
+  ];
+  return {
+    kind: "chart",
+    ...nodeId !== void 0 ? { nodeId } : {},
+    ...name !== void 0 ? { name } : {},
+    ...transform !== void 0 ? { transform } : {},
+    chartRelationshipId: asRelationshipId(rId),
+    handle: {
+      partPath,
+      ...nodeId !== void 0 ? { nodeId } : {},
+      relationshipId: asRelationshipId(rId),
+      orderingSlot
+    },
+    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+  };
 }
-function parseShapeTreeNode(local, node, orderedNode, partPath, nextId, orderingSlot) {
-  if (local === "sp") return parseShape(node, partPath, nextId, orderingSlot, orderedNode);
-  if (local === "pic") return parseImage(node, partPath, nextId, orderingSlot);
-  if (local === "cxnSp") {
-    return parseConnector(node, partPath, nextId, orderingSlot, orderedNode);
-  }
-  if (local === "grpSp") {
-    const orderedGroupChildren = unsafeOoxmlBoundaryAssertion(orderedNode?.[local]);
-    return parseGroup(node, partPath, nextId, orderingSlot, orderedGroupChildren);
-  }
-  if (local === "graphicFrame") {
-    return parseGraphicFrame(node, partPath, nextId, orderingSlot, orderedNode);
-  }
-  return parseRawShapeNode(`p:${local}`, node, partPath, nextId, orderingSlot);
+function parseSmartArtGraphicFrame(graphicFrame, partPath, nextId, orderingSlot) {
+  const graphic = getChild(graphicFrame, "graphic");
+  const graphicData = getChild(graphic, "graphicData");
+  const relIds = getChild(graphicData, "relIds");
+  const dmRId = getNamespacedAttr(relIds, "dm") ?? getAttr(relIds, "dm");
+  if (dmRId === void 0) return void 0;
+  const nvGraphicFramePr = getChild(graphicFrame, "nvGraphicFramePr");
+  const cNvPr = getChild(nvGraphicFramePr, "cNvPr");
+  const nodeId = sourceNodeId(cNvPr);
+  const name = getAttr(cNvPr, "name");
+  const transform = parseTransform(graphicFrame);
+  const rawSidecars = [
+    ...collectUnknownSidecars(graphicFrame, KNOWN_GRAPHIC_FRAME_CHILDREN, nextId),
+    ...collectUnknownSidecars(graphic, KNOWN_GRAPHIC_CHILDREN, nextId),
+    ...collectUnknownSidecars(graphicData, EMPTY_KNOWN, nextId)
+  ];
+  return {
+    kind: "smartArt",
+    ...nodeId !== void 0 ? { nodeId } : {},
+    ...name !== void 0 ? { name } : {},
+    ...transform !== void 0 ? { transform } : {},
+    dataRelationshipId: asRelationshipId(dmRId),
+    handle: {
+      partPath,
+      ...nodeId !== void 0 ? { nodeId } : {},
+      relationshipId: asRelationshipId(dmRId),
+      orderingSlot
+    },
+    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+  };
+}
+function parseTable(tbl, graphicFrame, partPath, nextId, orderingSlot, orderedTableChildren) {
+  const columns = parseTableColumns(getChild(tbl, "tblGrid"));
+  if (columns.length === 0) return void 0;
+  const nvGraphicFramePr = getChild(graphicFrame, "nvGraphicFramePr");
+  const cNvPr = getChild(nvGraphicFramePr, "cNvPr");
+  const nodeId = sourceNodeId(cNvPr);
+  const name = getAttr(cNvPr, "name");
+  const tblPr = getChild(tbl, "tblPr");
+  const tableStyleId = getChildText(tblPr, "tableStyleId");
+  const graphic = getChild(graphicFrame, "graphic");
+  const graphicData = getChild(graphic, "graphicData");
+  const transform = parseTransform(graphicFrame);
+  const rows = parseTableRows(tbl, partPath, nextId, nodeId, orderingSlot, orderedTableChildren);
+  const rawSidecars = [
+    ...collectUnknownSidecars(graphicFrame, KNOWN_GRAPHIC_FRAME_CHILDREN, nextId),
+    ...collectUnknownSidecars(graphic, KNOWN_GRAPHIC_CHILDREN, nextId),
+    ...collectUnknownSidecars(graphicData, KNOWN_GRAPHIC_DATA_CHILDREN, nextId),
+    ...collectUnknownSidecars(tbl, KNOWN_TABLE_CHILDREN, nextId)
+  ];
+  return {
+    kind: "table",
+    ...nodeId !== void 0 ? { nodeId } : {},
+    ...name !== void 0 ? { name } : {},
+    ...transform !== void 0 ? { transform } : {},
+    table: {
+      columns,
+      rows,
+      ...tableStyleId !== void 0 ? { tableStyleId } : {}
+    },
+    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot },
+    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+  };
+}
+function parseTableColumns(tblGrid) {
+  return getChildArray(tblGrid, "gridCol").map((col) => ({ width: emuAttr(col, "w") }));
+}
+function parseTableRows(tbl, partPath, nextId, tableNodeId, tableOrderingSlot, orderedTableChildren) {
+  const orderedRows = orderedChildChildrenList(orderedTableChildren, "tr");
+  return getChildArray(tbl, "tr").map((tr, rowIndex) => ({
+    height: emuAttr(tr, "h"),
+    cells: getChildArray(tr, "tc").map((tc, cellIndex) => {
+      const orderedCells = orderedChildChildrenList(orderedRows[rowIndex], "tc");
+      return parseTableCell(
+        tc,
+        partPath,
+        nextId,
+        tableNodeId,
+        tableOrderingSlot,
+        rowIndex,
+        cellIndex,
+        orderedCells[cellIndex]
+      );
+    })
+  }));
 }
-function parseShape(sp, partPath, nextId, orderingSlot, orderedNode) {
-  const nvSpPr = getChild(sp, "nvSpPr");
-  const cNvPr = getChild(nvSpPr, "cNvPr");
-  const nodeId = sourceNodeId(cNvPr);
-  const name = getAttr(cNvPr, "name");
-  const placeholder = parsePlaceholder(getChild(getChild(nvSpPr, "nvPr"), "ph"));
-  const spPr = getChild(sp, "spPr");
-  const transform = parseTransform(spPr);
-  const geometry = parseGeometry(spPr, orderedNestedChildChildren(orderedNode, "sp", "spPr"));
-  const fill = parseFill(spPr, nextId);
-  const outline = parseOutline(spPr, nextId);
-  const effects = parseEffectList(getChild(spPr, "effectLst"));
-  const style = parseShapeStyle(getChild(sp, "style"));
+function parseTableCell(tc, partPath, nextId, tableNodeId, tableOrderingSlot, rowIndex, cellIndex, orderedCellChildren) {
+  const tcPr = getChild(tc, "tcPr");
+  const textOrderingSlot = tableOrderingSlot * 1e9 + rowIndex * 1e6 + cellIndex;
   const textBody = parseTextBody(
-    getChild(sp, "txBody"),
+    getChild(tc, "txBody"),
     partPath,
     nextId,
-    nodeId,
-    orderingSlot,
-    orderedNestedChildChildren(orderedNode, "sp", "txBody")
+    tableNodeId,
+    textOrderingSlot,
+    orderedChildChildren2(orderedCellChildren, "txBody")
   );
+  const fill = parseFill(tcPr, nextId);
+  const borders = parseCellBorders(tcPr, nextId);
   const rawSidecars = [
-    ...collectUnknownSidecars(sp, KNOWN_SHAPE_CHILDREN, nextId),
-    ...collectUnknownSidecars(spPr, KNOWN_SP_PR_CHILDREN, nextId),
-    ...collectEffectSidecars(spPr, effects, nextId)
+    ...collectUnknownSidecars(tc, KNOWN_TABLE_CELL_CHILDREN, nextId),
+    ...collectUnknownSidecars(tcPr, KNOWN_TABLE_CELL_PROPERTIES_CHILDREN, nextId)
   ];
   return {
-    kind: "shape",
-    ...nodeId !== void 0 ? { nodeId } : {},
-    ...name !== void 0 ? { name } : {},
-    ...transform !== void 0 ? { transform } : {},
-    ...geometry !== void 0 ? { geometry } : {},
-    ...fill !== void 0 ? { fill } : {},
-    ...outline !== void 0 ? { outline } : {},
-    ...effects !== void 0 ? { effects } : {},
-    ...style !== void 0 ? { style } : {},
     ...textBody !== void 0 ? { textBody } : {},
-    ...placeholder !== void 0 ? { placeholder } : {},
-    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot },
+    ...fill !== void 0 ? { fill } : {},
+    ...borders !== void 0 ? { borders } : {},
+    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 } : {}
   };
 }
-function parseConnector(cxnSp, partPath, nextId, orderingSlot, orderedNode) {
-  const nvCxnSpPr = getChild(cxnSp, "nvCxnSpPr");
-  const cNvPr = getChild(nvCxnSpPr, "cNvPr");
-  const cNvCxnSpPr = getChild(nvCxnSpPr, "cNvCxnSpPr");
-  const nodeId = sourceNodeId(cNvPr);
-  const name = getAttr(cNvPr, "name");
-  const connection = parseConnectorConnection(cNvCxnSpPr);
-  const spPr = getChild(cxnSp, "spPr");
-  const transform = parseTransform(spPr);
-  const geometry = parseGeometry(spPr, orderedNestedChildChildren(orderedNode, "cxnSp", "spPr"));
-  const outline = parseOutline(spPr, nextId);
-  const effects = parseEffectList(getChild(spPr, "effectLst"));
-  const style = parseShapeStyle(getChild(cxnSp, "style"));
-  const rawSidecars = [
-    ...collectUnknownSidecars(cxnSp, KNOWN_CONNECTOR_CHILDREN, nextId),
-    ...collectUnknownSidecars(spPr, KNOWN_SP_PR_CHILDREN, nextId),
-    ...collectEffectSidecars(spPr, effects, nextId)
-  ];
+function parseCellBorders(tcPr, nextId) {
+  const left = parseLine(getChild(tcPr, "lnL"), nextId);
+  const right = parseLine(getChild(tcPr, "lnR"), nextId);
+  const top = parseLine(getChild(tcPr, "lnT"), nextId);
+  const bottom = parseLine(getChild(tcPr, "lnB"), nextId);
+  if (left === void 0 && right === void 0 && top === void 0 && bottom === void 0) {
+    return void 0;
+  }
   return {
-    kind: "connector",
+    ...top !== void 0 ? { top } : {},
+    ...bottom !== void 0 ? { bottom } : {},
+    ...left !== void 0 ? { left } : {},
+    ...right !== void 0 ? { right } : {}
+  };
+}
+function parseRawShapeNode(key, node, partPath, nextId, orderingSlot) {
+  const nodeId = sourceNodeId(getChild(getChild(node, "nvSpPr"), "cNvPr"));
+  return {
+    kind: "raw",
     ...nodeId !== void 0 ? { nodeId } : {},
-    ...name !== void 0 ? { name } : {},
-    ...connection !== void 0 ? { connection } : {},
-    ...transform !== void 0 ? { transform } : {},
-    ...geometry !== void 0 ? { geometry } : {},
-    ...outline !== void 0 ? { outline } : {},
-    ...effects !== void 0 ? { effects } : {},
-    ...style !== void 0 ? { style } : {},
-    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot },
-    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+    raw: makeSidecar(key, node, nextId),
+    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot }
   };
 }
-function parseConnectorConnection(cNvCxnSpPr) {
-  const start = parseConnectorConnectionEndpoint(getChild(cNvCxnSpPr, "stCxn"));
-  const end = parseConnectorConnectionEndpoint(getChild(cNvCxnSpPr, "endCxn"));
-  return start !== void 0 || end !== void 0 ? {
-    ...start !== void 0 ? { start } : {},
-    ...end !== void 0 ? { end } : {}
-  } : void 0;
+function parsePlaceholder(ph) {
+  if (!ph) return void 0;
+  const type = getAttr(ph, "type");
+  const index = numericAttr2(ph, "idx");
+  if (type === void 0 && index === void 0) return void 0;
+  return {
+    ...type !== void 0 ? { type } : {},
+    ...index !== void 0 ? { index } : {}
+  };
 }
-function parseConnectorConnectionEndpoint(node) {
-  const shapeId = getAttr(node, "id");
-  const connectionSiteIndex = numericAttr(node, "idx");
-  if (shapeId === void 0 || connectionSiteIndex === void 0) return void 0;
+function parseGeometry(spPr, orderedSpPr) {
+  const prstGeom = getChild(spPr, "prstGeom");
+  if (prstGeom) {
+    const preset = getAttr(prstGeom, "prst");
+    const adjustValues = parseAdjustValues(getChild(prstGeom, "avLst"));
+    return preset !== void 0 ? {
+      preset,
+      ...Object.keys(adjustValues).length > 0 ? { adjustValues } : {}
+    } : void 0;
+  }
+  const customPaths = parseCustomGeometry(
+    getChild(spPr, "custGeom"),
+    orderedChildChildren2(orderedSpPr, "custGeom")
+  );
+  if (customPaths !== void 0) return { kind: "custom", paths: customPaths };
+  return void 0;
+}
+function parseAdjustValues(avLst) {
+  const adjustValues = {};
+  for (const guide of getChildArray(avLst, "gd")) {
+    const name = getAttr(guide, "name");
+    const formula = getAttr(guide, "fmla");
+    const match = formula?.match(/val\s+(-?\d+)/);
+    if (name !== void 0 && match !== void 0 && match !== null) {
+      adjustValues[name] = Number(match[1]);
+    }
+  }
+  return adjustValues;
+}
+function parseChildTransform(grpSpPr, fallback) {
+  const xfrm = getChild(grpSpPr, "xfrm");
+  const childOff = getChild(xfrm, "chOff");
+  const childExt = getChild(xfrm, "chExt");
+  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 {
-    shapeId: asSourceNodeId(shapeId),
-    connectionSiteIndex
+    offsetX: asEmu2(offsetX),
+    offsetY: asEmu2(offsetY),
+    width: asEmu2(Number(width)),
+    height: asEmu2(Number(height))
+  };
+}
+function parseCrop(srcRect) {
+  if (!srcRect) return void 0;
+  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) } : {},
+    ...right !== void 0 ? { right: asOoxmlPercent(right) } : {},
+    ...bottom !== void 0 ? { bottom: asOoxmlPercent(bottom) } : {}
   };
+  return Object.keys(crop).length > 0 ? crop : void 0;
+}
+function parseStretch(stretch) {
+  const fillRect = getChild(stretch, "fillRect");
+  if (fillRect === void 0) return void 0;
+  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 };
+}
+function sourceNodeId(cNvPr) {
+  const id = getAttr(cNvPr, "id");
+  return id !== void 0 ? asSourceNodeId(id) : void 0;
+}
+function emuAttr(node, attrName) {
+  return asEmu2(numericAttr2(node, attrName) ?? 0);
+}
+var EMPTY_KNOWN = /* @__PURE__ */ new Set();
+function orderedChildChildren2(parent, childLocalName) {
+  const child = parent?.find((entry) => {
+    const key2 = Object.keys(entry).find((candidate) => candidate !== ":@");
+    return key2 !== void 0 && localName(key2) === childLocalName;
+  });
+  if (child === void 0) return void 0;
+  const key = Object.keys(child).find((candidate) => candidate !== ":@");
+  const value = key !== void 0 ? child[key] : void 0;
+  return Array.isArray(value) ? value : void 0;
+}
+function orderedChildChildrenList(parent, childLocalName) {
+  if (parent === void 0) return [];
+  return parent.filter((entry) => {
+    const key = Object.keys(entry).find((candidate) => candidate !== ":@");
+    return key !== void 0 && localName(key) === childLocalName;
+  }).map((entry) => {
+    const key = Object.keys(entry).find((candidate) => candidate !== ":@");
+    const value = key !== void 0 ? entry[key] : void 0;
+    return Array.isArray(value) ? value : void 0;
+  });
+}
+function orderedNestedChildChildren(node, parentLocalName, childLocalName) {
+  if (node === void 0) return void 0;
+  const parentChildren = node[parentLocalName];
+  return orderedChildChildren2(
+    Array.isArray(parentChildren) ? parentChildren : void 0,
+    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);
+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 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 parseShapeStyle(style) {
-  if (style === void 0) return void 0;
-  const fillRef = parseStyleReference(getChild(style, "fillRef"));
-  const lineRef = parseStyleReference(getChild(style, "lnRef"));
-  const effectRef = parseStyleReference(getChild(style, "effectRef"));
+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 = {
-    ...fillRef !== void 0 ? { fillRef } : {},
-    ...lineRef !== void 0 ? { lineRef } : {},
-    ...effectRef !== void 0 ? { effectRef } : {}
+    ...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 parseStyleReference(ref) {
-  if (ref === void 0) return void 0;
-  const index = numericAttr(ref, "idx") ?? 0;
-  const color = parseColorElement(ref);
-  return {
-    index,
-    ...color !== void 0 ? { color } : {}
+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 parseGroup(grpSp, partPath, nextId, orderingSlot, orderedChildren) {
-  const nvGrpSpPr = getChild(grpSp, "nvGrpSpPr");
-  const cNvPr = getChild(nvGrpSpPr, "cNvPr");
-  const nodeId = sourceNodeId(cNvPr);
-  const name = getAttr(cNvPr, "name");
-  const grpSpPr = getChild(grpSp, "grpSpPr");
-  const transform = parseTransform(grpSpPr);
-  const childTransform = parseChildTransform(grpSpPr, transform);
-  const fill = parseFill(grpSpPr, nextId);
-  const effects = parseEffectList(getChild(grpSpPr, "effectLst"));
-  const rawSidecars = [
-    ...collectUnknownSidecars(grpSp, KNOWN_GROUP_CHILDREN, nextId),
-    ...collectUnknownSidecars(grpSpPr, KNOWN_SP_PR_CHILDREN, nextId),
-    ...collectEffectSidecars(grpSpPr, effects, nextId)
-  ];
+function parseOuterShadow(node) {
+  if (node === void 0) return void 0;
+  const color = parseColorElement(node);
+  if (color === void 0) return void 0;
   return {
-    kind: "group",
-    ...nodeId !== void 0 ? { nodeId } : {},
-    ...name !== void 0 ? { name } : {},
-    ...transform !== void 0 ? { transform } : {},
-    ...childTransform !== void 0 ? { childTransform } : {},
-    ...fill !== void 0 ? { fill } : {},
-    ...effects !== void 0 ? { effects } : {},
-    children: parseShapeTree(grpSp, partPath, nextId, orderedChildren),
-    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot },
-    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+    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 parseImage(pic, partPath, nextId, orderingSlot) {
-  const cNvPr = getChild(getChild(pic, "nvPicPr"), "cNvPr");
-  const nodeId = sourceNodeId(cNvPr);
-  const name = getAttr(cNvPr, "name");
-  const blipFill = getChild(pic, "blipFill");
-  const blip = getChild(blipFill, "blip");
-  const embed = getNamespacedAttr(blip, "embed");
-  const crop = parseCrop(getChild(blipFill, "srcRect"));
-  const stretch = parseStretch(getChild(blipFill, "stretch"));
-  const tile = parseImageFillTile(getChild(blipFill, "tile"));
-  const blipEffects = parseBlipEffects(blip);
-  const spPr = getChild(pic, "spPr");
-  const transform = parseTransform(spPr);
-  const effects = parseEffectList(getChild(spPr, "effectLst"));
-  const rawSidecars = [
-    ...collectUnknownSidecars(pic, KNOWN_PICTURE_CHILDREN, nextId),
-    ...collectUnknownSidecars(spPr, KNOWN_SP_PR_CHILDREN, nextId),
-    ...collectEffectSidecars(spPr, effects, nextId),
-    // Retains fill mode such as `a:stretch` / `a:tile` and recolor operation under blip.
-    ...collectUnknownSidecars(blipFill, KNOWN_BLIP_FILL_CHILDREN, nextId),
-    ...collectBlipEffectSidecars(blip, blipEffects, nextId)
-  ];
+function parseInnerShadow(node) {
+  if (node === void 0) return void 0;
+  const color = parseColorElement(node);
+  if (color === void 0) return void 0;
   return {
-    kind: "image",
-    ...nodeId !== void 0 ? { nodeId } : {},
-    ...name !== void 0 ? { name } : {},
-    ...transform !== void 0 ? { transform } : {},
-    ...embed !== void 0 ? { blipRelationshipId: asRelationshipId(embed) } : {},
-    ...crop !== void 0 ? { crop } : {},
-    ...stretch !== void 0 ? { stretch } : {},
-    ...tile !== void 0 ? { tile } : {},
-    ...effects !== void 0 ? { effects } : {},
-    ...blipEffects !== void 0 ? { blipEffects } : {},
-    handle: {
-      partPath,
-      ...nodeId !== void 0 ? { nodeId } : {},
-      ...embed !== void 0 ? { relationshipId: asRelationshipId(embed) } : {},
-      orderingSlot
-    },
-    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+    blurRadius: asEmu2(numericAttr2(node, "blurRad") ?? 0),
+    distance: asEmu2(numericAttr2(node, "dist") ?? 0),
+    direction: asOoxmlAngle(numericAttr2(node, "dir") ?? 0),
+    color
   };
 }
-function collectEffectSidecars(spPr, effects, nextId) {
-  const effectList = getChild(spPr, "effectLst");
-  if (effectList === void 0) return [];
-  const sidecars = collectUnknownSidecars(effectList, KNOWN_EFFECT_CHILDREN, nextId);
-  const supportedChildren = [
-    ["outerShdw", effects?.outerShadow],
-    ["innerShdw", effects?.innerShadow],
-    ["glow", effects?.glow],
-    ["softEdge", effects?.softEdge]
-  ];
-  for (const [name, parsed] of supportedChildren) {
-    const node = getChild(effectList, name);
-    if (node !== void 0 && parsed === void 0) {
-      sidecars.push(makeSidecar(`a:${name}`, node, nextId));
-    }
-  }
-  return sidecars;
-}
-function collectBlipEffectSidecars(blip, effects, nextId) {
-  if (blip === void 0) return [];
-  const sidecars = collectUnknownSidecars(blip, KNOWN_BLIP_CHILDREN, nextId);
-  const supportedChildren = [
-    ["grayscl", effects?.grayscale === true],
-    ["biLevel", effects?.biLevel],
-    ["blur", effects?.blur],
-    ["lum", effects?.lum],
-    ["duotone", effects?.duotone],
-    ["clrChange", effects?.clrChange]
-  ];
-  for (const [name, parsed] of supportedChildren) {
-    const node = getChild(blip, name);
-    if (node !== void 0 && (parsed === void 0 || parsed === false)) {
-      sidecars.push(makeSidecar(`a:${name}`, node, nextId));
-    }
-  }
-  return sidecars;
-}
-function parseGraphicFrame(graphicFrame, partPath, nextId, orderingSlot, orderedNode) {
-  const graphic = getChild(graphicFrame, "graphic");
-  const graphicData = getChild(graphic, "graphicData");
-  const uri = getAttr(graphicData, "uri");
-  if (uri !== void 0 && CHART_GRAPHIC_DATA_URIS.has(uri)) {
-    const parsedChart = parseChartGraphicFrame(graphicFrame, partPath, nextId, orderingSlot);
-    if (parsedChart !== void 0) return parsedChart;
-  }
-  if (uri !== void 0 && SMARTART_DIAGRAM_URIS.has(uri)) {
-    const parsedSmartArt = parseSmartArtGraphicFrame(graphicFrame, partPath, nextId, orderingSlot);
-    if (parsedSmartArt !== void 0) return parsedSmartArt;
-  }
-  const table = getChild(graphicData, "tbl");
-  if (table === void 0) {
-    return parseRawShapeNode("p:graphicFrame", graphicFrame, partPath, nextId, orderingSlot);
-  }
-  const orderedGraphicChildren = orderedNestedChildChildren(orderedNode, "graphicFrame", "graphic");
-  const orderedGraphicDataChildren = orderedChildChildren2(orderedGraphicChildren, "graphicData");
-  const orderedTableChildren = orderedChildChildren2(orderedGraphicDataChildren, "tbl");
-  const parsedTable = parseTable(
-    table,
-    graphicFrame,
-    partPath,
-    nextId,
-    orderingSlot,
-    orderedTableChildren
-  );
-  if (parsedTable === void 0) {
-    return parseRawShapeNode("p:graphicFrame", graphicFrame, partPath, nextId, orderingSlot);
-  }
-  return parsedTable;
-}
-function parseAlternateContent(alternateContent, partPath, nextId, orderingSlot) {
-  const branches = [
-    ...getChildArray(alternateContent, "Choice"),
-    ...getChildArray(alternateContent, "Fallback")
-  ];
-  for (const branch of branches) {
-    const parsed = parseAlternateContentBranch(branch, partPath, nextId, orderingSlot);
-    if (parsed.length > 0) {
-      if (parsed.every((node) => node.kind === "raw")) {
-        continue;
-      }
-      return parsed.map(
-        (node) => attachRawSidecar(node, makeSidecar("mc:AlternateContent", alternateContent, nextId))
-      );
-    }
-  }
-  return [
-    parseRawShapeNode("mc:AlternateContent", alternateContent, partPath, nextId, orderingSlot)
-  ];
-}
-function attachRawSidecar(node, sidecar) {
-  if (node.kind === "raw") return node;
+function parseGlow(node) {
+  if (node === void 0) return void 0;
+  const color = parseColorElement(node);
+  if (color === void 0) return void 0;
   return {
-    ...node,
-    rawSidecars: [...node.rawSidecars ?? [], sidecar]
+    radius: asEmu2(numericAttr2(node, "rad") ?? 0),
+    color
   };
 }
-function parseAlternateContentBranch(branch, partPath, nextId, orderingSlot) {
-  const nodes = [];
-  for (const key of Object.keys(branch)) {
-    if (key.startsWith("@_") || key === "#text") continue;
-    const local = localName(key);
-    const value = branch[key];
-    const items = Array.isArray(value) ? value : [value];
-    for (const item of items) {
-      const node = unsafeOoxmlBoundaryAssertion(item);
-      if (local === "sp") nodes.push(parseShape(node, partPath, nextId, orderingSlot));
-      else if (local === "pic") nodes.push(parseImage(node, partPath, nextId, orderingSlot));
-      else if (local === "cxnSp") {
-        nodes.push(parseConnector(node, partPath, nextId, orderingSlot));
-      } else if (local === "grpSp") {
-        nodes.push(parseGroup(node, partPath, nextId, orderingSlot));
-      } else if (local === "graphicFrame") {
-        nodes.push(parseGraphicFrame(node, partPath, nextId, orderingSlot));
-      } else {
-        nodes.push(parseRawShapeNode(key, node, partPath, nextId, orderingSlot));
-      }
-    }
-  }
-  return nodes;
+function parseSoftEdge(node) {
+  if (node === void 0) return void 0;
+  return {
+    radius: asEmu2(numericAttr2(node, "rad") ?? 0)
+  };
 }
-function parseChartGraphicFrame(graphicFrame, partPath, nextId, orderingSlot) {
-  const graphic = getChild(graphicFrame, "graphic");
-  const graphicData = getChild(graphic, "graphicData");
-  const chart = getChild(graphicData, "chart");
-  const rId = getNamespacedAttr(chart, "id") ?? getAttr(chart, "id");
-  if (rId === void 0) return void 0;
-  const nvGraphicFramePr = getChild(graphicFrame, "nvGraphicFramePr");
-  const cNvPr = getChild(nvGraphicFramePr, "cNvPr");
-  const nodeId = sourceNodeId(cNvPr);
-  const name = getAttr(cNvPr, "name");
-  const transform = parseTransform(graphicFrame);
-  const rawSidecars = [
-    ...collectUnknownSidecars(graphicFrame, KNOWN_GRAPHIC_FRAME_CHILDREN, nextId),
-    ...collectUnknownSidecars(graphic, KNOWN_GRAPHIC_CHILDREN, nextId),
-    ...collectUnknownSidecars(graphicData, EMPTY_KNOWN, nextId)
-  ];
+function parseBiLevel(node) {
+  if (node === void 0) return void 0;
   return {
-    kind: "chart",
-    ...nodeId !== void 0 ? { nodeId } : {},
-    ...name !== void 0 ? { name } : {},
-    ...transform !== void 0 ? { transform } : {},
-    chartRelationshipId: asRelationshipId(rId),
-    handle: {
-      partPath,
-      ...nodeId !== void 0 ? { nodeId } : {},
-      relationshipId: asRelationshipId(rId),
-      orderingSlot
-    },
-    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+    threshold: (numericAttr2(node, "thresh") ?? 5e4) / 1e5
   };
 }
-function parseSmartArtGraphicFrame(graphicFrame, partPath, nextId, orderingSlot) {
-  const graphic = getChild(graphicFrame, "graphic");
-  const graphicData = getChild(graphic, "graphicData");
-  const relIds = getChild(graphicData, "relIds");
-  const dmRId = getNamespacedAttr(relIds, "dm") ?? getAttr(relIds, "dm");
-  if (dmRId === void 0) return void 0;
-  const nvGraphicFramePr = getChild(graphicFrame, "nvGraphicFramePr");
-  const cNvPr = getChild(nvGraphicFramePr, "cNvPr");
-  const nodeId = sourceNodeId(cNvPr);
-  const name = getAttr(cNvPr, "name");
-  const transform = parseTransform(graphicFrame);
-  const rawSidecars = [
-    ...collectUnknownSidecars(graphicFrame, KNOWN_GRAPHIC_FRAME_CHILDREN, nextId),
-    ...collectUnknownSidecars(graphic, KNOWN_GRAPHIC_CHILDREN, nextId),
-    ...collectUnknownSidecars(graphicData, EMPTY_KNOWN, nextId)
-  ];
+function parseBlurEffect(node) {
+  if (node === void 0) return void 0;
   return {
-    kind: "smartArt",
-    ...nodeId !== void 0 ? { nodeId } : {},
-    ...name !== void 0 ? { name } : {},
-    ...transform !== void 0 ? { transform } : {},
-    dataRelationshipId: asRelationshipId(dmRId),
-    handle: {
-      partPath,
-      ...nodeId !== void 0 ? { nodeId } : {},
-      relationshipId: asRelationshipId(dmRId),
-      orderingSlot
-    },
-    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+    radius: asEmu2(numericAttr2(node, "rad") ?? 0),
+    grow: getAttr(node, "grow") !== "0"
   };
 }
-function parseTable(tbl, graphicFrame, partPath, nextId, orderingSlot, orderedTableChildren) {
-  const columns = parseTableColumns(getChild(tbl, "tblGrid"));
-  if (columns.length === 0) return void 0;
-  const nvGraphicFramePr = getChild(graphicFrame, "nvGraphicFramePr");
-  const cNvPr = getChild(nvGraphicFramePr, "cNvPr");
-  const nodeId = sourceNodeId(cNvPr);
-  const name = getAttr(cNvPr, "name");
-  const tblPr = getChild(tbl, "tblPr");
-  const tableStyleId = getChildText(tblPr, "tableStyleId");
-  const graphic = getChild(graphicFrame, "graphic");
-  const graphicData = getChild(graphic, "graphicData");
-  const transform = parseTransform(graphicFrame);
-  const rows = parseTableRows(tbl, partPath, nextId, nodeId, orderingSlot, orderedTableChildren);
-  const rawSidecars = [
-    ...collectUnknownSidecars(graphicFrame, KNOWN_GRAPHIC_FRAME_CHILDREN, nextId),
-    ...collectUnknownSidecars(graphic, KNOWN_GRAPHIC_CHILDREN, nextId),
-    ...collectUnknownSidecars(graphicData, KNOWN_GRAPHIC_DATA_CHILDREN, nextId),
-    ...collectUnknownSidecars(tbl, KNOWN_TABLE_CHILDREN, nextId)
-  ];
+function parseLumEffect(node) {
+  if (node === void 0) return void 0;
   return {
-    kind: "table",
-    ...nodeId !== void 0 ? { nodeId } : {},
-    ...name !== void 0 ? { name } : {},
-    ...transform !== void 0 ? { transform } : {},
-    table: {
-      columns,
-      rows,
-      ...tableStyleId !== void 0 ? { tableStyleId } : {}
-    },
-    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot },
-    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+    brightness: (numericAttr2(node, "bright") ?? 0) / 1e5,
+    contrast: (numericAttr2(node, "contrast") ?? 0) / 1e5
   };
 }
-function parseTableColumns(tblGrid) {
-  return getChildArray(tblGrid, "gridCol").map((col) => ({ width: emuAttr(col, "w") }));
+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 parseTableRows(tbl, partPath, nextId, tableNodeId, tableOrderingSlot, orderedTableChildren) {
-  const orderedRows = orderedChildChildrenList(orderedTableChildren, "tr");
-  return getChildArray(tbl, "tr").map((tr, rowIndex) => ({
-    height: emuAttr(tr, "h"),
-    cells: getChildArray(tr, "tc").map((tc, cellIndex) => {
-      const orderedCells = orderedChildChildrenList(orderedRows[rowIndex], "tc");
-      return parseTableCell(
-        tc,
-        partPath,
-        nextId,
-        tableNodeId,
-        tableOrderingSlot,
-        rowIndex,
-        cellIndex,
-        orderedCells[cellIndex]
-      );
-    })
-  }));
+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 parseTableCell(tc, partPath, nextId, tableNodeId, tableOrderingSlot, rowIndex, cellIndex, orderedCellChildren) {
-  const tcPr = getChild(tc, "tcPr");
-  const textOrderingSlot = tableOrderingSlot * 1e9 + rowIndex * 1e6 + cellIndex;
-  const textBody = parseTextBody(
-    getChild(tc, "txBody"),
-    partPath,
-    nextId,
-    tableNodeId,
-    textOrderingSlot,
-    orderedChildChildren2(orderedCellChildren, "txBody")
-  );
-  const fill = parseFill(tcPr, nextId);
-  const borders = parseCellBorders(tcPr, nextId);
-  const rawSidecars = [
-    ...collectUnknownSidecars(tc, KNOWN_TABLE_CELL_CHILDREN, nextId),
-    ...collectUnknownSidecars(tcPr, KNOWN_TABLE_CELL_PROPERTIES_CHILDREN, nextId)
-  ];
-  return {
-    ...textBody !== void 0 ? { textBody } : {},
-    ...fill !== void 0 ? { fill } : {},
-    ...borders !== void 0 ? { borders } : {},
-    gridSpan: numericAttr(tc, "gridSpan") ?? 1,
-    rowSpan: numericAttr(tc, "rowSpan") ?? 1,
-    hMerge: isTrue(getAttr(tc, "hMerge") ?? getAttr(tcPr, "hMerge")),
-    vMerge: isTrue(getAttr(tc, "vMerge") ?? getAttr(tcPr, "vMerge")),
-    ...rawSidecars.length > 0 ? { rawSidecars } : {}
+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");
+  if (blip) {
+    return parseBlipFill(blip) ?? { kind: "raw", raw: makeSidecar("a:blipFill", blip, nextId) };
+  }
+  const pattern = getChild(parent, "pattFill");
+  if (pattern) {
+    const fill = parsePatternFill(pattern);
+    return fill ?? { kind: "raw", raw: makeSidecar("a:pattFill", pattern, nextId) };
+  }
+  for (const name of RAW_FILL_LOCAL_NAMES) {
+    if (hasChild(parent, name)) {
+      return { kind: "raw", raw: makeSidecar(`a:${name}`, getChild(parent, name) ?? {}, nextId) };
+    }
+  }
+  return void 0;
+}
+function parseGradientFill(grad) {
+  const stops = [];
+  for (const gs of getChildArray(getChild(grad, "gsLst"), "gs")) {
+    const color = parseColorElement(gs);
+    if (color === void 0) continue;
+    stops.push({
+      position: (numericAttr2(gs, "pos") ?? 0) / 1e5,
+      color
+    });
+  }
+  if (stops.length === 0) return void 0;
+  const path = getChild(grad, "path");
+  if (path !== void 0) {
+    const fillToRect = getChild(path, "fillToRect");
+    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",
+      stops,
+      centerX: (l + (1e5 - r)) / 2 / 1e5,
+      centerY: (t + (1e5 - b)) / 2 / 1e5
+    };
+  }
+  return {
+    kind: "gradient",
+    gradientType: "linear",
+    stops,
+    angle: asOoxmlAngle(numericAttr2(getChild(grad, "lin"), "ang") ?? 0)
   };
 }
-function parseCellBorders(tcPr, nextId) {
-  const left = parseLine(getChild(tcPr, "lnL"), nextId);
-  const right = parseLine(getChild(tcPr, "lnR"), nextId);
-  const top = parseLine(getChild(tcPr, "lnT"), nextId);
-  const bottom = parseLine(getChild(tcPr, "lnB"), nextId);
-  if (left === void 0 && right === void 0 && top === void 0 && bottom === void 0) {
-    return void 0;
-  }
+function parseBlipFill(blipFill) {
+  const blip = getChild(blipFill, "blip");
+  const embed = getNamespacedAttr(blip, "embed");
+  if (embed === void 0) return void 0;
+  const tile = parseImageFillTile(getChild(blipFill, "tile"));
   return {
-    ...top !== void 0 ? { top } : {},
-    ...bottom !== void 0 ? { bottom } : {},
-    ...left !== void 0 ? { left } : {},
-    ...right !== void 0 ? { right } : {}
+    kind: "image",
+    blipRelationshipId: asRelationshipId(embed),
+    ...tile !== void 0 ? { tile } : {}
   };
 }
-function parseRawShapeNode(key, node, partPath, nextId, orderingSlot) {
-  const nodeId = sourceNodeId(getChild(getChild(node, "nvSpPr"), "cNvPr"));
+function parseImageFillTile(tile) {
+  if (tile === void 0) return void 0;
+  const flip = getAttr(tile, "flip") ?? "none";
   return {
-    kind: "raw",
-    ...nodeId !== void 0 ? { nodeId } : {},
-    raw: makeSidecar(key, node, nextId),
-    handle: { partPath, ...nodeId !== void 0 ? { nodeId } : {}, orderingSlot }
+    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 parsePlaceholder(ph) {
-  if (!ph) return void 0;
-  const type = getAttr(ph, "type");
-  const index = numericAttr(ph, "idx");
-  if (type === void 0 && index === void 0) return void 0;
+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 {
-    ...type !== void 0 ? { type } : {},
-    ...index !== void 0 ? { index } : {}
+    kind: "pattern",
+    preset: getAttr(pattern, "prst") ?? "ltDnDiag",
+    foregroundColor,
+    backgroundColor
   };
 }
-function parseGeometry(spPr, orderedSpPr) {
-  const prstGeom = getChild(spPr, "prstGeom");
-  if (prstGeom) {
-    const preset = getAttr(prstGeom, "prst");
-    const adjustValues = parseAdjustValues(getChild(prstGeom, "avLst"));
-    return preset !== void 0 ? {
-      preset,
-      ...Object.keys(adjustValues).length > 0 ? { adjustValues } : {}
-    } : void 0;
-  }
-  const customPaths = parseCustomGeometry(
-    getChild(spPr, "custGeom"),
-    orderedChildChildren2(orderedSpPr, "custGeom")
-  );
-  if (customPaths !== void 0) return { kind: "custom", paths: customPaths };
-  return void 0;
+function parseOutline(spPr, nextId) {
+  const ln = getChild(spPr, "ln");
+  return parseLine(ln, nextId);
 }
-function parseAdjustValues(avLst) {
-  const adjustValues = {};
-  for (const guide of getChildArray(avLst, "gd")) {
-    const name = getAttr(guide, "name");
-    const formula = getAttr(guide, "fmla");
-    const match = formula?.match(/val\s+(-?\d+)/);
-    if (name !== void 0 && match !== void 0 && match !== null) {
-      adjustValues[name] = Number(match[1]);
-    }
-  }
-  return adjustValues;
+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 } : {}
+  };
 }
-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;
-  if (width === void 0 || height === void 0) return void 0;
+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;
+  }
+  const rotation = numericAttr2(xfrm, "rot");
+  const flipH = getAttr(xfrm, "flipH");
+  const flipV = getAttr(xfrm, "flipV");
   return {
     offsetX: asEmu2(offsetX),
     offsetY: asEmu2(offsetY),
-    width: asEmu2(Number(width)),
-    height: asEmu2(Number(height))
+    width: asEmu2(width),
+    height: asEmu2(height),
+    ...rotation !== void 0 ? { rotation: asOoxmlAngle(rotation) } : {},
+    ...isTrue(flipH) ? { flipHorizontal: true } : {},
+    ...isTrue(flipV) ? { flipVertical: true } : {}
   };
 }
-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 crop = {
-    ...left !== void 0 ? { left: asOoxmlPercent(left) } : {},
-    ...top !== void 0 ? { top: asOoxmlPercent(top) } : {},
-    ...right !== void 0 ? { right: asOoxmlPercent(right) } : {},
-    ...bottom !== void 0 ? { bottom: asOoxmlPercent(bottom) } : {}
-  };
-  return Object.keys(crop).length > 0 ? crop : void 0;
+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 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;
-  if (left === 0 && top === 0 && right === 0 && bottom === 0) return void 0;
-  return { left, top, right, bottom };
+function numericAttr2(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 sourceNodeId(cNvPr) {
-  const id = getAttr(cNvPr, "id");
-  return id !== void 0 ? asSourceNodeId(id) : void 0;
+function isTrue(value) {
+  return value === "1" || value === "true";
 }
-function emuAttr(node, attrName) {
-  return asEmu2(numericAttr(node, attrName) ?? 0);
+function parseDashStyle(prstDash) {
+  const value = getAttr(prstDash, "val");
+  return parseEnumValue(value, DASH_STYLES);
 }
-var EMPTY_KNOWN = /* @__PURE__ */ new Set();
-function orderedChildChildren2(parent, childLocalName) {
-  const child = parent?.find((entry) => {
-    const key2 = Object.keys(entry).find((candidate) => candidate !== ":@");
-    return key2 !== void 0 && localName(key2) === childLocalName;
-  });
-  if (child === void 0) return void 0;
-  const key = Object.keys(child).find((candidate) => candidate !== ":@");
-  const value = key !== void 0 ? child[key] : void 0;
-  return Array.isArray(value) ? value : void 0;
+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 orderedChildChildrenList(parent, childLocalName) {
-  if (parent === void 0) return [];
-  return parent.filter((entry) => {
-    const key = Object.keys(entry).find((candidate) => candidate !== ":@");
-    return key !== void 0 && localName(key) === childLocalName;
-  }).map((entry) => {
-    const key = Object.keys(entry).find((candidate) => candidate !== ":@");
-    const value = key !== void 0 ? entry[key] : void 0;
-    return Array.isArray(value) ? value : void 0;
-  });
+var LINE_CAP_MAP = {
+  flat: "butt",
+  sq: "square",
+  rnd: "round"
+};
+function parseLineCap(value) {
+  return value !== void 0 ? LINE_CAP_MAP[value] : void 0;
 }
-function orderedNestedChildChildren(node, parentLocalName, childLocalName) {
-  if (node === void 0) return void 0;
-  const parentChildren = node[parentLocalName];
-  return orderedChildChildren2(
-    Array.isArray(parentChildren) ? parentChildren : void 0,
-    childLocalName
-  );
+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"]);
 var DEFAULT_COLOR_MAP = {
   bg1: "lt1",
   tx1: "dk1",
@@ -8718,7 +8751,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),
@@ -9429,7 +9462,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 +9589,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 +9719,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 +9731,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 +9741,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) {
@@ -9734,7 +9767,7 @@ var SLIDE_LAYOUT_REL_TYPE2 = "http://schemas.openxmlformats.org/officeDocument/2
 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 textDecoder3 = new TextDecoder();
 function readPptx(input) {
   const entries = unzipPackage(input);
   const diagnostics = [];
@@ -9885,7 +9918,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({
@@ -9936,7 +9969,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 +9990,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 +10021,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)`
@@ -10085,8 +10118,8 @@ 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 textDecoder4 = new TextDecoder();
+var xmlBuilder2 = new import_fast_xml_parser3.XMLBuilder({
   ignoreAttributes: false,
   attributeNamePrefix: "@_",
   format: false,