@harbour-enterprises/superdoc 1.0.0-beta.40 → 1.0.0-beta.54

package/dist/superdoc.umd.js

@@ -18043,7 +18043,7 @@
     encode: encode$Q,
     decode: decode$S
   });
-  const validXmlAttributes$j = [attrConfig$s, attrConfig$r];
+  const validXmlAttributes$h = [attrConfig$s, attrConfig$r];
   const XML_NODE_NAME$q = "w:br";
   const SD_NODE_NAME$k = "lineBreak";
   const encode$P = (_2, encodedAttrs) => {
@@ -18079,7 +18079,7 @@
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$P,
     decode: decode$R,
-    attributes: validXmlAttributes$j
+    attributes: validXmlAttributes$h
   };
   const translator$23 = NodeTranslator.from(config$p);
   const encode$O = (attributes) => attributes?.["w:val"];
@@ -18090,7 +18090,7 @@
     encode: encode$O,
     decode: decode$Q
   });
-  const validXmlAttributes$i = [attrConfig$q];
+  const validXmlAttributes$g = [attrConfig$q];
   const XML_NODE_NAME$p = "w:highlight";
   const SD_ATTR_KEY$4 = "highlight";
   const DISABLED_TOKENS = /* @__PURE__ */ new Set(["transparent", "none", "inherit"]);
@@ -18141,7 +18141,7 @@
     type: NodeTranslator.translatorTypes.ATTRIBUTE,
     encode: encode$N,
     decode: decode$P,
-    attributes: validXmlAttributes$i
+    attributes: validXmlAttributes$g
   };
   const translator$22 = NodeTranslator.from(config$o);
   const encode$M = (attributes) => {
@@ -18184,7 +18184,7 @@
     encode: encode$K,
     decode: decode$M
   });
-  const validXmlAttributes$h = [attrConfig$p, attrConfig$n, attrConfig$o];
+  const validXmlAttributes$f = [attrConfig$p, attrConfig$n, attrConfig$o];
   const XML_NODE_NAME$o = "w:tab";
   const SD_NODE_NAME$j = "tab";
   const encode$J = (_2, encodedAttrs = {}) => {
@@ -18220,7 +18220,7 @@
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$J,
     decode: decode$L,
-    attributes: validXmlAttributes$h
+    attributes: validXmlAttributes$f
   };
   const translator$21 = NodeTranslator.from(config$n);
   const carbonCopy = (obj) => {
@@ -18591,7 +18591,7 @@
     encode: encode$E,
     decode: decode$G
   });
-  const validXmlAttributes$g = [attrConfig$m, attrConfig$l, attrConfig$k, attrConfig$j, attrConfig$i];
+  const validXmlAttributes$e = [attrConfig$m, attrConfig$l, attrConfig$k, attrConfig$j, attrConfig$i];
   const XML_NODE_NAME$n = "w:u";
   const SD_ATTR_KEY$3 = "underline";
   const encode$D = (params2, encodedAttrs = {}) => {
@@ -18643,7 +18643,7 @@
     type: NodeTranslator.translatorTypes.ATTRIBUTE,
     encode: encode$D,
     decode: decode$F,
-    attributes: validXmlAttributes$g
+    attributes: validXmlAttributes$e
   };
   const translator$1Z = NodeTranslator.from(config$m);
   const translator$1Y = NodeTranslator.from(createSingleBooleanPropertyHandler("w:strike"));
@@ -18777,7 +18777,7 @@
   ]);
   const XML_NODE_NAME$m = "mc:AlternateContent";
   const SD_NODE_NAME$i = [];
