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

package/dist/super-editor/chunks/{converter-nWAUAQ83.js → converter-DpPj67OW.js}

@@ -15088,14 +15088,21 @@ function twipsToInches(twips) {
 function twipsToPixels(twips) {
   if (twips == null) return;
   const inches = twipsToInches(twips);
+  return inchesToPixels(inches);
+}
+function pixelsToTwips(pixels) {
+  const inches = pixelsToInches(pixels);
+  return inchesToTwips(inches);
+}
+function inchesToPixels(inches) {
   if (inches == null) return;
   const pixels = inches * 96;
   return Math.round(pixels * 1e3) / 1e3;
 }
-function pixelsToTwips(pixels) {
+function pixelsToInches(pixels) {
   if (pixels == null) return;
   const inches = Number(pixels) / 96;
-  return inchesToTwips(inches);
+  return inches;
 }
 function twipsToLines(twips) {
   if (twips == null) return;
@@ -15120,9 +15127,9 @@ function pixelsToEmu(px) {
   if (typeof px === "string") px = parseFloat(px);
   return Math.round(px * 9525);
 }
-function eigthPointsToPixels(eigthPoints) {
-  if (eigthPoints == null) return;
-  const points = parseFloat(eigthPoints) / 8;
+function eighthPointsToPixels(eighthPoints) {
+  if (eighthPoints == null) return;
+  const points = parseFloat(eighthPoints) / 8;
   const pixels = points * 1.3333;
   return pixels;
 }
@@ -15146,6 +15153,71 @@ function degreesToRot(degrees) {
   if (degrees == null) return;
   return degrees * 6e4;
 }
+function pixelsToPolygonUnits(pixels) {
+  if (pixels == null) return;
+  const pu = pixels * 96;
+  return Math.round(pu);
+}
+function polygonUnitsToPixels(pu) {
+  if (pu == null) return;
+  const pixels = Number(pu) / 96;
+  return Math.round(pixels * 1e3) / 1e3;
+}
+function polygonToObj(polygonNode) {
+  if (!polygonNode) return null;
+  const points = [];
+  polygonNode.elements.forEach((element) => {
+    if (["wp:start", "wp:lineTo"].includes(element.name)) {
+      const { x, y: y2 } = element.attributes;
+      points.push([polygonUnitsToPixels(x), polygonUnitsToPixels(y2)]);
+    }
+  });
+  if (points.length > 1) {
+    const firstPoint = points[0];
+    const lastPoint = points[points.length - 1];
+    if (firstPoint[0] === lastPoint[0] && firstPoint[1] === lastPoint[1]) {
+      points.pop();
+    }
+  }
+  return points;
+}
+function objToPolygon(points) {
+  if (!points || !Array.isArray(points)) return null;
+  const polygonNode = {
+    name: "wp:wrapPolygon",
+    type: "wp:wrapPolygon",
+    attributes: {
+      edited: "0"
+    },
+    elements: []
+  };
+  points.forEach((point, index2) => {
+    const [x, y2] = point;
+    const tagName = index2 === 0 ? "wp:start" : "wp:lineTo";
+    const pointNode = {
+      name: tagName,
+      type: tagName,
+      attributes: {
+        x: pixelsToPolygonUnits(x),
+        y: pixelsToPolygonUnits(y2)
+      }
+    };
+    polygonNode.elements.push(pointNode);
+  });
+  if (points.length > 0) {
+    const [startX, startY] = points[0];
+    const closePointNode = {
+      name: "wp:lineTo",
+      type: "wp:lineTo",
+      attributes: {
+        x: pixelsToPolygonUnits(startX),
+        y: pixelsToPolygonUnits(startY)
+      }
+    };
+    polygonNode.elements.push(closePointNode);
+  }
+  return polygonNode;
+}
 const getTextIndentExportValue = (indent) => {
   const [value, unit] = parseSizeUnit(indent);
   const functionsMap = {
@@ -24470,37 +24542,37 @@ const _NodeTranslator = class _NodeTranslator {
 /** @type {typeof TranslatorTypes} */
 __publicField(_NodeTranslator, "translatorTypes", TranslatorTypes);
 let NodeTranslator = _NodeTranslator;
-const encode$1c = (attributes) => {
+const encode$1b = (attributes) => {
   return attributes["w:type"];
 };
-const decode$14 = (attrs) => {
+const decode$13 = (attrs) => {
   const { lineBreakType } = attrs;
   return lineBreakType;
 };
 const attrConfig$G = Object.freeze({
   xmlName: "w:type",
   sdName: "lineBreakType",
-  encode: encode$1c,
-  decode: decode$14
+  encode: encode$1b,
+  decode: decode$13
 });
-const encode$1b = (attributes) => {
+const encode$1a = (attributes) => {
   const xmlAttrValue = attributes["w:clear"];
   return xmlAttrValue;
 };
-const decode$13 = (attrs) => {
+const decode$12 = (attrs) => {
   const { clear } = attrs;
   return clear;
 };
 const attrConfig$F = Object.freeze({
   xmlName: "w:clear",
   sdName: "clear",
-  encode: encode$1b,
-  decode: decode$13
+  encode: encode$1a,
+  decode: decode$12
 });
-const validXmlAttributes$n = [attrConfig$G, attrConfig$F];
-const XML_NODE_NAME$z = "w:br";
+const validXmlAttributes$p = [attrConfig$G, attrConfig$F];
+const XML_NODE_NAME$y = "w:br";
 const SD_NODE_NAME$h = "lineBreak";
-const encode$1a = (_2, encodedAttrs) => {
+const encode$19 = (_2, encodedAttrs) => {
   const isPageBreak = encodedAttrs?.lineBreakType === "page";
   const translated = {
     type: isPageBreak ? "hardBreak" : "lineBreak"
@@ -24510,7 +24582,7 @@ const encode$1a = (_2, encodedAttrs) => {
   }
   return translated;
 };
-const decode$12 = (params, decodedAttrs) => {
+const decode$11 = (params, decodedAttrs) => {
   const { node } = params;
   if (!node) return;
   const wBreak = { name: "w:br" };
@@ -24527,39 +24599,39 @@ const decode$12 = (params, decodedAttrs) => {
   };
   return translated;
 };
-const config$w = {
-  xmlName: XML_NODE_NAME$z,
+const config$x = {
+  xmlName: XML_NODE_NAME$y,
   sdNodeOrKeyName: SD_NODE_NAME$h,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$1a,
-  decode: decode$12,
-  attributes: validXmlAttributes$n
+  encode: encode$19,
+  decode: decode$11,
+  attributes: validXmlAttributes$p
 };
-const translator$1a = NodeTranslator.from(config$w);
-const encode$19 = (attributes) => attributes?.["w:val"];
-const decode$11 = (attrs) => attrs?.highlight;
+const translator$1r = NodeTranslator.from(config$x);
+const encode$18 = (attributes) => attributes?.["w:val"];
+const decode$10 = (attrs) => attrs?.highlight;
 const attrConfig$E = Object.freeze({
   xmlName: "w:val",
   sdName: "highlight",
-  encode: encode$19,
-  decode: decode$11
+  encode: encode$18,
+  decode: decode$10
 });
-const validXmlAttributes$m = [attrConfig$E];
-const XML_NODE_NAME$y = "w:highlight";
-const SD_ATTR_KEY$g = "highlight";
+const validXmlAttributes$o = [attrConfig$E];
+const XML_NODE_NAME$x = "w:highlight";
+const SD_ATTR_KEY$f = "highlight";
 const DISABLED_TOKENS = /* @__PURE__ */ new Set(["transparent", "none", "inherit"]);
-const encode$18 = (params, encodedAttrs = {}) => {
+const encode$17 = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes?.[0];
   const value = encodedAttrs.highlight ?? node?.attributes?.["w:val"];
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$y,
-    sdNodeOrKeyName: SD_ATTR_KEY$g,
+    xmlName: XML_NODE_NAME$x,
+    sdNodeOrKeyName: SD_ATTR_KEY$f,
     attributes: { "w:val": value ?? null }
   };
 };
-const decode$10 = (params) => {
+const decode$$ = (params) => {
   const attrs = params?.node?.attrs || {};
   const highlightValue = attrs.highlight ?? attrs.color ?? null;
   if (!highlightValue) return void 0;
@@ -24567,14 +24639,14 @@ const decode$10 = (params) => {
   if (!normalizedValue) return void 0;
   if (DISABLED_TOKENS.has(normalizedValue)) {
     return {
-      name: XML_NODE_NAME$y,
+      name: XML_NODE_NAME$x,
       attributes: { "w:val": "none" }
     };
   }
   const keyword = getDocxHighlightKeywordFromHex(highlightValue);
   if (keyword) {
     return {
-      name: XML_NODE_NAME$y,
+      name: XML_NODE_NAME$x,
       attributes: { "w:val": keyword }
     };
   }
@@ -24589,63 +24661,63 @@ const decode$10 = (params) => {
     }
   };
 };
-const config$v = {
-  xmlName: XML_NODE_NAME$y,
-  sdNodeOrKeyName: SD_ATTR_KEY$g,
+const config$w = {
+  xmlName: XML_NODE_NAME$x,
+  sdNodeOrKeyName: SD_ATTR_KEY$f,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$18,
-  decode: decode$10,
-  attributes: validXmlAttributes$m
+  encode: encode$17,
+  decode: decode$$,
+  attributes: validXmlAttributes$o
 };
-const translator$19 = NodeTranslator.from(config$v);
-const encode$17 = (attributes) => {
+const translator$1q = NodeTranslator.from(config$w);
+const encode$16 = (attributes) => {
   return attributes["w:val"];
 };
-const decode$$ = (attrs) => {
+const decode$_ = (attrs) => {
   const { tabSize } = attrs || {};
   return tabSize;
 };
 const attrConfig$D = Object.freeze({
   xmlName: "w:val",
   sdName: "tabSize",
-  encode: encode$17,
-  decode: decode$$
+  encode: encode$16,
+  decode: decode$_
 });
-const encode$16 = (attributes) => {
+const encode$15 = (attributes) => {
   return attributes["w:leader"];
 };
-const decode$_ = (attrs) => {
+const decode$Z = (attrs) => {
   const { leader } = attrs || {};
   return leader;
 };
 const attrConfig$C = Object.freeze({
   xmlName: "w:leader",
   sdName: "leader",
-  encode: encode$16,
-  decode: decode$_
+  encode: encode$15,
+  decode: decode$Z
 });
-const encode$15 = (attributes) => {
+const encode$14 = (attributes) => {
   return attributes["w:pos"];
 };
-const decode$Z = (attrs) => {
+const decode$Y = (attrs) => {
   const { pos } = attrs || {};
   return pos;
 };
 const attrConfig$B = Object.freeze({
   xmlName: "w:pos",
   sdName: "pos",
-  encode: encode$15,
-  decode: decode$Z
+  encode: encode$14,
+  decode: decode$Y
 });
-const validXmlAttributes$l = [attrConfig$D, attrConfig$B, attrConfig$C];
-const XML_NODE_NAME$x = "w:tab";
+const validXmlAttributes$n = [attrConfig$D, attrConfig$B, attrConfig$C];
+const XML_NODE_NAME$w = "w:tab";
 const SD_NODE_NAME$g = "tab";
-const encode$14 = (_2, encodedAttrs = {}) => {
+const encode$13 = (_2, encodedAttrs = {}) => {
   const translated = { type: "tab" };
   if (encodedAttrs) translated.attrs = { ...encodedAttrs };
   return translated;
 };
-const decode$Y = (params, decodedAttrs = {}) => {
+const decode$X = (params, decodedAttrs = {}) => {
   const { node } = params || {};
   if (!node) return;
   const wTab = { name: "w:tab" };
@@ -24661,15 +24733,15 @@ const decode$Y = (params, decodedAttrs = {}) => {
   }
   return translated;
 };
-const config$u = {
-  xmlName: XML_NODE_NAME$x,
+const config$v = {
+  xmlName: XML_NODE_NAME$w,
   sdNodeOrKeyName: SD_NODE_NAME$g,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$14,
-  decode: decode$Y,
-  attributes: validXmlAttributes$l
+  encode: encode$13,
+  decode: decode$X,
+  attributes: validXmlAttributes$n
 };
-const translator$18 = NodeTranslator.from(config$u);
+const translator$1p = NodeTranslator.from(config$v);
 const mergeTextNodes = (nodes) => {
   if (!nodes || !Array.isArray(nodes)) {
     return nodes;
@@ -24895,9 +24967,9 @@ const parseParagraphBorders = (pBdr) => {
     const { attributes: a } = el;
     if (a["w:val"] === "nil" || a["w:val"] === void 0) return;
     let sizePx;
-    if (a["w:sz"] !== void 0) sizePx = eigthPointsToPixels(a["w:sz"]);
+    if (a["w:sz"] !== void 0) sizePx = eighthPointsToPixels(a["w:sz"]);
     let spacePx;
-    if (a["w:space"] !== void 0) spacePx = eigthPointsToPixels(a["w:space"]);
+    if (a["w:space"] !== void 0) spacePx = eighthPointsToPixels(a["w:space"]);
     result[side] = {
       val: a["w:val"],
       size: sizePx,
@@ -25187,91 +25259,91 @@ const handleParagraphNode$1 = (params) => {
   }
   return schemaNode;
 };
-const encode$13 = (attributes) => {
+const encode$12 = (attributes) => {
   return attributes["w:rsidDel"];
 };
-const decode$X = (attrs) => {
+const decode$W = (attrs) => {
   return attrs.rsidDel;
 };
 const attrConfig$A = Object.freeze({
   xmlName: "w:rsidDel",
   sdName: "rsidDel",
-  encode: encode$13,
-  decode: decode$X
+  encode: encode$12,
+  decode: decode$W
 });
-const encode$12 = (attributes) => {
+const encode$11 = (attributes) => {
   return attributes["w:rsidP"];
 };
-const decode$W = (attrs) => {
+const decode$V = (attrs) => {
   return attrs.rsidP;
 };
 const attrConfig$z = Object.freeze({
   xmlName: "w:rsidP",
   sdName: "rsidP",
-  encode: encode$12,
-  decode: decode$W
+  encode: encode$11,
+  decode: decode$V
 });
-const encode$11 = (attributes) => {
+const encode$10 = (attributes) => {
   return attributes["w:rsidR"];
 };
-const decode$V = (attrs) => {
+const decode$U = (attrs) => {
   return attrs.rsidR;
 };
 const attrConfig$y = Object.freeze({
   xmlName: "w:rsidR",
   sdName: "rsidR",
-  encode: encode$11,
-  decode: decode$V
+  encode: encode$10,
+  decode: decode$U
 });
-const encode$10 = (attributes) => {
+const encode$$ = (attributes) => {
   return attributes["w:rsidRPr"];
 };
-const decode$U = (attrs) => {
+const decode$T = (attrs) => {
   return attrs.rsidRPr;
 };
 const attrConfig$x = Object.freeze({
   xmlName: "w:rsidRPr",
   sdName: "rsidRPr",
-  encode: encode$10,
-  decode: decode$U
+  encode: encode$$,
+  decode: decode$T
 });
-const encode$$ = (attributes) => {
+const encode$_ = (attributes) => {
   return attributes["w:rsidRDefault"];
 };
-const decode$T = (attrs) => {
+const decode$S = (attrs) => {
   return attrs.rsidRDefault;
 };
 const attrConfig$w = Object.freeze({
   xmlName: "w:rsidRDefault",
   sdName: "rsidRDefault",
-  encode: encode$$,
-  decode: decode$T
+  encode: encode$_,
+  decode: decode$S
 });
-const encode$_ = (attributes) => {
+const encode$Z = (attributes) => {
   return attributes["w14:paraId"];
 };
-const decode$S = (attrs) => {
+const decode$R = (attrs) => {
   return attrs.paraId;
 };
 const attrConfig$v = Object.freeze({
   xmlName: "w14:paraId",
   sdName: "paraId",
-  encode: encode$_,
-  decode: decode$S
+  encode: encode$Z,
+  decode: decode$R
 });
-const encode$Z = (attributes) => {
+const encode$Y = (attributes) => {
   return attributes["w14:textId"];
 };
-const decode$R = (attrs) => {
+const decode$Q = (attrs) => {
   return attrs.textId;
 };
 const attrConfig$u = Object.freeze({
   xmlName: "w14:textId",
   sdName: "textId",
-  encode: encode$Z,
-  decode: decode$R
+  encode: encode$Y,
+  decode: decode$Q
 });
-const validXmlAttributes$k = [
+const validXmlAttributes$m = [
   attrConfig$v,
   attrConfig$u,
   attrConfig$y,
@@ -25280,9 +25352,9 @@ const validXmlAttributes$k = [
   attrConfig$x,
   attrConfig$A
 ];
-const XML_NODE_NAME$w = "w:p";
+const XML_NODE_NAME$v = "w:p";
 const SD_NODE_NAME$f = "paragraph";
-const encode$Y = (params, encodedAttrs = {}) => {
+const encode$X = (params, encodedAttrs = {}) => {
   const node = handleParagraphNode$1(params);
   if (!node) return void 0;
   if (encodedAttrs && Object.keys(encodedAttrs).length) {
@@ -25290,7 +25362,7 @@ const encode$Y = (params, encodedAttrs = {}) => {
   }
   return node;
 };
-const decode$Q = (params, decodedAttrs = {}) => {
+const decode$P = (params, decodedAttrs = {}) => {
   const translated = translateParagraphNode(params);
   if (!translated) return void 0;
   if (decodedAttrs && Object.keys(decodedAttrs).length) {
@@ -25298,16 +25370,16 @@ const decode$Q = (params, decodedAttrs = {}) => {
   }
   return translated;
 };
-const config$t = {
-  xmlName: XML_NODE_NAME$w,
+const config$u = {
+  xmlName: XML_NODE_NAME$v,
   sdNodeOrKeyName: SD_NODE_NAME$f,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$Y,
-  decode: decode$Q,
-  attributes: validXmlAttributes$k
+  encode: encode$X,
+  decode: decode$P,
+  attributes: validXmlAttributes$m
 };
-const translator$17 = NodeTranslator.from(config$t);
-const encode$X = (attributes) => {
+const translator$1o = NodeTranslator.from(config$u);
+const encode$W = (attributes) => {
   const raw = attributes?.["w:val"];
   if (raw === void 0 || raw === null) return void 0;
   if (typeof raw === "boolean") return raw;
@@ -25317,24 +25389,24 @@ const encode$X = (attributes) => {
   if (val === "1" || val === "true" || val === "on") return true;
   return void 0;
 };
-const decode$P = (runProps) => {
+const decode$O = (runProps) => {
   if (runProps?.bold === false) return "0";
   return void 0;
 };
 const attrConfig$t = Object.freeze({
   xmlName: "w:val",
   sdName: "bold",
-  encode: encode$X,
-  decode: decode$P
+  encode: encode$W,
+  decode: decode$O
 });
-const validXmlAttributes$j = [attrConfig$t];
-const XML_NODE_NAME$v = "w:b";
-const SD_ATTR_KEY$f = "bold";
-const encode$W = (params, encodedAttrs = {}) => {
+const validXmlAttributes$l = [attrConfig$t];
+const XML_NODE_NAME$u = "w:b";
+const SD_ATTR_KEY$e = "bold";
+const encode$V = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes[0];
   if (!node) return void 0;
-  const val = encodedAttrs?.[SD_ATTR_KEY$f];
+  const val = encodedAttrs?.[SD_ATTR_KEY$e];
   let attributes;
   if (val === false) attributes = { "w:val": "0" };
   else if (val === true)
@@ -25342,85 +25414,85 @@ const encode$W = (params, encodedAttrs = {}) => {
   else attributes = node.attributes || {};
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$v,
-    sdNodeOrKeyName: SD_ATTR_KEY$f,
+    xmlName: XML_NODE_NAME$u,
+    sdNodeOrKeyName: SD_ATTR_KEY$e,
     attributes
   };
 };
-const config$s = {
-  xmlName: XML_NODE_NAME$v,
-  sdNodeOrKeyName: SD_ATTR_KEY$f,
+const config$t = {
+  xmlName: XML_NODE_NAME$u,
+  sdNodeOrKeyName: SD_ATTR_KEY$e,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$W,
-  attributes: validXmlAttributes$j
+  encode: encode$V,
+  attributes: validXmlAttributes$l
 };
-const translator$16 = NodeTranslator.from(config$s);
-const XML_NODE_NAME$u = "w:i";
-const SD_ATTR_KEY$e = "italic";
-const encode$V = (params) => {
+const translator$1n = NodeTranslator.from(config$t);
+const XML_NODE_NAME$t = "w:i";
+const SD_ATTR_KEY$d = "italic";
+const encode$U = (params) => {
   const { nodes } = params;
   const node = nodes?.[0];
   if (!node) return void 0;
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$u,
-    sdNodeOrKeyName: SD_ATTR_KEY$e,
+    xmlName: XML_NODE_NAME$t,
+    sdNodeOrKeyName: SD_ATTR_KEY$d,
     attributes: {
       "w:val": node.attributes?.["w:val"] ?? null
     }
   };
 };
-const config$r = {
-  xmlName: XML_NODE_NAME$u,
-  sdNodeOrKeyName: SD_ATTR_KEY$e,
+const config$s = {
+  xmlName: XML_NODE_NAME$t,
+  sdNodeOrKeyName: SD_ATTR_KEY$d,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$V
+  encode: encode$U
 };
-const translator$15 = NodeTranslator.from(config$r);
-const encode$U = (attributes) => attributes?.["w:val"];
-const decode$O = (attrs) => attrs?.underline;
+const translator$1m = NodeTranslator.from(config$s);
+const encode$T = (attributes) => attributes?.["w:val"];
+const decode$N = (attrs) => attrs?.underline;
 const attrConfig$s = Object.freeze({
   xmlName: "w:val",
   sdName: "underline",
-  encode: encode$U,
-  decode: decode$O
+  encode: encode$T,
+  decode: decode$N
 });
-const encode$T = (attributes) => attributes?.["w:color"];
-const decode$N = (attrs) => attrs?.color;
+const encode$S = (attributes) => attributes?.["w:color"];
+const decode$M = (attrs) => attrs?.color;
 const attrConfig$r = Object.freeze({
   xmlName: "w:color",
   sdName: "color",
-  encode: encode$T,
-  decode: decode$N
+  encode: encode$S,
+  decode: decode$M
 });
-const encode$S = (attributes) => attributes?.["w:themeColor"];
-const decode$M = (attrs) => attrs?.themeColor;
+const encode$R = (attributes) => attributes?.["w:themeColor"];
+const decode$L = (attrs) => attrs?.themeColor;
 const attrConfig$q = Object.freeze({
   xmlName: "w:themeColor",
   sdName: "themeColor",
-  encode: encode$S,
-  decode: decode$M
+  encode: encode$R,
+  decode: decode$L
 });
-const encode$R = (attributes) => attributes?.["w:themeTint"];
-const decode$L = (attrs) => attrs?.themeTint;
+const encode$Q = (attributes) => attributes?.["w:themeTint"];
+const decode$K = (attrs) => attrs?.themeTint;
 const attrConfig$p = Object.freeze({
   xmlName: "w:themeTint",
   sdName: "themeTint",
-  encode: encode$R,
-  decode: decode$L
+  encode: encode$Q,
+  decode: decode$K
 });
-const encode$Q = (attributes) => attributes?.["w:themeShade"];
-const decode$K = (attrs) => attrs?.themeShade;
+const encode$P = (attributes) => attributes?.["w:themeShade"];
+const decode$J = (attrs) => attrs?.themeShade;
 const attrConfig$o = Object.freeze({
   xmlName: "w:themeShade",
   sdName: "themeShade",
-  encode: encode$Q,
-  decode: decode$K
+  encode: encode$P,
+  decode: decode$J
 });
-const validXmlAttributes$i = [attrConfig$s, attrConfig$r, attrConfig$q, attrConfig$p, attrConfig$o];
-const XML_NODE_NAME$t = "w:u";
-const SD_ATTR_KEY$d = "underline";
-const encode$P = (params, encodedAttrs = {}) => {
+const validXmlAttributes$k = [attrConfig$s, attrConfig$r, attrConfig$q, attrConfig$p, attrConfig$o];
+const XML_NODE_NAME$s = "w:u";
+const SD_ATTR_KEY$c = "underline";
+const encode$O = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes?.[0];
   const sourceAttrs = node?.attributes || {};
@@ -25436,12 +25508,12 @@ const encode$P = (params, encodedAttrs = {}) => {
   if (themeShade !== void 0 && themeShade !== null) attributes["w:themeShade"] = themeShade;
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$t,
-    sdNodeOrKeyName: SD_ATTR_KEY$d,
+    xmlName: XML_NODE_NAME$s,
+    sdNodeOrKeyName: SD_ATTR_KEY$c,
     attributes
   };
 };
-const decode$J = (params) => {
+const decode$I = (params) => {
   const attrs = params?.node?.attrs || {};
   const underlineType = attrs.underlineType ?? attrs.underline ?? null;
   const color = attrs.underlineColor ?? attrs.color ?? null;
@@ -25459,20 +25531,20 @@ const decode$J = (params) => {
   if (themeTint) attributes["w:themeTint"] = themeTint;
   if (themeShade) attributes["w:themeShade"] = themeShade;
   return {
-    name: XML_NODE_NAME$t,
+    name: XML_NODE_NAME$s,
     attributes
   };
 };
-const config$q = {
-  xmlName: XML_NODE_NAME$t,
-  sdNodeOrKeyName: SD_ATTR_KEY$d,
+const config$r = {
+  xmlName: XML_NODE_NAME$s,
+  sdNodeOrKeyName: SD_ATTR_KEY$c,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$P,
-  decode: decode$J,
-  attributes: validXmlAttributes$i
+  encode: encode$O,
+  decode: decode$I,
+  attributes: validXmlAttributes$k
 };
-const translator$14 = NodeTranslator.from(config$q);
-const encode$O = (attributes) => {
+const translator$1l = NodeTranslator.from(config$r);
+const encode$N = (attributes) => {
   const raw = attributes?.["w:val"];
   if (raw === void 0 || raw === null) return void 0;
   if (typeof raw === "boolean") return raw;
@@ -25482,24 +25554,24 @@ const encode$O = (attributes) => {
   if (val === "1" || val === "true" || val === "on") return true;
   return void 0;
 };
-const decode$I = (attrs) => {
+const decode$H = (attrs) => {
   if (attrs?.strike === false) return "0";
   return void 0;
 };
 const attrConfig$n = Object.freeze({
   xmlName: "w:val",
   sdName: "strike",
-  encode: encode$O,
-  decode: decode$I
+  encode: encode$N,
+  decode: decode$H
 });
-const validXmlAttributes$h = [attrConfig$n];
-const XML_NODE_NAME$s = "w:strike";
-const SD_ATTR_KEY$c = "strike";
-const encode$N = (params, encodedAttrs = {}) => {
+const validXmlAttributes$j = [attrConfig$n];
+const XML_NODE_NAME$r = "w:strike";
+const SD_ATTR_KEY$b = "strike";
+const encode$M = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes?.[0];
   if (!node) return void 0;
-  const val = encodedAttrs?.[SD_ATTR_KEY$c];
+  const val = encodedAttrs?.[SD_ATTR_KEY$b];
   let attributes;
   if (val === false) attributes = { "w:val": "0" };
   else if (val === true) attributes = {};
@@ -25508,55 +25580,55 @@ const encode$N = (params, encodedAttrs = {}) => {
   else if (val === true && attributes["w:val"] === void 0) delete attributes["w:val"];
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$s,
-    sdNodeOrKeyName: SD_ATTR_KEY$c,
+    xmlName: XML_NODE_NAME$r,
+    sdNodeOrKeyName: SD_ATTR_KEY$b,
     attributes
   };
 };
-const config$p = {
-  xmlName: XML_NODE_NAME$s,
-  sdNodeOrKeyName: SD_ATTR_KEY$c,
+const config$q = {
+  xmlName: XML_NODE_NAME$r,
+  sdNodeOrKeyName: SD_ATTR_KEY$b,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$N,
-  attributes: validXmlAttributes$h
+  encode: encode$M,
+  attributes: validXmlAttributes$j
 };
-const translator$13 = NodeTranslator.from(config$p);
-const encode$M = (attributes) => attributes?.["w:val"];
-const decode$H = (attrs) => attrs?.color;
+const translator$1k = NodeTranslator.from(config$q);
+const encode$L = (attributes) => attributes?.["w:val"];
+const decode$G = (attrs) => attrs?.color;
 const attrConfig$m = Object.freeze({
   xmlName: "w:val",
   sdName: "color",
-  encode: encode$M,
-  decode: decode$H
+  encode: encode$L,
+  decode: decode$G
 });
-const encode$L = (attributes) => attributes?.["w:themeColor"];
-const decode$G = (attrs) => attrs?.themeColor;
+const encode$K = (attributes) => attributes?.["w:themeColor"];
+const decode$F = (attrs) => attrs?.themeColor;
 const attrConfig$l = Object.freeze({
   xmlName: "w:themeColor",
   sdName: "themeColor",
-  encode: encode$L,
-  decode: decode$G
+  encode: encode$K,
+  decode: decode$F
 });
-const encode$K = (attributes) => attributes?.["w:themeTint"];
-const decode$F = (attrs) => attrs?.themeTint;
+const encode$J = (attributes) => attributes?.["w:themeTint"];
+const decode$E = (attrs) => attrs?.themeTint;
 const attrConfig$k = Object.freeze({
   xmlName: "w:themeTint",
   sdName: "themeTint",
-  encode: encode$K,
-  decode: decode$F
+  encode: encode$J,
+  decode: decode$E
 });
-const encode$J = (attributes) => attributes?.["w:themeShade"];
-const decode$E = (attrs) => attrs?.themeShade;
+const encode$I = (attributes) => attributes?.["w:themeShade"];
+const decode$D = (attrs) => attrs?.themeShade;
 const attrConfig$j = Object.freeze({
   xmlName: "w:themeShade",
   sdName: "themeShade",
-  encode: encode$J,
-  decode: decode$E
+  encode: encode$I,
+  decode: decode$D
 });
-const validXmlAttributes$g = [attrConfig$m, attrConfig$l, attrConfig$k, attrConfig$j];
-const XML_NODE_NAME$r = "w:color";
-const SD_ATTR_KEY$b = "color";
-const encode$I = (params, encodedAttrs = {}) => {
+const validXmlAttributes$i = [attrConfig$m, attrConfig$l, attrConfig$k, attrConfig$j];
+const XML_NODE_NAME$q = "w:color";
+const SD_ATTR_KEY$a = "color";
+const encode$H = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes?.[0];
   const sourceAttrs = node?.attributes || {};
@@ -25571,63 +25643,63 @@ const encode$I = (params, encodedAttrs = {}) => {
   if (themeShade !== void 0 && themeShade !== null) attributes["w:themeShade"] = themeShade;
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$r,
-    sdNodeOrKeyName: SD_ATTR_KEY$b,
+    xmlName: XML_NODE_NAME$q,
+    sdNodeOrKeyName: SD_ATTR_KEY$a,
     attributes
   };
 };
-const config$o = {
-  xmlName: XML_NODE_NAME$r,
-  sdNodeOrKeyName: SD_ATTR_KEY$b,
+const config$p = {
+  xmlName: XML_NODE_NAME$q,
+  sdNodeOrKeyName: SD_ATTR_KEY$a,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$I,
-  attributes: validXmlAttributes$g
+  encode: encode$H,
+  attributes: validXmlAttributes$i
 };
-const translator$12 = NodeTranslator.from(config$o);
-const encode$H = (attributes) => attributes?.["w:eastAsia"];
-const decode$D = (attrs) => attrs?.eastAsia;
+const translator$1j = NodeTranslator.from(config$p);
+const encode$G = (attributes) => attributes?.["w:eastAsia"];
+const decode$C = (attrs) => attrs?.eastAsia;
 const attrConfig$i = Object.freeze({
   xmlName: "w:eastAsia",
   sdName: "eastAsia",
-  encode: encode$H,
-  decode: decode$D
+  encode: encode$G,
+  decode: decode$C
 });
-const encode$G = (attributes) => attributes?.["w:ascii"];
-const decode$C = (attrs) => attrs?.ascii;
+const encode$F = (attributes) => attributes?.["w:ascii"];
+const decode$B = (attrs) => attrs?.ascii;
 const attrConfig$h = Object.freeze({
   xmlName: "w:ascii",
   sdName: "ascii",
-  encode: encode$G,
-  decode: decode$C
+  encode: encode$F,
+  decode: decode$B
 });
-const encode$F = (attributes) => attributes?.["w:hAnsi"];
-const decode$B = (attrs) => attrs?.hAnsi;
+const encode$E = (attributes) => attributes?.["w:hAnsi"];
+const decode$A = (attrs) => attrs?.hAnsi;
 const attrConfig$g = Object.freeze({
   xmlName: "w:hAnsi",
   sdName: "hAnsi",
-  encode: encode$F,
-  decode: decode$B
+  encode: encode$E,
+  decode: decode$A
 });
-const encode$E = (attributes) => attributes?.["w:cs"];
-const decode$A = (attrs) => attrs?.cs;
+const encode$D = (attributes) => attributes?.["w:cs"];
+const decode$z = (attrs) => attrs?.cs;
 const attrConfig$f = Object.freeze({
   xmlName: "w:cs",
   sdName: "cs",
-  encode: encode$E,
-  decode: decode$A
-});
-const encode$D = (attributes) => attributes?.["w:val"];
-const decode$z = (attrs) => attrs?.value;
+  encode: encode$D,
+  decode: decode$z
+});
+const encode$C = (attributes) => attributes?.["w:val"];
+const decode$y = (attrs) => attrs?.value;
 const attrConfig$e = Object.freeze({
   xmlName: "w:val",
   sdName: "value",
-  encode: encode$D,
-  decode: decode$z
+  encode: encode$C,
+  decode: decode$y
 });
-const validXmlAttributes$f = [attrConfig$i, attrConfig$h, attrConfig$g, attrConfig$f, attrConfig$e];
-const XML_NODE_NAME$q = "w:rFonts";
-const SD_ATTR_KEY$a = "fontFamily";
-const encode$C = (params, encodedAttrs = {}) => {
+const validXmlAttributes$h = [attrConfig$i, attrConfig$h, attrConfig$g, attrConfig$f, attrConfig$e];
+const XML_NODE_NAME$p = "w:rFonts";
+const SD_ATTR_KEY$9 = "fontFamily";
+const encode$B = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes?.[0];
   const sourceAttrs = node?.attributes || {};
@@ -25651,111 +25723,119 @@ const encode$C = (params, encodedAttrs = {}) => {
     attributes["w:val"] = attributes["w:eastAsia"];
   }
   if (attributes["w:val"] === void 0) delete attributes["w:val"];
+  if (params.inlineDocumentFonts) {
+    const font = attributes["w:ascii"];
+    if (font) {
+      if (!params.inlineDocumentFonts.includes(font)) {
+        params.inlineDocumentFonts.push(font);
+      }
+    }
+  }
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$q,
-    sdNodeOrKeyName: SD_ATTR_KEY$a,
+    xmlName: XML_NODE_NAME$p,
+    sdNodeOrKeyName: SD_ATTR_KEY$9,
     attributes
   };
 };
-const config$n = {
-  xmlName: XML_NODE_NAME$q,
-  sdNodeOrKeyName: SD_ATTR_KEY$a,
+const config$o = {
+  xmlName: XML_NODE_NAME$p,
+  sdNodeOrKeyName: SD_ATTR_KEY$9,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$C,
-  attributes: validXmlAttributes$f
+  encode: encode$B,
+  attributes: validXmlAttributes$h
 };
-const translator$11 = NodeTranslator.from(config$n);
-const encode$B = (attributes) => attributes?.["w:val"];
-const decode$y = (attrs) => attrs?.styleId;
+const translator$1i = NodeTranslator.from(config$o);
+const encode$A = (attributes) => attributes?.["w:val"];
+const decode$x = (attrs) => attrs?.styleId;
 const attrConfig$d = Object.freeze({
   xmlName: "w:val",
   sdName: "styleId",
-  encode: encode$B,
-  decode: decode$y
+  encode: encode$A,
+  decode: decode$x
 });
-const validXmlAttributes$e = [attrConfig$d];
-const XML_NODE_NAME$p = "w:rStyle";
-const SD_ATTR_KEY$9 = "styleId";
-const encode$A = (params, encodedAttrs = {}) => {
+const validXmlAttributes$g = [attrConfig$d];
+const XML_NODE_NAME$o = "w:rStyle";
+const SD_ATTR_KEY$8 = "styleId";
+const encode$z = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes?.[0];
   const value = encodedAttrs.styleId ?? node?.attributes?.["w:val"];
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$p,
-    sdNodeOrKeyName: SD_ATTR_KEY$9,
+    xmlName: XML_NODE_NAME$o,
+    sdNodeOrKeyName: SD_ATTR_KEY$8,
     attributes: { "w:val": value ?? null }
   };
 };
-const config$m = {
-  xmlName: XML_NODE_NAME$p,
-  sdNodeOrKeyName: SD_ATTR_KEY$9,
+const config$n = {
+  xmlName: XML_NODE_NAME$o,
+  sdNodeOrKeyName: SD_ATTR_KEY$8,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$A,
-  attributes: validXmlAttributes$e
+  encode: encode$z,
+  attributes: validXmlAttributes$g
 };
-const translator$10 = NodeTranslator.from(config$m);
-const encode$z = (attributes) => attributes?.["w:val"];
-const decode$x = (attrs) => attrs?.fontSize;
+const translator$1h = NodeTranslator.from(config$n);
+const encode$y = (attributes) => attributes?.["w:val"];
+const decode$w = (attrs) => attrs?.fontSize;
 const attrConfig$c = Object.freeze({
   xmlName: "w:val",
   sdName: "fontSize",
-  encode: encode$z,
-  decode: decode$x
+  encode: encode$y,
+  decode: decode$w
 });
-const validXmlAttributes$d = [attrConfig$c];
-const XML_NODE_NAME$o = "w:sz";
-const SD_ATTR_KEY$8 = "fontSize";
-const encode$y = (params, encodedAttrs = {}) => {
+const validXmlAttributes$f = [attrConfig$c];
+const XML_NODE_NAME$n = "w:sz";
+const SD_ATTR_KEY$7 = "fontSize";
+const encode$x = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes?.[0];
   const value = encodedAttrs.fontSize ?? node?.attributes?.["w:val"];
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$o,
-    sdNodeOrKeyName: SD_ATTR_KEY$8,
+    xmlName: XML_NODE_NAME$n,
+    sdNodeOrKeyName: SD_ATTR_KEY$7,
     attributes: { "w:val": value ?? null }
   };
 };
-const config$l = {
-  xmlName: XML_NODE_NAME$o,
-  sdNodeOrKeyName: SD_ATTR_KEY$8,
+const config$m = {
+  xmlName: XML_NODE_NAME$n,
+  sdNodeOrKeyName: SD_ATTR_KEY$7,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$y,
-  attributes: validXmlAttributes$d
+  encode: encode$x,
+  attributes: validXmlAttributes$f
 };
-const translator$$ = NodeTranslator.from(config$l);
-const encode$x = (attributes) => attributes?.["w:val"];
-const decode$w = (attrs) => attrs?.fontSizeCs;
+const translator$1g = NodeTranslator.from(config$m);
+const encode$w = (attributes) => attributes?.["w:val"];
+const decode$v = (attrs) => attrs?.fontSizeCs;
 const attrConfig$b = Object.freeze({
   xmlName: "w:val",
   sdName: "fontSizeCs",
-  encode: encode$x,
-  decode: decode$w
+  encode: encode$w,
+  decode: decode$v
 });
-const validXmlAttributes$c = [attrConfig$b];
-const XML_NODE_NAME$n = "w:szCs";
-const SD_ATTR_KEY$7 = "fontSizeCs";
-const encode$w = (params, encodedAttrs = {}) => {
+const validXmlAttributes$e = [attrConfig$b];
+const XML_NODE_NAME$m = "w:szCs";
+const SD_ATTR_KEY$6 = "fontSizeCs";
+const encode$v = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes?.[0];
   const value = encodedAttrs.fontSizeCs ?? node?.attributes?.["w:val"];
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$n,
-    sdNodeOrKeyName: SD_ATTR_KEY$7,
+    xmlName: XML_NODE_NAME$m,
+    sdNodeOrKeyName: SD_ATTR_KEY$6,
     attributes: { "w:val": value ?? null }
   };
 };
-const config$k = {
-  xmlName: XML_NODE_NAME$n,
-  sdNodeOrKeyName: SD_ATTR_KEY$7,
+const config$l = {
+  xmlName: XML_NODE_NAME$m,
+  sdNodeOrKeyName: SD_ATTR_KEY$6,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$w,
-  attributes: validXmlAttributes$c
+  encode: encode$v,
+  attributes: validXmlAttributes$e
 };
-const translator$_ = NodeTranslator.from(config$k);
+const translator$1f = NodeTranslator.from(config$l);
 const generateV2HandlerEntity = (handlerName, translator2) => ({
   handlerName,
   handler: (params) => {
@@ -25779,7 +25859,7 @@ function createSingleAttrPropertyHandler(xmlName, sdName = null, attrName = "w:v
     xmlName,
     sdNodeOrKeyName: sdName,
     encode: ({ nodes }) => {
-      return transformEncode(nodes[0].attributes[attrName]) ?? void 0;
+      return transformEncode(nodes[0]?.attributes?.[attrName]) ?? void 0;
     },
     decode: ({ node }) => {
       const value = node.attrs?.[sdName] != null ? transformDecode(node.attrs[sdName]) : void 0;
@@ -25811,8 +25891,32 @@ function createBorderPropertyHandler(xmlName, sdName = null) {
     xmlName,
     sdNodeOrKeyName: sdName,
     attributes: [
-      createAttributeHandler("w:val"),
-      createAttributeHandler("w:color"),
+      createAttributeHandler(
+        "w:val",
+        "val",
+        (v2) => v2 === "nil" ? "none" : v2,
+        (v2) => v2 === "none" ? "nil" : v2
+      ),
+      createAttributeHandler(
+        "w:color",
+        "color",
+        (v2) => {
+          if (v2 === "auto") {
+            return null;
+          } else if (v2) {
+            return `#${v2}`;
+          } else {
+            return void 0;
+          }
+        },
+        (v2) => {
+          if (v2) {
+            return v2.replace("#", "");
+          } else {
+            return void 0;
+          }
+        }
+      ),
       createAttributeHandler("w:themeColor"),
       createAttributeHandler("w:themeTint"),
       createAttributeHandler("w:themeShade"),
@@ -25878,6 +25982,37 @@ function decodeProperties(translatorsBySdName, properties) {
   });
   return elements;
 }
+function createNestedPropertiesTranslator(xmlName, sdName, propertyTranslators2, defaultEncodedAttrs = {}) {
+  const propertyTranslatorsByXmlName = {};
+  const propertyTranslatorsBySdName = {};
+  propertyTranslators2.forEach((translator2) => {
+    propertyTranslatorsByXmlName[translator2.xmlName] = translator2;
+    propertyTranslatorsBySdName[translator2.sdNodeOrKeyName] = translator2;
+  });
+  return {
+    xmlName,
+    sdNodeOrKeyName: sdName,
+    type: NodeTranslator.translatorTypes.NODE,
+    attributes: [],
+    encode: (params) => {
+      const { nodes } = params;
+      const node = nodes[0];
+      const attributes = { ...defaultEncodedAttrs, ...encodeProperties(node, propertyTranslatorsByXmlName) };
+      return Object.keys(attributes).length > 0 ? attributes : void 0;
+    },
+    decode: (params) => {
+      const currentValue = params.node.attrs?.[sdName];
+      const elements = decodeProperties(propertyTranslatorsBySdName, currentValue);
+      const newNode = {
+        name: xmlName,
+        type: "element",
+        attributes: {},
+        elements
+      };
+      return newNode;
+    }
+  };
+}
 const parseBoolean = (value) => value != null ? ["1", "true"].includes(value) : void 0;
 const booleanToString = (value) => value != null ? value ? "1" : "0" : void 0;
 const parseInteger = (value) => {
@@ -25889,9 +26024,9 @@ const integerToString = (value) => {
   const intValue = parseInteger(value);
   return intValue != void 0 ? String(intValue) : void 0;
 };
-const XML_NODE_NAME$m = "w:caps";
-const SD_ATTR_KEY$6 = "textTransform";
-const encode$v = (params, encodedAttrs = {}) => {
+const XML_NODE_NAME$l = "w:caps";
+const SD_ATTR_KEY$5 = "textTransform";
+const encode$u = (params, encodedAttrs = {}) => {
   const { nodes } = params;
   const node = nodes[0];
   if (!node) return void 0;
@@ -25903,31 +26038,31 @@ const encode$v = (params, encodedAttrs = {}) => {
   }
   return {
     type: "attr",
-    xmlName: XML_NODE_NAME$m,
-    sdNodeOrKeyName: SD_ATTR_KEY$6,
-    attributes: { [SD_ATTR_KEY$6]: result }
+    xmlName: XML_NODE_NAME$l,
+    sdNodeOrKeyName: SD_ATTR_KEY$5,
+    attributes: { [SD_ATTR_KEY$5]: result }
   };
 };
-const config$j = {
-  xmlName: XML_NODE_NAME$m,
-  sdNodeOrKeyName: SD_ATTR_KEY$6,
+const config$k = {
+  xmlName: XML_NODE_NAME$l,
+  sdNodeOrKeyName: SD_ATTR_KEY$5,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$v,
+  encode: encode$u,
   attributes: [createAttributeHandler("w:val")]
 };
-const translator$Z = NodeTranslator.from(config$j);
+const translator$1e = NodeTranslator.from(config$k);
 const runPropertyTranslators = Object.freeze({
-  "w:b": translator$16,
-  "w:i": translator$15,
-  "w:u": translator$14,
-  "w:strike": translator$13,
-  "w:color": translator$12,
-  "w:highlight": translator$19,
-  "w:rFonts": translator$11,
-  "w:rStyle": translator$10,
-  "w:sz": translator$$,
-  "w:szCs": translator$_,
-  "w:caps": translator$Z
+  "w:b": translator$1n,
+  "w:i": translator$1m,
+  "w:u": translator$1l,
+  "w:strike": translator$1k,
+  "w:color": translator$1j,
+  "w:highlight": translator$1q,
+  "w:rFonts": translator$1i,
+  "w:rStyle": translator$1h,
+  "w:sz": translator$1g,
+  "w:szCs": translator$1f,
+  "w:caps": translator$1e
 });
 const rawRunPropertyXmlNames = Object.freeze(["w:lang", "w:shd"]);
 const RAW_CHILD_NAME_SET = new Set(rawRunPropertyXmlNames);
@@ -25941,9 +26076,9 @@ const toRunPropertyEntry = (candidate) => {
     attributes: { ...candidate.attributes || {} }
   };
 };
-const XML_NODE_NAME$l = "w:rPr";
-const SD_ATTR_KEY$5 = "runProperties";
-const encode$u = (params) => {
+const XML_NODE_NAME$k = "w:rPr";
+const SD_ATTR_KEY$4 = "runProperties";
+const encode$t = (params) => {
   const { nodes } = params;
   const node = nodes?.[0] || {};
   const contents = Array.isArray(node.elements) ? node.elements : [];
@@ -25977,16 +26112,16 @@ const encode$u = (params) => {
     attributes: runPropsArray
   };
 };
-const config$i = {
-  xmlName: XML_NODE_NAME$l,
-  sdNodeOrKeyName: SD_ATTR_KEY$5,
+const config$j = {
+  xmlName: XML_NODE_NAME$k,
+  sdNodeOrKeyName: SD_ATTR_KEY$4,
   type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$u
+  encode: encode$t
 };
-const translator$Y = NodeTranslator.from(config$i);
+const translator$1d = NodeTranslator.from(config$j);
 const EAST_ASIAN_CHARACTER_REGEX = /[\u1100-\u11FF\u2E80-\u2EFF\u2F00-\u2FDF\u3040-\u30FF\u3100-\u312F\u3130-\u318F\u31A0-\u31BF\u3400-\u4DBF\u4E00-\u9FFF\uA960-\uA97F\uAC00-\uD7AF\uF900-\uFAFF\uFF00-\uFFEF]/u;
 const containsEastAsianCharacters = (text) => EAST_ASIAN_CHARACTER_REGEX.test(text);
-const collectRunProperties = (params, rPrNode, translator2 = translator$Y) => {
+const collectRunProperties = (params, rPrNode, translator2 = translator$1d) => {
   if (!rPrNode) return { entries: [], hadRPr: false, styleChangeMarks: [] };
   const result = translator2.encode({ ...params, nodes: [rPrNode] }) || {};
   let entries = [];
@@ -26459,7 +26594,7 @@ const ensureTrackedWrapper = (runs, trackingMarksByType = /* @__PURE__ */ new Ma
   }
   return runs;
 };
-const XML_NODE_NAME$k = "w:hyperlink";
+const XML_NODE_NAME$j = "w:hyperlink";
 const SD_NODE_NAME$e = "link";
 const _createAttributeHandler = (xmlName, sdName) => ({
   xmlName,
@@ -26467,7 +26602,7 @@ const _createAttributeHandler = (xmlName, sdName) => ({
   encode: (attributes) => attributes[xmlName],
   decode: (attributes) => attributes[sdName]
 });
-const validXmlAttributes$b = [
+const validXmlAttributes$d = [
   _createAttributeHandler("w:anchor", "anchor"),
   _createAttributeHandler("w:docLocation", "docLocation"),
   {
@@ -26480,7 +26615,7 @@ const validXmlAttributes$b = [
   _createAttributeHandler("r:id", "rId"),
   _createAttributeHandler("w:tgtFrame", "target")
 ];
-const encode$t = (params, encodedAttrs) => {
+const encode$s = (params, encodedAttrs) => {
   const { nodes, docx, nodeListHandler } = params;
   const node = nodes[0];
   let href = _resolveHref(docx, encodedAttrs);
@@ -26514,7 +26649,7 @@ const _resolveHref = (docx, encodedAttrs) => {
   }
   return href;
 };
-function decode$v(params) {
+function decode$u(params) {
   const { hyperlinkGroup = [params.node] } = params.extraParams || {};
   const node = hyperlinkGroup[0];
   const linkMark = node.marks.find((m2) => m2.type === "link");
@@ -26563,55 +26698,55 @@ function _addNewLinkRelationship(params, link) {
   });
   return id;
 }
-const config$h = {
-  xmlName: XML_NODE_NAME$k,
+const config$i = {
+  xmlName: XML_NODE_NAME$j,
   sdNodeOrKeyName: SD_NODE_NAME$e,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$t,
-  decode: decode$v,
-  attributes: validXmlAttributes$b
+  encode: encode$s,
+  decode: decode$u,
+  attributes: validXmlAttributes$d
 };
-const translator$X = NodeTranslator.from(config$h);
-const encode$s = (attributes) => {
+const translator$1c = NodeTranslator.from(config$i);
+const encode$r = (attributes) => {
   return attributes["w:rsidR"];
 };
-const decode$u = (attrs) => {
+const decode$t = (attrs) => {
   return attrs.rsidR;
 };
 const attrConfig$a = Object.freeze({
   xmlName: "w:rsidR",
   sdName: "rsidR",
-  encode: encode$s,
-  decode: decode$u
+  encode: encode$r,
+  decode: decode$t
 });
-const encode$r = (attributes) => {
+const encode$q = (attributes) => {
   return attributes["w:rsidRPr"];
 };
-const decode$t = (attrs) => {
+const decode$s = (attrs) => {
   return attrs.rsidRPr;
 };
 const attrConfig$9 = Object.freeze({
   xmlName: "w:rsidRPr",
   sdName: "rsidRPr",
-  encode: encode$r,
-  decode: decode$t
+  encode: encode$q,
+  decode: decode$s
 });
-const encode$q = (attributes) => {
+const encode$p = (attributes) => {
   return attributes["w:rsidDel"];
 };
-const decode$s = (attrs) => {
+const decode$r = (attrs) => {
   return attrs.rsidDel;
 };
 const attrConfig$8 = Object.freeze({
   xmlName: "w:rsidDel",
   sdName: "rsidDel",
-  encode: encode$q,
-  decode: decode$s
+  encode: encode$p,
+  decode: decode$r
 });
-const validXmlAttributes$a = [attrConfig$a, attrConfig$9, attrConfig$8];
-const XML_NODE_NAME$j = "w:r";
+const validXmlAttributes$c = [attrConfig$a, attrConfig$9, attrConfig$8];
+const XML_NODE_NAME$i = "w:r";
 const SD_KEY_NAME = "run";
-const encode$p = (params, encodedAttrs = {}) => {
+const encode$o = (params, encodedAttrs = {}) => {
   const { nodes = [], nodeListHandler } = params || {};
   const runNode = nodes[0];
   if (!runNode) return void 0;
@@ -26659,7 +26794,7 @@ const encode$p = (params, encodedAttrs = {}) => {
   }
   return runNodeResult;
 };
-const decode$r = (params, decodedAttrs = {}) => {
+const decode$q = (params, decodedAttrs = {}) => {
   const { node } = params || {};
   if (!node) return void 0;
   const isLinkNode = node.marks?.some((m2) => m2.type === "link");
@@ -26668,7 +26803,7 @@ const decode$r = (params, decodedAttrs = {}) => {
       ...params.extraParams,
       linkProcessed: true
     };
-    return translator$X.decode({ ...params, extraParams });
+    return translator$1c.decode({ ...params, extraParams });
   }
   const { runNode: runNodeForExport, trackingMarksByType } = prepareRunTrackingContext(node);
   const runAttrs = runNodeForExport.attrs || {};
@@ -26724,7 +26859,7 @@ const decode$r = (params, decodedAttrs = {}) => {
       runs.push(trackedClone);
       return;
     }
-    const runWrapper = { name: XML_NODE_NAME$j, elements: [] };
+    const runWrapper = { name: XML_NODE_NAME$i, elements: [] };
     applyBaseRunProps(runWrapper);
     if (!Array.isArray(runWrapper.elements)) runWrapper.elements = [];
     runWrapper.elements.push(cloneXmlNode(child));
@@ -26732,7 +26867,7 @@ const decode$r = (params, decodedAttrs = {}) => {
   });
   const trackedRuns = ensureTrackedWrapper(runs, trackingMarksByType);
   if (!trackedRuns.length) {
-    const emptyRun = { name: XML_NODE_NAME$j, elements: [] };
+    const emptyRun = { name: XML_NODE_NAME$i, elements: [] };
     applyBaseRunProps(emptyRun);
     trackedRuns.push(emptyRun);
   }
@@ -26746,15 +26881,15 @@ const decode$r = (params, decodedAttrs = {}) => {
   }
   return trackedRuns;
 };
-const config$g = {
-  xmlName: XML_NODE_NAME$j,
+const config$h = {
+  xmlName: XML_NODE_NAME$i,
   sdNodeOrKeyName: SD_KEY_NAME,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$p,
-  decode: decode$r,
-  attributes: validXmlAttributes$a
+  encode: encode$o,
+  decode: decode$q,
+  attributes: validXmlAttributes$c
 };
-const translator$W = NodeTranslator.from(config$g);
+const translator$1b = NodeTranslator.from(config$h);
 function preProcessVerticalMergeCells(table, { editorSchema }) {
   if (!table || !Array.isArray(table.content)) {
     return table;
@@ -26795,13 +26930,13 @@ function preProcessVerticalMergeCells(table, { editorSchema }) {
   }
   return table;
 }
-const translator$V = NodeTranslator.from({
+const translator$1a = 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$U = NodeTranslator.from({
+const translator$19 = NodeTranslator.from({
   xmlName: "w:cnfStyle",
   sdNodeOrKeyName: "cnfStyle",
   attributes: [
@@ -26827,8 +26962,8 @@ const translator$U = NodeTranslator.from({
     return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
   }
 });
-const translator$T = NodeTranslator.from(createSingleAttrPropertyHandler("w:divId"));
-const translator$S = NodeTranslator.from(
+const translator$18 = NodeTranslator.from(createSingleAttrPropertyHandler("w:divId"));
+const translator$17 = NodeTranslator.from(
   createSingleAttrPropertyHandler(
     "w:gridAfter",
     null,
@@ -26837,7 +26972,7 @@ const translator$S = NodeTranslator.from(
     (v2) => integerToString(v2)
   )
 );
-const translator$R = NodeTranslator.from(
+const translator$16 = NodeTranslator.from(
   createSingleAttrPropertyHandler(
     "w:gridBefore",
     null,
@@ -26846,21 +26981,21 @@ const translator$R = NodeTranslator.from(
     (v2) => integerToString(v2)
   )
 );
-const translator$Q = NodeTranslator.from({
+const translator$15 = 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$P = NodeTranslator.from(createSingleAttrPropertyHandler("w:jc", "justification"));
-const translator$O = NodeTranslator.from(createMeasurementPropertyHandler("w:tblCellSpacing", "tableCellSpacing"));
-const translator$N = NodeTranslator.from({
+const translator$14 = NodeTranslator.from(createSingleAttrPropertyHandler("w:jc", "justification"));
+const translator$13 = NodeTranslator.from(createMeasurementPropertyHandler("w:tblCellSpacing", "tableCellSpacing"));
+const translator$12 = 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$M = NodeTranslator.from({
+const translator$11 = NodeTranslator.from({
   xmlName: "w:trHeight",
   sdNodeOrKeyName: "rowHeight",
   encode: ({ nodes }) => {
@@ -26887,73 +27022,32 @@ const translator$M = NodeTranslator.from({
     return Object.keys(heightAttrs).length > 0 ? { attributes: heightAttrs } : void 0;
   }
 });
-const translator$L = NodeTranslator.from(createMeasurementPropertyHandler("w:wAfter"));
-const translator$K = NodeTranslator.from(createMeasurementPropertyHandler("w:wBefore"));
-const XML_NODE_NAME$i = "w:trPr";
-const SD_ATTR_KEY$4 = "tableRowProperties";
-const encode$o = (params) => {
-  const { nodes } = params;
-  const node = nodes[0];
-  let attributes = {
+const translator$10 = NodeTranslator.from(createMeasurementPropertyHandler("w:wAfter"));
+const translator$$ = NodeTranslator.from(createMeasurementPropertyHandler("w:wBefore"));
+const propertyTranslators$6 = [
+  translator$1a,
+  translator$19,
+  translator$18,
+  translator$17,
+  translator$16,
+  translator$15,
+  translator$14,
+  translator$13,
+  translator$12,
+  translator$11,
+  translator$10,
+  translator$$
+];
+const translator$_ = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:trPr", "tableRowProperties", propertyTranslators$6, {
     cantSplit: false,
     hidden: false,
     repeatHeader: false
-  };
-  attributes = {
-    ...attributes,
-    ...encodeProperties(node, propertyTranslatorsByXmlName$2)
-  };
-  return {
-    type: NodeTranslator.translatorTypes.ATTRIBUTE,
-    xmlName: XML_NODE_NAME$i,
-    sdNodeOrKeyName: SD_ATTR_KEY$4,
-    attributes
-  };
-};
-const decode$q = (params) => {
-  const { tableRowProperties = {} } = params.node.attrs || {};
-  const elements = decodeProperties(propertyTranslatorsBySdName$2, tableRowProperties);
-  const newNode = {
-    name: "w:trPr",
-    type: "element",
-    attributes: {},
-    elements
-  };
-  return newNode;
-};
-const propertyTranslators$3 = [
-  translator$V,
-  translator$U,
-  translator$T,
-  translator$S,
-  translator$R,
-  translator$Q,
-  translator$P,
-  translator$O,
-  translator$N,
-  translator$M,
-  translator$L,
-  translator$K
-];
-const propertyTranslatorsByXmlName$2 = {};
-propertyTranslators$3.forEach((translator2) => {
-  propertyTranslatorsByXmlName$2[translator2.xmlName] = translator2;
-});
-const propertyTranslatorsBySdName$2 = {};
-propertyTranslators$3.forEach((translator2) => {
-  propertyTranslatorsBySdName$2[translator2.sdNodeOrKeyName] = translator2;
-});
-const config$f = {
-  xmlName: XML_NODE_NAME$i,
-  sdNodeOrKeyName: SD_ATTR_KEY$4,
-  type: NodeTranslator.translatorTypes.ATTRIBUTE,
-  encode: encode$o,
-  decode: decode$q
-};
-const translator$J = NodeTranslator.from(config$f);
+  })
+);
 const XML_NODE_NAME$h = "w:tr";
 const SD_NODE_NAME$d = "tableRow";
-const validXmlAttributes$9 = ["w:rsidDel", "w:rsidR", "w:rsidRPr", "w:rsidTr", "w14:paraId", "w14:textId"].map(
+const validXmlAttributes$b = ["w:rsidDel", "w:rsidR", "w:rsidRPr", "w:rsidTr", "w14:paraId", "w14:textId"].map(
   (xmlName) => createAttributeHandler(xmlName)
 );
 const encode$n = (params, encodedAttrs) => {
@@ -26961,10 +27055,10 @@ const encode$n = (params, encodedAttrs) => {
   let tableRowProperties = {};
   const tPr = row.elements.find((el) => el.name === "w:trPr");
   if (tPr) {
-    ({ attributes: tableRowProperties } = translator$J.encode({
+    tableRowProperties = translator$_.encode({
       ...params,
       nodes: [tPr]
-    }));
+    });
   }
   encodedAttrs["tableRowProperties"] = Object.freeze(tableRowProperties);
   encodedAttrs["rowHeight"] = twipsToPixels(tableRowProperties["rowHeight"]?.value);
@@ -26974,7 +27068,7 @@ const encode$n = (params, encodedAttrs) => {
   let currentColumnIndex = 0;
   const content = cellNodes?.map((n) => {
     let columnWidth = gridColumnWidths?.[currentColumnIndex] || null;
-    const result = translator$a.encode({
+    const result = translator$c.encode({
       ...params,
       extraParams: {
         ...params.extraParams,
@@ -27008,7 +27102,7 @@ const decode$p = (params, decodedAttrs) => {
       }
     }
     tableRowProperties["cantSplit"] = node.attrs["cantSplit"];
-    const trPr = translator$J.decode({
+    const trPr = translator$_.decode({
       ...params,
       node: { ...node, attrs: { ...node.attrs, tableRowProperties } }
     });
@@ -27020,22 +27114,22 @@ const decode$p = (params, decodedAttrs) => {
     elements
   };
 };
-const config$e = {
+const config$g = {
   xmlName: XML_NODE_NAME$h,
   sdNodeOrKeyName: SD_NODE_NAME$d,
   type: NodeTranslator.translatorTypes.NODE,
   encode: encode$n,
   decode: decode$p,
-  attributes: validXmlAttributes$9
+  attributes: validXmlAttributes$b
 };
-const translator$I = NodeTranslator.from(config$e);
-const translator$H = NodeTranslator.from({
+const translator$Z = NodeTranslator.from(config$g);
+const translator$Y = 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$G = NodeTranslator.from({
+const translator$X = NodeTranslator.from({
   xmlName: "w:shd",
   sdNodeOrKeyName: "shading",
   attributes: [
@@ -27057,11 +27151,11 @@ const translator$G = NodeTranslator.from({
     return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
   }
 });
-const translator$F = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblCaption", "caption"));
-const translator$E = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblDescription", "description"));
-const translator$D = NodeTranslator.from(createMeasurementPropertyHandler("w:tblInd", "tableIndent"));
-const translator$C = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblLayout", "tableLayout", "w:type"));
-const translator$B = NodeTranslator.from({
+const translator$W = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblCaption", "caption"));
+const translator$V = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblDescription", "description"));
+const translator$U = NodeTranslator.from(createMeasurementPropertyHandler("w:tblInd", "tableIndent"));
+const translator$T = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblLayout", "tableLayout", "w:type"));
+const translator$S = 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")]),
@@ -27073,16 +27167,16 @@ const translator$B = NodeTranslator.from({
     return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
   }
 });
-const translator$A = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblOverlap", "overlap"));
-const translator$z = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblStyle", "tableStyleId"));
-const translator$y = NodeTranslator.from(
+const translator$R = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblOverlap", "overlap"));
+const translator$Q = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblStyle", "tableStyleId"));
+const translator$P = NodeTranslator.from(
   createSingleAttrPropertyHandler("w:tblStyleColBandSize", "tableStyleColBandSize")
 );
-const translator$x = NodeTranslator.from(
+const translator$O = NodeTranslator.from(
   createSingleAttrPropertyHandler("w:tblStyleRowBandSize", "tableStyleRowBandSize")
 );
-const translator$w = NodeTranslator.from(createMeasurementPropertyHandler("w:tblW", "tableWidth"));
-const translator$v = NodeTranslator.from({
+const translator$N = NodeTranslator.from(createMeasurementPropertyHandler("w:tblW", "tableWidth"));
+const translator$M = 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))),
@@ -27094,160 +27188,67 @@ const translator$v = NodeTranslator.from({
     return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
   }
 });
-const translator$u = NodeTranslator.from(createBorderPropertyHandler("w:bottom"));
-const translator$t = NodeTranslator.from(createMeasurementPropertyHandler("w:bottom", "marginBottom"));
-const translator$s = NodeTranslator.from(createBorderPropertyHandler("w:end"));
-const translator$r = NodeTranslator.from(createMeasurementPropertyHandler("w:end", "marginEnd"));
-const translator$q = NodeTranslator.from(createBorderPropertyHandler("w:insideH"));
-const translator$p = NodeTranslator.from(createBorderPropertyHandler("w:insideV"));
-const translator$o = NodeTranslator.from(createBorderPropertyHandler("w:left"));
-const translator$n = NodeTranslator.from(createMeasurementPropertyHandler("w:left", "marginLeft"));
-const translator$m = NodeTranslator.from(createBorderPropertyHandler("w:right"));
-const translator$l = NodeTranslator.from(createMeasurementPropertyHandler("w:right", "marginRight"));
-const translator$k = NodeTranslator.from(createBorderPropertyHandler("w:start"));
-const translator$j = NodeTranslator.from(createMeasurementPropertyHandler("w:start", "marginStart"));
-const translator$i = NodeTranslator.from(createBorderPropertyHandler("w:top"));
-const translator$h = NodeTranslator.from(createMeasurementPropertyHandler("w:top", "marginTop"));
-const XML_NODE_NAME$g = "w:tblBorders";
-const SD_ATTR_KEY$3 = "borders";
-const encode$m = (params) => {
-  const { nodes } = params;
-  const node = nodes[0];
-  const attributes = encodeProperties(node, tblBordersTranslatorsByXmlName);
-  return Object.keys(attributes).length > 0 ? attributes : void 0;
-};
-const decode$o = (params) => {
-  const { borders = {} } = params.node.attrs || {};
-  const elements = decodeProperties(tblBordersTranslatorsBySdName, borders);
-  const newNode = {
-    name: "w:tblBorders",
-    type: "element",
-    attributes: {},
-    elements
-  };
-  return newNode;
-};
-const propertyTranslators$2 = [
-  translator$u,
-  translator$s,
-  translator$q,
-  translator$p,
-  translator$o,
-  translator$m,
-  translator$k,
-  translator$i
-];
-const tblBordersTranslatorsByXmlName = {};
-const tblBordersTranslatorsBySdName = {};
-propertyTranslators$2.forEach((translator2) => {
-  tblBordersTranslatorsByXmlName[translator2.xmlName] = translator2;
-  tblBordersTranslatorsBySdName[translator2.sdNodeOrKeyName] = translator2;
-});
-const translator$g = NodeTranslator.from({
-  xmlName: XML_NODE_NAME$g,
-  sdNodeOrKeyName: SD_ATTR_KEY$3,
-  type: NodeTranslator.translatorTypes.NODE,
-  attributes: [],
-  encode: encode$m,
-  decode: decode$o
-});
-const XML_NODE_NAME$f = "w:tblCellMar";
-const SD_ATTR_KEY$2 = "cellMargins";
-const encode$l = (params) => {
-  const { nodes } = params;
-  const node = nodes[0];
-  const attributes = encodeProperties(node, propertyTranslatorsByXmlName$1);
-  return Object.keys(attributes).length > 0 ? attributes : void 0;
-};
-const decode$n = (params) => {
-  const { cellMargins = {} } = params.node.attrs || {};
-  const elements = decodeProperties(propertyTranslatorsBySdName$1, cellMargins);
-  const newNode = {
-    name: XML_NODE_NAME$f,
-    type: "element",
-    attributes: {},
-    elements
-  };
-  return newNode;
-};
-const propertyTranslators$1 = [
-  translator$t,
-  translator$r,
-  translator$n,
-  translator$l,
-  translator$j,
-  translator$h
-];
-const propertyTranslatorsByXmlName$1 = {};
-const propertyTranslatorsBySdName$1 = {};
-propertyTranslators$1.forEach((translator2) => {
-  propertyTranslatorsByXmlName$1[translator2.xmlName] = translator2;
-  propertyTranslatorsBySdName$1[translator2.sdNodeOrKeyName] = translator2;
-});
-const translator$f = NodeTranslator.from({
-  xmlName: XML_NODE_NAME$f,
-  sdNodeOrKeyName: SD_ATTR_KEY$2,
-  type: NodeTranslator.translatorTypes.NODE,
-  attributes: [],
-  encode: encode$l,
-  decode: decode$n
-});
-const XML_NODE_NAME$e = "w:tblPr";
-const SD_ATTR_KEY$1 = "tableProperties";
-const encode$k = (params) => {
-  const { nodes } = params;
-  const node = nodes[0];
-  const attributes = encodeProperties(node, propertyTranslatorsByXmlName);
-  return {
-    xmlName: XML_NODE_NAME$e,
-    sdNodeOrKeyName: SD_ATTR_KEY$1,
-    attributes
-  };
-};
-const decode$m = (params) => {
-  const { tableProperties = {} } = params.node.attrs || {};
-  const elements = decodeProperties(propertyTranslatorsBySdName, tableProperties);
-  const newNode = {
-    name: "w:tblPr",
-    type: "element",
-    attributes: {},
-    elements
-  };
-  return newNode;
-};
-const propertyTranslators = [
+const translator$L = NodeTranslator.from(createBorderPropertyHandler("w:bottom"));
+const translator$K = NodeTranslator.from(createMeasurementPropertyHandler("w:bottom", "marginBottom"));
+const translator$J = NodeTranslator.from(createBorderPropertyHandler("w:end"));
+const translator$I = NodeTranslator.from(createMeasurementPropertyHandler("w:end", "marginEnd"));
+const translator$H = NodeTranslator.from(createBorderPropertyHandler("w:insideH"));
+const translator$G = NodeTranslator.from(createBorderPropertyHandler("w:insideV"));
+const translator$F = NodeTranslator.from(createBorderPropertyHandler("w:left"));
+const translator$E = NodeTranslator.from(createMeasurementPropertyHandler("w:left", "marginLeft"));
+const translator$D = NodeTranslator.from(createBorderPropertyHandler("w:right"));
+const translator$C = NodeTranslator.from(createMeasurementPropertyHandler("w:right", "marginRight"));
+const translator$B = NodeTranslator.from(createBorderPropertyHandler("w:start"));
+const translator$A = NodeTranslator.from(createMeasurementPropertyHandler("w:start", "marginStart"));
+const translator$z = NodeTranslator.from(createBorderPropertyHandler("w:top"));
+const translator$y = NodeTranslator.from(createMeasurementPropertyHandler("w:top", "marginTop"));
+const propertyTranslators$5 = [
+  translator$L,
+  translator$J,
   translator$H,
-  translator$P,
   translator$G,
   translator$F,
-  translator$O,
-  translator$E,
   translator$D,
-  translator$C,
   translator$B,
+  translator$z
+];
+const translator$x = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:tblBorders", "borders", propertyTranslators$5)
+);
+const propertyTranslators$4 = [
+  translator$K,
+  translator$I,
+  translator$E,
+  translator$C,
   translator$A,
-  translator$z,
-  translator$y,
+  translator$y
+];
+const translator$w = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:tblCellMar", "cellMargins", propertyTranslators$4)
+);
+const propertyTranslators$3 = [
+  translator$Y,
+  translator$14,
+  translator$X,
+  translator$W,
+  translator$13,
+  translator$V,
+  translator$U,
+  translator$T,
+  translator$S,
+  translator$R,
+  translator$Q,
+  translator$P,
+  translator$O,
+  translator$N,
+  translator$M,
   translator$x,
-  translator$w,
-  translator$v,
-  translator$g,
-  translator$f
+  translator$w
 ];
-const propertyTranslatorsByXmlName = {};
-const propertyTranslatorsBySdName = {};
-propertyTranslators.forEach((translator2) => {
-  propertyTranslatorsByXmlName[translator2.xmlName] = translator2;
-  propertyTranslatorsBySdName[translator2.sdNodeOrKeyName] = translator2;
-});
-const config$d = {
-  xmlName: XML_NODE_NAME$e,
-  sdNodeOrKeyName: SD_ATTR_KEY$1,
-  encode: encode$k,
-  decode: decode$m
-};
-const translator$e = NodeTranslator.from(config$d);
-const translator$d = NodeTranslator.from(
+const translator$v = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:tblPr", "tableProperties", propertyTranslators$3)
+);
+const translator$u = NodeTranslator.from(
   createSingleAttrPropertyHandler("w:gridCol", "col", "w:w", parseInteger, integerToString)
 );
 const DEFAULT_COLUMN_WIDTH_PX = 100;
@@ -27297,20 +27298,20 @@ const resolveFallbackColumnWidthTwips = (params, totalColumns, cellMinWidthTwips
   }
   return Math.max(fallbackWidthTwips, cellMinWidthTwips);
 };
-const XML_NODE_NAME$d = "w:tblGrid";
-const SD_ATTR_KEY = "grid";
+const XML_NODE_NAME$g = "w:tblGrid";
+const SD_ATTR_KEY$3 = "grid";
 const cellMinWidth = pixelsToTwips(10);
-const encode$j = (params) => {
+const encode$m = (params) => {
   const { nodes } = params;
   const node = nodes[0];
-  const attributes = encodeProperties(node, { [translator$d.xmlName]: translator$d }, true);
+  const attributes = encodeProperties(node, { [translator$u.xmlName]: translator$u }, true);
   return {
-    xmlName: XML_NODE_NAME$d,
-    sdNodeOrKeyName: SD_ATTR_KEY,
+    xmlName: XML_NODE_NAME$g,
+    sdNodeOrKeyName: SD_ATTR_KEY$3,
     attributes
   };
 };
-const decode$l = (params) => {
+const decode$o = (params) => {
   const { grid: rawGrid } = params.node.attrs || {};
   const grid = Array.isArray(rawGrid) ? rawGrid : [];
   const { firstRow = {} } = params.extraParams || {};
@@ -27329,10 +27330,10 @@ const decode$l = (params) => {
       numericWidth = fallbackColumnWidthTwips;
     }
     numericWidth = Math.max(numericWidth, cellMinWidth);
-    const decoded = translator$d.decode({
+    const decoded = translator$u.decode({
       node: { type: (
         /** @type {string} */
-        translator$d.sdNodeOrKeyName
+        translator$u.sdNodeOrKeyName
       ), attrs: { col: numericWidth } }
     });
     if (decoded) elements.push(decoded);
@@ -27367,19 +27368,19 @@ const decode$l = (params) => {
     columnIndex++;
   }
   const newNode = {
-    name: XML_NODE_NAME$d,
+    name: XML_NODE_NAME$g,
     attributes: {},
     elements
   };
   return newNode;
 };
-const config$c = {
-  xmlName: XML_NODE_NAME$d,
-  sdNodeOrKeyName: SD_ATTR_KEY,
-  encode: encode$j,
-  decode: decode$l
+const config$f = {
+  xmlName: XML_NODE_NAME$g,
+  sdNodeOrKeyName: SD_ATTR_KEY$3,
+  encode: encode$m,
+  decode: decode$o
 };
-const translator$c = NodeTranslator.from(config$c);
+const translator$t = NodeTranslator.from(config$f);
 const DEFAULT_PAGE_WIDTH_TWIPS = 12240;
 const DEFAULT_PAGE_MARGIN_TWIPS = 1440;
 const DEFAULT_CONTENT_WIDTH_TWIPS = DEFAULT_PAGE_WIDTH_TWIPS - 2 * DEFAULT_PAGE_MARGIN_TWIPS;
@@ -27442,19 +27443,19 @@ const buildFallbackGridForTable = ({ params, rows, tableWidth, tableWidthMeasure
     columnWidths: Array(columnCount).fill(fallbackColumnWidthPx)
   };
 };
-const XML_NODE_NAME$c = "w:tbl";
+const XML_NODE_NAME$f = "w:tbl";
 const SD_NODE_NAME$c = "table";
-const encode$i = (params, encodedAttrs) => {
+const encode$l = (params, encodedAttrs) => {
   const { nodes } = params;
   const node = nodes[0];
   const tblPr = node.elements.find((el) => el.name === "w:tblPr");
   if (tblPr) {
-    const encodedProperties = translator$e.encode({ ...params, nodes: [tblPr] });
-    encodedAttrs["tableProperties"] = encodedProperties?.attributes || {};
+    const encodedProperties = translator$v.encode({ ...params, nodes: [tblPr] });
+    encodedAttrs["tableProperties"] = encodedProperties || {};
   }
   const tblGrid = node.elements.find((el) => el.name === "w:tblGrid");
   if (tblGrid) {
-    encodedAttrs["grid"] = translator$c.encode({ ...params, nodes: [tblGrid] }).attributes;
+    encodedAttrs["grid"] = translator$t.encode({ ...params, nodes: [tblGrid] }).attributes;
   }
   [
     "tableStyleId",
@@ -27521,7 +27522,7 @@ const encode$i = (params, encodedAttrs) => {
   }
   const content = [];
   rows.forEach((row) => {
-    const result = translator$I.encode({
+    const result = translator$Z.encode({
       ...params,
       nodes: [row],
       extraParams: {
@@ -27540,13 +27541,13 @@ const encode$i = (params, encodedAttrs) => {
     attrs: encodedAttrs
   };
 };
-const decode$k = (params, decodedAttrs) => {
+const decode$n = (params, decodedAttrs) => {
   params.node = preProcessVerticalMergeCells(params.node, params);
   const { node } = params;
   const elements = translateChildNodes(params);
   const firstRow = node.content?.find((n) => n.type === "tableRow");
   const properties = node.attrs.grid;
-  const element = translator$c.decode({
+  const element = translator$t.decode({
     ...params,
     node: { ...node, attrs: { ...node.attrs, grid: properties } },
     extraParams: {
@@ -27556,7 +27557,7 @@ const decode$k = (params, decodedAttrs) => {
   if (element) elements.unshift(element);
   if (node.attrs?.tableProperties) {
     const properties2 = { ...node.attrs.tableProperties };
-    const element2 = translator$e.decode({
+    const element2 = translator$v.decode({
       ...params,
       node: { ...node, attrs: { ...node.attrs, tableProperties: properties2 } }
     });
@@ -27576,7 +27577,7 @@ function _processTableBorders(rawBorders) {
     const color = attributes.color;
     const size = attributes.size;
     if (color && color !== "auto") attrs["color"] = color.startsWith("#") ? color : `#${color}`;
-    if (size && size !== "auto") attrs["size"] = eigthPointsToPixels(size);
+    if (size && size !== "auto") attrs["size"] = eighthPointsToPixels(size);
     const rowBorderNames = ["insideH", "insideV"];
     if (rowBorderNames.includes(name)) rowBorders[name] = attrs;
     borders[name] = attrs;
@@ -27622,7 +27623,7 @@ function _getReferencedTableStyles(tableStyleReference, params) {
     if (baseTblPr && baseTblPr.elements) {
       tblPr.elements.push(...baseTblPr.elements);
     }
-    const tableProperties = translator$e.encode({ ...params, nodes: [tblPr] }).attributes;
+    const tableProperties = translator$v.encode({ ...params, nodes: [tblPr] });
     const { borders, rowBorders } = _processTableBorders(tableProperties.borders || {});
     if (borders) stylesToReturn.borders = borders;
     if (rowBorders) stylesToReturn.rowBorders = rowBorders;
@@ -27639,16 +27640,16 @@ function _getReferencedTableStyles(tableStyleReference, params) {
   }
   return stylesToReturn;
 }
-const config$b = {
-  xmlName: XML_NODE_NAME$c,
+const config$e = {
+  xmlName: XML_NODE_NAME$f,
   sdNodeOrKeyName: SD_NODE_NAME$c,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$i,
-  decode: decode$k,
+  encode: encode$l,
+  decode: decode$n,
   attributes: []
 };
-const translator$b = NodeTranslator.from(config$b);
-const tableNodeHandlerEntity = generateV2HandlerEntity("tableNodeHandler", translator$b);
+const translator$s = NodeTranslator.from(config$e);
+const tableNodeHandlerEntity = generateV2HandlerEntity("tableNodeHandler", translator$s);
 function getReferencedTableStyles(tblStyleTag, docx) {
   if (!tblStyleTag) return null;
   const stylesToReturn = {};
@@ -27719,16 +27720,135 @@ function processTableBorders(borderElements) {
     const color = attributes["w:color"];
     const size = attributes["w:sz"];
     if (color && color !== "auto") attrs["color"] = color.startsWith("#") ? color : `#${color}`;
-    if (size && size !== "auto") attrs["size"] = eigthPointsToPixels(size);
+    if (size && size !== "auto") attrs["size"] = eighthPointsToPixels(size);
     const rowBorderNames = ["insideH", "insideV"];
     if (rowBorderNames.includes(borderName)) rowBorders[borderName] = attrs;
     borders[borderName] = attrs;
   });
   return {
-    borders,
-    rowBorders
+    borders,
+    rowBorders
+  };
+}
+const translator$r = NodeTranslator.from(createMeasurementPropertyHandler("w:tcW", "cellWidth"));
+const translator$q = NodeTranslator.from(
+  createSingleAttrPropertyHandler(
+    "w:gridSpan",
+    null,
+    "w:val",
+    (v2) => parseInteger(v2) ?? void 0,
+    (v2) => integerToString(v2)
+  )
+);
+const translator$p = NodeTranslator.from(createSingleAttrPropertyHandler("w:vMerge"));
+const translator$o = NodeTranslator.from(createBorderPropertyHandler("w:tl2br"));
+const translator$n = NodeTranslator.from(createBorderPropertyHandler("w:tr2bl"));
+const propertyTranslators$2 = [
+  translator$z,
+  translator$B,
+  translator$F,
+  translator$L,
+  translator$J,
+  translator$D,
+  translator$H,
+  translator$G,
+  translator$o,
+  translator$n
+];
+const translator$m = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:tcBorders", "borders", propertyTranslators$2)
+);
+const translator$l = NodeTranslator.from(
+  createSingleAttrPropertyHandler(
+    "w:noWrap",
+    null,
+    "w:val",
+    (v2) => parseBoolean(v2 ?? "true"),
+    (v2) => booleanToString(v2)
+  )
+);
+const propertyTranslators$1 = [
+  translator$K,
+  translator$I,
+  translator$E,
+  translator$C,
+  translator$A,
+  translator$y
+];
+const translator$k = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:tcMar", "cellMargins", propertyTranslators$1)
+);
+const translator$j = NodeTranslator.from(createSingleAttrPropertyHandler("w:textDirection"));
+const translator$i = NodeTranslator.from(
+  createSingleAttrPropertyHandler(
+    "w:tcFitText",
+    null,
+    "w:val",
+    (v2) => parseBoolean(v2 ?? "true"),
+    (v2) => booleanToString(v2)
+  )
+);
+const translator$h = NodeTranslator.from(createSingleAttrPropertyHandler("w:vAlign"));
+const translator$g = NodeTranslator.from(
+  createSingleAttrPropertyHandler(
+    "w:hideMark",
+    null,
+    "w:val",
+    (v2) => parseBoolean(v2 ?? "true"),
+    (v2) => booleanToString(v2)
+  )
+);
+const translator$f = NodeTranslator.from(createSingleAttrPropertyHandler("w:header"));
+const XML_NODE_NAME$e = "w:headers";
+const SD_ATTR_KEY$2 = "headers";
+const encode$k = (params) => {
+  const { nodes } = params;
+  const node = nodes[0];
+  const attributes = encodeProperties(node, { [translator$f.xmlName]: translator$f }, true);
+  return {
+    xmlName: XML_NODE_NAME$e,
+    sdNodeOrKeyName: SD_ATTR_KEY$2,
+    attributes
   };
-}
+};
+const decode$m = (params) => {
+  const { headers = [] } = params.node.attrs || {};
+  const newNode = {
+    name: XML_NODE_NAME$e,
+    attributes: {},
+    elements: headers.map(
+      (header) => translator$f.decode({
+        node: { type: "header", attrs: header }
+      })
+    )
+  };
+  return newNode;
+};
+const config$d = {
+  xmlName: XML_NODE_NAME$e,
+  sdNodeOrKeyName: SD_ATTR_KEY$2,
+  encode: encode$k,
+  decode: decode$m
+};
+const translator$e = NodeTranslator.from(config$d);
+const propertyTranslators = [
+  translator$19,
+  translator$r,
+  translator$q,
+  translator$p,
+  translator$m,
+  translator$X,
+  translator$l,
+  translator$k,
+  translator$j,
+  translator$i,
+  translator$h,
+  translator$g,
+  translator$e
+];
+const translator$d = NodeTranslator.from(
+  createNestedPropertiesTranslator("w:tcPr", "tableCellProperties", propertyTranslators)
+);
 function handleTableCellNode({
   params,
   node,
@@ -27741,8 +27861,10 @@ function handleTableCellNode({
   allColumnWidths = []
 }) {
   const { docx, nodeListHandler } = params;
+  const attributes = {};
   const tcPr = node.elements.find((el) => el.name === "w:tcPr");
-  const borders = tcPr?.elements?.find((el) => el.name === "w:tcBorders");
+  const tableCellProperties = tcPr ? translator$d.encode({ ...params, nodes: [tcPr] }) ?? {} : {};
+  attributes["tableCellProperties"] = tableCellProperties;
   if (rowBorders?.insideH) {
     rowBorders["bottom"] = rowBorders.insideH;
     delete rowBorders.insideH;
@@ -27751,33 +27873,20 @@ function handleTableCellNode({
     rowBorders["right"] = rowBorders.insideV;
     delete rowBorders?.insideV;
   }
-  const inlineBorders = processInlineCellBorders(borders, rowBorders);
-  const gridColumnWidths = allColumnWidths;
-  const tcWidth = tcPr?.elements?.find((el) => el.name === "w:tcW");
-  let width = tcWidth ? twipsToPixels(tcWidth.attributes["w:w"]) : null;
-  const widthType = tcWidth?.attributes["w:type"];
+  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);
+  let width = tableCellProperties.cellWidth?.value ? twipsToPixels(tableCellProperties.cellWidth?.value) : null;
+  const widthType = tableCellProperties.cellWidth?.type;
+  if (widthType) attributes["widthType"] = widthType;
   if (!width && columnWidth) width = columnWidth;
-  const vMerge = getTableCellMergeTag(node);
-  const { attributes: vMergeAttrs } = vMerge || {};
-  const backgroundColor = tcPr?.elements?.find((el) => el.name === "w:shd");
-  const background = {
-    color: backgroundColor?.attributes["w:fill"]
-  };
-  const colspanTag = tcPr?.elements?.find((el) => el.name === "w:gridSpan");
-  const colspan = colspanTag?.attributes["w:val"];
-  const marginTag = tcPr?.elements?.find((el) => el.name === "w:tcMar");
-  const verticalAlignTag = tcPr?.elements?.find((el) => el.name === "w:vAlign");
-  const verticalAlign = verticalAlignTag?.attributes["w:val"] || "top";
-  const attributes = {};
-  const referencedStyles = getReferencedTableStyles(styleTag, docx) || {};
-  attributes.cellMargins = getTableCellMargins(marginTag, referencedStyles);
-  const { fontSize, fonts = {} } = referencedStyles;
-  const fontFamily = fonts["ascii"];
   if (width) {
     attributes["colwidth"] = [width];
     attributes["widthUnit"] = "px";
-    const defaultColWidths = gridColumnWidths;
-    const hasDefaultColWidths = gridColumnWidths && gridColumnWidths.length > 0;
+    const defaultColWidths = allColumnWidths;
+    const hasDefaultColWidths = allColumnWidths && allColumnWidths.length > 0;
     const colspanNum = parseInt(colspan || 1, 10);
     if (colspanNum && colspanNum > 1 && hasDefaultColWidths) {
       let colwidth = [];
@@ -27795,15 +27904,19 @@ function handleTableCellNode({
       }
     }
   }
-  if (widthType) attributes["widthType"] = widthType;
-  if (colspan) attributes["colspan"] = parseInt(colspan, 10);
-  if (background) attributes["background"] = background;
-  attributes["verticalAlign"] = verticalAlign;
+  const background = {
+    color: tableCellProperties.shading?.fill
+  };
+  if (background.color) attributes["background"] = background;
+  const verticalAlign = tableCellProperties.vAlign;
+  if (verticalAlign) attributes["verticalAlign"] = verticalAlign;
+  const referencedStyles = getReferencedTableStyles(styleTag, docx) || { fontSize: null, fonts: {}, cellMargins: {} };
+  attributes.cellMargins = getTableCellMargins(tableCellProperties.cellMargins, referencedStyles);
+  const { fontSize, fonts = {} } = referencedStyles;
+  const fontFamily = fonts["ascii"];
   if (fontSize) attributes["fontSize"] = fontSize;
-  if (fontFamily) attributes["fontFamily"] = fontFamily["ascii"];
-  if (rowBorders) attributes["borders"] = { ...rowBorders };
-  if (inlineBorders) attributes["borders"] = Object.assign(attributes["borders"] || {}, inlineBorders);
-  if (vMergeAttrs && vMergeAttrs["w:val"] === "restart") {
+  if (fontFamily) attributes["fontFamily"] = fontFamily;
+  if (tableCellProperties.vMerge === "restart") {
     const rows = table.elements.filter((el) => el.name === "w:tr");
     const currentRowIndex = rows.findIndex((r) => r === row);
     const remainingRows = rows.slice(currentRowIndex + 1);
@@ -27814,9 +27927,8 @@ function handleTableCellNode({
       const firstCell = remainingRow.elements.findIndex((el) => el.name === "w:tc");
       const cellAtIndex = remainingRow.elements[firstCell + cellIndex];
       if (!cellAtIndex) break;
-      const vMerge2 = getTableCellMergeTag(cellAtIndex);
-      const { attributes: currentCellMergeAttrs } = vMerge2 || {};
-      if (!vMerge2 && !currentCellMergeAttrs || currentCellMergeAttrs && currentCellMergeAttrs["w:val"] === "restart") {
+      const vMerge = getTableCellVMerge(cellAtIndex);
+      if (!vMerge || vMerge === "restart") {
         break;
       }
       rowspan++;
@@ -27836,69 +27948,52 @@ function handleTableCellNode({
 }
 const processInlineCellBorders = (borders, rowBorders) => {
   if (!borders) return null;
-  const processedBorders = {};
-  const inlineBorderBottom = processBorder(borders, "bottom", rowBorders);
-  if (inlineBorderBottom) processedBorders["bottom"] = inlineBorderBottom;
-  const inlineBorderTop = processBorder(borders, "top", rowBorders);
-  if (inlineBorderTop) processedBorders["top"] = inlineBorderTop;
-  const inlineBorderLeft = processBorder(borders, "left", rowBorders);
-  if (inlineBorderLeft) processedBorders["left"] = inlineBorderLeft;
-  const inlineBorderRight = processBorder(borders, "right", rowBorders);
-  if (inlineBorderRight) processedBorders["right"] = inlineBorderRight;
-  return processedBorders;
-};
-const processBorder = (borders, direction, rowBorders = {}) => {
-  const borderAttrs = borders?.elements?.find((el) => el.name === `w:${direction}`)?.attributes;
-  if (borderAttrs && borderAttrs["w:val"] !== "nil") {
-    const border = {};
-    const color = borderAttrs["w:color"];
-    if (color) border["color"] = color === "auto" ? "#000000" : `#${color}`;
-    const size = borderAttrs["w:sz"];
-    if (size) border["size"] = eigthPointsToPixels(size);
-    return border;
-  }
-  if (borderAttrs && borderAttrs["w:val"] === "nil") {
-    const border = Object.assign({}, rowBorders[direction] || {});
-    if (!Object.keys(border)) return null;
-    border["val"] = "none";
-    return border;
-  }
-  return null;
+  return ["bottom", "top", "left", "right"].reduce((acc, direction) => {
+    const borderAttrs = borders[direction];
+    const rowBorderAttrs = rowBorders[direction];
+    if (borderAttrs && borderAttrs["val"] !== "nil") {
+      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") {
+      const border = Object.assign({}, rowBorderAttrs || {});
+      if (!Object.keys(border).length) {
+        return acc;
+      } else {
+        border["val"] = "none";
+        acc[direction] = border;
+        return acc;
+      }
+    }
+    return acc;
+  }, {});
 };
-const getTableCellMergeTag = (node) => {
+const getTableCellVMerge = (node) => {
   const tcPr = node.elements.find((el) => el.name === "w:tcPr");
   const vMerge = tcPr?.elements?.find((el) => el.name === "w:vMerge");
-  return vMerge;
-};
-const getTableCellMargins = (marginTag, referencedStyles) => {
-  const inlineMarginLeftTag = marginTag?.elements?.find((el) => el.name === "w:left");
-  const inlineMarginRightTag = marginTag?.elements?.find((el) => el.name === "w:right");
-  const inlineMarginTopTag = marginTag?.elements?.find((el) => el.name === "w:top");
-  const inlineMarginBottomTag = marginTag?.elements?.find((el) => el.name === "w:bottom");
-  const inlineMarginLeftValue = inlineMarginLeftTag?.attributes["w:w"];
-  const inlineMarginRightValue = inlineMarginRightTag?.attributes["w:w"];
-  const inlineMarginTopValue = inlineMarginTopTag?.attributes["w:w"];
-  const inlineMarginBottomValue = inlineMarginBottomTag?.attributes["w:w"];
+  if (!vMerge) return null;
+  return vMerge.attributes?.["w:val"] || "continue";
+};
+const getTableCellMargins = (inlineMargins, referencedStyles) => {
   const { cellMargins = {} } = referencedStyles;
-  const {
-    marginLeft: marginLeftStyle,
-    marginRight: marginRightStyle,
-    marginTop: marginTopStyle,
-    marginBottom: marginBottomStyle
-  } = cellMargins;
-  const resolveMargin = (inlineValue, styleValue) => {
-    if (inlineValue != null) return inlineValue;
-    if (styleValue == null) return void 0;
-    if (typeof styleValue === "object") return styleValue.value;
-    return styleValue;
-  };
-  const margins = {
-    left: twipsToPixels(resolveMargin(inlineMarginLeftValue, marginLeftStyle)),
-    right: twipsToPixels(resolveMargin(inlineMarginRightValue, marginRightStyle)),
-    top: twipsToPixels(resolveMargin(inlineMarginTopValue, marginTopStyle)),
-    bottom: twipsToPixels(resolveMargin(inlineMarginBottomValue, marginBottomStyle))
-  };
-  return margins;
+  return ["left", "right", "top", "bottom"].reduce((acc, direction) => {
+    const key = `margin${direction.charAt(0).toUpperCase() + direction.slice(1)}`;
+    const inlineValue = inlineMargins ? inlineMargins?.[key]?.value : null;
+    const styleValue = cellMargins ? cellMargins[key] : null;
+    if (inlineValue != null) {
+      acc[direction] = twipsToPixels(inlineValue);
+    } else if (styleValue == null) {
+      acc[direction] = void 0;
+    } else if (typeof styleValue === "object") {
+      acc[direction] = twipsToPixels(styleValue.value);
+    } else {
+      acc[direction] = twipsToPixels(styleValue);
+    }
+    return acc;
+  }, {});
 };
 function translateTableCell(params) {
   const elements = translateChildNodes({
@@ -27913,107 +28008,91 @@ function translateTableCell(params) {
   };
 }
 function generateTableCellProperties(node) {
-  const elements = [];
+  const tableCellProperties = { ...node.attrs?.tableCellProperties || {} };
   const { attrs } = node;
-  const { colwidth = [], cellWidthType = "dxa", background = {}, colspan, rowspan, widthUnit } = attrs;
+  const { colwidth = [], cellWidthType = "dxa", widthUnit } = attrs;
   const colwidthSum = colwidth.reduce((acc, curr) => acc + curr, 0);
-  const cellWidthElement = {
-    name: "w:tcW",
-    attributes: {
-      "w:w": widthUnit === "px" ? pixelsToTwips(colwidthSum) : inchesToTwips(colwidthSum),
-      "w:type": cellWidthType
-    }
-  };
-  elements.push(cellWidthElement);
-  if (colspan) {
-    const gridSpanElement = {
-      name: "w:gridSpan",
-      attributes: { "w:val": `${colspan}` }
+  const propertiesWidthPixels = twipsToPixels(tableCellProperties.cellWidth?.value);
+  if (propertiesWidthPixels !== colwidthSum) {
+    tableCellProperties["cellWidth"] = {
+      value: widthUnit === "px" ? pixelsToTwips(colwidthSum) : inchesToTwips(colwidthSum),
+      type: cellWidthType
     };
-    elements.push(gridSpanElement);
   }
-  const { color } = background || {};
-  if (color) {
-    const cellBgElement = {
-      name: "w:shd",
-      attributes: { "w:fill": color }
-    };
-    elements.push(cellBgElement);
+  const { colspan } = attrs;
+  if (colspan > 1 && tableCellProperties.gridSpan !== colspan) {
+    tableCellProperties["gridSpan"] = colspan;
+  } else if (!colspan || tableCellProperties?.gridSpan === 1) {
+    delete tableCellProperties.gridSpan;
+  }
+  const { background = {} } = attrs;
+  if (background?.color && tableCellProperties.shading?.fill !== background?.color) {
+    tableCellProperties["shading"] = { fill: background.color };
+  } else if (!background?.color && tableCellProperties?.shading?.fill) {
+    delete tableCellProperties.shading;
   }
   const { cellMargins } = attrs;
   if (cellMargins) {
-    const cellMarginsElement = {
-      name: "w:tcMar",
-      elements: generateCellMargins(cellMargins)
-    };
-    elements.push(cellMarginsElement);
+    ["left", "right", "top", "bottom"].forEach((side) => {
+      const key = `margin${side.charAt(0).toUpperCase() + side.slice(1)}`;
+      if (cellMargins[side] != null) {
+        if (!tableCellProperties.cellMargins) tableCellProperties["cellMargins"] = {};
+        let currentPropertyValuePixels = twipsToPixels(tableCellProperties.cellMargins?.[key]?.value);
+        if (currentPropertyValuePixels !== cellMargins[side]) {
+          tableCellProperties.cellMargins[key] = { value: pixelsToTwips(cellMargins[side]), type: "dxa" };
+        }
+      } else if (tableCellProperties?.cellMargins?.[key]) {
+        delete tableCellProperties.cellMargins[key];
+      }
+    });
   }
   const { verticalAlign } = attrs;
-  if (verticalAlign) {
-    const vertAlignElement = {
-      name: "w:vAlign",
-      attributes: { "w:val": verticalAlign }
-    };
-    elements.push(vertAlignElement);
-  }
-  if (rowspan && rowspan > 1) {
-    const vMergeElement = {
-      name: "w:vMerge",
-      type: "element",
-      attributes: { "w:val": "restart" }
-    };
-    elements.push(vMergeElement);
+  if (verticalAlign && verticalAlign !== tableCellProperties.vAlign) {
+    tableCellProperties["vAlign"] = verticalAlign;
+  } else if (!verticalAlign && tableCellProperties?.vAlign) {
+    delete tableCellProperties.vAlign;
+  }
+  const { rowspan } = attrs;
+  if (rowspan && rowspan > 1 && tableCellProperties.vMerge !== "restart") {
+    tableCellProperties["vMerge"] = "restart";
   } else if (attrs.continueMerge) {
-    const vMergeElement = {
-      name: "w:vMerge",
-      type: "element"
-    };
-    elements.push(vMergeElement);
+    tableCellProperties["vMerge"] = "continue";
+  } else if (tableCellProperties?.vMerge) {
+    delete tableCellProperties.vMerge;
   }
   const { borders = {} } = attrs;
   if (!!borders && Object.keys(borders).length) {
-    const cellBordersElement = {
-      name: "w:tcBorders",
-      elements: Object.entries(borders).map(([key, value]) => {
-        if (!value.size || value.val === "none") {
-          return {
-            name: `w:${key}`,
-            attributes: {
-              "w:val": "nil"
-            }
+    ["top", "bottom", "left", "right"].forEach((side) => {
+      if (borders[side]) {
+        let currentPropertyValue = tableCellProperties.borders?.[side];
+        let currentPropertySizePixels = eighthPointsToPixels(currentPropertyValue?.size);
+        let color = borders[side].color;
+        if (borders[side].color && color === "#000000") {
+          color = "auto";
+        }
+        if (currentPropertySizePixels !== borders[side].size || currentPropertyValue?.color !== color || borders[side].val !== currentPropertyValue?.val) {
+          if (!tableCellProperties.borders) tableCellProperties["borders"] = {};
+          tableCellProperties.borders[side] = {
+            size: pixelsToEightPoints(borders[side].size || 0),
+            color,
+            space: borders[side].space || 0,
+            val: borders[side].val || "single"
           };
         }
-        return {
-          name: `w:${key}`,
-          attributes: {
-            "w:val": "single",
-            "w:color": value.color ? value.color.substring(1) : "auto",
-            "w:sz": pixelsToEightPoints(value.size),
-            "w:space": value.space || 0
-          }
-        };
-      })
-    };
-    elements.push(cellBordersElement);
+      } else if (tableCellProperties.borders?.[side]) {
+        delete tableCellProperties.borders[side];
+      }
+    });
+  } else if (tableCellProperties?.borders) {
+    delete tableCellProperties.borders;
   }
-  return {
-    name: "w:tcPr",
-    elements
-  };
-}
-function generateCellMargins(cellMargins) {
-  const elements = [];
-  const { top, right, bottom, left } = cellMargins;
-  if (top != null) elements.push({ name: "w:top", attributes: { "w:w": pixelsToTwips(top) } });
-  if (right != null) elements.push({ name: "w:right", attributes: { "w:w": pixelsToTwips(right) } });
-  if (bottom != null) elements.push({ name: "w:bottom", attributes: { "w:w": pixelsToTwips(bottom) } });
-  if (left != null) elements.push({ name: "w:left", attributes: { "w:w": pixelsToTwips(left) } });
-  return elements;
+  const result = translator$d.decode({ node: { ...node, attrs: { ...node.attrs, tableCellProperties } } });
+  return result;
 }
-const XML_NODE_NAME$b = "w:tc";
+const XML_NODE_NAME$d = "w:tc";
 const SD_NODE_NAME$b = "tableCell";
-const validXmlAttributes$8 = [];
-function encode$h(params, encodedAttrs) {
+const validXmlAttributes$a = [];
+function encode$j(params, encodedAttrs) {
   const {
     node,
     table,
@@ -28040,22 +28119,22 @@ function encode$h(params, encodedAttrs) {
   }
   return schemaNode;
 }
-function decode$j(params, decodedAttrs) {
+function decode$l(params, decodedAttrs) {
   const translated = translateTableCell(params);
   if (decodedAttrs && Object.keys(decodedAttrs).length) {
     translated.attributes = { ...translated.attributes || {}, ...decodedAttrs };
   }
   return translated;
 }
-const config$a = {
-  xmlName: XML_NODE_NAME$b,
+const config$c = {
+  xmlName: XML_NODE_NAME$d,
   sdNodeOrKeyName: SD_NODE_NAME$b,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$h,
-  decode: decode$j,
-  attributes: validXmlAttributes$8
+  encode: encode$j,
+  decode: decode$l,
+  attributes: validXmlAttributes$a
 };
-const translator$a = NodeTranslator.from(config$a);
+const translator$c = NodeTranslator.from(config$c);
 function parseTagValueJSON(json) {
   if (typeof json !== "string") {
     return {};
@@ -28482,8 +28561,64 @@ function handleImageNode(node, params, isAnchor) {
   const vRelativeFrom = positionVTag?.attributes.relativeFrom;
   const alignV = positionVTag?.elements?.find((el) => el.name === "wp:align")?.elements[0]?.text;
   const simplePos = node.elements.find((el) => el.name === "wp:simplePos");
-  const wrapSquare = node.elements.find((el) => el.name === "wp:wrapSquare");
-  const wrapTopAndBottom = node.elements.find((el) => el.name === "wp:wrapTopAndBottom");
+  const wrapNode = isAnchor ? node.elements.find(
+    (el) => ["wp:wrapNone", "wp:wrapSquare", "wp:wrapThrough", "wp:wrapTight", "wp:wrapTopAndBottom"].includes(el.name)
+  ) : null;
+  const wrap2 = isAnchor ? { type: wrapNode?.name.slice(7) || "None", attrs: {} } : { type: "Inline" };
+  switch (wrap2.type) {
+    case "Square":
+      wrap2.attrs.wrapText = wrapNode.attributes.wrapText;
+      if ("distB" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distBottom = emuToPixels(wrapNode.attributes.distB);
+      }
+      if ("distL" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distLeft = emuToPixels(wrapNode.attributes.distL);
+      }
+      if ("distR" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distRight = emuToPixels(wrapNode.attributes.distR);
+      }
+      if ("distT" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distTop = emuToPixels(wrapNode.attributes.distT);
+      }
+      break;
+    case "Tight":
+    case "Through": {
+      if ("distL" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distLeft = emuToPixels(wrapNode.attributes.distL);
+      }
+      if ("distR" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distRight = emuToPixels(wrapNode.attributes.distR);
+      }
+      if ("distT" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distTop = emuToPixels(wrapNode.attributes.distT);
+      }
+      if ("distB" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distBottom = emuToPixels(wrapNode.attributes.distB);
+      }
+      if ("wrapText" in (wrapNode.attributes || {})) {
+        wrap2.attrs.wrapText = wrapNode.attributes.wrapText;
+      }
+      const polygon = wrapNode.elements?.find((el) => el.name === "wp:wrapPolygon");
+      if (polygon) {
+        wrap2.attrs.polygon = polygonToObj(polygon);
+        if (polygon.attributes?.edited !== void 0) {
+          wrap2.attrs.polygonEdited = polygon.attributes.edited;
+        }
+      }
+      break;
+    }
+    case "TopAndBottom":
+      if ("distB" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distBottom = emuToPixels(wrapNode.attributes.distB);
+      }
+      if ("distT" in (wrapNode.attributes || {})) {
+        wrap2.attrs.distTop = emuToPixels(wrapNode.attributes.distT);
+      }
+      break;
+    case "None":
+      wrap2.attrs.behindDoc = node.attributes?.behindDoc === "1";
+      break;
+  }
   const docPr = node.elements.find((el) => el.name === "wp:docPr");
   let anchorData = null;
   if (hRelativeFrom || alignH || vRelativeFrom || alignV) {
@@ -28495,7 +28630,7 @@ function handleImageNode(node, params, isAnchor) {
     };
   }
   const marginOffset = {
-    left: positionHValue,
+    horizontal: positionHValue,
     top: positionVValue
   };
   const { attributes: blipAttributes = {} } = blip;
@@ -28534,10 +28669,7 @@ function handleImageNode(node, params, isAnchor) {
           y: simplePos.attributes.y
         }
       },
-      ...wrapSquare && {
-        wrapText: wrapSquare.attributes.wrapText
-      },
-      wrapTopAndBottom: !!wrapTopAndBottom,
+      wrap: wrap2,
       originalPadding: {
         distT: attributes["distT"],
         distB: attributes["distB"],
@@ -28885,7 +29017,6 @@ function addNewImageRelationship(params, imagePath) {
 function translateAnchorNode(params) {
   const { attrs } = params.node;
   const anchorElements = [];
-  const wrapElements = [];
   if (attrs.simplePos) {
     anchorElements.push({
       name: "wp:simplePos",
@@ -28897,10 +29028,10 @@ function translateAnchorNode(params) {
   }
   if (attrs.anchorData) {
     const hElements = [];
-    if (attrs.marginOffset.left !== void 0) {
+    if (attrs.marginOffset.horizontal !== void 0) {
       hElements.push({
         name: "wp:posOffset",
-        elements: [{ type: "text", text: pixelsToEmu(attrs.marginOffset.left).toString() }]
+        elements: [{ type: "text", text: pixelsToEmu(attrs.marginOffset.horizontal).toString() }]
       });
     }
     if (attrs.anchorData.alignH) {
@@ -28933,38 +29064,110 @@ function translateAnchorNode(params) {
       ...vElements.length && { elements: vElements }
     });
   }
-  if (attrs.wrapText) {
-    wrapElements.push({
-      name: "wp:wrapSquare",
-      attributes: {
-        wrapText: attrs.wrapText
-      }
-    });
+  const nodeElements = translateImageNode(params);
+  const inlineAttrs = {
+    ...attrs.originalAttributes || {},
+    ...nodeElements.attributes || {}
+  };
+  if (inlineAttrs.relativeHeight == null) {
+    inlineAttrs.relativeHeight = 1;
   }
-  if (attrs.wrapTopAndBottom) {
-    wrapElements.push({
-      name: "wp:wrapTopAndBottom"
-    });
+  if (attrs.originalAttributes?.simplePos !== void 0) {
+    inlineAttrs.simplePos = attrs.originalAttributes.simplePos;
+  } else if (attrs.simplePos !== void 0) {
+    inlineAttrs.simplePos = attrs.simplePos;
   }
-  if (!wrapElements.length) {
-    wrapElements.push({
-      name: "wp:wrapNone"
-    });
+  if (attrs.originalAttributes?.locked !== void 0) {
+    inlineAttrs.locked = attrs.originalAttributes.locked;
   }
-  const nodeElements = translateImageNode(params);
-  const inlineAttrs = {
-    ...nodeElements.attributes,
-    simplePos: attrs.originalAttributes?.simplePos,
-    relativeHeight: 1,
-    behindDoc: attrs.originalAttributes?.behindDoc,
-    locked: attrs.originalAttributes?.locked,
-    layoutInCell: attrs.originalAttributes?.layoutInCell,
-    allowOverlap: attrs.originalAttributes?.allowOverlap
+  if (attrs.originalAttributes?.layoutInCell !== void 0) {
+    inlineAttrs.layoutInCell = attrs.originalAttributes.layoutInCell;
+  }
+  if (attrs.originalAttributes?.allowOverlap !== void 0) {
+    inlineAttrs.allowOverlap = attrs.originalAttributes.allowOverlap;
+  }
+  const wrapElement = {
+    name: `wp:wrap${attrs.wrap?.type || "None"}`
+    // Important: wp:anchor will break if no wrapping is specified. We need to use wrapNone.
   };
+  switch (attrs.wrap?.type) {
+    case "Square":
+      wrapElement.attributes = {
+        wrapText: attrs.wrap.attrs.wrapText
+      };
+      if ("distBottom" in (attrs.wrap.attrs || {})) {
+        wrapElement.attributes.distB = pixelsToEmu(attrs.wrap.attrs.distBottom);
+      }
+      if ("distLeft" in (attrs.wrap.attrs || {})) {
+        wrapElement.attributes.distL = pixelsToEmu(attrs.wrap.attrs.distLeft);
+      }
+      if ("distRight" in (attrs.wrap.attrs || {})) {
+        wrapElement.attributes.distR = pixelsToEmu(attrs.wrap.attrs.distRight);
+      }
+      if ("distTop" in (attrs.wrap.attrs || {})) {
+        wrapElement.attributes.distT = pixelsToEmu(attrs.wrap.attrs.distTop);
+      }
+      break;
+    case "TopAndBottom": {
+      const attributes = {};
+      let hasKeys = false;
+      if ("distBottom" in (attrs.wrap.attrs || {})) {
+        attributes.distB = pixelsToEmu(attrs.wrap.attrs.distBottom);
+        hasKeys = true;
+      }
+      if ("distTop" in (attrs.wrap.attrs || {})) {
+        attributes.distT = pixelsToEmu(attrs.wrap.attrs.distTop);
+        hasKeys = true;
+      }
+      if (hasKeys) {
+        wrapElement.attributes = attributes;
+      }
+      break;
+    }
+    case "Through":
+    case "Tight": {
+      const attributes = {};
+      if ("distLeft" in (attrs.wrap.attrs || {})) {
+        attributes.distL = pixelsToEmu(attrs.wrap.attrs.distLeft);
+      }
+      if ("distRight" in (attrs.wrap.attrs || {})) {
+        attributes.distR = pixelsToEmu(attrs.wrap.attrs.distRight);
+      }
+      if ("distTop" in (attrs.wrap.attrs || {})) {
+        attributes.distT = pixelsToEmu(attrs.wrap.attrs.distTop);
+      }
+      if ("distBottom" in (attrs.wrap.attrs || {})) {
+        attributes.distB = pixelsToEmu(attrs.wrap.attrs.distBottom);
+      }
+      const wrapText = attrs.wrap.attrs?.wrapText || "bothSides";
+      {
+        attributes.wrapText = wrapText;
+      }
+      if (Object.keys(attributes).length) {
+        wrapElement.attributes = attributes;
+      }
+      if (attrs.wrap.attrs?.polygon) {
+        const polygonNode = objToPolygon(attrs.wrap.attrs.polygon);
+        if (polygonNode) {
+          if (attrs.wrap.attrs?.polygonEdited !== void 0) {
+            polygonNode.attributes = {
+              ...polygonNode.attributes || {},
+              edited: String(attrs.wrap.attrs.polygonEdited)
+            };
+          }
+          wrapElement.elements = [polygonNode];
+        }
+      }
+      break;
+    }
+    case "None":
+      inlineAttrs.behindDoc = attrs.wrap.attrs?.behindDoc ? "1" : "0";
+      break;
+  }
   const effectIndex = nodeElements.elements.findIndex((el) => el.name === "wp:effectExtent");
   const elementsWithWrap = [
     ...nodeElements.elements.slice(0, effectIndex + 1),
-    ...wrapElements,
+    wrapElement,
     ...nodeElements.elements.slice(effectIndex + 1)
   ];
   return {
@@ -28973,32 +29176,32 @@ function translateAnchorNode(params) {
     elements: [...anchorElements, ...elementsWithWrap]
   };
 }
-const XML_NODE_NAME$a = "wp:anchor";
+const XML_NODE_NAME$c = "wp:anchor";
 const SD_NODE_NAME$a = ["image"];
-const validXmlAttributes$7 = ["distT", "distB", "distL", "distR"].map((xmlName) => createAttributeHandler(xmlName));
-function encode$g(params) {
+const validXmlAttributes$9 = ["distT", "distB", "distL", "distR"].map((xmlName) => createAttributeHandler(xmlName));
+function encode$i(params) {
   const { node } = params.extraParams;
   if (!node || !node.type) {
     return null;
   }
   return handleAnchorNode(params);
 }
-function decode$i(params) {
+function decode$k(params) {
   const { node } = params;
   if (!node || !node.type) {
     return null;
   }
   return translateAnchorNode(params);
 }
-const config$9 = {
-  xmlName: XML_NODE_NAME$a,
+const config$b = {
+  xmlName: XML_NODE_NAME$c,
   sdNodeOrKeyName: SD_NODE_NAME$a,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$g,
-  decode: decode$i,
-  attributes: validXmlAttributes$7
+  encode: encode$i,
+  decode: decode$k,
+  attributes: validXmlAttributes$9
 };
-const translator$9 = NodeTranslator.from(config$9);
+const translator$b = NodeTranslator.from(config$b);
 function handleInlineNode(params) {
   const { node } = params.extraParams;
   if (node.name !== "wp:inline") {
@@ -29014,41 +29217,41 @@ function translateInlineNode(params) {
     elements: nodeElements.elements
   };
 }
-const XML_NODE_NAME$9 = "wp:inline";
+const XML_NODE_NAME$b = "wp:inline";
 const SD_NODE_NAME$9 = ["image"];
-const validXmlAttributes$6 = ["distT", "distB", "distL", "distR"].map((xmlName) => createAttributeHandler(xmlName));
-function encode$f(params) {
+const validXmlAttributes$8 = ["distT", "distB", "distL", "distR"].map((xmlName) => createAttributeHandler(xmlName));
+function encode$h(params) {
   const { node } = params.extraParams;
   if (!node || !node.type) {
     return null;
   }
   return handleInlineNode(params);
 }
-function decode$h(params) {
+function decode$j(params) {
   const { node } = params;
   if (!node || !node.type) {
     return null;
   }
   return translateInlineNode(params);
 }
-const config$8 = {
-  xmlName: XML_NODE_NAME$9,
+const config$a = {
+  xmlName: XML_NODE_NAME$b,
   sdNodeOrKeyName: SD_NODE_NAME$9,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$f,
-  decode: decode$h,
-  attributes: validXmlAttributes$6
+  encode: encode$h,
+  decode: decode$j,
+  attributes: validXmlAttributes$8
 };
-const translator$8 = NodeTranslator.from(config$8);
-const XML_NODE_NAME$8 = "w:drawing";
+const translator$a = NodeTranslator.from(config$a);
+const XML_NODE_NAME$a = "w:drawing";
 const SD_NODE_NAME$8 = [];
-const validXmlAttributes$5 = [];
-function encode$e(params) {
+const validXmlAttributes$7 = [];
+function encode$g(params) {
   const nodes = params.nodes;
   const node = nodes[0];
   const translatorByChildName = {
-    "wp:anchor": translator$9,
-    "wp:inline": translator$8
+    "wp:anchor": translator$b,
+    "wp:inline": translator$a
   };
   return node.elements.reduce((acc, child) => {
     if (acc) return acc;
@@ -29057,12 +29260,12 @@ function encode$e(params) {
     return translator2.encode({ ...params, extraParams: { node: child } }) || acc;
   }, null);
 }
-function decode$g(params) {
+function decode$i(params) {
   const { node } = params;
   if (!node || !node.type) {
     return null;
   }
-  const childTranslator = node.attrs.isAnchor ? translator$9 : translator$8;
+  const childTranslator = node.attrs.isAnchor ? translator$b : translator$a;
   const resultNode = childTranslator.decode(params);
   return wrapTextInRun(
     {
@@ -29072,15 +29275,15 @@ function decode$g(params) {
     []
   );
 }
-const config$7 = {
-  xmlName: XML_NODE_NAME$8,
+const config$9 = {
+  xmlName: XML_NODE_NAME$a,
   sdNodeOrKeyName: SD_NODE_NAME$8,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$e,
-  decode: decode$g,
-  attributes: validXmlAttributes$5
+  encode: encode$g,
+  decode: decode$i,
+  attributes: validXmlAttributes$7
 };
-const translator$7 = NodeTranslator.from(config$7);
+const translator$9 = NodeTranslator.from(config$9);
 class CommandService {
   /**
    * @param {import('./commands/types/index.js').CommandServiceOptions} props
@@ -30428,7 +30631,7 @@ function prepareTextAnnotation(params) {
   return getTextNodeForExport(attrs.displayLabel, [...marks, ...marksFromAttrs], params);
 }
 function prepareImageAnnotation(params, imageSize) {
-  return translator$7.decode({
+  return translator$9.decode({
     ...params,
     imageSize
   });
@@ -30743,10 +30946,10 @@ function generateSdtPrTagForStructuredContent({ node }) {
   };
   return result;
 }
-const XML_NODE_NAME$7 = "w:sdt";
+const XML_NODE_NAME$9 = "w:sdt";
 const SD_NODE_NAME$7 = ["fieldAnnotation", "structuredContent", "structuredContentBlock", "documentSection"];
-const validXmlAttributes$4 = [];
-function encode$d(params) {
+const validXmlAttributes$6 = [];
+function encode$f(params) {
   const nodes = params.nodes;
   const node = nodes[0];
   const { type: sdtType, handler: handler2 } = sdtNodeTypeStrategy(node);
@@ -30756,7 +30959,7 @@ function encode$d(params) {
   const result = handler2(params);
   return result;
 }
-function decode$f(params) {
+function decode$h(params) {
   const { node } = params;
   if (!node || !node.type) {
     return null;
@@ -30774,85 +30977,85 @@ function decode$f(params) {
   const result = decoder();
   return result;
 }
-const config$6 = {
-  xmlName: XML_NODE_NAME$7,
+const config$8 = {
+  xmlName: XML_NODE_NAME$9,
   sdNodeOrKeyName: SD_NODE_NAME$7,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$d,
-  decode: decode$f,
-  attributes: validXmlAttributes$4
+  encode: encode$f,
+  decode: decode$h,
+  attributes: validXmlAttributes$6
 };
-const translator$6 = NodeTranslator.from(config$6);
-const encode$c = (attributes) => {
+const translator$8 = NodeTranslator.from(config$8);
+const encode$e = (attributes) => {
   return attributes["w:id"];
 };
-const decode$e = (attrs) => {
+const decode$g = (attrs) => {
   return attrs.id;
 };
 const attrConfig$7 = Object.freeze({
   xmlName: "w:id",
   sdName: "id",
-  encode: encode$c,
-  decode: decode$e
+  encode: encode$e,
+  decode: decode$g
 });
-const encode$b = (attributes) => {
+const encode$d = (attributes) => {
   return attributes["w:name"];
 };
-const decode$d = (attrs) => {
+const decode$f = (attrs) => {
   return attrs.name;
 };
 const attrConfig$6 = Object.freeze({
   xmlName: "w:name",
   sdName: "name",
-  encode: encode$b,
-  decode: decode$d
+  encode: encode$d,
+  decode: decode$f
 });
-const encode$a = (attributes) => {
+const encode$c = (attributes) => {
   return attributes["w:colFirst"];
 };
-const decode$c = (attrs) => {
+const decode$e = (attrs) => {
   return attrs.colFirst;
 };
 const attrConfig$5 = Object.freeze({
   xmlName: "w:colFirst",
   sdName: "colFirst",
-  encode: encode$a,
-  decode: decode$c
+  encode: encode$c,
+  decode: decode$e
 });
-const encode$9 = (attributes) => {
+const encode$b = (attributes) => {
   return attributes["w:colLast"];
 };
-const decode$b = (attrs) => {
+const decode$d = (attrs) => {
   return attrs.colLast;
 };
 const attrConfig$4 = Object.freeze({
   xmlName: "w:colLast",
   sdName: "colLast",
-  encode: encode$9,
-  decode: decode$b
+  encode: encode$b,
+  decode: decode$d
 });
-const encode$8 = (attributes) => {
+const encode$a = (attributes) => {
   return attributes["w:displacedByCustomXml"];
 };
-const decode$a = (attrs) => {
+const decode$c = (attrs) => {
   return attrs.displacedByCustomXml;
 };
 const attrConfig$3 = Object.freeze({
   xmlName: "w:displacedByCustomXml",
   sdName: "displacedByCustomXml",
-  encode: encode$8,
-  decode: decode$a
+  encode: encode$a,
+  decode: decode$c
 });
-const validXmlAttributes$3 = [attrConfig$7, attrConfig$6, attrConfig$5, attrConfig$4, attrConfig$3];
-const XML_NODE_NAME$6 = "w:bookmarkStart";
+const validXmlAttributes$5 = [attrConfig$7, attrConfig$6, attrConfig$5, attrConfig$4, attrConfig$3];
+const XML_NODE_NAME$8 = "w:bookmarkStart";
 const SD_NODE_NAME$6 = "bookmarkStart";
-const encode$7 = (params, encodedAttrs = {}) => {
+const encode$9 = (params, encodedAttrs = {}) => {
   return {
     type: "bookmarkStart",
     attrs: encodedAttrs
   };
 };
-const decode$9 = (params, decodedAttrs = {}) => {
+const decode$b = (params, decodedAttrs = {}) => {
   const result = {
     name: "w:bookmarkStart",
     elements: []
@@ -30862,49 +31065,49 @@ const decode$9 = (params, decodedAttrs = {}) => {
   }
   return result;
 };
-const config$5 = {
-  xmlName: XML_NODE_NAME$6,
+const config$7 = {
+  xmlName: XML_NODE_NAME$8,
   sdNodeOrKeyName: SD_NODE_NAME$6,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$7,
-  decode: decode$9,
-  attributes: validXmlAttributes$3
+  encode: encode$9,
+  decode: decode$b,
+  attributes: validXmlAttributes$5
 };
-const translator$5 = NodeTranslator.from(config$5);
-const encode$6 = (attributes) => {
+const translator$7 = NodeTranslator.from(config$7);
+const encode$8 = (attributes) => {
   return attributes["w:id"];
 };
-const decode$8 = (attrs) => {
+const decode$a = (attrs) => {
   return attrs.id;
 };
 const attrConfig$2 = Object.freeze({
   xmlName: "w:id",
   sdName: "id",
-  encode: encode$6,
-  decode: decode$8
+  encode: encode$8,
+  decode: decode$a
 });
-const encode$5 = (attributes) => {
+const encode$7 = (attributes) => {
   return attributes["w:displacedByCustomXml"];
 };
-const decode$7 = (attrs) => {
+const decode$9 = (attrs) => {
   return attrs.displacedByCustomXml;
 };
 const attrConfig$1 = Object.freeze({
   xmlName: "w:displacedByCustomXml",
   sdName: "displacedByCustomXml",
-  encode: encode$5,
-  decode: decode$7
+  encode: encode$7,
+  decode: decode$9
 });
-const validXmlAttributes$2 = [attrConfig$2, attrConfig$1];
-const XML_NODE_NAME$5 = "w:bookmarkEnd";
+const validXmlAttributes$4 = [attrConfig$2, attrConfig$1];
+const XML_NODE_NAME$7 = "w:bookmarkEnd";
 const SD_NODE_NAME$5 = "bookmarkEnd";
-const encode$4 = (params, encodedAttrs = {}) => {
+const encode$6 = (params, encodedAttrs = {}) => {
   return {
     type: "bookmarkEnd",
     attrs: encodedAttrs
   };
 };
-const decode$6 = (params, decodedAttrs = {}) => {
+const decode$8 = (params, decodedAttrs = {}) => {
   const result = {
     name: "w:bookmarkEnd",
     elements: []
@@ -30914,27 +31117,27 @@ const decode$6 = (params, decodedAttrs = {}) => {
   }
   return result;
 };
-const config$4 = {
-  xmlName: XML_NODE_NAME$5,
+const config$6 = {
+  xmlName: XML_NODE_NAME$7,
   sdNodeOrKeyName: SD_NODE_NAME$5,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$4,
-  decode: decode$6,
-  attributes: validXmlAttributes$2
+  encode: encode$6,
+  decode: decode$8,
+  attributes: validXmlAttributes$4
 };
-const translator$4 = NodeTranslator.from(config$4);
-const decode$5 = (attrs) => attrs?.["w:id"];
+const translator$6 = NodeTranslator.from(config$6);
+const decode$7 = (attrs) => attrs?.["w:id"];
 const attrConfig = Object.freeze({
   xmlName: "w:id",
   sdName: "w:id",
   // We do not translate it from 'w:id' to 'id' when encoding, so the name is the same
   encode: () => {
   },
-  decode: decode$5
+  decode: decode$7
 });
-const XML_NODE_NAME$4 = "w:commentRange";
+const XML_NODE_NAME$6 = "w:commentRange";
 const SD_NODE_NAME$4 = "commentRange";
-const decode$4 = (params) => {
+const decode$6 = (params) => {
   const { node, comments, commentsExportType, exportedCommentDefs } = params;
   if (!node) return;
   if (!comments) return;
@@ -30977,19 +31180,19 @@ const getCommentSchema = (type2, commentIndex) => {
   };
 };
 const getConfig = (type2) => ({
-  xmlName: `${XML_NODE_NAME$4}${type2}`,
+  xmlName: `${XML_NODE_NAME$6}${type2}`,
   sdNodeOrKeyName: `${SD_NODE_NAME$4}${type2}`,
   type: NodeTranslator.translatorTypes.NODE,
   encode: () => {
   },
-  decode: decode$4,
+  decode: decode$6,
   attributes: [attrConfig]
 });
 const commentRangeStartTranslator = NodeTranslator.from(getConfig("Start"));
 const commentRangeEndTranslator = NodeTranslator.from(getConfig("End"));
-const XML_NODE_NAME$3 = "sd:pageReference";
+const XML_NODE_NAME$5 = "sd:pageReference";
 const SD_NODE_NAME$3 = "pageReference";
-const encode$3 = (params) => {
+const encode$5 = (params) => {
   const { nodes = [], nodeListHandler } = params || {};
   const node = nodes[0];
   const processedText = nodeListHandler.handler({
@@ -31006,7 +31209,7 @@ const encode$3 = (params) => {
   };
   return processedNode;
 };
-const decode$3 = (params) => {
+const decode$5 = (params) => {
   const { node } = params;
   const outputMarks = processOutputMarks(node.attrs?.marksAsAttrs || []);
   const contentNodes = (node.content ?? []).flatMap((n) => exportSchemaToJson({ ...params, node: n }));
@@ -31079,17 +31282,17 @@ const decode$3 = (params) => {
   ];
   return translated;
 };
-const config$3 = {
-  xmlName: XML_NODE_NAME$3,
+const config$5 = {
+  xmlName: XML_NODE_NAME$5,
   sdNodeOrKeyName: SD_NODE_NAME$3,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$3,
-  decode: decode$3
+  encode: encode$5,
+  decode: decode$5
 };
-const translator$3 = NodeTranslator.from(config$3);
-const XML_NODE_NAME$2 = "sd:tableOfContents";
+const translator$5 = NodeTranslator.from(config$5);
+const XML_NODE_NAME$4 = "sd:tableOfContents";
 const SD_NODE_NAME$2 = "tableOfContents";
-const encode$2 = (params) => {
+const encode$4 = (params) => {
   const { nodes = [], nodeListHandler } = params || {};
   const node = nodes[0];
   const processedContent = nodeListHandler.handler({
@@ -31105,7 +31308,7 @@ const encode$2 = (params) => {
   };
   return processedNode;
 };
-const decode$2 = (params) => {
+const decode$4 = (params) => {
   const { node } = params;
   const contentNodes = node.content.map((n) => exportSchemaToJson({ ...params, node: n }));
   const tocBeginElements = [
@@ -31152,14 +31355,14 @@ const decode$2 = (params) => {
   }
   return contentNodes;
 };
-const config$2 = {
-  xmlName: XML_NODE_NAME$2,
+const config$4 = {
+  xmlName: XML_NODE_NAME$4,
   sdNodeOrKeyName: SD_NODE_NAME$2,
   type: NodeTranslator.translatorTypes.NODE,
-  encode: encode$2,
-  decode: decode$2
+  encode: encode$4,
+  decode: decode$4
 };
-const translator$2 = NodeTranslator.from(config$2);
+const translator$4 = NodeTranslator.from(config$4);
 function parseInlineStyles(styleString) {
   if (!styleString) return {};
   return styleString.split(";").filter((style) => !!style.trim()).reduce((acc, style) => {
@@ -31293,7 +31496,7 @@ const handleDrawingNode = (params) => {
   if (mainNode.name === "w:drawing") node = mainNode;
   else node = mainNode.elements.find((el) => el.name === "w:drawing");
   if (!node) return { nodes: [], consumed: 0 };
-  const schemaNode = translator$7.encode(params);
+  const schemaNode = translator$9.encode(params);
   const newNodes = schemaNode ? [schemaNode] : [];
   return { nodes: newNodes, consumed: 1 };
 };
@@ -31301,6 +31504,203 @@ const drawingNodeHandlerEntity = {
   handlerName: "drawingNodeHandler",
   handler: handleDrawingNode
 };
+const createTrackStyleMark = (marks) => {
+  const trackStyleMark = marks.find((mark) => mark.type === "trackFormat");
+  if (trackStyleMark) {
+    return {
+      type: "element",
+      name: "w:rPrChange",
+      attributes: {
+        "w:id": trackStyleMark.attrs.id,
+        "w:author": trackStyleMark.attrs.author,
+        "w:authorEmail": trackStyleMark.attrs.authorEmail,
+        "w:date": trackStyleMark.attrs.date
+      },
+      elements: trackStyleMark.attrs.before.map((mark) => processOutputMarks([mark])).filter((r) => r !== void 0)
+    };
+  }
+  return void 0;
+};
+const XML_NODE_NAME$3 = "w:del";
+const SD_ATTR_KEY$1 = "trackDelete";
+const validXmlAttributes$3 = [
+  createAttributeHandler("w:id", "id"),
+  createAttributeHandler("w:date", "date"),
+  createAttributeHandler("w:author", "author"),
+  createAttributeHandler("w:authorEmail", "authorEmail")
+];
+const encode$3 = (params, encodedAttrs = {}) => {
+  const { nodeListHandler, extraParams = {} } = params;
+  const { node } = extraParams;
+  const subs = nodeListHandler.handler({
+    ...params,
+    insideTrackChange: true,
+    nodes: node.elements,
+    path: [...params.path || [], node]
+  });
+  encodedAttrs.importedAuthor = `${encodedAttrs.author} (imported)`;
+  subs.forEach((subElement) => {
+    if (subElement.marks === void 0) subElement.marks = [];
+    subElement.marks.push({ type: "trackDelete", attrs: encodedAttrs });
+  });
+  return subs;
+};
+function decode$3(params) {
+  const { node } = params;
+  if (!node || !node.type) {
+    return null;
+  }
+  const trackingMarks = ["trackInsert", "trackFormat", "trackDelete"];
+  const marks = node.marks;
+  const trackedMark = marks.find((m2) => m2.type === "trackDelete");
+  const trackStyleMark = createTrackStyleMark(marks);
+  node.marks = marks.filter((m2) => !trackingMarks.includes(m2.type));
+  if (trackStyleMark) {
+    node.marks.push(trackStyleMark);
+  }
+  const translatedTextNode = exportSchemaToJson({ ...params, node });
+  const textNode = translatedTextNode.elements.find((n) => n.name === "w:t");
+  textNode.name = "w:delText";
+  return {
+    name: "w:del",
+    attributes: {
+      "w:id": trackedMark.attrs.id,
+      "w:author": trackedMark.attrs.author,
+      "w:authorEmail": trackedMark.attrs.authorEmail,
+      "w:date": trackedMark.attrs.date
+    },
+    elements: [translatedTextNode]
+  };
+}
+const config$3 = {
+  xmlName: XML_NODE_NAME$3,
+  sdNodeOrKeyName: SD_ATTR_KEY$1,
+  type: NodeTranslator.translatorTypes.ATTRIBUTE,
+  encode: encode$3,
+  decode: decode$3,
+  attributes: validXmlAttributes$3
+};
+const translator$3 = NodeTranslator.from(config$3);
+const XML_NODE_NAME$2 = "w:ins";
+const SD_ATTR_KEY = "trackInsert";
+const validXmlAttributes$2 = [
+  createAttributeHandler("w:id", "id"),
+  createAttributeHandler("w:date", "date"),
+  createAttributeHandler("w:author", "author"),
+  createAttributeHandler("w:authorEmail", "authorEmail")
+];
+const encode$2 = (params, encodedAttrs = {}) => {
+  const { nodeListHandler, extraParams = {} } = params;
+  const { node } = extraParams;
+  const subs = nodeListHandler.handler({
+    ...params,
+    insideTrackChange: true,
+    nodes: node.elements,
+    path: [...params.path || [], node]
+  });
+  encodedAttrs.importedAuthor = `${encodedAttrs.author} (imported)`;
+  subs.forEach((subElement) => {
+    if (subElement.marks === void 0) subElement.marks = [];
+    subElement.marks.push({ type: "trackInsert", attrs: encodedAttrs });
+  });
+  return subs;
+};
+function decode$2(params) {
+  const { node } = params;
+  if (!node || !node.type) {
+    return null;
+  }
+  const trackingMarks = ["trackInsert", "trackFormat", "trackDelete"];
+  const marks = node.marks;
+  const trackedMark = marks.find((m2) => m2.type === "trackInsert");
+  const trackStyleMark = createTrackStyleMark(marks);
+  node.marks = marks.filter((m2) => !trackingMarks.includes(m2.type));
+  if (trackStyleMark) {
+    node.marks.push(trackStyleMark);
+  }
+  const translatedTextNode = exportSchemaToJson({ ...params, node });
+  return {
+    name: "w:ins",
+    attributes: {
+      "w:id": trackedMark.attrs.id,
+      "w:author": trackedMark.attrs.author,
+      "w:authorEmail": trackedMark.attrs.authorEmail,
+      "w:date": trackedMark.attrs.date
+    },
+    elements: [translatedTextNode]
+  };
+}
+const config$2 = {
+  xmlName: XML_NODE_NAME$2,
+  sdNodeOrKeyName: SD_ATTR_KEY,
+  type: NodeTranslator.translatorTypes.ATTRIBUTE,
+  encode: encode$2,
+  decode: decode$2,
+  attributes: validXmlAttributes$2
+};
+const translator$2 = NodeTranslator.from(config$2);
+const isTrackChangeElement = (node) => node?.name === "w:del" || node?.name === "w:ins";
+const unwrapTrackChangeNode = (node) => {
+  if (!node) {
+    return null;
+  }
+  if (isTrackChangeElement(node)) {
+    return node;
+  }
+  if (node.name === "w:sdt") {
+    const content = node.elements?.find((element) => element.name === "w:sdtContent");
+    if (!content?.elements?.length) {
+      return null;
+    }
+    for (const child of content.elements) {
+      const trackChange = unwrapTrackChangeNode(child);
+      if (trackChange) {
+        return trackChange;
+      }
+    }
+  }
+  return null;
+};
+const handleTrackChangeNode = (params) => {
+  const { nodes } = params;
+  if (nodes.length === 0) {
+    return { nodes: [], consumed: 0 };
+  }
+  const mainNode = unwrapTrackChangeNode(nodes[0]);
+  if (!mainNode) {
+    return { nodes: [], consumed: 0 };
+  }
+  let result;
+  const translatorParams = {
+    ...params,
+    nodes: [mainNode]
+  };
+  switch (mainNode.name) {
+    case "w:del":
+      result = translator$3.encode({
+        extraParams: {
+          node: mainNode
+        },
+        ...translatorParams
+      });
+      break;
+    case "w:ins":
+      result = translator$2.encode({
+        extraParams: {
+          node: mainNode
+        },
+        ...translatorParams
+      });
+      break;
+  }
+  return { nodes: result, consumed: 1 };
+};
+const trackChangeNodeHandlerEntity = {
+  handlerName: "trackChangeNodeHandler",
+  handler: handleTrackChangeNode
+};
+const hyperlinkNodeHandlerEntity = generateV2HandlerEntity("hyperlinkNodeHandler", translator$1c);
+const runNodeHandlerEntity = generateV2HandlerEntity("runNodeHandler", translator$1b);
 function parseProperties(node) {
   const marks = [];
   const unknownMarks = [];
@@ -31352,51 +31752,6 @@ function getElementName(element) {
 const isPropertiesElement = (element) => {
   return !!SuperConverter.propertyTypes[element.name || element.type];
 };
-const handleTrackChangeNode = (params) => {
-  const { nodes, nodeListHandler } = params;
-  if (nodes.length === 0 || !(nodes[0].name === "w:del" || nodes[0].name === "w:ins" || nodes[0].name === "w:sdt")) {
-    return { nodes: [], consumed: 0 };
-  }
-  const mainNode = nodes[0];
-  let node;
-  if (["w:ins", "w:del"].includes(mainNode.name)) {
-    node = mainNode;
-  } else {
-    const sdtContent = mainNode.elements.find((el) => el.name === "w:sdtContent");
-    const trackedChange = sdtContent?.elements.find((el) => ["w:ins", "w:del"].includes(el.name));
-    if (trackedChange) node = trackedChange;
-  }
-  if (!node) {
-    return { nodes: [], consumed: 0 };
-  }
-  const { name } = node;
-  const { attributes, elements } = parseProperties(node);
-  const subs = nodeListHandler.handler({
-    ...params,
-    insideTrackChange: true,
-    nodes: elements,
-    path: [...params.path || [], node]
-  });
-  const changeType = name === "w:del" ? TrackDeleteMarkName : TrackInsertMarkName;
-  const mappedAttributes = {
-    id: attributes["w:id"],
-    date: attributes["w:date"],
-    author: attributes["w:author"],
-    authorEmail: attributes["w:authorEmail"],
-    importedAuthor: `${attributes["w:author"]} (imported)`
-  };
-  subs.forEach((subElement) => {
-    if (subElement.marks === void 0) subElement.marks = [];
-    subElement.marks.push({ type: changeType, attrs: mappedAttributes });
-  });
-  return { nodes: subs, consumed: 1 };
-};
-const trackChangeNodeHandlerEntity = {
-  handlerName: "trackChangeNodeHandler",
-  handler: handleTrackChangeNode
-};
-const hyperlinkNodeHandlerEntity = generateV2HandlerEntity("hyperlinkNodeHandler", translator$X);
-const runNodeHandlerEntity = generateV2HandlerEntity("runNodeHandler", translator$W);
 const handleTextNode = (params) => {
   const { nodes, insideTrackChange } = params;
   if (nodes.length === 0 || !(nodes[0].name === "w:t" || insideTrackChange && nodes[0].name === "w:delText")) {
@@ -31437,7 +31792,7 @@ const handleParagraphNode = (params) => {
   if (nodes.length === 0 || nodes[0].name !== "w:p") {
     return { nodes: [], consumed: 0 };
   }
-  const schemaNode = translator$17.encode(params);
+  const schemaNode = translator$1o.encode(params);
   const newNodes = schemaNode ? [schemaNode] : [];
   return { nodes: newNodes, consumed: 1 };
 };
@@ -31450,7 +31805,7 @@ const handleSdtNode = (params) => {
   if (nodes.length === 0 || nodes[0].name !== "w:sdt") {
     return { nodes: [], consumed: 0 };
   }
-  const result = translator$6.encode(params);
+  const result = translator$8.encode(params);
   if (!result) {
     return { nodes: [], consumed: 0 };
   }
@@ -31540,7 +31895,7 @@ const handler = (params) => {
   if (nodes.length === 0 || nodes[0].name !== "w:br") {
     return { nodes: [], consumed: 0 };
   }
-  const result = translator$1a.encode(params);
+  const result = translator$1r.encode(params);
   if (!result) return { nodes: [], consumed: 0 };
   return {
     nodes: [result],
@@ -31612,7 +31967,7 @@ const handleBookmarkStartNode = (params) => {
   if (isCustomMarkBookmark(nodes[0], params.editor)) {
     return handleBookmarkNode(params);
   }
-  const node = translator$5.encode(params);
+  const node = translator$7.encode(params);
   if (!node) return { nodes: [], consumed: 0 };
   return { nodes: [node], consumed: 1 };
 };
@@ -31644,7 +31999,7 @@ const handleBookmarkEndNode = (params) => {
   if (!nodes.length || nodes[0].name !== "w:bookmarkEnd") {
     return { nodes: [], consumed: 0 };
   }
-  const node = translator$4.encode(params);
+  const node = translator$6.encode(params);
   if (!node) return { nodes: [], consumed: 0 };
   return { nodes: [node], consumed: 1 };
 };
@@ -31777,7 +32132,7 @@ const autoTotalPageCountEntity = {
   handlerName: "autoTotalPageCountEntity",
   handler: handleAutoTotalPageNumber
 };
-const pageReferenceEntity = generateV2HandlerEntity("pageReferenceNodeHandler", translator$3);
+const pageReferenceEntity = generateV2HandlerEntity("pageReferenceNodeHandler", translator$5);
 const handlePictNode = (params) => {
   const { nodes } = params;
   if (!nodes.length || nodes[0].name !== "w:p") {
@@ -32166,14 +32521,14 @@ const handleTabNode = (params) => {
   if (!nodes.length || nodes[0].name !== "w:tab") {
     return { nodes: [], consumed: 0 };
   }
-  const node = translator$18.encode(params);
+  const node = translator$1p.encode(params);
   return { nodes: [node], consumed: 1 };
 };
 const tabNodeEntityHandler = {
   handlerName: "w:tabTranslator",
   handler: handleTabNode
 };
-const tableOfContentsHandlerEntity = generateV2HandlerEntity("tableOfContentsHandler", translator$2);
+const tableOfContentsHandlerEntity = generateV2HandlerEntity("tableOfContentsHandler", translator$4);
 function preProcessPageInstruction(nodesToCombine) {
   const pageNumNode = {
     name: "sd:autoPageNumber",
@@ -32418,12 +32773,14 @@ const createDocumentJson = (docx, converter, editor) => {
     const content = pruneIgnoredNodes(contentElements);
     const comments = importCommentData({ docx, converter, editor });
     const lists = {};
+    const inlineDocumentFonts = [];
     let parsedContent = nodeListHandler.handler({
       nodes: content,
       nodeListHandler,
       docx,
       converter,
       editor,
+      inlineDocumentFonts,
       lists,
       path: []
     });
@@ -32446,6 +32803,7 @@ const createDocumentJson = (docx, converter, editor) => {
       savedTagsToRestore: node,
       pageStyles: getDocumentStyles(node, docx, converter, editor),
       comments,
+      inlineDocumentFonts,
       linkedStyles: getStyleDefinitions(docx),
       numbering: getNumberingDefinitions(docx)
     };
@@ -32509,6 +32867,7 @@ const createNodeListHandler = (nodeHandlers) => {
     filename,
     parentStyleId,
     lists,
+    inlineDocumentFonts,
     path = []
   }) => {
     if (!elements || !elements.length) return [];
@@ -32535,6 +32894,7 @@ const createNodeListHandler = (nodeHandlers) => {
                 filename,
                 parentStyleId,
                 lists,
+                inlineDocumentFonts,
                 path
               });
             },
@@ -33222,35 +33582,35 @@ function exportSchemaToJson(params) {
     doc: translateDocumentNode,
     body: translateBodyNode,
     heading: translateHeadingNode,
-    paragraph: translator$17,
-    run: translator$W,
+    paragraph: translator$1o,
+    run: translator$1b,
     text: translateTextNode,
     bulletList: translateList,
     orderedList: translateList,
-    lineBreak: translator$1a,
-    table: translator$b,
-    tableRow: translator$I,
-    tableCell: translator$a,
-    bookmarkStart: translator$5,
-    bookmarkEnd: translator$4,
-    fieldAnnotation: translator$6,
-    tab: translator$18,
-    image: translator$7,
-    hardBreak: translator$1a,
+    lineBreak: translator$1r,
+    table: translator$s,
+    tableRow: translator$Z,
+    tableCell: translator$c,
+    bookmarkStart: translator$7,
+    bookmarkEnd: translator$6,
+    fieldAnnotation: translator$8,
+    tab: translator$1p,
+    image: translator$9,
+    hardBreak: translator$1r,
     commentRangeStart: commentRangeStartTranslator,
     commentRangeEnd: commentRangeEndTranslator,
     commentReference: () => null,
     shapeContainer: translator,
     shapeTextbox: translator,
     contentBlock: translator,
-    structuredContent: translator$6,
-    structuredContentBlock: translator$6,
-    documentPartObject: translator$6,
-    documentSection: translator$6,
+    structuredContent: translator$8,
+    structuredContentBlock: translator$8,
+    documentPartObject: translator$8,
+    documentSection: translator$8,
     "page-number": translatePageNumberNode,
     "total-page-number": translateTotalPageNumberNode,
-    pageReference: translator$3,
-    tableOfContents: translator$2
+    pageReference: translator$5,
+    tableOfContents: translator$4
   };
   let handler2 = router[type2];
   if (handler2 && "decode" in handler2 && typeof handler2.decode === "function") {
@@ -33586,62 +33946,22 @@ function getTextNodeForExport(text, marks, params) {
 function translateTextNode(params) {
   const { node, extraParams } = params;
   const trackedMarks = [TrackInsertMarkName, TrackDeleteMarkName];
-  const isTrackedNode = node.marks?.some((m2) => trackedMarks.includes(m2.type));
-  if (isTrackedNode) return translateTrackedNode(params);
+  const trackedMark = node.marks?.find((m2) => trackedMarks.includes(m2.type));
+  if (trackedMark) {
+    switch (trackedMark.type) {
+      case "trackDelete":
+        return translator$3.decode(params);
+      case "trackInsert":
+        return translator$2.decode(params);
+    }
+  }
   const isLinkNode = node.marks?.some((m2) => m2.type === "link");
   if (isLinkNode && !extraParams?.linkProcessed) {
-    return translator$X.decode(params);
+    return translator$1c.decode(params);
   }
   const { text, marks = [] } = node;
   return getTextNodeForExport(text, marks, params);
 }
-function createTrackStyleMark(marks) {
-  const trackStyleMark = marks.find((mark) => mark.type === TrackFormatMarkName);
-  if (trackStyleMark) {
-    const markElement = {
-      type: "element",
-      name: "w:rPrChange",
-      attributes: {
-        "w:id": trackStyleMark.attrs.id,
-        "w:author": trackStyleMark.attrs.author,
-        "w:authorEmail": trackStyleMark.attrs.authorEmail,
-        "w:date": trackStyleMark.attrs.date
-      },
-      elements: trackStyleMark.attrs.before.map((mark) => processOutputMarks([mark])).filter((r) => r !== void 0)
-    };
-    return markElement;
-  }
-  return void 0;
-}
-function translateTrackedNode(params) {
-  const { node } = params;
-  const marks = node.marks;
-  const trackingMarks = [TrackInsertMarkName, TrackDeleteMarkName, TrackFormatMarkName];
-  const trackedMark = marks.find((m2) => trackingMarks.includes(m2.type));
-  const isInsert = trackedMark.type === TrackInsertMarkName;
-  const trackStyleMark = createTrackStyleMark(marks);
-  node.marks = marks.filter((m2) => !trackingMarks.includes(m2.type));
-  if (trackStyleMark) {
-    node.marks.push(trackStyleMark);
-  }
-  const translatedTextNode = exportSchemaToJson({ ...params, node });
-  if (!isInsert) {
-    const textNode = translatedTextNode.elements.find((n) => n.name === "w:t");
-    textNode.name = "w:delText";
-  }
-  const trackedNode = {
-    name: isInsert ? "w:ins" : "w:del",
-    type: "element",
-    attributes: {
-      "w:id": trackedMark.attrs.id,
-      "w:author": trackedMark.attrs.author,
-      "w:authorEmail": trackedMark.attrs.authorEmail,
-      "w:date": trackedMark.attrs.date
-    },
-    elements: [translatedTextNode]
-  };
-  return trackedNode;
-}
 function wrapTextInRun(nodeOrNodes, marks) {
   let elements = [];
   if (Array.isArray(nodeOrNodes)) elements = nodeOrNodes;
@@ -33897,7 +34217,7 @@ function translateMark(mark) {
       markElement.type = "element";
       break;
     case "underline": {
-      const translated = translator$14.decode({
+      const translated = translator$1l.decode({
         node: {
           attrs: {
             underlineType: attrs.underlineType ?? attrs.underline ?? null,
@@ -33961,7 +34281,7 @@ function translateMark(mark) {
       break;
     case "highlight": {
       const highlightValue = attrs.color ?? attrs.highlight ?? null;
-      const translated = translator$19.decode({ node: { attrs: { highlight: highlightValue } } });
+      const translated = translator$1q.decode({ node: { attrs: { highlight: highlightValue } } });
       return translated || {};
     }
     case "link":
@@ -34340,6 +34660,7 @@ const _SuperConverter = class _SuperConverter {
     this.fonts = params?.fonts || {};
     this.addedMedia = {};
     this.comments = [];
+    this.inlineDocumentFonts = [];
     this.docHiglightColors = /* @__PURE__ */ new Set([]);
     this.xml = params?.xml;
     this.declaration = null;
@@ -34626,6 +34947,23 @@ const _SuperConverter = class _SuperConverter {
     return result;
   }
   getDocumentFonts() {
+    const inlineDocumentFonts = [...new Set(this.inlineDocumentFonts || [])];
+    const fontTable = this.convertedXml["word/fontTable.xml"];
+    if (!fontTable) {
+      return inlineDocumentFonts;
+    }
+    const wFonts = fontTable.elements?.find((element) => element.name === "w:fonts");
+    if (!wFonts) {
+      return inlineDocumentFonts;
+    }
+    if (!wFonts.elements) {
+      return inlineDocumentFonts;
+    }
+    const fontsInFontTable = wFonts.elements.filter((element) => element.name === "w:font").map((element) => element.attributes["w:name"]);
+    const allFonts = [...inlineDocumentFonts, ...fontsInFontTable];
+    return [...new Set(allFonts)];
+  }
+  getFontFaceImportString() {
     const fontTable = this.convertedXml["word/fontTable.xml"];
     if (!fontTable || !Object.keys(this.fonts).length) return;
     const fonts = fontTable.elements.find((el) => el.name === "w:fonts");
@@ -34639,6 +34977,7 @@ const _SuperConverter = class _SuperConverter {
     const rels = this.convertedXml["word/_rels/fontTable.xml.rels"];
     const relationships = rels?.elements.find((el) => el.name === "Relationships") || {};
     const { elements } = relationships;
+    const fontsImported = [];
     let styleString = "";
     for (const font of fontsToInclude) {
       const filePath = elements.find((el) => el.attributes.Id === font.attributes["r:id"])?.attributes?.Target;
@@ -34655,6 +34994,9 @@ const _SuperConverter = class _SuperConverter {
       const isItalic = font.name.includes("Italic");
       const isLight = font.name.includes("Light");
       const fontWeight = isNormal ? "normal" : isBold ? "bold" : isLight ? "200" : "normal";
+      if (!fontsImported.includes(font.fontFamily)) {
+        fontsImported.push(font.fontFamily);
+      }
       styleString += `
         @font-face {
           font-style: ${isItalic ? "italic" : "normal"};
@@ -34665,7 +35007,10 @@ const _SuperConverter = class _SuperConverter {
         }
       `;
     }
-    return styleString;
+    return {
+      styleString,
+      fontsImported
+    };
   }
   getDocumentInternalId() {
     const settingsLocation = "word/settings.xml";
@@ -34720,6 +35065,7 @@ const _SuperConverter = class _SuperConverter {
       this.numbering = result.numbering;
       this.comments = result.comments;
       this.linkedStyles = result.linkedStyles;
+      this.inlineDocumentFonts = result.inlineDocumentFonts;
       return result.pmDoc;
     } else {
       return null;
@@ -35095,7 +35441,7 @@ export {
   objectIncludes as Z,
   AddMarkStep as _,
   Plugin as a,
-  translator$D as a$,
+  translator$10 as a$,
   twipsToLines as a0,
   pixelsToTwips as a1,
   helpers as a2,
@@ -35106,33 +35452,33 @@ export {
   createDocFromMarkdown as a7,
   createDocFromHTML as a8,
   EditorState as a9,
-  vClickOutside as aA,
-  getActiveFormatting as aB,
-  readFromClipboard as aC,
-  handleClipboardPaste as aD,
-  getFileObject as aE,
-  runPropertyTranslators as aF,
-  commentRangeEndTranslator as aG,
-  commentRangeStartTranslator as aH,
-  translator$8 as aI,
-  translator$9 as aJ,
-  translator$K as aK,
-  translator$L as aL,
-  translator$14 as aM,
-  translator$J as aN,
-  translator$M as aO,
-  translator$I as aP,
-  translator$i as aQ,
-  translator$a as aR,
-  translator$v as aS,
-  translator$w as aT,
-  translator$x as aU,
-  translator$y as aV,
-  translator$z as aW,
-  translator$e as aX,
-  translator$A as aY,
-  translator$B as aZ,
-  translator$C as a_,
+  xmljs as aA,
+  vClickOutside as aB,
+  getActiveFormatting as aC,
+  readFromClipboard as aD,
+  handleClipboardPaste as aE,
+  getFileObject as aF,
+  runPropertyTranslators as aG,
+  translator$d as aH,
+  translator$k as aI,
+  translator$m as aJ,
+  translator$e as aK,
+  translator$f as aL,
+  translator$n as aM,
+  translator$o as aN,
+  translator$j as aO,
+  translator$g as aP,
+  translator$r as aQ,
+  translator$i as aR,
+  translator$l as aS,
+  translator$h as aT,
+  translator$q as aU,
+  translator$p as aV,
+  commentRangeEndTranslator as aW,
+  commentRangeStartTranslator as aX,
+  translator$a as aY,
+  translator$b as aZ,
+  translator$$ as a_,
   hasSomeParentWithClass as aa,
   isActive as ab,
   unflattenListsInHtml as ac,
@@ -35155,59 +35501,75 @@ export {
   isInTable as at,
   generateDocxRandomId as au,
   insertNewRelationship as av,
-  commonjsGlobal as aw,
-  getDefaultExportFromCjs$2 as ax,
-  getContentTypesFromXml as ay,
-  xmljs as az,
+  inchesToPixels as aw,
+  commonjsGlobal as ax,
+  getDefaultExportFromCjs$2 as ay,
+  getContentTypesFromXml as az,
   Slice as b,
-  translator$N as b0,
-  translator$c as b1,
-  translator$E as b2,
-  translator$O as b3,
-  translator$f as b4,
-  translator$F as b5,
-  translator$g as b6,
-  translator$b as b7,
-  translator$18 as b8,
-  translator$_ as b9,
-  translator$U as bA,
-  translator$V as bB,
-  translator$1a as bC,
-  translator$u as bD,
-  translator$5 as bE,
-  translator$4 as bF,
-  translator$H as bG,
-  translator$16 as bH,
-  translator$2 as bI,
-  translator$3 as bJ,
-  translator$1 as bK,
-  _sfc_main as bL,
-  translator$$ as ba,
-  translator$13 as bb,
-  translator$k as bc,
-  translator$G as bd,
-  translator$6 as be,
-  translator$m as bf,
-  translator$10 as bg,
-  translator$Y as bh,
-  translator$11 as bi,
-  translator$W as bj,
-  translator$17 as bk,
-  translator$o as bl,
-  translator$P as bm,
-  translator$p as bn,
-  translator$q as bo,
-  translator$15 as bp,
-  translator$X as bq,
-  translator$19 as br,
-  translator$Q as bs,
-  translator$d as bt,
-  translator$R as bu,
-  translator$S as bv,
-  translator$s as bw,
-  translator$7 as bx,
-  translator$T as by,
-  translator$12 as bz,
+  _sfc_main as b$,
+  translator$1l as b0,
+  translator$_ as b1,
+  translator$11 as b2,
+  translator$Z as b3,
+  translator$z as b4,
+  translator$c as b5,
+  translator$M as b6,
+  translator$N as b7,
+  translator$O as b8,
+  translator$P as b9,
+  translator$1o as bA,
+  translator$F as bB,
+  translator$14 as bC,
+  translator$G as bD,
+  translator$H as bE,
+  translator$1m as bF,
+  translator$1c as bG,
+  translator$1q as bH,
+  translator$15 as bI,
+  translator$u as bJ,
+  translator$16 as bK,
+  translator$17 as bL,
+  translator$J as bM,
+  translator$9 as bN,
+  translator$18 as bO,
+  translator$1j as bP,
+  translator$19 as bQ,
+  translator$1a as bR,
+  translator$1r as bS,
+  translator$L as bT,
+  translator$7 as bU,
+  translator$6 as bV,
+  translator$Y as bW,
+  translator$1n as bX,
+  translator$4 as bY,
+  translator$5 as bZ,
+  translator$1 as b_,
+  translator$Q as ba,
+  translator$v as bb,
+  translator$R as bc,
+  translator$S as bd,
+  translator$T as be,
+  translator$U as bf,
+  translator$12 as bg,
+  translator$t as bh,
+  translator$V as bi,
+  translator$13 as bj,
+  translator$w as bk,
+  translator$W as bl,
+  translator$x as bm,
+  translator$s as bn,
+  translator$1p as bo,
+  translator$1f as bp,
+  translator$1g as bq,
+  translator$1k as br,
+  translator$B as bs,
+  translator$X as bt,
+  translator$8 as bu,
+  translator$D as bv,
+  translator$1h as bw,
+  translator$1d as bx,
+  translator$1i as by,
+  translator$1b as bz,
   DOMParser$1 as c,
   Mark as d,
   dropPoint as e,