@harbour-enterprises/superdoc 1.3.0-next.2 → 1.3.0-next.4

package/dist/superdoc.umd.js

@@ -12179,134 +12179,200 @@
     "italic",
     "strike",
     "underline",
-    "letterSpacing",
-    "vertAlign",
-    "position"
+    "letterSpacing"
   ];
   const DEFAULT_FONT_SIZE_HALF_POINTS = 20;
-  const SUBSCRIPT_SUPERSCRIPT_SCALE$1 = 0.65;
-  const resolveRunProperties = (params2, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => {
+  function isObject$4(item) {
+    return item != null && typeof item === "object" && !Array.isArray(item);
+  }
+  function combineProperties$1(propertiesArray, options = {}) {
+    const { fullOverrideProps = [], specialHandling = {} } = options;
+    if (!propertiesArray || propertiesArray.length === 0) {
+      return {};
+    }
+    const merge2 = (target, source) => {
+      const output = { ...target };
+      if (isObject$4(target) && isObject$4(source)) {
+        for (const key2 in source) {
+          if (Object.prototype.hasOwnProperty.call(source, key2)) {
+            const handler2 = specialHandling[key2];
+            if (handler2 && typeof handler2 === "function") {
+              output[key2] = handler2(output, source);
+            } else if (!fullOverrideProps.includes(key2) && isObject$4(source[key2])) {
+              if (key2 in target && isObject$4(target[key2])) {
+                output[key2] = merge2(target[key2], source[key2]);
+              } else {
+                output[key2] = source[key2];
+              }
+            } else {
+              output[key2] = source[key2];
+            }
+          }
+        }
+      }
+      return output;
+    };
+    return propertiesArray.reduce((acc, current) => merge2(acc, current ?? {}), {});
+  }
+  function combineRunProperties$1(propertiesArray) {
+    return combineProperties$1(propertiesArray, {
+      fullOverrideProps: ["fontFamily", "color"]
+    });
+  }
+  function applyInlineOverrides(finalProps, inlineProps, overrideKeys = INLINE_OVERRIDE_PROPERTIES) {
+    if (!inlineProps) return finalProps;
+    for (const prop of overrideKeys) {
+      if (inlineProps[prop] != null) {
+        finalProps[prop] = inlineProps[prop];
+      }
+    }
+    return finalProps;
+  }
+  function isValidFontSize(value) {
+    return typeof value === "number" && Number.isFinite(value) && value > 0;
+  }
+  function resolveFontSizeWithFallback(value, defaultProps2, normalProps) {
+    if (isValidFontSize(value)) {
+      return value;
+    }
+    if (defaultProps2 && isValidFontSize(defaultProps2.fontSize)) {
+      return defaultProps2.fontSize;
+    }
+    if (normalProps && isValidFontSize(normalProps.fontSize)) {
+      return normalProps.fontSize;
+    }
+    return DEFAULT_FONT_SIZE_HALF_POINTS;
+  }
+  function orderDefaultsAndNormal(defaultProps2, normalProps, isNormalDefault) {
+    if (isNormalDefault) {
+      return [defaultProps2, normalProps];
+    } else {
+      return [normalProps, defaultProps2];
+    }
+  }
+  function createFirstLineIndentHandler() {
+    return (target, source) => {
+      if (target.hanging != null && source.firstLine != null) {
+        delete target.hanging;
+      }
+      return source.firstLine;
+    };
+  }
+  function combineIndentProperties(indentChain) {
+    const indentOnly = indentChain.map((props) => props.indent != null ? { indent: props.indent } : {});
+    return combineProperties$1(indentOnly, {
+      specialHandling: {
+        firstLine: createFirstLineIndentHandler()
+      }
+    });
+  }
+  function createOoxmlResolver(translators) {
+    return {
+      resolveRunProperties: (params2, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => resolveRunProperties$1(translators, params2, inlineRpr, resolvedPpr, isListNumber, numberingDefinedInline),
+      resolveParagraphProperties: (params2, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) => resolveParagraphProperties$1(translators, params2, inlineProps, insideTable, overrideInlineStyleId, tableStyleId),
+      getDefaultProperties,
+      getStyleProperties,
+      resolveStyleChain: resolveStyleChain$1,
+      getNumberingProperties: (params2, ilvl, numId, translator2, tries = 0) => getNumberingProperties(translators, params2, ilvl, numId, translator2, tries)
+    };
+  }
+  function resolveRunProperties$1(translators, params2, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) {
     const paragraphStyleId = resolvedPpr?.styleId;
-    const paragraphStyleProps = resolveStyleChain$1(params2, paragraphStyleId, translator$1O);
-    const defaultProps2 = getDefaultProperties(params2, translator$1O);
-    const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params2, "Normal", translator$1O);
+    const paragraphStyleProps = resolveStyleChain$1(params2, paragraphStyleId, translators.rPr);
+    const defaultProps2 = getDefaultProperties(params2, translators.rPr);
+    const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params2, "Normal", translators.rPr);
     let runStyleProps = {};
     if (!paragraphStyleId?.startsWith("TOC")) {
-      runStyleProps = inlineRpr.styleId ? resolveStyleChain$1(params2, inlineRpr.styleId, translator$1O) : {};
+      runStyleProps = inlineRpr?.styleId ? resolveStyleChain$1(params2, inlineRpr.styleId, translators.rPr) : {};
     }
+    const defaultsChain = orderDefaultsAndNormal(defaultProps2, normalProps, isNormalDefault);
+    const inlineRprSafe = inlineRpr ?? {};
     let styleChain;
-    if (isNormalDefault) {
-      styleChain = [defaultProps2, normalProps];
-    } else {
-      styleChain = [normalProps, defaultProps2];
-    }
+    let inlineOverrideSource = inlineRprSafe;
     if (isListNumber) {
       let numberingProps = {};
-      const numId = resolvedPpr?.numberingProperties?.numId;
+      const numberingProperties = resolvedPpr?.numberingProperties;
+      const numId = numberingProperties?.numId;
       if (numId != null && numId !== 0 && numId !== "0") {
         numberingProps = getNumberingProperties(
+          translators,
           params2,
-          resolvedPpr.numberingProperties.ilvl ?? 0,
+          numberingProperties?.ilvl ?? 0,
           numId,
-          translator$1O
+          translators.rPr
         );
       }
-      if (!numberingDefinedInline) {
-        inlineRpr = {};
-      }
-      if (inlineRpr?.underline) {
-        delete inlineRpr.underline;
+      const inlineRprForList = numberingDefinedInline ? inlineRprSafe : {};
+      if (inlineRprForList?.underline) {
+        delete inlineRprForList.underline;
       }
-      styleChain = [...styleChain, paragraphStyleProps, runStyleProps, inlineRpr, numberingProps];
+      styleChain = [...defaultsChain, paragraphStyleProps, runStyleProps, inlineRprForList, numberingProps];
+      inlineOverrideSource = inlineRprForList;
     } else {
-      styleChain = [...styleChain, paragraphStyleProps, runStyleProps, inlineRpr];
-    }
-    const finalProps = combineProperties(styleChain, ["fontFamily", "color"]);
-    for (const prop of INLINE_OVERRIDE_PROPERTIES) {
-      if (inlineRpr?.[prop] != null) {
-        finalProps[prop] = inlineRpr[prop];
-      }
-    }
-    if (finalProps.fontSize == null || typeof finalProps.fontSize !== "number" || !Number.isFinite(finalProps.fontSize) || finalProps.fontSize <= 0) {
-      let defaultFontSize = DEFAULT_FONT_SIZE_HALF_POINTS;
-      if (defaultProps2?.fontSize != null && typeof defaultProps2.fontSize === "number" && Number.isFinite(defaultProps2.fontSize) && defaultProps2.fontSize > 0) {
-        defaultFontSize = defaultProps2.fontSize;
-      } else if (normalProps?.fontSize != null && typeof normalProps.fontSize === "number" && Number.isFinite(normalProps.fontSize) && normalProps.fontSize > 0) {
-        defaultFontSize = normalProps.fontSize;
-      }
-      finalProps.fontSize = defaultFontSize;
+      styleChain = [...defaultsChain, paragraphStyleProps, runStyleProps, inlineRprSafe];
     }
+    const finalProps = combineRunProperties$1(styleChain);
+    applyInlineOverrides(finalProps, inlineOverrideSource);
+    finalProps.fontSize = resolveFontSizeWithFallback(finalProps.fontSize, defaultProps2, normalProps);
     return finalProps;
-  };
-  function resolveParagraphProperties(params2, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
-    const defaultProps2 = getDefaultProperties(params2, translator$14);
-    const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params2, "Normal", translator$14);
-    let styleId = inlineProps?.styleId;
-    let styleProps = inlineProps?.styleId ? resolveStyleChain$1(params2, inlineProps?.styleId, translator$14) : {};
+  }
+  function resolveParagraphProperties$1(translators, params2, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
+    const defaultProps2 = getDefaultProperties(params2, translators.pPr);
+    const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params2, "Normal", translators.pPr);
+    const inlinePropsSafe = inlineProps ?? {};
+    let styleId = inlinePropsSafe?.styleId;
+    let styleProps = inlinePropsSafe?.styleId ? resolveStyleChain$1(params2, inlinePropsSafe.styleId, translators.pPr) : {};
     let numberingProps = {};
-    let ilvl = inlineProps?.numberingProperties?.ilvl ?? styleProps?.numberingProperties?.ilvl;
-    let numId = inlineProps?.numberingProperties?.numId ?? styleProps?.numberingProperties?.numId;
-    let numberingDefinedInline = inlineProps?.numberingProperties?.numId != null;
-    const inlineNumIdDisablesNumbering = inlineProps?.numberingProperties?.numId === 0 || inlineProps?.numberingProperties?.numId === "0";
+    const ilvl = inlinePropsSafe?.numberingProperties?.ilvl ?? styleProps?.numberingProperties?.ilvl;
+    let numId = inlinePropsSafe?.numberingProperties?.numId ?? styleProps?.numberingProperties?.numId;
+    let numberingDefinedInline = inlinePropsSafe?.numberingProperties?.numId != null;
+    const inlineNumId = inlinePropsSafe?.numberingProperties?.numId;
+    const inlineNumIdDisablesNumbering = inlineNumId === 0 || inlineNumId === "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$14);
+      const ilvlNum = ilvl != null ? ilvl : 0;
+      numberingProps = getNumberingProperties(translators, params2, ilvlNum, numId, translators.pPr);
       if (overrideInlineStyleId && numberingProps.styleId) {
         styleId = numberingProps.styleId;
-        styleProps = resolveStyleChain$1(params2, styleId, translator$14);
-        if (inlineProps) {
-          inlineProps.styleId = styleId;
-          if (styleProps.numberingProperties?.ilvl === inlineProps.numberingProperties?.ilvl && styleProps.numberingProperties?.numId === inlineProps.numberingProperties?.numId) {
-            delete inlineProps.numberingProperties;
+        styleProps = resolveStyleChain$1(params2, styleId, translators.pPr);
+        if (inlinePropsSafe) {
+          inlinePropsSafe.styleId = styleId;
+          const inlineNumProps = inlinePropsSafe.numberingProperties;
+          if (styleProps.numberingProperties?.ilvl === inlineNumProps?.ilvl && styleProps.numberingProperties?.numId === inlineNumProps?.numId) {
+            delete inlinePropsSafe.numberingProperties;
             numberingDefinedInline = false;
           }
         }
       }
     }
-    const tableProps = tableStyleId ? resolveStyleChain$1(params2, tableStyleId, translator$14) : {};
-    let defaultsChain;
-    if (isNormalDefault) {
-      defaultsChain = [defaultProps2, normalProps];
-    } else {
-      defaultsChain = [normalProps, defaultProps2];
-    }
-    const propsChain = [...defaultsChain, tableProps, numberingProps, styleProps, inlineProps];
+    const tableProps = tableStyleId ? resolveStyleChain$1(params2, tableStyleId, translators.pPr) : {};
+    const defaultsChain = orderDefaultsAndNormal(defaultProps2, normalProps, isNormalDefault);
+    const propsChain = [...defaultsChain, tableProps, numberingProps, styleProps, inlinePropsSafe];
     let indentChain;
     if (isList2) {
       if (numberingDefinedInline) {
-        indentChain = [...defaultsChain, styleProps, numberingProps, inlineProps];
+        indentChain = [...defaultsChain, styleProps, numberingProps, inlinePropsSafe];
       } else {
-        styleProps = resolveStyleChain$1(params2, styleId, translator$14, false);
-        indentChain = [...defaultsChain, numberingProps, styleProps, inlineProps];
+        styleProps = resolveStyleChain$1(params2, styleId, translators.pPr, false);
+        indentChain = [...defaultsChain, numberingProps, styleProps, inlinePropsSafe];
       }
     } else {
-      indentChain = [...defaultsChain, numberingProps, styleProps, inlineProps];
+      indentChain = [...defaultsChain, numberingProps, styleProps, inlinePropsSafe];
     }
-    let finalProps = combineProperties(propsChain);
-    let finalIndent = combineProperties(
-      indentChain.map((props) => props.indent != null ? { indent: props.indent } : {}),
-      [],
-      {
-        firstLine: (target, source) => {
-          if (target.hanging != null && source.firstLine != null) {
-            delete target.hanging;
-          }
-          return source.firstLine;
-        }
-      }
-    );
+    const finalProps = combineProperties$1(propsChain);
+    const finalIndent = combineIndentProperties(indentChain);
     finalProps.indent = finalIndent.indent;
-    if (insideTable && !inlineProps?.spacing && !styleProps.spacing) {
+    if (insideTable && !inlinePropsSafe?.spacing && !styleProps?.spacing) {
       finalProps.spacing = void 0;
     }
     return finalProps;
   }
-  const resolveStyleChain$1 = (params2, styleId, translator2, followBasedOnChain = true) => {
-    let styleProps = {}, basedOn = null;
+  function resolveStyleChain$1(params2, styleId, translator2, followBasedOnChain = true) {
+    let styleProps = {};
+    let basedOn = void 0;
     if (styleId && styleId !== "Normal") {
       ({ properties: styleProps, basedOn } = getStyleProperties(params2, styleId, translator2));
     }
@@ -12318,7 +12384,7 @@
         break;
       }
       seenStyles.add(basedOn);
-      const result = getStyleProperties(params2, basedOn, translator2);
+      const result = getStyleProperties(params2, nextBasedOn, translator2);
       const basedOnProps = result.properties;
       nextBasedOn = result.basedOn;
       if (basedOnProps && Object.keys(basedOnProps).length) {
@@ -12327,120 +12393,499 @@
       basedOn = nextBasedOn;
     }
     styleChain = styleChain.reverse();
-    const combinedStyleProps = combineProperties(styleChain);
-    return combinedStyleProps;
-  };
+    return combineProperties$1(styleChain);
+  }
   function getDefaultProperties(params2, translator2) {
-    const { docx } = params2;
-    const styles = docx["word/styles.xml"];
+    const docx = params2?.docx;
+    const styles = docx?.["word/styles.xml"];
     const rootElements = styles?.elements?.[0]?.elements;
     if (!rootElements?.length) {
       return {};
     }
     const defaults2 = rootElements.find((el) => el.name === "w:docDefaults");
     const xmlName = translator2.xmlName;
-    const elementPrDefault = defaults2?.elements?.find((el) => el.name === `${xmlName}Default`) || {};
-    const elementPr = elementPrDefault?.elements?.find((el) => el.name === xmlName);
+    const defaultsElements = defaults2?.elements;
+    const elementPrDefault = defaultsElements?.find((el) => el.name === `${xmlName}Default`);
+    const elementPrDefaultElements = elementPrDefault?.elements;
+    const elementPr = elementPrDefaultElements?.find((el) => el.name === xmlName);
     if (!elementPr) {
       return {};
     }
-    const result = translator2.encode({ ...params2, nodes: [elementPr] }) || {};
-    return result;
+    return translator2.encode({ ...params2, nodes: [elementPr] }) || {};
   }
   function getStyleProperties(params2, styleId, translator2) {
-    const { docx } = params2;
-    const emptyResult = { properties: {}, isDefault: false, basedOn: null };
+    const emptyResult = { properties: {}, isDefault: false, basedOn: void 0 };
     if (!styleId) return emptyResult;
-    const styles = docx["word/styles.xml"];
+    const docx = params2?.docx;
+    const styles = docx?.["word/styles.xml"];
     const rootElements = styles?.elements?.[0]?.elements;
     if (!rootElements?.length) {
       return emptyResult;
     }
-    const style2 = rootElements.find((el) => el.name === "w:style" && el.attributes["w:styleId"] === styleId);
-    let basedOn = style2?.elements?.find((el) => el.name === "w:basedOn");
-    if (basedOn) {
-      basedOn = basedOn?.attributes?.["w:val"];
-    }
-    const elementPr = style2?.elements?.find((el) => el.name === translator2.xmlName);
+    const style2 = rootElements.find(
+      (el) => el.name === "w:style" && el.attributes?.["w:styleId"] === styleId
+    );
+    const styleElements = style2?.elements;
+    const basedOnElement = styleElements?.find((el) => el.name === "w:basedOn");
+    const basedOn = basedOnElement?.attributes?.["w:val"];
+    const elementPr = styleElements?.find((el) => el.name === translator2.xmlName);
     if (!elementPr) {
       return { ...emptyResult, basedOn };
     }
     const result = translator2.encode({ ...params2, nodes: [elementPr] }) || {};
-    return { properties: result, isDefault: style2?.attributes?.["w:default"] === "1", basedOn };
+    const isDefault = style2?.attributes?.["w:default"] === "1";
+    return { properties: result, isDefault, basedOn };
   }
-  function getNumberingProperties(params2, ilvl, numId, translator2, tries = 0) {
-    const { numbering: allDefinitions } = params2;
-    if (!allDefinitions) return {};
-    const { definitions, abstracts } = allDefinitions;
+  function getNumberingProperties(translators, params2, ilvl, numId, translator2, tries = 0) {
+    const numbering = params2?.numbering;
+    if (!numbering) return {};
+    const { definitions, abstracts } = numbering;
+    if (!definitions || !abstracts) return {};
     const propertiesChain = [];
     const numDefinition = definitions[numId];
     if (!numDefinition) return {};
-    const lvlOverride = numDefinition?.elements?.find(
-      (element2) => element2.name === "w:lvlOverride" && element2.attributes["w:ilvl"] == ilvl
+    const numDefElements = numDefinition.elements;
+    const lvlOverride = numDefElements?.find(
+      (element2) => element2.name === "w:lvlOverride" && element2.attributes?.["w:ilvl"] == ilvl
     );
-    const overridePr = lvlOverride?.elements?.find((el) => el.name === translator2.xmlName);
+    const lvlOverrideElements = lvlOverride?.elements;
+    const overridePr = lvlOverrideElements?.find((el) => el.name === translator2.xmlName);
     if (overridePr) {
       const overrideProps = translator2.encode({ ...params2, nodes: [overridePr] }) || {};
       propertiesChain.push(overrideProps);
     }
-    const abstractNumId = numDefinition.elements?.find((item) => item.name === "w:abstractNumId")?.attributes?.["w:val"];
+    const abstractNumIdElement = numDefElements?.find((item) => item.name === "w:abstractNumId");
+    const abstractNumId = abstractNumIdElement?.attributes?.["w:val"];
     const listDefinitionForThisNumId = abstracts[abstractNumId];
     if (!listDefinitionForThisNumId) return {};
-    const numStyleLink = listDefinitionForThisNumId.elements?.find((item) => item.name === "w:numStyleLink");
+    const listDefElements = listDefinitionForThisNumId.elements;
+    const numStyleLink = listDefElements?.find((item) => item.name === "w:numStyleLink");
     const styleId = numStyleLink?.attributes?.["w:val"];
     if (styleId && tries < 1) {
-      const { properties: styleProps } = getStyleProperties(params2, styleId, translator$14);
-      if (styleProps?.numberingProperties?.numId) {
-        return getNumberingProperties(params2, ilvl, styleProps.numberingProperties.numId, translator2, tries + 1);
+      const { properties: styleProps } = getStyleProperties(params2, styleId, translators.pPr);
+      const numIdFromStyle = styleProps?.numberingProperties?.numId;
+      if (numIdFromStyle) {
+        return getNumberingProperties(
+          translators,
+          params2,
+          ilvl,
+          numIdFromStyle,
+          translator2,
+          tries + 1
+        );
       }
     }
-    const levelDefinition = listDefinitionForThisNumId?.elements?.find(
-      (element2) => element2.name === "w:lvl" && element2.attributes["w:ilvl"] == ilvl
+    const levelDefinition = listDefElements?.find(
+      (element2) => element2.name === "w:lvl" && element2.attributes?.["w:ilvl"] == ilvl
     );
     if (!levelDefinition) return {};
-    const abstractElementPr = levelDefinition?.elements?.find((el) => el.name === translator2.xmlName);
+    const levelDefElements = levelDefinition.elements;
+    const abstractElementPr = levelDefElements?.find((el) => el.name === translator2.xmlName);
     if (!abstractElementPr) return {};
     const abstractProps = translator2.encode({ ...params2, nodes: [abstractElementPr] }) || {};
-    const pStyleElement = levelDefinition?.elements?.find((el) => el.name === "w:pStyle");
+    const pStyleElement = levelDefElements?.find((el) => el.name === "w:pStyle");
     if (pStyleElement) {
-      const pStyleId = pStyleElement?.attributes?.["w:val"];
+      const pStyleId = pStyleElement.attributes?.["w:val"];
       abstractProps.styleId = pStyleId;
     }
     propertiesChain.push(abstractProps);
     propertiesChain.reverse();
-    const result = combineProperties(propertiesChain);
-    return result;
+    return combineProperties$1(propertiesChain);
   }
-  const combineProperties = (propertiesArray, fullOverrideProps = [], specialHandling = {}) => {
-    if (!propertiesArray || propertiesArray.length === 0) {
-      return {};
+  function resolveDocxFontFamily(attributes, docx, toCssFontFamily2) {
+    if (!attributes || typeof attributes !== "object") return null;
+    const ascii = attributes["w:ascii"] ?? attributes["ascii"];
+    const themeAscii = attributes["w:asciiTheme"] ?? attributes["asciiTheme"];
+    let resolved = ascii;
+    if (docx && themeAscii) {
+      const theme = docx["word/theme/theme1.xml"];
+      const themeElements = theme?.elements;
+      if (themeElements?.length) {
+        const topElement = themeElements[0];
+        const topElementElements = topElement?.elements;
+        const themeElementsNode = topElementElements?.find((el) => el.name === "a:themeElements");
+        const themeElementsElements = themeElementsNode?.elements;
+        const fontScheme = themeElementsElements?.find((el) => el.name === "a:fontScheme");
+        const fontSchemeElements = fontScheme?.elements;
+        const prefix2 = themeAscii.startsWith("minor") ? "minor" : "major";
+        const font = fontSchemeElements?.find((el) => el.name === `a:${prefix2}Font`);
+        const fontElements = font?.elements;
+        const latin = fontElements?.find((el) => el.name === "a:latin");
+        const typeface = latin?.attributes?.typeface;
+        resolved = typeface || resolved;
+      }
     }
-    const isObject2 = (item) => item && typeof item === "object" && !Array.isArray(item);
-    const merge2 = (target, source) => {
-      const output = { ...target };
-      if (isObject2(target) && isObject2(source)) {
-        for (const key2 in source) {
-          if (Object.prototype.hasOwnProperty.call(source, key2)) {
-            if (!fullOverrideProps.includes(key2) && isObject2(source[key2])) {
-              if (key2 in target && isObject2(target[key2])) {
-                output[key2] = merge2(target[key2], source[key2]);
-              } else {
-                output[key2] = source[key2];
-              }
-            } else {
-              const handler2 = specialHandling[key2];
-              if (handler2 && typeof handler2 === "function") {
-                output[key2] = handler2(output, source);
-              } else {
-                output[key2] = source[key2];
-              }
-            }
-          }
-        }
+    if (!resolved) return null;
+    if (toCssFontFamily2) {
+      return toCssFontFamily2(resolved, docx ?? void 0);
+    }
+    return resolved;
+  }
+  const FONT_FAMILY_FALLBACKS$1 = Object.freeze({
+    swiss: "Arial, sans-serif",
+    roman: "Times New Roman, serif",
+    modern: "Courier New, monospace",
+    script: "cursive",
+    decorative: "fantasy",
+    system: "system-ui",
+    auto: "sans-serif"
+  });
+  const DEFAULT_GENERIC_FALLBACK$1 = "sans-serif";
+  const normalizeParts = (value) => (value || "").split(",").map((part) => part.trim()).filter(Boolean);
+  function mapWordFamilyFallback(wordFamily) {
+    if (!wordFamily) return DEFAULT_GENERIC_FALLBACK$1;
+    const mapped = FONT_FAMILY_FALLBACKS$1[wordFamily.toLowerCase()];
+    return mapped || DEFAULT_GENERIC_FALLBACK$1;
+  }
+  function toCssFontFamily(fontName, options = {}) {
+    if (!fontName || typeof fontName !== "string") return fontName;
+    const trimmed = fontName.trim();
+    if (!trimmed || trimmed.includes(",")) return trimmed;
+    const { fallback, wordFamily } = options;
+    const fallbackValue = fallback ?? (wordFamily ? mapWordFamilyFallback(wordFamily) : void 0) ?? DEFAULT_GENERIC_FALLBACK$1;
+    const fallbackParts = normalizeParts(fallbackValue);
+    if (fallbackParts.length === 0) {
+      return trimmed;
+    }
+    const normalizedName = trimmed.toLowerCase();
+    const includesName = fallbackParts.some((part) => part.toLowerCase() === normalizedName);
+    if (includesName) {
+      return fallbackParts.join(", ");
+    }
+    return [trimmed, ...fallbackParts].join(", ");
+  }
+  const sdtMetadataCache = /* @__PURE__ */ new Map();
+  function resolveStyle(node2, context, options = {}) {
+    let paragraph2 = createDefaultParagraph();
+    let character = createDefaultCharacter(context);
+    let numbering;
+    const chain = resolveStyleChain(node2.styleId, context.styles);
+    for (const style2 of chain) {
+      paragraph2 = mergeParagraph(paragraph2, style2.paragraph);
+      character = mergeCharacter(character, style2.character);
+      if (!numbering && style2.numbering) {
+        numbering = resolveNumbering(style2.numbering.numId, style2.numbering.level, context);
       }
-      return output;
+    }
+    paragraph2 = mergeParagraph(paragraph2, node2.paragraphProps);
+    character = mergeCharacter(character, node2.characterProps);
+    if (node2.numbering) {
+      numbering = resolveNumbering(node2.numbering.numId, node2.numbering.level, context);
+    }
+    const sdt = options?.sdt ? resolveSdtMetadata(options.sdt) : void 0;
+    return {
+      paragraph: paragraph2,
+      character,
+      numbering,
+      sdt
+    };
+  }
+  function resolveNumbering(numId, level, context) {
+    const def2 = context.numbering?.[numId];
+    if (!def2) return void 0;
+    const levelDef = def2.levels.find((entry) => entry.level === level) ?? def2.levels[level];
+    if (!levelDef) return void 0;
+    return {
+      numId,
+      level,
+      indent: {
+        left: levelDef.indent?.left,
+        hanging: levelDef.indent?.hanging
+      },
+      format: levelDef.format ?? "decimal",
+      text: levelDef.text ?? "%1.",
+      start: levelDef.start ?? 1
+    };
+  }
+  function resolveSdtMetadata(input2) {
+    if (!input2) return void 0;
+    const { nodeType, attrs, cacheKey: explicitKey } = input2;
+    if (!nodeType) return void 0;
+    const normalizedAttrs = isPlainObject$7(attrs) ? attrs : {};
+    const cacheKey = buildSdtCacheKey(nodeType, normalizedAttrs, explicitKey);
+    if (cacheKey && sdtMetadataCache.has(cacheKey)) {
+      return sdtMetadataCache.get(cacheKey);
+    }
+    let metadata;
+    switch (nodeType) {
+      case "fieldAnnotation":
+        metadata = normalizeFieldAnnotationMetadata(normalizedAttrs);
+        break;
+      case "structuredContent":
+      case "structuredContentBlock":
+        metadata = normalizeStructuredContentMetadata(nodeType, normalizedAttrs);
+        break;
+      case "documentSection":
+        metadata = normalizeDocumentSectionMetadata(normalizedAttrs);
+        break;
+      case "docPartObject":
+        metadata = normalizeDocPartMetadata(normalizedAttrs);
+        break;
+    }
+    if (metadata && cacheKey) {
+      sdtMetadataCache.set(cacheKey, metadata);
+    }
+    return metadata;
+  }
+  function createDefaultParagraph(_context) {
+    return {
+      alignment: "left",
+      spacing: {
+        before: 0,
+        after: 0,
+        line: 12,
+        lineRule: "auto"
+      },
+      indent: {
+        left: 0,
+        right: 0,
+        firstLine: 0,
+        hanging: 0
+      },
+      tabs: []
+    };
+  }
+  function createDefaultCharacter(context) {
+    const baseFont = context.defaults?.paragraphFont ?? "Calibri";
+    const fallback = context.defaults?.paragraphFontFallback;
+    const wordFamily = context.defaults?.paragraphFontFamily;
+    const resolvedFamily = toCssFontFamily(baseFont, { fallback, wordFamily }) ?? baseFont;
+    return {
+      font: {
+        family: resolvedFamily,
+        size: context.defaults?.fontSize ?? 11,
+        weight: 400,
+        italic: false
+      },
+      color: "#000000"
     };
-    return propertiesArray.reduce((acc, current) => merge2(acc, current), {});
+  }
+  function resolveStyleChain(styleId, styles) {
+    if (!styleId || !styles) return [];
+    const result = [];
+    const visited = /* @__PURE__ */ new Set();
+    let current = styles[styleId];
+    while (current && !visited.has(current.id)) {
+      result.unshift(current);
+      visited.add(current.id);
+      current = current.basedOn ? styles[current.basedOn] : void 0;
+    }
+    return result;
+  }
+  function mergeParagraph(base2, overrides) {
+    if (!overrides) return base2;
+    return {
+      ...base2,
+      alignment: overrides.alignment ?? base2.alignment,
+      spacing: overrides.spacing ? { ...base2.spacing, ...overrides.spacing } : base2.spacing,
+      indent: overrides.indent ? { ...base2.indent, ...overrides.indent } : base2.indent,
+      borders: overrides.borders ? { ...base2.borders, ...overrides.borders } : base2.borders,
+      shading: overrides.shading ?? base2.shading,
+      tabs: overrides.tabs ?? base2.tabs
+    };
+  }
+  function mergeCharacter(base2, overrides) {
+    if (!overrides) return base2;
+    return {
+      ...base2,
+      font: overrides.font ? { ...base2.font, ...overrides.font } : base2.font,
+      color: overrides.color ?? base2.color,
+      underline: overrides.underline ?? base2.underline,
+      strike: overrides.strike ?? base2.strike,
+      highlight: overrides.highlight ?? base2.highlight,
+      letterSpacing: overrides.letterSpacing ?? base2.letterSpacing
+    };
+  }
+  function normalizeFieldAnnotationMetadata(attrs) {
+    const fieldId = toOptionalString(attrs.fieldId) ?? "";
+    const formatting = extractFormatting(attrs);
+    const size2 = normalizeSize(attrs.size);
+    const extras = isPlainObject$7(attrs.extras) ? attrs.extras : null;
+    const marks = isPlainObject$7(attrs.marks) ? attrs.marks : void 0;
+    return {
+      type: "fieldAnnotation",
+      fieldId,
+      variant: normalizeFieldAnnotationVariant(attrs.type),
+      fieldType: toOptionalString(attrs.fieldType),
+      displayLabel: toOptionalString(attrs.displayLabel),
+      defaultDisplayLabel: toOptionalString(attrs.defaultDisplayLabel),
+      alias: toOptionalString(attrs.alias),
+      fieldColor: normalizeColorValue(attrs.fieldColor),
+      borderColor: normalizeColorValue(attrs.borderColor),
+      highlighted: toBoolean$3(attrs.highlighted, true),
+      fontFamily: toNullableString(attrs.fontFamily),
+      fontSize: normalizeFontSize(attrs.fontSize),
+      textColor: normalizeColorValue(attrs.textColor) ?? null,
+      textHighlight: normalizeColorValue(attrs.textHighlight) ?? null,
+      linkUrl: toNullableString(attrs.linkUrl),
+      imageSrc: toNullableString(attrs.imageSrc),
+      rawHtml: attrs.rawHtml ?? void 0,
+      size: size2 ?? null,
+      extras,
+      multipleImage: toBoolean$3(attrs.multipleImage, false),
+      hash: toOptionalString(attrs.hash) ?? null,
+      generatorIndex: toNumber$1(attrs.generatorIndex),
+      sdtId: toOptionalString(attrs.sdtId) ?? null,
+      hidden: toBoolean$3(attrs.hidden, false),
+      visibility: normalizeVisibility(attrs.visibility),
+      isLocked: toBoolean$3(attrs.isLocked, false),
+      formatting,
+      marks
+    };
+  }
+  function normalizeStructuredContentMetadata(nodeType, attrs) {
+    return {
+      type: "structuredContent",
+      scope: nodeType === "structuredContentBlock" ? "block" : "inline",
+      id: toNullableString(attrs.id),
+      tag: toOptionalString(attrs.tag),
+      alias: toOptionalString(attrs.alias),
+      sdtPr: attrs.sdtPr
+    };
+  }
+  function normalizeDocumentSectionMetadata(attrs) {
+    return {
+      type: "documentSection",
+      id: toNullableString(attrs.id),
+      title: toOptionalString(attrs.title) ?? null,
+      description: toOptionalString(attrs.description) ?? null,
+      sectionType: toOptionalString(attrs.sectionType) ?? null,
+      isLocked: toBoolean$3(attrs.isLocked, false),
+      sdBlockId: toNullableString(attrs.sdBlockId)
+    };
+  }
+  function normalizeDocPartMetadata(attrs) {
+    return {
+      type: "docPartObject",
+      gallery: toOptionalString(attrs.docPartGallery ?? attrs.gallery) ?? null,
+      // Source uniqueId from attrs.id (PM adapter uses getDocPartObjectId which extracts attrs.id)
+      // Fall back to attrs.uniqueId for compatibility
+      uniqueId: toOptionalString(attrs.id ?? attrs.uniqueId) ?? null,
+      alias: toOptionalString(attrs.alias) ?? null,
+      instruction: toOptionalString(attrs.instruction) ?? null
+    };
+  }
+  function isPlainObject$7(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+  }
+  function toOptionalString(value) {
+    if (value == null) return void 0;
+    if (typeof value === "string") {
+      const trimmed = value.trim();
+      return trimmed.length ? trimmed : void 0;
+    }
+    return String(value);
+  }
+  function toNullableString(value) {
+    const str = toOptionalString(value);
+    return str ?? null;
+  }
+  function toBoolean$3(value, fallback) {
+    if (typeof value === "boolean") return value;
+    if (typeof value === "string") {
+      const lower = value.toLowerCase();
+      if (lower === "true") return true;
+      if (lower === "false") return false;
+    }
+    if (value == null) return fallback;
+    return Boolean(value);
+  }
+  function normalizeVisibility(value) {
+    if (typeof value !== "string") return void 0;
+    const normalized = value.toLowerCase();
+    if (normalized === "visible" || normalized === "hidden") {
+      return normalized;
+    }
+    return void 0;
+  }
+  function normalizeColorValue(value) {
+    if (typeof value !== "string") return void 0;
+    const trimmed = value.trim();
+    if (!trimmed || trimmed.toLowerCase() === "none") return void 0;
+    return trimmed;
+  }
+  function normalizeFontSize(value) {
+    if (value == null) return null;
+    if (typeof value === "number") {
+      return Number.isFinite(value) ? value : null;
+    }
+    if (typeof value === "string") {
+      const trimmed = value.trim();
+      return trimmed.length ? trimmed : null;
+    }
+    return null;
+  }
+  function toNumber$1(value) {
+    if (typeof value === "number") {
+      return Number.isFinite(value) ? value : null;
+    }
+    if (typeof value === "string") {
+      const parsed = parseFloat(value);
+      return Number.isFinite(parsed) ? parsed : null;
+    }
+    return null;
+  }
+  function normalizeSize(value) {
+    if (!isPlainObject$7(value)) return null;
+    const obj = value;
+    const width = toNumber$1(obj.width);
+    const height = toNumber$1(obj.height);
+    if (width == null && height == null) return null;
+    const result = {};
+    if (width != null) result.width = width;
+    if (height != null) result.height = height;
+    return result;
+  }
+  function normalizeFieldAnnotationVariant(value) {
+    if (typeof value !== "string") return void 0;
+    const normalized = value.toLowerCase();
+    if (normalized === "text" || normalized === "image" || normalized === "signature" || normalized === "checkbox" || normalized === "html" || normalized === "link") {
+      return normalized;
+    }
+    return void 0;
+  }
+  function extractFormatting(attrs) {
+    const bold = toBoolean$3(attrs.bold, false);
+    const italic = toBoolean$3(attrs.italic, false);
+    const underline = toBoolean$3(attrs.underline, false);
+    const formatting = {};
+    if (bold) formatting.bold = true;
+    if (italic) formatting.italic = true;
+    if (underline) formatting.underline = true;
+    return Object.keys(formatting).length ? formatting : void 0;
+  }
+  function buildSdtCacheKey(nodeType, attrs, explicitKey) {
+    const provided = toOptionalString(explicitKey);
+    if (provided) {
+      return `${nodeType}:${provided}`;
+    }
+    const hash2 = toOptionalString(attrs.hash);
+    if (hash2) {
+      return `${nodeType}:${hash2}`;
+    }
+    const id = toOptionalString(attrs.id);
+    if (id) {
+      return `${nodeType}:${id}`;
+    }
+    return void 0;
+  }
+  const ooxmlResolver$1 = createOoxmlResolver({ pPr: translator$14, rPr: translator$1O });
+  const getToCssFontFamily = () => {
+    return SuperConverter.toCssFontFamily;
+  };
+  const SUBSCRIPT_SUPERSCRIPT_SCALE$1 = 0.65;
+  const resolveRunProperties = (params2, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => ooxmlResolver$1.resolveRunProperties(params2, inlineRpr, resolvedPpr, isListNumber, numberingDefinedInline);
+  function resolveParagraphProperties(params2, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
+    return ooxmlResolver$1.resolveParagraphProperties(
+      params2,
+      inlineProps,
+      insideTable,
+      overrideInlineStyleId,
+      tableStyleId
+    );
+  }
+  const combineProperties = (propertiesArray, fullOverrideProps = [], specialHandling = {}) => {
+    return combineProperties$1(propertiesArray, { fullOverrideProps, specialHandling });
   };
   const combineRunProperties = (propertiesArray) => {
     return combineProperties(propertiesArray, ["fontFamily", "color"]);
@@ -12499,9 +12944,9 @@
           textStyleAttrs[key2] = `${spacing}pt`;
           break;
         case "fontFamily":
-          const fontFamily2 = getFontFamilyValue$1(value, docx);
+          const fontFamily2 = resolveDocxFontFamily(value, docx, getToCssFontFamily());
           textStyleAttrs[key2] = fontFamily2;
-          const eastAsiaFamily = value["eastAsia"];
+          const eastAsiaFamily = typeof value === "object" && value !== null ? value["eastAsia"] : void 0;
           if (eastAsiaFamily) {
             const eastAsiaCss = getFontFamilyValue$1({ "w:ascii": eastAsiaFamily }, docx);
             if (!fontFamily2 || eastAsiaCss !== textStyleAttrs.fontFamily) {
@@ -12756,11 +13201,11 @@
         }
         case "fontFamily": {
           if (!value) break;
-          const fontFamily2 = getFontFamilyValue$1(value, docx);
+          const fontFamily2 = resolveDocxFontFamily(value, docx, getToCssFontFamily());
           if (fontFamily2) {
             css["font-family"] = fontFamily2;
           }
-          const eastAsiaFamily = value["eastAsia"];
+          const eastAsiaFamily = typeof value === "object" && value !== null ? value["eastAsia"] : void 0;
           if (eastAsiaFamily) {
             const eastAsiaCss = getFontFamilyValue$1({ "w:ascii": eastAsiaFamily }, docx);
             if (eastAsiaCss && (!fontFamily2 || eastAsiaCss !== fontFamily2)) {
@@ -30445,8 +30890,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       hash: attrs.hash
     };
     const annotationAttrsJson = JSON.stringify(annotationAttrs);
+    const sanitizedDisplayLabel = attrs.displayLabel === "undefined" || attrs.displayLabel === void 0 ? "" : attrs.displayLabel;
     const sdtPrElements = [
-      { name: "w:alias", attributes: { "w:val": attrs.displayLabel } },
+      { name: "w:alias", attributes: { "w:val": sanitizedDisplayLabel } },
       { name: "w:tag", attributes: { "w:val": annotationAttrsJson } },
       { name: "w:id", attributes: { "w:val": id } }
     ];
@@ -32519,7 +32965,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         text2 = text2.replace(/^[ \t\n\r]+/, "").replace(/[ \t\n\r]+$/, "");
       }
       text2 = text2.replace(/\[\[sdspace\]\]/g, "");
-      if (xmlSpace !== "preserve" && typeof text2 === "string" && !text2.trim()) {
+      const isWhitespaceOnly = /^[ \t\n\r]*$/.test(text2);
+      if (xmlSpace !== "preserve" && isWhitespaceOnly) {
         return null;
       }
     } else if (!elements.length && encodedAttrs.xmlSpace === "preserve") {
@@ -35473,7 +35920,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const result = additions.length ? [...existingRelationships, ...additions] : existingRelationships;
     return result;
   };
-  const FONT_FAMILY_FALLBACKS$1 = Object.freeze({
+  const FONT_FAMILY_FALLBACKS = Object.freeze({
     swiss: "Arial, sans-serif",
     roman: "Times New Roman, serif",
     modern: "Courier New, monospace",
@@ -35482,7 +35929,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     system: "system-ui",
     auto: "sans-serif"
   });
-  const DEFAULT_GENERIC_FALLBACK$1 = "sans-serif";
+  const DEFAULT_GENERIC_FALLBACK = "sans-serif";
   const DEFAULT_FONT_SIZE_PT = 10;
   const collectRunDefaultProperties = (runProps, { allowOverrideTypeface = true, allowOverrideSize = true, themeResolver, state }) => {
     if (!runProps?.elements?.length || !state) return;
@@ -35577,13 +36024,13 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const fontEntry = SuperConverter.getFontTableEntry(docx, fontName);
       const family = fontEntry?.elements?.find((child) => child.name === "w:family")?.attributes?.["w:val"];
       if (!family) return null;
-      const mapped = FONT_FAMILY_FALLBACKS$1[family.toLowerCase()];
-      return mapped || DEFAULT_GENERIC_FALLBACK$1;
+      const mapped = FONT_FAMILY_FALLBACKS[family.toLowerCase()];
+      return mapped || DEFAULT_GENERIC_FALLBACK;
     }
     static toCssFontFamily(fontName, docx) {
       if (!fontName) return fontName;
       if (fontName.includes(",")) return fontName;
-      const fallback = SuperConverter.getFallbackFromFontTable(docx, fontName) || DEFAULT_GENERIC_FALLBACK$1;
+      const fallback = SuperConverter.getFallbackFromFontTable(docx, fontName) || DEFAULT_GENERIC_FALLBACK;
       const normalizedFallbackParts = fallback.split(",").map((part) => part.trim().toLowerCase()).filter(Boolean);
       if (normalizedFallbackParts.includes(fontName.trim().toLowerCase())) {
         return fallback;
@@ -35919,7 +36366,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.2") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.4") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -45269,15 +45716,19 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       dispatchTransaction = editor.dispatch.bind(editor);
     }
     if (!dispatchTransaction) return false;
-    const handled = splitBlockPatch(state, (transaction) => {
-      dispatchTransaction(transaction);
-    });
+    const handled = splitBlockPatch(
+      state,
+      (transaction) => {
+        dispatchTransaction(transaction);
+      },
+      editor
+    );
     if (handled) {
       tr.setMeta("preventDispatch", true);
     }
     return handled;
   };
-  function splitBlockPatch(state, dispatch) {
+  function splitBlockPatch(state, dispatch, editor) {
     let { $from } = state.selection;
     if (state.selection instanceof NodeSelection && state.selection.node.isBlock) {
       if (!$from.parentOffset || !canSplit(state.doc, $from.pos)) return false;
@@ -45286,14 +45737,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     if (!$from.depth) return false;
     let types2 = [];
-    let splitDepth, deflt, atEnd = false, atStart = false;
+    let splitDepth, deflt, paragraphAttrs = null, atEnd = false, atStart = false;
     for (let d2 = $from.depth; ; d2--) {
       let node2 = $from.node(d2);
       if (node2.isBlock) {
         atEnd = $from.end(d2) == $from.pos + ($from.depth - d2);
         atStart = $from.start(d2) == $from.pos - ($from.depth - d2);
         deflt = defaultBlockAt$1($from.node(d2 - 1).contentMatchAt($from.indexAfter(d2 - 1)));
-        types2.unshift(null);
+        paragraphAttrs = { ...node2.attrs };
+        types2.unshift({ type: deflt || node2.type, attrs: paragraphAttrs });
         splitDepth = d2;
         break;
       } else {
@@ -45306,7 +45758,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     let splitPos = tr.mapping.map($from.pos);
     let can = canSplit(tr.doc, splitPos, types2.length, types2);
     if (!can) {
-      types2[0] = deflt ? { type: deflt } : null;
+      types2[0] = deflt ? { type: deflt, attrs: paragraphAttrs } : null;
       can = canSplit(tr.doc, splitPos, types2.length, types2);
     }
     if (!can) return false;
@@ -45316,9 +45768,37 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (deflt && $from.node(splitDepth - 1).canReplaceWith($first.index(), $first.index() + 1, deflt))
         tr.setNodeMarkup(tr.mapping.map($from.before(splitDepth)), deflt);
     }
+    applyStyleMarks(state, tr, editor, paragraphAttrs);
     if (dispatch) dispatch(tr.scrollIntoView());
     return true;
   }
+  function applyStyleMarks(state, tr, editor, paragraphAttrs) {
+    const styleId = paragraphAttrs?.paragraphProperties?.styleId;
+    if (!editor?.converter && !styleId) {
+      return;
+    }
+    try {
+      const params2 = { docx: editor?.converter?.convertedXml ?? {}, numbering: editor?.converter?.numbering ?? {} };
+      const resolvedPpr = styleId ? { styleId } : {};
+      const runProperties = styleId ? resolveRunProperties(params2, {}, resolvedPpr, false, false) : {};
+      const markDefsFromStyle = styleId ? (
+        /** @type {Array<{type: string, attrs: Record<string, unknown>}>} */
+        encodeMarksFromRPr(runProperties, editor?.converter?.convertedXml ?? {})
+      ) : [];
+      const selectionMarks = state.selection?.$from?.marks ? state.selection.$from.marks() : [];
+      const selectionMarkDefs = selectionMarks.map((mark2) => ({ type: mark2.type.name, attrs: mark2.attrs }));
+      const markDefsToApply = selectionMarks.length ? selectionMarkDefs : markDefsFromStyle;
+      const marksToApply = markDefsToApply.map((def2) => {
+        const markType = state.schema.marks[def2.type];
+        return markType ? markType.create(def2.attrs) : null;
+      }).filter(Boolean);
+      if (marksToApply.length > 0) {
+        tr.ensureMarks(marksToApply);
+        tr.setMeta("sdStyleMarks", markDefsToApply);
+      }
+    } catch {
+    }
+  }
   const splitRunAtCursor = () => (props) => {
     let { state, dispatch, tr } = props;
     const sel = state.selection;
@@ -46202,7 +46682,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     return true;
   };
-  const isPlainObject$7 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
+  const isPlainObject$6 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
   const assignNestedValue = (target, path2, value) => {
     if (!path2.includes(".")) {
       target[path2] = value;
@@ -46216,7 +46696,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (isLast) {
         current[part] = value;
       } else {
-        if (!isPlainObject$7(current[part])) {
+        if (!isPlainObject$6(current[part])) {
           current[part] = {};
         }
         current = current[part];
@@ -49189,8 +49669,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const hasMatchingId = changeMarks.find((mark2) => mark2.attrs.id === id);
       if (hasMatchingId) nodesWithMark.push(node3);
     });
+    const nodesToProcess = nodesWithMark.length ? nodesWithMark : node2 ? [node2] : [];
+    if (!nodesToProcess.length) {
+      return;
+    }
     const { deletionText, trackedChangeText } = getTrackedChangeText({
-      nodes: nodesWithMark.length ? nodesWithMark : [node2],
+      nodes: nodesToProcess,
       mark: trackedMark,
       trackedChangeType,
       isDeletionInsertion
@@ -52519,6 +53003,45 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       console.warn("[collaboration] Failed to update Ydoc docx data", error);
     }
   };
+  let isApplyingRemoteChanges = false;
+  const isApplyingRemoteHeaderFooterChanges = () => isApplyingRemoteChanges;
+  const pushHeaderFooterToYjs = (editor, type, sectionId, content2) => {
+    if (isApplyingRemoteChanges) return;
+    const ydoc = editor?.options?.ydoc;
+    if (!ydoc) return;
+    const headerFooterMap = ydoc.getMap("headerFooterJson");
+    const key2 = `${type}:${sectionId}`;
+    const existing = headerFooterMap.get(key2)?.content;
+    if (existing && JSON.stringify(existing) === JSON.stringify(content2)) {
+      return;
+    }
+    ydoc.transact(() => headerFooterMap.set(key2, { type, sectionId, content: content2 }), {
+      event: "header-footer-update",
+      user: editor.options.user
+    });
+  };
+  const applyRemoteHeaderFooterChanges = (editor, key2, data) => {
+    if (!editor || editor.isDestroyed || !editor.converter) return;
+    const { type, sectionId, content: content2 } = data;
+    if (!type || !sectionId || !content2) return;
+    isApplyingRemoteChanges = true;
+    try {
+      const storage = editor.converter[`${type}s`];
+      if (storage) storage[sectionId] = content2;
+      editor.converter.headerFooterModified = true;
+      const editors = editor.converter[`${type}Editors`];
+      editors?.forEach((item) => {
+        if (item.id === sectionId && item.editor) {
+          item.editor.replaceContent(content2);
+        }
+      });
+      editor.emit("remoteHeaderFooterChanged", { type, sectionId, content: content2 });
+    } finally {
+      setTimeout(() => {
+        isApplyingRemoteChanges = false;
+      }, 0);
+    }
+  };
   new PluginKey("collaboration");
   const Collaboration = Extension.create({
     name: "collaboration",
@@ -52547,6 +53070,18 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           }
         });
       });
+      const headerFooterMap = this.options.ydoc.getMap("headerFooterJson");
+      headerFooterMap.observe((event) => {
+        if (event.transaction.local) return;
+        event.changes.keys.forEach((change, key2) => {
+          if (change.action === "add" || change.action === "update") {
+            const data = headerFooterMap.get(key2);
+            if (data) {
+              applyRemoteHeaderFooterChanges(this.editor, key2, data);
+            }
+          }
+        });
+      });
       return [syncPlugin];
     },
     addCommands() {
@@ -52665,7 +53200,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const toRawType = (value) => {
     return toTypeString(value).slice(8, -1);
   };
-  const isPlainObject$6 = (val) => toTypeString(val) === "[object Object]";
+  const isPlainObject$5 = (val) => toTypeString(val) === "[object Object]";
   const isIntegerKey = (key2) => isString(key2) && key2 !== "NaN" && key2[0] !== "-" && "" + parseInt(key2, 10) === key2;
   const isReservedProp = /* @__PURE__ */ makeMap(
     // the leading comma is intentional so empty string "" is also included
@@ -52715,7 +53250,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const n = parseFloat(val);
     return isNaN(n) ? val : n;
   };
-  const toNumber$1 = (val) => {
+  const toNumber = (val) => {
     const n = isString(val) ? Number(val) : NaN;
     return isNaN(n) ? val : n;
   };
@@ -52814,7 +53349,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       };
     } else if (isSymbol$1(val)) {
       return stringifySymbol(val);
-    } else if (isObject$2(val) && !isArray$1(val) && !isPlainObject$6(val)) {
+    } else if (isObject$2(val) && !isArray$1(val) && !isPlainObject$5(val)) {
       return String(val);
     }
     return val;
@@ -54431,7 +54966,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       value.forEach((v2) => {
         traverse(v2, depth, seen);
       });
-    } else if (isPlainObject$6(value)) {
+    } else if (isPlainObject$5(value)) {
       for (const key2 in value) {
         traverse(value[key2], depth, seen);
       }
@@ -59660,7 +60195,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
   }
   function NumberOf(val) {
-    const res = toNumber$1(val);
+    const res = toNumber(val);
     return res;
   }
   function addTransitionClass(el, cls) {
@@ -61541,7 +62076,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.3.0-next.2";
+  const summaryVersion = "1.3.0-next.4";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -64175,7 +64710,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.2");
+      console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.4");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -69751,39 +70286,6 @@ ${l}
       right: borderValueToSpec(isLastCol ? tableBorders?.right : null)
     };
   };
-  const FONT_FAMILY_FALLBACKS = Object.freeze({
-    swiss: "Arial, sans-serif",
-    roman: "Times New Roman, serif",
-    modern: "Courier New, monospace",
-    script: "cursive",
-    decorative: "fantasy",
-    system: "system-ui",
-    auto: "sans-serif"
-  });
-  const DEFAULT_GENERIC_FALLBACK = "sans-serif";
-  const normalizeParts = (value) => (value || "").split(",").map((part) => part.trim()).filter(Boolean);
-  function mapWordFamilyFallback(wordFamily) {
-    if (!wordFamily) return DEFAULT_GENERIC_FALLBACK;
-    const mapped = FONT_FAMILY_FALLBACKS[wordFamily.toLowerCase()];
-    return mapped || DEFAULT_GENERIC_FALLBACK;
-  }
-  function toCssFontFamily(fontName, options = {}) {
-    if (!fontName || typeof fontName !== "string") return fontName;
-    const trimmed = fontName.trim();
-    if (!trimmed || trimmed.includes(",")) return trimmed;
-    const { fallback, wordFamily } = options;
-    const fallbackValue = fallback ?? (wordFamily ? mapWordFamilyFallback(wordFamily) : void 0) ?? DEFAULT_GENERIC_FALLBACK;
-    const fallbackParts = normalizeParts(fallbackValue);
-    if (fallbackParts.length === 0) {
-      return trimmed;
-    }
-    const normalizedName = trimmed.toLowerCase();
-    const includesName = fallbackParts.some((part) => part.toLowerCase() === normalizedName);
-    if (includesName) {
-      return fallbackParts.join(", ");
-    }
-    return [trimmed, ...fallbackParts].join(", ");
-  }
   const LIST_MARKER_GAP$3 = 8;
   function renderListMarker(params2) {
     const { doc: doc2, lineEl, markerLayout, markerMeasure, indentLeftPx } = params2;
@@ -73787,7 +74289,12 @@ ${l}
         const hanging = paraIndent?.hanging ?? 0;
         const isFirstLineOfPara = lineIndex === 0 || lineIndex === void 0;
         const firstLineOffsetForCumX = isFirstLineOfPara ? firstLine - hanging : 0;
-        const indentOffset = indentLeft + firstLineOffsetForCumX;
+        const wordLayoutValue = block.attrs?.wordLayout;
+        const wordLayout = isMinimalWordLayout(wordLayoutValue) ? wordLayoutValue : void 0;
+        const isListParagraph = Boolean(wordLayout?.marker);
+        const rawTextStartPx = typeof wordLayout?.marker?.textStartX === "number" && Number.isFinite(wordLayout.marker.textStartX) ? wordLayout.marker.textStartX : typeof wordLayout?.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : void 0;
+        const listIndentOffset = isFirstLineOfPara ? rawTextStartPx ?? indentLeft : indentLeft;
+        const indentOffset = isListParagraph ? listIndentOffset : indentLeft + firstLineOffsetForCumX;
         let cumulativeX = 0;
         const segmentsByRun = /* @__PURE__ */ new Map();
         line.segments.forEach((segment) => {
@@ -86334,8 +86841,17 @@ ${l}
     if (px == null || !Number.isFinite(px)) return void 0;
     return px / PX_PER_PT;
   };
+  const convertIndentTwipsToPx$1 = (indent2) => {
+    if (!indent2) return void 0;
+    const result = {};
+    if (isFiniteNumber(indent2.left)) result.left = twipsToPx$1(indent2.left);
+    if (isFiniteNumber(indent2.right)) result.right = twipsToPx$1(indent2.right);
+    if (isFiniteNumber(indent2.firstLine)) result.firstLine = twipsToPx$1(indent2.firstLine);
+    if (isFiniteNumber(indent2.hanging)) result.hanging = twipsToPx$1(indent2.hanging);
+    return Object.keys(result).length ? result : void 0;
+  };
   const isFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value);
-  const isPlainObject$5 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+  const isPlainObject$4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
   const normalizePrefix = (value) => {
     if (!value) return "";
     return String(value);
@@ -86397,7 +86913,7 @@ ${l}
     }
     return void 0;
   }
-  const toBoolean$3 = (value) => {
+  const toBoolean$2 = (value) => {
     if (typeof value === "boolean") return value;
     if (typeof value === "string") {
       const v2 = value.trim().toLowerCase();
@@ -86688,7 +87204,7 @@ ${l}
     });
   }
   function isGradientFill(value) {
-    if (!isPlainObject$5(value)) return false;
+    if (!isPlainObject$4(value)) return false;
     if (value.type !== "gradient") return false;
     const gradientType = value.gradientType;
     if (gradientType !== "linear" && gradientType !== "radial") return false;
@@ -86699,12 +87215,12 @@ ${l}
     }
     if (!Array.isArray(value.stops) || value.stops.length === 0) return false;
     return value.stops.every((stop) => {
-      if (!isPlainObject$5(stop)) return false;
+      if (!isPlainObject$4(stop)) return false;
       return typeof stop.position === "number" && Number.isFinite(stop.position) && typeof stop.color === "string" && (stop.alpha === void 0 || typeof stop.alpha === "number" && Number.isFinite(stop.alpha));
     });
   }
   function isSolidFillWithAlpha(value) {
-    return isPlainObject$5(value) && value.type === "solidWithAlpha" && typeof value.color === "string" && typeof value.alpha === "number";
+    return isPlainObject$4(value) && value.type === "solidWithAlpha" && typeof value.color === "string" && typeof value.alpha === "number";
   }
   function normalizeFillColor(value) {
     if (value === null) return null;
@@ -86719,10 +87235,10 @@ ${l}
     return void 0;
   }
   function normalizeTextContent(value) {
-    if (!isPlainObject$5(value)) return void 0;
+    if (!isPlainObject$4(value)) return void 0;
     if (!Array.isArray(value.parts)) return void 0;
     if (value.parts.length === 0) return void 0;
-    const validParts = value.parts.filter((p2) => isPlainObject$5(p2) && typeof p2.text === "string");
+    const validParts = value.parts.filter((p2) => isPlainObject$4(p2) && typeof p2.text === "string");
     if (validParts.length === 0) return void 0;
     const result = {
       parts: validParts
@@ -86740,7 +87256,7 @@ ${l}
     return void 0;
   }
   function normalizeTextInsets(value) {
-    if (!isPlainObject$5(value)) return void 0;
+    if (!isPlainObject$4(value)) return void 0;
     const top2 = pickNumber(value.top);
     const right2 = pickNumber(value.right);
     const bottom2 = pickNumber(value.bottom);
@@ -86752,7 +87268,7 @@ ${l}
   }
   const OOXML_Z_INDEX_BASE = 251658240;
   function normalizeZIndex(originalAttributes) {
-    if (!isPlainObject$5(originalAttributes)) return void 0;
+    if (!isPlainObject$4(originalAttributes)) return void 0;
     const relativeHeight = originalAttributes.relativeHeight;
     if (typeof relativeHeight !== "number") return void 0;
     return Math.max(0, relativeHeight - OOXML_Z_INDEX_BASE);
@@ -87906,321 +88422,6 @@ ${l}
     }
     return adjusted;
   };
-  const sdtMetadataCache = /* @__PURE__ */ new Map();
-  function resolveStyle(node2, context, options = {}) {
-    let paragraph2 = createDefaultParagraph();
-    let character = createDefaultCharacter(context);
-    let numbering;
-    const chain = resolveStyleChain(node2.styleId, context.styles);
-    for (const style2 of chain) {
-      paragraph2 = mergeParagraph(paragraph2, style2.paragraph);
-      character = mergeCharacter(character, style2.character);
-      if (!numbering && style2.numbering) {
-        numbering = resolveNumbering(style2.numbering.numId, style2.numbering.level, context);
-      }
-    }
-    paragraph2 = mergeParagraph(paragraph2, node2.paragraphProps);
-    character = mergeCharacter(character, node2.characterProps);
-    if (node2.numbering) {
-      numbering = resolveNumbering(node2.numbering.numId, node2.numbering.level, context);
-    }
-    const sdt = options?.sdt ? resolveSdtMetadata(options.sdt) : void 0;
-    return {
-      paragraph: paragraph2,
-      character,
-      numbering,
-      sdt
-    };
-  }
-  function resolveNumbering(numId, level, context) {
-    const def2 = context.numbering?.[numId];
-    if (!def2) return void 0;
-    const levelDef = def2.levels.find((entry) => entry.level === level) ?? def2.levels[level];
-    if (!levelDef) return void 0;
-    return {
-      numId,
-      level,
-      indent: {
-        left: levelDef.indent?.left,
-        hanging: levelDef.indent?.hanging
-      },
-      format: levelDef.format ?? "decimal",
-      text: levelDef.text ?? "%1.",
-      start: levelDef.start ?? 1
-    };
-  }
-  function resolveSdtMetadata(input2) {
-    if (!input2) return void 0;
-    const { nodeType, attrs, cacheKey: explicitKey } = input2;
-    if (!nodeType) return void 0;
-    const normalizedAttrs = isPlainObject$4(attrs) ? attrs : {};
-    const cacheKey = buildSdtCacheKey(nodeType, normalizedAttrs, explicitKey);
-    if (cacheKey && sdtMetadataCache.has(cacheKey)) {
-      return sdtMetadataCache.get(cacheKey);
-    }
-    let metadata;
-    switch (nodeType) {
-      case "fieldAnnotation":
-        metadata = normalizeFieldAnnotationMetadata(normalizedAttrs);
-        break;
-      case "structuredContent":
-      case "structuredContentBlock":
-        metadata = normalizeStructuredContentMetadata(nodeType, normalizedAttrs);
-        break;
-      case "documentSection":
-        metadata = normalizeDocumentSectionMetadata(normalizedAttrs);
-        break;
-      case "docPartObject":
-        metadata = normalizeDocPartMetadata(normalizedAttrs);
-        break;
-    }
-    if (metadata && cacheKey) {
-      sdtMetadataCache.set(cacheKey, metadata);
-    }
-    return metadata;
-  }
-  function createDefaultParagraph(_context) {
-    return {
-      alignment: "left",
-      spacing: {
-        before: 0,
-        after: 0,
-        line: 12,
-        lineRule: "auto"
-      },
-      indent: {
-        left: 0,
-        right: 0,
-        firstLine: 0,
-        hanging: 0
-      },
-      tabs: []
-    };
-  }
-  function createDefaultCharacter(context) {
-    const baseFont = context.defaults?.paragraphFont ?? "Calibri";
-    const fallback = context.defaults?.paragraphFontFallback;
-    const wordFamily = context.defaults?.paragraphFontFamily;
-    const resolvedFamily = toCssFontFamily(baseFont, { fallback, wordFamily }) ?? baseFont;
-    return {
-      font: {
-        family: resolvedFamily,
-        size: context.defaults?.fontSize ?? 11,
-        weight: 400,
-        italic: false
-      },
-      color: "#000000"
-    };
-  }
-  function resolveStyleChain(styleId, styles) {
-    if (!styleId || !styles) return [];
-    const result = [];
-    const visited = /* @__PURE__ */ new Set();
-    let current = styles[styleId];
-    while (current && !visited.has(current.id)) {
-      result.unshift(current);
-      visited.add(current.id);
-      current = current.basedOn ? styles[current.basedOn] : void 0;
-    }
-    return result;
-  }
-  function mergeParagraph(base2, overrides) {
-    if (!overrides) return base2;
-    return {
-      ...base2,
-      alignment: overrides.alignment ?? base2.alignment,
-      spacing: overrides.spacing ? { ...base2.spacing, ...overrides.spacing } : base2.spacing,
-      indent: overrides.indent ? { ...base2.indent, ...overrides.indent } : base2.indent,
-      borders: overrides.borders ? { ...base2.borders, ...overrides.borders } : base2.borders,
-      shading: overrides.shading ?? base2.shading,
-      tabs: overrides.tabs ?? base2.tabs
-    };
-  }
-  function mergeCharacter(base2, overrides) {
-    if (!overrides) return base2;
-    return {
-      ...base2,
-      font: overrides.font ? { ...base2.font, ...overrides.font } : base2.font,
-      color: overrides.color ?? base2.color,
-      underline: overrides.underline ?? base2.underline,
-      strike: overrides.strike ?? base2.strike,
-      highlight: overrides.highlight ?? base2.highlight,
-      letterSpacing: overrides.letterSpacing ?? base2.letterSpacing
-    };
-  }
-  function normalizeFieldAnnotationMetadata(attrs) {
-    const fieldId = toOptionalString(attrs.fieldId) ?? "";
-    const formatting = extractFormatting(attrs);
-    const size2 = normalizeSize(attrs.size);
-    const extras = isPlainObject$4(attrs.extras) ? attrs.extras : null;
-    const marks = isPlainObject$4(attrs.marks) ? attrs.marks : void 0;
-    return {
-      type: "fieldAnnotation",
-      fieldId,
-      variant: normalizeFieldAnnotationVariant(attrs.type),
-      fieldType: toOptionalString(attrs.fieldType),
-      displayLabel: toOptionalString(attrs.displayLabel),
-      defaultDisplayLabel: toOptionalString(attrs.defaultDisplayLabel),
-      alias: toOptionalString(attrs.alias),
-      fieldColor: normalizeColorValue(attrs.fieldColor),
-      borderColor: normalizeColorValue(attrs.borderColor),
-      highlighted: toBoolean$2(attrs.highlighted, true),
-      fontFamily: toNullableString(attrs.fontFamily),
-      fontSize: normalizeFontSize(attrs.fontSize),
-      textColor: normalizeColorValue(attrs.textColor) ?? null,
-      textHighlight: normalizeColorValue(attrs.textHighlight) ?? null,
-      linkUrl: toNullableString(attrs.linkUrl),
-      imageSrc: toNullableString(attrs.imageSrc),
-      rawHtml: attrs.rawHtml ?? void 0,
-      size: size2 ?? null,
-      extras,
-      multipleImage: toBoolean$2(attrs.multipleImage, false),
-      hash: toOptionalString(attrs.hash) ?? null,
-      generatorIndex: toNumber(attrs.generatorIndex),
-      sdtId: toOptionalString(attrs.sdtId) ?? null,
-      hidden: toBoolean$2(attrs.hidden, false),
-      visibility: normalizeVisibility(attrs.visibility),
-      isLocked: toBoolean$2(attrs.isLocked, false),
-      formatting,
-      marks
-    };
-  }
-  function normalizeStructuredContentMetadata(nodeType, attrs) {
-    return {
-      type: "structuredContent",
-      scope: nodeType === "structuredContentBlock" ? "block" : "inline",
-      id: toNullableString(attrs.id),
-      tag: toOptionalString(attrs.tag),
-      alias: toOptionalString(attrs.alias),
-      sdtPr: attrs.sdtPr
-    };
-  }
-  function normalizeDocumentSectionMetadata(attrs) {
-    return {
-      type: "documentSection",
-      id: toNullableString(attrs.id),
-      title: toOptionalString(attrs.title) ?? null,
-      description: toOptionalString(attrs.description) ?? null,
-      sectionType: toOptionalString(attrs.sectionType) ?? null,
-      isLocked: toBoolean$2(attrs.isLocked, false),
-      sdBlockId: toNullableString(attrs.sdBlockId)
-    };
-  }
-  function normalizeDocPartMetadata(attrs) {
-    return {
-      type: "docPartObject",
-      gallery: toOptionalString(attrs.docPartGallery ?? attrs.gallery) ?? null,
-      // Source uniqueId from attrs.id (PM adapter uses getDocPartObjectId which extracts attrs.id)
-      // Fall back to attrs.uniqueId for compatibility
-      uniqueId: toOptionalString(attrs.id ?? attrs.uniqueId) ?? null,
-      alias: toOptionalString(attrs.alias) ?? null,
-      instruction: toOptionalString(attrs.instruction) ?? null
-    };
-  }
-  function isPlainObject$4(value) {
-    return !!value && typeof value === "object" && !Array.isArray(value);
-  }
-  function toOptionalString(value) {
-    if (value == null) return void 0;
-    if (typeof value === "string") {
-      const trimmed = value.trim();
-      return trimmed.length ? trimmed : void 0;
-    }
-    return String(value);
-  }
-  function toNullableString(value) {
-    const str = toOptionalString(value);
-    return str ?? null;
-  }
-  function toBoolean$2(value, fallback) {
-    if (typeof value === "boolean") return value;
-    if (typeof value === "string") {
-      const lower = value.toLowerCase();
-      if (lower === "true") return true;
-      if (lower === "false") return false;
-    }
-    if (value == null) return fallback;
-    return Boolean(value);
-  }
-  function normalizeVisibility(value) {
-    if (typeof value !== "string") return void 0;
-    const normalized = value.toLowerCase();
-    if (normalized === "visible" || normalized === "hidden") {
-      return normalized;
-    }
-    return void 0;
-  }
-  function normalizeColorValue(value) {
-    if (typeof value !== "string") return void 0;
-    const trimmed = value.trim();
-    if (!trimmed || trimmed.toLowerCase() === "none") return void 0;
-    return trimmed;
-  }
-  function normalizeFontSize(value) {
-    if (value == null) return null;
-    if (typeof value === "number") {
-      return Number.isFinite(value) ? value : null;
-    }
-    if (typeof value === "string") {
-      const trimmed = value.trim();
-      return trimmed.length ? trimmed : null;
-    }
-    return null;
-  }
-  function toNumber(value) {
-    if (typeof value === "number") {
-      return Number.isFinite(value) ? value : null;
-    }
-    if (typeof value === "string") {
-      const parsed = parseFloat(value);
-      return Number.isFinite(parsed) ? parsed : null;
-    }
-    return null;
-  }
-  function normalizeSize(value) {
-    if (!isPlainObject$4(value)) return null;
-    const obj = value;
-    const width = toNumber(obj.width);
-    const height = toNumber(obj.height);
-    if (width == null && height == null) return null;
-    const result = {};
-    if (width != null) result.width = width;
-    if (height != null) result.height = height;
-    return result;
-  }
-  function normalizeFieldAnnotationVariant(value) {
-    if (typeof value !== "string") return void 0;
-    const normalized = value.toLowerCase();
-    if (normalized === "text" || normalized === "image" || normalized === "signature" || normalized === "checkbox" || normalized === "html" || normalized === "link") {
-      return normalized;
-    }
-    return void 0;
-  }
-  function extractFormatting(attrs) {
-    const bold = toBoolean$2(attrs.bold, false);
-    const italic = toBoolean$2(attrs.italic, false);
-    const underline = toBoolean$2(attrs.underline, false);
-    const formatting = {};
-    if (bold) formatting.bold = true;
-    if (italic) formatting.italic = true;
-    if (underline) formatting.underline = true;
-    return Object.keys(formatting).length ? formatting : void 0;
-  }
-  function buildSdtCacheKey(nodeType, attrs, explicitKey) {
-    const provided = toOptionalString(explicitKey);
-    if (provided) {
-      return `${nodeType}:${provided}`;
-    }
-    const hash2 = toOptionalString(attrs.hash);
-    if (hash2) {
-      return `${nodeType}:${hash2}`;
-    }
-    const id = toOptionalString(attrs.id);
-    if (id) {
-      return `${nodeType}:${id}`;
-    }
-    return void 0;
-  }
   const DEFAULT_LIST_HANGING_PX = 18;
   const LIST_MARKER_GAP = 8;
   const DEFAULT_BULLET_GLYPH = "•";
@@ -88780,6 +88981,7 @@ ${l}
     definitions: {},
     abstracts: {}
   };
+  const ooxmlResolver = createOoxmlResolver({ pPr: translator$14, rPr: translator$1O });
   const hydrateParagraphStyleAttrs = (para, context, preResolved) => {
     if (!hasParagraphStyleContext(context)) {
       return null;
@@ -88807,7 +89009,7 @@ ${l}
       // should still get docDefaults spacing from style resolution
       numbering: context.numbering ?? EMPTY_NUMBERING_CONTEXT
     };
-    const resolved = resolveParagraphProperties(resolverParams, inlineProps);
+    const resolved = ooxmlResolver.resolveParagraphProperties(resolverParams, inlineProps);
     if (!resolved) {
       return null;
     }
@@ -88862,6 +89064,138 @@ ${l}
     }
     return { ...value };
   };
+  const buildCharacterStyleHydration = (resolved, docx) => {
+    const fontFamily2 = extractFontFamily(resolved.fontFamily, docx);
+    const fontSize2 = typeof resolved.fontSize === "number" ? resolved.fontSize : 20;
+    const color2 = extractColorValue(resolved.color);
+    const bold = normalizeBooleanProp(resolved.bold);
+    const italic = normalizeBooleanProp(resolved.italic);
+    const strike = normalizeBooleanProp(resolved.strike);
+    const underline = extractUnderline(resolved.underline);
+    const letterSpacing = typeof resolved.letterSpacing === "number" ? resolved.letterSpacing : void 0;
+    return {
+      fontFamily: fontFamily2,
+      fontSize: fontSize2,
+      color: color2,
+      bold,
+      italic,
+      strike,
+      underline,
+      letterSpacing
+    };
+  };
+  const hydrateCharacterStyleAttrs = (para, context, resolvedPpr) => {
+    if (!hasParagraphStyleContext(context)) {
+      return null;
+    }
+    const attrs = para.attrs ?? {};
+    const paragraphProps = typeof attrs.paragraphProperties === "object" && attrs.paragraphProperties !== null ? attrs.paragraphProperties : {};
+    const styleIdSource = attrs.styleId ?? paragraphProps.styleId;
+    const styleId = typeof styleIdSource === "string" && styleIdSource.trim() ? styleIdSource : null;
+    const inlineRpr = {};
+    const pprForChain = resolvedPpr ?? { styleId };
+    const numberingProps = attrs.numberingProperties ?? paragraphProps.numberingProperties;
+    if (numberingProps != null) {
+      pprForChain.numberingProperties = numberingProps;
+    }
+    const resolverParams = {
+      docx: context.docx,
+      numbering: context.numbering ?? EMPTY_NUMBERING_CONTEXT
+    };
+    let resolved = null;
+    try {
+      resolved = ooxmlResolver.resolveRunProperties(
+        resolverParams,
+        inlineRpr,
+        pprForChain,
+        false,
+        // not list number marker
+        false
+        // not numberingDefinedInline
+      );
+      if (!resolved || typeof resolved !== "object") {
+        return null;
+      }
+    } catch {
+      return null;
+    }
+    return buildCharacterStyleHydration(resolved, context.docx);
+  };
+  const hydrateMarkerStyleAttrs = (para, context, resolvedPpr) => {
+    if (!hasParagraphStyleContext(context)) {
+      return null;
+    }
+    const attrs = para.attrs ?? {};
+    const paragraphProps = typeof attrs.paragraphProperties === "object" && attrs.paragraphProperties !== null ? attrs.paragraphProperties : {};
+    const styleIdSource = attrs.styleId ?? paragraphProps.styleId;
+    const styleId = typeof styleIdSource === "string" && styleIdSource.trim() ? styleIdSource : null;
+    const inlineRpr = {};
+    const numberingProps = attrs.numberingProperties ?? paragraphProps.numberingProperties;
+    const numberingDefinedInline = numberingProps?.numId != null;
+    const pprForChain = resolvedPpr ? { ...resolvedPpr } : { styleId };
+    if (styleId && !pprForChain.styleId) {
+      pprForChain.styleId = styleId;
+    }
+    if (numberingProps != null) {
+      pprForChain.numberingProperties = numberingProps;
+    }
+    const resolverParams = {
+      docx: context.docx,
+      numbering: context.numbering ?? EMPTY_NUMBERING_CONTEXT
+    };
+    let resolved = null;
+    try {
+      resolved = ooxmlResolver.resolveRunProperties(
+        resolverParams,
+        inlineRpr,
+        pprForChain,
+        true,
+        numberingDefinedInline
+      );
+      if (!resolved || typeof resolved !== "object") {
+        return null;
+      }
+    } catch {
+      return null;
+    }
+    return buildCharacterStyleHydration(resolved, context.docx);
+  };
+  function extractFontFamily(fontFamily2, docx) {
+    if (!fontFamily2 || typeof fontFamily2 !== "object") return void 0;
+    const toCssFontFamily2 = SuperConverter.toCssFontFamily;
+    const resolved = resolveDocxFontFamily(fontFamily2, docx ?? null, toCssFontFamily2);
+    return resolved ?? void 0;
+  }
+  function extractColorValue(color2) {
+    if (!color2 || typeof color2 !== "object") return void 0;
+    const c2 = color2;
+    const val = c2.val;
+    if (typeof val !== "string") return void 0;
+    if (!val || val.toLowerCase() === "auto") return void 0;
+    return val;
+  }
+  function normalizeBooleanProp(value) {
+    if (value == null) return void 0;
+    if (typeof value === "boolean") return value;
+    if (typeof value === "number") return value !== 0;
+    if (typeof value === "string") {
+      const lower = value.toLowerCase();
+      if (lower === "0" || lower === "false" || lower === "off") return false;
+      if (lower === "1" || lower === "true" || lower === "on" || lower === "") return true;
+    }
+    return Boolean(value);
+  }
+  function extractUnderline(underline) {
+    if (!underline || typeof underline !== "object") return void 0;
+    const u = underline;
+    const type = u["w:val"] ?? u.type ?? u.val;
+    if (typeof type !== "string" || type === "none") return void 0;
+    const color2 = u["w:color"] ?? u.color;
+    return {
+      type,
+      color: typeof color2 === "string" ? color2 : void 0
+    };
+  }
   const { resolveSpacingIndent } = Engines;
   const DEFAULT_DECIMAL_SEPARATOR$2 = ".";
   const isValidNumberingId = (numId) => {
@@ -89377,7 +89711,7 @@ ${l}
     }
     return dropCapRun;
   };
-  const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleContext, _paragraphNode) => {
+  const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleContext, paragraphNode, converterContext, resolvedPpr) => {
     if (numberingProps === null) {
       return null;
     }
@@ -89415,7 +89749,23 @@ ${l}
           spacing: {}
         }
       };
-      let markerRun = numberingProps?.resolvedMarkerRpr;
+      let markerRun;
+      const markerHydration = paragraphNode && converterContext ? hydrateMarkerStyleAttrs(paragraphNode, converterContext, resolvedPpr) : null;
+      if (markerHydration) {
+        const resolvedColor = markerHydration.color ? `#${markerHydration.color.replace("#", "")}` : void 0;
+        markerRun = {
+          fontFamily: markerHydration.fontFamily ?? "Times New Roman",
+          fontSize: markerHydration.fontSize / 2,
+          // half-points to points
+          bold: markerHydration.bold,
+          italic: markerHydration.italic,
+          color: resolvedColor,
+          letterSpacing: markerHydration.letterSpacing != null ? twipsToPx$1(markerHydration.letterSpacing) : void 0
+        };
+      }
+      if (!markerRun) {
+        markerRun = numberingProps?.resolvedMarkerRpr;
+      }
       if (!markerRun) {
         const { character: characterStyle } = resolveStyle({ styleId: paragraphAttrs.styleId }, styleContext);
         if (characterStyle) {
@@ -89484,8 +89834,11 @@ ${l}
     const hydrated = hydrationOverride ?? hydrateParagraphStyleAttrs(para, converterContext);
     const mergedSpacing = mergeSpacingSources(hydrated?.spacing, paragraphProps.spacing, attrs.spacing);
     const normalizedSpacing = normalizeParagraphSpacing(mergedSpacing);
-    const indentSource = attrs.indent ?? paragraphProps.indent ?? hydrated?.indent;
-    const normalizedIndent = normalizePxIndent(indentSource) ?? normalizeParagraphIndent(indentSource ?? attrs.textIndent);
+    const normalizeIndentObject = (value) => {
+      if (!value || typeof value !== "object") return;
+      return normalizePxIndent(value) ?? convertIndentTwipsToPx(value);
+    };
+    const normalizedIndent = normalizeIndentObject(attrs.indent) ?? convertIndentTwipsToPx(paragraphProps.indent) ?? convertIndentTwipsToPx(hydrated?.indent) ?? normalizeParagraphIndent(attrs.textIndent);
     const unwrapTabStops = (tabStops) => {
       if (!Array.isArray(tabStops)) {
         return void 0;
@@ -89736,7 +90089,12 @@ ${l}
       const numId = numberingProps.numId;
       const ilvl = Number.isFinite(numberingProps.ilvl) ? Math.max(0, Math.floor(Number(numberingProps.ilvl))) : 0;
       const numericNumId = typeof numId === "number" ? numId : void 0;
-      const resolvedLevel = resolveNumberingFromContext(numId, ilvl, converterContext?.numbering);
+      let resolvedLevel;
+      try {
+        resolvedLevel = resolveNumberingFromContext(numId, ilvl, converterContext?.numbering);
+      } catch (error) {
+        resolvedLevel = void 0;
+      }
       if (resolvedLevel) {
         if (resolvedLevel.format && numberingProps.format == null) {
           numberingProps.format = resolvedLevel.format;
@@ -89797,7 +90155,19 @@ ${l}
           }
         }
       }
-      let wordLayout = computeWordLayoutForParagraph(paragraphAttrs, enrichedNumberingProps, styleContext);
+      let wordLayout = null;
+      try {
+        wordLayout = computeWordLayoutForParagraph(
+          paragraphAttrs,
+          enrichedNumberingProps,
+          styleContext,
+          para,
+          converterContext,
+          hydrated?.resolved
+        );
+      } catch (error) {
+        wordLayout = null;
+      }
       if (!wordLayout && enrichedNumberingProps.resolvedLevelIndent) {
         const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
         const baseIndent = resolvedIndentPx ?? enrichedNumberingProps.resolvedLevelIndent;
@@ -90342,7 +90712,7 @@ ${l}
   const H_ALIGN_VALUES$1 = /* @__PURE__ */ new Set(["left", "center", "right"]);
   const V_ALIGN_VALUES$1 = /* @__PURE__ */ new Set(["top", "center", "bottom"]);
   const getAttrs$1 = (node2) => {
-    return isPlainObject$5(node2.attrs) ? node2.attrs : {};
+    return isPlainObject$4(node2.attrs) ? node2.attrs : {};
   };
   const normalizeWrapType$1 = (value) => {
     if (typeof value !== "string") return void 0;
@@ -90365,7 +90735,7 @@ ${l}
     return polygon.length > 0 ? polygon : void 0;
   };
   const normalizeWrap$2 = (value) => {
-    if (!isPlainObject$5(value)) {
+    if (!isPlainObject$4(value)) {
       return void 0;
     }
     const type = normalizeWrapType$1(value.type);
@@ -90373,7 +90743,7 @@ ${l}
       return void 0;
     }
     const wrap2 = { type };
-    const attrs = isPlainObject$5(value.attrs) ? value.attrs : {};
+    const attrs = isPlainObject$4(value.attrs) ? value.attrs : {};
     const wrapText = normalizeWrapText$1(attrs.wrapText);
     if (wrapText) {
       wrap2.wrapText = wrapText;
@@ -90390,7 +90760,7 @@ ${l}
     if (polygon) {
       wrap2.polygon = polygon;
     }
-    const behindDoc = toBoolean$3(attrs.behindDoc);
+    const behindDoc = toBoolean$2(attrs.behindDoc);
     if (behindDoc != null) {
       wrap2.behindDoc = behindDoc;
     }
@@ -90405,10 +90775,10 @@ ${l}
     return allowed.has(value) ? value : void 0;
   };
   const normalizeAnchorData$1 = (value, attrs, wrapBehindDoc) => {
-    const raw = isPlainObject$5(value) ? value : void 0;
-    const marginOffset = isPlainObject$5(attrs.marginOffset) ? attrs.marginOffset : void 0;
-    const simplePos = isPlainObject$5(attrs.simplePos) ? attrs.simplePos : void 0;
-    const originalAttrs = isPlainObject$5(attrs.originalAttributes) ? attrs.originalAttributes : void 0;
+    const raw = isPlainObject$4(value) ? value : void 0;
+    const marginOffset = isPlainObject$4(attrs.marginOffset) ? attrs.marginOffset : void 0;
+    const simplePos = isPlainObject$4(attrs.simplePos) ? attrs.simplePos : void 0;
+    const originalAttrs = isPlainObject$4(attrs.originalAttributes) ? attrs.originalAttributes : void 0;
     const isAnchored = attrs.isAnchor === true || Boolean(raw);
     const anchor = {};
     if (isAnchored) {
@@ -90426,7 +90796,7 @@ ${l}
     if (offsetH != null) anchor.offsetH = offsetH;
     const offsetV = pickNumber(marginOffset?.top ?? marginOffset?.vertical ?? raw?.offsetV ?? simplePos?.y);
     if (offsetV != null) anchor.offsetV = offsetV;
-    const behindDoc = toBoolean$3(raw?.behindDoc ?? wrapBehindDoc ?? originalAttrs?.behindDoc);
+    const behindDoc = toBoolean$2(raw?.behindDoc ?? wrapBehindDoc ?? originalAttrs?.behindDoc);
     if (behindDoc != null) anchor.behindDoc = behindDoc;
     const hasData = anchor.isAnchored || anchor.hRelativeFrom != null || anchor.vRelativeFrom != null || anchor.alignH != null || anchor.alignV != null || anchor.offsetH != null || anchor.offsetV != null || anchor.behindDoc != null;
     return hasData ? anchor : void 0;
@@ -90551,7 +90921,7 @@ ${l}
     }
   }
   const getAttrs = (node2) => {
-    return isPlainObject$5(node2.attrs) ? { ...node2.attrs } : {};
+    return isPlainObject$4(node2.attrs) ? { ...node2.attrs } : {};
   };
   const parseFullWidth = (value) => {
     if (typeof value === "string") {
@@ -90570,7 +90940,7 @@ ${l}
     if (rawAttrs.horizontalRule !== true) {
       return null;
     }
-    const size2 = isPlainObject$5(rawAttrs.size) ? rawAttrs.size : void 0;
+    const size2 = isPlainObject$4(rawAttrs.size) ? rawAttrs.size : void 0;
     const { width, isFullWidth } = parseFullWidth(size2?.width);
     const height = pickNumber(size2?.height);
     if (!height || height <= 0) {
@@ -90772,6 +91142,9 @@ ${l}
     return null;
   };
   const DEFAULT_IMAGE_DIMENSION_PX = 100;
+  const HALF_POINTS_PER_POINT = 2;
+  const SCREEN_DPI = 96;
+  const POINT_DPI = 72;
   function isInlineImage(node2) {
     const attrs = node2.attrs ?? {};
     const wrap2 = attrs.wrap;
@@ -90799,8 +91172,8 @@ ${l}
     const size2 = attrs.size ?? {};
     const width = typeof size2.width === "number" && Number.isFinite(size2.width) && size2.width > 0 ? size2.width : DEFAULT_IMAGE_DIMENSION_PX;
     const height = typeof size2.height === "number" && Number.isFinite(size2.height) && size2.height > 0 ? size2.height : DEFAULT_IMAGE_DIMENSION_PX;
-    const wrap2 = isPlainObject$5(attrs.wrap) ? attrs.wrap : {};
-    const wrapAttrs = isPlainObject$5(wrap2.attrs) ? wrap2.attrs : {};
+    const wrap2 = isPlainObject$4(attrs.wrap) ? attrs.wrap : {};
+    const wrapAttrs = isPlainObject$4(wrap2.attrs) ? wrap2.attrs : {};
     const run2 = {
       kind: "image",
       src,
@@ -91010,15 +91383,6 @@ ${l}
     if (defaults2.letterSpacing != null && run2.letterSpacing == null) {
       run2.letterSpacing = defaults2.letterSpacing;
     }
-    if (defaults2.bold && run2.bold === void 0) {
-      run2.bold = true;
-    }
-    if (defaults2.italic && run2.italic === void 0) {
-      run2.italic = true;
-    }
-    if (defaults2.underline && !run2.underline) {
-      run2.underline = defaults2.underline;
-    }
   };
   function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converters, converterContext) {
     const baseBlockId = nextBlockId("paragraph");
@@ -91027,28 +91391,48 @@ ${l}
     const paragraphHydration = converterContext ? hydrateParagraphStyleAttrs(para, converterContext) : null;
     let baseRunDefaults = {};
     try {
-      const spacingSource = para.attrs?.spacing !== void 0 ? para.attrs.spacing : paragraphProps.spacing !== void 0 ? paragraphProps.spacing : paragraphHydration?.spacing;
-      const indentSource = para.attrs?.indent ?? paragraphProps.indent ?? paragraphHydration?.indent;
-      const normalizedSpacing = normalizeParagraphSpacing(spacingSource);
-      const normalizedIndent = normalizePxIndent(indentSource) ?? normalizeParagraphIndent(indentSource ?? para.attrs?.textIndent);
-      const styleNodeAttrs = paragraphHydration?.tabStops && !para.attrs?.tabStops && !para.attrs?.tabs ? { ...para.attrs ?? {}, tabStops: paragraphHydration.tabStops } : para.attrs ?? {};
-      const styleNode = buildStyleNodeFromAttrs(styleNodeAttrs, normalizedSpacing, normalizedIndent);
-      if (styleNodeAttrs.styleId == null && paragraphProps.styleId) {
-        styleNode.styleId = paragraphProps.styleId;
-      }
-      const resolved = resolveStyle(styleNode, styleContext);
-      baseRunDefaults = {
-        fontFamily: resolved.character.font?.family,
-        fontSizePx: ptToPx(resolved.character.font?.size),
-        color: resolved.character.color,
-        bold: resolved.character.font?.weight != null ? resolved.character.font.weight >= 600 : void 0,
-        italic: resolved.character.font?.italic,
-        underline: resolved.character.underline ? {
-          style: resolved.character.underline.style,
-          color: resolved.character.underline.color
-        } : void 0,
-        letterSpacing: ptToPx(resolved.character.letterSpacing)
-      };
+      const charHydration = converterContext ? hydrateCharacterStyleAttrs(para, converterContext, paragraphHydration?.resolved) : null;
+      if (charHydration) {
+        const fontSizePx = charHydration.fontSize / HALF_POINTS_PER_POINT * (SCREEN_DPI / POINT_DPI);
+        baseRunDefaults = {
+          fontFamily: charHydration.fontFamily,
+          fontSizePx,
+          color: charHydration.color ? `#${charHydration.color.replace("#", "")}` : void 0,
+          bold: charHydration.bold,
+          italic: charHydration.italic,
+          underline: charHydration.underline ? {
+            style: charHydration.underline.type,
+            color: charHydration.underline.color
+          } : void 0,
+          letterSpacing: charHydration.letterSpacing != null ? twipsToPx$1(charHydration.letterSpacing) : void 0
+        };
+      } else {
+        const spacingSource = para.attrs?.spacing !== void 0 ? para.attrs.spacing : paragraphProps.spacing !== void 0 ? paragraphProps.spacing : paragraphHydration?.spacing;
+        const normalizeIndentObject = (value) => {
+          if (!value || typeof value !== "object") return;
+          return normalizePxIndent(value) ?? convertIndentTwipsToPx$1(value);
+        };
+        const normalizedSpacing = normalizeParagraphSpacing(spacingSource);
+        const normalizedIndent = normalizeIndentObject(para.attrs?.indent) ?? convertIndentTwipsToPx$1(paragraphProps.indent) ?? convertIndentTwipsToPx$1(paragraphHydration?.indent) ?? normalizeParagraphIndent(para.attrs?.textIndent);
+        const styleNodeAttrs = paragraphHydration?.tabStops && !para.attrs?.tabStops && !para.attrs?.tabs ? { ...para.attrs ?? {}, tabStops: paragraphHydration.tabStops } : para.attrs ?? {};
+        const styleNode = buildStyleNodeFromAttrs(styleNodeAttrs, normalizedSpacing, normalizedIndent);
+        if (styleNodeAttrs.styleId == null && paragraphProps.styleId) {
+          styleNode.styleId = paragraphProps.styleId;
+        }
+        const resolved = resolveStyle(styleNode, styleContext);
+        baseRunDefaults = {
+          fontFamily: resolved.character.font?.family,
+          fontSizePx: ptToPx(resolved.character.font?.size),
+          color: resolved.character.color,
+          bold: resolved.character.font?.weight != null ? resolved.character.font.weight >= 600 : void 0,
+          italic: resolved.character.font?.italic,
+          underline: resolved.character.underline ? {
+            style: resolved.character.underline.style,
+            color: resolved.character.underline.color
+          } : void 0,
+          letterSpacing: ptToPx(resolved.character.letterSpacing)
+        };
+      }
     } catch {
       baseRunDefaults = {};
     }
@@ -92750,6 +93134,9 @@ ${l}
   };
   const onHeaderFooterDataUpdate = async ({ editor, transaction }, mainEditor, sectionId, type) => {
     if (!type || !sectionId) return;
+    if (isApplyingRemoteHeaderFooterChanges()) {
+      return;
+    }
     const updatedData = editor.getUpdatedJson();
     const editorsList = mainEditor.converter[`${type}Editors`];
     if (Array.isArray(editorsList)) {
@@ -92773,6 +93160,7 @@ ${l}
     if (editor.docChanged && mainEditor.converter) {
       mainEditor.converter.headerFooterModified = true;
     }
+    pushHeaderFooterToYjs(mainEditor, type, sectionId, updatedData);
     await updateYdocDocxData(mainEditor);
   };
   const setEditorToolbar = ({ editor }, mainEditor) => {
@@ -94599,7 +94987,8 @@ ${l}
         const originX = currentLine.width;
         const { target, nextIndex, stop } = getNextTabStopPx(currentLine.width, tabStops, tabStopCursor);
         tabStopCursor = nextIndex;
-        const tabAdvance = Math.max(0, target - currentLine.width);
+        const clampedTarget = Math.min(target, currentLine.maxWidth);
+        const tabAdvance = Math.max(0, clampedTarget - currentLine.width);
         currentLine.width = roundValue(currentLine.width + tabAdvance);
         run2.width = tabAdvance;
         currentLine.maxFontSize = Math.max(currentLine.maxFontSize, 12);
@@ -94607,14 +94996,14 @@ ${l}
         currentLine.toChar = 1;
         if (stop) {
           validateTabStopVal(stop);
-          pendingTabAlignment = { target, val: stop.val };
+          pendingTabAlignment = { target: clampedTarget, val: stop.val };
         } else {
           pendingTabAlignment = null;
         }
         if (stop && stop.leader && stop.leader !== "none") {
           const leaderStyle = stop.leader;
-          const from2 = Math.min(originX, target);
-          const to = Math.max(originX, target);
+          const from2 = Math.min(originX, clampedTarget);
+          const to = Math.max(originX, clampedTarget);
           if (!currentLine.leaders) currentLine.leaders = [];
           currentLine.leaders.push({ from: from2, to, style: leaderStyle });
         }
@@ -95209,7 +95598,8 @@ ${l}
           const originX = currentLine.width;
           const { target, nextIndex, stop } = getNextTabStopPx(currentLine.width, tabStops, tabStopCursor);
           tabStopCursor = nextIndex;
-          const tabAdvance = Math.max(0, target - currentLine.width);
+          const clampedTarget = Math.min(target, currentLine.maxWidth);
+          const tabAdvance = Math.max(0, clampedTarget - currentLine.width);
           currentLine.width = roundValue(currentLine.width + tabAdvance);
           currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
           currentLine.maxFontSize = Math.max(currentLine.maxFontSize, run2.fontSize);
@@ -95218,14 +95608,14 @@ ${l}
           charPosInRun += 1;
           if (stop) {
             validateTabStopVal(stop);
-            pendingTabAlignment = { target, val: stop.val };
+            pendingTabAlignment = { target: clampedTarget, val: stop.val };
           } else {
             pendingTabAlignment = null;
           }
           if (stop && stop.leader && stop.leader !== "none" && stop.leader !== "middleDot") {
             const leaderStyle = stop.leader;
-            const from2 = Math.min(originX, target);
-            const to = Math.max(originX, target);
+            const from2 = Math.min(originX, clampedTarget);
+            const to = Math.max(originX, clampedTarget);
             if (!currentLine.leaders) currentLine.leaders = [];
             currentLine.leaders.push({ from: from2, to, style: leaderStyle });
           }
@@ -97619,6 +98009,17 @@ ${l}
         event: "collaborationReady",
         handler: handleCollaborationReady
       });
+      const handleRemoteHeaderFooterChanged = (payload) => {
+        this.#headerFooterAdapter?.invalidate(payload.sectionId);
+        this.#headerFooterManager?.refresh();
+        this.#pendingDocChange = true;
+        this.#scheduleRerender();
+      };
+      this.#editor.on("remoteHeaderFooterChanged", handleRemoteHeaderFooterChanged);
+      this.#editorListeners.push({
+        event: "remoteHeaderFooterChanged",
+        handler: handleRemoteHeaderFooterChanged
+      });
     }
     /**
      * Setup awareness event subscriptions for remote cursor tracking.
@@ -103734,16 +104135,112 @@ ${l}
     });
     return mergeRanges$2(mapped, docSize);
   };
-  const buildWrapTransaction = (state, ranges, runType) => {
+  const getParagraphAtPos = (doc2, pos) => {
+    try {
+      const $pos = doc2.resolve(pos);
+      for (let depth = $pos.depth; depth >= 0; depth--) {
+        const node2 = $pos.node(depth);
+        if (node2.type.name === "paragraph") {
+          return node2;
+        }
+      }
+    } catch (_e2) {
+    }
+    return null;
+  };
+  const resolveRunPropertiesFromParagraphStyle = (paragraphNode, editor) => {
+    if (!paragraphNode || !editor?.converter) return {};
+    const styleId = paragraphNode.attrs?.paragraphProperties?.styleId;
+    if (!styleId) return {};
+    try {
+      const params2 = { docx: editor.converter.convertedXml, numbering: editor.converter.numbering };
+      const resolvedPpr = { styleId };
+      const runProps = resolveRunProperties(params2, {}, resolvedPpr, false, false);
+      const runProperties = {};
+      if (runProps.fontFamily) {
+        const fontValue = runProps.fontFamily.ascii || runProps.fontFamily;
+        if (fontValue) {
+          runProperties.fontFamily = typeof fontValue === "string" ? fontValue : fontValue.ascii;
+        }
+      }
+      if (runProps.fontSize) {
+        runProperties.fontSize = `${runProps.fontSize / 2}pt`;
+      }
+      if (runProps.bold) runProperties.bold = true;
+      if (runProps.italic) runProperties.italic = true;
+      if (runProps.underline) runProperties.underline = runProps.underline;
+      if (runProps.strike) runProperties.strike = true;
+      return runProperties;
+    } catch (_e2) {
+      return {};
+    }
+  };
+  const createMarksFromDefs = (schema, markDefs = []) => markDefs.map((def2) => {
+    const markType = schema.marks[def2.type];
+    return markType ? markType.create(def2.attrs) : null;
+  }).filter(Boolean);
+  const createMarkDefsFromStyleRunProps = (styleRunProps) => {
+    const markDefs = [];
+    const textStyleAttrs = {};
+    if (styleRunProps.fontSize) {
+      textStyleAttrs.fontSize = styleRunProps.fontSize;
+    }
+    if (styleRunProps.fontFamily) {
+      textStyleAttrs.fontFamily = styleRunProps.fontFamily;
+    }
+    if (Object.keys(textStyleAttrs).length > 0) {
+      markDefs.push({ type: "textStyle", attrs: textStyleAttrs });
+    }
+    if (styleRunProps.bold) {
+      markDefs.push({ type: "bold", attrs: { value: true } });
+    }
+    if (styleRunProps.italic) {
+      markDefs.push({ type: "italic", attrs: { value: true } });
+    }
+    if (styleRunProps.strike) {
+      markDefs.push({ type: "strike", attrs: { value: true } });
+    }
+    if (styleRunProps.underline) {
+      const underlineType = styleRunProps.underline["w:val"];
+      if (underlineType) {
+        let underlineColor = styleRunProps.underline["w:color"];
+        if (underlineColor && underlineColor.toLowerCase() !== "auto" && !underlineColor.startsWith("#")) {
+          underlineColor = `#${underlineColor}`;
+        }
+        markDefs.push({
+          type: "underline",
+          attrs: { underlineType, underlineColor }
+        });
+      }
+    }
+    return markDefs;
+  };
+  const buildWrapTransaction = (state, ranges, runType, editor, markDefsFromMeta = []) => {
     if (!ranges.length) return null;
     const replacements = [];
+    const metaStyleMarks = createMarksFromDefs(state.schema, markDefsFromMeta);
     ranges.forEach(({ from: from2, to }) => {
       state.doc.nodesBetween(from2, to, (node2, pos, parent, index2) => {
         if (!node2.isText || !parent || parent.type === runType) return;
         const match = parent.contentMatchAt ? parent.contentMatchAt(index2) : null;
         if (match && !match.matchType(runType)) return;
         if (!match && !parent.type.contentMatch.matchType(runType)) return;
-        const runProperties = decodeRPrFromMarks(node2.marks);
+        let runProperties = decodeRPrFromMarks(node2.marks);
+        if ((!node2.marks || node2.marks.length === 0) && editor?.converter) {
+          const paragraphNode = getParagraphAtPos(state.doc, pos);
+          const styleRunProps = resolveRunPropertiesFromParagraphStyle(paragraphNode, editor);
+          if (Object.keys(styleRunProps).length > 0) {
+            runProperties = styleRunProps;
+            const markDefs = metaStyleMarks.length ? markDefsFromMeta : createMarkDefsFromStyleRunProps(styleRunProps);
+            const styleMarks = metaStyleMarks.length ? metaStyleMarks : createMarksFromDefs(state.schema, markDefs);
+            if (styleMarks.length && typeof state.schema.text === "function") {
+              const textNode = state.schema.text(node2.text || "", styleMarks);
+              if (textNode) {
+                node2 = textNode;
+              }
+            }
+          }
+        }
         const runNode = runType.create({ runProperties }, node2);
         replacements.push({ from: pos, to: pos + node2.nodeSize, runNode });
       });
@@ -103753,9 +104250,10 @@ ${l}
     replacements.sort((a2, b2) => b2.from - a2.from).forEach(({ from: from2, to, runNode }) => tr.replaceWith(from2, to, runNode));
     return tr.docChanged ? tr : null;
   };
-  const wrapTextInRunsPlugin = () => {
+  const wrapTextInRunsPlugin = (editor) => {
     let view = null;
     let pendingRanges = [];
+    let lastStyleMarksMeta = [];
     const flush = () => {
       if (!view) return;
       const runType = view.state.schema.nodes.run;
@@ -103763,7 +104261,7 @@ ${l}
         pendingRanges = [];
         return;
       }
-      const tr = buildWrapTransaction(view.state, pendingRanges, runType);
+      const tr = buildWrapTransaction(view.state, pendingRanges, runType, editor, lastStyleMarksMeta);
       pendingRanges = [];
       if (tr) {
         view.dispatch(tr);
@@ -103782,6 +104280,7 @@ ${l}
             editorView.dom.removeEventListener("compositionend", onCompositionEnd2);
             view = null;
             pendingRanges = [];
+            lastStyleMarksMeta = [];
           }
         };
       },
@@ -103795,7 +104294,11 @@ ${l}
         if (view?.composing) {
           return null;
         }
-        const tr = buildWrapTransaction(newState, pendingRanges, runType);
+        const latestStyleMarksMeta = [...transactions].reverse().find((tr2) => tr2.getMeta && tr2.getMeta("sdStyleMarks"))?.getMeta("sdStyleMarks") || lastStyleMarksMeta;
+        if (latestStyleMarksMeta && latestStyleMarksMeta.length) {
+          lastStyleMarksMeta = latestStyleMarksMeta;
+        }
+        const tr = buildWrapTransaction(newState, pendingRanges, runType, editor, latestStyleMarksMeta);
         pendingRanges = [];
         return tr;
       }
@@ -104058,7 +104561,7 @@ ${l}
     },
     addPmPlugins() {
       return [
-        wrapTextInRunsPlugin(),
+        wrapTextInRunsPlugin(this.editor),
         splitRunsAfterMarkPlugin,
         calculateInlineRunPropertiesPlugin(this.editor),
         cleanupEmptyRunsPlugin
@@ -143192,7 +143695,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.3.0-next.2";
+      this.version = "1.3.0-next.4";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;