-  const validXmlAttributes$f = [];
+  const validXmlAttributes$d = [];
   function encode$C(params2) {
     const { nodeListHandler } = params2;
     const { node: node2 } = params2.extraParams;
@@ -18817,7 +18817,7 @@
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$C,
     decode: decode$E,
-    attributes: validXmlAttributes$f
+    attributes: validXmlAttributes$d
   };
   function selectAlternateContentElements(node2) {
     if (!node2?.elements?.length) {
@@ -18957,7 +18957,7 @@
   };
   const XML_NODE_NAME$l = "w:ins";
   const SD_ATTR_KEY$2 = "trackInsert";
-  const validXmlAttributes$e = [
+  const validXmlAttributes$c = [
     createAttributeHandler("w:id", "id"),
     createAttributeHandler("w:date", "date"),
     createAttributeHandler("w:author", "author"),
@@ -19017,7 +19017,7 @@
     type: NodeTranslator.translatorTypes.ATTRIBUTE,
     encode: encode$B,
     decode: decode$D,
-    attributes: validXmlAttributes$e
+    attributes: validXmlAttributes$c
   };
   const translator$1w = NodeTranslator.from(config$k);
   const translator$1v = NodeTranslator.from(createSingleIntegerPropertyHandler("w:numId"));
@@ -19211,11 +19211,12 @@
     }
     if (isListNumber) {
       let numberingProps = {};
-      if (resolvedPpr?.numberingProperties?.numId != null) {
+      const numId = resolvedPpr?.numberingProperties?.numId;
+      if (numId != null && numId !== 0 && numId !== "0") {
         numberingProps = getNumberingProperties(
           params2,
           resolvedPpr.numberingProperties.ilvl ?? 0,
-          resolvedPpr.numberingProperties.numId,
+          numId,
           translator$1N
         );
       }
@@ -19253,9 +19254,13 @@
     let styleProps = inlineProps?.styleId ? resolveStyleChain$1(params2, inlineProps?.styleId, translator$12) : {};
     let numberingProps = {};
     let ilvl = inlineProps?.numberingProperties?.ilvl ?? styleProps?.numberingProperties?.ilvl;
-    const numId = inlineProps?.numberingProperties?.numId ?? styleProps?.numberingProperties?.numId;
+    let numId = inlineProps?.numberingProperties?.numId ?? styleProps?.numberingProperties?.numId;
     let numberingDefinedInline = inlineProps?.numberingProperties?.numId != null;
-    const isList2 = numId != null;
+    const inlineNumIdDisablesNumbering = inlineProps?.numberingProperties?.numId === 0 || inlineProps?.numberingProperties?.numId === "0";
+    if (inlineNumIdDisablesNumbering) {
+      numId = null;
+    }
+    const isList2 = numId != null && numId !== 0 && numId !== "0";
     if (isList2) {
       ilvl = ilvl != null ? ilvl : 0;
       numberingProps = getNumberingProperties(params2, ilvl, numId, translator$12);
@@ -20396,7 +20401,7 @@
     encode: encode$u,
     decode: decode$w
   });
-  const validXmlAttributes$d = [
+  const validXmlAttributes$b = [
     attrConfig$c,
     attrConfig$b,
     attrConfig$f,
@@ -20429,7 +20434,7 @@
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$t,
     decode: decode$v,
-    attributes: validXmlAttributes$d
+    attributes: validXmlAttributes$b
   };
   const translator$11 = NodeTranslator.from(config$j);
   const EAST_ASIAN_CHARACTER_REGEX = /[\u1100-\u11FF\u2E80-\u2EFF\u2F00-\u2FDF\u3040-\u30FF\u3100-\u312F\u3130-\u318F\u31A0-\u31BF\u3400-\u4DBF\u4E00-\u9FFF\uA960-\uA97F\uAC00-\uD7AF\uF900-\uFAFF\uFF00-\uFFEF]/u;
@@ -20612,7 +20617,7 @@
     encode: (attributes) => attributes[xmlName],
     decode: (attributes) => attributes[sdName]
   });
-  const validXmlAttributes$c = [
+  const validXmlAttributes$a = [
     _createAttributeHandler("w:anchor", "anchor"),
     _createAttributeHandler("w:docLocation", "docLocation"),
     {
@@ -20714,7 +20719,7 @@
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$s,
     decode: decode$u,
-    attributes: validXmlAttributes$c
+    attributes: validXmlAttributes$a
   };
   const translator$10 = NodeTranslator.from(config$i);
   const encode$r = (attributes) => {
@@ -20753,7 +20758,7 @@
     encode: encode$p,
     decode: decode$r
   });
-  const validXmlAttributes$b = [attrConfig$a, attrConfig$9, attrConfig$8];
+  const validXmlAttributes$9 = [attrConfig$a, attrConfig$9, attrConfig$8];
   const XML_NODE_NAME$i = "w:r";
   const SD_KEY_NAME = "run";
   const encode$o = (params2, encodedAttrs = {}) => {
@@ -20900,7 +20905,7 @@
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$o,
     decode: decode$q,
-    attributes: validXmlAttributes$b
+    attributes: validXmlAttributes$9
   };
   const translator$$ = NodeTranslator.from(config$h);
   const translator$_ = NodeTranslator.from(createMeasurementPropertyHandler("w:tcW", "cellWidth"));
@@ -21330,7 +21335,7 @@
   }
   const XML_NODE_NAME$h = "w:tc";
   const SD_NODE_NAME$f = "tableCell";
-  const validXmlAttributes$a = [];
+  const validXmlAttributes$8 = [];
   function encode$n(params2, encodedAttrs) {
     const {
       node: node2,
@@ -21371,7 +21376,7 @@
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$n,
     decode: decode$p,
-    attributes: validXmlAttributes$a
+    attributes: validXmlAttributes$8
   };
   const translator$G = NodeTranslator.from(config$g);
   const translator$F = NodeTranslator.from({
@@ -21525,7 +21530,7 @@
   };
   const XML_NODE_NAME$g = "w:tr";
   const SD_NODE_NAME$e = "tableRow";
-  const validXmlAttributes$9 = ["w:rsidDel", "w:rsidR", "w:rsidRPr", "w:rsidTr", "w14:paraId", "w14:textId"].map(
+  const validXmlAttributes$7 = ["w:rsidDel", "w:rsidR", "w:rsidRPr", "w:rsidTr", "w14:paraId", "w14:textId"].map(
     (xmlName) => createAttributeHandler(xmlName)
   );
   const encode$m = (params2, encodedAttrs) => {
@@ -21662,7 +21667,7 @@
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$m,
     decode: decode$o,
-    attributes: validXmlAttributes$9
+    attributes: validXmlAttributes$7
   };
   const translator$v = NodeTranslator.from(config$f);
   function parseTagValueJSON(json) {
@@ -30441,6 +30446,7 @@
     if (!node2) return null;
     const { docx, filename, converter } = params2;
     const attributes = node2?.attributes || {};
+    const { order: order2, originalChildren } = collectPreservedDrawingChildren(node2);
     const padding = {
       top: emuToPixels(attributes?.["distT"]),
       bottom: emuToPixels(attributes?.["distB"]),
@@ -30636,6 +30642,7 @@
     }
     const wrapValue = wrap2;
     const nodeAttrs = {
+      // originalXml: carbonCopy(node),
       src: finalSrc,
       alt: isMetafileExtension(extension) && !wasConverted ? "Unable to render EMF/WMF image" : docPr?.attributes?.name || "Image",
       extension: finalExtension,
@@ -30670,7 +30677,9 @@
         distR: attributes["distR"]
       },
       originalAttributes: node2.attributes,
-      rId: relAttributes["Id"]
+      rId: relAttributes["Id"],
+      ...order2.length ? { drawingChildOrder: order2 } : {},
+      ...originalChildren.length ? { originalDrawingChildren: originalChildren } : {}
     };
     return {
       type: "image",
@@ -30695,6 +30704,23 @@
     const fallbackType = textBoxContent ? "textbox" : "drawing";
     return buildShapePlaceholder(node2, size2, padding, marginOffset, fallbackType);
   };
+  function collectPreservedDrawingChildren(node2) {
+    const order2 = [];
+    const original = [];
+    if (!Array.isArray(node2?.elements)) {
+      return { order: order2, originalChildren: original };
+    }
+    node2.elements.forEach((child, index2) => {
+      if (!child) return;
+      const name = child.name ?? null;
+      order2.push(name);
+      original.push({
+        index: index2,
+        xml: carbonCopy(child)
+      });
+    });
+    return { order: order2, originalChildren: original };
+  }
   const handleShapeGroup = (params2, node2, graphicData, size2, padding, marginOffset, anchorData, wrap2) => {
     const wgp = graphicData.elements.find((el) => el.name === "wpg:wgp");
     if (!wgp) {
@@ -33463,7 +33489,7 @@
     }
     tr.setNodeMarkup(pos, null, newAttrs);
   }
-  const generateNewListDefinition = ({ numId, listType, level, start: start2, text: text2, fmt, editor }) => {
+  const generateNewListDefinition = ({ numId, listType, level, start: start2, text: text2, fmt, editor, markerFontFamily }) => {
     if (typeof listType !== "string") listType = listType.name;
     const definition2 = listType === "orderedList" ? baseOrderedListDef : baseBulletList;
     const numbering = editor.converter.numbering;
@@ -33517,6 +33543,29 @@
           }
         }
       ];
+      if (markerFontFamily) {
+        const rPrIndex = levelProps.elements.findIndex((el) => el.name === "w:rPr");
+        let rPr = levelProps.elements[rPrIndex];
+        if (!rPr) {
+          rPr = {
+            type: "element",
+            name: "w:rPr",
+            elements: []
+          };
+          levelProps.elements.push(rPr);
+        }
+        rPr.elements = rPr.elements.filter((el) => el.name !== "w:rFonts");
+        rPr.elements.push({
+          type: "element",
+          name: "w:rFonts",
+          attributes: {
+            "w:ascii": markerFontFamily,
+            "w:hAnsi": markerFontFamily,
+            "w:eastAsia": markerFontFamily,
+            "w:cs": markerFontFamily
+          }
+        });
+      }
     }
     if (!skipAddingNewAbstract) newNumbering.abstracts[newAbstractId] = newAbstractDef;
     const newNumDef = getBasicNumIdTag(numId, newAbstractId);
@@ -33783,8 +33832,8 @@
     }
     return styleMap;
   };
