@harbour-enterprises/superdoc 2.0.0-next.2 → 2.0.0-next.21

package/dist/superdoc.umd.js

@@ -38547,8 +38547,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     );
     const isInternal = parentComment?.isInternal || originalComment.isInternal;
     if (commentsExportType === "external" && isInternal) return;
-    const isResolved = !!originalComment.resolvedTime;
-    if (isResolved) return;
     if (node2.type !== "commentRangeStart" && node2.type !== "commentRangeEnd") {
       return;
     }
@@ -39217,11 +39215,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     if (elements.length === 1) {
       text2 = elements[0].text;
-      const xmlSpace = encodedAttrs.xmlSpace ?? elements[0]?.attributes?.["xml:space"];
+      const docXmlSpace = params2.converter?.documentAttributes?.["xml:space"];
+      const xmlSpace = encodedAttrs.xmlSpace ?? attributes?.["xml:space"] ?? elements[0]?.attributes?.["xml:space"] ?? docXmlSpace;
       if (xmlSpace !== "preserve" && typeof text2 === "string") {
         text2 = text2.replace(/^[ \t\n\r]+/, "").replace(/[ \t\n\r]+$/, "");
       }
       text2 = text2.replace(/\[\[sdspace\]\]/g, "");
+      if (xmlSpace !== "preserve" && typeof text2 === "string" && !text2.trim()) {
+        return null;
+      }
     } else if (!elements.length && encodedAttrs.xmlSpace === "preserve") {
       text2 = " ";
     } else return null;
@@ -42204,8 +42206,46 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       this.declaration = this.initialJSON?.declaration;
       this.resolveDocumentGuid();
     }
+    /**
+     * Parses XML content into JSON format while preserving whitespace-only text runs.
+     *
+     * This method wraps xml-js's xml2json parser with additional preprocessing to prevent
+     * the parser from dropping whitespace-only content in <w:t> and <w:delText> elements.
+     * This is critical for correctly handling documents that rely on document-level
+     * xml:space="preserve" rather than per-element attributes, which is common in
+     * PDF-to-DOCX converted documents.
+     *
+     * The whitespace preservation strategy:
+     * 1. Before parsing, wraps whitespace-only content with [[sdspace]] placeholders
+     * 2. xml-js parser preserves the placeholder-wrapped text
+     * 3. During text node processing (t-translator.js), placeholders are removed
+     *
+     * @param {string} xml - The XML string to parse
+     * @returns {Object} The parsed JSON representation of the XML document
+     *
+     * @example
+     * // Handles whitespace-only text runs
+     * const xml = '<w:t> </w:t>';
+     * const result = parseXmlToJson(xml);
+     * // Result preserves the space: { elements: [{ text: '[[sdspace]] [[sdspace]]' }] }
+     *
+     * @example
+     * // Handles elements with attributes
+     * const xml = '<w:t xml:space="preserve">  text  </w:t>';
+     * const result = parseXmlToJson(xml);
+     * // Preserves content and attributes
+     *
+     * @example
+     * // Handles both w:t and w:delText elements
+     * const xml = '<w:delText> </w:delText>';
+     * const result = parseXmlToJson(xml);
+     * // Preserves whitespace in deleted text
+     */
     parseXmlToJson(xml2) {
-      const newXml = xml2.replace(/(<w:t xml:space="preserve">)(\s+)(<\/w:t>)/g, "$1[[sdspace]]$2[[sdspace]]$3");
+      const newXml = xml2.replace(
+        /(<w:(?:t|delText)(?:\s[^>]*)?>)(\s+)(<\/w:(?:t|delText)>)/g,
+        "$1[[sdspace]]$2[[sdspace]]$3"
+      );
       return JSON.parse(xmljs.xml2json(newXml, null, 2));
     }
     /**
@@ -42428,7 +42468,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "2.0.0-next.2") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "2.0.0-next.21") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -53615,7 +53655,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   var __privateAdd$1 = (obj, member, value) => member.has(obj) ? __typeError$1("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
   var __privateSet = (obj, member, value, setter) => (__accessCheck$1(obj, member, "write to private field"), member.set(obj, value), value);
   var __privateMethod$1 = (obj, member, method) => (__accessCheck$1(obj, member, "access private method"), method);
-  var _a, _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _events, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _editor, _stateValidators, _xmlValidators, _requiredNodeTypes, _requiredMarkTypes, _SuperValidator_instances, initializeValidators_fn, collectValidatorRequirements_fn, analyzeDocument_fn, dispatchWithFallback_fn, _commandService, _Editor_instances, initContainerElement_fn, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, registerCopyHandler_fn, insertNewFileData_fn, getPluginKeyName_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, initFonts_fn, checkFonts_fn, determineUnsupportedFonts_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, dispatchTransaction_fn, handleNodeSelection_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, validateDocumentInit_fn, validateDocumentExport_fn, initDevTools_fn, _currentEpoch, _mapsByFromEpoch, _maxEpochsToKeep, _EpochPositionMapper_instances, pruneByCurrentEpoch_fn, _entries, _windowRoot, _getPainterHost, _onRebuild, _observer, _rebuildScheduled, _rebuildRafId, _docEpoch, _layoutEpoch, _layoutUpdating, _pending, _scheduled, _rafHandle, _scheduler, _SelectionSyncCoordinator_instances, isSafeToRender_fn, maybeSchedule_fn, cancelScheduledRender_fn, _windowRoot2, _layoutSurfaces, _getTargetDom, _isEditable, _onTargetChanged, _listeners, _currentTarget, _destroyed, _useWindowFallback, _PresentationInputBridge_instances, addListener_fn, dispatchToTarget_fn, forwardKeyboardEvent_fn, forwardTextEvent_fn, forwardCompositionEvent_fn, forwardContextMenu_fn, isEventOnActiveTarget_fn, shouldSkipSurface_fn, isInLayoutSurface_fn, getListenerTargets_fn, isPlainCharacterKey_fn, _map, _editor2, _descriptors, _collections, _editorEntries, _maxCachedEditors, _editorAccessOrder, _pendingCreations, _cacheHits, _cacheMisses, _evictions, _HeaderFooterEditorManager_instances, hasConverter_fn, extractCollections_fn, collectDescriptors_fn, teardownMissingEditors_fn, teardownEditors_fn, createEditor_fn, createEditorContainer_fn, registerConverterEditor_fn, unregisterConverterEditor_fn, updateAccessOrder_fn, enforceCacheSizeLimit_fn, _manager, _mediaFiles, _blockCache, _HeaderFooterLayoutAdapter_instances, getBlocks_fn, getConverterContext_fn, _selectionOverlay, _activeEditorHost, _activeDecorationContainer, _activeRegion, _borderLine, _dimmingOverlay, _EditorOverlayManager_instances, findDecorationContainer_fn, ensureEditorHost_fn, positionEditorHost_fn, showHeaderFooterBorder_fn, hideHeaderFooterBorder_fn, _instances, _options, _editor3, _visibleHost, _viewportHost, _painterHost, _selectionOverlay2, _hiddenHost, _layoutOptions, _layoutState, _domPainter, _pageGeometryHelper, _dragHandlerCleanup, _layoutError, _layoutErrorState, _errorBanner, _errorBannerMessage, _telemetryEmitter, _renderScheduled, _pendingDocChange, _isRerendering, _selectionSync, _remoteCursorUpdateScheduled, _epochMapper, _layoutEpoch2, _domPositionIndex, _domIndexObserverManager, _debugLastPointer, _debugLastHit, _pendingMarginClick, _rafHandle2, _editorListeners, _sectionMetadata, _documentMode, _inputBridge, _trackedChangesMode, _trackedChangesEnabled, _trackedChangesOverrides, _headerFooterManager, _headerFooterAdapter, _headerFooterIdentifier, _multiSectionIdentifier, _headerLayoutResults, _footerLayoutResults, _headerLayoutsByRId, _footerLayoutsByRId, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _overlayManager, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _a11ySelectionAnnounceTimeout, _a11yLastAnnouncedSelectionKey, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _lastSelectedImageBlockId, _dragAnchor, _dragAnchorPageIndex, _isDragging, _dragExtensionMode, _dragLastPointer, _dragLastRawHit, _dragUsedPageNotMountedFallback, _cellAnchor, _cellDragMode, _remoteCursorState, _remoteCursorElements, _remoteCursorDirty, _remoteCursorOverlay, _localSelectionLayer, _awarenessCleanup, _scrollCleanup, _scrollTimeout, _lastRemoteCursorRenderTime, _remoteCursorThrottleTimeout, _PresentationEditor_instances, wrapHiddenEditorFocus_fn, collectCommentPositions_fn, updateSelectionDebugHud_fn, computePendingMarginClick_fn, aggregateLayoutBounds_fn, rebuildDomPositionIndex_fn, setupEditorListeners_fn, setupCollaborationCursors_fn, updateLocalAwarenessCursor_fn, scheduleRemoteCursorUpdate_fn, scheduleRemoteCursorReRender_fn, updateRemoteCursors_fn, renderRemoteCursors_fn, setupPointerHandlers_fn, setupDragHandlers_fn, focusEditorAfterImageSelection_fn, setupInputBridge_fn, initHeaderFooterRegistry_fn, _handlePointerDown, getFirstTextPosition_fn, registerPointerClick_fn, getCellPosFromTableHit_fn, getTablePosFromHit_fn, shouldUseCellSelection_fn, setCellAnchor_fn, clearCellAnchor_fn, hitTestTable_fn, selectWordAt_fn, selectParagraphAt_fn, calculateExtendedSelection_fn, _handlePointerMove, _handlePointerLeave, _handleVisibleHostFocusIn, _handlePointerUp, _handleDragOver, _handleDrop, _handleDoubleClick, _handleKeyDown, focusHeaderFooterShortcut_fn, scheduleRerender_fn, flushRerenderQueue_fn, rerender_fn, ensurePainter_fn, scheduleSelectionUpdate_fn, updateSelection_fn, resolveLayoutOptions_fn, buildHeaderFooterInput_fn, computeHeaderFooterConstraints_fn, layoutPerRIdHeaderFooters_fn, updateDecorationProviders_fn, createDecorationProvider_fn, findHeaderFooterPageForPageNumber_fn, computeDecorationBox_fn, computeExpectedSectionType_fn, rebuildHeaderFooterRegions_fn, hitTestHeaderFooterRegion_fn, pointInRegion_fn, activateHeaderFooterRegion_fn, enterHeaderFooterMode_fn, exitHeaderFooterMode_fn, getActiveDomTarget_fn, emitHeaderFooterModeChanged_fn, emitHeaderFooterEditingContext_fn, updateAwarenessSession_fn, updateModeBanner_fn, announce_fn, syncHiddenEditorA11yAttributes_fn, scheduleA11ySelectionAnnouncement_fn, announceSelectionNow_fn, validateHeaderFooterEditPermission_fn, emitHeaderFooterEditBlocked_fn, resolveDescriptorForRegion_fn, createDefaultHeaderFooter_fn, getPageElement_fn, isSelectionAwareVirtualizationEnabled_fn, updateSelectionVirtualizationPins_fn, finalizeDragSelectionWithDom_fn, scrollPageIntoView_fn, waitForPageMount_fn, getEffectivePageGap_fn, getBodyPageHeight_fn, getHeaderFooterPageHeight_fn, renderCellSelectionOverlay_fn, renderHoverRegion_fn, clearHoverRegion_fn, getHeaderFooterContext_fn, computeHeaderFooterSelectionRects_fn, syncTrackedChangesPreferences_fn, deriveTrackedChangesMode_fn, deriveTrackedChangesEnabled_fn, getTrackChangesPluginState_fn, computeDefaultLayoutDefaults_fn, applyZoom_fn, getPageOffsetX_fn, convertPageLocalToOverlayCoords_fn, computeSelectionRectsFromDom_fn, computeDomCaretPageLocal_fn, normalizeClientPoint_fn, computeCaretLayoutRectGeometry_fn, computeCaretLayoutRect_fn, getCurrentPageIndex_fn, findRegionForPage_fn, handleLayoutError_fn, decorateError_fn, showLayoutErrorBanner_fn, dismissErrorBanner_fn, _DocumentSectionView_instances, init_fn2, addToolTip_fn, _ParagraphNodeView_instances, checkShouldUpdate_fn, updateHTMLAttributes_fn, updateDOMStyles_fn, resolveNeighborParagraphProperties_fn, updateListStyles_fn, initList_fn, checkIsList_fn, createMarker_fn, createSeparator_fn, calculateTabSeparatorStyle_fn, calculateMarkerStyle_fn, removeList_fn, getParagraphContext_fn, scheduleAnimation_fn, cancelScheduledAnimation_fn, _FieldAnnotationView_instances, createAnnotation_fn, _AutoPageNumberNodeView_instances, renderDom_fn, scheduleUpdateNodeStyle_fn, _VectorShapeView_instances, ensureParentPositioned_fn, _ShapeGroupView_instances, ensureParentPositioned_fn2;
+  var _a, _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _events, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _editor, _stateValidators, _xmlValidators, _requiredNodeTypes, _requiredMarkTypes, _SuperValidator_instances, initializeValidators_fn, collectValidatorRequirements_fn, analyzeDocument_fn, dispatchWithFallback_fn, _commandService, _Editor_instances, initContainerElement_fn, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, registerCopyHandler_fn, insertNewFileData_fn, getPluginKeyName_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, initFonts_fn, checkFonts_fn, determineUnsupportedFonts_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, dispatchTransaction_fn, handleNodeSelection_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, validateDocumentInit_fn, validateDocumentExport_fn, initDevTools_fn, _currentEpoch, _mapsByFromEpoch, _maxEpochsToKeep, _EpochPositionMapper_instances, pruneByCurrentEpoch_fn, _entries, _windowRoot, _getPainterHost, _onRebuild, _observer, _rebuildScheduled, _rebuildRafId, _docEpoch, _layoutEpoch, _layoutUpdating, _pending, _scheduled, _rafHandle, _scheduler, _SelectionSyncCoordinator_instances, isSafeToRender_fn, maybeSchedule_fn, cancelScheduledRender_fn, _windowRoot2, _layoutSurfaces, _getTargetDom, _isEditable, _onTargetChanged, _listeners, _currentTarget, _destroyed, _useWindowFallback, _PresentationInputBridge_instances, addListener_fn, dispatchToTarget_fn, forwardKeyboardEvent_fn, forwardTextEvent_fn, forwardCompositionEvent_fn, forwardContextMenu_fn, isEventOnActiveTarget_fn, shouldSkipSurface_fn, isInLayoutSurface_fn, getListenerTargets_fn, isPlainCharacterKey_fn, _map, _editor2, _descriptors, _collections, _editorEntries, _maxCachedEditors, _editorAccessOrder, _pendingCreations, _cacheHits, _cacheMisses, _evictions, _HeaderFooterEditorManager_instances, hasConverter_fn, extractCollections_fn, collectDescriptors_fn, teardownMissingEditors_fn, teardownEditors_fn, createEditor_fn, createEditorContainer_fn, registerConverterEditor_fn, unregisterConverterEditor_fn, updateAccessOrder_fn, enforceCacheSizeLimit_fn, _manager, _mediaFiles, _blockCache, _HeaderFooterLayoutAdapter_instances, getBlocks_fn, getConverterContext_fn, _selectionOverlay, _activeEditorHost, _activeDecorationContainer, _activeRegion, _borderLine, _dimmingOverlay, _EditorOverlayManager_instances, findDecorationContainer_fn, ensureEditorHost_fn, positionEditorHost_fn, showHeaderFooterBorder_fn, hideHeaderFooterBorder_fn, _instances, _options, _editor3, _visibleHost, _viewportHost, _painterHost, _selectionOverlay2, _hiddenHost, _layoutOptions, _layoutState, _domPainter, _pageGeometryHelper, _dragHandlerCleanup, _layoutError, _layoutErrorState, _errorBanner, _errorBannerMessage, _telemetryEmitter, _renderScheduled, _pendingDocChange, _isRerendering, _selectionSync, _remoteCursorUpdateScheduled, _epochMapper, _layoutEpoch2, _domPositionIndex, _domIndexObserverManager, _debugLastPointer, _debugLastHit, _pendingMarginClick, _rafHandle2, _editorListeners, _sectionMetadata, _documentMode, _inputBridge, _trackedChangesMode, _trackedChangesEnabled, _trackedChangesOverrides, _headerFooterManager, _headerFooterAdapter, _headerFooterIdentifier, _multiSectionIdentifier, _headerLayoutResults, _footerLayoutResults, _headerLayoutsByRId, _footerLayoutsByRId, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _overlayManager, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _a11ySelectionAnnounceTimeout, _a11yLastAnnouncedSelectionKey, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _lastSelectedImageBlockId, _dragAnchor, _dragAnchorPageIndex, _isDragging, _dragExtensionMode, _dragLastPointer, _dragLastRawHit, _dragUsedPageNotMountedFallback, _cellAnchor, _cellDragMode, _remoteCursorState, _remoteCursorElements, _remoteCursorDirty, _remoteCursorOverlay, _localSelectionLayer, _awarenessCleanup, _scrollCleanup, _scrollTimeout, _lastRemoteCursorRenderTime, _remoteCursorThrottleTimeout, _PresentationEditor_instances, wrapHiddenEditorFocus_fn, syncDocumentModeClass_fn, collectCommentPositions_fn, updateSelectionDebugHud_fn, computePendingMarginClick_fn, aggregateLayoutBounds_fn, rebuildDomPositionIndex_fn, setupEditorListeners_fn, setupCollaborationCursors_fn, updateLocalAwarenessCursor_fn, scheduleRemoteCursorUpdate_fn, scheduleRemoteCursorReRender_fn, updateRemoteCursors_fn, renderRemoteCursors_fn, setupPointerHandlers_fn, setupDragHandlers_fn, focusEditorAfterImageSelection_fn, setupInputBridge_fn, initHeaderFooterRegistry_fn, _handlePointerDown, getFirstTextPosition_fn, registerPointerClick_fn, getCellPosFromTableHit_fn, getTablePosFromHit_fn, shouldUseCellSelection_fn, setCellAnchor_fn, clearCellAnchor_fn, hitTestTable_fn, selectWordAt_fn, selectParagraphAt_fn, calculateExtendedSelection_fn, _handlePointerMove, _handlePointerLeave, _handleVisibleHostFocusIn, _handlePointerUp, _handleDragOver, _handleDrop, _handleDoubleClick, _handleKeyDown, focusHeaderFooterShortcut_fn, scheduleRerender_fn, flushRerenderQueue_fn, rerender_fn, ensurePainter_fn, scheduleSelectionUpdate_fn, updateSelection_fn, resolveLayoutOptions_fn, buildHeaderFooterInput_fn, computeHeaderFooterConstraints_fn, layoutPerRIdHeaderFooters_fn, updateDecorationProviders_fn, createDecorationProvider_fn, findHeaderFooterPageForPageNumber_fn, computeDecorationBox_fn, computeExpectedSectionType_fn, rebuildHeaderFooterRegions_fn, hitTestHeaderFooterRegion_fn, pointInRegion_fn, activateHeaderFooterRegion_fn, enterHeaderFooterMode_fn, exitHeaderFooterMode_fn, getActiveDomTarget_fn, emitHeaderFooterModeChanged_fn, emitHeaderFooterEditingContext_fn, updateAwarenessSession_fn, updateModeBanner_fn, announce_fn, syncHiddenEditorA11yAttributes_fn, scheduleA11ySelectionAnnouncement_fn, announceSelectionNow_fn, validateHeaderFooterEditPermission_fn, emitHeaderFooterEditBlocked_fn, resolveDescriptorForRegion_fn, createDefaultHeaderFooter_fn, getPageElement_fn, isSelectionAwareVirtualizationEnabled_fn, updateSelectionVirtualizationPins_fn, finalizeDragSelectionWithDom_fn, scrollPageIntoView_fn, waitForPageMount_fn, getEffectivePageGap_fn, getBodyPageHeight_fn, getHeaderFooterPageHeight_fn, renderCellSelectionOverlay_fn, renderHoverRegion_fn, clearHoverRegion_fn, getHeaderFooterContext_fn, computeHeaderFooterSelectionRects_fn, syncTrackedChangesPreferences_fn, deriveTrackedChangesMode_fn, deriveTrackedChangesEnabled_fn, getTrackChangesPluginState_fn, computeDefaultLayoutDefaults_fn, applyZoom_fn, getPageOffsetX_fn, convertPageLocalToOverlayCoords_fn, computeSelectionRectsFromDom_fn, computeDomCaretPageLocal_fn, normalizeClientPoint_fn, computeCaretLayoutRectGeometry_fn, computeCaretLayoutRect_fn, getCurrentPageIndex_fn, findRegionForPage_fn, handleLayoutError_fn, decorateError_fn, showLayoutErrorBanner_fn, dismissErrorBanner_fn, _DocumentSectionView_instances, init_fn2, addToolTip_fn, _ParagraphNodeView_instances, checkShouldUpdate_fn, updateHTMLAttributes_fn, updateDOMStyles_fn, resolveNeighborParagraphProperties_fn, updateListStyles_fn, initList_fn, checkIsList_fn, createMarker_fn, createSeparator_fn, calculateTabSeparatorStyle_fn, calculateMarkerStyle_fn, removeList_fn, getParagraphContext_fn, scheduleAnimation_fn, cancelScheduledAnimation_fn, _FieldAnnotationView_instances, createAnnotation_fn, _AutoPageNumberNodeView_instances, renderDom_fn, scheduleUpdateNodeStyle_fn, _VectorShapeView_instances, ensureParentPositioned_fn, _ShapeGroupView_instances, ensureParentPositioned_fn2;
   var GOOD_LEAF_SIZE = 200;
   var RopeSequence = function RopeSequence2() {
   };
@@ -65451,6 +65491,9 @@ ${err.toString()}`);
       return null;
     }
     const actualMark = start2.node.marks.find((mark2) => mark2.type.name === markName);
+    if (!actualMark) {
+      return null;
+    }
     let startIndex = $pos.index();
     let startPos = $pos.start() + start2.offset;
     while (startIndex > 0 && actualMark.isInSet(parent.child(startIndex - 1).marks)) {
@@ -65740,6 +65783,70 @@ ${err.toString()}`);
     });
     return positions;
   };
+  const getCommentMarkSegmentsById = (commentId, doc2) => {
+    const segments = [];
+    doc2.descendants((node2, pos) => {
+      if (!node2.isInline) return;
+      const commentMark = node2.marks?.find(
+        (mark2) => mark2.type.name === CommentMarkName$1 && mark2.attrs?.commentId === commentId
+      );
+      if (!commentMark) return;
+      segments.push({
+        from: pos,
+        to: pos + node2.nodeSize,
+        attrs: commentMark.attrs || {}
+      });
+    });
+    return segments;
+  };
+  const getCommentMarkRangesById = (commentId, doc2) => {
+    const segments = getCommentMarkSegmentsById(commentId, doc2);
+    if (!segments.length) return { segments, ranges: [] };
+    const ranges = [];
+    let active = null;
+    segments.forEach((seg) => {
+      if (!active) {
+        active = {
+          from: seg.from,
+          to: seg.to,
+          internal: !!seg.attrs?.internal
+        };
+        return;
+      }
+      if (seg.from <= active.to) {
+        active.to = Math.max(active.to, seg.to);
+        return;
+      }
+      ranges.push(active);
+      active = {
+        from: seg.from,
+        to: seg.to,
+        internal: !!seg.attrs?.internal
+      };
+    });
+    if (active) ranges.push(active);
+    return { segments, ranges };
+  };
+  const resolveCommentById = ({ commentId, state: state2, tr, dispatch }) => {
+    const { schema } = state2;
+    const markType = schema.marks?.[CommentMarkName$1];
+    if (!markType) return false;
+    const { segments, ranges } = getCommentMarkRangesById(commentId, state2.doc);
+    if (!segments.length) return false;
+    segments.forEach(({ from: from2, to, attrs }) => {
+      tr.removeMark(from2, to, markType.create(attrs));
+    });
+    const startType = schema.nodes?.commentRangeStart;
+    const endType = schema.nodes?.commentRangeEnd;
+    if (startType && endType) {
+      ranges.slice().sort((a2, b2) => b2.from - a2.from).forEach(({ from: from2, to, internal }) => {
+        tr.insert(to, endType.create({ "w:id": commentId }));
+        tr.insert(from2, startType.create({ "w:id": commentId, internal }));
+      });
+    }
+    dispatch(tr);
+    return true;
+  };
   const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
     const commentMap = /* @__PURE__ */ new Map();
     comments.forEach((c2) => {
@@ -65846,6 +65953,7 @@ ${err.toString()}`);
   const prepareCommentsForImport = (doc2, tr, schema, converter) => {
     const toMark = [];
     const toDelete = [];
+    const toUpdate = [];
     doc2.descendants((node2, pos) => {
       const { type: type2 } = node2;
       const commentNodes = ["commentRangeStart", "commentRangeEnd", "commentReference"];
@@ -65854,8 +65962,9 @@ ${err.toString()}`);
         converter,
         importedId: node2.attrs["w:id"]
       });
