pptx-react-viewer 1.1.1 → 1.1.2

package/node_modules/pptx-viewer-core/dist/cli/index.mjs

@@ -6255,33 +6255,10 @@ var PptxPresentationSaveBuilder = class {
     init.presentationData["p:presentation"] = presentation;
     return init.presentationData;
   }
-  applyHeaderFooter(presentation, headerFooter) {
-    if (!headerFooter) {
-      return;
-    }
-    const hf = presentation["p:hf"] || {};
-    if (headerFooter.hasHeader !== void 0) {
-      hf["@_hdr"] = headerFooter.hasHeader ? "1" : "0";
-    }
-    if (headerFooter.hasFooter !== void 0) {
-      hf["@_ftr"] = headerFooter.hasFooter ? "1" : "0";
-    }
-    if (headerFooter.hasDateTime !== void 0) {
-      hf["@_dt"] = headerFooter.hasDateTime ? "1" : "0";
-    }
-    if (headerFooter.hasSlideNumber !== void 0) {
-      hf["@_sldNum"] = headerFooter.hasSlideNumber ? "1" : "0";
-    }
-    if (headerFooter.footerText !== void 0) {
-      hf["@_ftrText"] = headerFooter.footerText;
-    }
-    if (headerFooter.dateTimeText !== void 0) {
-      hf["@_dtText"] = headerFooter.dateTimeText;
+  applyHeaderFooter(presentation, _headerFooter) {
+    if (presentation["p:hf"] !== void 0) {
+      delete presentation["p:hf"];
     }
-    if (headerFooter.dateFormat !== void 0) {
-      hf["@_dtFmt"] = headerFooter.dateFormat;
-    }
-    presentation["p:hf"] = hf;
   }
   applySlideDimensions(presentation, rawSlideWidthEmu, rawSlideHeightEmu, rawSlideSizeType) {
     const slideSize = presentation["p:sldSz"];
@@ -6957,7 +6934,9 @@ var PptxSlideNotesPartUpdater = class {
 var PptxSlideBackgroundBuilder = class {
   applyBackground(init) {
     const hasBackgroundColor = typeof init.slide.backgroundColor === "string" && init.slide.backgroundColor.length > 0 && init.slide.backgroundColor !== "transparent";
-    const hasBackgroundImage = typeof init.slide.backgroundImage === "string" && init.slide.backgroundImage.length > 0;
+    const rawBackgroundImage = typeof init.slide.backgroundImage === "string" ? init.slide.backgroundImage : "";
+    const hasBackgroundImage = rawBackgroundImage.length > 0;
+    const hasDataUrlBackgroundImage = hasBackgroundImage && rawBackgroundImage.startsWith("data:");
     const hasBackgroundGradient = typeof init.slide.backgroundGradient === "string" && init.slide.backgroundGradient.length > 0;
     const cSld = init.slideNode["p:cSld"] || {};
     if (!(hasBackgroundColor || hasBackgroundImage || hasBackgroundGradient)) {
@@ -6965,9 +6944,17 @@ var PptxSlideBackgroundBuilder = class {
       init.slideNode["p:cSld"] = cSld;
       return;
     }
+    const existingBg = cSld["p:bg"];
+    const existingBgPr = existingBg?.["p:bgPr"];
+    const existingHasBlipFill = existingBgPr?.["a:blipFill"] !== void 0;
+    if (!hasDataUrlBackgroundImage && existingHasBlipFill) {
+      this.reorderCSldBgFirst(cSld, existingBg);
+      init.slideNode["p:cSld"] = cSld;
+      return;
+    }
     const backgroundProperties = {};
-    if (hasBackgroundImage && init.slide.backgroundImage) {
-      const parsedBackgroundImage = init.parseDataUrlToBytes(init.slide.backgroundImage);
+    if (hasDataUrlBackgroundImage) {
+      const parsedBackgroundImage = init.parseDataUrlToBytes(rawBackgroundImage);
       if (parsedBackgroundImage) {
         const backgroundImagePath = init.saveState.nextMediaPath(parsedBackgroundImage.extension);
         init.zip.file(backgroundImagePath, parsedBackgroundImage.bytes);
@@ -6990,9 +6977,42 @@ var PptxSlideBackgroundBuilder = class {
         }
       };
     }
-    backgroundProperties["a:effectLst"] = {};
-    cSld["p:bg"] = { "p:bgPr": backgroundProperties };
-    init.slideNode["p:cSld"] = cSld;
+    const hasFillChild = backgroundProperties["a:blipFill"] !== void 0 || backgroundProperties["a:solidFill"] !== void 0 || backgroundProperties["a:gradFill"] !== void 0 || backgroundProperties["a:pattFill"] !== void 0 || backgroundProperties["a:noFill"] !== void 0 || backgroundProperties["a:grpFill"] !== void 0;
+    if (hasFillChild) {
+      backgroundProperties["a:effectLst"] = {};
+    }
+    if (!hasFillChild) {
+      delete cSld["p:bg"];
+      init.slideNode["p:cSld"] = cSld;
+      return;
+    }
+    const rebuiltCSld = { "p:bg": { "p:bgPr": backgroundProperties } };
+    for (const key of Object.keys(cSld)) {
+      if (key === "p:bg") {
+        continue;
+      }
+      rebuiltCSld[key] = cSld[key];
+    }
+    init.slideNode["p:cSld"] = rebuiltCSld;
+  }
+  reorderCSldBgFirst(cSld, bg) {
+    const keys = Object.keys(cSld);
+    if (keys.length > 0 && keys[0] === "p:bg") {
+      return;
+    }
+    const reordered = { "p:bg": bg };
+    for (const key of keys) {
+      if (key === "p:bg") {
+        continue;
+      }
+      reordered[key] = cSld[key];
+    }
+    for (const key of Object.keys(cSld)) {
+      delete cSld[key];
+    }
+    for (const key of Object.keys(reordered)) {
+      cSld[key] = reordered[key];
+    }
   }
 };
 
@@ -9869,6 +9889,7 @@ var PptxConnectorParser = class {
         slideRelationships,
         this.context.getOrderedSlidePaths()
       );
+      const connElementName = cNvPr?.["@_name"] ? String(cNvPr["@_name"]).trim() : void 0;
       const locks = this.context.parseShapeLocks(
         cNvConnectionShapeProperties?.["a:cxnSpLocks"] ?? cNvConnectionShapeProperties?.["a:spLocks"]
       );
@@ -9876,6 +9897,7 @@ var PptxConnectorParser = class {
       const textResult = this.context.parseConnectorTextBody?.(txBody, slidePath);
       return {
         id,
+        name: connElementName || void 0,
         type: "connector",
         x: Math.round(parseInt(String(offset["@_x"] || "0"), 10) / this.context.emuPerPx),
         y: Math.round(parseInt(String(offset["@_y"] || "0"), 10) / this.context.emuPerPx),
@@ -13405,7 +13427,16 @@ var PptxRuntimeDependencyFactory = class {
     return new XMLParser({
       ignoreAttributes: false,
       attributeNamePrefix: "@_",
-      parseAttributeValue: false
+      parseAttributeValue: false,
+      // Keep element text as strings. When true (the fast-xml-parser
+      // default), `<AppVersion>16.0000</AppVersion>` is coerced to the
+      // JS number 16, losing the trailing zeros. On save we write back
+      // "16", which fails PowerPoint's strict `[0-9]+\.[0-9]{4}` match
+      // on AppVersion — the loader rejects the package with HRESULT
+      // 0x80070570 (ERROR_FILE_CORRUPT) and shows the repair dialog.
+      // More generally, OOXML element text is always an untyped string;
+      // downstream callers coerce where needed.
+      parseTagValue: false
     });
   }
   createBuilder() {
@@ -14081,7 +14112,7 @@ var TRIPLET_ENCODINGS = [
   { byteCount: 2, xBits: 4, yBits: 4, deltaX: 49, deltaY: 49, xSign: 1, ySign: -1 },
   { byteCount: 2, xBits: 4, yBits: 4, deltaX: 49, deltaY: 49, xSign: -1, ySign: 1 },
   { byteCount: 2, xBits: 4, yBits: 4, deltaX: 49, deltaY: 49, xSign: 1, ySign: 1 },
-  // Indices 84-107: 8-bit X + 8-bit Y (3 bytes total)
+  // Indices 84-119: 8-bit X + 8-bit Y (3 bytes total)
   { byteCount: 3, xBits: 8, yBits: 8, deltaX: 1, deltaY: 1, xSign: -1, ySign: -1 },
   { byteCount: 3, xBits: 8, yBits: 8, deltaX: 1, deltaY: 1, xSign: 1, ySign: -1 },
   { byteCount: 3, xBits: 8, yBits: 8, deltaX: 1, deltaY: 1, xSign: -1, ySign: 1 },
@@ -14118,12 +14149,12 @@ var TRIPLET_ENCODINGS = [
   { byteCount: 3, xBits: 8, yBits: 8, deltaX: 513, deltaY: 513, xSign: 1, ySign: -1 },
   { byteCount: 3, xBits: 8, yBits: 8, deltaX: 513, deltaY: 513, xSign: -1, ySign: 1 },
   { byteCount: 3, xBits: 8, yBits: 8, deltaX: 513, deltaY: 513, xSign: 1, ySign: 1 },
-  // Indices 108-111: 12-bit X + 12-bit Y (4 bytes total)
+  // Indices 120-123: 12-bit X + 12-bit Y (4 bytes total)
   { byteCount: 4, xBits: 12, yBits: 12, deltaX: 0, deltaY: 0, xSign: -1, ySign: -1 },
   { byteCount: 4, xBits: 12, yBits: 12, deltaX: 0, deltaY: 0, xSign: 1, ySign: -1 },
   { byteCount: 4, xBits: 12, yBits: 12, deltaX: 0, deltaY: 0, xSign: -1, ySign: 1 },
   { byteCount: 4, xBits: 12, yBits: 12, deltaX: 0, deltaY: 0, xSign: 1, ySign: 1 },
-  // Indices 112-115: 16-bit X + 16-bit Y (5 bytes total)
+  // Indices 124-127: 16-bit X + 16-bit Y (5 bytes total)
   { byteCount: 5, xBits: 16, yBits: 16, deltaX: 0, deltaY: 0, xSign: -1, ySign: -1 },
   { byteCount: 5, xBits: 16, yBits: 16, deltaX: 0, deltaY: 0, xSign: 1, ySign: -1 },
   { byteCount: 5, xBits: 16, yBits: 16, deltaX: 0, deltaY: 0, xSign: -1, ySign: 1 },
@@ -14212,14 +14243,15 @@ function decodePushInstructions(sIn, sOut, pushCount) {
   if (pushCount === 0) {
     return;
   }
-  const values = [];
-  let isShort = false;
+  const data = [];
   let remaining = pushCount;
+  let isShort = false;
+  const runValues = [];
   function flush() {
-    if (values.length === 0) {
+    if (runValues.length === 0) {
       return;
     }
-    const count = values.length;
+    const count = runValues.length;
     if (isShort) {
       if (count < 8) {
         sOut.writeU8(PUSHW + (count - 1));
@@ -14227,7 +14259,7 @@ function decodePushInstructions(sIn, sOut, pushCount) {
         sOut.writeU8(NPUSHW);
         sOut.writeU8(count);
       }
-      for (const v of values) {
+      for (const v of runValues) {
         sOut.writeS16(v);
       }
     } else {
@@ -14237,54 +14269,50 @@ function decodePushInstructions(sIn, sOut, pushCount) {
         sOut.writeU8(NPUSHB);
         sOut.writeU8(count);
       }
-      for (const v of values) {
+      for (const v of runValues) {
         sOut.writeU8(v & 255);
       }
     }
-    values.length = 0;
+    runValues.length = 0;
   }
-  function addValue(v) {
+  function put(v) {
+    data.push(v);
     const needsShort = v < 0 || v > 255;
-    if (values.length > 0 && needsShort !== isShort) {
+    if (runValues.length > 0 && needsShort !== isShort) {
       flush();
     }
-    if (values.length === 0) {
+    if (runValues.length === 0) {
       isShort = needsShort;
     }
-    values.push(v);
-    if (values.length >= 255) {
+    runValues.push(v);
+    if (runValues.length >= 255) {
       flush();
     }
   }
   while (remaining > 0) {
-    const code = sIn.readU8();
-    if (code === 251 && remaining >= 4) {
-      const a = read255Short(sIn);
-      const b = read255Short(sIn);
-      const c = read255Short(sIn);
-      addValue(a);
-      addValue(b);
-      addValue(a);
-      addValue(c);
-      addValue(a);
-      remaining -= 5;
-    } else if (code === 252 && remaining >= 6) {
-      const a = read255Short(sIn);
-      const b = read255Short(sIn);
+    const code = sIn.peekU8();
+    if (code === 251 && remaining >= 3 && data.length >= 2) {
+      sIn.readU8();
+      const prev = data[data.length - 2];
+      put(prev);
+      const val = read255Short(sIn);
+      put(val);
+      put(prev);
+      remaining -= 3;
+    } else if (code === 252 && remaining >= 5 && data.length >= 2) {
+      sIn.readU8();
+      const prev = data[data.length - 2];
+      put(prev);
       const c = read255Short(sIn);
+      put(c);
+      put(prev);
       const d = read255Short(sIn);
-      addValue(a);
-      addValue(b);
-      addValue(a);
-      addValue(c);
-      addValue(a);
-      addValue(d);
-      addValue(a);
-      remaining -= 7;
+      put(d);
+      put(prev);
+      remaining -= 5;
     } else {
-      sIn.seekRelative(-1);
       const v = read255Short(sIn);
-      addValue(v);
+      put(v);
       remaining -= 1;
     }
   }
@@ -14312,6 +14340,9 @@ function makeGlyphFlags(x, y, onCurve, firstTime) {
   return flags;
 }
 function decodeSimpleGlyph(numContours, streams, out, calcBBox, minX, minY, maxX, maxY) {
+  if (numContours === 0) {
+    return;
+  }
   const sGlyph = streams[0];
   out.writeS16(numContours);
   const bboxPos = out.pos;
@@ -14332,13 +14363,12 @@ function decodeSimpleGlyph(numContours, streams, out, calcBBox, minX, minY, maxX
   }
   let totalPoints = 0;
   for (let c = 0; c < numContours; c++) {
-    const pointsInContour = read255UShort(sGlyph);
-    totalPoints += pointsInContour;
     if (c === 0) {
-      out.writeU16(pointsInContour - 1);
-    } else {
-      out.writeU16(totalPoints - 1);
+      totalPoints = 1;
     }
+    const pointsInContour = read255UShort(sGlyph);
+    totalPoints += pointsInContour;
+    out.writeU16(totalPoints - 1);
   }
   const flagBytes = new Uint8Array(totalPoints);
   for (let i = 0; i < totalPoints; i++) {
@@ -14351,7 +14381,7 @@ function decodeSimpleGlyph(numContours, streams, out, calcBBox, minX, minY, maxX
   let cumulativeY = 0;
   for (let i = 0; i < totalPoints; i++) {
     const flag = flagBytes[i];
-    onCurve[i] = flag >> 7;
+    onCurve[i] = flag & 128 ? 0 : 1;
     const enc = TRIPLET_ENCODINGS[flag & 127];
     const extraBytes = enc.byteCount - 1;
     const subBuf = new Uint8Array(extraBytes);
@@ -14690,7 +14720,10 @@ var AHuff = class _AHuff {
     this.bio = bio;
     this.range = range;
     this.bitCount = bitsUsed(range - 1);
-    this.bitCount2 = this.bitCount > 8 ? this.bitCount - 8 : 0;
+    this.bitCount2 = 0;
+    if (range > 256 && range < 512) {
+      this.bitCount2 = bitsUsed(range - 256 - 1) + 1;
+    }
     const treeSize = 2 * range;
     this.tree = Array.from({ length: treeSize });
     for (let i = 0; i < treeSize; i++) {
@@ -14698,6 +14731,7 @@ var AHuff = class _AHuff {
     }
     for (let i = 2; i < treeSize; i++) {
       this.tree[i].up = i >> 1;
+      this.tree[i].weight = 1;
     }
     for (let i = 1; i < range; i++) {
       this.tree[i].left = 2 * i;
@@ -14707,7 +14741,8 @@ var AHuff = class _AHuff {
     for (let i = 0; i < range; i++) {
       const leafIdx = range + i;
       this.tree[leafIdx].code = i;
-      this.tree[leafIdx].weight = 1;
+      this.tree[leafIdx].left = -1;
+      this.tree[leafIdx].right = -1;
     }
     this.symbolIndex = Array.from({ length: range });
     for (let i = 0; i < range; i++) {
@@ -14747,15 +14782,13 @@ var AHuff = class _AHuff {
    */
   readSymbol() {
     let a = _AHuff.ROOT;
-    while (this.tree[a].code < 0) {
-      if (this.bio.inputBit()) {
-        a = this.tree[a].right;
-      } else {
-        a = this.tree[a].left;
-      }
-    }
+    let symbol;
+    do {
+      a = this.bio.inputBit() ? this.tree[a].right : this.tree[a].left;
+      symbol = this.tree[a].code;
+    } while (symbol < 0);
     this.updateWeight(a);
-    return this.tree[a].code;
+    return symbol;
   }
   // --------------------------------------------------------------------
   // Private helpers
@@ -14779,17 +14812,19 @@ var AHuff = class _AHuff {
   updateWeight(a) {
     const tree = this.tree;
     for (; a !== _AHuff.ROOT; a = tree[a].up) {
+      const weightA = tree[a].weight;
       let b = a - 1;
-      if (b > 0 && tree[b].weight === tree[a].weight) {
-        while (b > _AHuff.ROOT && tree[b - 1].weight === tree[a].weight) {
+      if (tree[b].weight === weightA) {
+        do {
           b--;
-        }
-        if (b > _AHuff.ROOT && b !== a) {
+        } while (tree[b].weight === weightA);
+        b++;
+        if (b > _AHuff.ROOT) {
           this.swapNodes(a, b);
           a = b;
         }
       }
-      tree[a].weight++;
+      tree[a].weight = weightA + 1;
     }
     tree[_AHuff.ROOT].weight++;
   }
@@ -14809,38 +14844,26 @@ var AHuff = class _AHuff {
    */
   swapNodes(a, b) {
     const tree = this.tree;
-    const na = tree[a];
-    const nb = tree[b];
-    let tmp;
-    tmp = na.left;
-    na.left = nb.left;
-    nb.left = tmp;
-    tmp = na.right;
-    na.right = nb.right;
-    nb.right = tmp;
-    tmp = na.code;
-    na.code = nb.code;
-    nb.code = tmp;
-    tmp = na.weight;
-    na.weight = nb.weight;
-    nb.weight = tmp;
-    if (na.left) {
-      tree[na.left].up = a;
-    }
-    if (na.right) {
-      tree[na.right].up = a;
-    }
-    if (nb.left) {
-      tree[nb.left].up = b;
-    }
-    if (nb.right) {
-      tree[nb.right].up = b;
-    }
-    if (na.code >= 0) {
-      this.symbolIndex[na.code] = a;
+    const upa = tree[a].up;
+    const upb = tree[b].up;
+    const tmp = tree[a];
+    tree[a] = tree[b];
+    tree[b] = tmp;
+    tree[a].up = upa;
+    tree[b].up = upb;
+    let code = tree[a].code;
+    if (code < 0) {
+      tree[tree[a].left].up = a;
+      tree[tree[a].right].up = a;
+    } else {
+      this.symbolIndex[code] = a;
     }
-    if (nb.code >= 0) {
-      this.symbolIndex[nb.code] = b;
+    code = tree[b].code;
+    if (code < 0) {
+      tree[tree[b].left].up = b;
+      tree[tree[b].right].up = b;
+    } else {
+      this.symbolIndex[code] = b;
     }
   }
   /**
@@ -15219,12 +15242,12 @@ function unpackMtx(data, size) {
   const offset2 = data[4] << 16 | data[5] << 8 | data[6];
   const offset3 = data[7] << 16 | data[8] << 8 | data[9];
   const offsets = [10, offset2, offset3];
-  const sizes = [offset2 - 10, offset3 - offset2, size - offset3];
+  const blockSizes = [offset2 - 10, offset3 - offset2, size - offset3];
   const streams = [];
   const decompressedSizes = [];
   for (let i = 0; i < 3; i++) {
     const block = data.subarray(offsets[i]);
-    const decompressed = lzcompDecompress(block, sizes[i], versionMagic);
+    const decompressed = lzcompDecompress(block, blockSizes[i], versionMagic);
     streams.push(decompressed);
     decompressedSizes.push(decompressed.length);
   }
@@ -15316,6 +15339,15 @@ function parseEotHeader(data) {
   const fullName = readNameString();
   if (version >= 131074) {
     readNameString();
+    offset += 8;
+    if (offset + 4 <= data.length) {
+      const signatureSize = readUint16LE(data, offset + 2);
+      offset += 4 + signatureSize;
+    }
+    if (offset + 8 <= data.length) {
+      const eudcFontSize = readUint32LE(data, offset + 4);
+      offset += 8 + eudcFontSize;
+    }
   }
   return {
     eotSize,
@@ -23414,12 +23446,6 @@ function buildParagraphPropertiesXml(textStyle, paragraphAlign, bulletInfo, spac
   if (textStyle?.rtl !== void 0) {
     paragraphProps["@_rtl"] = textStyle.rtl ? "1" : "0";
   }
-  if (spacing.spacingBefore) {
-    paragraphProps["a:spcBef"] = spacing.spacingBefore;
-  }
-  if (spacing.spacingAfter) {
-    paragraphProps["a:spcAft"] = spacing.spacingAfter;
-  }
   if (spacing.lineSpacing) {
     paragraphProps["a:lnSpc"] = spacing.lineSpacing;
   } else if (typeof spacing.lineSpacingExactPt === "number" && Number.isFinite(spacing.lineSpacingExactPt)) {
@@ -23429,6 +23455,12 @@ function buildParagraphPropertiesXml(textStyle, paragraphAlign, bulletInfo, spac
       }
     };
   }
+  if (spacing.spacingBefore) {
+    paragraphProps["a:spcBef"] = spacing.spacingBefore;
+  }
+  if (spacing.spacingAfter) {
+    paragraphProps["a:spcAft"] = spacing.spacingAfter;
+  }
   if (typeof textStyle?.paragraphMarginLeft === "number" && Number.isFinite(textStyle.paragraphMarginLeft)) {
     paragraphProps["@_marL"] = String(Math.round(textStyle.paragraphMarginLeft * EMU_PER_PX4));
   }
@@ -23479,9 +23511,10 @@ function applyBulletProperties(paragraphProps, bulletInfo) {
     paragraphProps["a:buNone"] = {};
     return;
   }
-  if (bulletInfo.fontFamily) {
-    paragraphProps["a:buFont"] = {
-      "@_typeface": bulletInfo.fontFamily
+  if (bulletInfo.color) {
+    const colorHex = bulletInfo.color.replace("#", "");
+    paragraphProps["a:buClr"] = {
+      "a:srgbClr": { "@_val": colorHex }
     };
   }
   if (bulletInfo.sizePercent !== void 0) {
@@ -23494,10 +23527,9 @@ function applyBulletProperties(paragraphProps, bulletInfo) {
       "@_val": String(Math.round(bulletInfo.sizePts * 100))
     };
   }
-  if (bulletInfo.color) {
-    const colorHex = bulletInfo.color.replace("#", "");
-    paragraphProps["a:buClr"] = {
-      "a:srgbClr": { "@_val": colorHex }
+  if (bulletInfo.fontFamily) {
+    paragraphProps["a:buFont"] = {
+      "@_typeface": bulletInfo.fontFamily
     };
   }
   if (bulletInfo.char) {
@@ -23520,9 +23552,8 @@ function applyBulletProperties(paragraphProps, bulletInfo) {
 }
 function assembleParagraphXml(runs, paragraphProps) {
   const paragraph = {
-    "a:endParaRPr": { "@_lang": "en-US" }
+    "a:pPr": paragraphProps
   };
-  paragraph["a:pPr"] = paragraphProps;
   const regularRuns = runs.filter((r) => !r.__isField);
   const fieldRuns = runs.filter((r) => r.__isField).map((r) => {
     const { __isField, ...rest } = r;
@@ -23541,6 +23572,7 @@ function assembleParagraphXml(runs, paragraphProps) {
   if (cleanRegularRuns.length === 0 && fieldRuns.length === 0) {
     paragraph["a:r"] = runs.length > 1 ? runs : runs[0];
   }
+  paragraph["a:endParaRPr"] = { "@_lang": "en-US" };
   return paragraph;
 }
 function computeUniformSegmentOverrides(textStyle, textSegments) {
@@ -26379,9 +26411,6 @@ var PptxHandlerRuntime12 = class _PptxHandlerRuntime extends PptxHandlerRuntime1
     if (style.textCaps && style.textCaps !== "none") {
       runProps["@_cap"] = style.textCaps;
     }
-    if (style.rtl !== void 0) {
-      runProps["@_rtl"] = style.rtl ? "1" : "0";
-    }
     if (style.kumimoji !== void 0) {
       runProps["@_kumimoji"] = style.kumimoji ? "1" : "0";
     }
@@ -26403,17 +26432,19 @@ var PptxHandlerRuntime12 = class _PptxHandlerRuntime extends PptxHandlerRuntime1
     if (style.bookmark) {
       runProps["@_bmk"] = style.bookmark;
     }
-    if (style.fontFamily) {
-      runProps["a:latin"] = { "@_typeface": style.fontFamily };
-      runProps["a:ea"] = {
-        "@_typeface": style.eastAsiaFont || style.fontFamily
-      };
-      runProps["a:cs"] = {
-        "@_typeface": style.complexScriptFont || style.fontFamily
-      };
-    }
-    if (style.symbolFont) {
-      runProps["a:sym"] = { "@_typeface": style.symbolFont };
+    if (style.textOutlineWidth || style.textOutlineColor) {
+      const lnObj = {};
+      if (typeof style.textOutlineWidth === "number" && style.textOutlineWidth > 0) {
+        lnObj["@_w"] = String(Math.round(style.textOutlineWidth * _PptxHandlerRuntime.EMU_PER_PX));
+      }
+      if (style.textOutlineColor) {
+        lnObj["a:solidFill"] = {
+          "a:srgbClr": {
+            "@_val": style.textOutlineColor.replace("#", "")
+          }
+        };
+      }
+      runProps["a:ln"] = lnObj;
     }
     if (style.color) {
       runProps["a:solidFill"] = {
@@ -26421,15 +26452,7 @@ var PptxHandlerRuntime12 = class _PptxHandlerRuntime extends PptxHandlerRuntime1
           "@_val": style.color.replace("#", "")
         }
       };
-    }
-    if (style.highlightColor) {
-      runProps["a:highlight"] = {
-        "a:srgbClr": {
-          "@_val": style.highlightColor.replace("#", "")
-        }
-      };
-    }
-    if (style.textFillGradientStops && style.textFillGradientStops.length > 0) {
+    } else if (style.textFillGradientStops && style.textFillGradientStops.length > 0) {
       const gradStops = style.textFillGradientStops.filter((stop) => Boolean(stop?.color)).map((stop) => {
         const rawPos = (stop.position ?? 0) / 100;
         const posVal = Math.round(Math.max(0, Math.min(1, rawPos)) * 1e5);
@@ -26462,8 +26485,7 @@ var PptxHandlerRuntime12 = class _PptxHandlerRuntime extends PptxHandlerRuntime1
         }
         runProps["a:gradFill"] = gradFillXml;
       }
-    }
-    if (style.textFillPattern) {
+    } else if (style.textFillPattern) {
       const pattFill = { "@_prst": style.textFillPattern };
       if (style.textFillPatternForeground) {
         pattFill["a:fgClr"] = {
@@ -26481,6 +26503,17 @@ var PptxHandlerRuntime12 = class _PptxHandlerRuntime extends PptxHandlerRuntime1
       }
       runProps["a:pattFill"] = pattFill;
     }
+    const textEffectLst = buildTextRunEffectListXml(style);
+    if (textEffectLst) {
+      runProps["a:effectLst"] = textEffectLst;
+    }
+    if (style.highlightColor) {
+      runProps["a:highlight"] = {
+        "a:srgbClr": {
+          "@_val": style.highlightColor.replace("#", "")
+        }
+      };
+    }
     if (style.underline && style.underlineColor) {
       runProps["a:uFill"] = {
         "a:solidFill": {
@@ -26490,23 +26523,17 @@ var PptxHandlerRuntime12 = class _PptxHandlerRuntime extends PptxHandlerRuntime1
         }
       };
     }
-    if (style.textOutlineWidth || style.textOutlineColor) {
-      const lnObj = {};
-      if (typeof style.textOutlineWidth === "number" && style.textOutlineWidth > 0) {
-        lnObj["@_w"] = String(Math.round(style.textOutlineWidth * _PptxHandlerRuntime.EMU_PER_PX));
-      }
-      if (style.textOutlineColor) {
-        lnObj["a:solidFill"] = {
-          "a:srgbClr": {
-            "@_val": style.textOutlineColor.replace("#", "")
-          }
-        };
-      }
-      runProps["a:ln"] = lnObj;
+    if (style.fontFamily) {
+      runProps["a:latin"] = { "@_typeface": style.fontFamily };
+      runProps["a:ea"] = {
+        "@_typeface": style.eastAsiaFont || style.fontFamily
+      };
+      runProps["a:cs"] = {
+        "@_typeface": style.complexScriptFont || style.fontFamily
+      };
     }
-    const textEffectLst = buildTextRunEffectListXml(style);
-    if (textEffectLst) {
-      runProps["a:effectLst"] = textEffectLst;
+    if (style.symbolFont) {
+      runProps["a:sym"] = { "@_typeface": style.symbolFont };
     }
     if (style.hyperlink && resolveHyperlinkRelationshipId) {
       const hyperlinkTarget = String(style.hyperlink).trim();
@@ -29427,32 +29454,58 @@ var PptxHandlerRuntime24 = class _PptxHandlerRuntime extends PptxHandlerRuntime2
       };
       for (const variant of variants) {
         const fontData = variant.rawFontData;
-        const guid = variant.fontGuid ?? generateFontGuid();
-        const fileName = `{${guid}}.fntdata`;
-        const fontPartPath = `ppt/fonts/${fileName}`;
-        const relativeTarget = `fonts/${fileName}`;
-        const obfuscated = obfuscateFont(fontData, guid);
-        this.zip.file(fontPartPath, obfuscated);
+        const hasOriginal = Boolean(variant.originalRId && variant.partPath);
+        const reuseObfuscation = hasOriginal && Boolean(variant.fontGuid);
+        const reuseVerbatim = hasOriginal && !variant.fontGuid && Boolean(variant.originalPartBytes);
+        let guid;
+        let fontPartPath;
+        let relativeTarget;
         let rId;
-        const existingRel = relationships.find(
-          (r) => String(r?.["@_Target"] || "") === relativeTarget
-        );
-        if (existingRel) {
-          rId = String(existingRel["@_Id"]);
+        let bytesToWrite;
+        let fontKeyForXml;
+        if (reuseObfuscation) {
+          guid = variant.fontGuid;
+          fontPartPath = variant.partPath;
+          relativeTarget = fontPartPath.startsWith("ppt/") ? fontPartPath.substring(4) : fontPartPath;
+          rId = variant.originalRId;
+          bytesToWrite = obfuscateFont(fontData, guid);
+          fontKeyForXml = `{${guid}}`;
+        } else if (reuseVerbatim) {
+          guid = "";
+          fontPartPath = variant.partPath;
+          relativeTarget = fontPartPath.startsWith("ppt/") ? fontPartPath.substring(4) : fontPartPath;
+          rId = variant.originalRId;
+          bytesToWrite = variant.originalPartBytes;
+          fontKeyForXml = void 0;
         } else {
-          maxId++;
-          rId = `rId${maxId}`;
-          relationships.push({
-            "@_Id": rId,
-            "@_Type": _PptxHandlerRuntime.FONT_REL_TYPE,
-            "@_Target": relativeTarget
-          });
+          guid = variant.fontGuid ?? generateFontGuid();
+          const fileName = `{${guid}}.fntdata`;
+          fontPartPath = `ppt/fonts/${fileName}`;
+          relativeTarget = `fonts/${fileName}`;
+          bytesToWrite = obfuscateFont(fontData, guid);
+          fontKeyForXml = `{${guid}}`;
+          const existingRel = relationships.find(
+            (r) => String(r?.["@_Target"] || "") === relativeTarget
+          );
+          if (existingRel) {
+            rId = String(existingRel["@_Id"]);
+          } else {
+            maxId++;
+            rId = `rId${maxId}`;
+            relationships.push({
+              "@_Id": rId,
+              "@_Type": _PptxHandlerRuntime.FONT_REL_TYPE,
+              "@_Target": relativeTarget
+            });
+          }
         }
+        this.zip.file(fontPartPath, bytesToWrite);
         const variantKey = variant.bold && variant.italic ? "p:boldItalic" : variant.bold ? "p:bold" : variant.italic ? "p:italic" : "p:regular";
-        entry[variantKey] = {
-          "@_r:id": rId,
-          "@_fontKey": `{${guid}}`
-        };
+        const variantEntry = { "@_r:id": rId };
+        if (fontKeyForXml) {
+          variantEntry["@_fontKey"] = fontKeyForXml;
+        }
+        entry[variantKey] = variantEntry;
       }
       embeddedFontEntries.push(entry);
     }
@@ -29596,54 +29649,59 @@ var PptxHandlerRuntime25 = class extends PptxHandlerRuntime24 {
       }
     };
     const root = propsData["p:presentationPr"] || {};
-    const showPr = root["p:showPr"] || {};
-    delete showPr["p:present"];
-    delete showPr["p:browse"];
-    delete showPr["p:kiosk"];
-    if (properties.showType === "browsed") {
-      showPr["p:browse"] = {};
-    } else if (properties.showType === "kiosk") {
-      const kioskNode = {};
-      if (properties.kioskRestartTime !== void 0 && properties.kioskRestartTime > 0) {
-        kioskNode["@_restart"] = String(properties.kioskRestartTime);
+    const existingShowPr = root["p:showPr"] || {};
+    const rebuiltShowPr = {};
+    for (const key of Object.keys(existingShowPr)) {
+      if (key.startsWith("@_")) {
+        rebuiltShowPr[key] = existingShowPr[key];
       }
-      showPr["p:kiosk"] = kioskNode;
-    } else {
-      showPr["p:present"] = {};
     }
     if (properties.loopContinuously !== void 0) {
-      showPr["@_loop"] = properties.loopContinuously ? "1" : "0";
+      rebuiltShowPr["@_loop"] = properties.loopContinuously ? "1" : "0";
     }
     if (properties.showWithNarration !== void 0) {
-      showPr["@_showNarration"] = properties.showWithNarration ? "1" : "0";
+      rebuiltShowPr["@_showNarration"] = properties.showWithNarration ? "1" : "0";
     }
     if (properties.showWithAnimation !== void 0) {
-      showPr["@_showAnimation"] = properties.showWithAnimation ? "1" : "0";
+      rebuiltShowPr["@_showAnimation"] = properties.showWithAnimation ? "1" : "0";
     }
     if (properties.advanceMode !== void 0) {
-      showPr["@_useTimings"] = properties.advanceMode === "useTimings" ? "1" : "0";
+      rebuiltShowPr["@_useTimings"] = properties.advanceMode === "useTimings" ? "1" : "0";
     }
-    if (properties.penColor) {
-      showPr["p:penClr"] = {
-        "a:srgbClr": { "@_val": properties.penColor.replace("#", "") }
-      };
+    if (properties.showType === "browsed") {
+      rebuiltShowPr["p:browse"] = {};
+    } else if (properties.showType === "kiosk") {
+      const kioskNode = {};
+      if (properties.kioskRestartTime !== void 0 && properties.kioskRestartTime > 0) {
+        kioskNode["@_restart"] = String(properties.kioskRestartTime);
+      }
+      rebuiltShowPr["p:kiosk"] = kioskNode;
+    } else {
+      rebuiltShowPr["p:present"] = {};
     }
-    delete showPr["p:sldAll"];
-    delete showPr["p:sldRg"];
-    delete showPr["p:custShow"];
     if (properties.showSlidesMode === "range") {
-      showPr["p:sldRg"] = {
+      rebuiltShowPr["p:sldRg"] = {
         "@_st": String(properties.showSlidesFrom ?? 1),
         "@_end": String(properties.showSlidesTo ?? 1)
       };
     } else if (properties.showSlidesMode === "customShow" && properties.showSlidesCustomShowId) {
-      showPr["p:custShow"] = {
+      rebuiltShowPr["p:custShow"] = {
         "@_id": properties.showSlidesCustomShowId
       };
     } else {
-      showPr["p:sldAll"] = {};
+      rebuiltShowPr["p:sldAll"] = {};
     }
-    root["p:showPr"] = showPr;
+    if (properties.penColor) {
+      rebuiltShowPr["p:penClr"] = {
+        "a:srgbClr": { "@_val": properties.penColor.replace("#", "") }
+      };
+    } else if (existingShowPr["p:penClr"] !== void 0) {
+      rebuiltShowPr["p:penClr"] = existingShowPr["p:penClr"];
+    }
+    if (existingShowPr["p:extLst"] !== void 0) {
+      rebuiltShowPr["p:extLst"] = existingShowPr["p:extLst"];
+    }
+    root["p:showPr"] = rebuiltShowPr;
     if (properties.printFrameSlides !== void 0 || properties.printSlidesPerPage !== void 0 || properties.printColorMode !== void 0) {
       const prnPr = root["p:prnPr"] || {};
       if (properties.printFrameSlides !== void 0) {
@@ -30774,7 +30832,12 @@ var PptxHandlerRuntime31 = class extends PptxHandlerRuntime30 {
         shape = this.createPictureXml(el, relationshipId);
       }
       if (targetImagePath) {
-        this.zip.file(targetImagePath, parsedImage.bytes);
+        const targetExt = targetImagePath.toLowerCase().match(/\.([^./\\]+)$/)?.[1];
+        const parsedExt = parsedImage.extension.toLowerCase();
+        const extensionMismatch = targetExt !== void 0 && targetExt !== parsedExt && !(targetExt === "jpg" && parsedExt === "jpeg") && !(targetExt === "jpeg" && parsedExt === "jpg");
+        if (!extensionMismatch) {
+          this.zip.file(targetImagePath, parsedImage.bytes);
+        }
       }
     } else {
       this.compatibilityService.reportWarning({
@@ -31179,6 +31242,7 @@ var PptxHandlerRuntime34 = class _PptxHandlerRuntime extends PptxHandlerRuntime3
       );
     } else {
       this.zip.remove("ppt/commentAuthors.xml");
+      await this.stripPresentationCommentAuthorsRelationship();
     }
     const contentTypesXmlAfterComments = await this.zip.file("[Content_Types].xml")?.async("string");
     if (contentTypesXmlAfterComments) {
@@ -31252,8 +31316,39 @@ var PptxHandlerRuntime34 = class _PptxHandlerRuntime extends PptxHandlerRuntime3
     if (effectiveConformance === "strict") {
       await this.convertZipToStrictConformance();
     }
+    for (const name of Object.keys(this.zip.files)) {
+      if (this.zip.files[name].dir) {
+        delete this.zip.files[name];
+      }
+    }
     return await this.zip.generateAsync({ type: "uint8array" });
   }
+  /**
+   * Remove any Relationship in presentation.xml.rels whose Type matches either
+   * the Transitional or Strict commentAuthors relationship URI.
+   */
+  async stripPresentationCommentAuthorsRelationship() {
+    const relsPath = "ppt/_rels/presentation.xml.rels";
+    const relsXml = await this.zip.file(relsPath)?.async("string");
+    if (!relsXml) {
+      return;
+    }
+    const relsData = this.parser.parse(relsXml);
+    const root = relsData["Relationships"];
+    if (!root) {
+      return;
+    }
+    const relationships = this.ensureArray(root["Relationship"]);
+    const filtered = relationships.filter((relationship) => {
+      const type = String(relationship?.["@_Type"] ?? "");
+      return type !== "http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors" && type !== "http://purl.oclc.org/ooxml/officeDocument/relationships/commentAuthors";
+    });
+    if (filtered.length === relationships.length) {
+      return;
+    }
+    root["Relationship"] = filtered;
+    this.zip.file(relsPath, this.builder.build(relsData));
+  }
 };
 
 // src/core/core/runtime/PptxHandlerRuntimeElementParsing.ts
@@ -33238,7 +33333,7 @@ var PptxHandlerRuntime44 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
       }
       const shapeStyle = this.extractShapeStyle(effectiveSpPr, styleNode);
       const hasText = text.trim().length > 0;
-      const isPlainRect = !prstGeom || prstGeom === "rect";
+      const isPlainRect = (!prstGeom || prstGeom === "rect") && !custGeom;
       const hasVisibleStyle = shapeStyle.fillColor && shapeStyle.fillColor !== "transparent" || (shapeStyle.strokeWidth || 0) > 0;
       let type = "shape";
       if (hasText && isPlainRect && !hasVisibleStyle) {
@@ -33250,6 +33345,7 @@ var PptxHandlerRuntime44 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
         slideRelationshipMap,
         this.orderedSlidePaths
       );
+      const elementName = cNvPrForActions?.["@_name"] ? String(cNvPrForActions["@_name"]).trim() : void 0;
       const cNvSpPr = shape?.["p:nvSpPr"]?.["p:cNvSpPr"];
       const spLocksNode = cNvSpPr?.["a:spLocks"];
       const slideLocks = this.parseShapeLocks(spLocksNode);
@@ -33260,6 +33356,7 @@ var PptxHandlerRuntime44 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
       const promptText = !hasText && phDefaults?.promptText ? phDefaults.promptText : void 0;
       const commonProps = {
         id,
+        name: elementName || void 0,
         x,
         y,
         width,
@@ -33496,12 +33593,14 @@ var PptxHandlerRuntime45 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
         picSlideRels,
         this.orderedSlidePaths
       );
+      const picElementName = picCNvPr?.["@_name"] ? String(picCNvPr["@_name"]).trim() : void 0;
       const picCNvPicPr = pic?.["p:nvPicPr"]?.["p:cNvPicPr"];
       const picLocks = this.parseShapeLocks(
         picCNvPicPr?.["a:picLocks"] ?? picCNvPicPr?.["a:spLocks"]
       );
       return {
         id,
+        name: picElementName || void 0,
         type: "picture",
         x,
         y,
@@ -34048,9 +34147,11 @@ var PptxHandlerRuntime47 = class _PptxHandlerRuntime extends PptxHandlerRuntime4
       grpSlideRels,
       this.orderedSlidePaths
     );
+    const grpElementName = grpCNvPr?.["@_name"] ? String(grpCNvPr["@_name"]).trim() : void 0;
     const groupElement = {
       type: "group",
       id: baseId,
+      name: grpElementName || void 0,
       x: parentX,
       y: parentY,
       width: parentW || Math.max(...children.map((c) => c.x + c.width)),
@@ -37930,6 +38031,7 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
       if (!fontBinary || fontBinary.length === 0) {
         return null;
       }
+      const originalPartBytes = new Uint8Array(fontBinary);
       let fontData;
       let resolvedGuid;
       if (isEotFormat(fontBinary)) {
@@ -37983,7 +38085,9 @@ var PptxHandlerRuntime71 = class extends PptxHandlerRuntime70 {
         format,
         rawFontData: fontData,
         partPath: fontPath,
-        fontGuid: resolvedGuid
+        fontGuid: resolvedGuid,
+        originalRId: rId,
+        originalPartBytes
       };
     } catch {
       return null;