-  const extractParagraphStyles = (cssText, className) => {
-    const pattern = new RegExp(`\\.(${className})\\s*\\{([^}]+)\\}`, "i");
+  const extractParagraphStyles = (cssText, selector) => {
+    const pattern = new RegExp(`(${selector})\\s*\\{([^}]+)\\}`, "i");
     const match = cssText.match(pattern);
     if (!match) return null;
     const rawStyles = match[2].split(";").map((line) => line.trim()).filter(Boolean);
@@ -33899,7 +33948,7 @@
     cleanedHtml = cleanHtmlUnnecessaryTags(cleanedHtml);
     const tempDiv = document.createElement("div");
     tempDiv.innerHTML = cleanedHtml;
-    const data = tempDiv.querySelectorAll("p, li");
+    const data = tempDiv.querySelectorAll("p, li, " + [1, 2, 3, 4, 5, 6, 7, 8, 9].map((n) => `h${n}`).join(", "));
     const startMap = {};
     data.forEach((item) => {
       let type2;
@@ -33911,13 +33960,24 @@
       const styleAttr = item.getAttribute("style") || "";
       const msoListMatch = styleAttr.match(/mso-list:\s*l(\d+)\s+level(\d+)\s+lfo(\d+)/);
       const css = tempDiv.querySelector("style").innerHTML;
-      const normalStyles = extractParagraphStyles(css, "MsoNormal");
-      const paragraphStyles = extractParagraphStyles(css, item.getAttribute("class"));
-      let styleChain = { ...normalStyles, ...paragraphStyles };
+      const normalStyles = extractParagraphStyles(css, ".MsoNormal");
+      let styleId = item.getAttribute("class");
+      let charStyles = {};
+      if (item.localName.startsWith("h") && !styleId) {
+        styleId = item.localName;
+        const level = styleId.substring(1);
+        charStyles = extractParagraphStyles(css, `.Heading${level}Char`);
+      } else if (styleId) {
+        styleId = `.${styleId}`;
+      }
+      const paragraphStyles = extractParagraphStyles(css, styleId);
+      let styleChain = { ...normalStyles, ...paragraphStyles, ...charStyles };
       const numberingDefinedInline = !paragraphStyles || !paragraphStyles["mso-list"];
       if (msoListMatch) {
         const [, abstractId, level, numId] = msoListMatch;
         const numberingStyles = extractListLevelStyles(css, abstractId, level, numId) || {};
+        const markerFontFamily = numberingStyles?.["font-family"] ?? normalStyles?.["font-family"];
+        delete numberingStyles["font-family"];
         if (numberingDefinedInline) {
           styleChain = { ...normalStyles, ...paragraphStyles, ...numberingStyles };
         } else {
@@ -33940,6 +34000,7 @@
           if (!startMap[numId]) startMap[numId] = startGetter(item.children[0]?.innerText || "1");
           start2 = startMap[numId];
         }
+        item.setAttribute("data-marker-font-family", markerFontFamily);
         item.setAttribute("data-num-id", numId);
         item.setAttribute("data-list-level", parseInt(level) - 1);
         item.setAttribute("data-start", start2);
@@ -33988,6 +34049,24 @@
           }
         });
         item.setAttribute("data-text-styles", JSON.stringify(textStyles));
+        for (const child of item.children) {
+          if (child.style) {
+            Object.keys(textStyles).forEach((key2) => {
+              const styleValue = textStyles[key2];
+              if (styleValue) {
+                child.style[key2] = styleValue;
+              }
+            });
+          }
+        }
+      }
+      if (resolvedStyle["font-weight"] === "bold") {
+        item.style.fontWeight = "bold";
+        for (const child of item.children) {
+          if (child.style) {
+            child.style.fontWeight = "bold";
+          }
+        }
       }
       extractAndRemoveConditionalPrefix(item);
     });
@@ -34031,6 +34110,7 @@
       const numFmt = item.getAttribute("data-num-fmt");
       const start2 = item.getAttribute("data-start");
       const lvlText = item.getAttribute("data-lvl-text");
+      const markerFontFamily = item.getAttribute("data-marker-font-family");
       const importedId = item.getAttribute("data-num-id");
       if (!mappedLists[importedId]) mappedLists[importedId] = ListHelpers.getNewListId(editor);
       const id = mappedLists[importedId];
@@ -34042,7 +34122,8 @@
         start: start2,
         fmt: numFmt,
         text: lvlText,
-        editor
+        editor,
+        markerFontFamily
       });
       if (!lists[id]) lists[id] = { levels: {} };
       const currentListByNumId = lists[id];
@@ -34075,6 +34156,11 @@
           const styleValue = textStyles[key2];
           if (styleValue) {
             pElement.style[key2] = styleValue;
+            for (const child of pElement.children) {
+              if (child.style) {
+                child.style[key2] = styleValue;
+              }
+            }
           }
         });
       }
@@ -36408,11 +36494,71 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       elements: []
     });
   }
