@harbour-enterprises/superdoc 1.3.0-next.1 → 1.3.0-next.11

package/dist/chunks/{SuperConverter-BXP6NikG.es.js → SuperConverter-Caxoktb7.es.js}

@@ -7489,134 +7489,200 @@ const INLINE_OVERRIDE_PROPERTIES = [
   "italic",
   "strike",
   "underline",
-  "letterSpacing",
-  "vertAlign",
-  "position"
+  "letterSpacing"
 ];
 const DEFAULT_FONT_SIZE_HALF_POINTS = 20;
-const SUBSCRIPT_SUPERSCRIPT_SCALE = 0.65;
-const resolveRunProperties = (params, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => {
+function isObject(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 merge = (target, source) => {
+    const output = { ...target };
+    if (isObject(target) && isObject(source)) {
+      for (const key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          const handler2 = specialHandling[key];
+          if (handler2 && typeof handler2 === "function") {
+            output[key] = handler2(output, source);
+          } else if (!fullOverrideProps.includes(key) && isObject(source[key])) {
+            if (key in target && isObject(target[key])) {
+              output[key] = merge(target[key], source[key]);
+            } else {
+              output[key] = source[key];
+            }
+          } else {
+            output[key] = source[key];
+          }
+        }
+      }
+    }
+    return output;
+  };
+  return propertiesArray.reduce((acc, current) => merge(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, defaultProps, normalProps) {
+  if (isValidFontSize(value)) {
+    return value;
+  }
+  if (defaultProps && isValidFontSize(defaultProps.fontSize)) {
+    return defaultProps.fontSize;
+  }
+  if (normalProps && isValidFontSize(normalProps.fontSize)) {
+    return normalProps.fontSize;
+  }
+  return DEFAULT_FONT_SIZE_HALF_POINTS;
+}
+function orderDefaultsAndNormal(defaultProps, normalProps, isNormalDefault) {
+  if (isNormalDefault) {
+    return [defaultProps, normalProps];
+  } else {
+    return [normalProps, defaultProps];
+  }
+}
+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: (params, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => resolveRunProperties$1(translators, params, inlineRpr, resolvedPpr, isListNumber, numberingDefinedInline),
+    resolveParagraphProperties: (params, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) => resolveParagraphProperties$1(translators, params, inlineProps, insideTable, overrideInlineStyleId, tableStyleId),
+    getDefaultProperties,
+    getStyleProperties,
+    resolveStyleChain,
+    getNumberingProperties: (params, ilvl, numId, translator2, tries = 0) => getNumberingProperties(translators, params, ilvl, numId, translator2, tries)
+  };
+}
+function resolveRunProperties$1(translators, params, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) {
   const paragraphStyleId = resolvedPpr?.styleId;
-  const paragraphStyleProps = resolveStyleChain(params, paragraphStyleId, translator$1O);
-  const defaultProps = getDefaultProperties(params, translator$1O);
-  const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params, "Normal", translator$1O);
+  const paragraphStyleProps = resolveStyleChain(params, paragraphStyleId, translators.rPr);
+  const defaultProps = getDefaultProperties(params, translators.rPr);
+  const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params, "Normal", translators.rPr);
   let runStyleProps = {};
   if (!paragraphStyleId?.startsWith("TOC")) {
-    runStyleProps = inlineRpr.styleId ? resolveStyleChain(params, inlineRpr.styleId, translator$1O) : {};
+    runStyleProps = inlineRpr?.styleId ? resolveStyleChain(params, inlineRpr.styleId, translators.rPr) : {};
   }
+  const defaultsChain = orderDefaultsAndNormal(defaultProps, normalProps, isNormalDefault);
+  const inlineRprSafe = inlineRpr ?? {};
   let styleChain;
-  if (isNormalDefault) {
-    styleChain = [defaultProps, normalProps];
-  } else {
-    styleChain = [normalProps, defaultProps];
-  }
+  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,
         params,
-        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 (defaultProps?.fontSize != null && typeof defaultProps.fontSize === "number" && Number.isFinite(defaultProps.fontSize) && defaultProps.fontSize > 0) {
-      defaultFontSize = defaultProps.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, defaultProps, normalProps);
   return finalProps;
-};
-function resolveParagraphProperties(params, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
-  const defaultProps = getDefaultProperties(params, translator$14);
-  const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params, "Normal", translator$14);
-  let styleId = inlineProps?.styleId;
-  let styleProps = inlineProps?.styleId ? resolveStyleChain(params, inlineProps?.styleId, translator$14) : {};
+}
+function resolveParagraphProperties$1(translators, params, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
+  const defaultProps = getDefaultProperties(params, translators.pPr);
+  const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params, "Normal", translators.pPr);
+  const inlinePropsSafe = inlineProps ?? {};
+  let styleId = inlinePropsSafe?.styleId;
+  let styleProps = inlinePropsSafe?.styleId ? resolveStyleChain(params, 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(params, ilvl, numId, translator$14);
+    const ilvlNum = ilvl != null ? ilvl : 0;
+    numberingProps = getNumberingProperties(translators, params, ilvlNum, numId, translators.pPr);
     if (overrideInlineStyleId && numberingProps.styleId) {
       styleId = numberingProps.styleId;
-      styleProps = resolveStyleChain(params, 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(params, 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(params, tableStyleId, translator$14) : {};
-  let defaultsChain;
-  if (isNormalDefault) {
-    defaultsChain = [defaultProps, normalProps];
-  } else {
-    defaultsChain = [normalProps, defaultProps];
-  }
-  const propsChain = [...defaultsChain, tableProps, numberingProps, styleProps, inlineProps];
+  const tableProps = tableStyleId ? resolveStyleChain(params, tableStyleId, translators.pPr) : {};
+  const defaultsChain = orderDefaultsAndNormal(defaultProps, 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(params, styleId, translator$14, false);
-      indentChain = [...defaultsChain, numberingProps, styleProps, inlineProps];
+      styleProps = resolveStyleChain(params, 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 = (params, styleId, translator2, followBasedOnChain = true) => {
-  let styleProps = {}, basedOn = null;
+function resolveStyleChain(params, styleId, translator2, followBasedOnChain = true) {
+  let styleProps = {};
+  let basedOn = void 0;
   if (styleId && styleId !== "Normal") {
     ({ properties: styleProps, basedOn } = getStyleProperties(params, styleId, translator2));
   }
@@ -7628,7 +7694,7 @@ const resolveStyleChain = (params, styleId, translator2, followBasedOnChain = tr
       break;
     }
     seenStyles.add(basedOn);
-    const result = getStyleProperties(params, basedOn, translator2);
+    const result = getStyleProperties(params, nextBasedOn, translator2);
     const basedOnProps = result.properties;
     nextBasedOn = result.basedOn;
     if (basedOnProps && Object.keys(basedOnProps).length) {
@@ -7637,120 +7703,151 @@ const resolveStyleChain = (params, styleId, translator2, followBasedOnChain = tr
     basedOn = nextBasedOn;
   }
   styleChain = styleChain.reverse();
-  const combinedStyleProps = combineProperties(styleChain);
-  return combinedStyleProps;
-};
+  return combineProperties$1(styleChain);
+}
 function getDefaultProperties(params, translator2) {
-  const { docx } = params;
-  const styles = docx["word/styles.xml"];
+  const docx = params?.docx;
+  const styles = docx?.["word/styles.xml"];
   const rootElements = styles?.elements?.[0]?.elements;
   if (!rootElements?.length) {
     return {};
   }
   const defaults = rootElements.find((el) => el.name === "w:docDefaults");
   const xmlName = translator2.xmlName;
-  const elementPrDefault = defaults?.elements?.find((el) => el.name === `${xmlName}Default`) || {};
-  const elementPr = elementPrDefault?.elements?.find((el) => el.name === xmlName);
+  const defaultsElements = defaults?.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({ ...params, nodes: [elementPr] }) || {};
-  return result;
+  return translator2.encode({ ...params, nodes: [elementPr] }) || {};
 }
 function getStyleProperties(params, styleId, translator2) {
-  const { docx } = params;
-  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 = params?.docx;
+  const styles = docx?.["word/styles.xml"];
   const rootElements = styles?.elements?.[0]?.elements;
   if (!rootElements?.length) {
     return emptyResult;
   }
-  const style = rootElements.find((el) => el.name === "w:style" && el.attributes["w:styleId"] === styleId);
-  let basedOn = style?.elements?.find((el) => el.name === "w:basedOn");
-  if (basedOn) {
-    basedOn = basedOn?.attributes?.["w:val"];
-  }
-  const elementPr = style?.elements?.find((el) => el.name === translator2.xmlName);
+  const style = rootElements.find(
+    (el) => el.name === "w:style" && el.attributes?.["w:styleId"] === styleId
+  );
+  const styleElements = style?.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({ ...params, nodes: [elementPr] }) || {};
-  return { properties: result, isDefault: style?.attributes?.["w:default"] === "1", basedOn };
+  const isDefault = style?.attributes?.["w:default"] === "1";
+  return { properties: result, isDefault, basedOn };
 }
-function getNumberingProperties(params, ilvl, numId, translator2, tries = 0) {
-  const { numbering: allDefinitions } = params;
-  if (!allDefinitions) return {};
-  const { definitions, abstracts } = allDefinitions;
+function getNumberingProperties(translators, params, ilvl, numId, translator2, tries = 0) {
+  const numbering = params?.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(
-    (element) => element.name === "w:lvlOverride" && element.attributes["w:ilvl"] == ilvl
+  const numDefElements = numDefinition.elements;
+  const lvlOverride = numDefElements?.find(
+    (element) => element.name === "w:lvlOverride" && element.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({ ...params, 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(params, styleId, translator$14);
-    if (styleProps?.numberingProperties?.numId) {
-      return getNumberingProperties(params, ilvl, styleProps.numberingProperties.numId, translator2, tries + 1);
+    const { properties: styleProps } = getStyleProperties(params, styleId, translators.pPr);
+    const numIdFromStyle = styleProps?.numberingProperties?.numId;
+    if (numIdFromStyle) {
+      return getNumberingProperties(
+        translators,
+        params,
+        ilvl,
+        numIdFromStyle,
+        translator2,
+        tries + 1
+      );
     }
   }
-  const levelDefinition = listDefinitionForThisNumId?.elements?.find(
-    (element) => element.name === "w:lvl" && element.attributes["w:ilvl"] == ilvl
+  const levelDefinition = listDefElements?.find(
+    (element) => element.name === "w:lvl" && element.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({ ...params, 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 {};
-  }
-  const isObject = (item) => item && typeof item === "object" && !Array.isArray(item);
-  const merge = (target, source) => {
-    const output = { ...target };
-    if (isObject(target) && isObject(source)) {
-      for (const key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          if (!fullOverrideProps.includes(key) && isObject(source[key])) {
-            if (key in target && isObject(target[key])) {
-              output[key] = merge(target[key], source[key]);
-            } else {
-              output[key] = source[key];
-            }
-          } else {
-            const handler2 = specialHandling[key];
-            if (handler2 && typeof handler2 === "function") {
-              output[key] = handler2(output, source);
-            } else {
-              output[key] = source[key];
-            }
-          }
-        }
-      }
+function resolveDocxFontFamily(attributes, docx, toCssFontFamily) {
+  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 prefix = themeAscii.startsWith("minor") ? "minor" : "major";
+      const font = fontSchemeElements?.find((el) => el.name === `a:${prefix}Font`);
+      const fontElements = font?.elements;
+      const latin = fontElements?.find((el) => el.name === "a:latin");
+      const typeface = latin?.attributes?.typeface;
+      resolved = typeface || resolved;
     }
-    return output;
-  };
-  return propertiesArray.reduce((acc, current) => merge(acc, current), {});
+  }
+  if (!resolved) return null;
+  if (toCssFontFamily) {
+    return toCssFontFamily(resolved, docx ?? void 0);
+  }
+  return resolved;
+}
+const ooxmlResolver = createOoxmlResolver({ pPr: translator$14, rPr: translator$1O });
+const getToCssFontFamily = () => {
+  return SuperConverter.toCssFontFamily;
+};
+const SUBSCRIPT_SUPERSCRIPT_SCALE = 0.65;
+const resolveRunProperties = (params, inlineRpr, resolvedPpr, isListNumber = false, numberingDefinedInline = false) => ooxmlResolver.resolveRunProperties(params, inlineRpr, resolvedPpr, isListNumber, numberingDefinedInline);
+function resolveParagraphProperties(params, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
+  return ooxmlResolver.resolveParagraphProperties(
+    params,
+    inlineProps,
+    insideTable,
+    overrideInlineStyleId,
+    tableStyleId
+  );
+}
+const combineProperties = (propertiesArray, fullOverrideProps = [], specialHandling = {}) => {
+  return combineProperties$1(propertiesArray, { fullOverrideProps, specialHandling });
 };
 const combineRunProperties = (propertiesArray) => {
   return combineProperties(propertiesArray, ["fontFamily", "color"]);
@@ -7809,9 +7906,9 @@ function encodeMarksFromRPr(runProperties, docx) {
         textStyleAttrs[key] = `${spacing}pt`;
         break;
       case "fontFamily":
-        const fontFamily = getFontFamilyValue$1(value, docx);
+        const fontFamily = resolveDocxFontFamily(value, docx, getToCssFontFamily());
         textStyleAttrs[key] = fontFamily;
-        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 (!fontFamily || eastAsiaCss !== textStyleAttrs.fontFamily) {
@@ -8066,11 +8163,11 @@ function encodeCSSFromRPr(runProperties, docx) {
       }
       case "fontFamily": {
         if (!value) break;
-        const fontFamily = getFontFamilyValue$1(value, docx);
+        const fontFamily = resolveDocxFontFamily(value, docx, getToCssFontFamily());
         if (fontFamily) {
           css["font-family"] = fontFamily;
         }
-        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 && (!fontFamily || eastAsiaCss !== fontFamily)) {
@@ -9417,6 +9514,9 @@ function handleTableCellNode({
   columnIndex,
   columnWidth = null,
   allColumnWidths = [],
+  rowIndex = 0,
+  totalRows = 1,
+  totalColumns,
   _referencedStyles
 }) {
   const { nodeListHandler } = params;
@@ -9425,19 +9525,46 @@ function handleTableCellNode({
   const tcPr = node.elements.find((el) => el.name === "w:tcPr");
   const tableCellProperties = tcPr ? translator$J.encode({ ...params, nodes: [tcPr] }) ?? {} : {};
   attributes["tableCellProperties"] = tableCellProperties;
-  if (rowBorders?.insideH) {
-    rowBorders["bottom"] = rowBorders.insideH;
-    delete rowBorders.insideH;
-  }
-  if (rowBorders?.insideV) {
-    rowBorders["right"] = rowBorders.insideV;
-    delete rowBorders?.insideV;
-  }
-  if (rowBorders) attributes["borders"] = { ...rowBorders };
-  const inlineBorders = processInlineCellBorders(tableCellProperties.borders, rowBorders);
-  if (inlineBorders) attributes["borders"] = Object.assign(attributes["borders"] || {}, inlineBorders);
-  const colspan = tableCellProperties.gridSpan;
-  if (colspan && !isNaN(parseInt(colspan, 10))) attributes["colspan"] = parseInt(colspan, 10);
+  const effectiveTotalColumns = totalColumns ?? (allColumnWidths.length || 1);
+  const effectiveTotalRows = totalRows ?? (table?.elements?.filter((el) => el.name === "w:tr").length || 1);
+  const colspan = parseInt(tableCellProperties.gridSpan || 1, 10);
+  const isFirstRow = rowIndex === 0;
+  const isLastRow = rowIndex === effectiveTotalRows - 1;
+  const isFirstColumn = columnIndex === 0;
+  const isLastColumn = columnIndex + colspan >= effectiveTotalColumns;
+  const cellBorders = {};
+  if (rowBorders) {
+    if (rowBorders.top?.val === "none") {
+      cellBorders.top = rowBorders.top;
+    } else if (isFirstRow && rowBorders.top) {
+      cellBorders.top = rowBorders.top;
+    }
+    if (rowBorders.bottom?.val === "none") {
+      cellBorders.bottom = rowBorders.bottom;
+    } else if (isLastRow && rowBorders.bottom) {
+      cellBorders.bottom = rowBorders.bottom;
+    }
+    if (rowBorders.left?.val === "none") {
+      cellBorders.left = rowBorders.left;
+    } else if (isFirstColumn && rowBorders.left) {
+      cellBorders.left = rowBorders.left;
+    }
+    if (rowBorders.right?.val === "none") {
+      cellBorders.right = rowBorders.right;
+    } else if (isLastColumn && rowBorders.right) {
+      cellBorders.right = rowBorders.right;
+    }
+    if (!isLastRow && rowBorders.insideH) {
+      cellBorders.bottom = rowBorders.insideH;
+    }
+    if (!isLastColumn && rowBorders.insideV) {
+      cellBorders.right = rowBorders.insideV;
+    }
+  }
+  attributes["borders"] = cellBorders;
+  const inlineBorders = processInlineCellBorders(tableCellProperties.borders, cellBorders);
+  if (inlineBorders) attributes["borders"] = Object.assign(attributes["borders"], inlineBorders);
+  if (colspan > 1) attributes["colspan"] = colspan;
   let width = tableCellProperties.cellWidth?.value ? twipsToPixels(tableCellProperties.cellWidth?.value) : null;
   const widthType = tableCellProperties.cellWidth?.type;
   if (widthType) attributes["widthType"] = widthType;
@@ -9447,10 +9574,9 @@ function handleTableCellNode({
     attributes["widthUnit"] = "px";
     const defaultColWidths = allColumnWidths;
     const hasDefaultColWidths = allColumnWidths && allColumnWidths.length > 0;
-    const colspanNum = parseInt(colspan || 1, 10);
-    if (colspanNum && colspanNum > 1 && hasDefaultColWidths) {
+    if (colspan > 1 && hasDefaultColWidths) {
       let colwidth = [];
-      for (let i = 0; i < colspanNum; i++) {
+      for (let i = 0; i < colspan; i++) {
         let colwidthValue = defaultColWidths[columnIndex + i];
         let defaultColwidth = 100;
         if (typeof colwidthValue !== "undefined") {
@@ -9600,22 +9726,18 @@ const processInlineCellBorders = (borders, rowBorders) => {
   return ["bottom", "top", "left", "right"].reduce((acc, direction) => {
     const borderAttrs = borders[direction];
     const rowBorderAttrs = rowBorders[direction];
-    if (borderAttrs && borderAttrs["val"] !== "nil") {
+    if (borderAttrs && borderAttrs["val"] !== "none") {
       const color = borderAttrs["color"];
       let size = borderAttrs["size"];
       if (size) size = eighthPointsToPixels(size);
       acc[direction] = { color, size, val: borderAttrs["val"] };
       return acc;
     }
-    if (borderAttrs && borderAttrs["val"] === "nil") {
+    if (borderAttrs && borderAttrs["val"] === "none") {
       const border = Object.assign({}, rowBorderAttrs || {});
-      if (!Object.keys(border).length) {
-        return acc;
-      } else {
-        border["val"] = "none";
-        acc[direction] = border;
-        return acc;
-      }
+      border["val"] = "none";
+      acc[direction] = border;
+      return acc;
     }
     return acc;
   }, {});
@@ -9751,6 +9873,9 @@ function encode$w(params, encodedAttrs) {
     columnIndex,
     columnWidth,
     columnWidths: allColumnWidths,
+    rowIndex,
+    totalRows,
+    totalColumns,
     _referencedStyles
   } = params.extraParams;
   const schemaNode = handleTableCellNode({
@@ -9762,6 +9887,9 @@ function encode$w(params, encodedAttrs) {
     columnIndex,
     columnWidth,
     allColumnWidths,
+    rowIndex,
+    totalRows,
+    totalColumns,
     _referencedStyles
   });
   if (encodedAttrs && Object.keys(encodedAttrs).length) {
@@ -9785,13 +9913,26 @@ const config$i = {
   attributes: validXmlAttributes$a
 };
 const translator$I = NodeTranslator.from(config$i);
-const translator$H = NodeTranslator.from({
+const propertyTranslators$3 = [
+  translator$1q,
+  translator$Z,
+  translator$X,
+  translator$W,
+  translator$1o,
+  translator$1m,
+  translator$V,
+  translator$1k
+];
+const translator$H = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:tblBorders", "borders", propertyTranslators$3)
+);
+const translator$G = NodeTranslator.from({
   xmlName: "w:cantSplit",
   sdNodeOrKeyName: "cantSplit",
   encode: ({ nodes }) => ["1", "true"].includes(nodes[0].attributes?.["w:val"] ?? "1"),
   decode: ({ node }) => node.attrs?.cantSplit ? { attributes: {} } : void 0
 });
-const translator$G = NodeTranslator.from(
+const translator$F = NodeTranslator.from(
   createSingleAttrPropertyHandler(
     "w:gridAfter",
     null,
@@ -9800,7 +9941,7 @@ const translator$G = NodeTranslator.from(
     (v2) => integerToString(v2)
   )
 );
-const translator$F = NodeTranslator.from(
+const translator$E = NodeTranslator.from(
   createSingleAttrPropertyHandler(
     "w:gridBefore",
     null,
@@ -9809,20 +9950,20 @@ const translator$F = NodeTranslator.from(
     (v2) => integerToString(v2)
   )
 );
-const translator$E = NodeTranslator.from({
+const translator$D = NodeTranslator.from({
   xmlName: "w:hidden",
   sdNodeOrKeyName: "hidden",
   encode: ({ nodes }) => parseBoolean(nodes[0].attributes?.["w:val"] ?? "1"),
   decode: ({ node }) => node.attrs.hidden ? { attributes: {} } : void 0
 });
-const translator$D = NodeTranslator.from(createMeasurementPropertyHandler("w:tblCellSpacing", "tableCellSpacing"));
-const translator$C = NodeTranslator.from({
+const translator$C = NodeTranslator.from(createMeasurementPropertyHandler("w:tblCellSpacing", "tableCellSpacing"));
+const translator$B = NodeTranslator.from({
   xmlName: "w:tblHeader",
   sdNodeOrKeyName: "repeatHeader",
   encode: ({ nodes }) => parseBoolean(nodes[0].attributes?.["w:val"] ?? "1"),
   decode: ({ node }) => node.attrs.repeatHeader ? { attributes: {} } : void 0
 });
-const translator$B = NodeTranslator.from({
+const translator$A = NodeTranslator.from({
   xmlName: "w:trHeight",
   sdNodeOrKeyName: "rowHeight",
   encode: ({ nodes }) => {
@@ -9849,24 +9990,24 @@ const translator$B = NodeTranslator.from({
     return Object.keys(heightAttrs).length > 0 ? { attributes: heightAttrs } : void 0;
   }
 });
-const translator$A = NodeTranslator.from(createMeasurementPropertyHandler("w:wAfter"));
-const translator$z = NodeTranslator.from(createMeasurementPropertyHandler("w:wBefore"));
-const propertyTranslators$3 = [
-  translator$H,
+const translator$z = NodeTranslator.from(createMeasurementPropertyHandler("w:wAfter"));
+const translator$y = NodeTranslator.from(createMeasurementPropertyHandler("w:wBefore"));
+const propertyTranslators$2 = [
+  translator$G,
   translator$1I,
   translator$1G,
-  translator$G,
   translator$F,
   translator$E,
-  translator$1D,
   translator$D,
+  translator$1D,
   translator$C,
   translator$B,
   translator$A,
-  translator$z
+  translator$z,
+  translator$y
 ];
-const translator$y = NodeTranslator.from(
-  createNestedPropertiesTranslator("w:trPr", "tableRowProperties", propertyTranslators$3, {
+const translator$x = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:trPr", "tableRowProperties", propertyTranslators$2, {
     cantSplit: false,
     hidden: false,
     repeatHeader: false
@@ -9944,7 +10085,7 @@ const encode$v = (params, encodedAttrs) => {
   let tableRowProperties = {};
   const tPr = row.elements.find((el) => el.name === "w:trPr");
   if (tPr) {
-    tableRowProperties = translator$y.encode({
+    tableRowProperties = translator$x.encode({
       ...params,
       nodes: [tPr]
     });
@@ -9954,6 +10095,12 @@ const encode$v = (params, encodedAttrs) => {
   encodedAttrs["tableRowProperties"] = Object.freeze(tableRowProperties);
   encodedAttrs["rowHeight"] = twipsToPixels(tableRowProperties["rowHeight"]?.value);
   encodedAttrs["cantSplit"] = tableRowProperties["cantSplit"];
+  const baseBorders = params.extraParams?.rowBorders;
+  const rowTableBorders = getRowTableBorders({
+    params,
+    row,
+    baseBorders
+  });
   const { columnWidths: gridColumnWidths, activeRowSpans = [] } = params.extraParams;
   const totalColumns = Array.isArray(gridColumnWidths) ? gridColumnWidths.length : 0;
   const pendingRowSpans = Array.isArray(activeRowSpans) ? activeRowSpans.slice() : [];
@@ -9986,6 +10133,10 @@ const encode$v = (params, encodedAttrs) => {
       path: [...params.path || [], node],
       extraParams: {
         ...params.extraParams,
+        rowBorders: {
+          ...baseBorders,
+          ...rowTableBorders
+        },
         node,
         columnIndex: startColumn,
         columnWidth
@@ -10015,6 +10166,33 @@ const encode$v = (params, encodedAttrs) => {
   };
   return newNode;
 };
+function getRowTableBorders({ params, row, baseBorders }) {
+  const tblPrEx = row?.elements?.find?.((el) => el.name === "w:tblPrEx");
+  const tblBorders = tblPrEx?.elements?.find?.((el) => el.name === "w:tblBorders");
+  if (!tblBorders) {
+    return baseBorders;
+  }
+  const rawOverrides = translator$H.encode({ ...params, nodes: [tblBorders] }) || {};
+  const overrides = processRawTableBorders(rawOverrides);
+  if (!Object.keys(overrides).length) {
+    return baseBorders;
+  }
+  return { ...baseBorders || {}, ...overrides };
+}
+function processRawTableBorders(rawBorders) {
+  const borders = {};
+  Object.entries(rawBorders || {}).forEach(([name, attributes]) => {
+    const attrs = {};
+    const color = attributes?.color;
+    const size = attributes?.size;
+    const val = attributes?.val;
+    if (color && color !== "auto") attrs.color = color.startsWith("#") ? color : `#${color}`;
+    if (size != null && size !== "auto") attrs.size = eighthPointsToPixels(size);
+    if (val) attrs.val = val;
+    borders[name] = attrs;
+  });
+  return borders;
+}
 const decode$x = (params, decodedAttrs) => {
   const { node } = params;
   const cells = node.content || [];
@@ -10055,7 +10233,7 @@ const decode$x = (params, decodedAttrs) => {
       }
     }
     tableRowProperties["cantSplit"] = node.attrs["cantSplit"];
-    const trPr = translator$y.decode({
+    const trPr = translator$x.decode({
       ...params,
       node: { ...node, attrs: { ...node.attrs, tableRowProperties } }
     });
@@ -10075,7 +10253,7 @@ const config$h = {
   decode: decode$x,
   attributes: validXmlAttributes$9
 };
-const translator$x = NodeTranslator.from(config$h);
+const translator$w = NodeTranslator.from(config$h);
 function parseTagValueJSON(json) {
   if (typeof json !== "string") {
     return {};
@@ -24766,7 +24944,7 @@ const config$g = {
   decode: decode$w,
   attributes: validXmlAttributes$8
 };
-const translator$w = NodeTranslator.from(config$g);
+const translator$v = NodeTranslator.from(config$g);
 function handleInlineNode(params) {
   const { node } = params.extraParams;
   if (node.name !== "wp:inline") {
@@ -24820,7 +24998,7 @@ const config$f = {
   decode: decode$v,
   attributes: validXmlAttributes$7
 };
-const translator$v = NodeTranslator.from(config$f);
+const translator$u = NodeTranslator.from(config$f);
 const XML_NODE_NAME$f = "w:drawing";
 const SD_NODE_NAME$d = [];
 const validXmlAttributes$6 = [];
@@ -24828,8 +25006,8 @@ function encode$s(params) {
   const nodes = params.nodes;
   const node = nodes[0];
   const translatorByChildName = {
-    "wp:anchor": translator$w,
-    "wp:inline": translator$v
+    "wp:anchor": translator$v,
+    "wp:inline": translator$u
   };
   const result = (node.elements || []).reduce((acc, child) => {
     if (acc) return acc;
@@ -24852,7 +25030,7 @@ function decode$u(params) {
   if (!node || !node.type) {
     return null;
   }
-  const childTranslator = node.attrs.isAnchor ? translator$w : translator$v;
+  const childTranslator = node.attrs.isAnchor ? translator$v : translator$u;
   const resultNode = childTranslator.decode(params);
   return wrapTextInRun(
     {
@@ -24870,7 +25048,7 @@ const config$e = {
   decode: decode$u,
   attributes: validXmlAttributes$6
 };
-const translator$u = NodeTranslator.from(config$e);
+const translator$t = NodeTranslator.from(config$e);
 function getTextNodeForExport(text, marks, params) {
   const hasLeadingOrTrailingSpace = /^\s|\s$/.test(text);
   const space = hasLeadingOrTrailingSpace ? "preserve" : null;
@@ -25220,8 +25398,9 @@ function translateFieldAnnotation(params) {
     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 } }
   ];
@@ -25277,7 +25456,7 @@ function prepareTextAnnotation(params) {
   return getTextNodeForExport(attrs.displayLabel, [...marks, ...marksFromAttrs], params);
 }
 function prepareImageAnnotation(params, imageSize) {
-  return translator$u.decode({
+  return translator$t.decode({
     ...params,
     imageSize
   });
@@ -25739,7 +25918,7 @@ const config$d = {
   decode: decode$t,
   attributes: validXmlAttributes$5
 };
-const translator$t = NodeTranslator.from(config$d);
+const translator$s = NodeTranslator.from(config$d);
 function preProcessVerticalMergeCells(table, { editorSchema }) {
   if (!table || !Array.isArray(table.content)) {
     return table;
@@ -25780,17 +25959,17 @@ function preProcessVerticalMergeCells(table, { editorSchema }) {
   }
   return table;
 }
-const translator$s = NodeTranslator.from({
+const translator$r = NodeTranslator.from({
   xmlName: "w:bidiVisual",
   sdNodeOrKeyName: "rightToLeft",
   encode: ({ nodes }) => parseBoolean(nodes[0].attributes?.["w:val"] ?? "1"),
   decode: ({ node }) => node.attrs.rightToLeft ? { attributes: {} } : void 0
 });
-const translator$r = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblCaption", "caption"));
-const translator$q = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblDescription", "description"));
-const translator$p = NodeTranslator.from(createMeasurementPropertyHandler("w:tblInd", "tableIndent"));
-const translator$o = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblLayout", "tableLayout", "w:type"));
-const translator$n = NodeTranslator.from({
+const translator$q = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblCaption", "caption"));
+const translator$p = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblDescription", "description"));
+const translator$o = NodeTranslator.from(createMeasurementPropertyHandler("w:tblInd", "tableIndent"));
+const translator$n = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblLayout", "tableLayout", "w:type"));
+const translator$m = NodeTranslator.from({
   xmlName: "w:tblLook",
   sdNodeOrKeyName: "tblLook",
   attributes: ["w:firstColumn", "w:firstRow", "w:lastColumn", "w:lastRow", "w:noHBand", "w:noVBand"].map((attr) => createAttributeHandler(attr, null, parseBoolean, booleanToString)).concat([createAttributeHandler("w:val")]),
@@ -25802,16 +25981,16 @@ const translator$n = NodeTranslator.from({
     return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
   }
 });
-const translator$m = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblOverlap", "overlap"));
-const translator$l = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblStyle", "tableStyleId"));
-const translator$k = NodeTranslator.from(
+const translator$l = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblOverlap", "overlap"));
+const translator$k = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblStyle", "tableStyleId"));
+const translator$j = NodeTranslator.from(
   createSingleAttrPropertyHandler("w:tblStyleColBandSize", "tableStyleColBandSize")
 );
-const translator$j = NodeTranslator.from(
+const translator$i = NodeTranslator.from(
   createSingleAttrPropertyHandler("w:tblStyleRowBandSize", "tableStyleRowBandSize")
 );
-const translator$i = NodeTranslator.from(createMeasurementPropertyHandler("w:tblW", "tableWidth"));
-const translator$h = NodeTranslator.from({
+const translator$h = NodeTranslator.from(createMeasurementPropertyHandler("w:tblW", "tableWidth"));
+const translator$g = NodeTranslator.from({
   xmlName: "w:tblpPr",
   sdNodeOrKeyName: "floatingTableProperties",
   attributes: ["w:leftFromText", "w:rightFromText", "w:topFromText", "w:bottomFromText", "w:tblpX", "w:tblpY"].map((attr) => createAttributeHandler(attr, null, parseInteger, integerToString)).concat(["w:horzAnchor", "w:vertAnchor", "w:tblpXSpec", "w:tblpYSpec"].map((attr) => createAttributeHandler(attr))),
@@ -25823,19 +26002,6 @@ const translator$h = NodeTranslator.from({
     return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
   }
 });
-const propertyTranslators$2 = [
-  translator$1q,
-  translator$Z,
-  translator$X,
-  translator$W,
-  translator$1o,
-  translator$1m,
-  translator$V,
-  translator$1k
-];
-const translator$g = NodeTranslator.from(
-  createNestedPropertiesTranslator("w:tblBorders", "borders", propertyTranslators$2)
-);
 const propertyTranslators$1 = [
   translator$1p,
   translator$Y,
@@ -25848,12 +26014,11 @@ const translator$f = NodeTranslator.from(
   createNestedPropertiesTranslator("w:tblCellMar", "cellMargins", propertyTranslators$1)
 );
 const propertyTranslators = [
-  translator$s,
+  translator$r,
   translator$1D,
   translator$2b,
-  translator$r,
-  translator$D,
   translator$q,
+  translator$C,
   translator$p,
   translator$o,
   translator$n,
@@ -25864,6 +26029,7 @@ const propertyTranslators = [
   translator$i,
   translator$h,
   translator$g,
+  translator$H,
   translator$f
 ];
 const translator$e = NodeTranslator.from(
@@ -26123,8 +26289,7 @@ const encode$p = (params, encodedAttrs) => {
   }
   const borderProps = _processTableBorders(encodedAttrs.tableProperties.borders || {});
   const referencedStyles = _getReferencedTableStyles(encodedAttrs.tableStyleId, params) || {};
-  const rowBorders = { ...referencedStyles.rowBorders, ...borderProps.rowBorders };
-  encodedAttrs.borders = { ...referencedStyles.borders, ...borderProps.borders };
+  encodedAttrs.borders = { ...referencedStyles.borders, ...borderProps };
   encodedAttrs.tableProperties.cellMargins = referencedStyles.cellMargins = {
     ...referencedStyles.cellMargins,
     ...encodedAttrs.tableProperties.cellMargins
@@ -26145,19 +26310,22 @@ const encode$p = (params, encodedAttrs) => {
   }
   const content = [];
   const totalColumns = columnWidths.length;
+  const totalRows = rows.length;
   const activeRowSpans = totalColumns > 0 ? new Array(totalColumns).fill(0) : [];
   rows.forEach((row, rowIndex) => {
-    const result = translator$x.encode({
+    const result = translator$w.encode({
       ...params,
       path: [...params.path || [], node],
       nodes: [row],
       extraParams: {
         row,
         table: node,
-        rowBorders,
+        rowBorders: encodedAttrs.borders,
         columnWidths,
         activeRowSpans: activeRowSpans.slice(),
         rowIndex,
+        totalRows,
+        totalColumns,
         _referencedStyles: referencedStyles
       }
     });
@@ -26232,21 +26400,17 @@ const decode$r = (params, decodedAttrs) => {
 };
 function _processTableBorders(rawBorders) {
   const borders = {};
-  const rowBorders = {};
   Object.entries(rawBorders).forEach(([name, attributes]) => {
     const attrs = {};
     const color = attributes.color;
     const size = attributes.size;
+    const val = attributes.val;
     if (color && color !== "auto") attrs["color"] = color.startsWith("#") ? color : `#${color}`;
     if (size && size !== "auto") attrs["size"] = eighthPointsToPixels(size);
-    const rowBorderNames = ["insideH", "insideV"];
-    if (rowBorderNames.includes(name)) rowBorders[name] = attrs;
+    if (val) attrs["val"] = val;
     borders[name] = attrs;
   });
-  return {
-    borders,
-    rowBorders
-  };
+  return borders;
 }
 function _getReferencedTableStyles(tableStyleReference, params) {
   if (!tableStyleReference) return null;
@@ -26286,9 +26450,8 @@ function _getReferencedTableStyles(tableStyleReference, params) {
     }
     const tableProperties = translator$e.encode({ ...params, nodes: [tblPr] });
     if (tableProperties) {
-      const { borders, rowBorders } = _processTableBorders(tableProperties.borders || {});
-      if (borders) stylesToReturn.borders = borders;
-      if (rowBorders) stylesToReturn.rowBorders = rowBorders;
+      const borders = _processTableBorders(tableProperties.borders || {});
+      if (borders || Object.keys(borders).length) stylesToReturn.borders = borders;
       const cellMargins = {};
       Object.entries(tableProperties.cellMargins || {}).forEach(([key, attrs]) => {
         if (attrs?.value != null) {
@@ -27137,7 +27300,7 @@ const handleDrawingNode = (params) => {
     return { nodes: [], consumed: 0 };
   }
   const translatorParams = { ...params, nodes: [node] };
-  const schemaNode = translator$u.encode(translatorParams);
+  const schemaNode = translator$t.encode(translatorParams);
   const newNodes = schemaNode ? [schemaNode] : [];
   return { nodes: newNodes, consumed: 1 };
 };
@@ -27294,7 +27457,8 @@ const encode$1 = (params, encodedAttrs = {}) => {
       text = text.replace(/^[ \t\n\r]+/, "").replace(/[ \t\n\r]+$/, "");
     }
     text = text.replace(/\[\[sdspace\]\]/g, "");
-    if (xmlSpace !== "preserve" && typeof text === "string" && !text.trim()) {
+    const isWhitespaceOnly = /^[ \t\n\r]*$/.test(text);
+    if (xmlSpace !== "preserve" && isWhitespaceOnly) {
       return null;
     }
   } else if (!elements.length && encodedAttrs.xmlSpace === "preserve") {
@@ -27379,7 +27543,7 @@ const handleSdtNode = (params) => {
   if (nodes.length === 0 || nodes[0].name !== "w:sdt") {
     return { nodes: [], consumed: 0 };
   }
-  const result = translator$t.encode(params);
+  const result = translator$s.encode(params);
   if (!result) {
     return { nodes: [], consumed: 0 };
   }
@@ -27407,12 +27571,12 @@ const translatorList = Array.from(
     translator$1s,
     translator$2n,
     translator$2m,
-    translator$s,
+    translator$r,
     translator$9,
     translator$a,
     translator$1q,
     translator$2r,
-    translator$H,
+    translator$G,
     translator$2c,
     translator$1I,
     translator$2h,
@@ -27420,7 +27584,7 @@ const translatorList = Array.from(
     translator$1R,
     translator$2,
     translator$1G,
-    translator$u,
+    translator$t,
     translator$2i,
     translator$1T,
     translator$1Z,
@@ -27429,13 +27593,13 @@ const translatorList = Array.from(
     translator$Z,
     translator$1U,
     translator$1F,
-    translator$G,
     translator$F,
+    translator$E,
     translator$d,
     translator$$,
     translator$L,
     translator$K,
-    translator$E,
+    translator$D,
     translator$M,
     translator$2q,
     translator$12,
@@ -27477,7 +27641,7 @@ const translatorList = Array.from(
     translator$2f,
     translator$1S,
     translator$1m,
-    translator$t,
+    translator$s,
     translator$20,
     translator$2b,
     translator$27,
@@ -27495,23 +27659,23 @@ const translatorList = Array.from(
     translator$2p,
     translator$1b,
     translator$b,
-    translator$g,
-    translator$r,
-    translator$f,
-    translator$D,
+    translator$H,
     translator$q,
-    translator$c,
+    translator$f,
     translator$C,
     translator$p,
+    translator$c,
+    translator$B,
     translator$o,
     translator$n,
     translator$m,
-    translator$e,
     translator$l,
+    translator$e,
     translator$k,
     translator$j,
     translator$i,
     translator$h,
+    translator$g,
     translator$I,
     translator$R,
     translator$O,
@@ -27520,10 +27684,10 @@ const translatorList = Array.from(
     translator$10,
     translator$19,
     translator$T,
-    translator$x,
+    translator$w,
     translator$S,
-    translator$B,
-    translator$y,
+    translator$A,
+    translator$x,
     translator$1a,
     translator$18,
     translator$17,
@@ -27534,13 +27698,13 @@ const translatorList = Array.from(
     translator$28,
     translator$_,
     translator$1X,
-    translator$A,
     translator$z,
+    translator$y,
     translator$1P,
     translator$16,
     translator$15,
-    translator$w,
     translator$v,
+    translator$u,
     commentRangeStartTranslator,
     commentRangeEndTranslator
   ])
@@ -27879,8 +28043,8 @@ function importCommentData({ docx, editor, converter }) {
       converter,
       path: [el]
     });
-    const { attrs } = parsedElements[0];
-    const paraId = attrs["w14:paraId"];
+    const lastElement = parsedElements[parsedElements.length - 1];
+    const paraId = lastElement?.attrs?.["w14:paraId"];
     return {
       commentId: internalId || v4(),
       importedId,
@@ -27923,7 +28087,11 @@ const generateCommentsWithExtendedData = ({ docx, comments }) => {
     if (!extendedDef) return { ...comment, isDone: comment.isDone ?? false };
     const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
     let parentComment;
-    if (paraIdParent) parentComment = comments.find((c) => c.paraId === paraIdParent);
+    if (paraIdParent) {
+      parentComment = comments.find(
+        (c) => c.paraId === paraIdParent || c.elements?.some((el) => el.attrs?.["w14:paraId"] === paraIdParent)
+      );
+    }
     const newComment = {
       ...comment,
       isDone: isDone ?? false,
@@ -29808,13 +29976,13 @@ function exportSchemaToJson(params) {
     text: translator$1,
     lineBreak: translator$2r,
     table: translator$b,
-    tableRow: translator$x,
+    tableRow: translator$w,
     tableCell: translator$I,
     bookmarkStart: translator$a,
     bookmarkEnd: translator$9,
-    fieldAnnotation: translator$t,
+    fieldAnnotation: translator$s,
     tab: translator$2p,
-    image: translator$u,
+    image: translator$t,
     hardBreak: translator$2r,
     commentRangeStart: commentRangeStartTranslator,
     commentRangeEnd: commentRangeEndTranslator,
@@ -29826,10 +29994,10 @@ function exportSchemaToJson(params) {
     contentBlock: translator,
     vectorShape: translateVectorShape,
     shapeGroup: translateShapeGroup,
-    structuredContent: translator$t,
-    structuredContentBlock: translator$t,
-    documentPartObject: translator$t,
-    documentSection: translator$t,
+    structuredContent: translator$s,
+    structuredContentBlock: translator$s,
+    documentPartObject: translator$s,
+    documentSection: translator$s,
     "page-number": translator$4,
     "total-page-number": translator$3,
     pageReference: translator$6,
@@ -30839,7 +31007,7 @@ class SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.1") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.11") {
     return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**
@@ -31485,45 +31653,49 @@ function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
 export {
-  decodeRPrFromMarks as $,
+  createOoxmlResolver as $,
   AllSelection as A,
-  getResolvedParagraphProperties as B,
-  changeListLevel as C,
+  htmlHandler as B,
+  ReplaceStep as C,
   DOMParser$1 as D,
-  isList as E,
+  getResolvedParagraphProperties as E,
   Fragment as F,
-  updateNumberingProperties as G,
-  inputRulesPlugin as H,
-  TrackDeleteMarkName as I,
-  TrackInsertMarkName as J,
-  TrackFormatMarkName as K,
+  changeListLevel as G,
+  isList as H,
+  updateNumberingProperties as I,
+  inputRulesPlugin as J,
+  TrackDeleteMarkName as K,
   ListHelpers as L,
   Mapping as M,
   NodeSelection as N,
-  AddMarkStep as O,
+  TrackInsertMarkName as O,
   PluginKey as P,
-  RemoveMarkStep as Q,
+  TrackFormatMarkName as Q,
   ReplaceAroundStep as R,
   SuperConverter as S,
   TextSelection as T,
-  CommandService as U,
-  EditorState as V,
-  unflattenListsInHtml as W,
-  SelectionRange as X,
-  Transform as Y,
-  resolveParagraphProperties as Z,
-  _getReferencedTableStyles as _,
+  AddMarkStep as U,
+  RemoveMarkStep as V,
+  CommandService as W,
+  EditorState as X,
+  unflattenListsInHtml as Y,
+  SelectionRange as Z,
+  Transform as _,
   createDocFromHTML as a,
-  calculateResolvedParagraphProperties as a0,
-  resolveRunProperties as a1,
-  encodeCSSFromPPr as a2,
-  encodeCSSFromRPr as a3,
-  generateOrderedListIndex as a4,
-  docxNumberingHelpers as a5,
-  InputRule as a6,
-  insertNewRelationship as a7,
-  kebabCase as a8,
-  getUnderlineCssString as a9,
+  translator$14 as a0,
+  translator$1O as a1,
+  resolveDocxFontFamily as a2,
+  _getReferencedTableStyles as a3,
+  decodeRPrFromMarks as a4,
+  calculateResolvedParagraphProperties as a5,
+  encodeCSSFromPPr as a6,
+  encodeCSSFromRPr as a7,
+  generateOrderedListIndex as a8,
+  docxNumberingHelpers as a9,
+  InputRule as aa,
+  insertNewRelationship as ab,
+  kebabCase as ac,
+  getUnderlineCssString as ad,
   chainableEditorState as b,
   createDocFromMarkdown as c,
   convertMarkdownToHTML as d,
@@ -31542,11 +31714,11 @@ export {
   Schema$1 as q,
   registeredHandlers as r,
   canSplit as s,
-  liftTarget as t,
-  canJoin as u,
-  joinPoint as v,
+  resolveRunProperties as t,
+  encodeMarksFromRPr as u,
+  liftTarget as v,
   wrapTextsInRuns as w,
-  replaceStep as x,
-  htmlHandler as y,
-  ReplaceStep as z
+  canJoin as x,
+  joinPoint as y,
+  replaceStep as z
 };