+      const isDone = !!matchingImportedComment?.isDone;
       if (type2.name === "commentRangeStart") {
-        if (!matchingImportedComment?.isDone) {
+        if (!isDone) {
           toMark.push({
             commentId: resolvedCommentId,
             importedId,
@@ -65869,8 +65978,29 @@ ${err.toString()}`);
           commentId: resolvedCommentId,
           importedId
         });
-        toDelete.push({ start: pos, end: pos + 1 });
+        if (isDone) {
+          toUpdate.push({
+            pos,
+            attrs: {
+              ...node2.attrs,
+              "w:id": resolvedCommentId,
+              internal
+            }
+          });
+        } else {
+          toDelete.push({ start: pos, end: pos + 1 });
+        }
       } else if (type2.name === "commentRangeEnd") {
+        if (isDone) {
+          toUpdate.push({
+            pos,
+            attrs: {
+              ...node2.attrs,
+              "w:id": resolvedCommentId
+            }
+          });
+          return;
+        }
         const itemToMark = toMark.find((p2) => p2.importedId === importedId);
         if (!itemToMark) return;
         const { start: start2 } = itemToMark;
@@ -65885,6 +66015,11 @@ ${err.toString()}`);
         toDelete.push({ start: pos, end: pos + 1 });
       }
     });
+    if (typeof tr.setNodeMarkup === "function") {
+      toUpdate.sort((a2, b2) => b2.pos - a2.pos).forEach(({ pos, attrs }) => {
+        tr.setNodeMarkup(pos, void 0, attrs);
+      });
+    }
     toDelete.sort((a2, b2) => b2.start - a2.start).forEach(({ start: start2, end: end2 }) => {
       tr.delete(start2, end2);
     });
@@ -66078,7 +66213,7 @@ ${err.toString()}`);
         },
         resolveComment: ({ commentId }) => ({ tr, dispatch, state: state2 }) => {
           tr.setMeta(CommentsPluginKey, { event: "update" });
-          removeCommentsById({ commentId, state: state2, tr, dispatch });
+          return resolveCommentById({ commentId, state: state2, tr, dispatch });
         },
         setCursorById: (id) => ({ state: state2, editor }) => {
           const { from: from2 } = findRangeById(state2.doc, id) || {};
@@ -66511,47 +66646,58 @@ ${err.toString()}`);
     return from2 !== null && to !== null ? { from: from2, to } : null;
   }
   const replaceStep = ({ state: state2, tr, step, newTr, map: map2, user, date, originalStep, originalStepIndex }) => {
-    const deletionMarkSchema = state2.schema.marks[TrackDeleteMarkName$1];
-    const deletionMark = findMark(state2, deletionMarkSchema, false);
-    const positionTo = deletionMark ? deletionMark.to : step.to;
-    const newStep = new ReplaceStep(
-      positionTo,
-      // We insert all the same steps, but with "from"/"to" both set to "to" in order not to delete content. Mapped as needed.
-      positionTo,
-      step.slice,
-      step.structure
-    );
-    const invertStep = originalStep.invert(tr.docs[originalStepIndex]).map(map2);
-    map2.appendMap(invertStep.getMap());
-    const meta2 = {};
-    if (newStep) {
-      const trTemp = state2.apply(newTr).tr;
-      if (trTemp.maybeStep(newStep).failed) {
-        return;
-      }
-      const mappedNewStepTo = newStep.getMap().map(newStep.to);
-      const insertedMark = markInsertion({
-        tr: trTemp,
-        from: newStep.from,
-        to: mappedNewStepTo,
-        user,
-        date
-      });
-      const condensedStep = new ReplaceStep(newStep.from, newStep.to, trTemp.doc.slice(newStep.from, mappedNewStepTo));
-      newTr.step(condensedStep);
-      const mirrorIndex = map2.maps.length - 1;
-      map2.appendMap(condensedStep.getMap(), mirrorIndex);
-      if (newStep.from !== mappedNewStepTo) {
-        meta2.insertedMark = insertedMark;
-        meta2.step = condensedStep;
+    const trTemp = state2.apply(newTr).tr;
+    let positionTo = step.to;
+    const probePos = Math.max(step.from, step.to - 1);
+    const deletionSpan = findMarkPosition(trTemp.doc, probePos, TrackDeleteMarkName$1);
+    if (deletionSpan && deletionSpan.to > positionTo) {
+      positionTo = deletionSpan.to;
+    }
+    const tryInsert = (slice2) => {
+      const insertionStep = new ReplaceStep(positionTo, positionTo, slice2, false);
+      if (trTemp.maybeStep(insertionStep).failed) return null;
+      return {
+        insertedFrom: insertionStep.from,
+        insertedTo: insertionStep.getMap().map(insertionStep.to, 1)
+      };
+    };
+    const insertion = tryInsert(step.slice) || tryInsert(Slice.maxOpen(step.slice.content, true));
+    if (!insertion) {
+      if (!newTr.maybeStep(step).failed) {
+        map2.appendMap(step.getMap());
       }
-      if (!newTr.selection.eq(trTemp.selection)) {
-        newTr.setSelection(trTemp.selection);
+      return;
+    }
+    const meta2 = {};
+    const insertedMark = markInsertion({
+      tr: trTemp,
+      from: insertion.insertedFrom,
+      to: insertion.insertedTo,
+      user,
+      date
+    });
+    const trackedInsertedSlice = trTemp.doc.slice(insertion.insertedFrom, insertion.insertedTo);
+    const condensedStep = new ReplaceStep(positionTo, positionTo, trackedInsertedSlice, false);
+    if (newTr.maybeStep(condensedStep).failed) {
+      if (!newTr.maybeStep(step).failed) {
+        map2.appendMap(step.getMap());
       }
+      return;
+    }
+    const invertStep = originalStep.invert(tr.docs[originalStepIndex]).map(map2);
+    map2.appendMap(invertStep.getMap());
+    const mirrorIndex = map2.maps.length - 1;
+    map2.appendMap(condensedStep.getMap(), mirrorIndex);
+    if (insertion.insertedFrom !== insertion.insertedTo) {
+      meta2.insertedMark = insertedMark;
+      meta2.step = condensedStep;
+    }
+    if (!newTr.selection.eq(trTemp.selection)) {
+      newTr.setSelection(trTemp.selection);
     }
     if (step.from !== step.to) {
       const {
-        deletionMark: deletionMark2,
+        deletionMark,
         deletionMap,
         nodes: deletionNodes
       } = markDeletion({
@@ -66563,7 +66709,7 @@ ${err.toString()}`);
         id: meta2.insertedMark?.attrs?.id
       });
       meta2.deletionNodes = deletionNodes;
-      meta2.deletionMark = deletionMark2;
+      meta2.deletionMark = deletionMark;
       map2.appendMapping(deletionMap);
     }
     newTr.setMeta(TrackChangesBasePluginKey, meta2);
@@ -68384,7 +68530,7 @@ ${err.toString()}`);
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "2.0.0-next.2";
+  const summaryVersion = "2.0.0-next.21";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -69173,7 +69319,7 @@ ${err.toString()}`);
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexBqPa6D4q),
+        Promise.resolve().then(() => index_W_Fk0WX),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -69378,7 +69524,7 @@ ${err.toString()}`);
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "2.0.0-next.2");
+      console.debug("[checkVersionMigrations] Current editor version", "2.0.0-next.21");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -74942,6 +75088,24 @@ ${l}
   display: block;
 }
 
+/* Viewing mode: remove structured content affordances */
+.presentation-editor--viewing .superdoc-structured-content-block,
+.presentation-editor--viewing .superdoc-structured-content-inline {
+  background: none;
+  border: none;
+  padding: 0;
+}
+
+.presentation-editor--viewing .superdoc-structured-content-inline:hover {
+  background: none;
+  border: none;
+}
+
+.presentation-editor--viewing .superdoc-structured-content__label,
+.presentation-editor--viewing .superdoc-structured-content-inline__label {
+  display: none !important;
+}
+
 /* Print mode: hide visual styling for SDT containers */
 @media print {
   .superdoc-document-section,
@@ -76630,7 +76794,7 @@ ${l}
     return true;
   }
   const LIST_MARKER_GAP$2 = 8;
-  const DEFAULT_TAB_INTERVAL_PX$1 = 48;
+  const DEFAULT_TAB_INTERVAL_PX$2 = 48;
   const DEFAULT_PAGE_HEIGHT_PX = 1056;
   const DEFAULT_VIRTUALIZED_PAGE_GAP$1 = 72;
   const COMMENT_EXTERNAL_COLOR = "#B1124B";
@@ -77557,6 +77721,7 @@ ${l}
         const block = lookup2.block;
         const measure = lookup2.measure;
         const wordLayout = isMinimalWordLayout(block.attrs?.wordLayout) ? block.attrs.wordLayout : void 0;
+        const alignment2 = block.attrs?.alignment;
         const fragmentEl = this.doc.createElement("div");
         fragmentEl.classList.add(CLASS_NAMES$1.fragment);
         const isTocEntry = block.attrs?.isTocEntry;
@@ -77635,7 +77800,7 @@ ${l}
                 const textStart = paraIndentLeft + firstLine;
                 tabWidth = textStart - currentPos;
                 if (tabWidth <= 0) {
-                  tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
+                  tabWidth = DEFAULT_TAB_INTERVAL_PX$2 - currentPos % DEFAULT_TAB_INTERVAL_PX$2;
                 } else if (tabWidth < LIST_MARKER_GAP$2) {
                   tabWidth = LIST_MARKER_GAP$2;
                 }
@@ -77662,6 +77827,21 @@ ${l}
           let availableWidthOverride = line.maxWidth != null ? Math.min(line.maxWidth, fallbackAvailableWidth) : fallbackAvailableWidth;
           if (index2 === 0 && listFirstLineMarkerTabWidth != null) {
             availableWidthOverride = fragment.width - listFirstLineMarkerTabWidth - Math.max(0, paraIndentRight);
+            if (alignment2 === "justify" || alignment2 === "both") {
+              console.log(
+                "[justify-debug][painter-firstline-available]",
+                JSON.stringify({
+                  blockId: block.id,
+                  fragmentWidth: fragment.width,
+                  markerTabWidth: listFirstLineMarkerTabWidth,
+                  paraIndentRight,
+                  availableWidthOverride,
+                  lineMaxWidth: line.maxWidth ?? null,
+                  lineWidth: line.width,
+                  lineNaturalWidth: line.naturalWidth ?? null
+                })
+              );
+            }
           }
           const isLastLineOfFragment = index2 === lines.length - 1;
           const isLastLineOfParagraph = isLastLineOfFragment && !fragment.continuesOnNext;
@@ -77787,7 +77967,7 @@ ${l}
                   const textStart = paraIndentLeft + firstLine;
                   tabWidth = textStart - currentPos;
                   if (tabWidth <= 0) {
-                    tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
+                    tabWidth = DEFAULT_TAB_INTERVAL_PX$2 - currentPos % DEFAULT_TAB_INTERVAL_PX$2;
                   } else if (tabWidth < LIST_MARKER_GAP$2) {
                     tabWidth = LIST_MARKER_GAP$2;
                   }
@@ -79321,6 +79501,23 @@ ${l}
       if (spacingPerSpace !== 0) {
         el.style.wordSpacing = `${spacingPerSpace}px`;
       }
+      if (justifyShouldApply && spacingPerSpace < 0) {
+        console.log(
+          "[justify-debug][painter-wordspacing-negative]",
+          JSON.stringify({
+            blockId: block.id,
+            lineIndex: lineIndex ?? null,
+            alignment: alignment2 ?? null,
+            availableWidth,
+            lineWidth,
+            lineMaxWidth: line.maxWidth ?? null,
+            lineNaturalWidth: line.naturalWidth ?? null,
+            spaceCount,
+            hasExplicitPositioning: Boolean(hasExplicitPositioning),
+            skipJustify: Boolean(skipJustify)
+          })
+        );
+      }
       if (hasExplicitPositioning && line.segments) {
         const paraIndent = block.attrs?.indent;
         const indentLeft = paraIndent?.left ?? 0;
@@ -81514,6 +81711,28 @@ ${l}
   const TAB_CHAR_LENGTH = 1;
   const SPACE_CHARS = SPACE_CHARS$1;
   const isTabRun$1 = (run2) => run2?.kind === "tab";
+  const isWordChar$3 = (char) => {
+    if (!char) return false;
+    const code2 = char.charCodeAt(0);
+    return code2 >= 48 && code2 <= 57 || code2 >= 65 && code2 <= 90 || code2 >= 97 && code2 <= 122 || char === "'";
+  };
+  const capitalizeText$2 = (text2) => {
+    if (!text2) return text2;
+    let result = "";
+    for (let i2 = 0; i2 < text2.length; i2 += 1) {
+      const prevChar = i2 > 0 ? text2[i2 - 1] : "";
+      const ch = text2[i2];
+      result += isWordChar$3(ch) && !isWordChar$3(prevChar) ? ch.toUpperCase() : ch;
+    }
+    return result;
+  };
+  const applyTextTransform$2 = (text2, transform) => {
+    if (!text2 || !transform || transform === "none") return text2;
+    if (transform === "uppercase") return text2.toUpperCase();
+    if (transform === "lowercase") return text2.toLowerCase();
+    if (transform === "capitalize") return capitalizeText$2(text2);
+    return text2;
+  };
   function getMeasurementContext() {
     if (measurementCtx) return measurementCtx;
     if (typeof document === "undefined") {
@@ -81689,17 +81908,19 @@ ${l}
       }
       const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
       const runLength = text2.length;
+      const transform = isTabRun$1(run2) || "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? void 0 : run2.textTransform;
+      const displayText = applyTextTransform$2(text2, transform);
       if (currentCharOffset + runLength >= charOffset) {
         const offsetInRun = charOffset - currentCharOffset;
         ctx2.font = getRunFontString(run2);
-        const textUpToTarget = text2.slice(0, offsetInRun);
+        const textUpToTarget = displayText.slice(0, offsetInRun);
         const measured2 = ctx2.measureText(textUpToTarget);
         const spacingWidth = computeLetterSpacingWidth(run2, offsetInRun, runLength);
-        const spacesInPortion = justify.extraPerSpace !== 0 ? countSpaces(textUpToTarget) : 0;
+        const spacesInPortion = justify.extraPerSpace !== 0 ? countSpaces(text2.slice(0, offsetInRun)) : 0;
         return alignmentOffset + currentX + measured2.width + spacingWidth + justify.extraPerSpace * (spaceTally + spacesInPortion);
       }
       ctx2.font = getRunFontString(run2);
-      const measured = ctx2.measureText(text2);
+      const measured = ctx2.measureText(displayText);
       const runLetterSpacing = computeLetterSpacingWidth(run2, runLength, runLength);
       const spacesInRun = justify.extraPerSpace !== 0 ? countSpaces(text2) : 0;
       currentX += measured.width + runLetterSpacing + justify.extraPerSpace * spacesInRun;
@@ -81738,8 +81959,10 @@ ${l}
           return segmentBaseX + (offsetInSegment >= segmentChars ? segment.width ?? 0 : 0);
         }
         const text2 = run2.text ?? "";
-        const segmentText = text2.slice(segment.fromChar, segment.toChar);
-        const textUpToTarget = segmentText.slice(0, offsetInSegment);
+        const transform = "textTransform" in run2 ? run2.textTransform : void 0;
+        const displayText = applyTextTransform$2(text2, transform);
+        const displaySegmentText = displayText.slice(segment.fromChar, segment.toChar);
+        const textUpToTarget = displaySegmentText.slice(0, offsetInSegment);
         ctx2.font = getRunFontString(run2);
         const measured = ctx2.measureText(textUpToTarget);
         const spacingWidth = computeLetterSpacingWidth(run2, offsetInSegment, segmentChars);
@@ -81835,12 +82058,14 @@ ${l}
       }
       const text2 = "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
       const runLength = text2.length;
+      const transform = isTabRun$1(run2) || "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? void 0 : run2.textTransform;
+      const displayText = applyTextTransform$2(text2, transform);
       if (runLength === 0) continue;
       ctx2.font = getRunFontString(run2);
       for (let i2 = 0; i2 <= runLength; i2++) {
-        const textUpToChar = text2.slice(0, i2);
+        const textUpToChar = displayText.slice(0, i2);
         const measured2 = ctx2.measureText(textUpToChar);
-        const spacesInPortion = justify.extraPerSpace > 0 ? countSpaces(textUpToChar) : 0;
+        const spacesInPortion = justify.extraPerSpace > 0 ? countSpaces(text2.slice(0, i2)) : 0;
         const charX = currentX + measured2.width + computeLetterSpacingWidth(run2, i2, runLength) + justify.extraPerSpace * (spaceTally + spacesInPortion);
         if (charX >= safeX) {
           if (i2 === 0) {
@@ -81850,7 +82075,7 @@ ${l}
               pmPosition: pmPosition3
             };
           }
-          const prevText = text2.slice(0, i2 - 1);
+          const prevText = displayText.slice(0, i2 - 1);
           const prevMeasured = ctx2.measureText(prevText);
           const prevX = currentX + prevMeasured.width + computeLetterSpacingWidth(run2, i2 - 1, runLength);
           const distToPrev = Math.abs(safeX - prevX);
@@ -81863,7 +82088,7 @@ ${l}
           };
         }
       }
-      const measured = ctx2.measureText(text2);
+      const measured = ctx2.measureText(displayText);
       const runLetterSpacing = computeLetterSpacingWidth(run2, runLength, runLength);
       const spacesInRun = justify.extraPerSpace > 0 ? countSpaces(text2) : 0;
       currentX += measured.width + runLetterSpacing + justify.extraPerSpace * spacesInRun;
@@ -82294,6 +82519,83 @@ ${l}
     }
     return index2;
   }