+  function mergeDrawingChildren({ order: order2, generated, original }) {
+    const genQueues = groupByName(generated);
+    const originalsByIndex = groupByIndex(original);
+    return mergeWithOrder(order2, genQueues, originalsByIndex);
+  }
+  function groupByIndex(entries = []) {
+    const map2 = /* @__PURE__ */ new Map();
+    entries.forEach((entry) => {
+      if (!entry) return;
+      const { index: index2, xml: xml2 } = entry;
+      if (typeof index2 === "number" && xml2 && xml2.name !== "wp:extent") {
+        map2.set(index2, carbonCopy(xml2));
+      }
+    });
+    return map2;
+  }
+  function mergeWithOrder(order2 = [], genQueues, originalsByIndex) {
+    const out = [];
+    const namesInOrder = new Set(order2);
+    order2.forEach((name, idx) => {
+      if (name === "wp:extent") {
+        const queue3 = genQueues.get("wp:extent") || [];
+        if (queue3.length) {
+          out.push(queue3.shift());
+          if (!queue3.length) genQueues.delete("wp:extent");
+        }
+        return;
+      }
+      if (originalsByIndex.has(idx)) {
+        out.push(originalsByIndex.get(idx));
+        originalsByIndex.delete(idx);
+        if (genQueues.has(name)) {
+          genQueues.delete(name);
+        }
+        return;
+      }
+      const queue2 = genQueues.get(name) || [];
+      if (queue2.length) {
+        out.push(queue2.shift());
+        if (!queue2.length) genQueues.delete(name);
+      }
+    });
+    originalsByIndex.forEach((xml2) => out.push(xml2));
+    genQueues.forEach((queue2, name) => {
+      if (namesInOrder.has(name)) return;
+      queue2.forEach((el) => out.push(el));
+    });
+    return out;
+  }
+  function groupByName(nodes = []) {
+    const map2 = /* @__PURE__ */ new Map();
+    nodes.forEach((el) => {
+      if (!el?.name) return;
+      const list2 = map2.get(el.name) || [];
+      list2.push(carbonCopy(el));
+      map2.set(el.name, list2);
+    });
+    return map2;
+  }
   function translateAnchorNode(params2) {
     const { attrs } = params2.node;
     const anchorElements = [];
-    const hasSimplePos = attrs.simplePos || attrs.originalAttributes?.simplePos;
-    if (hasSimplePos) {
+    const useOriginalChildren = Array.isArray(attrs.originalDrawingChildren) && attrs.originalDrawingChildren.length > 0;
+    const hasSimplePos = attrs.simplePos !== void 0 || attrs.originalAttributes?.simplePos !== void 0;
+    if (!useOriginalChildren && hasSimplePos) {
       anchorElements.push({
         name: "wp:simplePos",
         attributes: {
@@ -36421,7 +36567,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         }
       });
     }
-    if (attrs.anchorData) {
+    if (!useOriginalChildren && attrs.anchorData) {
       const hElements = [];
       if (attrs.marginOffset.horizontal !== void 0) {
         hElements.push({
@@ -36467,25 +36613,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     if (inlineAttrs.relativeHeight == null) {
       inlineAttrs.relativeHeight = 1;
     }
-    if (attrs.originalAttributes?.simplePos !== void 0) {
-      inlineAttrs.simplePos = attrs.originalAttributes.simplePos;
-    } else if (hasSimplePos) {
+    if (attrs.originalAttributes?.simplePos === void 0 && hasSimplePos) {
       inlineAttrs.simplePos = "1";
     }
-    if (attrs.originalAttributes?.locked !== void 0) {
-      inlineAttrs.locked = attrs.originalAttributes.locked;
-    }
-    if (attrs.originalAttributes?.layoutInCell !== void 0) {
-      inlineAttrs.layoutInCell = attrs.originalAttributes.layoutInCell;
-    }
-    if (attrs.originalAttributes?.allowOverlap !== void 0) {
-      inlineAttrs.allowOverlap = attrs.originalAttributes.allowOverlap;
-    }
     const wrapElement = {
       name: `wp:wrap${attrs.wrap?.type || "None"}`
       // Important: wp:anchor will break if no wrapping is specified. We need to use wrapNone.
     };
-    switch (attrs.wrap?.type) {
+    switch (useOriginalChildren ? void 0 : attrs.wrap?.type) {
       case "Square":
         wrapElement.attributes = {
           wrapText: attrs.wrap.attrs.wrapText
@@ -36565,15 +36700,33 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       wrapElement,
       ...nodeElements.elements.slice(effectIndex + 1)
     ];
+    const mergedElements = mergeDrawingChildren({
+      order: attrs.drawingChildOrder || [],
+      original: attrs.originalDrawingChildren || [],
+      generated: [...anchorElements, ...elementsWithWrap]
+    });
     return {
       name: "wp:anchor",
       attributes: inlineAttrs,
-      elements: [...anchorElements, ...elementsWithWrap]
+      elements: mergedElements
     };
   }
   const XML_NODE_NAME$f = "wp:anchor";
   const SD_NODE_NAME$d = ["image", "shapeGroup", "vectorShape", "contentBlock"];
-  const validXmlAttributes$8 = ["distT", "distB", "distL", "distR"].map((xmlName) => createAttributeHandler(xmlName));
+  const validXmlAttributes$6 = [
+    "distT",
+    "distB",
+    "distL",
+    "distR",
+    "allowOverlap",
+    "behindDoc",
+    "layoutInCell",
+    "locked",
+    "relativeHeight",
+    "simplePos",
+    "wp14:anchorId",
+    "wp14:editId"
+  ].map((xmlName) => createAttributeHandler(xmlName));
   function encode$l(params2) {
     const { node: node2 } = params2.extraParams;
     if (!node2 || !node2.name) {
@@ -36594,7 +36747,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$l,
     decode: decode$n,
-    attributes: validXmlAttributes$8
+    attributes: validXmlAttributes$6
   };
   const translator$u = NodeTranslator.from(config$e);
   function handleInlineNode(params2) {
@@ -36605,16 +36758,29 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return handleImageNode$1(node2, params2, false);
   }
   function translateInlineNode(params2) {
+    const { attrs } = params2.node;
     const nodeElements = translateImageNode(params2);
+    const inlineAttrs = {
+      ...attrs.originalAttributes || {},
+      ...nodeElements.attributes || {}
+    };
+    const generatedElements = nodeElements?.elements || [];
+    const mergedElements = mergeDrawingChildren({
+      order: params2.node?.attrs?.drawingChildOrder || [],
+      original: params2.node?.attrs?.originalDrawingChildren || [],
+      generated: generatedElements
+    });
     return {
       name: "wp:inline",
-      attributes: nodeElements.attributes,
-      elements: nodeElements.elements
+      attributes: inlineAttrs,
+      elements: mergedElements
     };
   }
   const XML_NODE_NAME$e = "wp:inline";
   const SD_NODE_NAME$c = ["image", "shapeGroup", "vectorShape", "contentBlock"];
-  const validXmlAttributes$7 = ["distT", "distB", "distL", "distR"].map((xmlName) => createAttributeHandler(xmlName));
+  const validXmlAttributes$5 = ["distT", "distB", "distL", "distR", "wp14:anchorId", "wp14:editId"].map(
+    (xmlName) => createAttributeHandler(xmlName)
+  );
   function encode$k(params2) {
     const { node: node2 } = params2.extraParams;
     if (!node2 || !node2.name) {
@@ -36635,12 +36801,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$k,
     decode: decode$m,
-    attributes: validXmlAttributes$7
+    attributes: validXmlAttributes$5
   };
   const translator$t = NodeTranslator.from(config$d);
   const XML_NODE_NAME$d = "w:drawing";
   const SD_NODE_NAME$b = [];
-  const validXmlAttributes$6 = [];
+  const validXmlAttributes$4 = [];
   function encode$j(params2) {
     const nodes = params2.nodes;
     const node2 = nodes[0];
@@ -36648,14 +36814,21 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       "wp:anchor": translator$u,
       "wp:inline": translator$t
     };
-    const result = node2.elements.reduce((acc, child) => {
+    const result = (node2.elements || []).reduce((acc, child) => {
       if (acc) return acc;
       const translator2 = translatorByChildName[child.name];
       if (!translator2) return acc;
       const childResult = translator2.encode({ ...params2, extraParams: { node: child } });
       return childResult || acc;
     }, null);
-    return result;
+    if (result) return result;
+    return {
+      type: "passthroughBlock",
+      attrs: {
+        originalName: "w:drawing",
+        originalXml: carbonCopy(node2)
+      }
+    };
   }
   function decode$l(params2) {
     const { node: node2 } = params2;
@@ -36678,7 +36851,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$j,
     decode: decode$l,
-    attributes: validXmlAttributes$6
+    attributes: validXmlAttributes$4
   };
   const translator$s = NodeTranslator.from(config$c);
   function getTextNodeForExport(text2, marks, params2) {
@@ -37509,7 +37682,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   }
   const XML_NODE_NAME$c = "w:sdt";
   const SD_NODE_NAME$a = ["fieldAnnotation", "structuredContent", "structuredContentBlock", "documentSection"];
-  const validXmlAttributes$5 = [];
+  const validXmlAttributes$3 = [];
   function encode$i(params2) {
     const nodes = params2.nodes;
     const node2 = nodes[0];
@@ -37544,7 +37717,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$i,
     decode: decode$k,
-    attributes: validXmlAttributes$5
+    attributes: validXmlAttributes$3
   };
   const translator$r = NodeTranslator.from(config$b);
   function preProcessVerticalMergeCells(table2, { editorSchema }) {
@@ -38179,7 +38352,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     encode: encode$b,
     decode: decode$d
   });
-  const validXmlAttributes$4 = [attrConfig$7, attrConfig$6, attrConfig$5, attrConfig$4, attrConfig$3];
+  const bookmarkStartAttrConfigs = [attrConfig$7, attrConfig$6, attrConfig$5, attrConfig$4, attrConfig$3];
   const XML_NODE_NAME$9 = "w:bookmarkStart";
   const SD_NODE_NAME$8 = "bookmarkStart";
   const encode$a = (params2, encodedAttrs = {}) => {
@@ -38204,7 +38377,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$a,
     decode: decode$c,
-    attributes: validXmlAttributes$4
+    attributes: bookmarkStartAttrConfigs
   };
   const translator$8 = NodeTranslator.from(config$8);
   const encode$9 = (attributes) => {
@@ -38231,7 +38404,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     encode: encode$8,
     decode: decode$a
   });
-  const validXmlAttributes$3 = [attrConfig$2, attrConfig$1];
+  const bookmarkEndAttrConfigs = [attrConfig$2, attrConfig$1];
   const XML_NODE_NAME$8 = "w:bookmarkEnd";
   const SD_NODE_NAME$7 = "bookmarkEnd";
   const encode$7 = (params2, encodedAttrs = {}) => {
@@ -38256,7 +38429,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     type: NodeTranslator.translatorTypes.NODE,
     encode: encode$7,
     decode: decode$9,
-    attributes: validXmlAttributes$3
+    attributes: bookmarkEndAttrConfigs
   };
   const translator$7 = NodeTranslator.from(config$7);
   const decode$8 = (attrs) => attrs?.["w:id"];
@@ -39222,7 +39395,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   ]);
   const BLOCK_BOUNDARY_NAMES = /* @__PURE__ */ new Set(["w:body", "w:tbl", "w:tc", "w:tr"]);
   const isInlineContext = (path2 = [], currentNodeName) => {
-    if (currentNodeName && INLINE_NODE_NAMES.has(currentNodeName)) {
+    const immediateName = currentNodeName ?? path2[path2.length - 1]?.name;
+    if (immediateName && INLINE_NODE_NAMES.has(immediateName)) {
       return true;
     }
     if (!Array.isArray(path2) || path2.length === 0) return false;
@@ -40085,27 +40259,28 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const fldCharEl = node2.elements?.find((el) => el.name === "w:fldChar");
       const fldType = fldCharEl?.attributes?.["w:fldCharType"];
       const instrTextEl = node2.elements?.find((el) => el.name === "w:instrText");
+      const rawNode = carbonCopy(node2);
       collecting = collectedNodesStack.length > 0;
       if (fldType === "begin") {
         collectedNodesStack.push([]);
-        rawCollectedNodesStack.push([node2]);
+        rawCollectedNodesStack.push([rawNode]);
         currentFieldStack.push({ instrText: "" });
         continue;
       }
       if (instrTextEl && collecting && currentFieldStack.length > 0) {
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node2);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
         currentFieldStack[currentFieldStack.length - 1].instrText += (instrTextEl.elements?.[0]?.text || "") + " ";
         continue;
       }
       if (fldType === "end") {
         if (collecting) {
-          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node2);
+          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
         }
         finalizeField();
         continue;
       } else if (fldType === "separate") {
         if (collecting) {
-          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node2);
+          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
         }
         continue;
       }
@@ -40116,21 +40291,21 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           childResult.unpairedBegin.forEach((pendingField) => {
             currentFieldStack.push(pendingField.fieldInfo);
             collectedNodesStack.push([node2]);
-            rawCollectedNodesStack.push([node2]);
+            rawCollectedNodesStack.push([rawNode]);
           });
         } else if (childResult.unpairedEnd) {
           collectedNodesStack[collectedNodesStack.length - 1].push(node2);
-          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node2);
+          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
           finalizeField();
         } else if (collecting) {
           collectedNodesStack[collectedNodesStack.length - 1].push(node2);
-          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node2);
+          rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
         } else {
           processedNodes.push(node2);
         }
       } else if (collecting) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node2);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node2);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
       } else {
         processedNodes.push(node2);
       }
