@harbour-enterprises/superdoc 1.6.2-next.1 → 1.7.0-next.10

package/dist/chunks/{index-zOfz1dJM.es.js → index-lM-AjL0q.es.js}

@@ -1,6 +1,6 @@
 import { B as Buffer$2 } from "./jszip-B1fkPkPJ.es.js";
 import { t as twipsToInches, i as inchesToTwips, p as ptToTwips, l as linesToTwips, a as twipsToLines, b as pixelsToTwips, h as halfPointToPoints, c as twipsToPixels$2, d as convertSizeToCSS, e as inchesToPixels } from "./helpers-C8e9wR5l.es.js";
-import { g as generateDocxRandomId, T as TextSelection$1, o as objectIncludes, w as wrapTextsInRuns, D as DOMParser$1, c as createDocFromMarkdown, a as createDocFromHTML, b as chainableEditorState, d as convertMarkdownToHTML, f as findParentNode, e as findParentNodeClosestToPos, h as generateRandom32BitHex, i as generateRandomSigned32BitIntStrId, P as PluginKey, j as Plugin, M as Mapping, N as NodeSelection, k as Selection, l as Slice, m as DOMSerializer, F as Fragment, n as Mark$1, p as dropPoint, A as AllSelection, q as Schema$1, s as canSplit, t as resolveRunProperties, u as encodeMarksFromRPr, v as liftTarget, x as canJoin, y as joinPoint, z as replaceStep$1, R as ReplaceAroundStep$1, B as htmlHandler, C as ReplaceStep, E as getResolvedParagraphProperties, G as changeListLevel, H as isList$1, I as updateNumberingProperties, L as ListHelpers, J as inputRulesPlugin, K as TrackDeleteMarkName$1, O as TrackInsertMarkName$1, Q as TrackFormatMarkName$1, U as AddMarkStep, V as RemoveMarkStep, W as CommandService, S as SuperConverter, X as EditorState, Y as unflattenListsInHtml, Z as SelectionRange, _ as Transform, $ as createOoxmlResolver, a0 as translator, a1 as translator$1, a2 as resolveDocxFontFamily, a3 as combineIndentProperties, a4 as _getReferencedTableStyles, a5 as decodeRPrFromMarks, a6 as calculateResolvedParagraphProperties, a7 as encodeCSSFromPPr, a8 as encodeCSSFromRPr, a9 as generateOrderedListIndex, aa as docxNumberingHelpers, ab as InputRule, ac as insertNewRelationship, ad as kebabCase$1, ae as getUnderlineCssString } from "./SuperConverter-C0XQKCFE.es.js";
+import { g as generateDocxRandomId, T as TextSelection$1, o as objectIncludes, w as wrapTextsInRuns, D as DOMParser$1, c as createDocFromMarkdown, a as createDocFromHTML, b as chainableEditorState, d as convertMarkdownToHTML, f as findParentNode, e as findParentNodeClosestToPos, h as generateRandom32BitHex, i as generateRandomSigned32BitIntStrId, P as PluginKey, j as Plugin, M as Mapping, N as NodeSelection, k as Selection, l as Slice, m as DOMSerializer, F as Fragment, n as Mark$1, p as dropPoint, A as AllSelection, q as Schema$1, s as canSplit, t as resolveRunProperties, u as encodeMarksFromRPr, v as liftTarget, x as canJoin, y as joinPoint, z as replaceStep$1, R as ReplaceAroundStep$1, B as htmlHandler, C as ReplaceStep, E as getResolvedParagraphProperties, G as changeListLevel, H as isList$1, I as updateNumberingProperties, L as ListHelpers, J as inputRulesPlugin, K as TrackDeleteMarkName$1, O as TrackInsertMarkName$1, Q as TrackFormatMarkName$1, U as AddMarkStep, V as RemoveMarkStep, W as CommandService, S as SuperConverter, X as EditorState, Y as unflattenListsInHtml, Z as SelectionRange, _ as Transform, $ as createOoxmlResolver, a0 as translator, a1 as translator$1, a2 as resolveDocxFontFamily, a3 as combineIndentProperties, a4 as _getReferencedTableStyles, a5 as decodeRPrFromMarks, a6 as calculateResolvedParagraphProperties, a7 as encodeCSSFromPPr, a8 as encodeCSSFromRPr, a9 as generateOrderedListIndex, aa as docxNumberingHelpers, ab as InputRule, ac as insertNewRelationship, ad as kebabCase$1, ae as getUnderlineCssString } from "./SuperConverter-CsrXPsVn.es.js";
 import { p as process$1, r as ref, C as global$1, c as computed, E as createElementBlock, F as Fragment$1, S as renderList, O as withModifiers, G as openBlock, P as normalizeClass, M as createCommentVNode, H as toDisplayString, K as createBaseVNode, U as createApp, f as onMounted, X as onUnmounted, R as withDirectives, v as unref, Y as vModelText, y as nextTick, L as normalizeStyle, u as watch, Z as withKeys, _ as createTextVNode, I as createVNode, h as h$1, $ as readonly, s as getCurrentInstance, o as onBeforeUnmount, j as reactive, b as onBeforeMount, i as inject, a0 as onActivated, a1 as onDeactivated, a2 as Comment, d as defineComponent, a as provide, g as Teleport, t as toRef, a3 as renderSlot, a4 as isVNode, D as shallowRef, w as watchEffect, T as Transition, a5 as mergeProps, a6 as vShow, a7 as cloneVNode, a8 as Text$2, m as markRaw, N as createBlock, J as withCtx, a9 as useCssVars, V as resolveDynamicComponent, aa as normalizeProps, ab as guardReactiveProps } from "./vue-BnBKJwCW.es.js";
 import "./jszip.min-DCl8qkFO.es.js";
 import { E as EventEmitter$1 } from "./eventemitter3-CwrdEv8r.es.js";
@@ -12927,9 +12927,43 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
   comments.forEach((c2) => {
     commentMap.set(c2.commentId, c2);
   });
+  const trackedChangeSpanById = /* @__PURE__ */ new Map();
+  const trackedChangeMarksById = /* @__PURE__ */ new Map();
+  doc2.descendants((node, pos) => {
+    const trackedChangeMark = node.marks?.find((mark) => TRACK_CHANGE_MARKS$1.includes(mark.type.name));
+    if (!trackedChangeMark) return;
+    const trackedChangeId = trackedChangeMark.attrs?.id;
+    if (!trackedChangeId) return;
+    const existing = trackedChangeSpanById.get(trackedChangeId);
+    const startPos = pos;
+    const endPos = pos + node.nodeSize;
+    if (!existing) {
+      trackedChangeSpanById.set(trackedChangeId, { startPos, endPos });
+    } else {
+      existing.startPos = Math.min(existing.startPos, startPos);
+      existing.endPos = Math.max(existing.endPos, endPos);
+    }
+    const marksEntry = trackedChangeMarksById.get(trackedChangeId) || {};
+    if (trackedChangeMark.type?.name === TrackInsertMarkName$1 && !marksEntry.insertMark) {
+      marksEntry.insertMark = trackedChangeMark;
+    }
+    if (trackedChangeMark.type?.name === TrackDeleteMarkName$1 && !marksEntry.deleteMark) {
+      marksEntry.deleteMark = trackedChangeMark;
+    }
+    trackedChangeMarksById.set(trackedChangeId, marksEntry);
+  });
+  const getThreadingParentId = (comment) => {
+    if (!comment) return comment?.parentCommentId;
+    const usesRangeThreading = comment.threadingStyleOverride === "range-based" || comment.threadingMethod === "range-based" || comment.originalXmlStructure?.hasCommentsExtended === false;
+    if (usesRangeThreading && comment.threadingParentCommentId) {
+      return comment.threadingParentCommentId;
+    }
+    return comment.parentCommentId;
+  };
   const startNodes = [];
   const endNodes = [];
   const seen = /* @__PURE__ */ new Set();
+  const trackedChangeCommentMeta = /* @__PURE__ */ new Map();
   doc2.descendants((node, pos) => {
     const commentMarks = node.marks?.filter((mark) => mark.type.name === CommentMarkName$1) || [];
     commentMarks.forEach((commentMark) => {
@@ -12937,9 +12971,21 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
       const { commentId } = attrs;
       if (commentId === "pending") return;
       if (seen.has(commentId)) return;
-      seen.add(commentId);
       const comment = commentMap.get(commentId);
-      const parentCommentId = comment?.parentCommentId;
+      const parentCommentId = getThreadingParentId(comment);
+      const trackedChangeMark = node.marks?.find((mark) => TRACK_CHANGE_MARKS$1.includes(mark.type.name));
+      const trackedChangeId = trackedChangeMark?.attrs?.id;
+      const trackedSpan = trackedChangeId ? trackedChangeSpanById.get(trackedChangeId) : null;
+      if (trackedSpan) {
+        trackedChangeCommentMeta.set(commentId, {
+          comment,
+          parentCommentId,
+          trackedChangeId
+        });
+        seen.add(commentId);
+        return;
+      }
+      seen.add(commentId);
       const commentStartNodeAttrs = getPreparedComment(commentMark.attrs);
       const startNode = schema.nodes.commentRangeStart.create(commentStartNodeAttrs);
       startNodes.push({
@@ -12955,7 +13001,7 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
         commentId,
         parentCommentId
       });
-      const childComments = comments.filter((c2) => c2.parentCommentId === commentId).sort((a, b2) => a.createdTime - b2.createdTime);
+      const childComments = comments.filter((c2) => getThreadingParentId(c2) === commentId).sort((a, b2) => a.createdTime - b2.createdTime);
       childComments.forEach((c2) => {
         if (seen.has(c2.commentId)) return;
         seen.add(c2.commentId);
@@ -12968,47 +13014,74 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
           pos,
           node: childStartNode,
           commentId: c2.commentId,
-          parentCommentId: c2.parentCommentId
+          parentCommentId: getThreadingParentId(c2)
         });
         const childEndNode = schema.nodes.commentRangeEnd.create(childMark);
         endNodes.push({
           pos: pos + node.nodeSize,
           node: childEndNode,
           commentId: c2.commentId,
-          parentCommentId: c2.parentCommentId
+          parentCommentId: getThreadingParentId(c2)
         });
       });
     });
-    const trackedChangeMark = node.marks?.find((mark) => TRACK_CHANGE_MARKS$1.includes(mark.type.name));
-    if (trackedChangeMark) {
-      const trackedChangeId = trackedChangeMark.attrs?.id;
-      if (trackedChangeId) {
-        const childComments = comments.filter((c2) => c2.parentCommentId === trackedChangeId && !c2.trackedChange).sort((a, b2) => a.createdTime - b2.createdTime);
-        childComments.forEach((c2) => {
-          if (seen.has(c2.commentId)) return;
-          seen.add(c2.commentId);
-          const childMark = getPreparedComment({
-            commentId: c2.commentId,
-            internal: c2.isInternal
-          });
-          const childStartNode = schema.nodes.commentRangeStart.create(childMark);
-          startNodes.push({
-            pos,
-            node: childStartNode,
-            commentId: c2.commentId,
-            parentCommentId: c2.parentCommentId
-          });
-          const childEndNode = schema.nodes.commentRangeEnd.create(childMark);
-          endNodes.push({
-            pos: pos + node.nodeSize,
-            node: childEndNode,
-            commentId: c2.commentId,
-            parentCommentId: c2.parentCommentId
-          });
-        });
-      }
-    }
   });