+  const LIST_MARKER_GAP$1 = 8;
+  const MIN_MARKER_GUTTER = 24;
+  const DEFAULT_LIST_INDENT_BASE_PX = 24;
+  const DEFAULT_LIST_INDENT_STEP_PX = 24;
+  const DEFAULT_LIST_HANGING_PX$1 = 18;
+  const SPACE_SUFFIX_GAP_PX = 4;
+  const DEFAULT_TAB_INTERVAL_PX$1 = 48;
+  function resolveListTextStartPx(wordLayout, indentLeft, firstLine, hanging, measureMarkerText) {
+    const marker = wordLayout?.marker;
+    if (!marker) {
+      const textStartPx = wordLayout?.firstLineIndentMode === true && typeof wordLayout.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : void 0;
+      return textStartPx;
+    }
+    const markerBoxWidth = typeof marker.markerBoxWidthPx === "number" && Number.isFinite(marker.markerBoxWidthPx) ? marker.markerBoxWidthPx : 0;
+    let markerTextWidth = typeof marker.glyphWidthPx === "number" && Number.isFinite(marker.glyphWidthPx) ? marker.glyphWidthPx : void 0;
+    if (markerTextWidth == null && marker.markerText) {
+      markerTextWidth = measureMarkerText(marker.markerText, marker);
+    }
+    if (!Number.isFinite(markerTextWidth) || markerTextWidth !== void 0 && markerTextWidth < 0) {
+      markerTextWidth = markerBoxWidth;
+    }
+    const finalMarkerTextWidth = Math.max(0, markerTextWidth ?? 0);
+    let markerStartPos;
+    if (wordLayout?.firstLineIndentMode === true && typeof marker.markerX === "number" && Number.isFinite(marker.markerX)) {
+      markerStartPos = marker.markerX;
+    } else {
+      markerStartPos = indentLeft - hanging + firstLine;
+    }
+    if (!Number.isFinite(markerStartPos)) {
+      markerStartPos = 0;
+    }
+    const currentPos = markerStartPos + finalMarkerTextWidth;
+    const suffix2 = marker.suffix ?? "tab";
+    if (suffix2 === "space") {
+      return markerStartPos + finalMarkerTextWidth + SPACE_SUFFIX_GAP_PX;
+    }
+    if (suffix2 === "nothing") {
+      return markerStartPos + finalMarkerTextWidth;
+    }
+    const markerJustification = marker.justification ?? "left";
+    if (markerJustification !== "left") {
+      const gutterWidth = typeof marker.gutterWidthPx === "number" && Number.isFinite(marker.gutterWidthPx) && marker.gutterWidthPx > 0 ? marker.gutterWidthPx : LIST_MARKER_GAP$1;
+      return markerStartPos + finalMarkerTextWidth + Math.max(gutterWidth, LIST_MARKER_GAP$1);
+    }
+    if (wordLayout?.firstLineIndentMode === true) {
+      let targetTabStop;
+      if (Array.isArray(wordLayout.tabsPx)) {
+        for (const tab of wordLayout.tabsPx) {
+          if (typeof tab === "number" && tab > currentPos) {
+            targetTabStop = tab;
+            break;
+          }
+        }
+      }
+      const textStartTarget = typeof marker.textStartX === "number" && Number.isFinite(marker.textStartX) ? marker.textStartX : wordLayout.textStartPx;
+      let tabWidth2;
+      if (targetTabStop !== void 0) {
+        tabWidth2 = targetTabStop - currentPos;
+      } else if (textStartTarget !== void 0 && Number.isFinite(textStartTarget) && textStartTarget > currentPos) {
+        tabWidth2 = textStartTarget - currentPos;
+      } else {
+        tabWidth2 = LIST_MARKER_GAP$1;
+      }
+      if (tabWidth2 < LIST_MARKER_GAP$1) {
+        tabWidth2 = LIST_MARKER_GAP$1;
+      }
+      return markerStartPos + finalMarkerTextWidth + tabWidth2;
+    }
+    const textStart = indentLeft + firstLine;
+    let tabWidth = textStart - currentPos;
+    if (tabWidth <= 0) {
+      tabWidth = DEFAULT_TAB_INTERVAL_PX$1 - currentPos % DEFAULT_TAB_INTERVAL_PX$1;
+    } else if (tabWidth < LIST_MARKER_GAP$1) {
+      tabWidth = LIST_MARKER_GAP$1;
+    }
+    return markerStartPos + finalMarkerTextWidth + tabWidth;
+  }
   function getWordLayoutConfig(block) {
     if (!block || block.kind !== "paragraph") {
       return void 0;
@@ -82326,9 +82628,16 @@ ${l}
     const isFirstLineIndentMode = wordLayout?.firstLineIndentMode === true;
     let indentAdjust = paraIndentLeft;
     if (isListItem2 && isFirstLine && isFirstLineIndentMode) {
+      const resolvedTextStart = resolveListTextStartPx(
+        wordLayout,
+        paraIndentLeft,
+        Math.max(firstLineIndent, 0),
+        Math.max(hangingIndent, 0),
+        () => markerWidth
+        // Use provided markerWidth since we don't have canvas access here
+      );
       const textStartFallback = paraIndentLeft + Math.max(firstLineIndent, 0) + markerWidth;
-      const markerTextStartX = wordLayout?.marker?.textStartX;
-      indentAdjust = typeof markerTextStartX === "number" && Number.isFinite(markerTextStartX) ? markerTextStartX : typeof wordLayout?.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : textStartFallback;
+      indentAdjust = typeof resolvedTextStart === "number" && Number.isFinite(resolvedTextStart) ? resolvedTextStart : textStartFallback;
     } else if (isFirstLine && !isListItem2) {
       indentAdjust += firstLineOffset;
     }
@@ -82484,7 +82793,10 @@ ${l}
   }
   function createFloatingObjectManager(columns, margins, pageWidth) {
     const zones = [];
-    const marginLeft = Math.max(0, margins?.left ?? 0);
+    let currentColumns = columns;
+    let currentMargins = margins;
+    let currentPageWidth = pageWidth;
+    let marginLeft = Math.max(0, currentMargins?.left ?? 0);
     return {
       registerDrawing(drawingBlock, measure, anchorY, columnIndex, pageNumber) {
         if (!drawingBlock.anchor?.isAnchored) {
@@ -82497,7 +82809,7 @@ ${l}
         }
         const objectWidth = measure.width ?? 0;
         const objectHeight = measure.height ?? 0;
-        const x2 = computeAnchorX(anchor, columnIndex, columns, objectWidth, margins, pageWidth);
+        const x2 = computeAnchorX(anchor, columnIndex, currentColumns, objectWidth, currentMargins, currentPageWidth);
         const y2 = anchorY + (anchor.offsetV ?? 0);
         const zone = {
           imageBlockId: drawingBlock.id,
@@ -82531,7 +82843,7 @@ ${l}
         }
         const tableWidth = measure.totalWidth ?? 0;
         const tableHeight = measure.totalHeight ?? 0;
-        const x2 = computeTableAnchorX(anchor, columnIndex, columns, tableWidth, margins, pageWidth);
+        const x2 = computeTableAnchorX(anchor, columnIndex, currentColumns, tableWidth, currentMargins, currentPageWidth);
         const y2 = anchorY + (anchor.offsetV ?? 0);
         const zone = {
           imageBlockId: tableBlock.id,
@@ -82579,7 +82891,7 @@ ${l}
         }
         const leftFloats = [];
         const rightFloats = [];
-        const columnOrigin = marginLeft + columnIndex * (columns.width + columns.gap);
+        const columnOrigin = marginLeft + columnIndex * (currentColumns.width + currentColumns.gap);
         const columnCenter = columnOrigin + baseWidth / 2;
         for (const zone of wrappingZones) {
           if (zone.wrapMode === "left") {
@@ -82618,6 +82930,22 @@ ${l}
       },
       clear() {
         zones.length = 0;
+      },
+      /**
+       * Update layout context used for positioning and wrapping (columns, margins, page width).
+       * This method should be called when the layout configuration changes (e.g., section breaks,
+       * column changes, page size changes) to ensure floating objects are positioned and wrapped
+       * correctly relative to the new layout boundaries.
+       *
+       * @param nextColumns - Column layout configuration (width, gap, count)
+       * @param nextMargins - Optional page margins (left, right) in pixels
+       * @param nextPageWidth - Optional total page width in pixels
+       */
+      setLayoutContext(nextColumns, nextMargins, nextPageWidth) {
+        currentColumns = nextColumns;
+        currentMargins = nextMargins;
+        currentPageWidth = nextPageWidth;
+        marginLeft = Math.max(0, currentMargins?.left ?? 0);
       }
     };
   }
@@ -82717,7 +83045,14 @@ ${l}
       const props = {};
       if (source.kind !== "sectionBreak") return props;
       if (source.margins) {
-        props.margins = { header: source.margins.header, footer: source.margins.footer };
+        props.margins = {
+          header: source.margins.header,
+          footer: source.margins.footer,
+          top: source.margins.top,
+          right: source.margins.right,
+          bottom: source.margins.bottom,
+          left: source.margins.left
+        };
       }
       if (source.pageSize) {
         props.pageSize = { w: source.pageSize.w, h: source.pageSize.h };
@@ -82748,13 +83083,13 @@ ${l}
       if (maxHeaderContentHeight > 0) {
         return Math.max(baseTop, headerDistance + maxHeaderContentHeight);
       }
-      return Math.max(baseTop, headerDistance);
+      return baseTop;
     };
     const calcRequiredBottomMargin = (footerDistance, baseBottom) => {
       if (maxFooterContentHeight > 0) {
         return Math.max(baseBottom, footerDistance + maxFooterContentHeight);
       }
-      return Math.max(baseBottom, footerDistance);
+      return baseBottom;
     };
     if (block.attrs?.isFirstSection && !next2.hasAnyPages) {
       if (block.pageSize) {
@@ -82765,20 +83100,36 @@ ${l}
         next2.activeOrientation = block.orientation;
         next2.pendingOrientation = null;
       }
+      const headerDistance = typeof block.margins?.header === "number" ? Math.max(0, block.margins.header) : next2.activeHeaderDistance;
+      const footerDistance = typeof block.margins?.footer === "number" ? Math.max(0, block.margins.footer) : next2.activeFooterDistance;
+      const sectionTop = typeof block.margins?.top === "number" ? Math.max(0, block.margins.top) : baseMargins.top;
+      const sectionBottom = typeof block.margins?.bottom === "number" ? Math.max(0, block.margins.bottom) : baseMargins.bottom;
       if (block.margins?.header !== void 0) {
-        const headerDistance = Math.max(0, block.margins.header);
         next2.activeHeaderDistance = headerDistance;
         next2.pendingHeaderDistance = headerDistance;
-        next2.activeTopMargin = calcRequiredTopMargin(headerDistance, baseMargins.top);
-        next2.pendingTopMargin = next2.activeTopMargin;
       }
       if (block.margins?.footer !== void 0) {
-        const footerDistance = Math.max(0, block.margins.footer);
         next2.activeFooterDistance = footerDistance;
         next2.pendingFooterDistance = footerDistance;
-        next2.activeBottomMargin = calcRequiredBottomMargin(footerDistance, baseMargins.bottom);
+      }
+      if (block.margins?.top !== void 0 || block.margins?.header !== void 0) {
+        next2.activeTopMargin = calcRequiredTopMargin(headerDistance, sectionTop);
+        next2.pendingTopMargin = next2.activeTopMargin;
+      }
+      if (block.margins?.bottom !== void 0 || block.margins?.footer !== void 0) {
+        next2.activeBottomMargin = calcRequiredBottomMargin(footerDistance, sectionBottom);
         next2.pendingBottomMargin = next2.activeBottomMargin;
       }
+      if (block.margins?.left !== void 0) {
+        const leftMargin = Math.max(0, block.margins.left);
+        next2.activeLeftMargin = leftMargin;
+        next2.pendingLeftMargin = leftMargin;
+      }
+      if (block.margins?.right !== void 0) {
+        const rightMargin = Math.max(0, block.margins.right);
+        next2.activeRightMargin = rightMargin;
+        next2.pendingRightMargin = rightMargin;
+      }
       if (block.columns) {
         next2.activeColumns = { count: block.columns.count, gap: block.columns.gap };
         next2.pendingColumns = null;
@@ -82787,26 +83138,42 @@ ${l}
     }
     const headerPx = block.margins?.header;
     const footerPx = block.margins?.footer;
+    const topPx = block.margins?.top;
+    const bottomPx = block.margins?.bottom;
     const nextTop = next2.pendingTopMargin ?? next2.activeTopMargin;
     const nextBottom = next2.pendingBottomMargin ?? next2.activeBottomMargin;
+    const nextLeft = next2.pendingLeftMargin ?? next2.activeLeftMargin;
+    const nextRight = next2.pendingRightMargin ?? next2.activeRightMargin;
     const nextHeader = next2.pendingHeaderDistance ?? next2.activeHeaderDistance;
     const nextFooter = next2.pendingFooterDistance ?? next2.activeFooterDistance;
-    if (typeof headerPx === "number") {
-      const newHeaderDist = Math.max(0, headerPx);
+    if (typeof headerPx === "number" || typeof topPx === "number") {
+      const newHeaderDist = typeof headerPx === "number" ? Math.max(0, headerPx) : nextHeader;
+      const sectionTop = typeof topPx === "number" ? Math.max(0, topPx) : baseMargins.top;
       next2.pendingHeaderDistance = newHeaderDist;
-      next2.pendingTopMargin = calcRequiredTopMargin(newHeaderDist, baseMargins.top);
+      next2.pendingTopMargin = calcRequiredTopMargin(newHeaderDist, sectionTop);
     } else {
       next2.pendingTopMargin = nextTop;
       next2.pendingHeaderDistance = nextHeader;
     }
-    if (typeof footerPx === "number") {
-      const newFooterDist = Math.max(0, footerPx);
+    if (typeof footerPx === "number" || typeof bottomPx === "number") {
+      const newFooterDist = typeof footerPx === "number" ? Math.max(0, footerPx) : nextFooter;
+      const sectionBottom = typeof bottomPx === "number" ? Math.max(0, bottomPx) : baseMargins.bottom;
       next2.pendingFooterDistance = newFooterDist;
-      next2.pendingBottomMargin = calcRequiredBottomMargin(newFooterDist, baseMargins.bottom);
+      next2.pendingBottomMargin = calcRequiredBottomMargin(newFooterDist, sectionBottom);
     } else {
       next2.pendingBottomMargin = nextBottom;
       next2.pendingFooterDistance = nextFooter;
     }
+    if (typeof block.margins?.left === "number") {
+      next2.pendingLeftMargin = Math.max(0, block.margins.left);
+    } else {
+      next2.pendingLeftMargin = nextLeft;
+    }
+    if (typeof block.margins?.right === "number") {
+      next2.pendingRightMargin = Math.max(0, block.margins.right);
+    } else {
+      next2.pendingRightMargin = nextRight;
+    }
     if (block.pageSize) {
       next2.pendingPageSize = { w: block.pageSize.w, h: block.pageSize.h };
     }
@@ -82866,6 +83233,12 @@ ${l}
     if (next2.pendingBottomMargin != null) {
       next2.activeBottomMargin = next2.pendingBottomMargin;
     }
+    if (next2.pendingLeftMargin != null) {
+      next2.activeLeftMargin = next2.pendingLeftMargin;
+    }
+    if (next2.pendingRightMargin != null) {
+      next2.activeRightMargin = next2.pendingRightMargin;
+    }
     if (next2.pendingHeaderDistance != null) {
       next2.activeHeaderDistance = next2.pendingHeaderDistance;
     }
@@ -82883,6 +83256,8 @@ ${l}
     }
     next2.pendingTopMargin = null;
     next2.pendingBottomMargin = null;
+    next2.pendingLeftMargin = null;
+    next2.pendingRightMargin = null;
     next2.pendingHeaderDistance = null;
     next2.pendingFooterDistance = null;
     next2.pendingPageSize = null;
@@ -83111,7 +83486,8 @@ ${l}
     if (typeof remeasureParagraph2 === "function" && typeof measurementWidth === "number" && measurementWidth > remeasureWidth) {
       const firstLineIndent = calculateFirstLineIndent(block, measure);
       const newMeasure = remeasureParagraph2(block, columnWidth, firstLineIndent);
-      lines = normalizeLines(newMeasure);
+      const newLines = normalizeLines(newMeasure);
+      lines = newLines;
       didRemeasureForColumnWidth = true;
     }
     let fromLine = 0;
@@ -83193,7 +83569,8 @@ ${l}
       if (narrowestRemeasureWidth < remeasureWidth) {
         const firstLineIndent = calculateFirstLineIndent(block, measure);
         const newMeasure = remeasureParagraph2(block, narrowestRemeasureWidth, firstLineIndent);
-        lines = normalizeLines(newMeasure);
+        const newLines = normalizeLines(newMeasure);
+        lines = newLines;
         didRemeasureForFloats = true;
       }
     }
@@ -83213,6 +83590,11 @@ ${l}
           const prevTrailing = state2.trailingSpacing ?? 0;
           const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
           if (state2.cursorY + neededSpacingBefore > state2.contentBottom) {
+            if (state2.cursorY <= state2.topMargin) {
+              state2.trailingSpacing = 0;
+              appliedSpacingBefore = true;
+              break;
+            }
             state2 = advanceColumn(state2);
             if (state2.trailingSpacing == null) state2.trailingSpacing = 0;
             continue;
@@ -83537,6 +83919,94 @@ ${l}
   function getCellTotalLines(cell2) {
     return getCellLines(cell2).length;
   }
+  function mergePmRange(target, range2) {
+    if (typeof range2.pmStart === "number") {
+      target.pmStart = target.pmStart == null ? range2.pmStart : Math.min(target.pmStart, range2.pmStart);
+    }
+    if (typeof range2.pmEnd === "number") {
+      target.pmEnd = target.pmEnd == null ? range2.pmEnd : Math.max(target.pmEnd, range2.pmEnd);
+    }
+  }
+  function computeCellPmRange(cell2, cellMeasure, fromLine, toLine) {
+    const range2 = {};
+    if (!cell2 || !cellMeasure) return range2;
+    const cellBlocks = cell2.blocks ?? (cell2.paragraph ? [cell2.paragraph] : []);
+    const blockMeasures = cellMeasure.blocks ?? (cellMeasure.paragraph ? [cellMeasure.paragraph] : []);
+    const maxBlocks = Math.min(cellBlocks.length, blockMeasures.length);
+    let cumulativeLineCount = 0;
+    for (let i2 = 0; i2 < maxBlocks; i2++) {
+      const block = cellBlocks[i2];
+      const blockMeasure = blockMeasures[i2];
+      if (blockMeasure.kind === "paragraph" && block?.kind === "paragraph") {
+        const paraMeasure = blockMeasure;
+        const lines = paraMeasure.lines;
+        const blockLineCount = lines?.length ?? 0;
+        const blockStartGlobal = cumulativeLineCount;
+        const blockEndGlobal = cumulativeLineCount + blockLineCount;
+        const localFrom = Math.max(fromLine, blockStartGlobal) - blockStartGlobal;
+        const localTo = Math.min(toLine, blockEndGlobal) - blockStartGlobal;
+        if (lines && lines.length > 0 && localFrom < localTo) {
+          mergePmRange(range2, computeFragmentPmRange(block, lines, localFrom, localTo));
+        } else {
+          mergePmRange(range2, extractBlockPmRange(block));
+        }
+        cumulativeLineCount += blockLineCount;
+        continue;
+      }
+      mergePmRange(range2, extractBlockPmRange(block));
+    }
+    return range2;
+  }
+  function computeTableFragmentPmRange(block, measure, fromRow, toRow, partialRow) {
+    const range2 = {};
+    for (let rowIndex = fromRow; rowIndex < toRow; rowIndex++) {
+      const row2 = block.rows[rowIndex];
+      const rowMeasure = measure.rows[rowIndex];
+      if (!row2 || !rowMeasure) continue;
+      const isPartial = partialRow?.rowIndex === rowIndex;
+      const cellCount = Math.min(row2.cells.length, rowMeasure.cells.length);
+      for (let cellIndex = 0; cellIndex < cellCount; cellIndex++) {
+        const cell2 = row2.cells[cellIndex];
+        const cellMeasure = rowMeasure.cells[cellIndex];
+        if (!cell2 || !cellMeasure) continue;
+        const totalLines = getCellTotalLines(cellMeasure);
+        let fromLine = 0;
+        let toLine = totalLines;
+        if (isPartial) {
+          const hasValidFromLineByCell = partialRow?.fromLineByCell && cellIndex < partialRow.fromLineByCell.length;
+          const hasValidToLineByCell = partialRow?.toLineByCell && cellIndex < partialRow.toLineByCell.length;
+          if (hasValidFromLineByCell) {
+            const rawFrom = partialRow.fromLineByCell[cellIndex];
+            if (typeof rawFrom === "number" && rawFrom >= 0) {
+              fromLine = rawFrom;
+            }
+          }
+          if (hasValidToLineByCell) {
+            const rawTo = partialRow.toLineByCell[cellIndex];
+            if (typeof rawTo === "number") {
+              toLine = rawTo === -1 ? totalLines : rawTo;
+            }
+          }
+        }
+        fromLine = Math.max(0, Math.min(fromLine, totalLines));
+        toLine = Math.max(0, Math.min(toLine, totalLines));
+        if (toLine < fromLine) {
+          toLine = fromLine;
+        }
+        mergePmRange(range2, computeCellPmRange(cell2, cellMeasure, fromLine, toLine));
+      }
+    }
+    return range2;
+  }
+  function applyTableFragmentPmRange(fragment, block, measure) {
+    const range2 = computeTableFragmentPmRange(block, measure, fragment.fromRow, fragment.toRow, fragment.partialRow);
+    if (range2.pmStart != null) {
+      fragment.pmStart = range2.pmStart;
+    }
+    if (range2.pmEnd != null) {
+      fragment.pmEnd = range2.pmEnd;
+    }
+  }
   function computePartialRow(rowIndex, blockRow, measure, availableHeight, fromLineByCell) {
     const row2 = measure.rows[rowIndex];
     if (!row2) {
@@ -83681,6 +84151,7 @@ ${l}
       height,
       metadata
     };
+    applyTableFragmentPmRange(fragment, context.block, context.measure);
     state2.page.fragments.push(fragment);
     state2.cursorY += height;
   }
@@ -83759,6 +84230,7 @@ ${l}
         height,
         metadata
       };
+      applyTableFragmentPmRange(fragment, block, measure);
       state2.page.fragments.push(fragment);
       state2.cursorY += height;
       return;
@@ -83822,6 +84294,7 @@ ${l}
             partialRow: continuationPartialRow,
             metadata: generateFragmentMetadata(measure)
           };
+          applyTableFragmentPmRange(fragment2, block, measure);
           state2.page.fragments.push(fragment2);
           state2.cursorY += fragmentHeight2;
         }
@@ -83866,6 +84339,7 @@ ${l}
           partialRow: forcedPartialRow,
           metadata: generateFragmentMetadata(measure)
         };
+        applyTableFragmentPmRange(fragment2, block, measure);
         state2.page.fragments.push(fragment2);
         state2.cursorY += fragmentHeight2;
         pendingPartialRow = forcedPartialRow;
@@ -83901,6 +84375,7 @@ ${l}
         partialRow: partialRow || void 0,
         metadata: generateFragmentMetadata(measure)
       };