@@ -40735,8 +40910,48 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       "commentReference",
       "structuredContent"
     ]);
-    return content2.filter((node2) => node2 && typeof node2.type === "string" && !INLINE_TYPES.has(node2.type));
+    const PRESERVABLE_INLINE_XML_NAMES = {
+      bookmarkStart: "w:bookmarkStart",
+      bookmarkEnd: "w:bookmarkEnd"
+    };
+    const result = [];
+    content2.forEach((node2) => {
+      if (!node2 || typeof node2.type !== "string") return;
+      const type2 = node2.type;
+      const preservableNodeName = PRESERVABLE_INLINE_XML_NAMES[type2];
+      if (!INLINE_TYPES.has(type2)) {
+        result.push(node2);
+      } else if (preservableNodeName) {
+        const originalXml = buildOriginalXml(type2, node2.attrs, PRESERVABLE_INLINE_XML_NAMES);
+        result.push({
+          type: "passthroughBlock",
+          attrs: {
+            originalName: preservableNodeName,
+            ...originalXml ? { originalXml } : {}
+          }
+        });
+      }
+    });
+    return result;
   }
+  const buildOriginalXml = (type2, attrs, preservableTags) => {
+    const attrConfigsByType = {
+      bookmarkStart: bookmarkStartAttrConfigs,
+      bookmarkEnd: bookmarkEndAttrConfigs
+    };
+    const configs = attrConfigsByType[type2];
+    if (!configs) return null;
+    const xmlAttrs = {};
+    configs.forEach((cfg) => {
+      const val = cfg.decode(attrs || {});
+      if (val !== void 0) {
+        xmlAttrs[cfg.xmlName] = val;
+      }
+    });
+    const attributes = Object.keys(xmlAttrs).length ? xmlAttrs : void 0;
+    const name = preservableTags[type2];
+    return { name, ...attributes ? { attributes } : {}, elements: [] };
+  };
   function collapseWhitespaceNextToInlinePassthrough(content2 = []) {
     if (!Array.isArray(content2) || content2.length === 0) return;
     const sequence = collectInlineSequence(content2);
@@ -41868,7 +42083,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.40") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.54") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -44941,19 +45156,24 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           const u8 = await zipEntry.async("uint8array");
           const content2 = ensureXmlString(u8);
           this.files.push({ name, content: content2 });
-        } else if (name.startsWith("word/media") && name !== "word/media/" || zipEntry.name.startsWith("media") && zipEntry.name !== "media/" || name.startsWith("media") && name !== "media/") {
+        } else if (name.startsWith("word/media") && name !== "word/media/" || zipEntry.name.startsWith("media") && zipEntry.name !== "media/" || name.startsWith("media") && name !== "media/" || name.startsWith("word/embeddings") && name !== "word/embeddings/") {
           if (isNode2) {
             const buffer2 = await zipEntry.async("nodebuffer");
             const fileBase64 = buffer2.toString("base64");
             this.mediaFiles[name] = fileBase64;
           } else {
-            const blob = await zipEntry.async("blob");
-            const extension = this.getFileExtension(name);
             const fileBase64 = await zipEntry.async("base64");
-            this.mediaFiles[name] = `data:image/${extension};base64,${fileBase64}`;
-            const fileObj = new File([blob], name, { type: blob.type });
-            const imageUrl = URL.createObjectURL(fileObj);
-            this.media[name] = imageUrl;
+            const extension = this.getFileExtension(name)?.toLowerCase();
+            const imageTypes = /* @__PURE__ */ new Set(["png", "jpg", "jpeg", "gif", "bmp", "tiff", "emf", "wmf", "svg", "webp"]);
+            if (imageTypes.has(extension)) {
+              this.mediaFiles[name] = `data:image/${extension};base64,${fileBase64}`;
+              const blob = await zipEntry.async("blob");
+              const fileObj = new File([blob], name, { type: blob.type });
+              const imageUrl = URL.createObjectURL(fileObj);
+              this.media[name] = imageUrl;
+            } else {
+              this.mediaFiles[name] = fileBase64;
+            }
           }
         } else if (name.startsWith("word/fonts") && name !== "word/fonts/") {
           const uint8array = await zipEntry.async("uint8array");
@@ -44972,9 +45192,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      */
     async updateContentTypes(docx, media2, fromJson, updatedDocs = {}) {
       const additionalPartNames = Object.keys(updatedDocs || {});
-      const newMediaTypes = Object.keys(media2).map((name) => {
-        return this.getFileExtension(name);
-      }).filter(Boolean);
+      const imageExts = /* @__PURE__ */ new Set(["png", "jpg", "jpeg", "gif", "bmp", "tiff", "emf", "wmf", "svg", "webp"]);
+      const newMediaTypes = Object.keys(media2).map((name) => this.getFileExtension(name)).filter((ext) => ext && imageExts.has(ext));
       const contentTypesPath = "[Content_Types].xml";
       let contentTypesXml;
       if (fromJson) {
@@ -66903,7 +67122,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "1.0.0-beta.40";
+  const summaryVersion = "1.0.0-beta.54";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -67692,7 +67911,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexDx9W6Dsv),
+        Promise.resolve().then(() => indexT8thQIOL),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -67897,7 +68116,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.40");
+      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.54");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -70356,8 +70575,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const hanging = ptToPx(indent2.hanging);
     if (left2 != null && left2 !== 0) result.left = left2;
     if (right2 != null && right2 !== 0) result.right = right2;
-    if (firstLine != null && firstLine !== 0) result.firstLine = firstLine;
-    if (hanging != null && hanging !== 0) result.hanging = hanging;
+    if (firstLine != null) result.firstLine = firstLine;
+    if (hanging != null) result.hanging = hanging;
     return Object.keys(result).length > 0 ? result : void 0;
   };
   const normalizeAlignment = (value) => {
@@ -70444,7 +70663,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
     });
     if (!values.length) return void 0;