+  if (trackedChangeSpanById.size > 0) {
+    trackedChangeCommentMeta.forEach(({ comment, parentCommentId, trackedChangeId }) => {
+      if (!comment || !trackedChangeSpanById.has(trackedChangeId)) return;
+      const span = trackedChangeSpanById.get(trackedChangeId);
+      if (!span) return;
+      const childMark = getPreparedComment({
+        commentId: comment.commentId,
+        internal: comment.isInternal
+      });
+      const trackedMarks = trackedChangeMarksById.get(trackedChangeId) || {};
+      const startMarks = trackedMarks.insertMark ? [trackedMarks.insertMark] : trackedMarks.deleteMark ? [trackedMarks.deleteMark] : void 0;
+      const endMarks = trackedMarks.deleteMark ? [trackedMarks.deleteMark] : trackedMarks.insertMark ? [trackedMarks.insertMark] : void 0;
+      const childStartNode = schema.nodes.commentRangeStart.create(childMark, null, startMarks);
+      startNodes.push({
+        pos: span.startPos,
+        node: childStartNode,
+        commentId: comment.commentId,
+        parentCommentId
+      });
+      const childEndNode = schema.nodes.commentRangeEnd.create(childMark, null, endMarks);
+      endNodes.push({
+        pos: span.endPos,
+        node: childEndNode,
+        commentId: comment.commentId,
+        parentCommentId
+      });
+    });
+    comments.filter((comment) => trackedChangeSpanById.has(comment.parentCommentId) && !comment.trackedChange).sort((a, b2) => a.createdTime - b2.createdTime).forEach((comment) => {
+      if (seen.has(comment.commentId)) return;
+      seen.add(comment.commentId);
+      const span = trackedChangeSpanById.get(comment.parentCommentId);
+      if (!span) return;
+      const childMark = getPreparedComment({
+        commentId: comment.commentId,
+        internal: comment.isInternal
+      });
+      const parentCommentId = getThreadingParentId(comment);
+      const trackedMarks = trackedChangeMarksById.get(comment.parentCommentId) || {};
+      const startMarks = trackedMarks.insertMark ? [trackedMarks.insertMark] : trackedMarks.deleteMark ? [trackedMarks.deleteMark] : void 0;
+      const endMarks = trackedMarks.deleteMark ? [trackedMarks.deleteMark] : trackedMarks.insertMark ? [trackedMarks.insertMark] : void 0;
+      const childStartNode = schema.nodes.commentRangeStart.create(childMark, null, startMarks);
+      startNodes.push({
+        pos: span.startPos,
+        node: childStartNode,
+        commentId: comment.commentId,
+        parentCommentId
+      });
+      const childEndNode = schema.nodes.commentRangeEnd.create(childMark, null, endMarks);
+      endNodes.push({
+        pos: span.endPos,
+        node: childEndNode,
+        commentId: comment.commentId,
+        parentCommentId
+      });
+    });
+  }
   startNodes.sort((a, b2) => {
     if (a.pos !== b2.pos) return a.pos - b2.pos;
     const aIsParentOfB = a.commentId === b2.parentCommentId;
@@ -15771,7 +15844,7 @@ const canUseDOM = () => {
     return false;
   }
 };
-const summaryVersion = "1.6.2-next.1";
+const summaryVersion = "1.7.0-next.10";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -18064,19 +18137,22 @@ class Editor extends EventEmitter {
       }
       if (comments.length) {
         const commentsXml = this.converter.schemaToXml(this.converter.convertedXml["word/comments.xml"].elements[0]);
-        const commentsExtendedXml = this.converter.schemaToXml(
-          this.converter.convertedXml["word/commentsExtended.xml"].elements[0]
-        );
-        const commentsExtensibleXml = this.converter.schemaToXml(
-          this.converter.convertedXml["word/commentsExtensible.xml"].elements[0]
-        );
-        const commentsIdsXml = this.converter.schemaToXml(
-          this.converter.convertedXml["word/commentsIds.xml"].elements[0]
-        );
         updatedDocs["word/comments.xml"] = String(commentsXml);
-        updatedDocs["word/commentsExtended.xml"] = String(commentsExtendedXml);
-        updatedDocs["word/commentsExtensible.xml"] = String(commentsExtensibleXml);
-        updatedDocs["word/commentsIds.xml"] = String(commentsIdsXml);
+        const commentsExtended = this.converter.convertedXml["word/commentsExtended.xml"];
+        if (commentsExtended?.elements?.[0]) {
+          const commentsExtendedXml = this.converter.schemaToXml(commentsExtended.elements[0]);
+          updatedDocs["word/commentsExtended.xml"] = String(commentsExtendedXml);
+        }
+        const commentsExtensible = this.converter.convertedXml["word/commentsExtensible.xml"];
+        if (commentsExtensible?.elements?.[0]) {
+          const commentsExtensibleXml = this.converter.schemaToXml(commentsExtensible.elements[0]);
+          updatedDocs["word/commentsExtensible.xml"] = String(commentsExtensibleXml);
+        }
+        const commentsIds = this.converter.convertedXml["word/commentsIds.xml"];
+        if (commentsIds?.elements?.[0]) {
+          const commentsIdsXml = this.converter.schemaToXml(commentsIds.elements[0]);
+          updatedDocs["word/commentsIds.xml"] = String(commentsIdsXml);
+        }
       }
       const zipper = new DocxZipper();
       if (getUpdatedDocs) {
@@ -18438,7 +18514,7 @@ class Editor extends EventEmitter {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.6.2-next.1");
+    console.debug("[checkVersionMigrations] Current editor version", "1.7.0-next.10");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -20530,18 +20606,22 @@ class EpochPositionMapper {
 function computeTabStops$1(context) {
   const { explicitStops, defaultTabInterval, paragraphIndent } = context;
   const leftIndent = paragraphIndent.left ?? 0;
+  const hanging = paragraphIndent.hanging ?? 0;
+  const effectiveMinIndent = Math.max(0, leftIndent - hanging);
   const clearPositions = explicitStops.filter((stop) => stop.val === "clear").map((stop) => stop.pos);
-  const stops = explicitStops.filter((stop) => stop.val !== "clear");
-  const maxExplicit = stops.reduce((max2, stop) => Math.max(max2, stop.pos), 0);
-  const hasExplicit = stops.length > 0;
-  const defaultStart = hasExplicit ? Math.max(maxExplicit, leftIndent ?? 0) : 0;
-  let pos = hasExplicit ? defaultStart : 0;
-  const targetLimit = Math.max(defaultStart, leftIndent ?? 0) + 14400;
+  const filteredExplicitStops = explicitStops.filter((stop) => stop.val !== "clear").filter((stop) => stop.pos >= effectiveMinIndent);
+  const maxExplicit = filteredExplicitStops.reduce((max2, stop) => Math.max(max2, stop.pos), 0);
+  const hasExplicit = filteredExplicitStops.length > 0;
+  const stops = [...filteredExplicitStops];
+  const defaultStart = hasExplicit ? Math.max(maxExplicit, leftIndent) : 0;
+  let pos = defaultStart;
+  const targetLimit = Math.max(defaultStart, leftIndent) + 14400;
   while (pos < targetLimit) {
     pos += defaultTabInterval;
-    const hasExplicitStop = stops.some((s) => Math.abs(s.pos - pos) < 20);
+    const hasExplicitStop = filteredExplicitStops.some((s) => Math.abs(s.pos - pos) < 20);
     const hasClearStop = clearPositions.some((clearPos) => Math.abs(clearPos - pos) < 20);
-    if (!hasExplicitStop && !hasClearStop) {
+    const isValidDefault = pos >= leftIndent;
+    if (!hasExplicitStop && !hasClearStop && isValidDefault) {
       stops.push({
         val: "start",
         pos,
@@ -20549,7 +20629,7 @@ function computeTabStops$1(context) {
       });
     }
   }
-  return stops.filter((stop) => stop.pos >= leftIndent).sort((a, b2) => a.pos - b2.pos);
+  return stops.sort((a, b2) => a.pos - b2.pos);
 }
 function layoutWithTabs(runs, stops, lineWidth, options = {}) {
   const result = [];
@@ -24492,6 +24572,69 @@ const resolveTableCellBorders = (tableBorders, rowIndex, colIndex, totalRows, to
     right: borderValueToSpec(isLastCol ? tableBorders?.right : null)
   };
 };
+const clampNumber = (value, min2, max2) => Math.min(max2, Math.max(min2, value));
+const mergeSortedSegments = (segments) => {
+  if (segments.length <= 1) return segments;
+  const merged = [];
+  let current = segments[0];
+  for (let i = 1; i < segments.length; i += 1) {
+    const next = segments[i];
+    if (next.start <= current.end) {
+      current = { start: current.start, end: Math.max(current.end, next.end) };
+      continue;
+    }
+    merged.push(current);
+    current = next;
+  }
+  merged.push(current);
+  return merged;
+};
+const applySquareWrapExclusionsToLines = (renderedLines, exclusions, contentWidthPx, alignmentOffsetY) => {
+  if (renderedLines.length === 0 || exclusions.length === 0 || contentWidthPx <= 0) return;
+  renderedLines.forEach((line) => {
+    const paddingLeft = line.el.style.paddingLeft;
+    const paddingRight = line.el.style.paddingRight;
+    if (paddingLeft && paddingLeft !== "0px" || paddingRight && paddingRight !== "0px") {
+      return;
+    }
+    const lineTop = line.top + alignmentOffsetY;
+    const lineBottom = lineTop + line.height;
+    const excludedSegments = [];
+    for (const ex of exclusions) {
+      if (lineBottom <= ex.top || lineTop >= ex.bottom) continue;
+      if (ex.wrapText !== "bothSides") continue;
+      const start2 = clampNumber(ex.left, 0, contentWidthPx);
+      const end2 = clampNumber(ex.right, 0, contentWidthPx);
+      if (end2 <= start2) continue;
+      excludedSegments.push({ start: start2, end: end2 });
+    }
+    if (excludedSegments.length === 0) return;
+    excludedSegments.sort((a, b2) => a.start - b2.start);
+    const merged = mergeSortedSegments(excludedSegments);
+    let bestStart = 0;
+    let bestWidth = 0;
+    let cursor = 0;
+    for (const seg of merged) {
+      const gapWidth = seg.start - cursor;
+      if (gapWidth > bestWidth) {
+        bestStart = cursor;
+        bestWidth = gapWidth;
+      }
+      cursor = Math.max(cursor, seg.end);
+    }
+    const tailWidth = contentWidthPx - cursor;
+    if (tailWidth > bestWidth) {
+      bestStart = cursor;
+      bestWidth = tailWidth;
+    }
+    if (bestWidth <= 0 || bestStart === 0 && bestWidth >= contentWidthPx) return;
+    const marginLeft = bestStart;
+    const marginRight = Math.max(0, contentWidthPx - (bestStart + bestWidth));
+    line.el.style.boxSizing = "border-box";
+    line.el.style.marginLeft = `${marginLeft}px`;
+    line.el.style.marginRight = `${marginRight}px`;
+  });
+};
 function isStructuredContentMetadata(sdt) {
   return sdt !== null && sdt !== void 0 && typeof sdt === "object" && "type" in sdt && sdt.type === "structuredContent";
 }
@@ -24604,6 +24747,50 @@ function renderListMarker(params2) {
   lineContainer.appendChild(lineEl);
   return lineContainer;
 }
+function applyTableCellLineIndentation(params2) {
+  const {
+    lineEl,
+    line,
+    indent,
+    indentLeftPx,
+    hasListMarkerLayout,
+    lineIndex,
+    localStartLine,
+    suppressFirstLineIndent
+  } = params2;
+  const paraIndentLeft = indent?.left ?? 0;
+  const paraIndentRight = indent?.right ?? 0;
+  const firstLineOffset = suppressFirstLineIndent ? 0 : (indent?.firstLine ?? 0) - (indent?.hanging ?? 0);
+  const isFirstLine = lineIndex === 0 && localStartLine === 0;
+  const hasExplicitSegmentPositioning = line.segments?.some((seg) => seg.x !== void 0) ?? false;
+  if (hasListMarkerLayout && indentLeftPx) {
+    if (!hasExplicitSegmentPositioning) {
+      lineEl.style.paddingLeft = `${indentLeftPx}px`;
+    }
+  } else {
+    if (hasExplicitSegmentPositioning) {
+      if (isFirstLine && firstLineOffset !== 0) {
+        const effectiveLeftIndent = paraIndentLeft < 0 ? 0 : paraIndentLeft;
+        const adjustedPadding = effectiveLeftIndent + firstLineOffset;
+        if (adjustedPadding > 0) {
+          lineEl.style.paddingLeft = `${adjustedPadding}px`;
+        }
+      }
+    } else if (paraIndentLeft && paraIndentLeft > 0) {
+      lineEl.style.paddingLeft = `${paraIndentLeft}px`;
+    } else if (!isFirstLine && indent?.hanging && indent.hanging > 0 && (paraIndentLeft == null || paraIndentLeft >= 0)) {
+      lineEl.style.paddingLeft = `${indent.hanging}px`;
+    }
+  }
+  if (paraIndentRight && paraIndentRight > 0) {
+    lineEl.style.paddingRight = `${paraIndentRight}px`;
+  }
+  if (isFirstLine && firstLineOffset && !hasExplicitSegmentPositioning) {
+    lineEl.style.textIndent = `${firstLineOffset}px`;
+  } else if (firstLineOffset && hasExplicitSegmentPositioning) {
+    lineEl.style.textIndent = "0px";
+  }
+}
 const applyInlineStyles = (el, styles) => {
   Object.entries(styles).forEach(([key2, value]) => {
     if (value != null && value !== "" && key2 in el.style) {
@@ -24776,6 +24963,7 @@ const renderTableCell = (deps) => {
       content.style.justifyContent = "flex-start";
     }
     cellEl.appendChild(content);
+    content.style.zIndex = "0";
     const blockLineCounts = [];
     for (let i = 0; i < Math.min(blockMeasures.length, cellBlocks.length); i++) {
       const bm = blockMeasures[i];
@@ -24788,6 +24976,12 @@ const renderTableCell = (deps) => {
     const totalLines = blockLineCounts.reduce((a, b2) => a + b2, 0);
     const globalFromLine = fromLine ?? 0;
     const globalToLine = toLine === -1 || toLine === void 0 ? totalLines : toLine;
+    const contentWidthPx = Math.max(0, cellMeasure.width - paddingLeft - paddingRight);
+    const contentHeightPx = Math.max(0, rowHeight - paddingTop - paddingBottom);
+    const paragraphTopById = /* @__PURE__ */ new Map();
+    let flowCursorY = 0;
+    const anchoredBlocks = [];
+    const renderedLines = [];
     let cumulativeLineCount = 0;
     for (let i = 0; i < Math.min(blockMeasures.length, cellBlocks.length); i++) {
       const blockMeasure = blockMeasures[i];
@@ -24810,9 +25004,14 @@ const renderTableCell = (deps) => {
         });
         tableWrapper.appendChild(tableEl);
         content.appendChild(tableWrapper);
+        flowCursorY += tableMeasure.totalHeight;
         continue;
       }
       if (blockMeasure.kind === "image" && block?.kind === "image") {
+        if (block.anchor?.isAnchored) {
+          anchoredBlocks.push({ block, measure: blockMeasure });
+          continue;
+        }
         const imageWrapper = doc2.createElement("div");
         imageWrapper.style.position = "relative";
         imageWrapper.style.width = `${blockMeasure.width}px`;
@@ -24835,9 +25034,14 @@ const renderTableCell = (deps) => {
         imgEl.style.display = "block";
         imageWrapper.appendChild(imgEl);
         content.appendChild(imageWrapper);
+        flowCursorY += blockMeasure.height;
         continue;
       }
       if (blockMeasure.kind === "drawing" && block?.kind === "drawing") {
+        if (block.anchor?.isAnchored) {
+          anchoredBlocks.push({ block, measure: blockMeasure });
+          continue;
+        }
         const drawingWrapper = doc2.createElement("div");
         drawingWrapper.style.position = "relative";
         drawingWrapper.style.width = `${blockMeasure.width}px`;
@@ -24880,16 +25084,19 @@ const renderTableCell = (deps) => {
         }
         drawingWrapper.appendChild(drawingInner);
         content.appendChild(drawingWrapper);
+        flowCursorY += blockMeasure.height;
         continue;
       }
       if (blockMeasure.kind === "paragraph" && block?.kind === "paragraph") {
         const paragraphMeasure = blockMeasure;
         const lines = paragraphMeasure.lines;
         const blockLineCount = lines?.length || 0;
+        paragraphTopById.set(block.id, flowCursorY);
         const wordLayout = block.attrs?.wordLayout ?? null;
         const markerLayout = wordLayout?.marker;
         const markerMeasure = paragraphMeasure.marker;
         const indentLeftPx = markerMeasure?.indentLeft ?? wordLayout?.indentLeftPx ?? (block.attrs?.indent && typeof block.attrs.indent.left === "number" ? block.attrs.indent.left : 0);
+        const suppressFirstLineIndent = block.attrs?.suppressFirstLineIndent === true;
         const blockStartGlobal = cumulativeLineCount;
         const blockEndGlobal = cumulativeLineCount + blockLineCount;
         if (blockEndGlobal <= globalFromLine) {
@@ -24919,6 +25126,7 @@ const renderTableCell = (deps) => {
         for (let lineIdx = localStartLine; lineIdx < localEndLine && lineIdx < lines.length; lineIdx++) {
           const line = lines[lineIdx];
           const isLastLine = lineIdx === lines.length - 1;
+          const lineTop = flowCursorY + renderedHeight;
           const lineEl = renderLine(
             block,
             line,
@@ -24938,35 +25146,20 @@ const renderTableCell = (deps) => {
               markerMeasure,
               indentLeftPx
             });
+            renderedLines.push({ el: lineContainer, top: lineTop, height: line.lineHeight });
             paraWrapper.appendChild(lineContainer);
           } else {
-            if (markerLayout && indentLeftPx) {
-              lineEl.style.paddingLeft = `${indentLeftPx}px`;
-            } else {
-              const indent = block.attrs?.indent;
-              if (indent) {
-                const leftIndent = typeof indent.left === "number" ? indent.left : 0;
-                const hanging = typeof indent.hanging === "number" ? indent.hanging : 0;
-                const firstLine = typeof indent.firstLine === "number" ? indent.firstLine : 0;
-                const isFirstLine = lineIdx === 0 && localStartLine === 0;
-                const firstLineOffset = firstLine - hanging;
-                if (isFirstLine) {
-                  if (leftIndent > 0) {
-                    lineEl.style.paddingLeft = `${leftIndent}px`;
-                  }
-                  if (firstLineOffset !== 0) {
-                    lineEl.style.textIndent = `${firstLineOffset}px`;
-                  }
-                } else {
-                  if (leftIndent > 0) {
-                    lineEl.style.paddingLeft = `${leftIndent}px`;
-                  }
-                }
-                if (typeof indent.right === "number" && indent.right > 0) {
-                  lineEl.style.paddingRight = `${indent.right}px`;
-                }
-              }
-            }
+            applyTableCellLineIndentation({
+              lineEl,
+              line,
+              indent: block.attrs?.indent,
+              indentLeftPx,
+              hasListMarkerLayout: Boolean(markerLayout),
+              lineIndex: lineIdx,
+              localStartLine,
+              suppressFirstLineIndent
+            });
+            renderedLines.push({ el: lineEl, top: lineTop, height: line.lineHeight });
             paraWrapper.appendChild(lineEl);
           }
           renderedHeight += line.lineHeight;
@@ -24979,15 +25172,124 @@ const renderTableCell = (deps) => {
         if (renderedHeight > 0) {
           paraWrapper.style.height = `${renderedHeight}px`;
         }
+        flowCursorY += renderedHeight;
         if (renderedEntireBlock) {
           const spacingAfter = block.attrs?.spacing?.after;
           if (typeof spacingAfter === "number" && spacingAfter > 0) {
             paraWrapper.style.marginBottom = `${spacingAfter}px`;
+            flowCursorY += spacingAfter;
           }
         }
         cumulativeLineCount += blockLineCount;
       }
     }
+    const verticalAlign = cell?.attrs?.verticalAlign;
+    const remainingSpace = contentHeightPx - flowCursorY;
+    const alignmentOffsetY = verticalAlign === "center" ? Math.max(0, remainingSpace / 2) : verticalAlign === "bottom" ? Math.max(0, remainingSpace) : 0;
+    const wrapExclusions = [];
+    for (const entry of anchoredBlocks) {
+      const anchoredBlock = entry.block;
+      const anchoredMeasure = entry.measure;
+      const anchor = anchoredBlock.anchor;
+      if (!anchor || !anchor.isAnchored) {
+        continue;
+      }
+      const objectWidth = anchoredMeasure.width;
+      const objectHeight = anchoredMeasure.height;
+      const left2 = anchor.offsetH ?? 0;
+      const top2 = anchor.offsetV ?? 0;
+      const behindDoc = anchor.behindDoc === true || anchoredBlock.wrap?.type === "None" && anchoredBlock.wrap?.behindDoc;
+      const zIndex = anchoredBlock.kind === "drawing" && typeof anchoredBlock.zIndex === "number" ? anchoredBlock.zIndex : behindDoc ? -1 : 1;
+      const wrap = anchoredBlock.wrap;
+      if (!behindDoc && wrap?.type === "Square") {
+        const wrapText = wrap.wrapText ?? "bothSides";
+        const distLeft = anchoredBlock.padding?.left ?? 0;
+        const distRight = anchoredBlock.padding?.right ?? 0;
+        const distTop = anchoredBlock.padding?.top ?? 0;
+        const distBottom = anchoredBlock.padding?.bottom ?? 0;
+        wrapExclusions.push({
+          left: left2 - distLeft,
+          right: left2 + objectWidth + distRight,
+          top: top2 - distTop,
+          bottom: top2 + objectHeight + distBottom,
+          wrapText
+        });
+      }
+      if (anchoredBlock.kind === "image") {
+        const imageWrapper = doc2.createElement("div");
+        imageWrapper.style.position = "absolute";
+        imageWrapper.style.left = `${left2}px`;
+        imageWrapper.style.top = `${top2}px`;
+        imageWrapper.style.width = `${objectWidth}px`;
+        imageWrapper.style.height = `${objectHeight}px`;
+        imageWrapper.style.maxWidth = "100%";
+        imageWrapper.style.boxSizing = "border-box";
+        imageWrapper.style.zIndex = String(zIndex);
+        applySdtDataset(imageWrapper, anchoredBlock.attrs?.sdt);
+        const imgEl = doc2.createElement("img");
+        imgEl.classList.add("superdoc-table-image");
+        if (anchoredBlock.src) {
+          imgEl.src = anchoredBlock.src;
+        }
+        imgEl.alt = anchoredBlock.alt ?? "";
+        imgEl.style.width = "100%";
+        imgEl.style.height = "100%";
+        imgEl.style.objectFit = anchoredBlock.objectFit ?? "contain";
+        if (anchoredBlock.objectFit === "cover") {
+          imgEl.style.objectPosition = "left top";
+        }
+        imgEl.style.display = "block";
+        imageWrapper.appendChild(imgEl);
+        content.appendChild(imageWrapper);
+      } else {
+        const drawingWrapper = doc2.createElement("div");
+        drawingWrapper.style.position = "absolute";
+        drawingWrapper.style.left = `${left2}px`;
+        drawingWrapper.style.top = `${top2}px`;
+        drawingWrapper.style.width = `${objectWidth}px`;
+        drawingWrapper.style.height = `${objectHeight}px`;
+        drawingWrapper.style.maxWidth = "100%";
+        drawingWrapper.style.boxSizing = "border-box";
+        drawingWrapper.style.zIndex = String(zIndex);
+        applySdtDataset(drawingWrapper, anchoredBlock.attrs);
+        const drawingInner = doc2.createElement("div");
+        drawingInner.classList.add("superdoc-table-drawing");
+        drawingInner.style.width = "100%";
+        drawingInner.style.height = "100%";
+        drawingInner.style.display = "flex";
+        drawingInner.style.alignItems = "center";
+        drawingInner.style.justifyContent = "center";
+        drawingInner.style.overflow = "hidden";
+        if (anchoredBlock.drawingKind === "image" && "src" in anchoredBlock && anchoredBlock.src) {
+          const img = doc2.createElement("img");
+          img.classList.add("superdoc-drawing-image");
+          img.src = anchoredBlock.src;
+          img.alt = anchoredBlock.alt ?? "";
+          img.style.width = "100%";
+          img.style.height = "100%";
+          img.style.objectFit = anchoredBlock.objectFit ?? "contain";
+          if (anchoredBlock.objectFit === "cover") {
+            img.style.objectPosition = "left top";
+          }
+          drawingInner.appendChild(img);
+        } else if (renderDrawingContent) {
+          const drawingContent = renderDrawingContent(anchoredBlock);
+          drawingContent.style.width = "100%";
+          drawingContent.style.height = "100%";
+          drawingInner.appendChild(drawingContent);
+        } else {
+          const placeholder = doc2.createElement("div");
+          placeholder.style.width = "100%";
+          placeholder.style.height = "100%";
+          placeholder.style.background = "repeating-linear-gradient(45deg, rgba(15,23,42,0.1), rgba(15,23,42,0.1) 6px, rgba(15,23,42,0.2) 6px, rgba(15,23,42,0.2) 12px)";
+          placeholder.style.border = "1px dashed rgba(15, 23, 42, 0.3)";
+          drawingInner.appendChild(placeholder);
+        }
+        drawingWrapper.appendChild(drawingInner);
+        content.appendChild(drawingWrapper);
+      }
+    }
+    applySquareWrapExclusionsToLines(renderedLines, wrapExclusions, contentWidthPx, alignmentOffsetY);
   }
   return { cellElement: cellEl };
 };
@@ -27433,13 +27735,13 @@ class DomPainter {
       const filters = [];
       if (block.gain != null || block.blacklevel != null) {
         if (block.gain && typeof block.gain === "string" && block.gain.endsWith("f")) {
-          const contrast = Math.max(0, parseInt(block.gain) / 65536);
+          const contrast = Math.max(0, parseInt(block.gain) / 65536) * (2 / 3);
           if (contrast > 0) {
             filters.push(`contrast(${contrast})`);
           }
         }
         if (block.blacklevel && typeof block.blacklevel === "string" && block.blacklevel.endsWith("f")) {
-          const brightness = Math.max(0, 1 + parseInt(block.blacklevel) / 327 / 100) + 0.5;
+          const brightness = Math.max(0, 1 + parseInt(block.blacklevel) / 327 / 100) * 1.3;
           if (brightness > 0) {
             filters.push(`brightness(${brightness})`);
           }
@@ -27493,7 +27795,7 @@ class DomPainter {
       }
       transforms.push(`scale(${scale})`);
       innerWrapper.style.transform = transforms.join(" ");
-      innerWrapper.appendChild(this.renderDrawingContent(block, fragment));
+      innerWrapper.appendChild(this.renderDrawingContent(block, fragment, context));
       fragmentEl.appendChild(innerWrapper);
       return fragmentEl;
     } catch (error) {
@@ -27501,7 +27803,7 @@ class DomPainter {
       return this.createErrorPlaceholder(fragment.blockId, error);
     }
   }
-  renderDrawingContent(block, fragment) {
+  renderDrawingContent(block, fragment, context) {
     if (!this.doc) {
       throw new Error("DomPainter: document is not available");
     }
@@ -27509,10 +27811,10 @@ class DomPainter {
       return this.createDrawingImageElement(block);
     }
     if (block.drawingKind === "vectorShape") {
-      return this.createVectorShapeElement(block, fragment.geometry, true);
+      return this.createVectorShapeElement(block, fragment.geometry, true, 1, 1, context);
     }
     if (block.drawingKind === "shapeGroup") {
-      return this.createShapeGroupElement(block);
+      return this.createShapeGroupElement(block, context);
     }
     return this.createDrawingPlaceholder();
   }
@@ -27533,7 +27835,7 @@ class DomPainter {
     img.style.display = "block";
     return img;
   }
-  createVectorShapeElement(block, geometry, applyTransforms = false, groupScaleX = 1, groupScaleY = 1) {
+  createVectorShapeElement(block, geometry, applyTransforms = false, groupScaleX = 1, groupScaleY = 1, context) {
     const container = this.doc.createElement("div");
     container.classList.add("superdoc-vector-shape");
     container.style.width = "100%";
@@ -27573,7 +27875,8 @@ class DomPainter {
             block.textVerticalAlign,
             block.textInsets,
             groupScaleX,
-            groupScaleY
+            groupScaleY,
+            context
           );
           contentContainer.appendChild(textDiv);
         }
@@ -27589,7 +27892,8 @@ class DomPainter {
         block.textVerticalAlign,
         block.textInsets,
         groupScaleX,
-        groupScaleY
+        groupScaleY,
+        context
       );
       contentContainer.appendChild(textDiv);
     }
@@ -27637,7 +27941,7 @@ class DomPainter {
    * @param groupScaleX - Scale factor applied by parent group (for counter-scaling)
    * @param groupScaleY - Scale factor applied by parent group (for counter-scaling)
    */
-  createFallbackTextElement(textContent2, textAlign, textVerticalAlign, textInsets, groupScaleX = 1, groupScaleY = 1) {
+  createFallbackTextElement(textContent2, textAlign, textVerticalAlign, textInsets, groupScaleX = 1, groupScaleY = 1, context) {
     const textDiv = this.doc.createElement("div");
     textDiv.style.position = "absolute";
     textDiv.style.top = "0";
@@ -27685,6 +27989,15 @@ class DomPainter {
     currentParagraph.style.width = "100%";
     currentParagraph.style.minWidth = "0";
     currentParagraph.style.whiteSpace = "normal";
+    const resolvePartText = (part) => {
+      if (part.fieldType === "PAGE") {
+        return context?.pageNumberText ?? String(context?.pageNumber ?? 1);
+      }
+      if (part.fieldType === "NUMPAGES") {
+        return String(context?.totalPages ?? 1);
+      }
+      return part.text;
+    };
     textContent2.parts.forEach((part) => {
       if (part.isLineBreak) {
         textDiv.appendChild(currentParagraph);
@@ -27697,7 +28010,7 @@ class DomPainter {
         }
       } else {
         const span = this.doc.createElement("span");
-        span.textContent = part.text;
+        span.textContent = resolvePartText(part);
         if (part.formatting) {
           if (part.formatting.bold) {
             span.style.fontWeight = "bold";
@@ -27705,6 +28018,9 @@ class DomPainter {
           if (part.formatting.italic) {
             span.style.fontStyle = "italic";
           }
+          if (part.formatting.fontFamily) {
+            span.style.fontFamily = part.formatting.fontFamily;
+          }
           if (part.formatting.color) {
             const validatedColor = validateHexColor(part.formatting.color);
             if (validatedColor) {
@@ -27919,7 +28235,7 @@ class DomPainter {
       target.style.removeProperty("transform-origin");
     }
   }
-  createShapeGroupElement(block) {
+  createShapeGroupElement(block, context) {
     const groupEl = this.doc.createElement("div");
     groupEl.classList.add("superdoc-shape-group");
     groupEl.style.position = "relative";
@@ -27927,8 +28243,8 @@ class DomPainter {
     groupEl.style.height = "100%";
     const groupTransform = block.groupTransform;
     let contentContainer = groupEl;
-    let groupScaleX = 1;
-    let groupScaleY = 1;
+    const groupScaleX = 1;
+    const groupScaleY = 1;
     if (groupTransform) {
       const inner = this.doc.createElement("div");
       inner.style.position = "absolute";
@@ -27944,13 +28260,6 @@ class DomPainter {
       if (offsetX || offsetY) {
         transforms.push(`translate(${-offsetX}px, ${-offsetY}px)`);
       }
-      const targetWidth = groupTransform.width ?? block.geometry.width ?? childWidth;
-      const targetHeight = groupTransform.height ?? block.geometry.height ?? childHeight;
-      groupScaleX = childWidth ? targetWidth / childWidth : 1;
-      groupScaleY = childHeight ? targetHeight / childHeight : 1;
-      if (groupScaleX !== 1 || groupScaleY !== 1) {
-        transforms.push(`scale(${groupScaleX}, ${groupScaleY})`);
-      }
       if (transforms.length > 0) {
         inner.style.transformOrigin = "top left";
         inner.style.transform = transforms.join(" ");
@@ -27959,7 +28268,7 @@ class DomPainter {
       contentContainer = inner;
     }
     block.shapes.forEach((child) => {
-      const childContent = this.createGroupChildContent(child, groupScaleX, groupScaleY);
+      const childContent = this.createGroupChildContent(child, groupScaleX, groupScaleY, context);
       if (!childContent) return;
       const attrs = child.attrs ?? {};
       const wrapper = this.doc.createElement("div");
@@ -27992,7 +28301,7 @@ class DomPainter {
     });
     return groupEl;
   }
-  createGroupChildContent(child, groupScaleX = 1, groupScaleY = 1) {
+  createGroupChildContent(child, groupScaleX = 1, groupScaleY = 1, context) {
     if (child.shapeType === "vectorShape" && "fillColor" in child.attrs) {
       const attrs = child.attrs;
       const childGeometry = {
@@ -28020,9 +28329,11 @@ class DomPainter {
         strokeWidth: attrs.strokeWidth,
         lineEnds: attrs.lineEnds,
         textContent: attrs.textContent,
-        textAlign: attrs.textAlign
+        textAlign: attrs.textAlign,
+        textVerticalAlign: attrs.textVerticalAlign,
+        textInsets: attrs.textInsets
       };
-      return this.createVectorShapeElement(vectorChild, childGeometry, false, groupScaleX, groupScaleY);
+      return this.createVectorShapeElement(vectorChild, childGeometry, false, groupScaleX, groupScaleY, context);
     }
     if (child.shapeType === "image" && "src" in child.attrs) {
       const attrs = child.attrs;
@@ -28062,10 +28373,10 @@ class DomPainter {
         return this.createDrawingImageElement(block);
       }
       if (block.drawingKind === "shapeGroup") {
-        return this.createShapeGroupElement(block);
+        return this.createShapeGroupElement(block, context);
       }
       if (block.drawingKind === "vectorShape") {
-        return this.createVectorShapeElement(block, block.geometry, false);
+        return this.createVectorShapeElement(block, block.geometry, false, 1, 1, context);
       }
       return this.createDrawingPlaceholder();
     };
@@ -28515,12 +28826,18 @@ class DomPainter {
     }
     if (run.size) {
       if (run.size.width) {
-        annotation.style.width = `${run.size.width}px`;
-        annotation.style.display = "inline-block";
-        annotation.style.overflow = "hidden";
+        const requiresImage = run.variant === "image" || run.variant === "signature";
+        if (!requiresImage || run.imageSrc) {
+          annotation.style.width = `${run.size.width}px`;
+          annotation.style.display = "inline-block";
+          annotation.style.overflow = "hidden";
+        }
       }
-      if (run.size.height) {
-        annotation.style.height = `${run.size.height}px`;
+      if (run.size.height && run.variant !== "html") {
+        const requiresImage = run.variant === "image" || run.variant === "signature";
+        if (!requiresImage || run.imageSrc) {
+          annotation.style.height = `${run.size.height}px`;
+        }
       }
     }
     if (run.fontFamily) {
@@ -28580,6 +28897,8 @@ class DomPainter {
           content.appendChild(img);
           annotation.style.display = "inline-block";
           content.style.display = "inline-block";
+          annotation.style.lineHeight = "normal";
+          content.style.lineHeight = "normal";
         } else {
           content.textContent = run.displayLabel || (run.variant === "signature" ? "Signature" : "");
         }
@@ -28607,9 +28926,11 @@ class DomPainter {
       }
       case "html": {
         if (run.rawHtml && typeof run.rawHtml === "string") {
-          content.textContent = run.displayLabel;
+          content.innerHTML = run.rawHtml.trim();
           annotation.style.display = "inline-block";
           content.style.display = "inline-block";
+          annotation.style.lineHeight = "normal";
+          content.style.lineHeight = "normal";
         } else {
           content.textContent = run.displayLabel;
         }
@@ -29565,6 +29886,33 @@ const deriveBlockVersion = (block) => {
       if (run.kind === "tab") {
         return [run.text ?? "", "tab"].join(",");
       }
+      if (run.kind === "fieldAnnotation") {
+        const size2 = run.size ? `${run.size.width ?? ""}x${run.size.height ?? ""}` : "";
+        const highlighted = run.highlighted !== false ? 1 : 0;
+        return [
+          "field",
+          run.variant ?? "",
+          run.displayLabel ?? "",
+          run.fieldColor ?? "",
+          run.borderColor ?? "",
+          highlighted,
+          run.hidden ? 1 : 0,
+          run.visibility ?? "",
+          run.imageSrc ?? "",
+          run.linkUrl ?? "",
+          run.rawHtml ?? "",
+          size2,
+          run.fontFamily ?? "",
+          run.fontSize ?? "",
+          run.textColor ?? "",
+          run.textHighlight ?? "",
+          run.bold ? 1 : 0,
+          run.italic ? 1 : 0,
+          run.underline ? 1 : 0,
+          run.fieldId ?? "",
+          run.fieldType ?? ""
+        ].join(",");
+      }
       const textRun = run;
       return [
         textRun.text ?? "",
@@ -32580,6 +32928,16 @@ function computeNextSectionPropsAtBreak(blocks) {
   });
   return nextSectionPropsAtBreak;
 }
+const SINGLE_COLUMN_DEFAULT = { count: 1, gap: 0 };
+function getColumnConfig(blockColumns) {
+  return blockColumns ? { count: blockColumns.count, gap: blockColumns.gap } : { ...SINGLE_COLUMN_DEFAULT };
+}
+function isColumnConfigChanging(blockColumns, activeColumns) {
+  if (blockColumns) {
+    return blockColumns.count !== activeColumns.count || blockColumns.gap !== activeColumns.gap;
+  }
+  return activeColumns.count > 1;
+}
 function scheduleSectionBreak(block, state, baseMargins, maxHeaderContentHeight = 0, maxFooterContentHeight = 0) {
   const next = { ...state };
   const calcRequiredTopMargin = (headerDistance, baseTop) => {
@@ -32633,10 +32991,8 @@ function scheduleSectionBreak(block, state, baseMargins, maxHeaderContentHeight
       next.activeRightMargin = rightMargin;
       next.pendingRightMargin = rightMargin;
     }
-    if (block.columns) {
-      next.activeColumns = { count: block.columns.count, gap: block.columns.gap };
-      next.pendingColumns = null;
-    }
+    next.activeColumns = getColumnConfig(block.columns);
+    next.pendingColumns = null;
     return { decision: { forcePageBreak: false, forceMidPageRegion: false }, state: next };
   }
   const headerPx = block.margins?.header;
@@ -32684,33 +33040,25 @@ function scheduleSectionBreak(block, state, baseMargins, maxHeaderContentHeight
     next.pendingOrientation = block.orientation;
   }
   const sectionType = block.type ?? "continuous";
-  const isColumnsChanging = !!block.columns && (block.columns.count !== next.activeColumns.count || block.columns.gap !== next.activeColumns.gap);
+  const isColumnsChanging = isColumnConfigChanging(block.columns, next.activeColumns);
   if (block.attrs?.requirePageBoundary) {
-    if (block.columns) {
-      next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
-    }
+    next.pendingColumns = getColumnConfig(block.columns);
     return { decision: { forcePageBreak: true, forceMidPageRegion: false }, state: next };
   }
   switch (sectionType) {
     case "nextPage": {
-      if (block.columns) {
-        next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
-      }
+      next.pendingColumns = getColumnConfig(block.columns);
       return { decision: { forcePageBreak: true, forceMidPageRegion: false }, state: next };
     }
     case "evenPage": {
-      if (block.columns) {
-        next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
-      }
+      next.pendingColumns = getColumnConfig(block.columns);
       return {
         decision: { forcePageBreak: true, forceMidPageRegion: false, requiredParity: "even" },
         state: next
       };
     }
     case "oddPage": {
-      if (block.columns) {
-        next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
-      }
+      next.pendingColumns = getColumnConfig(block.columns);
       return {
         decision: { forcePageBreak: true, forceMidPageRegion: false, requiredParity: "odd" },
         state: next
@@ -32719,11 +33067,10 @@ function scheduleSectionBreak(block, state, baseMargins, maxHeaderContentHeight
     case "continuous":
     default: {
       if (isColumnsChanging) {
+        next.pendingColumns = getColumnConfig(block.columns);
         return { decision: { forcePageBreak: false, forceMidPageRegion: true }, state: next };
       }
-      if (block.columns) {
-        next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
-      }
+      next.pendingColumns = getColumnConfig(block.columns);
       return { decision: { forcePageBreak: false, forceMidPageRegion: false }, state: next };
     }
   }
@@ -32768,6 +33115,28 @@ function applyPendingToActive(state) {
   next.pendingOrientation = null;
   return next;
 }
+const isTextRun$3 = (run) => {
+  const runWithKind = run;
+  return !runWithKind.kind || runWithKind.kind === "text";
+};
+const isEmptyTextParagraph = (block) => {
+  const runs = block.runs;
+  if (!runs || runs.length === 0) return true;
+  if (runs.length !== 1) return false;
+  const run = runs[0];
+  if (!isTextRun$3(run)) return false;
+  return typeof run.text === "string" && run.text.length === 0;
+};
+const shouldSuppressSpacingForEmpty = (block, side) => {
+  if (!isEmptyTextParagraph(block)) return false;
+  const attrs = block.attrs;
+  const spacingExplicit = attrs?.spacingExplicit;
+  if (!spacingExplicit) return false;
+  if (side === "before") {
+    return !spacingExplicit.before;
+  }
+  return !spacingExplicit.after;
+};
 function normalizeLines(measure) {
   if (measure.lines.length > 0) {
     return measure.lines;
@@ -32827,7 +33196,7 @@ const getParagraphAttrs = (block) => {
 const asString = (value) => {
   return typeof value === "string" ? value : void 0;
 };
-const asBoolean = (value) => {
+const asBoolean$1 = (value) => {
   if (value === true || value === 1) return true;
   if (typeof value === "string") {
     const normalized = value.toLowerCase();
@@ -33007,10 +33376,17 @@ function layoutParagraphBlock(ctx2, anchors) {
   let fromLine = 0;
   const attrs = getParagraphAttrs(block);
   const spacing = attrs?.spacing ?? {};
+  const spacingExplicit = attrs?.spacingExplicit;
   const styleId = asString(attrs?.styleId);
-  const contextualSpacing = asBoolean(attrs?.contextualSpacing);
+  const contextualSpacing = asBoolean$1(attrs?.contextualSpacing);
   let spacingBefore = Math.max(0, Number(spacing.before ?? spacing.lineSpaceBefore ?? 0));
-  const spacingAfter = Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
+  let spacingAfter = ctx2.overrideSpacingAfter ?? Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
+  const emptyTextParagraph = isEmptyTextParagraph(block);
+  if (emptyTextParagraph && spacingExplicit) {
+    if (!spacingExplicit.before) spacingBefore = 0;
+    if (!spacingExplicit.after) spacingAfter = 0;
+  }
+  const baseSpacingBefore = spacingBefore;
   let appliedSpacingBefore = spacingBefore === 0;
   let lastState = null;
   const isPositionedFrame = frame?.wrap === "none";
@@ -33104,6 +33480,21 @@ function layoutParagraphBlock(ctx2, anchors) {
         state.trailingSpacing = 0;
       }
     }
+    const keepLines = attrs?.keepLines === true;
+    if (keepLines && fromLine === 0) {
+      const prevTrailing = state.trailingSpacing ?? 0;
+      const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
+      const pageContentHeight = state.contentBottom - state.topMargin;
+      const fullHeight = lines.reduce((sum, line) => sum + (line.lineHeight || 0), 0);
+      const fitsOnBlankPage = fullHeight + baseSpacingBefore <= pageContentHeight;
+      const remainingHeightAfterSpacing = state.contentBottom - (state.cursorY + neededSpacingBefore);
+      if (fitsOnBlankPage && state.page.fragments.length > 0 && fullHeight > remainingHeightAfterSpacing) {
+        state = advanceColumn(state);
+        spacingBefore = baseSpacingBefore;
+        appliedSpacingBefore = spacingBefore === 0;
+        continue;
+      }
+    }
     if (!appliedSpacingBefore && spacingBefore > 0) {
       while (!appliedSpacingBefore) {
         const prevTrailing = state.trailingSpacing ?? 0;
@@ -34228,6 +34619,86 @@ function computeDisplayPageNumber(pages, sections) {
   }
   return result;
 }
+const DEFAULT_BALANCING_CONFIG = {
+  // Max 10 iterations to find balance
+  minColumnHeight: 20
+  // Minimum 20px content per column
+};
+function getFragmentHeight(fragment, measureMap) {
+  if (fragment.kind === "para") {
+    const measure = measureMap.get(fragment.blockId);
+    if (!measure || measure.kind !== "paragraph" || !measure.lines) {
+      return 0;
+    }
+    let sum = 0;
+    const fromLine = fragment.fromLine ?? 0;
+    const toLine = fragment.toLine ?? measure.lines.length;
+    for (let i = fromLine; i < toLine; i++) {
+      sum += measure.lines[i]?.lineHeight ?? 0;
+    }
+    return sum;
+  }
+  if (fragment.kind === "image" || fragment.kind === "drawing" || fragment.kind === "table") {
+    if (typeof fragment.height === "number") {
+      return fragment.height;
+    }
+    const measure = measureMap.get(fragment.blockId);
+    if (measure && typeof measure.height === "number") {
+      return measure.height;
+    }
+  }
+  return 0;
+}
+function balancePageColumns(fragments, columns, margins, topMargin, measureMap) {
+  if (columns.count <= 1 || fragments.length === 0) {
+    return;
+  }
+  const columnX = (columnIndex) => {
+    return margins.left + columnIndex * (columns.width + columns.gap);
+  };
+  const rowMap = /* @__PURE__ */ new Map();
+  fragments.forEach((fragment, idx) => {
+    const y2 = Math.round(fragment.y);
+    if (!rowMap.has(y2)) {
+      rowMap.set(y2, []);
+    }
+    const height = getFragmentHeight(fragment, measureMap);
+    rowMap.get(y2).push({
+      fragment,
+      height,
+      originalIndex: idx
+    });
+  });
+  const sortedRows = [...rowMap.entries()].sort((a, b2) => a[0] - b2[0]);
+  let totalHeight = 0;
+  for (const [, rowFragments] of sortedRows) {
+    const maxHeight = Math.max(...rowFragments.map((f) => f.height));
+    totalHeight += maxHeight;
+  }
+  const targetHeight = totalHeight / columns.count;
+  if (targetHeight < DEFAULT_BALANCING_CONFIG.minColumnHeight) {
+    return;
+  }
+  let currentColumn = 0;
+  let currentColumnHeight = 0;
+  let currentY = topMargin;
+  for (const [, rowFragments] of sortedRows) {
+    const rowHeight = Math.max(...rowFragments.map((f) => f.height));
+    if (currentColumnHeight > 0 && currentColumnHeight + rowHeight >= targetHeight && currentColumn < columns.count - 1) {
+      currentColumn++;
+      currentColumnHeight = 0;
+      currentY = topMargin;
+    }
+    const colX = columnX(currentColumn);
+    for (const info of rowFragments) {
+      info.fragment.x = colX;
+      info.fragment.y = currentY;
+      info.fragment.width = columns.width;
+    }
+    currentColumnHeight += rowHeight;
+    currentY += rowHeight;
+  }
+}
 function resolvePageNumberTokens(layout, blocks, measures, numberingCtx) {
   const affectedBlockIds = /* @__PURE__ */ new Set();
   const updatedBlocks = /* @__PURE__ */ new Map();
@@ -34317,11 +34788,13 @@ function hasHeight(fragment) {
 function getParagraphSpacingBefore(block) {
   const spacing = block.attrs?.spacing;
   const value = spacing?.before ?? spacing?.lineSpaceBefore;
+  if (shouldSuppressSpacingForEmpty(block, "before")) return 0;
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
 }
 function getParagraphSpacingAfter$1(block) {
   const spacing = block.attrs?.spacing;
   const value = spacing?.after ?? spacing?.lineSpaceAfter;
+  if (shouldSuppressSpacingForEmpty(block, "after")) return 0;
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
 }
 function getMeasureHeight(block, measure) {
@@ -34344,9 +34817,123 @@ function getMeasureHeight(block, measure) {
     }
   }
 }
+function computeKeepNextChains(blocks) {
+  const chains = /* @__PURE__ */ new Map();
+  const processedIndices = /* @__PURE__ */ new Set();
+  for (let i = 0; i < blocks.length; i++) {
+    if (processedIndices.has(i)) continue;
+    const block = blocks[i];
+    if (block.kind !== "paragraph") continue;
+    const paraBlock = block;
+    if (paraBlock.attrs?.keepNext !== true) continue;
+    const memberIndices = [i];
+    let endIndex = i;
+    for (let j = i + 1; j < blocks.length; j++) {
+      const nextBlock = blocks[j];
+      if (nextBlock.kind === "sectionBreak" || nextBlock.kind === "pageBreak" || nextBlock.kind === "columnBreak") {
+        break;
+      }
+      if (nextBlock.kind !== "paragraph") {
+        break;
+      }
+      const nextPara = nextBlock;
+      if (nextPara.attrs?.keepNext === true) {
+        memberIndices.push(j);
+        endIndex = j;
+        processedIndices.add(j);
+      } else {
+        break;
+      }
+    }
+    const anchorIndex = endIndex + 1 < blocks.length ? endIndex + 1 : -1;
+    if (anchorIndex !== -1) {
+      const anchorBlock = blocks[anchorIndex];
+      if (anchorBlock.kind === "sectionBreak" || anchorBlock.kind === "pageBreak" || anchorBlock.kind === "columnBreak") {
+        if (memberIndices.length > 1) {
+          chains.set(i, {
+            startIndex: i,
+            endIndex,
+            memberIndices,
+            anchorIndex: -1
+          });
+        }
+        continue;
+      }
+    }
+    chains.set(i, {
+      startIndex: i,
+      endIndex,
+      memberIndices,
+      anchorIndex
+    });
+  }
+  return chains;
+}
+function calculateChainHeight(chain, blocks, measures, state) {
+  let totalHeight = 0;
+  let prevStyleId;
+  let prevSpacingAfter = 0;
+  let prevContextualSpacing = false;
+  let isFirstMember = true;
+  for (const memberIndex of chain.memberIndices) {
+    const block = blocks[memberIndex];
+    const measure = measures[memberIndex];
+    if (!measure) continue;
+    const spacingBefore = getParagraphSpacingBefore(block);
+    const spacingAfter = getParagraphSpacingAfter$1(block);
+    const styleId = typeof block.attrs?.styleId === "string" ? block.attrs?.styleId : void 0;
+    const contextualSpacing = block.attrs?.contextualSpacing === true;
+    if (isFirstMember) {
+      const prevTrailing = Number.isFinite(state.trailingSpacing) && state.trailingSpacing > 0 ? state.trailingSpacing : 0;
+      const sameAsLastOnPage = styleId && state.lastParagraphStyleId === styleId;
+      const effectiveSpacingBefore = contextualSpacing && sameAsLastOnPage ? 0 : Math.max(spacingBefore - prevTrailing, 0);
+      totalHeight += effectiveSpacingBefore;
+      isFirstMember = false;
+    } else {
+      const sameStyle = styleId && prevStyleId && styleId === prevStyleId;
+      const effectiveSpacingAfterPrev = prevContextualSpacing && sameStyle ? 0 : prevSpacingAfter;
+      const effectiveSpacingBefore = contextualSpacing && sameStyle ? 0 : spacingBefore;
+      const interParagraphSpacing = Math.max(effectiveSpacingAfterPrev, effectiveSpacingBefore);
+      totalHeight += interParagraphSpacing;
+    }
+    totalHeight += getMeasureHeight(block, measure);
+    prevStyleId = styleId;
+    prevSpacingAfter = spacingAfter;
+    prevContextualSpacing = contextualSpacing;
+  }
+  if (chain.anchorIndex !== -1) {
+    const anchorBlock = blocks[chain.anchorIndex];
+    const anchorMeasure = measures[chain.anchorIndex];
+    if (anchorBlock && anchorMeasure) {
+      if (anchorBlock.kind === "paragraph" && anchorMeasure.kind === "paragraph") {
+        const anchorSpacingBefore = getParagraphSpacingBefore(anchorBlock);
+        const anchorStyleId = typeof anchorBlock.attrs?.styleId === "string" ? anchorBlock.attrs?.styleId : void 0;
+        const anchorContextualSpacing = anchorBlock.attrs?.contextualSpacing === true;
+        const sameStyle = anchorStyleId && prevStyleId && anchorStyleId === prevStyleId;
+        const effectiveSpacingAfterPrev = prevContextualSpacing && sameStyle ? 0 : prevSpacingAfter;
+        const effectiveAnchorSpacingBefore = anchorContextualSpacing && sameStyle ? 0 : anchorSpacingBefore;
+        const interParagraphSpacing = Math.max(effectiveSpacingAfterPrev, effectiveAnchorSpacingBefore);
+        const firstLineHeight = anchorMeasure.lines[0]?.lineHeight;
+        const anchorHeight = typeof firstLineHeight === "number" && Number.isFinite(firstLineHeight) && firstLineHeight > 0 ? firstLineHeight : getMeasureHeight(anchorBlock, anchorMeasure);
+        totalHeight += interParagraphSpacing + anchorHeight;
+      } else {
+        totalHeight += prevSpacingAfter + getMeasureHeight(anchorBlock, anchorMeasure);
+      }
+    }
+  }
+  return totalHeight;
+}
 const DEFAULT_PAGE_SIZE$2 = { w: 612, h: 792 };
 const DEFAULT_MARGINS$2 = { top: 72, right: 72, bottom: 72, left: 72 };
 const COLUMN_EPSILON$1 = 1e-4;
+const asBoolean = (value) => {
+  if (value === true || value === 1) return true;
+  if (typeof value === "string") {
+    const normalized = value.toLowerCase();
+    return normalized === "true" || normalized === "1" || normalized === "on";
+  }
+  return false;
+};
 const layoutDebugEnabled$1 = typeof process$1 !== "undefined" && typeof process$1.env !== "undefined" && Boolean(process$1.env.SD_DEBUG_LAYOUT);
 const layoutLog = (...args) => {
   if (!layoutDebugEnabled$1) return;
@@ -34459,7 +35046,7 @@ function layoutDocument(blocks, measures, options = {}) {
   let activeOrientation = null;
   let pendingOrientation = null;
   let activeVAlign = null;
-  let pendingVAlign = null;
+  let pendingVAlign = void 0;
   const paginatorMargins = { left: activeLeftMargin, right: activeRightMargin };
   const floatManager = createFloatingObjectManager(
     normalizeColumns(activeColumns, activePageSize.w - (activeLeftMargin + activeRightMargin)),
@@ -34516,6 +35103,9 @@ function layoutDocument(blocks, measures, options = {}) {
       if (block.columns) {
         next.activeColumns = { count: block.columns.count, gap: block.columns.gap };
         next.pendingColumns = null;
+      } else {
+        next.activeColumns = { count: 1, gap: 0 };
+        next.pendingColumns = null;
       }
       if (block.headerRefs || block.footerRefs) {
         const baseSectionRefs = pendingSectionRefs ?? activeSectionRefs;
@@ -34575,7 +35165,7 @@ function layoutDocument(blocks, measures, options = {}) {
     if (block.pageSize) next.pendingPageSize = { w: block.pageSize.w, h: block.pageSize.h };
     if (block.orientation) next.pendingOrientation = block.orientation;
     const sectionType = block.type ?? "continuous";
-    const isColumnsChanging = !!block.columns && (block.columns.count !== next.activeColumns.count || block.columns.gap !== next.activeColumns.gap);
+    const isColumnsChanging = block.columns && (block.columns.count !== next.activeColumns.count || block.columns.gap !== next.activeColumns.gap) || !block.columns && next.activeColumns.count > 1;
     const sectionIndexRaw = block.attrs?.sectionIndex;
     const metadataIndex = typeof sectionIndexRaw === "number" ? sectionIndexRaw : Number(sectionIndexRaw ?? NaN);
     if (Number.isFinite(metadataIndex)) {
@@ -34596,26 +35186,28 @@ function layoutDocument(blocks, measures, options = {}) {
       pendingSectionRefs = mergeSectionRefs(baseSectionRefs, nextSectionRefs);
       layoutLog(`[Layout] Compat fallback: Scheduled pendingSectionRefs:`, pendingSectionRefs);
     }
+    const getColumnConfig2 = () => block.columns ? { count: block.columns.count, gap: block.columns.gap } : { count: 1, gap: 0 };
     if (block.attrs?.requirePageBoundary) {
-      if (block.columns) next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
+      next.pendingColumns = getColumnConfig2();
       return { decision: { forcePageBreak: true, forceMidPageRegion: false }, state: next };
     }
     if (sectionType === "nextPage") {
-      if (block.columns) next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
+      next.pendingColumns = getColumnConfig2();
       return { decision: { forcePageBreak: true, forceMidPageRegion: false }, state: next };
     }
     if (sectionType === "evenPage") {
-      if (block.columns) next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
+      next.pendingColumns = getColumnConfig2();
       return { decision: { forcePageBreak: true, forceMidPageRegion: false, requiredParity: "even" }, state: next };
     }
     if (sectionType === "oddPage") {
-      if (block.columns) next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
+      next.pendingColumns = getColumnConfig2();
       return { decision: { forcePageBreak: true, forceMidPageRegion: false, requiredParity: "odd" }, state: next };
     }
     if (isColumnsChanging) {
+      next.pendingColumns = getColumnConfig2();
       return { decision: { forcePageBreak: false, forceMidPageRegion: true }, state: next };
     }
-    if (block.columns) next.pendingColumns = { count: block.columns.count, gap: block.columns.gap };
+    next.pendingColumns = getColumnConfig2();
     return { decision: { forcePageBreak: false, forceMidPageRegion: false }, state: next };
   };
   const createPage = (number, pageMargins, pageSizeOverride) => {
@@ -34632,6 +35224,10 @@ function layoutDocument(blocks, measures, options = {}) {
     }
     if (activeVAlign && activeVAlign !== "top") {
       page.vAlign = activeVAlign;
+      page.baseMargins = {
+        top: activeSectionBaseTopMargin,
+        bottom: activeSectionBaseBottomMargin
+      };
     }
     return page;
   };
@@ -34666,6 +35262,9 @@ function layoutDocument(blocks, measures, options = {}) {
       ...initialSectionMetadata.footerRefs && { footerRefs: initialSectionMetadata.footerRefs }
     };
   }
+  if (initialSectionMetadata?.vAlign) {
+    activeVAlign = initialSectionMetadata.vAlign;
+  }
   let activeSectionIndex = initialSectionMetadata?.sectionIndex ?? 0;
   let pendingSectionIndex = null;
   const sectionFirstPageNumbers = /* @__PURE__ */ new Map();
@@ -34752,9 +35351,9 @@ function layoutDocument(blocks, measures, options = {}) {
           activeSectionIndex = pendingSectionIndex;
           pendingSectionIndex = null;
         }
-        if (pendingVAlign !== null) {
+        if (pendingVAlign !== void 0) {
           activeVAlign = pendingVAlign;
-          pendingVAlign = null;
+          pendingVAlign = void 0;
         }
         if (pendingSectionBaseTopMargin !== null) {
           activeSectionBaseTopMargin = pendingSectionBaseTopMargin;
@@ -34935,6 +35534,13 @@ function layoutDocument(blocks, measures, options = {}) {
     floatManager.registerDrawing(entry.block, entry.measure, anchorY, state.columnIndex, state.page.number);
     preRegisteredPositions.set(entry.block.id, { anchorX, anchorY, pageNumber: state.page.number });
   }
+  const keepNextChains = computeKeepNextChains(blocks);
+  const midChainIndices = /* @__PURE__ */ new Set();
+  for (const chain of keepNextChains.values()) {
+    for (let i = 1; i < chain.memberIndices.length; i++) {
+      midChainIndices.add(chain.memberIndices[i]);
+    }
+  }
   for (let index2 = 0; index2 < blocks.length; index2 += 1) {
     const block = blocks[index2];
     const measure = measures[index2];
@@ -35038,14 +35644,13 @@ function layoutDocument(blocks, measures, options = {}) {
           pendingSectionBaseBottomMargin = typeof blockBottomMargin === "number" ? blockBottomMargin : margins.bottom;
         }
       }
-      if (effectiveBlock.vAlign) {
-        const isFirstSection2 = effectiveBlock.attrs?.isFirstSection && states.length === 0;
-        if (isFirstSection2) {
-          activeVAlign = effectiveBlock.vAlign;
-          pendingVAlign = null;
-        } else {
-          pendingVAlign = effectiveBlock.vAlign;
-        }
+      const sectionVAlign = effectiveBlock.vAlign ?? null;
+      const isFirstSectionForVAlign = effectiveBlock.attrs?.isFirstSection && states.length === 0;
+      if (isFirstSectionForVAlign) {
+        activeVAlign = sectionVAlign;
+        pendingVAlign = void 0;
+      } else {
+        pendingVAlign = sectionVAlign;
       }
       if (effectiveBlock.headerRefs || effectiveBlock.footerRefs) {
         const baseSectionRefs = pendingSectionRefs ?? activeSectionRefs;
@@ -35085,14 +35690,10 @@ function layoutDocument(blocks, measures, options = {}) {
           pendingNumbering = { ...effectiveBlock.numbering };
         }
       }
-      if (breakInfo.forceMidPageRegion && block.columns) {
+      if (breakInfo.forceMidPageRegion && updatedState.pendingColumns) {
         let state = paginator.ensurePage();
         const columnIndexBefore = state.columnIndex;
-        const rawCount = block.columns.count;
-        const validatedCount = typeof rawCount === "number" && Number.isFinite(rawCount) && rawCount > 0 ? Math.max(1, Math.floor(rawCount)) : 1;
-        const rawGap = block.columns.gap;
-        const validatedGap = typeof rawGap === "number" && Number.isFinite(rawGap) && rawGap >= 0 ? Math.max(0, rawGap) : 0;
-        const newColumns = { count: validatedCount, gap: validatedGap };
+        const newColumns = updatedState.pendingColumns;
         if (columnIndexBefore >= newColumns.count) {
           state = paginator.startNewPage();
         }
@@ -35156,7 +35757,24 @@ function layoutDocument(blocks, measures, options = {}) {
           placedAnchoredTableIds.add(tableBlock.id);
         }
       }
-      if (paraBlock.attrs?.keepNext === true) {
+      const chain = keepNextChains.get(index2);
+      if (midChainIndices.has(index2)) ;
+      else if (chain) {
+        let state = paginator.ensurePage();
+        const availableHeight = state.contentBottom - state.cursorY;
+        const firstMemberBlock = blocks[chain.startIndex];
+        const firstMemberStyleId = typeof firstMemberBlock.attrs?.styleId === "string" ? firstMemberBlock.attrs?.styleId : void 0;
+        const firstMemberContextualSpacing = firstMemberBlock.attrs?.contextualSpacing === true;
+        const contextualSpacingApplies = firstMemberContextualSpacing && firstMemberStyleId && state.lastParagraphStyleId === firstMemberStyleId;
+        const prevTrailing = Number.isFinite(state.trailingSpacing) && state.trailingSpacing > 0 ? state.trailingSpacing : 0;
+        const effectiveAvailableHeight = contextualSpacingApplies ? availableHeight + prevTrailing : availableHeight;
+        const chainHeight = calculateChainHeight(chain, blocks, measures, state);
+        const pageContentHeight = state.contentBottom - state.topMargin;
+        const chainFitsOnBlankPage = chainHeight <= pageContentHeight;
+        if (chainFitsOnBlankPage && chainHeight > effectiveAvailableHeight && state.page.fragments.length > 0) {
+          state = paginator.advanceColumn(state);
+        }
+      } else if (paraBlock.attrs?.keepNext === true) {
         const nextBlock = blocks[index2 + 1];
         const nextMeasure = measures[index2 + 1];
         if (nextBlock && nextMeasure && nextBlock.kind !== "sectionBreak" && nextBlock.kind !== "pageBreak" && nextBlock.kind !== "columnBreak") {
@@ -35164,11 +35782,23 @@ function layoutDocument(blocks, measures, options = {}) {
           if (!shouldSkipAnchoredTable) {
             let state = paginator.ensurePage();
             const availableHeight = state.contentBottom - state.cursorY;
+            const spacingBefore = getParagraphSpacingBefore(paraBlock);
             const spacingAfter = getParagraphSpacingAfter$1(paraBlock);
+            const prevTrailing = Number.isFinite(state.trailingSpacing) && state.trailingSpacing > 0 ? state.trailingSpacing : 0;
+            const currentStyleId = typeof paraBlock.attrs?.styleId === "string" ? paraBlock.attrs?.styleId : void 0;
+            const currentContextualSpacing = asBoolean(paraBlock.attrs?.contextualSpacing);
+            const contextualSpacingApplies = currentContextualSpacing && currentStyleId && state.lastParagraphStyleId === currentStyleId;
+            const effectiveSpacingBefore = contextualSpacingApplies ? 0 : Math.max(spacingBefore - prevTrailing, 0);
             const currentHeight = getMeasureHeight(paraBlock, measure);
             const nextHeight = getMeasureHeight(nextBlock, nextMeasure);
             const nextIsParagraph = nextBlock.kind === "paragraph" && nextMeasure.kind === "paragraph";
             const nextSpacingBefore = nextIsParagraph ? getParagraphSpacingBefore(nextBlock) : 0;
+            const nextStyleId = nextIsParagraph && typeof nextBlock.attrs?.styleId === "string" ? nextBlock.attrs?.styleId : void 0;
+            const nextContextualSpacing = nextIsParagraph && asBoolean(nextBlock.attrs?.contextualSpacing);
+            const sameStyleAsNext = currentStyleId && nextStyleId && nextStyleId === currentStyleId;
+            const effectiveSpacingAfter = currentContextualSpacing && sameStyleAsNext ? 0 : spacingAfter;
+            const effectiveNextSpacingBefore = nextContextualSpacing && sameStyleAsNext ? 0 : nextSpacingBefore;
+            const interParagraphSpacing = nextIsParagraph ? Math.max(effectiveSpacingAfter, effectiveNextSpacingBefore) : effectiveSpacingAfter;
             const nextFirstLineHeight = (() => {
               if (!nextIsParagraph) {
                 return nextHeight;
@@ -35179,13 +35809,26 @@ function layoutDocument(blocks, measures, options = {}) {
               }
               return nextHeight;
             })();
-            const combinedHeight = nextIsParagraph ? currentHeight + Math.max(spacingAfter, nextSpacingBefore) + nextFirstLineHeight : currentHeight + spacingAfter + nextHeight;
-            if (combinedHeight > availableHeight && state.page.fragments.length > 0) {
+            const combinedHeight = nextIsParagraph ? effectiveSpacingBefore + currentHeight + interParagraphSpacing + nextFirstLineHeight : effectiveSpacingBefore + currentHeight + spacingAfter + nextHeight;
+            const effectiveAvailableHeight = contextualSpacingApplies ? availableHeight + prevTrailing : availableHeight;
+            if (combinedHeight > effectiveAvailableHeight && state.page.fragments.length > 0) {
               state = paginator.advanceColumn(state);
             }
           }
         }
       }
+      let overrideSpacingAfter;
+      const curStyleId = typeof paraBlock.attrs?.styleId === "string" ? paraBlock.attrs.styleId : void 0;
+      const curContextualSpacing = asBoolean(paraBlock.attrs?.contextualSpacing);
+      if (curContextualSpacing && curStyleId) {
+        const nextBlock = index2 < blocks.length - 1 ? blocks[index2 + 1] : null;
+        if (nextBlock?.kind === "paragraph") {
+          const nextStyleId = typeof nextBlock.attrs?.styleId === "string" ? nextBlock.attrs?.styleId : void 0;
+          if (nextStyleId === curStyleId) {
+            overrideSpacingAfter = 0;
+          }
+        }
+      }
       layoutParagraphBlock(
         {
           block,
@@ -35195,7 +35838,8 @@ function layoutDocument(blocks, measures, options = {}) {
           advanceColumn: paginator.advanceColumn,
           columnX,
           floatManager,
-          remeasureParagraph: options.remeasureParagraph
+          remeasureParagraph: options.remeasureParagraph,
+          overrideSpacingAfter
         },
         anchorsForPara ? {
           anchoredDrawings: anchorsForPara,
@@ -35326,11 +35970,17 @@ function layoutDocument(blocks, measures, options = {}) {
     pages.pop();
   }
   for (const page of pages) {
-    if (!page.vAlign || page.vAlign === "top") continue;
-    if (page.fragments.length === 0) continue;
+    if (!page.vAlign || page.vAlign === "top") {
+      continue;
+    }
+    if (page.fragments.length === 0) {
+      continue;
+    }
     const pageSizeForPage = page.size ?? pageSize;
-    const contentTop = page.margins?.top ?? margins.top;
-    const contentBottom = pageSizeForPage.h - (page.margins?.bottom ?? margins.bottom);
+    const baseTop = page.baseMargins?.top ?? page.margins?.top ?? margins.top;
+    const baseBottom = page.baseMargins?.bottom ?? page.margins?.bottom ?? margins.bottom;
+    const contentTop = baseTop;
+    const contentBottom = pageSizeForPage.h - baseBottom;
     const contentHeight = contentBottom - contentTop;
     let minY = Infinity;
     let maxY = -Infinity;
@@ -35364,6 +36014,58 @@ function layoutDocument(blocks, measures, options = {}) {
       }
     }
   }
+  if (activeColumns.count > 1) {
+    const contentWidth = pageSize.w - (activeLeftMargin + activeRightMargin);
+    const normalizedCols = normalizeColumns(activeColumns, contentWidth);
+    const measureMap = /* @__PURE__ */ new Map();
+    const blockSectionMap = /* @__PURE__ */ new Map();
+    blocks.forEach((block, idx) => {
+      const measure = measures[idx];
+      if (measure) {
+        measureMap.set(block.id, measure);
+      }
+      const blockWithAttrs = block;
+      const sectionIdx = blockWithAttrs.attrs?.sectionIndex;
+      if (typeof sectionIdx === "number") {
+        blockSectionMap.set(block.id, sectionIdx);
+      }
+    });
+    for (const page of pages) {
+      if (page === pages[pages.length - 1] && page.fragments.length > 0) {
+        const uniqueXPositions = new Set(page.fragments.map((f) => Math.round(f.x)));
+        const hasExplicitColumnStructure = uniqueXPositions.size > 1;
+        if (hasExplicitColumnStructure) {
+          continue;
+        }
+        const uniqueWidths = new Set(page.fragments.map((f) => Math.round(f.width)));
+        const hasMixedColumnWidths = uniqueWidths.size > 1;
+        if (hasMixedColumnWidths) {
+          continue;
+        }
+        const fragmentSections = /* @__PURE__ */ new Set();
+        for (const f of page.fragments) {
+          const section = blockSectionMap.get(f.blockId);
+          if (section !== void 0) {
+            fragmentSections.add(section);
+          }
+        }
+        const hasMixedSections = fragmentSections.size > 1;
+        const fragmentsToBalance = hasMixedSections ? page.fragments.filter((f) => {
+          const fragSection = blockSectionMap.get(f.blockId);
+          return fragSection === activeSectionIndex;
+        }) : page.fragments;
+        if (fragmentsToBalance.length > 0) {
+          balancePageColumns(
+            fragmentsToBalance,
+            normalizedCols,
+            { left: activeLeftMargin },
+            activeTopMargin,
+            measureMap
+          );
+        }
+      }
+    }
+  }
   return {
     pageSize,
     pages,
@@ -35490,6 +36192,29 @@ function normalizeColumns(input, contentWidth) {
     width
   };
 }
+const fieldAnnotationKey = (run) => {
+  if (run.kind !== "fieldAnnotation") return "";
+  const annotation = run;
+  const sizeKey = annotation.size ? `${annotation.size.width ?? ""}x${annotation.size.height ?? ""}` : "";
+  const highlightKey = annotation.highlighted === false ? "nohl" : "hl";
+  const hiddenKey = annotation.hidden ? "hidden" : "";
+  return [
+    annotation.variant ?? "",
+    annotation.displayLabel ?? "",
+    annotation.imageSrc ?? "",
+    annotation.rawHtml ?? "",
+    annotation.linkUrl ?? "",
+    annotation.fontFamily ?? "",
+    annotation.fontSize ?? "",
+    annotation.bold ? "b" : "",
+    annotation.italic ? "i" : "",
+    annotation.underline ? "u" : "",
+    highlightKey,
+    hiddenKey,
+    annotation.visibility ?? "",
+    sizeKey
+  ].join("|");
+};
 const hasTrackedChange = (run) => {
   return "trackedChange" in run && run.trackedChange !== void 0 && run.trackedChange !== null;
 };
@@ -35703,7 +36428,10 @@ const hashRuns = (block) => {
       const srcHash = imgRun.src.slice(0, 50);
       return `img:${srcHash}:${imgRun.width}x${imgRun.height}`;
     }
-    const text = "src" in run || run.kind === "lineBreak" || run.kind === "break" || run.kind === "fieldAnnotation" ? "" : run.text ?? "";
+    if (run.kind === "fieldAnnotation") {
+      return `fa:${fieldAnnotationKey(run)}`;
+    }
+    const text = "src" in run || run.kind === "lineBreak" || run.kind === "break" ? "" : run.text ?? "";
     const bold = "bold" in run ? run.bold : false;
     const italic = "italic" in run ? run.italic : false;
     const color = "color" in run ? run.color : void 0;
@@ -36581,6 +37309,13 @@ const TAB_EPSILON$1 = 0.1;
 const WIDTH_FUDGE_PX = 0.5;
 const twipsToPx$2 = (twips) => twips / TWIPS_PER_PX$1;
 const pxToTwips$1 = (px) => Math.round(px * TWIPS_PER_PX$1);
+const sanitizeIndent$1 = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : 0;
+const sanitizeDecimalSeparator$1 = (value) => value === "," ? "," : ".";
+const getRunWidth = (run) => {
+  const width = run.width;
+  return typeof width === "number" ? width : 0;
+};
+const isLineBreakRun$1 = (run) => run.kind === "lineBreak" || run.kind === "break" && run.breakType === "line";
 const markerFontString = (run) => {
   const size2 = run?.fontSize ?? 16;
   const family = run?.fontFamily ?? "Arial";
@@ -36590,10 +37325,10 @@ const markerFontString = (run) => {
 };
 const buildTabStopsPx$1 = (indent, tabs, tabIntervalTwips) => {
   const paragraphIndentTwips = {
-    left: pxToTwips$1(Math.max(0, indent?.left ?? 0)),
-    right: pxToTwips$1(Math.max(0, indent?.right ?? 0)),
-    firstLine: pxToTwips$1(Math.max(0, indent?.firstLine ?? 0)),
-    hanging: pxToTwips$1(Math.max(0, indent?.hanging ?? 0))
+    left: pxToTwips$1(sanitizeIndent$1(indent?.left)),
+    right: pxToTwips$1(sanitizeIndent$1(indent?.right)),
+    firstLine: pxToTwips$1(sanitizeIndent$1(indent?.firstLine)),
+    hanging: pxToTwips$1(sanitizeIndent$1(indent?.hanging))
   };
   const stops = computeTabStops$1({
     explicitStops: tabs ?? [],
@@ -36612,7 +37347,7 @@ const getNextTabStopPx$1 = (currentX, tabStops, startIndex) => {
     index2 += 1;
   }
   if (index2 < tabStops.length) {
-    return { target: tabStops[index2].pos, nextIndex: index2 + 1 };
+    return { target: tabStops[index2].pos, nextIndex: index2 + 1, stop: tabStops[index2] };
   }
   return { target: currentX + twipsToPx$2(DEFAULT_TAB_INTERVAL_TWIPS$1), nextIndex: index2 };
 };
@@ -36630,6 +37365,211 @@ function measureRunSliceWidth(run, fromChar, toChar) {
   const metrics = context.measureText(text);
   return metrics.width;
 }
+const scanTabAlignmentGroup = (runs, startRunIndex, startChar, decimalSeparator) => {
+  let totalWidth = 0;
+  let beforeDecimalWidth;
+  let foundDecimal = false;
+  let endRun = startRunIndex;
+  let endChar = startChar;
+  for (let r2 = startRunIndex; r2 < runs.length; r2 += 1) {
+    const run = runs[r2];
+    if (!run) continue;
+    if (run.kind === "tab") {
+      return { totalWidth, beforeDecimalWidth, endRun, endChar, resumeRun: r2, resumeChar: 0 };
+    }
+    if (isLineBreakRun$1(run)) {
+      return { totalWidth, beforeDecimalWidth, endRun, endChar, resumeRun: r2, resumeChar: 0 };
+    }
+    const text = runText(run);
+    if (!text) {
+      const runWidth = getRunWidth(run);
+      if (runWidth > 0) {
+        totalWidth += runWidth;
+        endRun = r2;
+        endChar = 1;
+      }
+      continue;
+    }
+    const sliceStart = r2 === startRunIndex ? startChar : 0;
+    if (sliceStart >= text.length) continue;
+    const tabIndex = text.indexOf("	", sliceStart);
+    const effectiveEnd = tabIndex >= 0 ? tabIndex : text.length;
+    if (effectiveEnd > sliceStart) {
+      const sliceWidth = measureRunSliceWidth(run, sliceStart, effectiveEnd);
+      if (!foundDecimal) {
+        const decimalIndex = text.slice(sliceStart, effectiveEnd).indexOf(decimalSeparator);
+        if (decimalIndex >= 0) {
+          foundDecimal = true;
+          const beforeWidth = decimalIndex > 0 ? measureRunSliceWidth(run, sliceStart, sliceStart + decimalIndex) : 0;
+          beforeDecimalWidth = totalWidth + beforeWidth;
+        }
+      }
+      totalWidth += sliceWidth;
+      endRun = r2;
+      endChar = effectiveEnd;
+    }
+    if (tabIndex >= 0) {
+      return { totalWidth, beforeDecimalWidth, endRun, endChar, resumeRun: r2, resumeChar: tabIndex };
+    }
+  }
+  return { totalWidth, beforeDecimalWidth, endRun, endChar, resumeRun: runs.length, resumeChar: 0 };
+};
+const measureTabAlignmentGroupInLine = (runs, line, startRunIndex, startChar, decimalSeparator) => {
+  let totalWidth = 0;
+  let beforeDecimalWidth;
+  let foundDecimal = false;
+  for (let r2 = startRunIndex; r2 <= line.toRun; r2 += 1) {
+    const run = runs[r2];
+    if (!run) continue;
+    if (run.kind === "tab") break;
+    if (isLineBreakRun$1(run)) break;
+    const text = runText(run);
+    if (!text) {
+      totalWidth += getRunWidth(run);
+      continue;
+    }
+    const sliceStart = r2 === startRunIndex ? startChar : 0;
+    const sliceEnd = r2 === line.toRun ? line.toChar : text.length;
+    if (sliceStart >= sliceEnd) continue;
+    const slice2 = text.slice(sliceStart, sliceEnd);
+    const tabIndex = slice2.indexOf("	");
+    const effectiveSlice = tabIndex >= 0 ? slice2.slice(0, tabIndex) : slice2;
+    const effectiveSliceEnd = tabIndex >= 0 ? sliceStart + tabIndex : sliceEnd;
+    if (effectiveSlice.length > 0) {
+      const sliceWidth = measureRunSliceWidth(run, sliceStart, effectiveSliceEnd);
+      totalWidth += sliceWidth;
+      if (!foundDecimal) {
+        const decimalIndex = effectiveSlice.indexOf(decimalSeparator);
+        if (decimalIndex >= 0) {
+          foundDecimal = true;
+          const beforeWidth = decimalIndex > 0 ? measureRunSliceWidth(run, sliceStart, sliceStart + decimalIndex) : 0;
+          beforeDecimalWidth = totalWidth - sliceWidth + beforeWidth;
+        }
+      }
+    }
+    if (tabIndex >= 0) {
+      break;
+    }
+  }
+  return { totalWidth, beforeDecimalWidth };
+};
+const applyTabLayoutToLines = (lines, runs, tabStops, decimalSeparator, indentLeft, rawFirstLineOffset) => {
+  lines.forEach((line, lineIndex) => {
+    let cursorX = 0;
+    let lineWidth = 0;
+    let tabStopCursor = 0;
+    let pendingTabAlignStartX = null;
+    const segments = [];
+    const leaders = [];
+    const effectiveIndent = lineIndex === 0 ? indentLeft + rawFirstLineOffset : indentLeft;
+    const maxAbsWidth = typeof line.maxWidth === "number" && Number.isFinite(line.maxWidth) ? line.maxWidth + effectiveIndent : Number.POSITIVE_INFINITY;
+    const applyTab = (startRunIndex, startChar, run) => {
+      const originX = cursorX;
+      const absCurrentX = cursorX + effectiveIndent;
+      const { target, nextIndex, stop } = getNextTabStopPx$1(absCurrentX, tabStops, tabStopCursor);
+      tabStopCursor = nextIndex;
+      const clampedTarget = Number.isFinite(maxAbsWidth) ? Math.min(target, maxAbsWidth) : target;
+      const relativeTarget = clampedTarget - effectiveIndent;
+      lineWidth = Math.max(lineWidth, relativeTarget);
+      if (stop?.leader && stop.leader !== "none") {
+        const from3 = Math.min(originX, relativeTarget);
+        const to = Math.max(originX, relativeTarget);
+        leaders.push({ from: from3, to, style: stop.leader });
+      }
+      const stopVal = stop?.val ?? "start";
+      if (stopVal === "end" || stopVal === "center" || stopVal === "decimal") {
+        const groupMeasure = measureTabAlignmentGroupInLine(runs, line, startRunIndex, startChar, decimalSeparator);
+        if (groupMeasure.totalWidth > 0) {
+          let groupStartX;
+          if (stopVal === "end") {
+            groupStartX = Math.max(0, relativeTarget - groupMeasure.totalWidth);
+          } else if (stopVal === "center") {
+            groupStartX = Math.max(0, relativeTarget - groupMeasure.totalWidth / 2);
+          } else {
+            const beforeDecimal = groupMeasure.beforeDecimalWidth ?? groupMeasure.totalWidth;
+            groupStartX = Math.max(0, relativeTarget - beforeDecimal);
+          }
+          pendingTabAlignStartX = groupStartX;
+        } else {
+          cursorX = Math.max(cursorX, relativeTarget);
+        }
+      } else {
+        cursorX = Math.max(cursorX, relativeTarget);
+      }
+      if (run && run.kind === "tab") {
+        run.width = Math.max(0, relativeTarget - originX);
+      }
+    };
+    for (let runIndex = line.fromRun; runIndex <= line.toRun; runIndex += 1) {
+      const run = runs[runIndex];
+      if (!run) continue;
+      if (run.kind === "tab") {
+        applyTab(runIndex + 1, 0, run);
+        continue;
+      }
+      const text = runText(run);
+      if (!text) {
+        cursorX += getRunWidth(run);
+        lineWidth = Math.max(lineWidth, cursorX);
+        continue;
+      }
+      const sliceStart = runIndex === line.fromRun ? line.fromChar : 0;
+      const sliceEnd = runIndex === line.toRun ? line.toChar : text.length;
+      if (sliceStart >= sliceEnd) continue;
+      let segmentStart = sliceStart;
+      for (let i = sliceStart; i < sliceEnd; i += 1) {
+        if (text[i] !== "	") continue;
+        if (i > segmentStart) {
+          const segmentWidth = measureRunSliceWidth(run, segmentStart, i);
+          const segment = {
+            runIndex,
+            fromChar: segmentStart,
+            toChar: i,
+            width: segmentWidth
+          };
+          if (pendingTabAlignStartX != null) {
+            segment.x = pendingTabAlignStartX;
+            cursorX = pendingTabAlignStartX + segmentWidth;
+            pendingTabAlignStartX = null;
+          } else {
+            cursorX += segmentWidth;
+          }
+          lineWidth = Math.max(lineWidth, cursorX);
+          segments.push(segment);
+        }
+        applyTab(runIndex, i + 1);
+        segmentStart = i + 1;
+      }
+      if (segmentStart < sliceEnd) {
+        const segmentWidth = measureRunSliceWidth(run, segmentStart, sliceEnd);
+        const segment = {
+          runIndex,
+          fromChar: segmentStart,
+          toChar: sliceEnd,
+          width: segmentWidth
+        };
+        if (pendingTabAlignStartX != null) {
+          segment.x = pendingTabAlignStartX;
+          cursorX = pendingTabAlignStartX + segmentWidth;
+          pendingTabAlignStartX = null;
+        } else {
+          cursorX += segmentWidth;
+        }
+        lineWidth = Math.max(lineWidth, cursorX);
+        segments.push(segment);
+      }
+    }
+    if (segments.length > 0) {
+      line.segments = segments;
+    }
+    if (leaders.length > 0) {
+      line.leaders = leaders;
+    }
+    if (lineWidth > 0) {
+      line.width = Math.max(line.width, lineWidth);
+    }
+  });
+};
 function lineHeightForRuns(runs, fromRun, toRun) {
   let maxSize2 = 0;
   for (let i = fromRun; i <= toRun; i += 1) {
@@ -36658,13 +37598,14 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
   const attrs = block.attrs;
   const indent = attrs?.indent;
   const wordLayout = attrs?.wordLayout;
-  const rawIndentLeft = indent?.left ?? 0;
-  const rawIndentRight = indent?.right ?? 0;
+  const rawIndentLeft = typeof indent?.left === "number" && Number.isFinite(indent.left) ? indent.left : 0;
+  const rawIndentRight = typeof indent?.right === "number" && Number.isFinite(indent.right) ? indent.right : 0;
   const indentLeft = Math.max(0, rawIndentLeft);
   const indentRight = Math.max(0, rawIndentRight);
   const indentFirstLine = Math.max(0, indent?.firstLine ?? 0);
   const indentHanging = Math.max(0, indent?.hanging ?? 0);
   const baseFirstLineOffset = firstLineIndent || indentFirstLine - indentHanging;
+  const rawFirstLineOffset = baseFirstLineOffset;
   const clampedFirstLineOffset = Math.max(0, baseFirstLineOffset);
   const hasNegativeIndent = rawIndentLeft < 0 || rawIndentRight < 0;
   const allowNegativeFirstLineOffset = !wordLayout?.marker && !hasNegativeIndent && baseFirstLineOffset < 0;
@@ -36691,11 +37632,13 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
   const treatAsHanging = !wordLayout?.marker && effectiveTextStartPx && indentLeft === 0 && indentHanging === 0;
   const firstLineWidth = typeof effectiveTextStartPx === "number" && effectiveTextStartPx > indentLeft && !treatAsHanging ? Math.max(1, maxWidth - effectiveTextStartPx - indentRight) : Math.max(1, contentWidth - effectiveFirstLineOffset);
   const tabStops = buildTabStopsPx$1(indent, attrs?.tabs, attrs?.tabIntervalTwips);
+  const decimalSeparator = sanitizeDecimalSeparator$1(attrs?.decimalSeparator);
   let currentRun = 0;
   let currentChar = 0;
   while (currentRun < runs.length) {
     const isFirstLine = lines.length === 0;
     const effectiveMaxWidth = Math.max(1, isFirstLine ? firstLineWidth : contentWidth);
+    const effectiveIndent = isFirstLine ? indentLeft + rawFirstLineOffset : indentLeft;
     const startRun = currentRun;
     const startChar = currentChar;
     let width = 0;
@@ -36706,13 +37649,50 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
     let endChar = currentChar;
     let tabStopCursor = 0;
     let didBreakInThisLine = false;
+    let resumeRun = -1;
+    let resumeChar = 0;
     for (let r2 = currentRun; r2 < runs.length; r2 += 1) {
       const run = runs[r2];
       if (run.kind === "tab") {
-        const { target, nextIndex } = getNextTabStopPx$1(width, tabStops, tabStopCursor);
-        const tabAdvance = Math.max(0, target - width);
+        const absCurrentX = width + effectiveIndent;
+        const { target, nextIndex, stop } = getNextTabStopPx$1(absCurrentX, tabStops, tabStopCursor);
+        const maxAbsWidth = effectiveMaxWidth + effectiveIndent;
+        const clampedTarget = Math.min(target, maxAbsWidth);
+        const tabAdvance = Math.max(0, clampedTarget - absCurrentX);
         width += tabAdvance;
         tabStopCursor = nextIndex;
+        if (stop && (stop.val === "end" || stop.val === "center" || stop.val === "decimal")) {
+          const group = scanTabAlignmentGroup(runs, r2 + 1, 0, decimalSeparator);
+          if (group.totalWidth > 0) {
+            const relativeTarget = clampedTarget - effectiveIndent;
+            let groupStartX;
+            if (stop.val === "end") {
+              groupStartX = Math.max(0, relativeTarget - group.totalWidth);
+            } else if (stop.val === "center") {
+              groupStartX = Math.max(0, relativeTarget - group.totalWidth / 2);
+            } else {
+              const beforeDecimal = group.beforeDecimalWidth ?? group.totalWidth;
+              groupStartX = Math.max(0, relativeTarget - beforeDecimal);
+            }
+            const rightEdge = stop.val === "end" ? relativeTarget : groupStartX + group.totalWidth;
+            width = Math.max(width, rightEdge);
+            endRun = group.endRun;
+            endChar = group.endChar;
+            lastBreakRun = group.endRun;
+            lastBreakChar = group.endChar;
+            widthAtLastBreak = width;
+            if (group.resumeRun >= runs.length) {
+              didBreakInThisLine = true;
+              break;
+            }
+            if (group.resumeRun > r2) {
+              resumeRun = group.resumeRun;
+              resumeChar = group.resumeChar;
+              r2 = resumeRun - 1;
+              continue;
+            }
+          }
+        }
         endRun = r2;
         endChar = 1;
         lastBreakRun = r2;
@@ -36721,8 +37701,63 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
         continue;
       }
       const text = runText(run);
-      const start2 = r2 === currentRun ? currentChar : 0;
+      const start2 = r2 === currentRun ? currentChar : r2 === resumeRun ? resumeChar : 0;
+      if (r2 === resumeRun) {
+        resumeRun = -1;
+      }
       for (let c2 = start2; c2 < text.length; c2 += 1) {
+        const ch = text[c2];
+        if (ch === "	") {
+          const absCurrentX = width + effectiveIndent;
+          const { target, nextIndex, stop } = getNextTabStopPx$1(absCurrentX, tabStops, tabStopCursor);
+          const maxAbsWidth = effectiveMaxWidth + effectiveIndent;
+          const clampedTarget = Math.min(target, maxAbsWidth);
+          const tabAdvance = Math.max(0, clampedTarget - absCurrentX);
+          width += tabAdvance;
+          tabStopCursor = nextIndex;
+          if (stop && (stop.val === "end" || stop.val === "center" || stop.val === "decimal")) {
+            const group = scanTabAlignmentGroup(runs, r2, c2 + 1, decimalSeparator);
+            if (group.totalWidth > 0) {
+              const relativeTarget = clampedTarget - effectiveIndent;
+              let groupStartX;
+              if (stop.val === "end") {
+                groupStartX = Math.max(0, relativeTarget - group.totalWidth);
+              } else if (stop.val === "center") {
+                groupStartX = Math.max(0, relativeTarget - group.totalWidth / 2);
+              } else {
+                const beforeDecimal = group.beforeDecimalWidth ?? group.totalWidth;
+                groupStartX = Math.max(0, relativeTarget - beforeDecimal);
+              }
+              const rightEdge = stop.val === "end" ? relativeTarget : groupStartX + group.totalWidth;
+              width = Math.max(width, rightEdge);
+              endRun = group.endRun;
+              endChar = group.endChar;
+              lastBreakRun = group.endRun;
+              lastBreakChar = group.endChar;
+              widthAtLastBreak = width;
+              if (group.resumeRun >= runs.length) {
+                didBreakInThisLine = true;
+                break;
+              }
+              if (group.resumeRun > r2) {
+                resumeRun = group.resumeRun;
+                resumeChar = group.resumeChar;
+                r2 = resumeRun - 1;
+                break;
+              }
+              if (group.resumeRun === r2) {
+                c2 = group.resumeChar - 1;
+                continue;
+              }
+            }
+          }
+          endRun = r2;
+          endChar = c2 + 1;
+          lastBreakRun = r2;
+          lastBreakChar = c2 + 1;
+          widthAtLastBreak = width;
+          continue;
+        }
         const w = measureRunSliceWidth(run, c2, c2 + 1);
         if (width + w > effectiveMaxWidth - WIDTH_FUDGE_PX && width > 0) {
           if (lastBreakRun >= 0) {
@@ -36739,7 +37774,6 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
         width += w;
         endRun = r2;
         endChar = c2 + 1;
-        const ch = text[c2];
         if (ch === " " || ch === "	" || ch === "-") {
           lastBreakRun = r2;
           lastBreakChar = c2 + 1;
@@ -36774,6 +37808,13 @@ function remeasureParagraph(block, maxWidth, firstLineIndent = 0) {
       currentChar = 0;
     }
   }
+  const hasTabRun = runs.some((run) => run?.kind === "tab");
+  const hasTextTab = runs.some(
+    (run) => run?.kind === "text" && typeof run.text === "string" && run.text.includes("	")
+  );
+  if (hasTabRun || hasTextTab) {
+    applyTabLayoutToLines(lines, runs, tabStops, decimalSeparator, indentLeft, rawFirstLineOffset);
+  }
   const totalHeight = lines.reduce((s, l) => s + l.lineHeight, 0);
   const marker = wordLayout?.marker;
   const markerInfo = marker ? {
@@ -36932,7 +37973,7 @@ const paragraphBlocksEqual = (a, b2) => {
   for (let i = 0; i < a.runs.length; i += 1) {
     const runA = a.runs[i];
     const runB = b2.runs[i];
-    if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || ("fontSize" in runA ? runA.fontSize : void 0) !== ("fontSize" in runB ? runB.fontSize : void 0) || ("fontFamily" in runA ? runA.fontFamily : void 0) !== ("fontFamily" in runB ? runB.fontFamily : void 0) || ("highlight" in runA ? runA.highlight : void 0) !== ("highlight" in runB ? runB.highlight : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB) || getCommentKey(runA) !== getCommentKey(runB)) {
+    if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || fieldAnnotationKey(runA) !== fieldAnnotationKey(runB) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || ("fontSize" in runA ? runA.fontSize : void 0) !== ("fontSize" in runB ? runB.fontSize : void 0) || ("fontFamily" in runA ? runA.fontFamily : void 0) !== ("fontFamily" in runB ? runB.fontFamily : void 0) || ("highlight" in runA ? runA.highlight : void 0) !== ("highlight" in runB ? runB.highlight : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB) || getCommentKey(runA) !== getCommentKey(runB)) {
       return false;
     }
   }
@@ -41972,18 +43013,29 @@ function setupInternalFieldAnnotationDragHandlers({
       const fieldId = event.data.fieldId;
       if (fieldId) {
         const targetPos = event.pmPosition;
+        const pmStart = event.data.pmStart;
         let sourceStart = null;
         let sourceEnd = null;
         let sourceNode = null;
-        state.doc.descendants((node, pos) => {
-          if (node.type.name === "fieldAnnotation" && node.attrs.fieldId === fieldId) {
-            sourceStart = pos;
-            sourceEnd = pos + node.nodeSize;
-            sourceNode = node;
-            return false;
+        if (pmStart != null) {
+          const nodeAt = state.doc.nodeAt(pmStart);
+          if (nodeAt?.type?.name === "fieldAnnotation") {
+            sourceStart = pmStart;
+            sourceEnd = pmStart + nodeAt.nodeSize;
+            sourceNode = nodeAt;
           }
-          return true;
-        });
+        }
+        if (sourceStart == null || sourceEnd == null || !sourceNode) {
+          state.doc.descendants((node, pos) => {
+            if (node.type.name === "fieldAnnotation" && node.attrs.fieldId === fieldId) {
+              sourceStart = pos;
+              sourceEnd = pos + node.nodeSize;
+              sourceNode = node;
+              return false;
+            }
+            return true;
+          });
+        }
         if (sourceStart === null || sourceEnd === null || !sourceNode) {
           return;
         }
@@ -42299,7 +43351,7 @@ function getSectPrFromNode(node) {
   return isSectPrElement(sectPr) ? sectPr : null;
 }
 function createSectionBreakBlock(section, blockIdGen, extraAttrs) {
-  const result = {
+  return {
     kind: "sectionBreak",
     id: blockIdGen("sectionBreak"),
     margins: section.margins ?? { header: 0, footer: 0 },
@@ -42317,7 +43369,6 @@ function createSectionBreakBlock(section, blockIdGen, extraAttrs) {
     ...section.footerRefs && { footerRefs: section.footerRefs },
     ...section.vAlign && { vAlign: section.vAlign }
   };
-  return result;
 }
 function shouldRequirePageBoundary(current, next) {
   if (!next) return false;
@@ -42353,14 +43404,33 @@ function shouldIgnoreSectionBreak(paragraph, index2, total, hasBodySectPr) {
 function findParagraphsWithSectPr(doc2) {
   const paragraphs = [];
   let paragraphIndex = 0;
+  const getNodeChildren = (node) => {
+    if (Array.isArray(node.content)) return node.content;
+    const content = node.content;
+    if (content && typeof content.forEach === "function") {
+      const children = [];
+      content.forEach((child) => {
+        children.push(child);
+      });
+      return children;
+    }
+    return [];
+  };
+  const visitNode = (node) => {
+    if (node.type === "paragraph") {
+      if (hasSectPr(node)) {
+        paragraphs.push({ index: paragraphIndex, node });
+      }
+      paragraphIndex++;
+      return;
+    }
+    if (node.type === "index") {
+      getNodeChildren(node).forEach(visitNode);
+    }
+  };
   if (doc2.content) {
     for (const node of doc2.content) {
-      if (node.type === "paragraph") {
-        if (hasSectPr(node)) {
-          paragraphs.push({ index: paragraphIndex, node });
-        }
-        paragraphIndex++;
-      }
+      visitNode(node);
     }
   }
   return { paragraphs, totalCount: paragraphIndex };
@@ -42405,7 +43475,9 @@ function buildSectionRangesFromParagraphs(paragraphs, hasBodySectPr) {
   return ranges;
 }
 function publishSectionMetadata(sectionRanges, options) {
-  if (!options?.sectionMetadata) return;
+  if (!options?.sectionMetadata) {
+    return;
+  }
   options.sectionMetadata.length = 0;
   sectionRanges.forEach((section) => {
     options.sectionMetadata?.push({
@@ -42413,7 +43485,8 @@ function publishSectionMetadata(sectionRanges, options) {
       headerRefs: section.headerRefs,
       footerRefs: section.footerRefs,
       numbering: section.numbering,
-      titlePg: section.titlePg
+      titlePg: section.titlePg,
+      vAlign: section.vAlign
     });
   });
 }
@@ -42506,6 +43579,8 @@ const ATOMIC_INLINE_TYPES = /* @__PURE__ */ new Set([
   "lineBreak",
   "page-number",
   "total-page-number",
+  "indexEntry",
+  "tab",
   "footnoteReference",
   "passthroughInline",
   "bookmarkEnd"
@@ -43117,6 +44192,26 @@ function normalizeTextInsets(value) {
   return { top: top2, right: right2, bottom: bottom2, left: left2 };
 }
 const OOXML_Z_INDEX_BASE = 251658240;
+const asOoxmlElement = (value) => {
+  if (!value || typeof value !== "object") return void 0;
+  const element = value;
+  if (element.name == null && element.attributes == null && element.elements == null) return void 0;
+  return element;
+};
+const findOoxmlChild = (parent, name) => {
+  return parent?.elements?.find((child) => child?.name === name);
+};
+const getOoxmlAttribute = (element, key2) => {
+  if (!element?.attributes) return void 0;
+  const attrs = element.attributes;
+  return attrs[key2] ?? attrs[key2.startsWith("w:") ? key2.slice(2) : `w:${key2}`];
+};
+const parseOoxmlNumber = (value) => {
+  if (value == null) return void 0;
+  const num = typeof value === "number" ? value : Number.parseInt(String(value), 10);
+  return Number.isFinite(num) ? num : void 0;
+};
+const hasOwnProperty$d = (obj, key2) => Object.prototype.hasOwnProperty.call(obj, key2);
 function normalizeZIndex(originalAttributes) {
   if (!isPlainObject$2(originalAttributes)) return void 0;
   const relativeHeight = originalAttributes.relativeHeight;
@@ -45117,24 +46212,47 @@ const DEFAULT_DECIMAL_SEPARATOR$2 = ".";
 const isValidNumberingId = (numId) => {
   return numId != null && numId !== 0 && numId !== "0";
 };
-const asOoxmlElement = (value) => {
-  if (!value || typeof value !== "object") return void 0;
-  const element = value;
-  if (element.name == null && element.attributes == null && element.elements == null) return void 0;
-  return element;
-};
-const findChild = (parent, name) => {
-  return parent?.elements?.find((child) => child?.name === name);
+const extractSpacingExplicitFromObject = (value) => {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+  const obj = value;
+  const explicit = {};
+  if (hasOwnProperty$d(obj, "before") || hasOwnProperty$d(obj, "lineSpaceBefore") || hasOwnProperty$d(obj, "beforeAutospacing") || hasOwnProperty$d(obj, "beforeAutoSpacing")) {
+    explicit.before = true;
+  }
+  if (hasOwnProperty$d(obj, "after") || hasOwnProperty$d(obj, "lineSpaceAfter") || hasOwnProperty$d(obj, "afterAutospacing") || hasOwnProperty$d(obj, "afterAutoSpacing")) {
+    explicit.after = true;
+  }
+  if (hasOwnProperty$d(obj, "line") || hasOwnProperty$d(obj, "lineRule")) {
+    explicit.line = true;
+  }
+  return explicit;
 };
-const getAttribute = (element, key2) => {
-  if (!element?.attributes) return void 0;
-  const attrs = element.attributes;
-  return attrs[key2] ?? attrs[key2.startsWith("w:") ? key2.slice(2) : `w:${key2}`];
+const extractSpacingExplicitFromOoxml = (value) => {
+  const element = asOoxmlElement(value);
+  if (!element) return {};
+  const pPr = element.name === "w:pPr" ? element : findOoxmlChild(element, "w:pPr");
+  const spacingEl = findOoxmlChild(pPr, "w:spacing");
+  if (!spacingEl) return {};
+  const explicit = {};
+  if (getOoxmlAttribute(spacingEl, "w:before") != null || getOoxmlAttribute(spacingEl, "w:beforeAutospacing") != null || getOoxmlAttribute(spacingEl, "w:beforeAutoSpacing") != null) {
+    explicit.before = true;
+  }
+  if (getOoxmlAttribute(spacingEl, "w:after") != null || getOoxmlAttribute(spacingEl, "w:afterAutospacing") != null || getOoxmlAttribute(spacingEl, "w:afterAutoSpacing") != null) {
+    explicit.after = true;
+  }
+  if (getOoxmlAttribute(spacingEl, "w:line") != null || getOoxmlAttribute(spacingEl, "w:lineRule") != null) {
+    explicit.line = true;
+  }
+  return explicit;
 };
-const parseNumberAttr = (value) => {
-  if (value == null) return void 0;
-  const num = typeof value === "number" ? value : Number.parseInt(String(value), 10);
-  return Number.isFinite(num) ? num : void 0;
+const mergeSpacingExplicit = (...sources) => {
+  const merged = {};
+  for (const source of sources) {
+    if (source.before) merged.before = true;
+    if (source.after) merged.after = true;
+    if (source.line) merged.line = true;
+  }
+  return merged;
 };
 const mergeSpacingSources = (base2, paragraphProps, attrs) => {
   const isObject2 = (v) => v !== null && typeof v === "object";
@@ -45180,13 +46298,13 @@ const normalizeJustification = (value) => {
   return void 0;
 };
 const extractIndentFromLevel = (lvl) => {
-  const pPr = findChild(lvl, "w:pPr");
-  const ind = findChild(pPr, "w:ind");
+  const pPr = findOoxmlChild(lvl, "w:pPr");
+  const ind = findOoxmlChild(pPr, "w:ind");
   if (!ind) return void 0;
-  const left2 = parseNumberAttr(getAttribute(ind, "w:left"));
-  const right2 = parseNumberAttr(getAttribute(ind, "w:right"));
-  const firstLine = parseNumberAttr(getAttribute(ind, "w:firstLine"));
-  const hanging = parseNumberAttr(getAttribute(ind, "w:hanging"));
+  const left2 = parseOoxmlNumber(getOoxmlAttribute(ind, "w:left"));
+  const right2 = parseOoxmlNumber(getOoxmlAttribute(ind, "w:right"));
+  const firstLine = parseOoxmlNumber(getOoxmlAttribute(ind, "w:firstLine"));
+  const hanging = parseOoxmlNumber(getOoxmlAttribute(ind, "w:hanging"));
   const indent = {};
   if (left2 != null) indent.left = left2;
   if (right2 != null) indent.right = right2;
@@ -45202,31 +46320,31 @@ const normalizeColor = (value) => {
   return `#${upper.toUpperCase()}`;
 };
 const extractMarkerRun = (lvl) => {
-  const rPr = findChild(lvl, "w:rPr");
+  const rPr = findOoxmlChild(lvl, "w:rPr");
   if (!rPr) return void 0;
   const run = {};
-  const rFonts = findChild(rPr, "w:rFonts");
-  const font = getAttribute(rFonts, "w:ascii") ?? getAttribute(rFonts, "w:hAnsi") ?? getAttribute(rFonts, "w:eastAsia");
+  const rFonts = findOoxmlChild(rPr, "w:rFonts");
+  const font = getOoxmlAttribute(rFonts, "w:ascii") ?? getOoxmlAttribute(rFonts, "w:hAnsi") ?? getOoxmlAttribute(rFonts, "w:eastAsia");
   if (typeof font === "string" && font.trim()) {
     run.fontFamily = font;
   }
-  const sz = parseNumberAttr(getAttribute(findChild(rPr, "w:sz"), "w:val")) ?? parseNumberAttr(getAttribute(findChild(rPr, "w:szCs"), "w:val"));
+  const sz = parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:sz"), "w:val")) ?? parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:szCs"), "w:val"));
   if (sz != null) {
     run.fontSize = sz / 2;
   }
-  const color = normalizeColor(getAttribute(findChild(rPr, "w:color"), "w:val"));
+  const color = normalizeColor(getOoxmlAttribute(findOoxmlChild(rPr, "w:color"), "w:val"));
   if (color) run.color = color;
-  const boldEl = findChild(rPr, "w:b");
+  const boldEl = findOoxmlChild(rPr, "w:b");
   if (boldEl) {
-    const boldVal = getAttribute(boldEl, "w:val");
+    const boldVal = getOoxmlAttribute(boldEl, "w:val");
     if (boldVal == null || isTruthy(boldVal)) run.bold = true;
   }
-  const italicEl = findChild(rPr, "w:i");
+  const italicEl = findOoxmlChild(rPr, "w:i");
   if (italicEl) {
-    const italicVal = getAttribute(italicEl, "w:val");
+    const italicVal = getOoxmlAttribute(italicEl, "w:val");
     if (italicVal == null || isTruthy(italicVal)) run.italic = true;
   }
-  const spacingTwips = parseNumberAttr(getAttribute(findChild(rPr, "w:spacing"), "w:val"));
+  const spacingTwips = parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:spacing"), "w:val"));
   if (spacingTwips != null && Number.isFinite(spacingTwips)) {
     run.letterSpacing = twipsToPx$1(spacingTwips);
   }
@@ -45234,12 +46352,12 @@ const extractMarkerRun = (lvl) => {
 };
 const findNumFmtElement = (lvl) => {
   if (!lvl) return void 0;
-  const direct = findChild(lvl, "w:numFmt");
+  const direct = findOoxmlChild(lvl, "w:numFmt");
   if (direct) return direct;
-  const alternate = findChild(lvl, "mc:AlternateContent");
-  const choice = findChild(alternate, "mc:Choice");
+  const alternate = findOoxmlChild(lvl, "mc:AlternateContent");
+  const choice = findOoxmlChild(alternate, "mc:Choice");
   if (choice) {
-    return findChild(choice, "w:numFmt");
+    return findOoxmlChild(choice, "w:numFmt");
   }
   return void 0;
 };
@@ -45253,7 +46371,7 @@ const resolveNumberingFromContext = (numId, ilvl, numbering) => {
   if (!numDef) {
     return void 0;
   }
-  const abstractId = getAttribute(findChild(numDef, "w:abstractNumId"), "w:val");
+  const abstractId = getOoxmlAttribute(findOoxmlChild(numDef, "w:abstractNumId"), "w:val");
   if (abstractId == null) {
     return void 0;
   }
@@ -45262,27 +46380,27 @@ const resolveNumberingFromContext = (numId, ilvl, numbering) => {
     return void 0;
   }
   let levelDef = abstract.elements?.find(
-    (el) => el?.name === "w:lvl" && parseNumberAttr(el.attributes?.["w:ilvl"]) === ilvl
+    (el) => el?.name === "w:lvl" && parseOoxmlNumber(el.attributes?.["w:ilvl"]) === ilvl
   );
   const override = numDef.elements?.find(
-    (el) => el?.name === "w:lvlOverride" && parseNumberAttr(el.attributes?.["w:ilvl"]) === ilvl
+    (el) => el?.name === "w:lvlOverride" && parseOoxmlNumber(el.attributes?.["w:ilvl"]) === ilvl
   );
-  const overrideLvl = findChild(override, "w:lvl");
+  const overrideLvl = findOoxmlChild(override, "w:lvl");
   if (overrideLvl) {
     levelDef = overrideLvl;
   }
-  const startOverride = parseNumberAttr(getAttribute(findChild(override, "w:startOverride"), "w:val"));
+  const startOverride = parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(override, "w:startOverride"), "w:val"));
   if (!levelDef) {
     return void 0;
   }
   const numFmtEl = findNumFmtElement(levelDef);
-  const lvlText = getAttribute(findChild(levelDef, "w:lvlText"), "w:val");
-  const start2 = startOverride ?? parseNumberAttr(getAttribute(findChild(levelDef, "w:start"), "w:val"));
-  const suffix2 = normalizeSuffix(getAttribute(findChild(levelDef, "w:suff"), "w:val"));
-  const lvlJc = normalizeJustification(getAttribute(findChild(levelDef, "w:lvlJc"), "w:val"));
+  const lvlText = getOoxmlAttribute(findOoxmlChild(levelDef, "w:lvlText"), "w:val");
+  const start2 = startOverride ?? parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(levelDef, "w:start"), "w:val"));
+  const suffix2 = normalizeSuffix(getOoxmlAttribute(findOoxmlChild(levelDef, "w:suff"), "w:val"));
+  const lvlJc = normalizeJustification(getOoxmlAttribute(findOoxmlChild(levelDef, "w:lvlJc"), "w:val"));
   const indent = extractIndentFromLevel(levelDef);
   const markerRun = extractMarkerRun(levelDef);
-  const numFmt = normalizeNumFmt(getAttribute(numFmtEl, "w:val"));
+  const numFmt = normalizeNumFmt(getOoxmlAttribute(numFmtEl, "w:val"));
   return {
     format: numFmt,
     lvlText,
@@ -45375,6 +46493,7 @@ const cloneParagraphAttrs = (attrs) => {
   if (!attrs) return void 0;
   const clone = { ...attrs };
   if (attrs.spacing) clone.spacing = { ...attrs.spacing };
+  if (attrs.spacingExplicit) clone.spacingExplicit = { ...attrs.spacingExplicit };
   if (attrs.indent) clone.indent = { ...attrs.indent };
   if (attrs.borders) {
     const borderClone = {};
@@ -45750,6 +46869,11 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
   const hydrated = hydrationOverride ?? hydrateParagraphStyleAttrs(para, converterContext);
   const mergedSpacing = mergeSpacingSources(hydrated?.spacing, paragraphProps.spacing, attrs.spacing);
   const normalizedSpacing = normalizeParagraphSpacing(mergedSpacing);
+  const spacingExplicit = mergeSpacingExplicit(
+    extractSpacingExplicitFromObject(paragraphProps.spacing),
+    extractSpacingExplicitFromObject(attrs.spacing),
+    extractSpacingExplicitFromOoxml(paragraphProps)
+  );
   const normalizeIndentObject = (value) => {
     if (!value || typeof value !== "object") return;
     return normalizePxIndent(value) ?? convertIndentTwipsToPx(value);
@@ -45884,6 +47008,7 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
       paragraphAttrs.spacing.afterAutospacing = normalizedSpacing.afterAutospacing;
     }
   }
+  paragraphAttrs.spacingExplicit = spacingExplicit;
   const contextualSpacingValue = normalizedSpacing?.contextualSpacing ?? safeGetProperty(paragraphProps, "contextualSpacing") ?? safeGetProperty(attrs, "contextualSpacing") ?? hydrated?.contextualSpacing;
   if (contextualSpacingValue != null) {
     paragraphAttrs.contextualSpacing = isTruthy(contextualSpacingValue);
@@ -45891,9 +47016,33 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
   const hasExplicitIndent = Boolean(normalizedIndent);
   const hasNumberingIndent = Boolean(computed2.numbering?.indent?.left || computed2.numbering?.indent?.hanging);
   if (hasExplicitIndent || hasNumberingIndent || bidi && adjustRightInd) {
-    const indentPx = indentPtToPx(indent);
-    if (indentPx) {
-      const adjustedIndent = bidi && adjustRightInd ? ensureBidiIndentPx({ ...indentPx }) : indentPx;
+    const styleIndentPx = indentPtToPx(indent);
+    if (styleIndentPx || normalizedIndent) {
+      const mergedIndent = { ...styleIndentPx ?? {} };
+      if (normalizedIndent) {
+        if (normalizedIndent.left !== void 0) {
+          if (normalizedIndent.left === 0) {
+            delete mergedIndent.left;
+          } else {
+            mergedIndent.left = normalizedIndent.left;
+          }
+        }
+        if (normalizedIndent.right !== void 0) {
+          if (normalizedIndent.right === 0) {
+            delete mergedIndent.right;
+          } else {
+            mergedIndent.right = normalizedIndent.right;
+          }
+        }
+        if (normalizedIndent.firstLine !== void 0) mergedIndent.firstLine = normalizedIndent.firstLine;
+        if (normalizedIndent.hanging !== void 0) mergedIndent.hanging = normalizedIndent.hanging;
+        if (normalizedIndent.hanging !== void 0 && normalizedIndent.firstLine === void 0) {
+          delete mergedIndent.firstLine;
+        } else if (normalizedIndent.firstLine !== void 0 && normalizedIndent.hanging === void 0) {
+          delete mergedIndent.hanging;
+        }
+      }
+      const adjustedIndent = bidi && adjustRightInd ? ensureBidiIndentPx({ ...mergedIndent }) : mergedIndent;
       const finalIndent = bidi && adjustRightInd ? mirrorIndentForRtl({ ...adjustedIndent }) : adjustedIndent;
       paragraphAttrs.indent = finalIndent;
     } else if (bidi && adjustRightInd) {
@@ -46346,6 +47495,79 @@ function handleTableOfContentsNode(node, context) {
     }
   });
 }
+const getIndexChildren = (node) => {
+  if (Array.isArray(node.content)) return node.content;
+  const content = node.content;
+  if (content && typeof content.forEach === "function") {
+    const children = [];
+    content.forEach((child) => {
+      children.push(child);
+    });
+    return children;
+  }
+  return [];
+};
+function handleIndexNode(node, context) {
+  const children = getIndexChildren(node);
+  if (children.length === 0) return;
+  const {
+    blocks,
+    recordBlockKind,
+    nextBlockId,
+    positions,
+    defaultFont,
+    defaultSize,
+    styleContext,
+    listCounterContext,
+    trackedChangesConfig,
+    bookmarks,
+    hyperlinkConfig,
+    sectionState,
+    converters
+  } = context;
+  const paragraphToFlowBlocks2 = converters?.paragraphToFlowBlocks;
+  if (!paragraphToFlowBlocks2) {
+    return;
+  }
+  const { getListCounter, incrementListCounter, resetListCounter } = listCounterContext;
+  children.forEach((child) => {
+    if (child.type !== "paragraph") {
+      return;
+    }
+    if (sectionState?.ranges?.length > 0) {
+      const nextSection = sectionState.ranges[sectionState.currentSectionIndex + 1];
+      if (nextSection && sectionState.currentParagraphIndex === nextSection.startParagraphIndex) {
+        const currentSection = sectionState.ranges[sectionState.currentSectionIndex];
+        const requiresPageBoundary = shouldRequirePageBoundary(currentSection, nextSection) || hasIntrinsicBoundarySignals();
+        const extraAttrs = requiresPageBoundary ? { requirePageBoundary: true } : void 0;
+        const sectionBreak = createSectionBreakBlock(nextSection, nextBlockId, extraAttrs);
+        blocks.push(sectionBreak);
+        recordBlockKind(sectionBreak.kind);
+        sectionState.currentSectionIndex++;
+      }
+    }
+    const paragraphBlocks = paragraphToFlowBlocks2(
+      child,
+      nextBlockId,
+      positions,
+      defaultFont,
+      defaultSize,
+      styleContext,
+      { getListCounter, incrementListCounter, resetListCounter },
+      trackedChangesConfig,
+      bookmarks,
+      hyperlinkConfig,
+      void 0,
+      // themeColors - not available in NodeHandlerContext
+      context.converterContext
+    );
+    paragraphBlocks.forEach((block) => {
+      blocks.push(block);
+      recordBlockKind(block.kind);
+    });
+    sectionState.currentParagraphIndex++;
+  });
+}
 function handleStructuredContentBlockNode(node, context) {
   if (!Array.isArray(node.content)) return;
   const {
@@ -47253,7 +48475,10 @@ function fieldAnnotationNodeToRun(node, positions, fieldMetadata) {
   }
   return run;
 }
-const isTextRun = (run) => run.kind !== "tab";
+const isTextRun = (run) => {
+  const kind = run.kind;
+  return (kind === void 0 || kind === "text") && "text" in run;
+};
 const dataAttrsCompatible = (a, b2) => {
   const aAttrs = a.dataAttrs;
   const bAttrs = b2.dataAttrs;
@@ -47362,6 +48587,75 @@ const extractFirstTextRunFont = (para) => {
   const font = findFirstTextFont(para.content);
   return font;
 };
+const resolveRunFontFamily = (fontFamily2, docx) => {
+  if (typeof fontFamily2 === "string" && fontFamily2.trim().length > 0) {
+    return fontFamily2;
+  }
+  if (!fontFamily2 || typeof fontFamily2 !== "object") return void 0;
+  const toCssFontFamily2 = SuperConverter.toCssFontFamily;
+  const resolved = resolveDocxFontFamily(fontFamily2, docx ?? null, toCssFontFamily2);
+  return resolved ?? void 0;
+};
+const parseRunFontSizePx = (fontSize2) => {
+  if (typeof fontSize2 === "number" && Number.isFinite(fontSize2)) {
+    return ptToPx(fontSize2 / HALF_POINTS_PER_POINT) ?? void 0;
+  }
+  if (typeof fontSize2 === "string") {
+    const numeric = Number.parseFloat(fontSize2);
+    if (!Number.isFinite(numeric)) return void 0;
+    if (fontSize2.endsWith("pt")) {
+      return ptToPx(numeric);
+    }
+    if (fontSize2.endsWith("px")) {
+      return numeric;
+    }
+    return ptToPx(numeric / HALF_POINTS_PER_POINT) ?? void 0;
+  }
+  return void 0;
+};
+const extractParagraphMarkRunProps = (paragraphProps) => {
+  const directRunProps = paragraphProps.runProperties;
+  const directRunPropsElement = asOoxmlElement(directRunProps);
+  if (directRunProps && isPlainObject$2(directRunProps) && !directRunPropsElement) {
+    return directRunProps;
+  }
+  const element = asOoxmlElement(paragraphProps);
+  const pPr = element ? element.name === "w:pPr" ? element : findOoxmlChild(element, "w:pPr") : void 0;
+  const rPr = directRunPropsElement?.name === "w:rPr" ? directRunPropsElement : findOoxmlChild(pPr, "w:rPr");
+  if (!rPr) return void 0;
+  const runProps = {};
+  const sz = parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:sz"), "w:val")) ?? parseOoxmlNumber(getOoxmlAttribute(findOoxmlChild(rPr, "w:szCs"), "w:val"));
+  if (sz != null) {
+    runProps.fontSize = sz;
+  }
+  const rFonts = findOoxmlChild(rPr, "w:rFonts");
+  if (rFonts) {
+    const fontFamily2 = {};
+    const keys2 = ["ascii", "hAnsi", "eastAsia", "cs", "val", "asciiTheme", "hAnsiTheme", "eastAsiaTheme", "cstheme"];
+    for (const key2 of keys2) {
+      const value = getOoxmlAttribute(rFonts, `w:${key2}`);
+      if (value != null) {
+        fontFamily2[key2] = value;
+      }
+    }
+    if (Object.keys(fontFamily2).length > 0) {
+      runProps.fontFamily = fontFamily2;
+    }
+  }
+  return Object.keys(runProps).length > 0 ? runProps : void 0;
+};
+const applyParagraphMarkRunProps = (run, paragraphProps, converterContext) => {
+  const runProps = extractParagraphMarkRunProps(paragraphProps);
+  if (!runProps) return;
+  const fontSizePx = parseRunFontSizePx(runProps.fontSize);
+  if (fontSizePx != null) {
+    run.fontSize = fontSizePx;
+  }
+  const fontFamily2 = resolveRunFontFamily(runProps.fontFamily, converterContext?.docx);
+  if (fontFamily2) {
+    run.fontFamily = fontFamily2;
+  }
+};
 const applyBaseRunDefaults = (run, defaults, uiDisplayFallbackFont, fallbackSize) => {
   if (!run) return;
   if (defaults.fontFamily && run.fontFamily === uiDisplayFallbackFont) {
@@ -47452,6 +48746,13 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
     converterContext,
     paragraphHydration
   );
+  if (paragraphAttrs && (!Array.isArray(paragraphAttrs.tabs) || paragraphAttrs.tabs.length === 0)) {
+    const rawTabs = para.attrs?.tabs ?? para.attrs?.tabStops ?? paragraphProps.tabStops ?? paragraphProps.tabs;
+    const normalizedTabs = normalizeOoxmlTabs(rawTabs);
+    if (normalizedTabs && normalizedTabs.length > 0) {
+      paragraphAttrs.tabs = normalizedTabs;
+    }
+  }
   if (paragraphAttrs?.spacing) {
     const spacing = { ...paragraphAttrs.spacing };
     const effectiveFontSize = baseRunDefaults.fontSizePx ?? defaultSize;
@@ -47511,6 +48812,8 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
       emptyRun.pmStart = paraPos.start + 1;
       emptyRun.pmEnd = paraPos.start + 1;
     }
+    applyBaseRunDefaults(emptyRun, baseRunDefaults, defaultFont, defaultSize);
+    applyParagraphMarkRunProps(emptyRun, paragraphProps, converterContext);
     let emptyParagraphAttrs = cloneParagraphAttrs(paragraphAttrs);
     if (isSectPrMarker) {
       if (emptyParagraphAttrs) {
@@ -49013,6 +50316,7 @@ const DEFAULT_DECIMAL_SEPARATOR$1 = ".";
 const nodeHandlers = {
   paragraph: handleParagraphNode,
   tableOfContents: handleTableOfContentsNode,
+  index: handleIndexNode,
   structuredContentBlock: handleStructuredContentBlockNode,
   documentSection: handleDocumentSectionNode,
   table: handleTableNode,
@@ -50898,7 +52202,6 @@ function measureText(text, font, ctx2, _fontFamily, _letterSpacing) {
   const paintedWidth = (metrics.actualBoundingBoxLeft || 0) + (metrics.actualBoundingBoxRight || 0);
   return Math.max(advanceWidth, paintedWidth);
 }
-const MIN_SINGLE_LINE_PX = 12 * 96 / 72;
 const WORD_SINGLE_LINE_SPACING_MULTIPLIER = 1.15;
 function calculateTypographyMetrics(fontSize2, spacing, fontInfo) {
   let ascent;
@@ -50912,7 +52215,27 @@ function calculateTypographyMetrics(fontSize2, spacing, fontInfo) {
     ascent = roundValue(fontSize2 * 0.8);
     descent = roundValue(fontSize2 * 0.2);
   }
-  const baseLineHeight = Math.max(fontSize2 * WORD_SINGLE_LINE_SPACING_MULTIPLIER, ascent + descent, MIN_SINGLE_LINE_PX);
+  const baseLineHeight = Math.max(fontSize2 * WORD_SINGLE_LINE_SPACING_MULTIPLIER, ascent + descent);
+  const lineHeight2 = roundValue(resolveLineHeight(spacing, baseLineHeight));
+  return {
+    ascent,
+    descent,
+    lineHeight: lineHeight2
+  };
+}
+function calculateEmptyParagraphMetrics(fontSize2, spacing, fontInfo) {
+  let ascent;
+  let descent;
+  if (fontInfo) {
+    const ctx2 = getCanvasContext();
+    const metrics = getFontMetrics(ctx2, fontInfo);
+    ascent = roundValue(metrics.ascent);
+    descent = roundValue(metrics.descent);
+  } else {
+    ascent = roundValue(fontSize2 * 0.8);
+    descent = roundValue(fontSize2 * 0.2);
+  }
+  const baseLineHeight = Math.max(fontSize2, ascent + descent);
   const lineHeight2 = roundValue(resolveLineHeight(spacing, baseLineHeight));
   return {
     ascent,
@@ -50943,6 +52266,10 @@ function isImageRun(run) {
 function isLineBreakRun(run) {
   return run.kind === "lineBreak";
 }
+const isEmptyTextRun = (run) => {
+  if (run.kind && run.kind !== "text") return false;
+  return typeof run.text === "string" && run.text.length === 0;
+};
 function isFieldAnnotationRun(run) {
   return run.kind === "fieldAnnotation";
 }
@@ -51112,8 +52439,28 @@ async function measureParagraphBlock(block, maxWidth) {
       dropCapDescriptor.measuredHeight = dropCapMeasured.height;
     }
   }
+  const emptyParagraphRun = block.runs.length === 1 && isEmptyTextRun(block.runs[0]) ? block.runs[0] : null;
+  if (emptyParagraphRun) {
+    const fontSize2 = emptyParagraphRun.fontSize ?? 12;
+    const metrics = calculateEmptyParagraphMetrics(fontSize2, spacing, getFontInfoFromRun(emptyParagraphRun));
+    const emptyLine = {
+      fromRun: 0,
+      fromChar: 0,
+      toRun: 0,
+      toChar: 0,
+      width: 0,
+      ...metrics
+    };
+    addBarTabsToLine(emptyLine);
+    lines.push(emptyLine);
+    return {
+      kind: "paragraph",
+      lines,
+      totalHeight: metrics.lineHeight
+    };
+  }
   if (block.runs.length === 0) {
-    const metrics = calculateTypographyMetrics(12, spacing);
+    const metrics = calculateEmptyParagraphMetrics(12, spacing);
     const emptyLine = {
       fromRun: 0,
       fromChar: 0,
@@ -51130,6 +52477,11 @@ async function measureParagraphBlock(block, maxWidth) {
       totalHeight: metrics.lineHeight
     };
   }
+  const firstTextRunWithSize = block.runs.find(
+    (run) => "text" in run && "fontSize" in run && typeof run.fontSize === "number"
+  );
+  const fallbackFontSize = firstTextRunWithSize?.fontSize ?? 12;
+  const fallbackFontInfo = firstTextRunWithSize ? getFontInfoFromRun(firstTextRunWithSize) : void 0;
   let currentLine = null;
   const getEffectiveWidth = (baseWidth) => {
     if (dropCapMeasure && lines.length < dropCapMeasure.lines && dropCapMeasure.mode === "drop") {
@@ -51137,7 +52489,8 @@ async function measureParagraphBlock(block, maxWidth) {
     }
     return baseWidth;
   };
-  let lastFontSize = 12;
+  let lastFontSize = fallbackFontSize;
+  let hasSeenTextRun = false;
   let tabStopCursor = 0;
   let pendingTabAlignment = null;
   let pendingRunSpacing = 0;
@@ -51262,11 +52615,7 @@ async function measureParagraphBlock(block, maxWidth) {
         lines.push(completedLine);
         currentLine = null;
       } else {
-        const textRunWithSize = block.runs.find(
-          (r2) => r2.kind !== "tab" && r2.kind !== "lineBreak" && r2.kind !== "break" && !("src" in r2) && "fontSize" in r2
-        );
-        const fallbackSize = textRunWithSize?.fontSize ?? 12;
-        const metrics = calculateTypographyMetrics(fallbackSize, spacing);
+        const metrics = calculateTypographyMetrics(fallbackFontSize, spacing, fallbackFontInfo);
         const emptyLine = {
           fromRun: runIndex,
           fromChar: 0,
@@ -51286,6 +52635,7 @@ async function measureParagraphBlock(block, maxWidth) {
       continue;
     }
     if (isLineBreakRun(run)) {
+      const lineBreakFontInfo = hasSeenTextRun ? void 0 : fallbackFontInfo;
       if (currentLine) {
         const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
         const completedLine = {
@@ -51295,7 +52645,7 @@ async function measureParagraphBlock(block, maxWidth) {
         addBarTabsToLine(completedLine);
         lines.push(completedLine);
       } else {
-        const metrics = calculateTypographyMetrics(lastFontSize, spacing);
+        const metrics = calculateTypographyMetrics(lastFontSize, spacing, lineBreakFontInfo);
         const emptyLine = {
           fromRun: runIndex,
           fromChar: 0,
@@ -51318,6 +52668,7 @@ async function measureParagraphBlock(block, maxWidth) {
         toChar: 0,
         width: 0,
         maxFontSize: lastFontSize,
+        maxFontInfo: lineBreakFontInfo,
         maxWidth: nextLineMaxWidth,
         segments: [],
         spaceCount: 0
@@ -51510,8 +52861,21 @@ async function measureParagraphBlock(block, maxWidth) {
       const annotationFont = `${fontStyle} ${fontWeight} ${annotationFontSize}px ${annotationFontFamily}`;
       ctx2.font = annotationFont;
       const textWidth = displayText ? ctx2.measureText(displayText).width : 0;
-      const annotationWidth = textWidth + FIELD_ANNOTATION_PILL_PADDING;
-      const annotationHeight = annotationFontSize * FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER + FIELD_ANNOTATION_VERTICAL_PADDING;
+      const annotationHorizontalPadding = run.highlighted === false ? 0 : FIELD_ANNOTATION_PILL_PADDING;
+      const annotationVerticalPadding = run.highlighted === false ? 0 : FIELD_ANNOTATION_VERTICAL_PADDING;
+      const annotationWidth = textWidth + annotationHorizontalPadding;
+      let annotationHeight = annotationFontSize * FIELD_ANNOTATION_LINE_HEIGHT_MULTIPLIER + annotationVerticalPadding;
+      if (run.variant === "signature" && run.imageSrc) {
+        const signatureHeight = 28 + annotationVerticalPadding;
+        annotationHeight = Math.max(annotationHeight, signatureHeight);
+      }
+      if (run.variant === "image" && run.imageSrc && run.size?.height) {
+        const imageHeight = run.size.height + annotationVerticalPadding;
+        annotationHeight = Math.max(annotationHeight, imageHeight);
+      }
+      if (run.variant === "html" && run.size?.height) {
+        annotationHeight = Math.max(annotationHeight, run.size.height);
+      }
       let annotationStartX;
       if (pendingTabAlignment && currentLine) {
         annotationStartX = alignPendingTabForWidth(annotationWidth);
@@ -51598,6 +52962,7 @@ async function measureParagraphBlock(block, maxWidth) {
       continue;
     }
     lastFontSize = run.fontSize;
+    hasSeenTextRun = true;
     const { font } = buildFontString(run);
     const tabSegments = run.text.split("	");
     let charPosInRun = 0;
@@ -51708,7 +53073,10 @@ async function measureParagraphBlock(block, maxWidth) {
               trimTrailingWrapSpaces(currentLine);
               const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
               const lineBase = currentLine;
-              const completedLine = { ...lineBase, ...metrics };
+              const completedLine = {
+                ...lineBase,
+                ...metrics
+              };
               addBarTabsToLine(completedLine);
               lines.push(completedLine);
               tabStopCursor = 0;
@@ -51765,7 +53133,10 @@ async function measureParagraphBlock(block, maxWidth) {
             trimTrailingWrapSpaces(currentLine);
             const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
             const lineBase = currentLine;
-            const completedLine = { ...lineBase, ...metrics };
+            const completedLine = {
+              ...lineBase,
+              ...metrics
+            };
             addBarTabsToLine(completedLine);
             lines.push(completedLine);
             tabStopCursor = 0;
@@ -51810,7 +53181,10 @@ async function measureParagraphBlock(block, maxWidth) {
                 trimTrailingWrapSpaces(currentLine);
                 const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
                 const lineBase = currentLine;
-                const completedLine = { ...lineBase, ...metrics };
+                const completedLine = {
+                  ...lineBase,
+                  ...metrics
+                };
                 addBarTabsToLine(completedLine);
                 lines.push(completedLine);
                 tabStopCursor = 0;
@@ -52256,6 +53630,10 @@ async function measureTableBlock(block, constraints) {
         const measure = await measureBlock(block2, { maxWidth: contentWidth, maxHeight: Infinity });
         blockMeasures.push(measure);
         const blockHeight = "totalHeight" in measure ? measure.totalHeight : "height" in measure ? measure.height : 0;
+        const isAnchoredOutOfFlow = (block2.kind === "image" || block2.kind === "drawing") && block2.anchor?.isAnchored === true && (block2.wrap?.type ?? "Inline") !== "Inline";
+        if (isAnchoredOutOfFlow) {
+          continue;
+        }
         contentHeight += blockHeight;
         if (block2.kind === "paragraph") {
           const spacingAfter = block2.attrs?.spacing?.after;
@@ -52825,6 +54203,9 @@ class PresentationEditor extends EventEmitter {
   #remoteCursorUpdateScheduled = false;
   #epochMapper = new EpochPositionMapper();
   #layoutEpoch = 0;
+  #htmlAnnotationHeights = /* @__PURE__ */ new Map();
+  #htmlAnnotationMeasureEpoch = -1;
+  #htmlAnnotationMeasureAttempts = 0;
   #domPositionIndex = new DomPositionIndex();
   #domIndexObserverManager = null;
   #debugLastPointer = null;
@@ -56083,6 +57464,7 @@ class PresentationEditor extends EventEmitter {
         this.#handleLayoutError("render", new Error("toFlowBlocks returned undefined blocks"));
         return;
       }
+      this.#applyHtmlAnnotationMeasurements(blocks);
       const baseLayoutOptions = this.#resolveLayoutOptions(blocks, sectionMetadata);
       const footnotesLayoutInput = this.#buildFootnotesLayoutInput({
         converterContext,
@@ -56201,6 +57583,10 @@ class PresentationEditor extends EventEmitter {
       this.#rebuildDomPositionIndex();
       this.#domIndexObserverManager?.resume();
       this.#layoutEpoch = layoutEpoch;
+      if (this.#updateHtmlAnnotationMeasurements(layoutEpoch)) {
+        this.#pendingDocChange = true;
+        this.#scheduleRerender();
+      }
       this.#epochMapper.onLayoutComplete(layoutEpoch);
       this.#selectionSync.onLayoutComplete(layoutEpoch);
       layoutCompleted = true;
@@ -56250,6 +57636,68 @@ class PresentationEditor extends EventEmitter {
     }
     return this.#domPainter;
   }
+  #applyHtmlAnnotationMeasurements(blocks) {
+    if (this.#htmlAnnotationHeights.size === 0) return;
+    blocks.forEach((block) => {
+      if (block.kind !== "paragraph") return;
+      block.runs.forEach((run) => {
+        if (run.kind !== "fieldAnnotation" || run.variant !== "html") {
+          return;
+        }
+        if (run.pmStart == null || run.pmEnd == null) {
+          return;
+        }
+        const key2 = `${run.pmStart}-${run.pmEnd}`;
+        const height = this.#htmlAnnotationHeights.get(key2);
+        if (!height || height <= 0) {
+          return;
+        }
+        const currentSize = run.size ?? {};
+        if (currentSize.height === height) {
+          return;
+        }
+        run.size = { ...currentSize, height };
+      });
+    });
+  }
+  #updateHtmlAnnotationMeasurements(layoutEpoch) {
+    const nextHeights = new Map(this.#htmlAnnotationHeights);
+    const annotations = this.#painterHost.querySelectorAll('.annotation[data-type="html"]');
+    const threshold = 1;
+    let changed = false;
+    annotations.forEach((annotation) => {
+      const element = annotation;
+      const pmStart = element.dataset.pmStart;
+      const pmEnd = element.dataset.pmEnd;
+      if (!pmStart || !pmEnd) {
+        return;
+      }
+      const height = element.offsetHeight;
+      if (height <= 0) {
+        return;
+      }
+      const key2 = `${pmStart}-${pmEnd}`;
+      const prev = nextHeights.get(key2);
+      if (prev != null && Math.abs(prev - height) <= threshold) {
+        return;
+      }
+      nextHeights.set(key2, height);
+      changed = true;
+    });
+    if (layoutEpoch !== this.#htmlAnnotationMeasureEpoch) {
+      this.#htmlAnnotationMeasureEpoch = layoutEpoch;
+      this.#htmlAnnotationMeasureAttempts = 0;
+    }
+    this.#htmlAnnotationHeights = nextHeights;
+    if (!changed) {
+      return false;
+    }
+    if (this.#htmlAnnotationMeasureAttempts >= 2) {
+      return false;
+    }
+    this.#htmlAnnotationMeasureAttempts += 1;
+    return true;
+  }
   /**
    * Requests a local selection overlay update.
    *
@@ -68979,6 +70427,55 @@ const TableOfContents = Node$1.create({
     };
   }
 });
+const DocumentIndex = Node$1.create({
+  name: "index",
+  group: "block",
+  content: "paragraph+",
+  inline: false,
+  addOptions() {
+    return {
+      htmlAttributes: {
+        "data-id": "document-index",
+        "aria-label": "Index"
+      }
+    };
+  },
+  parseDOM() {
+    return [
+      {
+        tag: 'div[data-id="document-index"]'
+      }
+    ];
+  },
+  renderDOM({ htmlAttributes }) {
+    return ["div", Attribute.mergeAttributes(this.options.htmlAttributes, htmlAttributes), 0];
+  },
+  addAttributes() {
+    return {
+      instruction: {
+        default: null,
+        rendered: false
+      },
+      instructionTokens: {
+        default: null,
+        rendered: false
+      },
+      /**
+       * @private
+       * @category Attribute
+       * @param {string} [sdBlockId] - Internal block tracking ID (not user-configurable)
+       */
+      sdBlockId: {
+        default: null,
+        keepOnSplit: false,
+        parseDOM: (elem) => elem.getAttribute("data-sd-block-id"),
+        renderDOM: (attrs) => {
+          return attrs.sdBlockId ? { "data-sd-block-id": attrs.sdBlockId } : {};
+        }
+      }
+    };
+  }
+});
 function createGradient(gradientData, gradientId) {
   const { gradientType, stops, angle } = gradientData;
   if (!stops || stops.length === 0) {
@@ -69015,7 +70512,8 @@ function createGradient(gradientData, gradientId) {
   });
   return gradient;
 }
-function createTextElement(textContent2, textAlign, width, height) {
+function createTextElement(textContent2, textAlign, width, height, options = {}) {
+  const { textInsets, textVerticalAlign, pageNumber, totalPages } = options;
   const foreignObject = document.createElementNS("http://www.w3.org/2000/svg", "foreignObject");
   foreignObject.setAttribute("x", "0");
   foreignObject.setAttribute("y", "0");
@@ -69026,8 +70524,19 @@ function createTextElement(textContent2, textAlign, width, height) {
   div2.style.height = "100%";
   div2.style.display = "flex";
   div2.style.flexDirection = "column";
-  div2.style.justifyContent = "center";
-  div2.style.padding = "10px";
+  const verticalAlign = textVerticalAlign || "center";
+  if (verticalAlign === "top") {
+    div2.style.justifyContent = "flex-start";
+  } else if (verticalAlign === "bottom") {
+    div2.style.justifyContent = "flex-end";
+  } else {
+    div2.style.justifyContent = "center";
+  }
+  if (textInsets) {
+    div2.style.padding = `${textInsets.top}px ${textInsets.right}px ${textInsets.bottom}px ${textInsets.left}px`;
+  } else {
+    div2.style.padding = "10px";
+  }
   div2.style.boxSizing = "border-box";
   div2.style.wordWrap = "break-word";
   div2.style.overflowWrap = "break-word";
@@ -69041,6 +70550,15 @@ function createTextElement(textContent2, textAlign, width, height) {
     div2.style.textAlign = "left";
   }
   let currentParagraph = document.createElement("div");
+  const resolveFieldText = (part) => {
+    if (part.fieldType === "PAGE") {
+      return pageNumber != null ? String(pageNumber) : "1";
+    }
+    if (part.fieldType === "NUMPAGES") {
+      return totalPages != null ? String(totalPages) : "1";
+    }
+    return part.text;
+  };
   textContent2.parts.forEach((part) => {
     if (part.isLineBreak) {
       div2.appendChild(currentParagraph);
@@ -69050,7 +70568,7 @@ function createTextElement(textContent2, textAlign, width, height) {
       }
     } else {
       const span = document.createElement("span");
-      span.textContent = part.text;
+      span.textContent = resolveFieldText(part);
       if (part.formatting) {
         if (part.formatting.bold) {
           span.style.fontWeight = "bold";
@@ -69058,6 +70576,9 @@ function createTextElement(textContent2, textAlign, width, height) {
         if (part.formatting.italic) {
           span.style.fontStyle = "italic";
         }
+        if (part.formatting.fontFamily) {
+          span.style.fontFamily = part.formatting.fontFamily;
+        }
         if (part.formatting.color) {
           span.style.color = `#${part.formatting.color}`;
         }
@@ -69248,7 +70769,14 @@ class VectorShapeView {
       this.applyLineEnds(svg, attrs);
       element.appendChild(svg);
       if (attrs.textContent && attrs.textContent.parts) {
-        const textElement = this.createTextElement(attrs.textContent, attrs.textAlign, attrs.width, attrs.height);
+        const pageNumber = this.editor?.options?.currentPageNumber;
+        const totalPages = this.editor?.options?.totalPageCount;
+        const textElement = this.createTextElement(attrs.textContent, attrs.textAlign, attrs.width, attrs.height, {
+          textVerticalAlign: attrs.textVerticalAlign,
+          textInsets: attrs.textInsets,
+          pageNumber,
+          totalPages
+        });
         if (textElement) {
           svg.appendChild(textElement);
         }
@@ -69580,8 +71108,8 @@ class VectorShapeView {
   applyAlphaToSVG(svg, alphaData) {
     applyAlphaToSVG(svg, alphaData);
   }
-  createTextElement(textContent2, textAlign, width, height) {
-    return createTextElement(textContent2, textAlign, width, height);
+  createTextElement(textContent2, textAlign, width, height, options) {
+    return createTextElement(textContent2, textAlign, width, height, options);
   }
   buildView() {
     const { element } = this.createElement();
@@ -69933,7 +71461,14 @@ class ShapeGroupView {
       }
       g2.appendChild(line);
       if (attrs.textContent && attrs.textContent.parts) {
-        const textGroup = this.createTextElement(attrs.textContent, attrs.textAlign, width, height);
+        const pageNumber = this.editor?.options?.currentPageNumber;
+        const totalPages = this.editor?.options?.totalPageCount;
+        const textGroup = this.createTextElement(attrs.textContent, attrs.textAlign, width, height, {
+          textVerticalAlign: attrs.textVerticalAlign,
+          textInsets: attrs.textInsets,
+          pageNumber,
+          totalPages
+        });
         if (textGroup) {
           g2.appendChild(textGroup);
         }
@@ -70027,15 +71562,22 @@ class ShapeGroupView {
       g2.appendChild(rect);
     }
     if (attrs.textContent && attrs.textContent.parts) {
-      const textGroup = this.createTextElement(attrs.textContent, attrs.textAlign, width, height);
+      const pageNumber = this.editor?.options?.currentPageNumber;
+      const totalPages = this.editor?.options?.totalPageCount;
+      const textGroup = this.createTextElement(attrs.textContent, attrs.textAlign, width, height, {
+        textVerticalAlign: attrs.textVerticalAlign,
+        textInsets: attrs.textInsets,
+        pageNumber,
+        totalPages
+      });
       if (textGroup) {
         g2.appendChild(textGroup);
       }
     }
     return g2;
   }
-  createTextElement(textContent2, textAlign, width, height) {
-    return createTextElement(textContent2, textAlign, width, height);
+  createTextElement(textContent2, textAlign, width, height, options) {
+    return createTextElement(textContent2, textAlign, width, height, options);
   }
   /**
    * Applies line end markers (arrowheads) to a target SVG element.
@@ -70285,6 +71827,47 @@ const PassthroughInline = Node$1.create({
     return sharedAttributes();
   }
 });
+const IndexEntry = Node$1.create({
+  name: "indexEntry",
+  group: "inline",
+  inline: true,
+  atom: true,
+  draggable: false,
+  selectable: false,
+  content: "inline*",
+  addOptions() {
+    return {
+      htmlAttributes: {
+        contenteditable: false,
+        "data-id": "document-index-entry",
+        "aria-label": "Index entry",
+        style: "display:none"
+      }
+    };
+  },
+  addAttributes() {
+    return {
+      instruction: {
+        default: "",
+        rendered: false
+      },
+      instructionTokens: {
+        default: null,
+        rendered: false
+      },
+      marksAsAttrs: {
+        default: null,
+        rendered: false
+      }
+    };
+  },
+  parseDOM() {
+    return [{ tag: 'span[data-id="document-index-entry"]' }];
+  },
+  renderDOM({ htmlAttributes }) {
+    return ["span", Attribute.mergeAttributes(this.options.htmlAttributes, htmlAttributes), 0];
+  }
+});
 const TextStyle = Mark.create({
   name: "textStyle",
   addOptions() {
@@ -77025,6 +78608,7 @@ const getStarterExtensions = () => {
     Strike,
     TabNode,
     TableOfContents,
+    DocumentIndex,
     Text,
     TextAlign,
     TextStyle,
@@ -77058,6 +78642,7 @@ const getStarterExtensions = () => {
     PageNumber,
     TotalPageCount,
     PageReference,
+    IndexEntry,
     ShapeContainer,
     ShapeTextbox,
     ContentBlock,
@@ -94434,6 +96019,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
     const getExtensions = () => getStarterExtensions();
     const initEditor = async ({ content, media = {}, mediaFiles = {}, fonts = {} } = {}) => {
+      if (!editorElem.value) return;
       const { editorCtor, ...editorOptions } = props.options || {};
       const EditorCtor = editorCtor ?? Editor;
       clearSelectedImage();
@@ -94742,7 +96328,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-f5c4f915"]]);
+const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-bb7d8a50"]]);
 const _hoisted_1 = ["innerHTML"];
 const _sfc_main = {
   __name: "SuperInput",