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

package/dist/chunks/{super-editor.es-C7wUYMFI.cjs → super-editor.es-BMiadG4G.cjs}

@@ -18042,7 +18042,7 @@ const attrConfig$r = Object.freeze({
   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) => {
@@ -18078,7 +18078,7 @@ const config$p = {
   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"];
@@ -18089,7 +18089,7 @@ const attrConfig$q = Object.freeze({
   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"]);
@@ -18140,7 +18140,7 @@ const config$o = {
   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) => {
@@ -18183,7 +18183,7 @@ const attrConfig$n = Object.freeze({
   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 = {}) => {
@@ -18219,7 +18219,7 @@ const config$n = {
   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) => {
@@ -18590,7 +18590,7 @@ const attrConfig$i = Object.freeze({
   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 = {}) => {
@@ -18642,7 +18642,7 @@ const config$m = {
   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"));
@@ -18776,7 +18776,7 @@ const SUPPORTED_ALTERNATE_CONTENT_REQUIRES = /* @__PURE__ */ new Set([
 ]);
 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 } = params2.extraParams;
@@ -18816,7 +18816,7 @@ const config$l = {
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$C,
   decode: decode$E,
-  attributes: validXmlAttributes$f
+  attributes: validXmlAttributes$d
 };
 function selectAlternateContentElements(node) {
   if (!node?.elements?.length) {
@@ -18956,7 +18956,7 @@ const createTrackStyleMark = (marks) => {
 };
 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"),
@@ -19016,7 +19016,7 @@ const config$k = {
   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"));
@@ -19210,11 +19210,12 @@ const resolveRunProperties = (params2, inlineRpr, resolvedPpr, isListNumber = fa
   }
   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
       );
     }
@@ -19252,9 +19253,13 @@ function resolveParagraphProperties(params2, inlineProps, insideTable = false, o
   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);
@@ -20395,7 +20400,7 @@ const attrConfig$b = Object.freeze({
   encode: encode$u,
   decode: decode$w
 });
-const validXmlAttributes$d = [
+const validXmlAttributes$b = [
   attrConfig$c,
   attrConfig$b,
   attrConfig$f,
@@ -20428,7 +20433,7 @@ const config$j = {
   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;
@@ -20611,7 +20616,7 @@ const _createAttributeHandler = (xmlName, sdName) => ({
   encode: (attributes) => attributes[xmlName],
   decode: (attributes) => attributes[sdName]
 });
-const validXmlAttributes$c = [
+const validXmlAttributes$a = [
   _createAttributeHandler("w:anchor", "anchor"),
   _createAttributeHandler("w:docLocation", "docLocation"),
   {
@@ -20713,7 +20718,7 @@ const config$i = {
   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) => {
@@ -20752,7 +20757,7 @@ const attrConfig$8 = Object.freeze({
   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 = {}) => {
@@ -20899,7 +20904,7 @@ const config$h = {
   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"));
@@ -21329,7 +21334,7 @@ function generateTableCellProperties(node) {
 }
 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,
@@ -21370,7 +21375,7 @@ const config$g = {
   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({
@@ -21524,7 +21529,7 @@ const isPlaceholderCell = (cell) => {
 };
 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) => {
@@ -21661,7 +21666,7 @@ const config$f = {
   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) {
@@ -30440,6 +30445,7 @@ function handleImageNode$1(node, params2, isAnchor) {
   if (!node) return null;
   const { docx, filename, converter } = params2;
   const attributes = node?.attributes || {};
+  const { order: order2, originalChildren } = collectPreservedDrawingChildren(node);
   const padding = {
     top: emuToPixels(attributes?.["distT"]),
     bottom: emuToPixels(attributes?.["distB"]),
@@ -30635,6 +30641,7 @@ function handleImageNode$1(node, params2, isAnchor) {
   }
   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,
@@ -30669,7 +30676,9 @@ function handleImageNode$1(node, params2, isAnchor) {
       distR: attributes["distR"]
     },
     originalAttributes: node.attributes,
-    rId: relAttributes["Id"]
+    rId: relAttributes["Id"],
+    ...order2.length ? { drawingChildOrder: order2 } : {},
+    ...originalChildren.length ? { originalDrawingChildren: originalChildren } : {}
   };
   return {
     type: "image",
@@ -30694,6 +30703,23 @@ const handleShapeDrawing = (params2, node, graphicData, size2, padding, marginOf
   const fallbackType = textBoxContent ? "textbox" : "drawing";
   return buildShapePlaceholder(node, size2, padding, marginOffset, fallbackType);
 };
+function collectPreservedDrawingChildren(node) {
+  const order2 = [];
+  const original = [];
+  if (!Array.isArray(node?.elements)) {
+    return { order: order2, originalChildren: original };
+  }
+  node.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, node, graphicData, size2, padding, marginOffset, anchorData, wrap2) => {
   const wgp = graphicData.elements.find((el) => el.name === "wpg:wgp");
   if (!wgp) {
@@ -33462,7 +33488,7 @@ function updateNumberingProperties(newNumberingProperties, paragraphNode, pos, e
   }
   tr.setNodeMarkup(pos, null, newAttrs);
 }
-const generateNewListDefinition = ({ numId, listType, level, start: start2, text, fmt, editor }) => {
+const generateNewListDefinition = ({ numId, listType, level, start: start2, text, fmt, editor, markerFontFamily }) => {
   if (typeof listType !== "string") listType = listType.name;
   const definition = listType === "orderedList" ? baseOrderedListDef : baseBulletList;
   const numbering = editor.converter.numbering;
@@ -33516,6 +33542,29 @@ const generateNewListDefinition = ({ numId, listType, level, start: start2, text
         }
       }
     ];
+    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);
@@ -33782,8 +33831,8 @@ const extractListLevelStyles = (cssText, listId, level, numId) => {
   }
   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);
@@ -33898,7 +33947,7 @@ const handleDocxPaste = (html, editor, view) => {
   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;
@@ -33910,13 +33959,24 @@ const handleDocxPaste = (html, editor, view) => {
     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 {
@@ -33939,6 +33999,7 @@ const handleDocxPaste = (html, editor, view) => {
         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);
@@ -33987,6 +34048,24 @@ const handleDocxPaste = (html, editor, view) => {
         }
       });
       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);
   });
@@ -34030,6 +34109,7 @@ const transformWordLists = (container, editor) => {
     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];
@@ -34041,7 +34121,8 @@ const transformWordLists = (container, editor) => {
       start: start2,
       fmt: numFmt,
       text: lvlText,
-      editor
+      editor,
+      markerFontFamily
     });
     if (!lists[id]) lists[id] = { levels: {} };
     const currentListByNumId = lists[id];
@@ -34074,6 +34155,11 @@ const transformWordLists = (container, editor) => {
         const styleValue = textStyles[key2];
         if (styleValue) {
           pElement.style[key2] = styleValue;
+          for (const child of pElement.children) {
+            if (child.style) {
+              child.style[key2] = styleValue;
+            }
+          }
         }
       });
     }
@@ -36407,11 +36493,71 @@ function translateShapeGroup(params2) {
     elements: []
   });
 }
+function mergeDrawingChildren({ order: order2, generated, original }) {
+  const genQueues = groupByName(generated);
+  const originalsByIndex = groupByIndex(original);
+  return mergeWithOrder(order2, genQueues, originalsByIndex);
+}
+function groupByIndex(entries = []) {
+  const map3 = /* @__PURE__ */ new Map();
+  entries.forEach((entry) => {
+    if (!entry) return;
+    const { index: index2, xml } = entry;
+    if (typeof index2 === "number" && xml && xml.name !== "wp:extent") {
+      map3.set(index2, carbonCopy(xml));
+    }
+  });
+  return map3;
+}
+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((xml) => out.push(xml));
+  genQueues.forEach((queue2, name) => {
+    if (namesInOrder.has(name)) return;
+    queue2.forEach((el) => out.push(el));
+  });
+  return out;
+}
+function groupByName(nodes = []) {
+  const map3 = /* @__PURE__ */ new Map();
+  nodes.forEach((el) => {
+    if (!el?.name) return;
+    const list = map3.get(el.name) || [];
+    list.push(carbonCopy(el));
+    map3.set(el.name, list);
+  });
+  return map3;
+}
 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: {
@@ -36420,7 +36566,7 @@ function translateAnchorNode(params2) {
       }
     });
   }
-  if (attrs.anchorData) {
+  if (!useOriginalChildren && attrs.anchorData) {
     const hElements = [];
     if (attrs.marginOffset.horizontal !== void 0) {
       hElements.push({
@@ -36466,25 +36612,14 @@ function translateAnchorNode(params2) {
   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
@@ -36564,15 +36699,33 @@ function translateAnchorNode(params2) {
     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 } = params2.extraParams;
   if (!node || !node.name) {
@@ -36593,7 +36746,7 @@ const config$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) {
@@ -36604,16 +36757,29 @@ function handleInlineNode(params2) {
   return handleImageNode$1(node, 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 } = params2.extraParams;
   if (!node || !node.name) {
@@ -36634,12 +36800,12 @@ const config$d = {
   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 node = nodes[0];
@@ -36647,14 +36813,21 @@ function encode$j(params2) {
     "wp:anchor": translator$u,
     "wp:inline": translator$t
   };
-  const result = node.elements.reduce((acc, child) => {
+  const result = (node.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(node)
+    }
+  };
 }
 function decode$l(params2) {
   const { node } = params2;
@@ -36677,7 +36850,7 @@ const config$c = {
   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(text, marks, params2) {
@@ -37508,7 +37681,7 @@ function generateSdtPrTagForStructuredContent({ node }) {
 }
 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 node = nodes[0];
@@ -37543,7 +37716,7 @@ const config$b = {
   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(table, { editorSchema }) {
@@ -38178,7 +38351,7 @@ const attrConfig$3 = Object.freeze({
   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 = {}) => {
@@ -38203,7 +38376,7 @@ const config$8 = {
   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) => {
@@ -38230,7 +38403,7 @@ const attrConfig$1 = Object.freeze({
   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 = {}) => {
@@ -38255,7 +38428,7 @@ const config$7 = {
   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"];
@@ -39221,7 +39394,8 @@ const INLINE_NODE_NAMES = /* @__PURE__ */ new Set([
 ]);
 const BLOCK_BOUNDARY_NAMES = /* @__PURE__ */ new Set(["w:body", "w:tbl", "w:tc", "w:tr"]);
 const isInlineContext = (path = [], currentNodeName) => {
-  if (currentNodeName && INLINE_NODE_NAMES.has(currentNodeName)) {
+  const immediateName = currentNodeName ?? path[path.length - 1]?.name;
+  if (immediateName && INLINE_NODE_NAMES.has(immediateName)) {
     return true;
   }
   if (!Array.isArray(path) || path.length === 0) return false;
@@ -40084,27 +40258,28 @@ const preProcessNodesForFldChar = (nodes = [], docx) => {
     const fldCharEl = node.elements?.find((el) => el.name === "w:fldChar");
     const fldType = fldCharEl?.attributes?.["w:fldCharType"];
     const instrTextEl = node.elements?.find((el) => el.name === "w:instrText");
+    const rawNode = carbonCopy(node);
     collecting = collectedNodesStack.length > 0;
     if (fldType === "begin") {
       collectedNodesStack.push([]);
-      rawCollectedNodesStack.push([node]);
+      rawCollectedNodesStack.push([rawNode]);
       currentFieldStack.push({ instrText: "" });
       continue;
     }
     if (instrTextEl && collecting && currentFieldStack.length > 0) {
-      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+      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(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
       }
       finalizeField();
       continue;
     } else if (fldType === "separate") {
       if (collecting) {
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
       }
       continue;
     }
@@ -40115,21 +40290,21 @@ const preProcessNodesForFldChar = (nodes = [], docx) => {
         childResult.unpairedBegin.forEach((pendingField) => {
           currentFieldStack.push(pendingField.fieldInfo);
           collectedNodesStack.push([node]);
-          rawCollectedNodesStack.push([node]);
+          rawCollectedNodesStack.push([rawNode]);
         });
       } else if (childResult.unpairedEnd) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
         finalizeField();
       } else if (collecting) {
         collectedNodesStack[collectedNodesStack.length - 1].push(node);
-        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+        rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
       } else {
         processedNodes.push(node);
       }
     } else if (collecting) {
       collectedNodesStack[collectedNodesStack.length - 1].push(node);
-      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(node);
+      rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(rawNode);
     } else {
       processedNodes.push(node);
     }
@@ -40734,8 +40909,48 @@ function filterOutRootInlineNodes(content = []) {
     "commentReference",
     "structuredContent"
   ]);
-  return content.filter((node) => node && typeof node.type === "string" && !INLINE_TYPES.has(node.type));
+  const PRESERVABLE_INLINE_XML_NAMES = {
+    bookmarkStart: "w:bookmarkStart",
+    bookmarkEnd: "w:bookmarkEnd"
+  };
+  const result = [];
+  content.forEach((node) => {
+    if (!node || typeof node.type !== "string") return;
+    const type2 = node.type;
+    const preservableNodeName = PRESERVABLE_INLINE_XML_NAMES[type2];
+    if (!INLINE_TYPES.has(type2)) {
+      result.push(node);
+    } else if (preservableNodeName) {
+      const originalXml = buildOriginalXml(type2, node.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(content = []) {
   if (!Array.isArray(content) || content.length === 0) return;
   const sequence = collectInlineSequence(content);
@@ -41867,7 +42082,7 @@ const _SuperConverter = class _SuperConverter2 {
   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);
   }
   /**
@@ -44940,19 +45155,24 @@ class DocxZipper {
         const u8 = await zipEntry.async("uint8array");
         const content = ensureXmlString(u8);
         this.files.push({ name, content });
-      } 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");
@@ -44971,9 +45191,8 @@ class DocxZipper {
    */
   async updateContentTypes(docx, media, fromJson, updatedDocs = {}) {
     const additionalPartNames = Object.keys(updatedDocs || {});
-    const newMediaTypes = Object.keys(media).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(media).map((name) => this.getFileExtension(name)).filter((ext) => ext && imageExts.has(ext));
     const contentTypesPath = "[Content_Types].xml";
     let contentTypesXml;
     if (fromJson) {
@@ -59045,7 +59264,7 @@ const isHeadless = (editor) => {
 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) {
@@ -59834,7 +60053,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      Promise.resolve().then(() => require("./index-Dx9W6Dsv-D4FIlgW4.cjs")),
+      Promise.resolve().then(() => require("./index-t8thQIOL-CV8VTGI4.cjs")),
       Promise.resolve().then(() => require("./index-DRCvimau-H4Ck3S9a.cjs")),
       Promise.resolve().then(() => require("./index-C_x_N6Uh-Db3CUJMX.cjs")),
       Promise.resolve().then(() => require("./index-D_sWOSiG-BtDZzJ6I.cjs")),
@@ -60039,7 +60258,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * 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");
@@ -62498,8 +62717,8 @@ const indentPtToPx = (indent) => {
   const hanging = ptToPx(indent.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) => {
@@ -62586,7 +62805,7 @@ const normalizePxIndent = (value) => {
     }
   });
   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;
   }
@@ -63471,6 +63690,7 @@ function computeWordParagraphLayout(input) {
   const firstLinePx = indent.firstLine;
   const defaultTabIntervalPx = resolveDefaultTabIntervalPx(paragraph.tabIntervalTwips, docDefaults);
   const tabsPx = tabs.map((tab) => tab.position);
+  const hasFirstLineIndent = indent.firstLine != null && Number.isFinite(indent.firstLine) && indent.firstLine > 0 && !indent.hanging;
   const layout = {
     indentLeftPx,
     hangingPx: Math.max(hangingPxRaw, 0),
@@ -63494,9 +63714,19 @@ function computeWordParagraphLayout(input) {
   });
   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,
@@ -64088,6 +64318,9 @@ const cloneIfObject = (value) => {
 };
 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 element = value;
@@ -64580,9 +64813,10 @@ const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleCont
     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);
@@ -64744,11 +64978,6 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
   } 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) {
@@ -64887,7 +65116,8 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
   }
   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;
@@ -71185,6 +71415,50 @@ function assertFragmentPmPositions(fragment, _context) {
   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";
@@ -71946,7 +72220,7 @@ const _DomPainter = class _DomPainter2 {
       }
       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;
@@ -71987,11 +72261,11 @@ const _DomPainter = class _DomPainter2 {
       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;
@@ -72001,7 +72275,7 @@ const _DomPainter = class _DomPainter2 {
           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);
@@ -72025,8 +72299,17 @@ const _DomPainter = class _DomPainter2 {
           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");
@@ -72042,7 +72325,7 @@ const _DomPainter = class _DomPainter2 {
           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";
@@ -72067,12 +72350,36 @@ const _DomPainter = class _DomPainter2 {
             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;
@@ -76044,8 +76351,13 @@ function computePartialRow(rowIndex, blockRow, measure, availableHeight, fromLin
     toLineByCell.push(cutLine);
     heightByCell.push(cumulativeHeight);
   }
-  const positiveHeights = heightByCell.filter((h) => h > 0);
-  const minHeight = positiveHeights.length > 0 ? Math.min(...positiveHeights) : 0;
+  const allCellsCompleteInFirstPass = toLineByCell.every((cutLine, idx) => {
+    const totalLines = getCellTotalLines(row.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++) {
@@ -76055,18 +76367,17 @@ function computePartialRow(rowIndex, blockRow, measure, availableHeight, fromLin
     const cellPadding = cellPaddings[cellIdx];
     const paddingTotal = cellPadding.top + cellPadding.bottom;
     maxPaddingTotal = Math.max(maxPaddingTotal, paddingTotal);
-    let cumulativeHeight = 0;
-    let cutLine = startLine;
-    for (let i = startLine; i < lines.length; i++) {
-      const lineHeight2 = lines[i].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 i = startLine; i < targetLine; i++) {
+        cumulativeHeight += lines[i].lineHeight || 0;
       }
-      cumulativeHeight += lineHeight2;
-      cutLine = i + 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((l3) => l3 === 0);
@@ -76294,7 +76605,6 @@ function layoutTableBlock({
       } else if (!madeProgress && hadRemainingLinesBefore) {
         state2 = advanceColumn(state2);
       } else {
-        state2 = advanceColumn(state2);
         pendingPartialRow = continuationPartialRow;
       }
       isTableContinuation = true;
@@ -91054,6 +91364,52 @@ function createDropcapPlugin(editor) {
     }
   });
 }
+function parseAttrs(node) {
+  const numberingProperties = {};
+  let indent, spacing;
+  const { styleid: styleId, ...extraAttrs } = Array.from(node.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 {
+        indent = JSON.parse(attr.value);
+        Object.keys(indent).forEach((key2) => {
+          indent[key2] = Number(indent[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 (indent && Object.keys(indent).length > 0) {
+    attrs.paragraphProperties.indent = indent;
+  }
+  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({
@@ -91123,50 +91479,7 @@ const Paragraph = OxmlNode.create({
     return [
       {
         tag: "p",
-        getAttrs: (node) => {
-          const numberingProperties = {};
-          let indent, spacing;
-          const { styleid: styleId, ...extraAttrs } = Array.from(node.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 {
-                indent = JSON.parse(attr.value);
-                Object.keys(indent).forEach((key2) => {
-                  indent[key2] = Number(indent[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,
-                spacing,
-                styleId: styleId || null
-              },
-              extraAttrs
-            };
-          }
-          return {
-            extraAttrs
-          };
-        }
+        getAttrs: parseAttrs
       },
       {
         tag: "div",
@@ -91184,7 +91497,16 @@ const Paragraph = OxmlNode.create({
       },
       ...this.options.headingLevels.map((level) => ({
         tag: `h${level}`,
-        attrs: { level, paragraphProperties: { styleId: `Heading${level}` } }
+        getAttrs: (node) => {
+          let attrs = parseAttrs(node);
+          return {
+            ...attrs,
+            paragraphProperties: {
+              ...attrs.paragraphProperties,
+              styleId: `Heading${level}`
+            }
+          };
+        }
       }))
     ];
   },
@@ -97675,6 +97997,14 @@ const Image = Node$1.create({
           if (!style2) return {};
           return { style: style2 };
         }
+      },
+      drawingChildOrder: {
+        default: null,
+        rendered: false
+      },
+      originalDrawingChildren: {
+        default: null,
+        rendered: false
       }
     };
   },
@@ -102289,11 +102619,11 @@ const getChangesByIdToResolve = (state2, id) => {
         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;
       }