-    const looksLikeTwips = values.some((val) => val >= 50 || Math.abs(val % 15) < 1e-6);
+    const looksLikeTwips = values.some((val) => val >= 50 || val !== 0 && Math.abs(val % 15) < 1e-6);
     if (looksLikeTwips) {
       return void 0;
     }
@@ -71329,6 +71548,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const firstLinePx = indent2.firstLine;
     const defaultTabIntervalPx = resolveDefaultTabIntervalPx(paragraph2.tabIntervalTwips, docDefaults);
     const tabsPx = tabs.map((tab) => tab.position);
+    const hasFirstLineIndent = indent2.firstLine != null && Number.isFinite(indent2.firstLine) && indent2.firstLine > 0 && !indent2.hanging;
     const layout = {
       indentLeftPx,
       hangingPx: Math.max(hangingPxRaw, 0),
@@ -71352,9 +71572,19 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     });
     const markerText = numbering.markerText ?? formatMarkerText(numbering);
     const glyphWidthPx = measurement?.measureText && markerText ? measurement.measureText(markerText, buildFontCss(markerRun), { letterSpacing: markerRun.letterSpacing }) : void 0;
-    const markerBoxWidthPx = resolveMarkerBoxWidth(hangingPxRaw, glyphWidthPx);
-    const markerX = indentLeftPx - markerBoxWidthPx;
-    layout.hangingPx = markerBoxWidthPx;
+    let markerBoxWidthPx;
+    let markerX;
+    if (hasFirstLineIndent) {
+      markerBoxWidthPx = glyphWidthPx != null && glyphWidthPx > 0 ? glyphWidthPx + LIST_MARKER_GAP$2 : DEFAULT_LIST_HANGING_PX$1;
+      markerX = indentLeftPx + (firstLinePx ?? 0);
+      layout.textStartPx = markerX + markerBoxWidthPx;
+      layout.hangingPx = 0;
+      layout.firstLineIndentMode = true;
+    } else {
+      markerBoxWidthPx = resolveMarkerBoxWidth(hangingPxRaw, glyphWidthPx);
+      markerX = indentLeftPx - markerBoxWidthPx;
+      layout.hangingPx = markerBoxWidthPx;
+    }
     layout.marker = buildMarkerLayout({
       numbering,
       markerText,
@@ -71946,6 +72176,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   };
   const { resolveSpacingIndent } = Engines;
   const DEFAULT_DECIMAL_SEPARATOR$2 = ".";
+  const isValidNumberingId = (numId) => {
+    return numId != null && numId !== 0 && numId !== "0";
+  };
   const asOoxmlElement = (value) => {
     if (!value || typeof value !== "object") return void 0;
     const element2 = value;
@@ -72438,9 +72671,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       let effectiveIndent = paragraphAttrs.indent;
       if (numberingProps?.resolvedLevelIndent) {
         const resolvedIndentPx = convertIndentTwipsToPx(numberingProps.resolvedLevelIndent);
+        const numberingIndent = resolvedIndentPx ?? numberingProps.resolvedLevelIndent;
         effectiveIndent = {
-          ...paragraphAttrs.indent,
-          ...resolvedIndentPx ?? numberingProps.resolvedLevelIndent
+          ...numberingIndent,
+          ...paragraphAttrs.indent
         };
       }
       const resolvedTabs = toResolvedTabStops(paragraphAttrs.tabs);
@@ -72602,11 +72836,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     } else if (computed2.paragraph.alignment) {
       paragraphAttrs.alignment = computed2.paragraph.alignment;
     }
-    const isJustified = paragraphAttrs.alignment === "justify";
-    const hasFirstLineIndent = normalizedIndent?.firstLine && normalizedIndent.firstLine > 0;
-    if (isJustified && hasFirstLineIndent) {
-      paragraphAttrs.suppressFirstLineIndent = true;
-    }
     const spacingPx = spacingPtToPx(spacing, normalizedSpacing);
     if (spacingPx) paragraphAttrs.spacing = spacingPx;
     if (normalizedSpacing?.beforeAutospacing != null || normalizedSpacing?.afterAutospacing != null) {
@@ -72745,7 +72974,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     const numberingSource = attrs.numberingProperties ?? paragraphProps.numberingProperties ?? hydrated?.numberingProperties;
     const rawNumberingProps = toAdapterNumberingProps(numberingSource);
-    if (rawNumberingProps) {
+    const hasValidNumbering = rawNumberingProps && isValidNumberingId(rawNumberingProps.numId);
+    if (hasValidNumbering) {
       const numberingProps = rawNumberingProps;
       const numId = numberingProps.numId;
       const ilvl = Number.isFinite(numberingProps.ilvl) ? Math.max(0, Math.floor(Number(numberingProps.ilvl))) : 0;
@@ -79043,6 +79273,50 @@ ${l}
     const hasPmEnd = fragment.pmEnd != null;
     globalValidationStats.record(hasPmStart, hasPmEnd);
   }
+  function isMinimalWordLayout(value) {
+    if (typeof value !== "object" || value === null) {
+      return false;
+    }
+    const obj = value;
+    if (obj.marker !== void 0) {
+      if (typeof obj.marker !== "object" || obj.marker === null) {
+        return false;
+      }
+      const marker = obj.marker;
+      if (marker.markerX !== void 0 && typeof marker.markerX !== "number") {
+        return false;
+      }
+      if (marker.textStartX !== void 0 && typeof marker.textStartX !== "number") {
+        return false;
+      }
+    }
+    if (obj.indentLeftPx !== void 0) {
+      if (typeof obj.indentLeftPx !== "number") {
+        return false;
+      }
+    }
+    if (obj.firstLineIndentMode !== void 0) {
+      if (typeof obj.firstLineIndentMode !== "boolean") {
+        return false;
+      }
+    }
+    if (obj.textStartPx !== void 0) {
+      if (typeof obj.textStartPx !== "number") {
+        return false;
+      }
+    }
+    if (obj.tabsPx !== void 0) {
+      if (!Array.isArray(obj.tabsPx)) {
+        return false;
+      }
+      for (const tab of obj.tabsPx) {
+        if (typeof tab !== "number") {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
   const LIST_MARKER_GAP$1 = 8;
   const DEFAULT_TAB_INTERVAL_PX$1 = 48;
   const COMMENT_EXTERNAL_COLOR = "#B1124B";
@@ -79804,7 +80078,7 @@ ${l}
         }
         const block = lookup2.block;
         const measure = lookup2.measure;
-        const wordLayout = block.attrs?.wordLayout;
+        const wordLayout = isMinimalWordLayout(block.attrs?.wordLayout) ? block.attrs.wordLayout : void 0;
         const fragmentEl = this.doc.createElement("div");
         fragmentEl.classList.add(CLASS_NAMES$1.fragment);
         const isTocEntry = block.attrs?.isTocEntry;
@@ -79845,11 +80119,11 @@ ${l}
         const paraIndentRight = paraIndent?.right ?? 0;
         const suppressFirstLineIndent = block.attrs?.suppressFirstLineIndent === true;
         const firstLineOffset = suppressFirstLineIndent ? 0 : (paraIndent?.firstLine ?? 0) - (paraIndent?.hanging ?? 0);
-        const isListParagraph = !!(fragment.markerWidth && wordLayout?.marker);
         const lastRun = block.runs.length > 0 ? block.runs[block.runs.length - 1] : null;
         const paragraphEndsWithLineBreak = lastRun?.kind === "lineBreak";
         lines.forEach((line, index2) => {
-          const availableWidthOverride = Math.max(0, fragment.width - (paraIndentLeft + paraIndentRight));
+          const fallbackAvailableWidth = Math.max(0, fragment.width - (paraIndentLeft + paraIndentRight));
+          const availableWidthOverride = line.maxWidth ?? fallbackAvailableWidth;
           const isLastLineOfFragment = index2 === lines.length - 1;
           const isLastLineOfParagraph = isLastLineOfFragment && !fragment.continuesOnNext;
           const shouldSkipJustifyForLastLine = isLastLineOfParagraph && !paragraphEndsWithLineBreak;
@@ -79859,7 +80133,7 @@ ${l}
             context,
             availableWidthOverride,
             fragment.fromLine + index2,
-            isListParagraph || shouldSkipJustifyForLastLine
+            shouldSkipJustifyForLastLine
           );
           const isListFirstLine = index2 === 0 && !fragment.continuesFromPrev && fragment.markerWidth && wordLayout?.marker;
           const hasExplicitSegmentPositioning = line.segments?.some((seg) => seg.x !== void 0);
@@ -79883,8 +80157,17 @@ ${l}
             lineEl.style.textIndent = "0px";
           }
           if (isListFirstLine && wordLayout?.marker && fragment.markerWidth) {
-            const markerStartPos = paraIndentLeft - (paraIndent?.hanging ?? 0);
-            lineEl.style.paddingLeft = `${markerStartPos}px`;
+            const isFirstLineIndentMode = wordLayout.firstLineIndentMode === true;
+            let markerStartPos;
+            if (isFirstLineIndentMode && wordLayout.marker.markerX !== void 0 && Number.isFinite(wordLayout.marker.markerX)) {
+              markerStartPos = wordLayout.marker.markerX;
+            } else if (isFirstLineIndentMode) {
+              markerStartPos = paraIndentLeft + (paraIndent?.firstLine ?? 0);
+            } else {
+              markerStartPos = paraIndentLeft - (paraIndent?.hanging ?? 0);
+            }
+            const validMarkerStartPos = Number.isFinite(markerStartPos) ? markerStartPos : 0;
+            lineEl.style.paddingLeft = `${validMarkerStartPos}px`;
             const markerContainer = this.doc.createElement("span");
             markerContainer.style.display = "inline-block";
             const markerEl = this.doc.createElement("span");
@@ -79900,7 +80183,7 @@ ${l}
             if (markerJustification === "left") {
               markerContainer.style.position = "relative";
             } else {
-              const markerLeftX = markerStartPos - fragment.markerWidth;
+              const markerLeftX = validMarkerStartPos - fragment.markerWidth;
               markerContainer.style.position = "absolute";
               markerContainer.style.left = `${markerLeftX}px`;
               markerContainer.style.top = "0";
@@ -79925,12 +80208,36 @@ ${l}
               const markerBoxWidth = fragment.markerWidth;
               const markerTextWidth = fragment.markerTextWidth != null && isFinite(fragment.markerTextWidth) && fragment.markerTextWidth >= 0 ? fragment.markerTextWidth : markerBoxWidth;
               if ((wordLayout.marker.justification ?? "left") === "left") {
-                const currentPos = markerStartPos + markerTextWidth;
-                const implicitTabStop = paraIndentLeft;
-                tabWidth = implicitTabStop - currentPos;
-                if (tabWidth < 1) {
-                  tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
-                  if (tabWidth === 0) tabWidth = DEFAULT_TAB_INTERVAL_PX$1;
+                const currentPos = validMarkerStartPos + markerTextWidth;
+                if (isFirstLineIndentMode) {
+                  const explicitTabs = wordLayout.tabsPx;
+                  let targetTabStop;
+                  if (Array.isArray(explicitTabs) && explicitTabs.length > 0) {
+                    for (const tab of explicitTabs) {
+                      if (typeof tab === "number" && tab > currentPos) {
+                        targetTabStop = tab;
+                        break;
+                      }
+                    }
+                  }
+                  const textStartTarget = wordLayout.marker.textStartX !== void 0 && Number.isFinite(wordLayout.marker.textStartX) ? wordLayout.marker.textStartX : wordLayout.textStartPx;
+                  if (targetTabStop !== void 0) {
+                    tabWidth = targetTabStop - currentPos;
+                  } else if (textStartTarget !== void 0 && Number.isFinite(textStartTarget) && textStartTarget > currentPos) {
+                    tabWidth = textStartTarget - currentPos;
+                  } else {
+                    tabWidth = LIST_MARKER_GAP$1;
+                  }
+                  if (tabWidth < LIST_MARKER_GAP$1) {
+                    tabWidth = LIST_MARKER_GAP$1;
+                  }
+                } else {
+                  const implicitTabStop = paraIndentLeft;
+                  tabWidth = implicitTabStop - currentPos;
+                  if (tabWidth < 1) {
+                    tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
+                    if (tabWidth === 0) tabWidth = DEFAULT_TAB_INTERVAL_PX$1;
+                  }
                 }
               } else {
                 tabWidth = fragment.markerGutter != null && isFinite(fragment.markerGutter) ? fragment.markerGutter : typeof wordLayout.marker.gutterWidthPx === "number" && isFinite(wordLayout.marker.gutterWidthPx) && wordLayout.marker.gutterWidthPx > 0 ? wordLayout.marker.gutterWidthPx : LIST_MARKER_GAP$1;
@@ -83902,8 +84209,13 @@ ${l}
       toLineByCell.push(cutLine);
       heightByCell.push(cumulativeHeight);
     }
-    const positiveHeights = heightByCell.filter((h2) => h2 > 0);
-    const minHeight = positiveHeights.length > 0 ? Math.min(...positiveHeights) : 0;
+    const allCellsCompleteInFirstPass = toLineByCell.every((cutLine, idx) => {
+      const totalLines = getCellTotalLines(row2.cells[idx]);
+      return cutLine >= totalLines;
+    });
+    const lineAdvancements = toLineByCell.map((cutLine, idx) => cutLine - (startLines[idx] || 0));
+    const positiveAdvancements = lineAdvancements.filter((adv) => adv > 0);
+    const minLineAdvancement = positiveAdvancements.length > 0 ? Math.min(...positiveAdvancements) : 0;
     let actualPartialHeight = 0;
     let maxPaddingTotal = 0;
     for (let cellIdx = 0; cellIdx < cellCount; cellIdx++) {
@@ -83913,18 +84225,17 @@ ${l}
       const cellPadding = cellPaddings[cellIdx];
       const paddingTotal = cellPadding.top + cellPadding.bottom;
       maxPaddingTotal = Math.max(maxPaddingTotal, paddingTotal);
-      let cumulativeHeight = 0;
-      let cutLine = startLine;
-      for (let i2 = startLine; i2 < lines.length; i2++) {
-        const lineHeight2 = lines[i2].lineHeight || 0;
-        if (cumulativeHeight + lineHeight2 > minHeight) {
-          break;
+      if (allCellsCompleteInFirstPass) {
+        actualPartialHeight = Math.max(actualPartialHeight, heightByCell[cellIdx] + paddingTotal);
+      } else {
+        const targetLine = Math.min(startLine + minLineAdvancement, lines.length);
+        let cumulativeHeight = 0;
+        for (let i2 = startLine; i2 < targetLine; i2++) {
+          cumulativeHeight += lines[i2].lineHeight || 0;
         }
-        cumulativeHeight += lineHeight2;
-        cutLine = i2 + 1;
+        toLineByCell[cellIdx] = targetLine;
+        actualPartialHeight = Math.max(actualPartialHeight, cumulativeHeight + paddingTotal);
       }
-      toLineByCell[cellIdx] = cutLine;
-      actualPartialHeight = Math.max(actualPartialHeight, cumulativeHeight + paddingTotal);
     }
     const madeProgress = toLineByCell.some((cutLine, idx) => cutLine > (startLines[idx] || 0));
     const isFirstPart = startLines.every((l) => l === 0);
@@ -84152,7 +84463,6 @@ ${l}
         } else if (!madeProgress && hadRemainingLinesBefore) {
           state2 = advanceColumn(state2);
         } else {
-          state2 = advanceColumn(state2);
           pendingPartialRow = continuationPartialRow;
         }
         isTableContinuation = true;
@@ -98912,6 +99222,52 @@ ${l}
       }
     });
   }
+  function parseAttrs(node2) {
+    const numberingProperties = {};
+    let indent2, spacing;
+    const { styleid: styleId, ...extraAttrs } = Array.from(node2.attributes).reduce((acc, attr) => {
+      if (attr.name === "data-num-id") {
+        numberingProperties.numId = parseInt(attr.value);
+      } else if (attr.name === "data-level") {
+        numberingProperties.ilvl = parseInt(attr.value);
+      } else if (attr.name === "data-indent") {
+        try {
+          indent2 = JSON.parse(attr.value);
+          Object.keys(indent2).forEach((key2) => {
+            indent2[key2] = Number(indent2[key2]);
+          });
+        } catch {
+        }
+      } else if (attr.name === "data-spacing") {
+        try {
+          spacing = JSON.parse(attr.value);
+          Object.keys(spacing).forEach((key2) => {
+            spacing[key2] = Number(spacing[key2]);
+          });
+        } catch {
+        }
+      } else {
+        acc[attr.name] = attr.value;
+      }
+      return acc;
+    }, {});
+    let attrs = {
+      paragraphProperties: {
+        styleId: styleId || null
+      },
+      extraAttrs
+    };
+    if (indent2 && Object.keys(indent2).length > 0) {
+      attrs.paragraphProperties.indent = indent2;
+    }
+    if (spacing && Object.keys(spacing).length > 0) {
+      attrs.paragraphProperties.spacing = spacing;
+    }
+    if (Object.keys(numberingProperties).length > 0) {
+      attrs.paragraphProperties.numberingProperties = numberingProperties;
+    }
+    return attrs;
+  }
   const bulletInputRegex = /^\s*([-+*])\s$/;
   const orderedInputRegex = /^(\d+)\.\s$/;
   const Paragraph = OxmlNode.create({
@@ -98981,50 +99337,7 @@ ${l}
       return [
         {
           tag: "p",
-          getAttrs: (node2) => {
-            const numberingProperties = {};
-            let indent2, spacing;
-            const { styleid: styleId, ...extraAttrs } = Array.from(node2.attributes).reduce((acc, attr) => {
-              if (attr.name === "data-num-id") {
-                numberingProperties.numId = parseInt(attr.value);
-              } else if (attr.name === "data-level") {
-                numberingProperties.ilvl = parseInt(attr.value);
-              } else if (attr.name === "data-indent") {
-                try {
-                  indent2 = JSON.parse(attr.value);
-                  Object.keys(indent2).forEach((key2) => {
-                    indent2[key2] = Number(indent2[key2]);
-                  });
-                } catch {
-                }
-              } else if (attr.name === "data-spacing") {
-                try {
-                  spacing = JSON.parse(attr.value);
-                  Object.keys(spacing).forEach((key2) => {
-                    spacing[key2] = Number(spacing[key2]);
-                  });
-                } catch {
-                }
-              } else {
-                acc[attr.name] = attr.value;
-              }
-              return acc;
-            }, {});
-            if (Object.keys(numberingProperties).length > 0) {
-              return {
-                paragraphProperties: {
-                  numberingProperties,
-                  indent: indent2,
-                  spacing,
-                  styleId: styleId || null
-                },
-                extraAttrs
-              };
-            }
-            return {
-              extraAttrs
-            };
-          }
+          getAttrs: parseAttrs
         },
         {
           tag: "div",
@@ -99042,7 +99355,16 @@ ${l}
         },
         ...this.options.headingLevels.map((level) => ({
           tag: `h${level}`,
-          attrs: { level, paragraphProperties: { styleId: `Heading${level}` } }
+          getAttrs: (node2) => {
+            let attrs = parseAttrs(node2);
+            return {
+              ...attrs,
+              paragraphProperties: {
+                ...attrs.paragraphProperties,
+                styleId: `Heading${level}`
+              }
+            };
+          }
         }))
       ];
     },
@@ -105533,6 +105855,14 @@ ${l}
             if (!style2) return {};
             return { style: style2 };
           }
+        },
+        drawingChildOrder: {
+          default: null,
+          rendered: false
+        },
+        originalDrawingChildren: {
+          default: null,
+          rendered: false
         }
       };
     },
@@ -110147,11 +110477,11 @@ ${l}
           break;
         }
         const [left2, right2] = direction < 0 ? [neighbor, currentChange] : [currentChange, neighbor];
-        if (!areDirectlyConnected(left2, right2)) {
-          break;
-        }
         const sharesId = neighbor.mark.attrs.id === matchingId;
         const complementary = isComplementaryPair(currentChange.mark.type.name, neighbor.mark.type.name);
+        if (!sharesId && !areDirectlyConnected(left2, right2)) {
+          break;
+        }
         if (!sharesId && !complementary) {
           break;
         }
@@ -148333,7 +148663,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.0.0-beta.40";
+      this.version = "1.0.0-beta.54";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -150799,7 +151129,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexDx9W6Dsv = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexT8thQIOL = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));