+      applyTableFragmentPmRange(fragment, block, measure);
       state2.page.fragments.push(fragment);
       state2.cursorY += fragmentHeight;
       if (partialRow && !partialRow.isLastPart) {
@@ -83918,7 +84393,7 @@ ${l}
       columnBoundaries: generateColumnBoundaries(measure),
       coordinateSystem: "fragment"
     };
-    return {
+    const fragment = {
       kind: "table",
       blockId: block.id,
       fromRow: 0,
@@ -83929,6 +84404,8 @@ ${l}
       height: measure.totalHeight ?? 0,
       metadata
     };
+    applyTableFragmentPmRange(fragment, block, measure);
+    return fragment;
   }
   function isPageRelativeAnchor(block) {
     const vRelativeFrom = block.anchor?.vRelativeFrom;
@@ -84350,8 +84827,8 @@ ${l}
       header: options.margins?.header ?? options.margins?.top ?? DEFAULT_MARGINS$2.top,
       footer: options.margins?.footer ?? options.margins?.bottom ?? DEFAULT_MARGINS$2.bottom
     };
-    const contentWidth = pageSize.w - (margins.left + margins.right);
-    if (contentWidth <= 0) {
+    const baseContentWidth = pageSize.w - (margins.left + margins.right);
+    if (baseContentWidth <= 0) {
       throw new Error("layoutDocument: pageSize and margins yield non-positive content area");
     }
     const validateContentHeight = (height) => {
@@ -84381,8 +84858,12 @@ ${l}
     const effectiveBottomMargin = maxFooterContentHeight > 0 ? Math.max(margins.bottom, footerDistance + maxFooterContentHeight) : margins.bottom;
     let activeTopMargin = effectiveTopMargin;
     let activeBottomMargin = effectiveBottomMargin;
+    let activeLeftMargin = margins.left;
+    let activeRightMargin = margins.right;
     let pendingTopMargin = null;
     let pendingBottomMargin = null;
+    let pendingLeftMargin = null;
+    let pendingRightMargin = null;
     let activeHeaderDistance = margins.header ?? margins.top;
     let pendingHeaderDistance = null;
     let activeFooterDistance = margins.footer ?? margins.bottom;
@@ -84395,10 +84876,11 @@ ${l}
     let pendingOrientation = null;
     let activeVAlign = null;
     let pendingVAlign = null;
+    const paginatorMargins = { left: activeLeftMargin, right: activeRightMargin };
     const floatManager = createFloatingObjectManager(
-      normalizeColumns(activeColumns, contentWidth),
-      { left: margins.left, right: margins.right },
-      pageSize.w
+      normalizeColumns(activeColumns, activePageSize.w - (activeLeftMargin + activeRightMargin)),
+      { left: activeLeftMargin, right: activeRightMargin },
+      activePageSize.w
     );
     const nextSectionPropsAtBreak = computeNextSectionPropsAtBreak(blocks2);
     const scheduleSectionBreakCompat = (block, state2, baseMargins) => {
@@ -84415,22 +84897,38 @@ ${l}
           next2.activeOrientation = block.orientation;
           next2.pendingOrientation = null;
         }
+        const headerDistance2 = typeof block.margins?.header === "number" ? Math.max(0, block.margins.header) : next2.activeHeaderDistance;
+        const footerDistance2 = typeof block.margins?.footer === "number" ? Math.max(0, block.margins.footer) : next2.activeFooterDistance;
+        const sectionTop = typeof block.margins?.top === "number" ? Math.max(0, block.margins.top) : baseMargins.top;
+        const sectionBottom = typeof block.margins?.bottom === "number" ? Math.max(0, block.margins.bottom) : baseMargins.bottom;
         if (block.margins?.header !== void 0) {
-          const headerDist = Math.max(0, block.margins.header);
-          next2.activeHeaderDistance = headerDist;
-          next2.pendingHeaderDistance = headerDist;
-          const requiredTop = maxHeaderContentHeight > 0 ? headerDist + maxHeaderContentHeight : headerDist;
-          next2.activeTopMargin = Math.max(baseMargins.top, requiredTop);
-          next2.pendingTopMargin = next2.activeTopMargin;
+          next2.activeHeaderDistance = headerDistance2;
+          next2.pendingHeaderDistance = headerDistance2;
         }
         if (block.margins?.footer !== void 0) {
-          const footerDistance2 = Math.max(0, block.margins.footer);
           next2.activeFooterDistance = footerDistance2;
           next2.pendingFooterDistance = footerDistance2;
-          const requiredBottom = maxFooterContentHeight > 0 ? footerDistance2 + maxFooterContentHeight : footerDistance2;
-          next2.activeBottomMargin = Math.max(baseMargins.bottom, requiredBottom);
+        }
+        if (block.margins?.top !== void 0 || block.margins?.header !== void 0) {
+          const requiredTop = maxHeaderContentHeight > 0 ? headerDistance2 + maxHeaderContentHeight : 0;
+          next2.activeTopMargin = Math.max(sectionTop, requiredTop);
+          next2.pendingTopMargin = next2.activeTopMargin;
+        }
+        if (block.margins?.bottom !== void 0 || block.margins?.footer !== void 0) {
+          const requiredBottom = maxFooterContentHeight > 0 ? footerDistance2 + maxFooterContentHeight : 0;
+          next2.activeBottomMargin = Math.max(sectionBottom, requiredBottom);
           next2.pendingBottomMargin = next2.activeBottomMargin;
         }
+        if (block.margins?.left !== void 0) {
+          const leftMargin = Math.max(0, block.margins.left);
+          next2.activeLeftMargin = leftMargin;
+          next2.pendingLeftMargin = leftMargin;
+        }
+        if (block.margins?.right !== void 0) {
+          const rightMargin = Math.max(0, block.margins.right);
+          next2.activeRightMargin = rightMargin;
+          next2.pendingRightMargin = rightMargin;
+        }
         if (block.columns) {
           next2.activeColumns = { count: block.columns.count, gap: block.columns.gap };
           next2.pendingColumns = null;
@@ -84459,27 +84957,35 @@ ${l}
       const headerPx = block.margins?.header;
       const footerPx = block.margins?.footer;
       const topPx = block.margins?.top;
+      const bottomPx = block.margins?.bottom;
+      const leftPx = block.margins?.left;
+      const rightPx = block.margins?.right;
       const nextTop = next2.pendingTopMargin ?? next2.activeTopMargin;
       const nextBottom = next2.pendingBottomMargin ?? next2.activeBottomMargin;
+      const nextLeft = next2.pendingLeftMargin ?? next2.activeLeftMargin;
+      const nextRight = next2.pendingRightMargin ?? next2.activeRightMargin;
       const nextHeader = next2.pendingHeaderDistance ?? next2.activeHeaderDistance;
       const nextFooter = next2.pendingFooterDistance ?? next2.activeFooterDistance;
       next2.pendingHeaderDistance = typeof headerPx === "number" ? Math.max(0, headerPx) : nextHeader;
       next2.pendingFooterDistance = typeof footerPx === "number" ? Math.max(0, footerPx) : nextFooter;
       if (typeof headerPx === "number" || typeof topPx === "number") {
-        const sectionTop = topPx ?? baseMargins.top;
+        const sectionTop = typeof topPx === "number" ? Math.max(0, topPx) : baseMargins.top;
         const sectionHeader = next2.pendingHeaderDistance;
         const requiredTop = maxHeaderContentHeight > 0 ? sectionHeader + maxHeaderContentHeight : sectionHeader;
         next2.pendingTopMargin = Math.max(sectionTop, requiredTop);
       } else {
         next2.pendingTopMargin = nextTop;
       }
-      if (typeof footerPx === "number") {
+      if (typeof footerPx === "number" || typeof bottomPx === "number") {
         const sectionFooter = next2.pendingFooterDistance;
+        const sectionBottom = typeof bottomPx === "number" ? Math.max(0, bottomPx) : baseMargins.bottom;
         const requiredBottom = maxFooterContentHeight > 0 ? sectionFooter + maxFooterContentHeight : sectionFooter;
-        next2.pendingBottomMargin = Math.max(baseMargins.bottom, requiredBottom);
+        next2.pendingBottomMargin = Math.max(sectionBottom, requiredBottom);
       } else {
         next2.pendingBottomMargin = nextBottom;
       }
+      next2.pendingLeftMargin = typeof leftPx === "number" ? Math.max(0, leftPx) : nextLeft;
+      next2.pendingRightMargin = typeof rightPx === "number" ? Math.max(0, rightPx) : nextRight;
       if (block.pageSize) next2.pendingPageSize = { w: block.pageSize.w, h: block.pageSize.h };
       if (block.orientation) next2.pendingOrientation = block.orientation;
       const sectionType = block.type ?? "continuous";
@@ -84564,7 +85070,7 @@ ${l}
     let activeSectionIndex = initialSectionMetadata?.sectionIndex ?? 0;
     let pendingSectionIndex = null;
     const paginator = createPaginator({
-      margins: { left: margins.left, right: margins.right },
+      margins: paginatorMargins,
       getActiveTopMargin: () => activeTopMargin,
       getActiveBottomMargin: () => activeBottomMargin,
       getActiveHeaderDistance: () => activeHeaderDistance,
@@ -84579,8 +85085,12 @@ ${l}
           const applied = applyPendingToActive({
             activeTopMargin,
             activeBottomMargin,
+            activeLeftMargin,
+            activeRightMargin,
             pendingTopMargin,
             pendingBottomMargin,
+            pendingLeftMargin,
+            pendingRightMargin,
             activeHeaderDistance,
             activeFooterDistance,
             pendingHeaderDistance,
@@ -84595,8 +85105,12 @@ ${l}
           });
           activeTopMargin = applied.activeTopMargin;
           activeBottomMargin = applied.activeBottomMargin;
+          activeLeftMargin = applied.activeLeftMargin;
+          activeRightMargin = applied.activeRightMargin;
           pendingTopMargin = applied.pendingTopMargin;
           pendingBottomMargin = applied.pendingBottomMargin;
+          pendingLeftMargin = applied.pendingLeftMargin;
+          pendingRightMargin = applied.pendingRightMargin;
           activeHeaderDistance = applied.activeHeaderDistance;
           activeFooterDistance = applied.activeFooterDistance;
           pendingHeaderDistance = applied.pendingHeaderDistance;
@@ -84608,6 +85122,14 @@ ${l}
           activeOrientation = applied.activeOrientation;
           pendingOrientation = applied.pendingOrientation;
           cachedColumnsState.state = null;
+          paginatorMargins.left = activeLeftMargin;
+          paginatorMargins.right = activeRightMargin;
+          const contentWidth = activePageSize.w - (activeLeftMargin + activeRightMargin);
+          floatManager.setLayoutContext(
+            normalizeColumns(activeColumns, contentWidth),
+            { left: activeLeftMargin, right: activeRightMargin },
+            activePageSize.w
+          );
           if (pendingNumbering) {
             if (pendingNumbering.format) activeNumberFormat = pendingNumbering.format;
             if (typeof pendingNumbering.start === "number" && Number.isFinite(pendingNumbering.start)) {
@@ -84652,7 +85174,7 @@ ${l}
     const getActiveColumnsForState = paginator.getActiveColumnsForState;
     let cachedColumnsState = { state: null, constraintIndex: -2, contentWidth: -1, colsConfig: null, normalized: null };
     const getCurrentColumns = () => {
-      const currentContentWidth = activePageSize.w - (margins.left + margins.right);
+      const currentContentWidth = activePageSize.w - (activeLeftMargin + activeRightMargin);
       const state2 = states[states.length - 1] ?? null;
       const colsConfig = state2 ? getActiveColumnsForState(state2) : activeColumns;
       const constraintIndex = state2 ? state2.activeConstraintIndex : -1;
@@ -84685,6 +85207,12 @@ ${l}
       layoutLog(`  Current page: ${state2.page.number}, cursorY: ${state2.cursorY}`);
       activeColumns = newColumns;
       cachedColumnsState.state = null;
+      const contentWidth = activePageSize.w - (activeLeftMargin + activeRightMargin);
+      floatManager.setLayoutContext(
+        normalizeColumns(activeColumns, contentWidth),
+        { left: activeLeftMargin, right: activeRightMargin },
+        activePageSize.w
+      );
     };
     const anchoredByParagraph = collectAnchoredDrawings(blocks2, measures);
     const anchoredTablesByParagraph = collectAnchoredTables(blocks2, measures);
@@ -84716,10 +85244,10 @@ ${l}
         if (alignV === "top") {
           anchorY = offsetV;
         } else if (alignV === "bottom") {
-          const pageHeight = contentBottom + margins.bottom;
+          const pageHeight = contentBottom + (state2.page.margins?.bottom ?? activeBottomMargin);
           anchorY = pageHeight - imageHeight + offsetV;
         } else if (alignV === "center") {
-          const pageHeight = contentBottom + margins.bottom;
+          const pageHeight = contentBottom + (state2.page.margins?.bottom ?? activeBottomMargin);
           anchorY = (pageHeight - imageHeight) / 2 + offsetV;
         } else {
           anchorY = offsetV;
@@ -84730,11 +85258,11 @@ ${l}
       const anchorX = entry.block.anchor ? computeAnchorX(
         entry.block.anchor,
         state2.columnIndex,
-        normalizeColumns(activeColumns, contentWidth),
+        normalizeColumns(activeColumns, activePageSize.w - (activeLeftMargin + activeRightMargin)),
         entry.measure.width,
-        { left: margins.left, right: margins.right },
+        { left: activeLeftMargin, right: activeRightMargin },
         activePageSize.w
-      ) : margins.left;
+      ) : activeLeftMargin;
       floatManager.registerDrawing(entry.block, entry.measure, anchorY, state2.columnIndex, state2.page.number);
       preRegisteredPositions.set(entry.block.id, { anchorX, anchorY, pageNumber: state2.page.number });
     }
@@ -84772,8 +85300,12 @@ ${l}
         const sectionState = {
           activeTopMargin,
           activeBottomMargin,
+          activeLeftMargin,
+          activeRightMargin,
           pendingTopMargin,
           pendingBottomMargin,
+          pendingLeftMargin,
+          pendingRightMargin,
           activeHeaderDistance,
           activeFooterDistance,
           pendingHeaderDistance,
@@ -84807,8 +85339,12 @@ ${l}
         layoutLog(`[Layout] ========== END SECTION BREAK ==========`);
         activeTopMargin = updatedState.activeTopMargin;
         activeBottomMargin = updatedState.activeBottomMargin;
+        activeLeftMargin = updatedState.activeLeftMargin;
+        activeRightMargin = updatedState.activeRightMargin;
         pendingTopMargin = updatedState.pendingTopMargin;
         pendingBottomMargin = updatedState.pendingBottomMargin;
+        pendingLeftMargin = updatedState.pendingLeftMargin;
+        pendingRightMargin = updatedState.pendingRightMargin;
         activeHeaderDistance = updatedState.activeHeaderDistance;
         activeFooterDistance = updatedState.activeFooterDistance;
         pendingHeaderDistance = updatedState.pendingHeaderDistance;
@@ -84946,8 +85482,8 @@ ${l}
             pageMargins: {
               top: activeTopMargin,
               bottom: activeBottomMargin,
-              left: margins.left,
-              right: margins.right
+              left: activeLeftMargin,
+              right: activeRightMargin
             },
             columns: getCurrentColumns(),
             placedAnchoredIds
@@ -84969,9 +85505,9 @@ ${l}
           const cols = getCurrentColumns();
           let maxWidth;
           if (relativeFrom === "page") {
-            maxWidth = cols.count === 1 ? activePageSize.w - margins.left - margins.right : activePageSize.w;
+            maxWidth = cols.count === 1 ? activePageSize.w - (activeLeftMargin + activeRightMargin) : activePageSize.w;
           } else if (relativeFrom === "margin") {
-            maxWidth = activePageSize.w - margins.left - margins.right;
+            maxWidth = activePageSize.w - (activeLeftMargin + activeRightMargin);
           } else {
             maxWidth = cols.width;
           }
@@ -85129,8 +85665,11 @@ ${l}
       throw new Error("layoutHeaderFooter: width must be positive");
     }
     if (!Number.isFinite(height) || height <= 0) {
-      throw new Error("layoutHeaderFooter: height must be positive");
+      return { pages: [], height: 0 };
     }
+    const maxBehindDocOverflow = Math.max(192, height * 4);
+    const minBehindDocY = -maxBehindDocOverflow;
+    const maxBehindDocY = height + maxBehindDocOverflow;
     const marginLeft = constraints.margins?.left ?? 0;
     const transformedBlocks = marginLeft > 0 ? blocks2.map((block) => {
       const hasPageRelativeAnchor = (block.kind === "image" || block.kind === "drawing") && block.anchor?.hRelativeFrom === "page" && block.anchor.offsetH != null;
@@ -85161,6 +85700,18 @@ ${l}
         if (idx == null) continue;
         const block = blocks2[idx];
         const measure = measures[idx];
+        const isAnchoredFragment = (fragment.kind === "image" || fragment.kind === "drawing") && fragment.isAnchored === true;
+        if (isAnchoredFragment) {
+          if (block.kind !== "image" && block.kind !== "drawing") {
+            throw new Error(
+              `Type mismatch: fragment kind is ${fragment.kind} but block kind is ${block.kind} for block ${block.id}`
+            );
+          }
+          const anchoredBlock = block;
+          if (anchoredBlock.anchor?.behindDoc && (fragment.y < minBehindDocY || fragment.y > maxBehindDocY)) {
+            continue;
+          }
+        }
         if (fragment.y < minY) minY = fragment.y;
         let bottom2 = fragment.y;
         if (fragment.kind === "para" && measure?.kind === "paragraph") {
@@ -86158,11 +86709,11 @@ ${l}
     if (text2.length === 0) return null;
     const clampedPos = Math.max(0, Math.min(localPos, text2.length));
     let wordStart = clampedPos;
-    while (wordStart > 0 && isWordChar(text2[wordStart - 1])) {
+    while (wordStart > 0 && isWordChar$2(text2[wordStart - 1])) {
       wordStart--;
     }
     let wordEnd = clampedPos;
-    while (wordEnd < text2.length && isWordChar(text2[wordEnd])) {
+    while (wordEnd < text2.length && isWordChar$2(text2[wordEnd])) {
       wordEnd++;
     }
     if (wordStart === wordEnd) {
@@ -86225,7 +86776,7 @@ ${l}
     }
     return null;
   }
-  function isWordChar(char) {
+  function isWordChar$2(char) {
     return /[\p{L}\p{N}_]/u.test(char);
   }
   function isWhitespace$1(char) {
@@ -86260,6 +86811,29 @@ ${l}
   function runText(run2) {
     return "src" in run2 || run2.kind === "lineBreak" || run2.kind === "break" || run2.kind === "fieldAnnotation" ? "" : run2.text ?? "";
   }
+  const isWordChar$1 = (char) => {
+    if (!char) return false;
+    const code2 = char.charCodeAt(0);
+    return code2 >= 48 && code2 <= 57 || code2 >= 65 && code2 <= 90 || code2 >= 97 && code2 <= 122 || char === "'";
+  };
+  const capitalizeText$1 = (text2, fullText, startOffset) => {
+    if (!text2) return text2;
+    const hasFullText = typeof startOffset === "number" && fullText != null;
+    let result = "";
+    for (let i2 = 0; i2 < text2.length; i2 += 1) {
+      const prevChar = hasFullText ? startOffset + i2 > 0 ? fullText[startOffset + i2 - 1] : "" : i2 > 0 ? text2[i2 - 1] : "";
+      const ch = text2[i2];
+      result += isWordChar$1(ch) && !isWordChar$1(prevChar) ? ch.toUpperCase() : ch;
+    }
+    return result;
+  };
+  const applyTextTransform$1 = (text2, transform, fullText, startOffset) => {
+    if (!text2 || !transform || transform === "none") return text2;
+    if (transform === "uppercase") return text2.toUpperCase();
+    if (transform === "lowercase") return text2.toLowerCase();
+    if (transform === "capitalize") return capitalizeText$1(text2, fullText, startOffset);
+    return text2;
+  };
   const DEFAULT_TAB_INTERVAL_TWIPS$1 = 720;
   const TWIPS_PER_INCH$4 = 1440;
   const PX_PER_INCH$3 = 96;
@@ -86268,6 +86842,13 @@ ${l}
   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 markerFontString = (run2) => {
+    const size2 = run2?.fontSize ?? 16;
+    const family = run2?.fontFamily ?? "Arial";
+    const italic = run2?.italic ? "italic " : "";
+    const bold = run2?.bold ? "bold " : "";
+    return `${italic}${bold}${size2}px ${family}`.trim();
+  };
   const buildTabStopsPx$1 = (indent2, tabs, tabIntervalTwips) => {
     const paragraphIndentTwips = {
       left: pxToTwips$1(Math.max(0, indent2?.left ?? 0)),
@@ -86298,7 +86879,9 @@ ${l}
   };
   function measureRunSliceWidth(run2, fromChar, toChar) {
     const context = getCtx();
-    const text2 = runText(run2).slice(fromChar, toChar);
+    const fullText = runText(run2);
+    const transform = isTextRun$2(run2) ? run2.textTransform : void 0;
+    const text2 = applyTextTransform$1(fullText.slice(fromChar, toChar), transform, fullText, fromChar);
     if (!context) {
       const textRun = isTextRun$2(run2) ? run2 : null;
       const size2 = textRun?.fontSize ?? 16;
@@ -86344,8 +86927,21 @@ ${l}
     const contentWidth = Math.max(1, maxWidth - indentLeft - indentRight);
     const markerTextStartX = wordLayout?.marker?.textStartX;
     const textStartPx = typeof markerTextStartX === "number" && Number.isFinite(markerTextStartX) ? markerTextStartX : typeof wordLayout?.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : void 0;
-    const treatAsHanging = textStartPx && indentLeft === 0 && indentHanging === 0;
-    const firstLineWidth = typeof textStartPx === "number" && textStartPx > indentLeft && !treatAsHanging ? Math.max(1, maxWidth - textStartPx - indentRight) : Math.max(1, contentWidth - rawFirstLineOffset);
+    const resolvedTextStartPx = resolveListTextStartPx(
+      wordLayout,
+      indentLeft,
+      indentFirstLine,
+      indentHanging,
+      (markerText, marker) => {
+        const context = getCtx();
+        if (!context) return 0;
+        context.font = markerFontString(marker.run);
+        return context.measureText(markerText).width;
+      }
+    );
+    const effectiveTextStartPx = resolvedTextStartPx ?? textStartPx;
+    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 - rawFirstLineOffset);
     const tabStops = buildTabStopsPx$1(indent2, attrs?.tabs, attrs?.tabIntervalTwips);
     let currentRun = 0;
     let currentChar = 0;
@@ -86885,7 +87481,7 @@ ${l}
     if (dirty.deletedBlockIds.length > 0) {
       measureCache.invalidate(dirty.deletedBlockIds);
     }
-    const { measurementWidth, measurementHeight } = resolveMeasurementConstraints(options);
+    const { measurementWidth, measurementHeight } = resolveMeasurementConstraints(options, nextBlocks);
     if (measurementWidth <= 0 || measurementHeight <= 0) {
       throw new Error("incrementalLayout: invalid measurement constraints resolved from options");
     }
@@ -86915,7 +87511,9 @@ ${l}
       `[Perf] 4.1 Measure all blocks: ${(measureEnd - measureStart).toFixed(2)}ms (${cacheMisses} measured, ${cacheHits} cached)`
     );
     let headerContentHeights;
-    if (headerFooter?.constraints && headerFooter.headerBlocks) {
+    const hasHeaderBlocks = headerFooter?.headerBlocks && Object.keys(headerFooter.headerBlocks).length > 0;
+    const hasHeaderBlocksByRId = headerFooter?.headerBlocksByRId && headerFooter.headerBlocksByRId.size > 0;
+    if (headerFooter?.constraints && (hasHeaderBlocks || hasHeaderBlocksByRId)) {
       const hfPreStart = performance.now();
       const measureFn = headerFooter.measure ?? measureBlock2;
       invalidateHeaderFooterCache(
@@ -86927,25 +87525,45 @@ ${l}
         options.sectionMetadata
       );
       const HEADER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT = 1;
-      const preHeaderLayouts = await layoutHeaderFooterWithCache(
-        headerFooter.headerBlocks,
-        headerFooter.constraints,
-        measureFn,
-        headerMeasureCache,
-        HEADER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT,
-        void 0
-        // No page resolver needed for height calculation
-      );
       const isValidHeaderType = (key2) => {
         return ["default", "first", "even", "odd"].includes(key2);
       };
       headerContentHeights = {};
-      for (const [type2, value] of Object.entries(preHeaderLayouts)) {
-        if (!isValidHeaderType(type2)) continue;
-        if (value?.layout && typeof value.layout.height === "number") {
-          const height = value.layout.height;
-          if (Number.isFinite(height) && height >= 0) {
-            headerContentHeights[type2] = height;
+      if (hasHeaderBlocks && headerFooter.headerBlocks) {
+        const preHeaderLayouts = await layoutHeaderFooterWithCache(
+          headerFooter.headerBlocks,
+          headerFooter.constraints,
+          measureFn,
+          headerMeasureCache,
+          HEADER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT,
+          void 0
+          // No page resolver needed for height calculation
+        );
+        for (const [type2, value] of Object.entries(preHeaderLayouts)) {
+          if (!isValidHeaderType(type2)) continue;
+          if (value?.layout && typeof value.layout.height === "number") {
+            const height = value.layout.height;
+            if (Number.isFinite(height) && height >= 0) {
+              headerContentHeights[type2] = height;
+            }
+          }
+        }
+      }
+      if (hasHeaderBlocksByRId && headerFooter.headerBlocksByRId) {
+        for (const [_rId, blocks2] of headerFooter.headerBlocksByRId) {
+          if (!blocks2 || blocks2.length === 0) continue;
+          const measureConstraints = {
+            maxWidth: headerFooter.constraints.width,
+            maxHeight: headerFooter.constraints.height
+          };
+          const measures2 = await Promise.all(blocks2.map((block) => measureFn(block, measureConstraints)));
+          const layout2 = layoutHeaderFooter(blocks2, measures2, {
+            width: headerFooter.constraints.width,
+            height: headerFooter.constraints.height
+          });
+          if (layout2.height > 0) {
+            const currentDefault = headerContentHeights.default ?? 0;
+            headerContentHeights.default = Math.max(currentDefault, layout2.height);
           }
         }
       }
@@ -86953,10 +87571,12 @@ ${l}
       perfLog(`[Perf] 4.1.5 Pre-layout headers for height: ${(hfPreEnd - hfPreStart).toFixed(2)}ms`);
     }
     let footerContentHeights;
-    if (headerFooter?.constraints && headerFooter.footerBlocks) {
+    const hasFooterBlocks = headerFooter?.footerBlocks && Object.keys(headerFooter.footerBlocks).length > 0;
+    const hasFooterBlocksByRId = headerFooter?.footerBlocksByRId && headerFooter.footerBlocksByRId.size > 0;
+    if (headerFooter?.constraints && (hasFooterBlocks || hasFooterBlocksByRId)) {
       const footerPreStart = performance.now();
       const measureFn = headerFooter.measure ?? measureBlock2;
-      if (!headerFooter.headerBlocks) {
+      if (!hasHeaderBlocks && !hasHeaderBlocksByRId) {
         invalidateHeaderFooterCache(
           headerMeasureCache,
           headerFooterCacheState,
@@ -86967,26 +87587,46 @@ ${l}
         );
       }
       const FOOTER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT = 1;
+      const isValidFooterType = (key2) => {
+        return ["default", "first", "even", "odd"].includes(key2);
+      };
+      footerContentHeights = {};
       try {
-        const preFooterLayouts = await layoutHeaderFooterWithCache(
-          headerFooter.footerBlocks,
-          headerFooter.constraints,
-          measureFn,
-          headerMeasureCache,
-          FOOTER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT,
-          void 0
-          // No page resolver needed for height calculation
-        );
-        const isValidFooterType = (key2) => {
-          return ["default", "first", "even", "odd"].includes(key2);
-        };
-        footerContentHeights = {};
-        for (const [type2, value] of Object.entries(preFooterLayouts)) {
-          if (!isValidFooterType(type2)) continue;
-          if (value?.layout && typeof value.layout.height === "number") {
-            const height = value.layout.height;
-            if (Number.isFinite(height) && height >= 0) {
-              footerContentHeights[type2] = height;
+        if (hasFooterBlocks && headerFooter.footerBlocks) {
+          const preFooterLayouts = await layoutHeaderFooterWithCache(
+            headerFooter.footerBlocks,
+            headerFooter.constraints,
+            measureFn,
+            headerMeasureCache,
+            FOOTER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT,
+            void 0
+            // No page resolver needed for height calculation
+          );
+          for (const [type2, value] of Object.entries(preFooterLayouts)) {
+            if (!isValidFooterType(type2)) continue;
+            if (value?.layout && typeof value.layout.height === "number") {
+              const height = value.layout.height;
+              if (Number.isFinite(height) && height >= 0) {
+                footerContentHeights[type2] = height;
+              }
+            }
+          }
+        }
+        if (hasFooterBlocksByRId && headerFooter.footerBlocksByRId) {
+          for (const [_rId, blocks2] of headerFooter.footerBlocksByRId) {
+            if (!blocks2 || blocks2.length === 0) continue;
+            const measureConstraints = {
+              maxWidth: headerFooter.constraints.width,
+              maxHeight: headerFooter.constraints.height
+            };
+            const measures2 = await Promise.all(blocks2.map((block) => measureFn(block, measureConstraints)));
+            const layout2 = layoutHeaderFooter(blocks2, measures2, {
+              width: headerFooter.constraints.width,
+              height: headerFooter.constraints.height
+            });
+            if (layout2.height > 0) {
+              const currentDefault = footerContentHeights.default ?? 0;
+              footerContentHeights.default = Math.max(currentDefault, layout2.height);
             }
           }
         }
@@ -87154,7 +87794,7 @@ ${l}
   const DEFAULT_PAGE_SIZE$1 = { w: 612, h: 792 };
   const DEFAULT_MARGINS$1 = { top: 72, right: 72, bottom: 72, left: 72 };
   const normalizeMargin = (value, fallback) => Number.isFinite(value) ? value : fallback;
-  function resolveMeasurementConstraints(options) {
+  function resolveMeasurementConstraints(options, blocks2) {
     const pageSize = options.pageSize ?? DEFAULT_PAGE_SIZE$1;
     const margins = {
       top: normalizeMargin(options.margins?.top, DEFAULT_MARGINS$1.top),
@@ -87162,23 +87802,41 @@ ${l}
       bottom: normalizeMargin(options.margins?.bottom, DEFAULT_MARGINS$1.bottom),
       left: normalizeMargin(options.margins?.left, DEFAULT_MARGINS$1.left)
     };
-    const contentWidth = pageSize.w - (margins.left + margins.right);
-    const contentHeight = pageSize.h - (margins.top + margins.bottom);
-    const columns = options.columns;
-    if (columns && columns.count > 1) {
+    const baseContentWidth = pageSize.w - (margins.left + margins.right);
+    const baseContentHeight = pageSize.h - (margins.top + margins.bottom);
+    const computeColumnWidth = (contentWidth, columns) => {
+      if (!columns || columns.count <= 1) return contentWidth;
       const gap = Math.max(0, columns.gap ?? 0);
       const totalGap = gap * (columns.count - 1);
-      const columnWidth = (contentWidth - totalGap) / columns.count;
-      if (columnWidth > 0) {
-        return {
-          measurementWidth: columnWidth,
-          measurementHeight: contentHeight
+      return (contentWidth - totalGap) / columns.count;
+    };
+    let measurementWidth = computeColumnWidth(baseContentWidth, options.columns);
+    let measurementHeight = baseContentHeight;
+    if (blocks2 && blocks2.length > 0) {
+      for (const block of blocks2) {
+        if (block.kind !== "sectionBreak") continue;
+        const sectionPageSize = block.pageSize ?? pageSize;
+        const sectionMargins = {
+          top: normalizeMargin(block.margins?.top, margins.top),
+          right: normalizeMargin(block.margins?.right, margins.right),
+          bottom: normalizeMargin(block.margins?.bottom, margins.bottom),
+          left: normalizeMargin(block.margins?.left, margins.left)
         };
+        const contentWidth = sectionPageSize.w - (sectionMargins.left + sectionMargins.right);
+        const contentHeight = sectionPageSize.h - (sectionMargins.top + sectionMargins.bottom);
+        if (contentWidth <= 0 || contentHeight <= 0) continue;
+        const columnWidth = computeColumnWidth(contentWidth, block.columns ?? options.columns);
+        if (columnWidth > measurementWidth) {
+          measurementWidth = columnWidth;
+        }
+        if (contentHeight > measurementHeight) {
+          measurementHeight = contentHeight;
+        }
       }
     }
     return {
-      measurementWidth: contentWidth,
-      measurementHeight: contentHeight
+      measurementWidth,
+      measurementHeight
     };
   }
   const serializeHeaderFooterResults = (kind, batch2) => {
@@ -89568,14 +90226,15 @@ ${l}
     if (!schema) return [];
     const types2 = [];
     try {
-      schema.nodes.forEach((nodeType, name) => {
+      for (const name in schema.nodes) {
         if (name === "text") {
-          return;
+          continue;
         }
-        if (nodeType.isAtom || nodeType.isLeaf) {
+        const nodeType = schema.nodes[name];
+        if (nodeType && (nodeType.isAtom || nodeType.isLeaf)) {
           types2.push(name);
         }
-      });
+      }
     } catch {
       return [];
     }
@@ -90978,6 +91637,7 @@ ${l}
   function hasIntrinsicBoundarySignals(_2) {
     return false;
   }
+  const DEFAULT_HEADER_FOOTER_MARGIN_PX = 0;
   function shouldIgnoreSectionBreak(paragraph2, index2, total, hasBodySectPr) {
     const paragraphAttrs = paragraph2.attrs ?? {};
     const paragraphProperties = paragraphAttrs?.paragraphProperties;
@@ -91018,14 +91678,15 @@ ${l}
       const sectionData = extractSectionData(item.node);
       if (!sectionData) return;
       const sectPr = getSectPrFromNode(item.node);
+      const hasAnyMargin = sectionData.headerPx != null || sectionData.footerPx != null || sectionData.topPx != null || sectionData.rightPx != null || sectionData.bottomPx != null || sectionData.leftPx != null;
       const range2 = {
         sectionIndex: idx,
         startParagraphIndex: currentStart,
         endParagraphIndex: item.index,
         sectPr,
-        margins: sectionData.headerPx != null || sectionData.footerPx != null ? {
-          header: sectionData.headerPx ?? 0,
-          footer: sectionData.footerPx ?? 0,
+        margins: hasAnyMargin ? {
+          header: sectionData.headerPx ?? DEFAULT_HEADER_FOOTER_MARGIN_PX,
+          footer: sectionData.footerPx ?? DEFAULT_HEADER_FOOTER_MARGIN_PX,
           top: sectionData.topPx,
           right: sectionData.rightPx,
           bottom: sectionData.bottomPx,
@@ -91067,14 +91728,15 @@ ${l}
     };
     const bodySectionData = extractSectionData(tempNode);
     if (!bodySectionData) return null;
+    const hasAnyMargin = bodySectionData.headerPx != null || bodySectionData.footerPx != null || bodySectionData.topPx != null || bodySectionData.rightPx != null || bodySectionData.bottomPx != null || bodySectionData.leftPx != null;
     return {
       sectionIndex,
       startParagraphIndex: currentStart,
       endParagraphIndex: totalParagraphs - 1,
       sectPr: bodySectPr,
-      margins: bodySectionData.headerPx != null || bodySectionData.footerPx != null ? {
-        header: bodySectionData.headerPx ?? 0,
-        footer: bodySectionData.footerPx ?? 0,
+      margins: hasAnyMargin ? {
+        header: bodySectionData.headerPx ?? DEFAULT_HEADER_FOOTER_MARGIN_PX,
+        footer: bodySectionData.footerPx ?? DEFAULT_HEADER_FOOTER_MARGIN_PX,
         top: bodySectionData.topPx,
         right: bodySectionData.rightPx,
         bottom: bodySectionData.bottomPx,
@@ -92058,11 +92720,27 @@ ${l}
     }, void 0);
   };
   const normalizeUnderlineStyle = (value) => {
-    if (value === "none") {
-      return void 0;
+    if (value === void 0 || value === null) {
+      return "single";
     }
-    if (value === "double" || value === "dotted" || value === "dashed" || value === "wavy") {
-      return value;
+    if (typeof value === "boolean") {
+      return value ? "single" : void 0;
+    }
+    if (typeof value === "number") {
+      return value === 0 ? void 0 : "single";
+    }
+    if (typeof value === "string") {
+      const normalized = value.trim().toLowerCase();
+      if (!normalized) {
+        return "single";
+      }
+      if (normalized === "none" || normalized === "0" || normalized === "false" || normalized === "off") {
+        return void 0;
+      }
+      if (normalized === "double" || normalized === "dotted" || normalized === "dashed" || normalized === "wavy") {
+        return normalized;
+      }
+      return "single";
     }
     return "single";
   };
@@ -92214,13 +92892,16 @@ ${l}
             break;
           }
           case "underline": {
-            const style2 = normalizeUnderlineStyle(mark2.attrs?.underlineType);
+            const underlineValue = mark2.attrs?.underlineType ?? mark2.attrs?.value ?? mark2.attrs?.underline ?? mark2.attrs?.style;
+            const style2 = normalizeUnderlineStyle(underlineValue);
             if (style2) {
               const underlineColor = resolveColorFromAttributes(mark2.attrs ?? {}, themeColors);
               run2.underline = {
                 style: style2,
                 color: underlineColor ?? run2.underline?.color
               };
+            } else if (underlineValue !== void 0 && underlineValue !== null) {
+              delete run2.underline;
             }
             break;
           }
@@ -93156,8 +93837,8 @@ ${l}
     }
     return void 0;
   }
-  const DEFAULT_LIST_HANGING_PX$1 = 18;
-  const LIST_MARKER_GAP$1 = 8;
+  const DEFAULT_LIST_HANGING_PX = 18;
+  const LIST_MARKER_GAP = 8;
   const DEFAULT_BULLET_GLYPH = "•";
   const DEFAULT_DECIMAL_PATTERN = "%1.";
   const ASCII_UPPERCASE_A = 65;
@@ -93568,7 +94249,7 @@ ${l}
     let markerBoxWidthPx;
     let markerX;
     if (hasFirstLineIndent) {
-      markerBoxWidthPx = glyphWidthPx != null && glyphWidthPx > 0 ? glyphWidthPx + LIST_MARKER_GAP$1 : DEFAULT_LIST_HANGING_PX$1;
+      markerBoxWidthPx = glyphWidthPx != null && glyphWidthPx > 0 ? glyphWidthPx + LIST_MARKER_GAP : DEFAULT_LIST_HANGING_PX;
       markerX = indentLeftPx + (firstLinePx ?? 0);
       layout.textStartPx = markerX + markerBoxWidthPx;
       layout.hangingPx = 0;
@@ -93668,12 +94349,12 @@ ${l}
     let markerBox = Math.max(hangingPxRaw || 0, 0);
     if (markerBox <= 0) {
       if (glyphWidthPx != null && glyphWidthPx > 0) {
-        markerBox = glyphWidthPx + LIST_MARKER_GAP$1;
+        markerBox = glyphWidthPx + LIST_MARKER_GAP;
       } else {
-        markerBox = DEFAULT_LIST_HANGING_PX$1;
+        markerBox = DEFAULT_LIST_HANGING_PX;
       }
-    } else if (glyphWidthPx != null && glyphWidthPx + LIST_MARKER_GAP$1 > markerBox) {
-      markerBox = glyphWidthPx + LIST_MARKER_GAP$1;
+    } else if (glyphWidthPx != null && glyphWidthPx + LIST_MARKER_GAP > markerBox) {
+      markerBox = glyphWidthPx + LIST_MARKER_GAP;
     }
     return markerBox;
   };
@@ -93693,7 +94374,7 @@ ${l}
     textStartX: textStartPx,
     baselineOffsetPx: markerRun.baselineShift ?? 0,
     // Gutter is the small gap between marker and text, not the full marker box width
-    gutterWidthPx: LIST_MARKER_GAP$1,
+    gutterWidthPx: LIST_MARKER_GAP,
     justification: numbering.lvlJc ?? "left",
     suffix: normalizeSuffix$1(numbering.suffix) ?? "tab",
     run: markerRun,
@@ -93783,7 +94464,10 @@ ${l}
       tabStops: cloneIfObject(resolvedExtended.tabStops),
       keepLines: resolvedExtended.keepLines,
       keepNext: resolvedExtended.keepNext,
-      numberingProperties: cloneIfObject(resolvedAsRecord.numberingProperties)
+      numberingProperties: cloneIfObject(resolvedAsRecord.numberingProperties),
+      // Extract contextualSpacing from style resolution - this is a sibling to spacing in OOXML,
+      // not nested within it. When true, suppresses spacing between paragraphs of the same style.
+      contextualSpacing: resolvedExtended.contextualSpacing
     };
     return hydrated;
   };
@@ -94385,6 +95069,31 @@ ${l}
       return null;
     }
   };
+  const normalizeWordLayoutForIndent = (wordLayout, paragraphIndent) => {
+    const resolvedIndent = wordLayout.resolvedIndent ?? paragraphIndent ?? {};
+    const indentLeft = isFiniteNumber(resolvedIndent.left) ? resolvedIndent.left : 0;
+    const firstLine = isFiniteNumber(resolvedIndent.firstLine) ? resolvedIndent.firstLine : 0;
+    const hanging = isFiniteNumber(resolvedIndent.hanging) ? resolvedIndent.hanging : 0;
+    const shouldFirstLineIndentMode = firstLine > 0 && !hanging;
+    if (wordLayout.firstLineIndentMode === true && !shouldFirstLineIndentMode) {
+      wordLayout.firstLineIndentMode = false;
+    }
+    if (wordLayout.firstLineIndentMode === true) {
+      if (isFiniteNumber(wordLayout.textStartPx)) {
+        if (wordLayout.marker && (!isFiniteNumber(wordLayout.marker.textStartX) || wordLayout.marker.textStartX !== wordLayout.textStartPx)) {
+          wordLayout.marker.textStartX = wordLayout.textStartPx;
+        }
+      } else if (wordLayout.marker && isFiniteNumber(wordLayout.marker.textStartX)) {
+        wordLayout.textStartPx = wordLayout.marker.textStartX;
+      }
+    } else {
+      wordLayout.textStartPx = indentLeft;
+      if (wordLayout.marker) {
+        wordLayout.marker.textStartX = indentLeft;
+      }
+    }
+    return wordLayout;
+  };
   const computeParagraphAttrs = (para, styleContext, listCounterContext, converterContext, hydrationOverride) => {
     const attrs = para.attrs ?? {};
     const paragraphProps = typeof attrs.paragraphProperties === "object" && attrs.paragraphProperties !== null ? attrs.paragraphProperties : {};
@@ -94493,7 +95202,7 @@ ${l}
         paragraphAttrs.spacing.afterAutospacing = normalizedSpacing.afterAutospacing;
       }
     }
-    const contextualSpacingValue = normalizedSpacing?.contextualSpacing ?? safeGetProperty(paragraphProps, "contextualSpacing") ?? safeGetProperty(attrs, "contextualSpacing");
+    const contextualSpacingValue = normalizedSpacing?.contextualSpacing ?? safeGetProperty(paragraphProps, "contextualSpacing") ?? safeGetProperty(attrs, "contextualSpacing") ?? hydrated?.contextualSpacing;
     if (contextualSpacingValue != null) {
       paragraphAttrs.contextualSpacing = isTruthy(contextualSpacingValue);
     }
@@ -94707,8 +95416,11 @@ ${l}
       let wordLayout = computeWordLayoutForParagraph(paragraphAttrs, enrichedNumberingProps, styleContext);
       if (!wordLayout && enrichedNumberingProps.resolvedLevelIndent) {
         const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
-        const firstLinePx = resolvedIndentPx?.firstLine ?? 0;
-        if (firstLinePx > 0) {
+        const baseIndent = resolvedIndentPx ?? enrichedNumberingProps.resolvedLevelIndent;
+        const mergedIndent = { ...baseIndent, ...paragraphAttrs.indent ?? {} };
+        const firstLinePx = isFiniteNumber(mergedIndent.firstLine) ? mergedIndent.firstLine : 0;
+        const hangingPx = isFiniteNumber(mergedIndent.hanging) ? mergedIndent.hanging : 0;
+        if (firstLinePx > 0 && !hangingPx) {
           wordLayout = {
             // Treat as first-line-indent mode: text starts after the marker+firstLine offset.
             firstLineIndentMode: true,
@@ -94716,10 +95428,13 @@ ${l}
           };
         }
       }
-      if (wordLayout && (!wordLayout.textStartPx || !Number.isFinite(wordLayout.textStartPx)) && enrichedNumberingProps.resolvedLevelIndent) {
+      if (wordLayout && !Number.isFinite(wordLayout.textStartPx) && enrichedNumberingProps.resolvedLevelIndent) {
         const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
-        const firstLinePx = resolvedIndentPx?.firstLine ?? 0;
-        if (firstLinePx > 0) {
+        const baseIndent = resolvedIndentPx ?? enrichedNumberingProps.resolvedLevelIndent;
+        const mergedIndent = { ...baseIndent, ...paragraphAttrs.indent ?? {} };
+        const firstLinePx = isFiniteNumber(mergedIndent.firstLine) ? mergedIndent.firstLine : 0;
+        const hangingPx = isFiniteNumber(mergedIndent.hanging) ? mergedIndent.hanging : 0;
+        if (firstLinePx > 0 && !hangingPx) {
           wordLayout = {
             ...wordLayout,
             firstLineIndentMode: wordLayout.firstLineIndentMode ?? true,
@@ -94739,6 +95454,7 @@ ${l}
             wordLayout.marker.suffix = listRendering.suffix;
           }
         }
+        wordLayout = normalizeWordLayoutForIndent(wordLayout, paragraphAttrs.indent);
         paragraphAttrs.wordLayout = wordLayout;
       }
       if (enrichedNumberingProps.resolvedLevelIndent) {
@@ -98855,11 +99571,6 @@ ${l}
       cleanups
     };
   }
-  const LIST_MARKER_GAP = 8;
-  const MIN_MARKER_GUTTER = 24;
-  const DEFAULT_LIST_INDENT_BASE_PX = 24;
-  const DEFAULT_LIST_INDENT_STEP_PX = 24;
-  const DEFAULT_LIST_HANGING_PX = 18;
   function calculateRotatedBounds(input2) {
     const width = Math.max(0, input2.width);
     const height = Math.max(0, input2.height);
@@ -99029,7 +99740,7 @@ ${l}
     return Math.max(advanceWidth, paintedWidth);
   }
   const MIN_SINGLE_LINE_PX = 12 * 96 / 72;
-  const LINE_HEIGHT_SAFETY_MARGIN_PX = 1;
+  const WORD_SINGLE_LINE_SPACING_MULTIPLIER = 1.15;
   function calculateTypographyMetrics(fontSize2, spacing, fontInfo) {
     let ascent;
     let descent;
@@ -99042,7 +99753,7 @@ ${l}
       ascent = roundValue(fontSize2 * 0.8);
       descent = roundValue(fontSize2 * 0.2);
     }
-    const baseLineHeight = Math.max(ascent + descent + LINE_HEIGHT_SAFETY_MARGIN_PX, MIN_SINGLE_LINE_PX);
+    const baseLineHeight = Math.max(fontSize2 * WORD_SINGLE_LINE_SPACING_MULTIPLIER, ascent + descent, MIN_SINGLE_LINE_PX);
     const lineHeight2 = roundValue(resolveLineHeight(spacing, baseLineHeight));
     return {
       ascent,
@@ -99123,8 +99834,25 @@ ${l}
     const rawTextStartPx = wordLayout?.textStartPx;
     const markerTextStartX = wordLayout?.marker?.textStartX;
     const textStartPx = typeof markerTextStartX === "number" && Number.isFinite(markerTextStartX) ? markerTextStartX : typeof rawTextStartPx === "number" && Number.isFinite(rawTextStartPx) ? rawTextStartPx : void 0;
-    if (typeof textStartPx === "number" && textStartPx > indentLeft) {
-      initialAvailableWidth = Math.max(1, maxWidth - textStartPx - indentRight);
+    const resolvedTextStartPx = resolveListTextStartPx(
+      wordLayout,
+      indentLeft,
+      firstLine,
+      hanging,
+      (markerText, marker) => {
+        const markerRun = {
+          fontFamily: toCssFontFamily(marker.run?.fontFamily) ?? marker.run?.fontFamily ?? "Arial",
+          fontSize: marker.run?.fontSize ?? 16,
+          bold: marker.run?.bold ?? false,
+          italic: marker.run?.italic ?? false
+        };
+        const { font: markerFont } = buildFontString(markerRun);
+        return measureText(markerText, markerFont, ctx2);
+      }
+    );
+    const effectiveTextStartPx = resolvedTextStartPx ?? textStartPx;
+    if (typeof effectiveTextStartPx === "number" && effectiveTextStartPx > indentLeft) {
+      initialAvailableWidth = Math.max(1, maxWidth - effectiveTextStartPx - indentRight);
     } else {
       initialAvailableWidth = Math.max(1, contentWidth - firstLineOffset);
     }
@@ -99211,7 +99939,7 @@ ${l}
       pendingTabAlignment = null;
       return startX;
     };
-    const alignSegmentAtTab = (segmentText, font, runContext) => {
+    const alignSegmentAtTab = (segmentText, font, runContext, segmentStartChar) => {
       if (!pendingTabAlignment || !currentLine) return void 0;
       const { val } = pendingTabAlignment;
       let segmentWidth = 0;
@@ -99220,11 +99948,11 @@ ${l}
         const idx = segmentText.indexOf(decimalSeparator);
         if (idx >= 0) {
           const beforeText = segmentText.slice(0, idx);
-          beforeDecimalWidth = beforeText.length > 0 ? measureRunWidth(beforeText, font, ctx2, runContext) : 0;
+          beforeDecimalWidth = beforeText.length > 0 ? measureRunWidth(beforeText, font, ctx2, runContext, segmentStartChar) : 0;
         }
-        segmentWidth = segmentText.length > 0 ? measureRunWidth(segmentText, font, ctx2, runContext) : 0;
+        segmentWidth = segmentText.length > 0 ? measureRunWidth(segmentText, font, ctx2, runContext, segmentStartChar) : 0;
       } else if (val === "end" || val === "center") {
-        segmentWidth = segmentText.length > 0 ? measureRunWidth(segmentText, font, ctx2, runContext) : 0;
+        segmentWidth = segmentText.length > 0 ? measureRunWidth(segmentText, font, ctx2, runContext, segmentStartChar) : 0;
       }
       return alignPendingTabForWidth(segmentWidth, beforeDecimalWidth);
     };
@@ -99276,8 +100004,8 @@ ${l}
       const { font } = buildFontString(
         lastRun
       );
-      const fullWidth = measureRunWidth(sliceText, font, ctx2, lastRun);
-      const keptWidth = keptText.length > 0 ? measureRunWidth(keptText, font, ctx2, lastRun) : 0;
+      const fullWidth = measureRunWidth(sliceText, font, ctx2, lastRun, sliceStart);
+      const keptWidth = keptText.length > 0 ? measureRunWidth(keptText, font, ctx2, lastRun, sliceStart) : 0;
       const delta = Math.max(0, fullWidth - keptWidth);
       lineToTrim.width = roundValue(Math.max(0, lineToTrim.width - delta));
       lineToTrim.spaceCount = Math.max(0, lineToTrim.spaceCount - trimCount);
@@ -99488,7 +100216,8 @@ ${l}
         continue;
       }
       if (isFieldAnnotationRun(run2)) {
-        const displayText = run2.displayLabel || "";
+        const rawDisplayText = run2.displayLabel || "";
+        const displayText = applyTextTransform(rawDisplayText, run2);
         const annotationFontSize = typeof run2.fontSize === "number" ? run2.fontSize : typeof run2.fontSize === "string" ? parseFloat(run2.fontSize) || DEFAULT_FIELD_ANNOTATION_FONT_SIZE : DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
         const annotationFontFamily = run2.fontFamily || "Arial, sans-serif";
         const fontWeight = run2.bold ? "bold" : "normal";
@@ -99591,7 +100320,7 @@ ${l}
           const spacesLength = segment.length;
           const spacesStartChar = charPosInRun;
           const spacesEndChar = charPosInRun + spacesLength;
-          const spacesWidth = measureRunWidth(segment, font, ctx2, run2);
+          const spacesWidth = measureRunWidth(segment, font, ctx2, run2, spacesStartChar);
           if (!currentLine) {
             currentLine = {
               fromRun: runIndex,
@@ -99655,7 +100384,7 @@ ${l}
         }
         let segmentStartX;
         if (currentLine && pendingTabAlignment) {
-          segmentStartX = alignSegmentAtTab(segment, font, run2);
+          segmentStartX = alignSegmentAtTab(segment, font, run2, charPosInRun);
           if (segmentStartX == null) {
             segmentStartX = currentLine.width;
           }
@@ -99665,7 +100394,7 @@ ${l}
           if (word2 === "") {
             const spaceStartChar = charPosInRun;
             const spaceEndChar = charPosInRun + 1;
-            const singleSpaceWidth = measureRunWidth(" ", font, ctx2, run2);
+            const singleSpaceWidth = measureRunWidth(" ", font, ctx2, run2, spaceStartChar);
             if (!currentLine) {
               currentLine = {
                 fromRun: runIndex,
@@ -99716,12 +100445,12 @@ ${l}
             charPosInRun = spaceEndChar;
             continue;
           }
-          const wordOnlyWidth = measureRunWidth(word2, font, ctx2, run2);
-          const shouldIncludeDelimiterSpace = wordIndex < lastNonEmptyWordIndex;
-          const spaceWidth = shouldIncludeDelimiterSpace ? measureRunWidth(" ", font, ctx2, run2) : 0;
-          const wordCommitWidth = wordOnlyWidth + spaceWidth;
           const wordStartChar = charPosInRun;
+          const wordOnlyWidth = measureRunWidth(word2, font, ctx2, run2, wordStartChar);
+          const shouldIncludeDelimiterSpace = wordIndex < lastNonEmptyWordIndex;
           const wordEndNoSpace = charPosInRun + word2.length;
+          const spaceWidth = shouldIncludeDelimiterSpace ? measureRunWidth(" ", font, ctx2, run2, wordEndNoSpace) : 0;
+          const wordCommitWidth = wordOnlyWidth + spaceWidth;
           const wordEndWithSpace = wordEndNoSpace + (shouldIncludeDelimiterSpace ? 1 : 0);
           const effectiveMaxWidth = currentLine ? currentLine.maxWidth : getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : contentWidth);
           if (wordOnlyWidth > effectiveMaxWidth && word2.length > 1) {
@@ -99740,7 +100469,7 @@ ${l}
             const hasTabOnlyLine = currentLine && currentLine.segments && currentLine.segments.length === 0 && currentLine.width > 0;
             const remainingWidthAfterTab = hasTabOnlyLine ? currentLine.maxWidth - currentLine.width : lineMaxWidth;
             const chunkWidth = hasTabOnlyLine ? Math.max(remainingWidthAfterTab, lineMaxWidth * 0.25) : lineMaxWidth;
-            const chunks = breakWordIntoChunks(word2, chunkWidth - WIDTH_FUDGE_PX2, font, ctx2, run2);
+            const chunks = breakWordIntoChunks(word2, chunkWidth - WIDTH_FUDGE_PX2, font, ctx2, run2, wordStartChar);
             let chunkCharOffset = wordStartChar;
             for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
               const chunk = chunks[chunkIndex];
@@ -99842,6 +100571,10 @@ ${l}
               currentLine.width = roundValue(currentLine.width + spaceWidth + ls);
               charPosInRun = wordEndWithSpace;
               currentLine.spaceCount += 1;
+              if (currentLine.segments?.[0]) {
+                currentLine.segments[0].toChar = wordEndWithSpace;
+                currentLine.segments[0].width += spaceWidth;
+              }
             } else {
               charPosInRun = wordEndWithSpace;
             }
@@ -99864,7 +100597,7 @@ ${l}
               if (candidateSpaces > 0) {
                 const overflow = totalWidthWithWord - availableWidth;
                 if (overflow > 0) {
-                  const baseSpaceWidth = spaceWidth || measureRunWidth(" ", font, ctx2, run2) || Math.max(1, boundarySpacing);
+                  const baseSpaceWidth = spaceWidth || measureRunWidth(" ", font, ctx2, run2, wordEndNoSpace) || Math.max(1, boundarySpacing);
                   const perSpaceCompression = overflow / candidateSpaces;
                   const maxPerSpaceCompression = baseSpaceWidth * 0.25;
                   if (perSpaceCompression <= maxPerSpaceCompression) {
@@ -99904,6 +100637,10 @@ ${l}
               currentLine.width = roundValue(currentLine.width + spaceWidth + (run2.letterSpacing ?? 0));
               charPosInRun = wordEndWithSpace;
               currentLine.spaceCount += 1;
+              if (currentLine.segments?.[0]) {
+                currentLine.segments[0].toChar = wordEndWithSpace;
+                currentLine.segments[0].width += spaceWidth;
+              }
             } else {
               charPosInRun = wordEndWithSpace;
             }
@@ -100039,8 +100776,8 @@ ${l}
       const { font: markerFont } = buildFontString(markerRun);
       const markerText = wordLayout.marker.markerText ?? "";
       const glyphWidth = markerText ? measureText(markerText, markerFont, ctx2) : 0;
-      const gutter = typeof wordLayout.marker.gutterWidthPx === "number" && isFinite(wordLayout.marker.gutterWidthPx) && wordLayout.marker.gutterWidthPx >= 0 ? wordLayout.marker.gutterWidthPx : LIST_MARKER_GAP;
-      const markerBoxWidth = Math.max(wordLayout.marker.markerBoxWidthPx ?? 0, glyphWidth + LIST_MARKER_GAP);
+      const gutter = typeof wordLayout.marker.gutterWidthPx === "number" && isFinite(wordLayout.marker.gutterWidthPx) && wordLayout.marker.gutterWidthPx >= 0 ? wordLayout.marker.gutterWidthPx : LIST_MARKER_GAP$1;
+      const markerBoxWidth = Math.max(wordLayout.marker.markerBoxWidthPx ?? 0, glyphWidth + LIST_MARKER_GAP$1);
       markerInfo = {
         markerWidth: markerBoxWidth,
         markerTextWidth: glyphWidth,
@@ -100384,7 +101121,7 @@ ${l}
         markerTextWidth = markerText ? measureText(markerText, markerFont, ctx2) : 0;
         indentLeft = resolveIndentLeft(item);
         const indentHanging = resolveIndentHanging(item);
-        markerWidth = Math.max(MIN_MARKER_GUTTER, markerTextWidth + LIST_MARKER_GAP, indentHanging);
+        markerWidth = Math.max(MIN_MARKER_GUTTER, markerTextWidth + LIST_MARKER_GAP$1, indentHanging);
       }
       const paragraphWidth = Math.max(1, constraints.maxWidth - indentLeft - markerWidth);
       const paragraphMeasure = await measureParagraphBlock(item.paragraph, paragraphWidth);
@@ -100410,16 +101147,46 @@ ${l}
       fontSize: 16
     };
   };
-  const measureRunWidth = (text2, font, ctx2, run2) => {
+  const isWordChar = (char) => {
+    if (!char) return false;
+    const code2 = char.charCodeAt(0);
+    return code2 >= 48 && code2 <= 57 || code2 >= 65 && code2 <= 90 || code2 >= 97 && code2 <= 122 || char === "'";
+  };
+  const capitalizeText = (text2, fullText, startOffset) => {
+    if (!text2) return text2;
+    const hasFullText = typeof startOffset === "number" && fullText != null;
+    let result = "";
+    for (let i2 = 0; i2 < text2.length; i2 += 1) {
+      const prevChar = hasFullText ? startOffset + i2 > 0 ? fullText[startOffset + i2 - 1] : "" : i2 > 0 ? text2[i2 - 1] : "";
+      const ch = text2[i2];
+      result += isWordChar(ch) && !isWordChar(prevChar) ? ch.toUpperCase() : ch;
+    }
+    return result;
+  };
+  const applyTextTransform = (text2, run2, startOffset) => {
+    const transform = "textTransform" in run2 ? run2.textTransform : void 0;
+    if (!text2 || !transform || transform === "none") return text2;
+    if (transform === "uppercase") return text2.toUpperCase();
+    if (transform === "lowercase") return text2.toLowerCase();
+    if (transform === "capitalize") {
+      const fullText = "text" in run2 && typeof run2.text === "string" ? run2.text : text2;
+      return capitalizeText(text2, fullText, startOffset);
+    }
+    return text2;
+  };
+  const measureRunWidth = (text2, font, ctx2, run2, startOffset) => {
     const letterSpacing = run2.kind === "text" || run2.kind === void 0 ? run2.letterSpacing || 0 : 0;
-    const width = getMeasuredTextWidth(text2, font, letterSpacing, ctx2);
+    const displayText = applyTextTransform(text2, run2, startOffset);
+    const width = getMeasuredTextWidth(displayText, font, letterSpacing, ctx2);
     return roundValue(width);
   };
-  const breakWordIntoChunks = (word2, maxWidth, font, ctx2, run2) => {
+  const breakWordIntoChunks = (word2, maxWidth, font, ctx2, run2, startOffset) => {
     const chunks = [];
+    const baseOffset = typeof startOffset === "number" ? startOffset : 0;
     if (maxWidth <= 0) {
-      for (const char of word2) {
-        const charWidth = measureRunWidth(char, font, ctx2, run2);
+      for (let i2 = 0; i2 < word2.length; i2++) {
+        const char = word2[i2];
+        const charWidth = measureRunWidth(char, font, ctx2, run2, baseOffset + i2);
         chunks.push({ text: char, width: charWidth });
       }
       return chunks;
@@ -100429,11 +101196,11 @@ ${l}
     for (let i2 = 0; i2 < word2.length; i2++) {
       const char = word2[i2];
       const testChunk = currentChunk + char;
-      const testWidth = measureRunWidth(testChunk, font, ctx2, run2);
+      const testWidth = measureRunWidth(testChunk, font, ctx2, run2, baseOffset);
       if (testWidth > maxWidth && currentChunk.length > 0) {
         chunks.push({ text: currentChunk, width: currentWidth });
         currentChunk = char;
-        currentWidth = measureRunWidth(char, font, ctx2, run2);
+        currentWidth = measureRunWidth(char, font, ctx2, run2, baseOffset + i2);
       } else {
         currentChunk = testChunk;
         currentWidth = testWidth;
@@ -100487,12 +101254,13 @@ ${l}
       italic: run2.italic
     });
     ctx2.font = font;
-    const metrics = ctx2.measureText(run2.text);
+    const displayText = applyTextTransform(run2.text, run2);
+    const metrics = ctx2.measureText(displayText);
     const advanceWidth = metrics.width;
     const paintedWidth = (metrics.actualBoundingBoxLeft || 0) + (metrics.actualBoundingBoxRight || 0);
     const textWidth = Math.max(advanceWidth, paintedWidth);
     const width = roundValue(textWidth + DROP_CAP_PADDING_PX);
-    const baseLineHeight = resolveLineHeight(spacing, run2.fontSize * 1.2);
+    const baseLineHeight = resolveLineHeight(spacing, run2.fontSize * WORD_SINGLE_LINE_SPACING_MULTIPLIER);
     const height = roundValue(baseLineHeight * lines);
     return {
       width,
@@ -100513,7 +101281,7 @@ ${l}
     if (indentHanging > 0) {
       return indentHanging;
     }
-    return DEFAULT_LIST_HANGING_PX;
+    return DEFAULT_LIST_HANGING_PX$1;
   };
   const buildTabStopsPx = (indent2, tabs, tabIntervalTwips) => {
     const paragraphIndentTwips = {
@@ -100719,6 +101487,9 @@ ${l}
         if (event.button !== 0) {
           return;
         }
+        if (event.ctrlKey && navigator.platform.includes("Mac")) {
+          return;
+        }
         __privateSet(this, _pendingMarginClick, null);
         const target = event.target;
         if (target?.closest?.(".superdoc-ruler-handle") != null) {
@@ -101215,6 +101986,10 @@ ${l}
           __privateMethod$1(this, _PresentationEditor_instances, clearHoverRegion_fn).call(this);
           return;
         }
+        if (__privateGet$1(this, _documentMode) === "viewing") {
+          __privateMethod$1(this, _PresentationEditor_instances, clearHoverRegion_fn).call(this);
+          return;
+        }
         const region = __privateMethod$1(this, _PresentationEditor_instances, hitTestHeaderFooterRegion_fn).call(this, normalized.x, normalized.y);
         if (!region) {
           __privateMethod$1(this, _PresentationEditor_instances, clearHoverRegion_fn).call(this);
@@ -101443,6 +102218,7 @@ ${l}
       __privateSet(this, _visibleHost, options.element);
       __privateGet$1(this, _visibleHost).innerHTML = "";
       __privateGet$1(this, _visibleHost).classList.add("presentation-editor");
+      __privateMethod$1(this, _PresentationEditor_instances, syncDocumentModeClass_fn).call(this);
       if (!__privateGet$1(this, _visibleHost).hasAttribute("tabindex")) {
         __privateGet$1(this, _visibleHost).tabIndex = 0;
       }
@@ -101938,6 +102714,7 @@ ${l}
       }
       __privateSet(this, _documentMode, mode);
       __privateGet$1(this, _editor3).setDocumentMode(mode);
+      __privateMethod$1(this, _PresentationEditor_instances, syncDocumentModeClass_fn).call(this);
       __privateMethod$1(this, _PresentationEditor_instances, syncHiddenEditorA11yAttributes_fn).call(this);
       const trackedChangesChanged = __privateMethod$1(this, _PresentationEditor_instances, syncTrackedChangesPreferences_fn).call(this);
       if (trackedChangesChanged) {
@@ -102848,6 +103625,10 @@ ${l}
       }
     };
   };
+  syncDocumentModeClass_fn = function() {
+    if (!__privateGet$1(this, _visibleHost)) return;
+    __privateGet$1(this, _visibleHost).classList.toggle("presentation-editor--viewing", __privateGet$1(this, _documentMode) === "viewing");
+  };
   collectCommentPositions_fn = function() {
     return collectCommentPositions(__privateGet$1(this, _editor3)?.state?.doc ?? null, {
       commentMarkName: CommentMarkName,
@@ -103481,7 +104262,7 @@ ${l}
         const atomNodeTypes = getAtomNodeTypes(__privateGet$1(this, _editor3)?.schema ?? null);
         const positionMap2 = __privateGet$1(this, _editor3)?.state?.doc && docJson ? buildPositionMapFromPmDoc(__privateGet$1(this, _editor3).state.doc, docJson) : null;
         const result = toFlowBlocks(docJson, {
-          mediaFiles: __privateGet$1(this, _options).mediaFiles,
+          mediaFiles: __privateGet$1(this, _editor3)?.storage?.image?.media,
           emitSectionBreaks: true,
           sectionMetadata,
           trackedChangesMode: __privateGet$1(this, _trackedChangesMode),
@@ -103805,7 +104586,14 @@ ${l}
     const footerMargin = margins.footer ?? 0;
     const headerContentSpace = Math.max(marginTop - headerMargin, 0);
     const footerContentSpace = Math.max(marginBottom - footerMargin, 0);
-    const height = Math.max(headerContentSpace, footerContentSpace, 1);
+    const height = Math.max(
+      headerContentSpace,
+      footerContentSpace,
+      headerMargin,
+      footerMargin,
+      marginTop,
+      marginBottom
+    );
     return {
       width: measurementWidth,
       height,
@@ -103955,7 +104743,8 @@ ${l}
       const headerMargin = margins.header ?? 0;
       const topMargin = margins.top ?? DEFAULT_MARGINS.top ?? 0;
       const height = Math.max(topMargin - headerMargin, 1);
-      return { x: left2, width, height, offset: headerMargin };
+      const offset2 = headerMargin;
+      return { x: left2, width, height, offset: offset2 };
     } else {
       const footerMargin = margins.footer ?? 0;
       const bottomMargin = margins.bottom ?? DEFAULT_MARGINS.bottom ?? 0;
@@ -104548,6 +105337,10 @@ ${l}
     });
   };
   renderHoverRegion_fn = function(region) {
+    if (__privateGet$1(this, _documentMode) === "viewing") {
+      __privateMethod$1(this, _PresentationEditor_instances, clearHoverRegion_fn).call(this);
+      return;
+    }
     if (!__privateGet$1(this, _hoverOverlay) || !__privateGet$1(this, _hoverTooltip)) return;
     const coords = __privateMethod$1(this, _PresentationEditor_instances, convertPageLocalToOverlayCoords_fn).call(this, region.pageIndex, region.localX, region.localY);
     if (!coords) {
@@ -106128,6 +106921,8 @@ ${l}
                     const cbRect = containingBlock.getBoundingClientRect();
                     left2 -= cbRect.left;
                     top2 -= cbRect.top;
+                    left2 += containingBlock.scrollLeft || 0;
+                    top2 += containingBlock.scrollTop || 0;
                   } catch (error) {
                     console.warn("SlashMenu: Failed to adjust for containing block", error);
                   }
@@ -122035,7 +122830,7 @@ ${l}
         document.addEventListener("mousedown", globalMousedownHandler);
         scrollHandler = () => {
           if (currentWrapper && resizeContainer) {
-            updateHandlePositions(currentWrapper.firstElementChild);
+            updateHandlePositions(currentWrapper);
           }
         };
         window.addEventListener("scroll", scrollHandler, true);
@@ -122097,7 +122892,7 @@ ${l}
       }
       applyStyleIsolationClass(resizeContainer);
       document.body.appendChild(resizeContainer);
-      updateHandlePositions(wrapper.firstElementChild);
+      updateHandlePositions(wrapper);
     }
     function hideResizeHandles() {
       if (resizeContainer?.parentNode) {
@@ -137466,7 +138261,7 @@ ${style2}
         if (open) {
           nextTick(() => {
             if (searchInput.value) {
-              searchInput.value.focus();
+              searchInput.value.focus({ preventScroll: true });
             }
           });
         }
@@ -137571,7 +138366,11 @@ ${style2}
       };
       const handleGlobalOutsideClick = (event) => {
         if (isOpen.value && menuRef.value && !menuRef.value.contains(event.target)) {
-          moveCursorToMouseEvent(event, props.editor);
+          const isCtrlClickOnMac = event.ctrlKey && isMacOS();
+          const isLeftClick = event.button === 0 && !isCtrlClickOnMac;
+          if (isLeftClick) {
+            moveCursorToMouseEvent(event, props.editor);
+          }
           closeMenu({ restoreCursor: false });
         }
       };
@@ -139666,6 +140465,12 @@ ${style2}
         if (props.options?.suppressSkeletonLoader || !props.options?.collaborationProvider) editorReady.value = true;
       });
       const handleMarginClick = (event) => {
+        if (event.button !== 0) {
+          return;
+        }
+        if (event.ctrlKey && isMacOS()) {
+          return;
+        }
         if (event.target.classList.contains("ProseMirror")) return;
         onMarginClickCursorChange(event, activeEditor.value);
       };
@@ -139804,7 +140609,7 @@ ${style2}
       };
     }
   });
-  const SuperEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$1$1, [["__scopeId", "data-v-209a1e8b"]]);
+  const SuperEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$1$1, [["__scopeId", "data-v-c9a3c876"]]);
   const _hoisted_1$h = ["innerHTML"];
   const _sfc_main$i = {
     __name: "SuperInput",
@@ -143012,12 +143817,10 @@ ${reason}`);
       return processedComments;
     };
     const convertHtmlToSchema = (commentHTML) => {
-      const div2 = document.createElement("div");
-      div2.innerHTML = commentHTML;
       const editor = new Editor({
         mode: "text",
         isHeadless: true,
-        content: div2,
+        content: commentHTML,
         extensions: getRichTextExtensions()
       });
       return editor.getJSON().content[0];
@@ -157258,7 +158061,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "2.0.0-next.2";
+      this.version = "2.0.0-next.21";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -159731,7 +160534,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexBqPa6D4q = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const index_W_Fk0WX = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));