superdoc 1.0.0-beta.13 → 1.0.0-beta.14

package/dist/super-editor/chunks/{editor-ByPqJ2k8.js → editor-wC_gs8Bl.js}

@@ -9,11 +9,11 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("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(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var _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, _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, _instances, _options, _editor3, _visibleHost, _viewportHost, _painterHost, _selectionOverlay, _hiddenHost, _layoutOptions, _layoutState, _domPainter, _layoutError, _layoutErrorState, _errorBanner, _errorBannerMessage, _telemetryEmitter, _renderScheduled, _pendingDocChange, _isRerendering, _selectionUpdateScheduled, _remoteCursorUpdateScheduled, _rafHandle, _editorListeners, _sectionMetadata, _documentMode, _inputBridge, _trackedChangesMode, _trackedChangesEnabled, _trackedChangesOverrides, _headerFooterManager, _headerFooterAdapter, _headerFooterIdentifier, _headerLayoutResults, _footerLayoutResults, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _remoteCursorState, _remoteCursorDirty, _remoteCursorOverlay, _localSelectionLayer, _awarenessCleanup, _scrollCleanup, _remoteCursorRafHandle, _scrollTimeout, _PresentationEditor_instances, aggregateLayoutBounds_fn, safeCleanup_fn, setupEditorListeners_fn, setupCollaborationCursors_fn, normalizeAwarenessStates_fn, getFallbackColor_fn, getValidatedColor_fn, scheduleRemoteCursorUpdate_fn, scheduleRemoteCursorReRender_fn, updateRemoteCursors_fn, renderRemoteCursors_fn, renderRemoteCaret_fn, renderRemoteCursorLabel_fn, renderRemoteSelection_fn, setupPointerHandlers_fn, setupInputBridge_fn, initHeaderFooterRegistry_fn, _handlePointerDown, getFirstTextPosition_fn, registerPointerClick_fn, selectWordAt_fn, selectParagraphAt_fn, isWordCharacter_fn, _handlePointerMove, _handlePointerLeave, _handleDoubleClick, _handleKeyDown, focusHeaderFooterShortcut_fn, scheduleRerender_fn, flushRerenderQueue_fn, rerender_fn, ensurePainter_fn, scheduleSelectionUpdate_fn, updateSelection_fn, resolveLayoutOptions_fn, buildHeaderFooterInput_fn, computeHeaderFooterConstraints_fn, updateDecorationProviders_fn, createDecorationProvider_fn, computeDecorationBox_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, validateHeaderFooterEditPermission_fn, emitHeaderFooterEditBlocked_fn, resolveDescriptorForRegion_fn, getBodyPageHeight_fn, getHeaderFooterPageHeight_fn, renderSelectionRects_fn, renderHoverRegion_fn, clearHoverRegion_fn, renderCaretOverlay_fn, getHeaderFooterContext_fn, computeHeaderFooterSelectionRects_fn, computeHeaderFooterCaretRect_fn, syncTrackedChangesPreferences_fn, deriveTrackedChangesMode_fn, deriveTrackedChangesEnabled_fn, getTrackChangesPluginState_fn, computeDefaultLayoutDefaults_fn, parseColumns_fn, inchesToPx_fn, applyZoom_fn, createLayoutMetrics_fn, convertPageLocalToOverlayCoords_fn, normalizeClientPoint_fn, computeCaretLayoutRect_fn, findLineContainingPos_fn, lineHeightBeforeIndex_fn, getCurrentPageIndex_fn, findRegionForPage_fn, handleLayoutError_fn, decorateError_fn, showLayoutErrorBanner_fn, dismissErrorBanner_fn, createHiddenHost_fn, _windowRoot, _layoutSurfaces, _getTargetDom, _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, _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;
+var _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, _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, _instances, _options, _editor3, _visibleHost, _viewportHost, _painterHost, _selectionOverlay, _hiddenHost, _layoutOptions, _layoutState, _domPainter, _layoutError, _layoutErrorState, _errorBanner, _errorBannerMessage, _telemetryEmitter, _renderScheduled, _pendingDocChange, _isRerendering, _selectionUpdateScheduled, _remoteCursorUpdateScheduled, _rafHandle, _editorListeners, _sectionMetadata, _documentMode, _inputBridge, _trackedChangesMode, _trackedChangesEnabled, _trackedChangesOverrides, _headerFooterManager, _headerFooterAdapter, _headerFooterIdentifier, _headerLayoutResults, _footerLayoutResults, _headerDecorationProvider, _footerDecorationProvider, _headerFooterManagerCleanups, _headerRegions, _footerRegions, _session, _activeHeaderFooterEditor, _hoverOverlay, _hoverTooltip, _modeBanner, _ariaLiveRegion, _hoverRegion, _clickCount, _lastClickTime, _lastClickPosition, _lastSelectedImageBlockId, _remoteCursorState, _remoteCursorDirty, _remoteCursorOverlay, _localSelectionLayer, _awarenessCleanup, _scrollCleanup, _remoteCursorRafHandle, _scrollTimeout, _PresentationEditor_instances, aggregateLayoutBounds_fn, safeCleanup_fn, setupEditorListeners_fn, setupCollaborationCursors_fn, normalizeAwarenessStates_fn, getFallbackColor_fn, getValidatedColor_fn, scheduleRemoteCursorUpdate_fn, scheduleRemoteCursorReRender_fn, updateRemoteCursors_fn, renderRemoteCursors_fn, renderRemoteCaret_fn, renderRemoteCursorLabel_fn, renderRemoteSelection_fn, setupPointerHandlers_fn, setupInputBridge_fn, initHeaderFooterRegistry_fn, _handlePointerDown, getFirstTextPosition_fn, registerPointerClick_fn, selectWordAt_fn, selectParagraphAt_fn, isWordCharacter_fn, _handlePointerMove, _handlePointerLeave, _handleDoubleClick, _handleKeyDown, focusHeaderFooterShortcut_fn, scheduleRerender_fn, flushRerenderQueue_fn, rerender_fn, ensurePainter_fn, scheduleSelectionUpdate_fn, updateSelection_fn, resolveLayoutOptions_fn, buildHeaderFooterInput_fn, computeHeaderFooterConstraints_fn, updateDecorationProviders_fn, createDecorationProvider_fn, findHeaderFooterPageForPageNumber_fn, computeDecorationBox_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, validateHeaderFooterEditPermission_fn, emitHeaderFooterEditBlocked_fn, resolveDescriptorForRegion_fn, getBodyPageHeight_fn, getHeaderFooterPageHeight_fn, renderSelectionRects_fn, renderHoverRegion_fn, clearHoverRegion_fn, renderCaretOverlay_fn, getHeaderFooterContext_fn, computeHeaderFooterSelectionRects_fn, computeHeaderFooterCaretRect_fn, syncTrackedChangesPreferences_fn, deriveTrackedChangesMode_fn, deriveTrackedChangesEnabled_fn, getTrackChangesPluginState_fn, computeDefaultLayoutDefaults_fn, parseColumns_fn, inchesToPx_fn, applyZoom_fn, createLayoutMetrics_fn, convertPageLocalToOverlayCoords_fn, normalizeClientPoint_fn, computeCaretLayoutRect_fn, findLineContainingPos_fn, lineHeightBeforeIndex_fn, getCurrentPageIndex_fn, findRegionForPage_fn, handleLayoutError_fn, decorateError_fn, showLayoutErrorBanner_fn, dismissErrorBanner_fn, createHiddenHost_fn, _windowRoot, _layoutSurfaces, _getTargetDom, _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, _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;
 import * as Y from "yjs";
 import { UndoManager, Item as Item$1, ContentType, Text as Text$1, XmlElement, encodeStateAsUpdate } from "yjs";
-import { P as PluginKey, a as Plugin, M as Mapping, N as NodeSelection, S as Selection, T as TextSelection, b as Slice, D as DOMSerializer, F as Fragment, c as DOMParser$1, d as Mark$1, e as dropPoint, A as AllSelection, p as process$1, B as Buffer2, f as callOrGet, g as getExtensionConfigField, h as getMarkType, i as getMarksFromSelection, j as getNodeType, k as getSchemaTypeNameByName, l as Schema$1, m as cleanSchemaItem, n as canSplit, o as defaultBlockAt$1, q as liftTarget, r as canJoin, s as joinPoint, t as replaceStep$1, R as ReplaceAroundStep$1, u as isTextSelection, v as getMarkRange, w as isMarkActive, x as isNodeActive, y as deleteProps, z as processContent, C as htmlHandler, E as ReplaceStep, G as twipsToInches, H as inchesToTwips, I as ptToTwips, J as getResolvedParagraphProperties, K as linesToTwips, L as ListHelpers, O as updateNumberingProperties, Q as changeListLevel, U as findParentNode, V as isList, W as isMacOS, X as isIOS, Y as getSchemaTypeByName, Z as inputRulesPlugin, _ as TrackDeleteMarkName, $ as TrackInsertMarkName, a0 as v4, a1 as TrackFormatMarkName, a2 as comments_module_events, a3 as findMark, a4 as objectIncludes, a5 as AddMarkStep, a6 as RemoveMarkStep, a7 as twipsToLines, a8 as pixelsToTwips, a9 as helpers, aa as posToDOMRect, ab as CommandService, ac as SuperConverter, ad as createDocument, ae as createDocFromMarkdown, af as createDocFromHTML, ag as EditorState, ah as isActive, ai as unflattenListsInHtml, aj as resolveParagraphProperties, ak as _getReferencedTableStyles, al as parseSizeUnit, am as minMax, an as updateDOMAttributes, ao as findChildren$5, ap as generateRandomSigned32BitIntStrId, aq as calculateResolvedParagraphProperties, ar as encodeCSSFromPPr, as as twipsToPixels$2, at as resolveRunProperties, au as encodeCSSFromRPr, av as generateOrderedListIndex, aw as docxNumberingHelpers, ax as InputRule, ay as convertSizeToCSS, az as SelectionRange, aA as Transform, aB as findParentNodeClosestToPos, aC as isInTable$1, aD as generateDocxRandomId, aE as insertNewRelationship, aF as inchesToPixels, aG as kebabCase, aH as getUnderlineCssString } from "./converter-D9KiDgXx.js";
-import { D as DocxZipper } from "./docx-zipper-DQmUj-ef.js";
+import { P as PluginKey, a as Plugin, M as Mapping, N as NodeSelection, S as Selection, T as TextSelection, b as Slice, D as DOMSerializer, F as Fragment, c as DOMParser$1, d as Mark$1, e as dropPoint, A as AllSelection, p as process$1, B as Buffer2, f as callOrGet, g as getExtensionConfigField, h as getMarkType, i as getMarksFromSelection, j as getNodeType, k as getSchemaTypeNameByName, l as Schema$1, m as cleanSchemaItem, n as canSplit, o as defaultBlockAt$1, q as liftTarget, r as canJoin, s as joinPoint, t as replaceStep$1, R as ReplaceAroundStep$1, u as isTextSelection, v as getMarkRange, w as isMarkActive, x as isNodeActive, y as deleteProps, z as processContent, C as htmlHandler, E as ReplaceStep, G as twipsToInches, H as inchesToTwips, I as ptToTwips, J as getResolvedParagraphProperties, K as linesToTwips, L as ListHelpers, O as updateNumberingProperties, Q as changeListLevel, U as findParentNode, V as isList, W as isMacOS, X as isIOS, Y as getSchemaTypeByName, Z as inputRulesPlugin, _ as TrackDeleteMarkName, $ as TrackInsertMarkName, a0 as v4, a1 as TrackFormatMarkName, a2 as comments_module_events, a3 as findMark, a4 as objectIncludes, a5 as AddMarkStep, a6 as RemoveMarkStep, a7 as twipsToLines, a8 as pixelsToTwips, a9 as helpers, aa as posToDOMRect, ab as CommandService, ac as SuperConverter, ad as createDocument, ae as createDocFromMarkdown, af as createDocFromHTML, ag as EditorState, ah as isActive, ai as unflattenListsInHtml, aj as resolveParagraphProperties, ak as _getReferencedTableStyles, al as parseSizeUnit, am as minMax, an as updateDOMAttributes, ao as findChildren$5, ap as generateRandomSigned32BitIntStrId, aq as calculateResolvedParagraphProperties, ar as encodeCSSFromPPr, as as twipsToPixels$2, at as resolveRunProperties, au as encodeCSSFromRPr, av as generateOrderedListIndex, aw as docxNumberingHelpers, ax as InputRule, ay as convertSizeToCSS, az as SelectionRange, aA as Transform, aB as findParentNodeClosestToPos, aC as isInTable$1, aD as generateDocxRandomId, aE as insertNewRelationship, aF as inchesToPixels, aG as kebabCase, aH as getUnderlineCssString } from "./converter-CfmIU--8.js";
+import { D as DocxZipper } from "./docx-zipper-B-CXiNSb.js";
 import { ref, computed, createElementBlock, openBlock, withModifiers, Fragment as Fragment$1, renderList, normalizeClass, createCommentVNode, toDisplayString, createElementVNode, createApp } from "vue";
 var GOOD_LEAF_SIZE = 200;
 var RopeSequence = function RopeSequence2() {
@@ -13553,7 +13553,7 @@ const isHeadless = (editor) => {
 const shouldSkipNodeView = (editor) => {
   return isHeadless(editor);
 };
-const summaryVersion = "1.0.0-beta.13";
+const summaryVersion = "1.0.0-beta.14";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -14335,7 +14335,7 @@ const _Editor = class _Editor extends EventEmitter {
       { default: remarkStringify },
       { default: remarkGfm }
     ] = await Promise.all([
-      import("./index-BMAfbNel.js"),
+      import("./index-I4Ew0HDV.js"),
       import("./index-DRCvimau.js"),
       import("./index-C_x_N6Uh.js"),
       import("./index-D_sWOSiG.js"),
@@ -14540,7 +14540,7 @@ const _Editor = class _Editor extends EventEmitter {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.13");
+    console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.14");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -15872,22 +15872,15 @@ function hydrateImageBlocks(blocks, mediaFiles) {
   if (normalizedMedia.size === 0) {
     return blocks;
   }
-  return blocks.map((block) => {
-    if (block.kind !== "image") {
-      return block;
-    }
-    if (!block.src || block.src.startsWith("data:")) {
-      return block;
+  const resolveImageSrc = (src, relId, attrSrc, extension) => {
+    if (!src || src.startsWith("data:")) {
+      return void 0;
     }
-    const attrs = block.attrs ?? {};
-    const relId = typeof attrs.rId === "string" ? attrs.rId : void 0;
-    const attrSrc = typeof attrs.src === "string" ? attrs.src : void 0;
-    const extension = typeof attrs.extension === "string" ? attrs.extension.toLowerCase() : void 0;
     const candidates = /* @__PURE__ */ new Set();
-    candidates.add(block.src);
+    candidates.add(src);
     if (attrSrc) candidates.add(attrSrc);
     if (relId) {
-      const inferredExt = extension ?? inferExtensionFromPath(block.src) ?? "jpeg";
+      const inferredExt = extension ?? inferExtensionFromPath(src) ?? "jpeg";
       candidates.add(`word/media/${relId}.${inferredExt}`);
       candidates.add(`media/${relId}.${inferredExt}`);
     }
@@ -15897,14 +15890,128 @@ function hydrateImageBlocks(blocks, mediaFiles) {
       const base64 = normalizedMedia.get(normalized);
       if (!base64) continue;
       const finalExt = extension ?? inferExtensionFromPath(normalized) ?? "jpeg";
-      return {
-        ...block,
-        src: `data:image/${finalExt};base64,${base64}`
-      };
+      return base64.startsWith("data:") ? base64 : `data:image/${finalExt};base64,${base64}`;
+    }
+    return void 0;
+  };
+  const hydrateRuns = (runs) => {
+    let hasChanges = false;
+    const hydratedRuns = runs.map((run) => {
+      if (run.kind !== "image") {
+        return run;
+      }
+      const imageRun = run;
+      if (!imageRun.src || imageRun.src.startsWith("data:")) {
+        return run;
+      }
+      const resolvedSrc = resolveImageSrc(imageRun.src);
+      if (resolvedSrc) {
+        hasChanges = true;
+        return { ...imageRun, src: resolvedSrc };
+      }
+      return run;
+    });
+    return hasChanges ? hydratedRuns : runs;
+  };
+  return blocks.map((block) => {
+    if (block.kind === "image") {
+      if (!block.src || block.src.startsWith("data:")) {
+        return block;
+      }
+      const attrs = block.attrs ?? {};
+      const relId = typeof attrs.rId === "string" ? attrs.rId : void 0;
+      const attrSrc = typeof attrs.src === "string" ? attrs.src : void 0;
+      const extension = typeof attrs.extension === "string" ? attrs.extension.toLowerCase() : void 0;
+      const resolvedSrc = resolveImageSrc(block.src, relId, attrSrc, extension);
+      if (resolvedSrc) {
+        return { ...block, src: resolvedSrc };
+      }
+      return block;
+    }
+    if (block.kind === "paragraph") {
+      const paragraphBlock = block;
+      if (!paragraphBlock.runs || paragraphBlock.runs.length === 0) {
+        return block;
+      }
+      const hydratedRuns = hydrateRuns(paragraphBlock.runs);
+      if (hydratedRuns !== paragraphBlock.runs) {
+        return { ...paragraphBlock, runs: hydratedRuns };
+      }
+      return block;
     }
     return block;
   });
 }
+function isGradientFill(value) {
+  if (!isPlainObject$2(value)) return false;
+  if (value.type !== "gradient") return false;
+  const gradientType = value.gradientType;
+  if (gradientType !== "linear" && gradientType !== "radial") return false;
+  if (gradientType === "linear") {
+    if (typeof value.angle !== "number" || !Number.isFinite(value.angle)) {
+      return false;
+    }
+  }
+  if (!Array.isArray(value.stops) || value.stops.length === 0) return false;
+  return value.stops.every((stop) => {
+    if (!isPlainObject$2(stop)) return false;
+    return typeof stop.position === "number" && Number.isFinite(stop.position) && typeof stop.color === "string" && (stop.alpha === void 0 || typeof stop.alpha === "number" && Number.isFinite(stop.alpha));
+  });
+}
+function isSolidFillWithAlpha(value) {
+  return isPlainObject$2(value) && value.type === "solidWithAlpha" && typeof value.color === "string" && typeof value.alpha === "number";
+}
+function normalizeFillColor(value) {
+  if (value === null) return null;
+  if (typeof value === "string") return value;
+  if (isGradientFill(value)) return value;
+  if (isSolidFillWithAlpha(value)) return value;
+  return void 0;
+}
+function normalizeStrokeColor(value) {
+  if (value === null) return null;
+  if (typeof value === "string") return value;
+  return void 0;
+}
+function normalizeTextContent(value) {
+  if (!isPlainObject$2(value)) return void 0;
+  if (!Array.isArray(value.parts)) return void 0;
+  if (value.parts.length === 0) return void 0;
+  const validParts = value.parts.filter((p) => isPlainObject$2(p) && typeof p.text === "string");
+  if (validParts.length === 0) return void 0;
+  const result = {
+    parts: validParts
+  };
+  if (["left", "center", "right"].includes(value.horizontalAlign)) {
+    result.horizontalAlign = value.horizontalAlign;
+  }
+  return result;
+}
+function normalizeTextVerticalAlign(value) {
+  if (typeof value !== "string") return void 0;
+  if (value === "top" || value === "center" || value === "bottom") {
+    return value;
+  }
+  return void 0;
+}
+function normalizeTextInsets(value) {
+  if (!isPlainObject$2(value)) return void 0;
+  const top2 = pickNumber(value.top);
+  const right2 = pickNumber(value.right);
+  const bottom2 = pickNumber(value.bottom);
+  const left2 = pickNumber(value.left);
+  if (top2 == null || right2 == null || bottom2 == null || left2 == null) {
+    return void 0;
+  }
+  return { top: top2, right: right2, bottom: bottom2, left: left2 };
+}
+const OOXML_Z_INDEX_BASE = 251658240;
+function normalizeZIndex(originalAttributes) {
+  if (!isPlainObject$2(originalAttributes)) return void 0;
+  const relativeHeight = originalAttributes.relativeHeight;
+  if (typeof relativeHeight !== "number") return void 0;
+  return Math.max(0, relativeHeight - OOXML_Z_INDEX_BASE);
+}
 const DEFAULT_ALLOWED_PROTOCOLS = ["http", "https", "mailto", "tel", "sms"];
 const OPTIONAL_PROTOCOLS = ["ftp", "sftp", "irc"];
 const BLOCKED_PROTOCOLS = ["javascript", "data", "vbscript", "file", "ssh", "ws", "wss"];
@@ -16798,6 +16905,7 @@ const normalizeBorderSide = (value) => {
   if (!value || typeof value !== "object") return void 0;
   const raw = value;
   const style = mapBorderStyle(raw.val);
+  if (style === "none") return void 0;
   const width = pickNumber(raw.size);
   const widthPx = borderSizeToPx(width);
   const color = normalizeColor(raw.color);
@@ -16806,7 +16914,9 @@ const normalizeBorderSide = (value) => {
     return void 0;
   }
   const border = {};
-  if (style && style !== "none") border.style = style;
+  if (style) {
+    border.style = style;
+  }
   if (widthPx != null) border.width = Math.max(0, widthPx);
   if (color) border.color = color;
   if (space != null) border.space = Math.max(0, space);
@@ -17917,7 +18027,13 @@ function resolveMarkerRunProperties(input) {
     return input.cached;
   }
   const numberingResolved = input.numbering?.resolvedMarkerRpr || input.resolvedParagraphProps.numberingProperties?.resolvedMarkerRpr;
-  return mergeRunProperties(DEFAULT_MARKER_RUN, input.docDefaults.run, numberingResolved, input.inlineMarkerRpr);
+  const result = mergeRunProperties(
+    DEFAULT_MARKER_RUN,
+    input.docDefaults.run,
+    numberingResolved,
+    input.inlineMarkerRpr
+  );
+  return result;
 }
 const DEFAULT_MARKER_RUN = {
   fontFamily: "Times New Roman",
@@ -18661,7 +18777,7 @@ const normalizeResolvedTabAlignment = (value) => {
       return void 0;
   }
 };
-const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleContext) => {
+const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleContext, _paragraphNode) => {
   if (numberingProps === null) {
     return null;
   }
@@ -18684,12 +18800,14 @@ const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleCont
       decimalSeparator: paragraphAttrs.decimalSeparator,
       numberingProperties: numberingProps
     };
+    const defaultFontFamily = styleContext.defaults?.paragraphFont ?? styleContext.defaults?.paragraphFontFamily ?? "Times New Roman";
+    const defaultFontSize = styleContext.defaults?.fontSize ?? 12;
     const docDefaults = {
       defaultTabIntervalTwips: styleContext.defaults?.defaultTabIntervalTwips ?? 720,
       decimalSeparator: styleContext.defaults?.decimalSeparator ?? ".",
       run: {
-        fontFamily: "Times New Roman",
-        fontSize: 12
+        fontFamily: defaultFontFamily,
+        fontSize: defaultFontSize
       },
       paragraph: {
         indent: {},
@@ -18710,12 +18828,26 @@ const computeWordLayoutForParagraph = (paragraphAttrs, numberingProps, styleCont
         };
       }
     }
-    return computeWordParagraphLayout({
+    if (!markerRun) {
+      markerRun = {
+        fontFamily: "Times New Roman",
+        fontSize: 12,
+        color: "#000000"
+      };
+    }
+    if (markerRun.fontSize != null) {
+      const fontSizePx = ptToPx(markerRun.fontSize);
+      if (fontSizePx != null) {
+        markerRun = { ...markerRun, fontSize: fontSizePx };
+      }
+    }
+    const layout = computeWordParagraphLayout({
       paragraph: resolvedParagraph,
       numbering: numberingProps,
       markerRun,
       docDefaults
     });
+    return layout;
   } catch {
     return null;
   }
@@ -18879,26 +19011,58 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
       paragraphAttrs.tabs = normalizedTabs;
     }
   }
-  let framePr = attrs.framePr;
-  if (!framePr && attrs.paragraphProperties && typeof attrs.paragraphProperties === "object") {
-    const pPr = attrs.paragraphProperties;
-    if (pPr.elements && Array.isArray(pPr.elements)) {
-      const framePrElement = pPr.elements.find((el) => el.name === "w:framePr");
-      if (framePrElement?.attributes) {
-        framePr = {
-          xAlign: framePrElement.attributes["w:xAlign"],
-          dropCap: framePrElement.attributes["w:dropCap"]
-        };
-      }
+  const asString = (value) => {
+    return typeof value === "string" ? value : void 0;
+  };
+  const normalizeFramePr = (value) => {
+    if (!value || typeof value !== "object") return void 0;
+    const record = value;
+    if (record.attributes && typeof record.attributes === "object") {
+      return record.attributes;
     }
-  }
-  if (framePr?.xAlign) {
-    const xAlign = framePr.xAlign.toLowerCase();
+    return record;
+  };
+  const extractFramePrFromElements = (paragraphProperties) => {
+    if (!paragraphProperties || typeof paragraphProperties !== "object") return void 0;
+    const pPr = paragraphProperties;
+    if (!Array.isArray(pPr.elements)) return void 0;
+    const framePrElement = pPr.elements.find((el) => el.name === "w:framePr");
+    if (framePrElement?.attributes && typeof framePrElement.attributes === "object") {
+      return framePrElement.attributes;
+    }
+    return void 0;
+  };
+  const framePr = normalizeFramePr(attrs.framePr) ?? normalizeFramePr(attrs.paragraphProperties?.framePr) ?? extractFramePrFromElements(attrs.paragraphProperties);
+  if (framePr) {
+    const rawXAlign = asString(framePr["w:xAlign"] ?? framePr.xAlign);
+    const xAlign = typeof rawXAlign === "string" ? rawXAlign.toLowerCase() : void 0;
     if (xAlign === "left" || xAlign === "right" || xAlign === "center") {
       paragraphAttrs.floatAlignment = xAlign;
     }
-    if (framePr.dropCap != null) {
-      paragraphAttrs.dropCap = framePr.dropCap;
+    const dropCap = framePr["w:dropCap"] ?? framePr.dropCap;
+    if (dropCap != null && (typeof dropCap === "string" || typeof dropCap === "number" || typeof dropCap === "boolean")) {
+      paragraphAttrs.dropCap = dropCap;
+    }
+    const frame = {};
+    const wrap = asString(framePr["w:wrap"] ?? framePr.wrap);
+    if (wrap) frame.wrap = wrap;
+    if (xAlign) {
+      frame.xAlign = xAlign;
+    }
+    const rawYAlign = asString(framePr["w:yAlign"] ?? framePr.yAlign);
+    if (rawYAlign) {
+      frame.yAlign = rawYAlign;
+    }
+    const hAnchor = asString(framePr["w:hAnchor"] ?? framePr.hAnchor);
+    if (hAnchor) frame.hAnchor = hAnchor;
+    const vAnchor = asString(framePr["w:vAnchor"] ?? framePr.vAnchor);
+    if (vAnchor) frame.vAnchor = vAnchor;
+    const xTwips = pickNumber(framePr["w:x"] ?? framePr.x);
+    if (xTwips != null) frame.x = twipsToPx$1(xTwips);
+    const yTwips = pickNumber(framePr["w:y"] ?? framePr.y);
+    if (yTwips != null) frame.y = twipsToPx$1(yTwips);
+    if (Object.keys(frame).length > 0) {
+      paragraphAttrs.frame = frame;
     }
   }
   const numberingSource = attrs.numberingProperties ?? paragraphProps.numberingProperties ?? hydrated?.numberingProperties;
@@ -18943,13 +19107,6 @@ const computeParagraphAttrs = (para, styleContext, listCounterContext, converter
           enrichedNumberingProps.resolvedMarkerRpr = marker.run;
         }
       }
-      if (!enrichedNumberingProps.resolvedMarkerRpr) {
-        enrichedNumberingProps.resolvedMarkerRpr = {
-          fontFamily: "Times New Roman",
-          fontSize: 12,
-          color: "#000000"
-        };
-      }
     }
     const wordLayout = computeWordLayoutForParagraph(paragraphAttrs, enrichedNumberingProps, styleContext);
     if (wordLayout) {
@@ -19386,7 +19543,9 @@ function handleDocumentPartObjectNode(node, context) {
     styleContext,
     bookmarks,
     hyperlinkConfig,
-    converters
+    converters,
+    listCounterContext,
+    trackedChangesConfig
   } = context;
   const docPartGallery = getDocPartGallery(node);
   const docPartObjectId = getDocPartObjectId(node);
@@ -19409,6 +19568,27 @@ function handleDocumentPartObjectNode(node, context) {
       { blocks, recordBlockKind },
       paragraphToFlowBlocks2
     );
+  } else if (paragraphToFlowBlocks2) {
+    for (const child of node.content) {
+      if (child.type === "paragraph") {
+        const childBlocks = paragraphToFlowBlocks2(
+          child,
+          nextBlockId,
+          positions,
+          defaultFont,
+          defaultSize,
+          styleContext,
+          listCounterContext,
+          trackedChangesConfig,
+          bookmarks,
+          hyperlinkConfig
+        );
+        for (const block of childBlocks) {
+          blocks.push(block);
+          recordBlockKind(block.kind);
+        }
+      }
+    }
   }
 }
 const extractValue = (value) => {
@@ -19569,6 +19749,55 @@ const extractRunStyleId = (runProperties) => {
   }
   return null;
 };
+const DEFAULT_IMAGE_DIMENSION_PX = 100;
+function isInlineImage(node) {
+  const attrs = node.attrs ?? {};
+  const wrap = attrs.wrap;
+  const rawWrapType = wrap?.type;
+  if (rawWrapType === "Inline") return true;
+  if (rawWrapType && rawWrapType !== "Inline") return false;
+  if (attrs.inline === true) return true;
+  if (attrs.display === "inline") return true;
+  return false;
+}
+function imageNodeToRun(node, positions, activeSdt) {
+  const attrs = node.attrs ?? {};
+  const src = typeof attrs.src === "string" ? attrs.src : "";
+  if (!src) {
+    return null;
+  }
+  const size = attrs.size ?? {};
+  const width = typeof size.width === "number" && Number.isFinite(size.width) && size.width > 0 ? size.width : DEFAULT_IMAGE_DIMENSION_PX;
+  const height = typeof size.height === "number" && Number.isFinite(size.height) && size.height > 0 ? size.height : DEFAULT_IMAGE_DIMENSION_PX;
+  const wrap = isPlainObject$2(attrs.wrap) ? attrs.wrap : {};
+  const wrapAttrs = isPlainObject$2(wrap.attrs) ? wrap.attrs : {};
+  const run = {
+    kind: "image",
+    src,
+    width,
+    height
+  };
+  if (typeof attrs.alt === "string") run.alt = attrs.alt;
+  if (typeof attrs.title === "string") run.title = attrs.title;
+  const distTop = pickNumber(wrapAttrs.distTop ?? wrapAttrs.distT);
+  if (distTop != null) run.distTop = distTop;
+  const distBottom = pickNumber(wrapAttrs.distBottom ?? wrapAttrs.distB);
+  if (distBottom != null) run.distBottom = distBottom;
+  const distLeft = pickNumber(wrapAttrs.distLeft ?? wrapAttrs.distL);
+  if (distLeft != null) run.distLeft = distLeft;
+  const distRight = pickNumber(wrapAttrs.distRight ?? wrapAttrs.distR);
+  if (distRight != null) run.distRight = distRight;
+  run.verticalAlign = "bottom";
+  const pos = positions.get(node);
+  if (pos) {
+    run.pmStart = pos.start;
+    run.pmEnd = pos.end;
+  }
+  if (activeSdt) {
+    run.sdt = activeSdt;
+  }
+  return run;
+}
 const isTextRun$1 = (run) => run.kind !== "tab";
 const dataAttrsCompatible = (a, b) => {
   const aAttrs = a.dataAttrs;
@@ -19609,6 +19838,62 @@ function mergeAdjacentRuns(runs) {
   merged.push(current);
   return merged;
 }
+const extractFirstTextRunFont = (para) => {
+  if (!para.content || !Array.isArray(para.content) || para.content.length === 0) {
+    return void 0;
+  }
+  const extractFontFromMarks = (marks) => {
+    if (!marks || !Array.isArray(marks)) return void 0;
+    const result = {};
+    for (const mark of marks) {
+      if (!mark || typeof mark !== "object") continue;
+      if (mark.type === "textStyle" && mark.attrs) {
+        const attrs = mark.attrs;
+        if (attrs.fontSize != null) {
+          const fontSizeStr = String(attrs.fontSize);
+          const size = parseFloat(fontSizeStr);
+          if (Number.isFinite(size)) {
+            if (fontSizeStr.endsWith("pt")) {
+              result.fontSizePx = ptToPx(size);
+            } else {
+              result.fontSizePx = size;
+            }
+          }
+        }
+        if (typeof attrs.fontFamily === "string") {
+          result.fontFamily = attrs.fontFamily;
+        }
+      }
+    }
+    return Object.keys(result).length > 0 ? result : void 0;
+  };
+  const findFirstTextFont = (nodes) => {
+    for (const node of nodes) {
+      if (!node) continue;
+      if (node.type === "text") {
+        const font2 = extractFontFromMarks(node.marks);
+        if (font2) return font2;
+      }
+      if (node.type === "run" && Array.isArray(node.content)) {
+        const runFont = extractFontFromMarks(node.marks);
+        const childFont = findFirstTextFont(node.content);
+        if (runFont || childFont) {
+          return {
+            fontSizePx: childFont?.fontSizePx ?? runFont?.fontSizePx,
+            fontFamily: childFont?.fontFamily ?? runFont?.fontFamily
+          };
+        }
+      }
+      if (Array.isArray(node.content)) {
+        const font2 = findFirstTextFont(node.content);
+        if (font2) return font2;
+      }
+    }
+    return void 0;
+  };
+  const font = findFirstTextFont(para.content);
+  return font;
+};
 const applyBaseRunDefaults = (run, defaults, fallbackFont, fallbackSize) => {
   if (!run) return;
   if (defaults.fontFamily && run.fontFamily === fallbackFont) {
@@ -19684,6 +19969,22 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
     }
     paragraphAttrs.spacing = spacing;
   }
+  if (paragraphAttrs?.numberingProperties && paragraphAttrs?.wordLayout) {
+    const firstRunFont = extractFirstTextRunFont(para);
+    if (firstRunFont) {
+      const wordLayout = paragraphAttrs.wordLayout;
+      const marker = wordLayout.marker;
+      if (marker?.run) {
+        const markerRun = marker.run;
+        if (firstRunFont.fontSizePx != null && Number.isFinite(firstRunFont.fontSizePx)) {
+          markerRun.fontSize = firstRunFont.fontSizePx;
+        }
+        if (firstRunFont.fontFamily) {
+          markerRun.fontFamily = firstRunFont.fontFamily;
+        }
+      }
+    }
+  }
   const linkedStyleResolver = createLinkedStyleResolver(converterContext?.linkedStyles);
   const blocks = [];
   if (hasPageBreakBefore(para)) {
@@ -19900,6 +20201,13 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
       return;
     }
     if (node.type === "image") {
+      if (isInlineImage(node)) {
+        const imageRun = imageNodeToRun(node, positions, activeSdt);
+        if (imageRun) {
+          currentRuns.push(imageRun);
+        }
+        return;
+      }
       flushParagraph();
       const mergedMarks = [...node.marks ?? [], ...inheritedMarks ?? []];
       const trackedMeta = trackedChanges?.enabled ? collectTrackedChangeFromMarks(mergedMarks) : void 0;
@@ -19999,7 +20307,9 @@ function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defa
       return;
     }
   };
-  para.content.forEach((child) => visitNode(child, [], void 0, null));
+  para.content.forEach((child) => {
+    visitNode(child, [], void 0, null);
+  });
   flushParagraph();
   const hasParagraphBlock = blocks.some((block) => block.kind === "paragraph");
   if (!hasParagraphBlock) {
@@ -20167,7 +20477,7 @@ const normalizeWrap$2 = (value) => {
     return void 0;
   }
   const type = normalizeWrapType$1(value.type);
-  if (!type || type === "Inline") {
+  if (!type) {
     return void 0;
   }
   const wrap = { type };
@@ -20392,6 +20702,8 @@ const buildDrawingBlock = (rawAttrs, nextBlockId, positions, node, geometry, dra
     attrsWithPm.pmStart = pos.start;
     attrsWithPm.pmEnd = pos.end;
   }
+  const zIndexFromRelativeHeight = normalizeZIndex(rawAttrs.originalAttributes);
+  const finalZIndex = zIndexFromRelativeHeight ?? coerceNumber(rawAttrs.zIndex);
   return {
     kind: "drawing",
     id: nextBlockId("drawing"),
@@ -20400,15 +20712,19 @@ const buildDrawingBlock = (rawAttrs, nextBlockId, positions, node, geometry, dra
     margin: toBoxSpacing$1(rawAttrs.marginOffset) ?? toBoxSpacing$1(rawAttrs.margin),
     anchor: baseAnchor,
     wrap: normalizedWrap,
-    zIndex: coerceNumber(rawAttrs.zIndex),
+    zIndex: finalZIndex,
     drawingContentId: typeof rawAttrs.drawingContentId === "string" ? rawAttrs.drawingContentId : void 0,
     drawingContent: toDrawingContentSnapshot(rawAttrs.drawingContent),
     attrs: attrsWithPm,
     geometry,
     shapeKind: typeof rawAttrs.kind === "string" ? rawAttrs.kind : void 0,
-    fillColor: typeof rawAttrs.fillColor === "string" ? rawAttrs.fillColor : void 0,
-    strokeColor: typeof rawAttrs.strokeColor === "string" ? rawAttrs.strokeColor : void 0,
+    fillColor: normalizeFillColor(rawAttrs.fillColor),
+    strokeColor: normalizeStrokeColor(rawAttrs.strokeColor),
     strokeWidth: coerceNumber(rawAttrs.strokeWidth),
+    textContent: normalizeTextContent(rawAttrs.textContent),
+    textAlign: typeof rawAttrs.textAlign === "string" ? rawAttrs.textAlign : void 0,
+    textVerticalAlign: normalizeTextVerticalAlign(rawAttrs.textVerticalAlign),
+    textInsets: normalizeTextInsets(rawAttrs.textInsets),
     ...extraProps
   };
 };
@@ -20585,26 +20901,32 @@ const parseTableCell = (args) => {
   if (!isTableCellNode(cellNode) || !Array.isArray(cellNode.content)) {
     return null;
   }
-  const paraNode = cellNode.content.find((c) => c.type === "paragraph");
-  if (!paraNode) {
+  const blocks = [];
+  for (const childNode of cellNode.content) {
+    if (childNode.type === "paragraph") {
+      const paragraphBlocks = context.paragraphToFlowBlocks(
+        childNode,
+        context.nextBlockId,
+        context.positions,
+        context.defaultFont,
+        context.defaultSize,
+        context.styleContext,
+        void 0,
+        context.trackedChanges,
+        context.bookmarks,
+        context.hyperlinkConfig,
+        context.themeColors,
+        context.converterContext
+      );
+      const paragraph = paragraphBlocks.find((b) => b.kind === "paragraph");
+      if (paragraph) {
+        blocks.push(paragraph);
+      }
+    }
+  }
+  if (blocks.length === 0) {
     return null;
   }
-  const paragraphBlocks = context.paragraphToFlowBlocks(
-    paraNode,
-    context.nextBlockId,
-    context.positions,
-    context.defaultFont,
-    context.defaultSize,
-    context.styleContext,
-    void 0,
-    context.trackedChanges,
-    context.bookmarks,
-    context.hyperlinkConfig,
-    context.themeColors,
-    context.converterContext
-  );
-  const paragraph = paragraphBlocks.find((b) => b.kind === "paragraph");
-  if (!paragraph) return null;
   const cellAttrs = {};
   const borders = extractCellBorders(cellNode.attrs ?? {});
   if (borders) cellAttrs.borders = borders;
@@ -20627,7 +20949,9 @@ const parseTableCell = (args) => {
   const colSpan = pickNumber(cellNode.attrs?.colspan);
   return {
     id: context.nextBlockId(`cell-${rowIndex}-${cellIndex}`),
-    paragraph,
+    blocks,
+    // Backward compatibility: set paragraph to first block if it's a paragraph
+    paragraph: blocks[0]?.kind === "paragraph" ? blocks[0] : void 0,
     rowSpan: rowSpan ?? void 0,
     colSpan: colSpan ?? void 0,
     attrs: Object.keys(cellAttrs).length > 0 ? cellAttrs : void 0
@@ -20722,6 +21046,10 @@ function tableNodeToBlock$1(node, nextBlockId, positions, defaultFont, defaultSi
   } else if (hydratedTableStyle?.tableWidth) {
     tableAttrs.tableWidth = hydratedTableStyle.tableWidth;
   }
+  const tableLayout = node.attrs?.tableLayout;
+  if (tableLayout) {
+    tableAttrs.tableLayout = tableLayout;
+  }
   let columnWidths = void 0;
   const twipsToPixels2 = (twips) => {
     const PIXELS_PER_INCH2 = 96;
@@ -21074,7 +21402,7 @@ function getMeasurementContext() {
   return measurementCtx;
 }
 function getRunFontString(run) {
-  if (run.kind === "tab") {
+  if (run.kind === "tab" || run.kind === "image") {
     return "normal normal 16px Arial";
   }
   const style = run.italic ? "italic" : "normal";
@@ -21093,6 +21421,10 @@ function sliceRunsForLine$1(block, line) {
       result.push(run);
       continue;
     }
+    if (run.kind === "image") {
+      result.push(run);
+      continue;
+    }
     const text = run.text ?? "";
     const isFirstRun = runIndex === line.fromRun;
     const isLastRun = runIndex === line.toRun;
@@ -21120,7 +21452,11 @@ function measureCharacterX(block, line, charOffset) {
     const runs2 = sliceRunsForLine$1(block, line);
     const charsInLine = Math.max(
       1,
-      runs2.reduce((sum, run) => sum + (isTabRun$1(run) ? TAB_CHAR_LENGTH : (run.text ?? "").length), 0)
+      runs2.reduce((sum, run) => {
+        if (isTabRun$1(run)) return sum + TAB_CHAR_LENGTH;
+        if (run.kind === "image") return sum;
+        return sum + (run.text ?? "").length;
+      }, 0)
     );
     return charOffset / charsInLine * line.width;
   }
@@ -21139,7 +21475,7 @@ function measureCharacterX(block, line, charOffset) {
       currentCharOffset += runLength2;
       continue;
     }
-    const text = run.text ?? "";
+    const text = run.kind === "image" ? "" : run.text ?? "";
     const runLength = text.length;
     if (currentCharOffset + runLength >= charOffset) {
       const offsetInRun = charOffset - currentCharOffset;
@@ -21162,7 +21498,11 @@ function findCharacterAtX(block, line, x, pmStart) {
     const runs2 = sliceRunsForLine$1(block, line);
     const charsInLine = Math.max(
       1,
-      runs2.reduce((sum, run) => sum + (isTabRun$1(run) ? TAB_CHAR_LENGTH : (run.text ?? "").length), 0)
+      runs2.reduce((sum, run) => {
+        if (isTabRun$1(run)) return sum + TAB_CHAR_LENGTH;
+        if (run.kind === "image") return sum;
+        return sum + (run.text ?? "").length;
+      }, 0)
     );
     const ratio = Math.max(0, Math.min(1, x / line.width));
     const charOffset = Math.round(ratio * charsInLine);
@@ -21195,7 +21535,7 @@ function findCharacterAtX(block, line, x, pmStart) {
       currentCharOffset += TAB_CHAR_LENGTH;
       continue;
     }
-    const text = run.text ?? "";
+    const text = run.kind === "image" ? "" : run.text ?? "";
     const runLength = text.length;
     if (runLength === 0) continue;
     ctx2.font = getRunFontString(run);
@@ -21232,7 +21572,7 @@ function findCharacterAtX(block, line, x, pmStart) {
   };
 }
 const computeLetterSpacingWidth = (run, precedingChars, runLength) => {
-  if (run.kind === "tab" || !run.letterSpacing) {
+  if (isTabRun$1(run) || run.kind === "image" || !run.letterSpacing) {
     return 0;
   }
   const maxGaps = Math.max(runLength - 1, 0);
@@ -21598,14 +21938,8 @@ function computeAnchorX(anchor, columnIndex, columns, imageWidth, margins, pageW
     baseX = columnLeft;
     availableWidth = columns.width;
   }
-  if (alignH === "left") {
-    return baseX + offsetH;
-  } else if (alignH === "right") {
-    return baseX + availableWidth - imageWidth - offsetH;
-  } else if (alignH === "center") {
-    return baseX + (availableWidth - imageWidth) / 2 + offsetH;
-  }
-  return baseX;
+  const result = alignH === "left" ? baseX + offsetH : alignH === "right" ? baseX + availableWidth - imageWidth - offsetH : alignH === "center" ? baseX + (availableWidth - imageWidth) / 2 + offsetH : baseX;
+  return result;
 }
 function computeWrapMode(wrap, _anchor) {
   if (!wrap) return "none";
@@ -21834,6 +22168,18 @@ const computeLinePmRange$2 = (block, line) => {
   for (let runIndex = line.fromRun; runIndex <= line.toRun; runIndex += 1) {
     const run = block.runs[runIndex];
     if (!run) continue;
+    if (run.kind === "image") {
+      const runPmStart2 = run.pmStart ?? void 0;
+      const runPmEnd = run.pmEnd ?? void 0;
+      if (runPmStart2 == null || runPmEnd == null) {
+        continue;
+      }
+      if (pmStart == null) {
+        pmStart = runPmStart2;
+      }
+      pmEnd = runPmEnd;
+      continue;
+    }
     const runWithPm = run;
     const text = runWithPm.text ?? "";
     const runLength = text.length;
@@ -21867,16 +22213,34 @@ const extractBlockPmRange = (block) => {
     pmEnd: end2 ?? (start2 != null ? start2 + 1 : void 0)
   };
 };
-const spacingDebugLog = (..._args) => {
+const anchorDebugLog = (...args) => {
+  return;
 };
 function layoutParagraphBlock(ctx2, anchors) {
   const { block, measure, columnWidth, ensurePage, advanceColumn, columnX, floatManager } = ctx2;
   const remeasureParagraph2 = ctx2.remeasureParagraph;
+  const frame = block.attrs?.frame;
   if (anchors?.anchoredDrawings?.length) {
     for (const entry of anchors.anchoredDrawings) {
       if (anchors.placedAnchoredIds.has(entry.block.id)) continue;
       const state = ensurePage();
-      const anchorY = state.cursorY;
+      const baseAnchorY = state.cursorY;
+      const firstLineHeight = measure.lines?.[0]?.lineHeight ?? 0;
+      const vRelativeFrom = entry.block.anchor?.vRelativeFrom;
+      const paragraphAdjustment = vRelativeFrom === "paragraph" ? firstLineHeight / 2 : 0;
+      const anchorY = baseAnchorY + paragraphAdjustment;
+      anchorDebugLog("Positioning anchored image:", {
+        blockId: entry.block.id,
+        baseAnchorY,
+        paragraphAdjustment,
+        anchorY,
+        offsetV: entry.block.anchor?.offsetV,
+        finalY: anchorY + (entry.block.anchor?.offsetV ?? 0),
+        measureHeight: entry.measure.height,
+        measureWidth: entry.measure.width,
+        pageNumber: state.page.number,
+        vRelativeFrom
+      });
       floatManager.registerDrawing(entry.block, entry.measure, anchorY, state.columnIndex, state.page.number);
       const anchorX = entry.block.anchor ? computeAnchorX(
         entry.block.anchor,
@@ -21888,6 +22252,30 @@ function layoutParagraphBlock(ctx2, anchors) {
       ) : columnX(state.columnIndex);
       const pmRange = extractBlockPmRange(entry.block);
       if (entry.block.kind === "image" && entry.measure.kind === "image") {
+        const pageContentHeight = Math.max(0, state.contentBottom - state.topMargin);
+        const relativeFrom = entry.block.anchor?.hRelativeFrom ?? "column";
+        const marginLeft = anchors.pageMargins.left ?? 0;
+        const marginRight = anchors.pageMargins.right ?? 0;
+        let maxWidth;
+        if (relativeFrom === "page") {
+          maxWidth = anchors.columns.count === 1 ? anchors.pageWidth - marginLeft - marginRight : anchors.pageWidth;
+        } else if (relativeFrom === "margin") {
+          maxWidth = anchors.pageWidth - marginLeft - marginRight;
+        } else {
+          maxWidth = anchors.columns.width;
+        }
+        const aspectRatio = entry.measure.width > 0 && entry.measure.height > 0 ? entry.measure.width / entry.measure.height : 1;
+        const minWidth = 20;
+        const minHeight = minWidth / aspectRatio;
+        const metadata = {
+          originalWidth: entry.measure.width,
+          originalHeight: entry.measure.height,
+          maxWidth,
+          maxHeight: pageContentHeight,
+          aspectRatio,
+          minWidth,
+          minHeight
+        };
         const fragment = {
           kind: "image",
           blockId: entry.block.id,
@@ -21896,7 +22284,8 @@ function layoutParagraphBlock(ctx2, anchors) {
           width: entry.measure.width,
           height: entry.measure.height,
           isAnchored: true,
-          zIndex: entry.block.anchor?.behindDoc ? 0 : 1
+          zIndex: entry.block.anchor?.behindDoc ? 0 : 1,
+          metadata
         };
         if (pmRange.pmStart != null) fragment.pmStart = pmRange.pmStart;
         if (pmRange.pmEnd != null) fragment.pmEnd = pmRange.pmEnd;
@@ -21932,13 +22321,41 @@ function layoutParagraphBlock(ctx2, anchors) {
   const spacingAfter = Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
   let appliedSpacingBefore = spacingBefore === 0;
   let lastState = null;
-  {
-    spacingDebugLog("paragraph spacing attrs", {
+  const isPositionedFrame = frame?.wrap === "none";
+  if (isPositionedFrame) {
+    let state = ensurePage();
+    if (state.cursorY >= state.contentBottom) {
+      state = advanceColumn(state);
+    }
+    const maxLineWidth = lines.reduce((max2, line) => Math.max(max2, line.width ?? 0), 0);
+    const fragmentWidth = maxLineWidth || columnWidth;
+    let x = columnX(state.columnIndex);
+    if (frame.xAlign === "right") {
+      x += columnWidth - fragmentWidth;
+    } else if (frame.xAlign === "center") {
+      x += (columnWidth - fragmentWidth) / 2;
+    }
+    if (typeof frame.x === "number" && Number.isFinite(frame.x)) {
+      x += frame.x;
+    }
+    const yOffset = typeof frame.y === "number" && Number.isFinite(frame.y) ? frame.y : 0;
+    const fragment = {
+      kind: "para",
       blockId: block.id,
-      spacingAttrs: spacing,
-      spacingBefore,
-      spacingAfter
-    });
+      fromLine: 0,
+      toLine: lines.length,
+      x,
+      y: state.cursorY + yOffset,
+      width: fragmentWidth,
+      ...computeFragmentPmRange(block, lines, 0, lines.length)
+    };
+    if (measure.marker) {
+      fragment.markerWidth = measure.marker.markerWidth;
+    }
+    state.page.fragments.push(fragment);
+    state.trailingSpacing = 0;
+    state.lastParagraphStyleId = styleId;
+    return;
   }
   let didRemeasureForFloats = false;
   while (fromLine < lines.length) {
@@ -21957,54 +22374,13 @@ function layoutParagraphBlock(ctx2, anchors) {
       while (!appliedSpacingBefore) {
         const prevTrailing = state.trailingSpacing ?? 0;
         const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
-        {
-          spacingDebugLog("spacingBefore pending", {
-            blockId: block.id,
-            cursorY: state.cursorY,
-            contentBottom: state.contentBottom,
-            spacingBefore,
-            prevTrailing,
-            neededSpacingBefore,
-            column: state.columnIndex,
-            page: state.page.number
-          });
-        }
         if (state.cursorY + neededSpacingBefore > state.contentBottom) {
-          {
-            spacingDebugLog("spacingBefore triggers column advance", {
-              blockId: block.id,
-              cursorY: state.cursorY,
-              spacingBefore,
-              neededSpacingBefore,
-              prevTrailing,
-              column: state.columnIndex,
-              page: state.page.number
-            });
-          }
           state = advanceColumn(state);
           if (state.trailingSpacing == null) state.trailingSpacing = 0;
           continue;
         }
         if (neededSpacingBefore > 0) {
           state.cursorY += neededSpacingBefore;
-          {
-            spacingDebugLog("spacingBefore applied", {
-              blockId: block.id,
-              added: neededSpacingBefore,
-              prevTrailing,
-              newCursorY: state.cursorY,
-              column: state.columnIndex,
-              page: state.page.number
-            });
-          }
-        } else if (prevTrailing > 0) {
-          spacingDebugLog("spacingBefore collapsed by trailing spacing", {
-            blockId: block.id,
-            prevTrailing,
-            spacingBefore,
-            column: state.columnIndex,
-            page: state.page.number
-          });
         }
         state.trailingSpacing = 0;
         appliedSpacingBefore = true;
@@ -22056,18 +22432,18 @@ function layoutParagraphBlock(ctx2, anchors) {
       width: effectiveColumnWidth,
       ...computeFragmentPmRange(block, lines, fromLine, slice2.toLine)
     };
+    anchorDebugLog("Positioning paragraph fragment:", {
+      blockId: block.id,
+      fragmentY: state.cursorY,
+      fragmentHeight,
+      firstLineHeight: lines[fromLine]?.lineHeight,
+      firstLineAscent: lines[fromLine]?.ascent,
+      firstLineDescent: lines[fromLine]?.descent,
+      pageNumber: state.page.number
+    });
     if (measure.marker && fromLine === 0) {
       fragment.markerWidth = measure.marker.markerWidth;
     }
-    if (process$1.env.NODE_ENV !== "production" && measure.marker && fromLine === 0) {
-      console.log("[layoutParagraphBlock] fragment marker info", {
-        blockId: block.id,
-        indent: block.attrs?.indent,
-        markerWidth: fragment.markerWidth,
-        textWidth: fragment.width,
-        marker: measure.marker
-      });
-    }
     if (fromLine > 0) fragment.continuesFromPrev = true;
     if (slice2.toLine < lines.length) fragment.continuesOnNext = true;
     const floatAlignment = block.attrs?.floatAlignment;
@@ -22094,30 +22470,12 @@ function layoutParagraphBlock(ctx2, anchors) {
       let targetState = lastState;
       let appliedSpacingAfter = spacingAfter;
       if (targetState.cursorY + spacingAfter > targetState.contentBottom) {
-        {
-          spacingDebugLog("spacingAfter triggers column advance", {
-            blockId: block.id,
-            cursorY: targetState.cursorY,
-            spacingAfter,
-            column: targetState.columnIndex,
-            page: targetState.page.number
-          });
-        }
         targetState = advanceColumn(targetState);
         appliedSpacingAfter = 0;
       } else {
         targetState.cursorY += spacingAfter;
       }
       targetState.trailingSpacing = appliedSpacingAfter;
-      {
-        spacingDebugLog("spacingAfter applied", {
-          blockId: block.id,
-          appliedSpacingAfter,
-          newCursorY: targetState.cursorY,
-          column: targetState.columnIndex,
-          page: targetState.page.number
-        });
-      }
     } else {
       lastState.trailingSpacing = 0;
     }
@@ -22159,6 +22517,18 @@ function layoutImageBlock({
     state = advanceColumn(state);
   }
   const pmRange = extractBlockPmRange(block);
+  const aspectRatio = measure.width > 0 && measure.height > 0 ? measure.width / measure.height : 1;
+  const minWidth = 20;
+  const minHeight = minWidth / aspectRatio;
+  const metadata = {
+    originalWidth: measure.width,
+    originalHeight: measure.height,
+    maxWidth,
+    maxHeight: pageContentHeight,
+    aspectRatio,
+    minWidth,
+    minHeight
+  };
   const fragment = {
     kind: "image",
     blockId: block.id,
@@ -22167,7 +22537,8 @@ function layoutImageBlock({
     width,
     height,
     pmStart: pmRange.pmStart,
-    pmEnd: pmRange.pmEnd
+    pmEnd: pmRange.pmEnd,
+    metadata
   };
   state.page.fragments.push(fragment);
   state.cursorY += requiredHeight;
@@ -22398,6 +22769,175 @@ function createPaginator(opts) {
     getActiveColumnsForState
   };
 }
+function toUpperRoman(num) {
+  if (num < 1 || num > 3999) {
+    return String(num);
+  }
+  const values = [1e3, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1];
+  const numerals = ["M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"];
+  let result = "";
+  let remaining = num;
+  for (let i = 0; i < values.length; i++) {
+    while (remaining >= values[i]) {
+      result += numerals[i];
+      remaining -= values[i];
+    }
+  }
+  return result;
+}
+function toLowerRoman(num) {
+  return toUpperRoman(num).toLowerCase();
+}
+function toUpperLetter(num) {
+  if (num < 1) {
+    return "A";
+  }
+  let result = "";
+  let n = num;
+  while (n > 0) {
+    const remainder = (n - 1) % 26;
+    result = String.fromCharCode(65 + remainder) + result;
+    n = Math.floor((n - 1) / 26);
+  }
+  return result;
+}
+function toLowerLetter(num) {
+  return toUpperLetter(num).toLowerCase();
+}
+function formatPageNumber$1(pageNumber, format) {
+  const num = Math.max(1, pageNumber);
+  switch (format) {
+    case "decimal":
+      return String(num);
+    case "upperRoman":
+      return toUpperRoman(num);
+    case "lowerRoman":
+      return toLowerRoman(num);
+    case "upperLetter":
+      return toUpperLetter(num);
+    case "lowerLetter":
+      return toLowerLetter(num);
+    default:
+      return String(num);
+  }
+}
+function computeDisplayPageNumber(pages, sections) {
+  const result = [];
+  if (pages.length === 0) {
+    return result;
+  }
+  const sectionMap = /* @__PURE__ */ new Map();
+  for (const section of sections) {
+    sectionMap.set(section.sectionIndex, section);
+  }
+  let runningCounter = 1;
+  let currentSectionIndex = -1;
+  for (let i = 0; i < pages.length; i++) {
+    const page = pages[i];
+    const pageSectionIndex = 0;
+    if (pageSectionIndex !== currentSectionIndex) {
+      const sectionMetadata2 = sectionMap.get(pageSectionIndex);
+      if (sectionMetadata2?.numbering?.start !== void 0) {
+        runningCounter = sectionMetadata2.numbering.start;
+      }
+      currentSectionIndex = pageSectionIndex;
+    }
+    const sectionMetadata = sectionMap.get(pageSectionIndex);
+    const format = sectionMetadata?.numbering?.format ?? "decimal";
+    const displayNumber = runningCounter;
+    const displayText = formatPageNumber$1(displayNumber, format);
+    result.push({
+      physicalPage: page.number,
+      displayNumber,
+      displayText,
+      sectionIndex: pageSectionIndex
+    });
+    runningCounter++;
+  }
+  return result;
+}
+function resolvePageNumberTokens(layout, blocks, measures, numberingCtx) {
+  const affectedBlockIds = /* @__PURE__ */ new Set();
+  const updatedBlocks = /* @__PURE__ */ new Map();
+  if (!layout?.pages || layout.pages.length === 0) {
+    return { affectedBlockIds, updatedBlocks };
+  }
+  if (!numberingCtx || !numberingCtx.displayPages || numberingCtx.totalPages < 1) {
+    console.warn("[resolvePageTokens] Invalid numbering context - skipping resolution");
+    return { affectedBlockIds, updatedBlocks };
+  }
+  const blockMap = /* @__PURE__ */ new Map();
+  const blockHasTokensFlags = /* @__PURE__ */ new Map();
+  for (let i = 0; i < blocks.length; i++) {
+    const block = blocks[i];
+    blockMap.set(block.id, block);
+    if (block.kind === "paragraph" && block.attrs && "hasPageTokens" in block.attrs) {
+      blockHasTokensFlags.set(block.id, Boolean(block.attrs.hasPageTokens));
+    }
+  }
+  const totalPagesStr = String(numberingCtx.totalPages);
+  const processedBlocks = /* @__PURE__ */ new Set();
+  for (const page of layout.pages) {
+    const pageIndex = page.number - 1;
+    const displayPageInfo = numberingCtx.displayPages[pageIndex];
+    if (!displayPageInfo) {
+      console.warn(`[resolvePageTokens] No display page info for page ${page.number} - skipping`);
+      continue;
+    }
+    const displayPageText = displayPageInfo.displayText;
+    for (const fragment of page.fragments) {
+      if (fragment.kind !== "para") continue;
+      const blockId = fragment.blockId;
+      if (processedBlocks.has(blockId)) continue;
+      const hasTokensFlag = blockHasTokensFlags.get(blockId);
+      if (hasTokensFlag === false) continue;
+      const block = blockMap.get(blockId);
+      if (!block || block.kind !== "paragraph") continue;
+      const wasModified = hasPageTokens$1(block);
+      if (!wasModified) {
+        processedBlocks.add(blockId);
+        continue;
+      }
+      const clonedBlock = cloneBlockWithResolvedTokens(block, displayPageText, totalPagesStr);
+      updatedBlocks.set(blockId, clonedBlock);
+      affectedBlockIds.add(blockId);
+      processedBlocks.add(blockId);
+    }
+  }
+  return { affectedBlockIds, updatedBlocks };
+}
+function hasPageTokens$1(block) {
+  for (const run of block.runs) {
+    if ("token" in run && (run.token === "pageNumber" || run.token === "totalPageCount")) {
+      return true;
+    }
+  }
+  return false;
+}
+function cloneBlockWithResolvedTokens(block, displayPageText, totalPagesStr) {
+  const clonedRuns = block.runs.map((run) => {
+    if ("token" in run && run.token) {
+      if (run.token === "pageNumber") {
+        const { token: _token, ...runWithoutToken } = run;
+        return {
+          ...runWithoutToken,
+          text: displayPageText
+        };
+      } else if (run.token === "totalPageCount") {
+        const { token: _token, ...runWithoutToken } = run;
+        return {
+          ...runWithoutToken,
+          text: totalPagesStr
+        };
+      }
+    }
+    return run;
+  });
+  return {
+    ...block,
+    runs: clonedRuns
+  };
+}
 const DEFAULT_PAGE_SIZE$2 = { w: 612, h: 792 };
 const DEFAULT_MARGINS$2 = { top: 72, right: 72, bottom: 72, left: 72 };
 const COLUMN_EPSILON = 1e-4;
@@ -22854,7 +23394,7 @@ function layoutDocument(blocks, measures, options = {}) {
         throw new Error(`layoutDocument: expected paragraph measure for block ${block.id}`);
       }
       const paraBlock = block;
-      const isEmpty2 = !paraBlock.runs || paraBlock.runs.length === 0 || paraBlock.runs.length === 1 && (!paraBlock.runs[0].text || paraBlock.runs[0].text === "");
+      const isEmpty2 = !paraBlock.runs || paraBlock.runs.length === 0 || paraBlock.runs.length === 1 && (!paraBlock.runs[0].kind || paraBlock.runs[0].kind === "text") && (!paraBlock.runs[0].text || paraBlock.runs[0].text === "");
       if (isEmpty2) {
         const prevBlock = index2 > 0 ? blocks[index2 - 1] : null;
         const nextBlock = index2 < blocks.length - 1 ? blocks[index2 + 1] : null;
@@ -22980,7 +23520,21 @@ function layoutHeaderFooter(blocks, measures, constraints) {
   if (!Number.isFinite(height) || height <= 0) {
     throw new Error("layoutHeaderFooter: height must be positive");
   }
-  const layout = layoutDocument(blocks, measures, {
+  const marginLeft = constraints.margins?.left ?? 0;
+  const transformedBlocks = marginLeft > 0 ? blocks.map((block) => {
+    const hasPageRelativeAnchor = (block.kind === "image" || block.kind === "drawing") && block.anchor?.hRelativeFrom === "page" && block.anchor.offsetH != null;
+    if (hasPageRelativeAnchor) {
+      return {
+        ...block,
+        anchor: {
+          ...block.anchor,
+          offsetH: block.anchor.offsetH - marginLeft
+        }
+      };
+    }
+    return block;
+  }) : blocks;
+  const layout = layoutDocument(transformedBlocks, measures, {
     pageSize: { w: width, h: height },
     margins: { top: 0, right: 0, bottom: 0, left: 0 }
   });
@@ -23074,7 +23628,7 @@ const hashRuns = (block) => {
   const trackedMode = block.attrs && "trackedChangesMode" in block.attrs && block.attrs.trackedChangesMode || "review";
   const trackedEnabled = resolveTrackedChangesEnabled(block.attrs, true);
   const runsHash = block.runs.map((run) => {
-    const text = normalizeText(run.text ?? "");
+    const text = normalizeText(run.kind === "image" ? "" : run.text ?? "");
     const bold = "bold" in run ? run.bold : false;
     const italic = "italic" in run ? run.italic : false;
     const color = "color" in run ? run.color : void 0;
@@ -23253,6 +23807,358 @@ class MeasureCache {
     return `${block.id}@${safeWidth}x${safeHeight}:${hash2}`;
   }
 }
+function resolveHeaderFooterTokens(blocks, pageNumber, totalPages) {
+  if (!blocks || blocks.length === 0) {
+    return;
+  }
+  if (!Number.isFinite(pageNumber) || pageNumber < 1) {
+    console.warn("[resolveHeaderFooterTokens] Invalid pageNumber:", pageNumber, "- using 1 as fallback");
+    pageNumber = 1;
+  }
+  if (!Number.isFinite(totalPages) || totalPages < 1) {
+    console.warn("[resolveHeaderFooterTokens] Invalid totalPages:", totalPages, "- using 1 as fallback");
+    totalPages = 1;
+  }
+  const pageNumberStr = String(pageNumber);
+  const totalPagesStr = String(totalPages);
+  for (const block of blocks) {
+    if (block.kind !== "paragraph") continue;
+    const paraBlock = block;
+    for (const run of paraBlock.runs) {
+      if ("token" in run && run.token) {
+        if (run.token === "pageNumber") {
+          run.text = pageNumberStr;
+        } else if (run.token === "totalPageCount") {
+          run.text = totalPagesStr;
+        }
+      }
+    }
+  }
+}
+function cloneHeaderFooterBlocks(blocks) {
+  if (!blocks || blocks.length === 0) {
+    return [];
+  }
+  return blocks.map((block) => {
+    if (block.kind === "paragraph") {
+      const paraBlock = block;
+      return {
+        ...paraBlock,
+        runs: paraBlock.runs.map((run) => ({ ...run })),
+        attrs: paraBlock.attrs ? { ...paraBlock.attrs } : void 0
+      };
+    }
+    return { ...block };
+  });
+}
+function isEnabled(envVar, defaultValue) {
+  if (typeof process$1 === "undefined" || typeof process$1.env === "undefined") {
+    return defaultValue;
+  }
+  const value = process$1.env[envVar];
+  if (value === "true" || value === "1") {
+    return true;
+  }
+  if (value === "false" || value === "0") {
+    return false;
+  }
+  return defaultValue;
+}
+const FeatureFlags = {
+  /**
+   * Enable section-aware numbering with restarts and format changes.
+   * When disabled, falls back to simple 1-N sequential numbering.
+   */
+  NUMBERING_SECTION_AWARE: isEnabled("SD_NUMBERING_SECTION_AWARE", true),
+  /**
+   * Enable body page token resolution (PAGE/NUMPAGES in document content).
+   * When disabled, tokens remain as placeholders in body content.
+   */
+  BODY_PAGE_TOKENS: isEnabled("SD_BODY_PAGE_TOKENS", true),
+  /**
+   * Enable header/footer page token resolution.
+   * When disabled, headers/footers use painter-time token rendering fallback.
+   */
+  HEADER_FOOTER_PAGE_TOKENS: isEnabled("SD_HEADER_FOOTER_PAGE_TOKENS", true),
+  /**
+   * Enable digit bucketing for header/footer caching in large documents.
+   * When disabled, creates per-page layouts for all documents (no bucketing).
+   * Recommended to keep enabled for documents with 100+ pages.
+   */
+  HF_DIGIT_BUCKETING: isEnabled("SD_HF_DIGIT_BUCKETING", true),
+  /**
+   * Enable debug logging for page token resolution.
+   * Logs token resolution details, affected blocks, and convergence iteration info.
+   * Should be disabled in production (only enabled for debugging).
+   */
+  DEBUG_PAGE_TOKENS: isEnabled("SD_DEBUG_PAGE_TOKENS", false),
+  /**
+   * Enable debug logging for header/footer cache operations.
+   * Logs cache hits, misses, invalidations, and bucket selection.
+   * Should be disabled in production (only enabled for debugging).
+   */
+  DEBUG_HF_CACHE: isEnabled("SD_DEBUG_HF_CACHE", false)
+};
+const PageTokenLogger = {
+  /**
+   * Logs the start of token resolution.
+   *
+   * @param iteration - Current iteration number (0-based)
+   * @param totalPages - Total number of pages in the document
+   */
+  logIterationStart(iteration, totalPages) {
+    if (!FeatureFlags.DEBUG_PAGE_TOKENS) return;
+    console.log(`[PageTokens] Iteration ${iteration}: Resolving tokens for ${totalPages} pages`);
+  },
+  /**
+   * Logs affected blocks during token resolution.
+   *
+   * @param iteration - Current iteration number (0-based)
+   * @param affectedBlockIds - Set of affected block IDs
+   * @param blockSamples - Sample block IDs for debugging (first 5)
+   */
+  logAffectedBlocks(iteration, affectedBlockIds, blockSamples = []) {
+    if (!FeatureFlags.DEBUG_PAGE_TOKENS) return;
+    const count = affectedBlockIds.size;
+    const samples = blockSamples.slice(0, 5).join(", ");
+    console.log(
+      `[PageTokens] Iteration ${iteration}: ${count} blocks affected`,
+      samples ? `(samples: ${samples})` : ""
+    );
+  },
+  /**
+   * Logs convergence status.
+   *
+   * @param iteration - Final iteration number
+   * @param converged - Whether convergence was achieved
+   * @param totalTimeMs - Total time spent in token resolution
+   */
+  logConvergence(iteration, converged, totalTimeMs) {
+    if (!FeatureFlags.DEBUG_PAGE_TOKENS) return;
+    if (converged) {
+      console.log(`[PageTokens] Converged after ${iteration} iterations in ${totalTimeMs.toFixed(2)}ms`);
+    } else {
+      console.warn(`[PageTokens] Did NOT converge after ${iteration} iterations (${totalTimeMs.toFixed(2)}ms)`);
+    }
+  },
+  /**
+   * Logs token resolution error.
+   *
+   * @param blockId - Block ID where error occurred
+   * @param error - Error object
+   */
+  logError(blockId, error) {
+    if (!FeatureFlags.DEBUG_PAGE_TOKENS) return;
+    console.error(`[PageTokens] Error resolving tokens in block ${blockId}:`, error);
+  },
+  /**
+   * Logs re-measurement details.
+   *
+   * @param blockCount - Number of blocks being re-measured
+   * @param timeMs - Time spent re-measuring
+   */
+  logRemeasure(blockCount, timeMs) {
+    if (!FeatureFlags.DEBUG_PAGE_TOKENS) return;
+    console.log(`[PageTokens] Re-measured ${blockCount} blocks in ${timeMs.toFixed(2)}ms`);
+  }
+};
+const HeaderFooterCacheLogger = {
+  /**
+   * Logs cache hit for a header/footer variant.
+   *
+   * @param variantType - Variant type (default, first, even, odd)
+   * @param pageNumber - Page number being cached
+   * @param bucket - Digit bucket (d1, d2, d3, d4) or 'exact'
+   */
+  logCacheHit(variantType, pageNumber, bucket) {
+    if (!FeatureFlags.DEBUG_HF_CACHE) return;
+    console.log(`[HF Cache] HIT: variant=${variantType}, page=${pageNumber}, bucket=${bucket}`);
+  },
+  /**
+   * Logs cache miss for a header/footer variant.
+   *
+   * @param variantType - Variant type (default, first, even, odd)
+   * @param pageNumber - Page number being cached
+   * @param bucket - Digit bucket (d1, d2, d3, d4) or 'exact'
+   */
+  logCacheMiss(variantType, pageNumber, bucket) {
+    if (!FeatureFlags.DEBUG_HF_CACHE) return;
+    console.log(`[HF Cache] MISS: variant=${variantType}, page=${pageNumber}, bucket=${bucket}`);
+  },
+  /**
+   * Logs cache invalidation.
+   *
+   * @param reason - Reason for invalidation
+   * @param affectedBlockIds - Block IDs being invalidated
+   */
+  logInvalidation(reason, affectedBlockIds) {
+    if (!FeatureFlags.DEBUG_HF_CACHE) return;
+    console.log(`[HF Cache] INVALIDATE: reason=${reason}, blocks=${affectedBlockIds.length}`);
+  },
+  /**
+   * Logs cache statistics.
+   *
+   * @param stats - Cache statistics object
+   */
+  logStats(stats) {
+    if (!FeatureFlags.DEBUG_HF_CACHE) return;
+    const hitRate = stats.hits + stats.misses > 0 ? (stats.hits / (stats.hits + stats.misses) * 100).toFixed(1) : "0.0";
+    console.log(
+      `[HF Cache] Stats: hits=${stats.hits}, misses=${stats.misses}, hitRate=${hitRate}%, size=${stats.size}, evictions=${stats.evictions}`
+    );
+  },
+  /**
+   * Logs bucketing decision for large documents.
+   *
+   * @param totalPages - Total number of pages
+   * @param useBucketing - Whether bucketing is being used
+   * @param buckets - Buckets needed (if bucketing enabled)
+   */
+  logBucketingDecision(totalPages, useBucketing, buckets) {
+    if (!FeatureFlags.DEBUG_HF_CACHE) return;
+    if (useBucketing && buckets) {
+      console.log(`[HF Cache] Bucketing enabled: ${totalPages} pages, buckets=${buckets.join(", ")}`);
+    } else {
+      console.log(`[HF Cache] Bucketing disabled: ${totalPages} pages (per-page layouts)`);
+    }
+  }
+};
+class MetricsCollector {
+  constructor() {
+    this.pageTokenMetrics = null;
+    this.headerFooterCacheMetrics = null;
+    this.layoutMetrics = null;
+  }
+  /**
+   * Records page token resolution metrics.
+   *
+   * @param metrics - Page token metrics
+   */
+  recordPageTokenMetrics(metrics) {
+    this.pageTokenMetrics = { ...metrics };
+    this.checkPageTokenRollbackTriggers(metrics);
+  }
+  /**
+   * Records header/footer cache metrics.
+   *
+   * @param stats - Cache statistics
+   */
+  recordHeaderFooterCacheMetrics(stats) {
+    const hitRate = stats.hits + stats.misses > 0 ? stats.hits / (stats.hits + stats.misses) * 100 : 0;
+    this.headerFooterCacheMetrics = {
+      hits: stats.hits,
+      misses: stats.misses,
+      hitRate,
+      cacheSize: stats.size,
+      memoryEstimate: stats.memorySizeEstimate,
+      evictions: stats.evictions
+    };
+    this.checkCacheRollbackTriggers(this.headerFooterCacheMetrics);
+  }
+  /**
+   * Records overall layout metrics.
+   *
+   * @param metrics - Layout metrics
+   */
+  recordLayoutMetrics(metrics) {
+    this.layoutMetrics = { ...metrics };
+  }
+  /**
+   * Gets all collected metrics.
+   *
+   * @returns Object with all metrics or null if not collected
+   */
+  getMetrics() {
+    return {
+      pageTokens: this.pageTokenMetrics,
+      headerFooterCache: this.headerFooterCacheMetrics,
+      layout: this.layoutMetrics
+    };
+  }
+  /**
+   * Resets all collected metrics.
+   */
+  reset() {
+    this.pageTokenMetrics = null;
+    this.headerFooterCacheMetrics = null;
+    this.layoutMetrics = null;
+  }
+  /**
+   * Checks for page token rollback triggers and logs warnings.
+   *
+   * Rollback triggers (from plan):
+   * - Convergence > 2 iterations
+   * - Token resolution time > 100ms per layout run
+   *
+   * @param metrics - Page token metrics
+   */
+  checkPageTokenRollbackTriggers(metrics) {
+    if (metrics.iterations > 2 && !metrics.converged) {
+      console.warn(
+        `[Rollback Trigger] Page token resolution did not converge after ${metrics.iterations} iterations. Consider disabling SD_BODY_PAGE_TOKENS if this persists.`
+      );
+    }
+    if (metrics.totalTimeMs > 100 && metrics.iterations > 0) {
+      console.warn(
+        `[Rollback Trigger] Page token resolution took ${metrics.totalTimeMs.toFixed(2)}ms (>100ms threshold). Consider disabling SD_BODY_PAGE_TOKENS if performance is unacceptable.`
+      );
+    }
+  }
+  /**
+   * Checks for cache rollback triggers and logs warnings.
+   *
+   * Rollback triggers (from plan):
+   * - Cache thrash (hit rate below 30%)
+   * - Excessive memory usage (>1MB per 100 pages)
+   *
+   * @param metrics - Header/footer cache metrics
+   */
+  checkCacheRollbackTriggers(metrics) {
+    const MIN_HIT_RATE = 30;
+    const MAX_MEMORY_PER_100_PAGES = 1e6;
+    if (metrics.hits + metrics.misses > 10 && metrics.hitRate < MIN_HIT_RATE) {
+      console.warn(
+        `[Rollback Trigger] Header/footer cache hit rate is low (${metrics.hitRate.toFixed(1)}% < ${MIN_HIT_RATE}%). Consider disabling SD_HF_DIGIT_BUCKETING if cache thrashing persists.`
+      );
+    }
+    if (metrics.memoryEstimate > MAX_MEMORY_PER_100_PAGES) {
+      console.warn(
+        `[Rollback Trigger] Header/footer cache memory usage is high (${(metrics.memoryEstimate / 1e6).toFixed(2)}MB). Monitor for excessive growth.`
+      );
+    }
+  }
+}
+const globalMetrics = new MetricsCollector();
+const MIN_PAGES_FOR_BUCKETING = 100;
+function getBucketForPageNumber(pageNumber) {
+  if (pageNumber < 10) return "d1";
+  if (pageNumber < 100) return "d2";
+  if (pageNumber < 1e3) return "d3";
+  return "d4";
+}
+function getBucketRepresentative(bucket) {
+  switch (bucket) {
+    case "d1":
+      return 5;
+    case "d2":
+      return 50;
+    case "d3":
+      return 500;
+    case "d4":
+      return 5e3;
+  }
+}
+function hasPageTokens(blocks) {
+  for (const block of blocks) {
+    if (block.kind !== "paragraph") continue;
+    for (const run of block.runs) {
+      if ("token" in run && (run.token === "pageNumber" || run.token === "totalPageCount")) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
 class HeaderFooterLayoutCache {
   constructor() {
     this.cache = new MeasureCache();
@@ -23277,15 +24183,81 @@ class HeaderFooterLayoutCache {
   invalidate(blockIds) {
     this.cache.invalidate(blockIds);
   }
+  /**
+   * Gets cache statistics for monitoring and debugging.
+   *
+   * @returns Cache statistics object
+   */
+  getStats() {
+    return this.cache.getStats();
+  }
 }
 const sharedHeaderFooterCache = new HeaderFooterLayoutCache();
-async function layoutHeaderFooterWithCache(sections, constraints, measureBlock2, cache2 = sharedHeaderFooterCache) {
+async function layoutHeaderFooterWithCache(sections, constraints, measureBlock2, cache2 = sharedHeaderFooterCache, totalPages, pageResolver) {
   const result = {};
+  if (!pageResolver) {
+    const numPages = totalPages ?? 1;
+    for (const [type, blocks] of Object.entries(sections)) {
+      if (!blocks || blocks.length === 0) continue;
+      const clonedBlocks = cloneHeaderFooterBlocks(blocks);
+      resolveHeaderFooterTokens(clonedBlocks, 1, numPages);
+      const measures = await cache2.measureBlocks(clonedBlocks, constraints, measureBlock2);
+      const layout = layoutHeaderFooter(clonedBlocks, measures, constraints);
+      result[type] = { blocks: clonedBlocks, measures, layout };
+    }
+    return result;
+  }
+  const { totalPages: docTotalPages } = pageResolver(1);
+  const useBucketing = FeatureFlags.HF_DIGIT_BUCKETING && docTotalPages >= MIN_PAGES_FOR_BUCKETING;
   for (const [type, blocks] of Object.entries(sections)) {
     if (!blocks || blocks.length === 0) continue;
-    const measures = await cache2.measureBlocks(blocks, constraints, measureBlock2);
-    const layout = layoutHeaderFooter(blocks, measures, constraints);
-    result[type] = { blocks, measures, layout };
+    if (!hasPageTokens(blocks)) {
+      const measures = await cache2.measureBlocks(blocks, constraints, measureBlock2);
+      const layout = layoutHeaderFooter(blocks, measures, constraints);
+      result[type] = { blocks, measures, layout };
+      continue;
+    }
+    let pagesToLayout;
+    if (!useBucketing) {
+      pagesToLayout = Array.from({ length: docTotalPages }, (_, i) => i + 1);
+      HeaderFooterCacheLogger.logBucketingDecision(docTotalPages, false);
+    } else {
+      const bucketsNeeded = /* @__PURE__ */ new Set();
+      for (let p = 1; p <= docTotalPages; p++) {
+        bucketsNeeded.add(getBucketForPageNumber(p));
+      }
+      pagesToLayout = Array.from(bucketsNeeded).map((bucket) => getBucketRepresentative(bucket));
+      HeaderFooterCacheLogger.logBucketingDecision(docTotalPages, true, Array.from(bucketsNeeded));
+    }
+    const pages = [];
+    for (const pageNum of pagesToLayout) {
+      const clonedBlocks = cloneHeaderFooterBlocks(blocks);
+      const { displayText, totalPages: totalPagesForPage } = pageResolver(pageNum);
+      resolveHeaderFooterTokens(clonedBlocks, parseInt(displayText, 10) || pageNum, totalPagesForPage);
+      const measures = await cache2.measureBlocks(clonedBlocks, constraints, measureBlock2);
+      const pageLayout = layoutHeaderFooter(clonedBlocks, measures, constraints);
+      pages.push({
+        number: pageNum,
+        blocks: clonedBlocks,
+        measures,
+        fragments: pageLayout.pages[0]?.fragments ?? []
+      });
+    }
+    const firstPageLayout = pages[0] ? layoutHeaderFooter(pages[0].blocks, pages[0].measures, constraints) : { height: 0 };
+    const finalLayout = {
+      height: firstPageLayout.height,
+      minY: firstPageLayout.minY,
+      maxY: firstPageLayout.maxY,
+      pages: pages.map((p) => ({
+        number: p.number,
+        fragments: p.fragments
+      }))
+    };
+    result[type] = {
+      blocks: pages[0]?.blocks ?? blocks,
+      measures: pages[0]?.measures ?? [],
+      layout: finalLayout
+    };
   }
   return result;
 }
@@ -23310,7 +24282,7 @@ function fontString(run) {
   return `${italic}${bold}${size}px ${family}`.trim();
 }
 function runText(run) {
-  return run.text ?? "";
+  return run.kind === "image" ? "" : run.text ?? "";
 }
 function measureRunSliceWidth(run, fromChar, toChar) {
   const context = getCtx();
@@ -23472,7 +24444,7 @@ const paragraphBlocksEqual = (a, b) => {
   for (let i = 0; i < a.runs.length; i += 1) {
     const runA = a.runs[i];
     const runB = b.runs[i];
-    if (runA.text !== runB.text || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB)) {
+    if ((runA.kind === "image" ? "" : runA.text) !== (runB.kind === "image" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB)) {
       return false;
     }
   }
@@ -23583,8 +24555,195 @@ const jsonEqual = (a, b) => {
     return false;
   }
 };
+function computeHeaderFooterContentHash(blocks) {
+  if (!blocks || blocks.length === 0) {
+    return "";
+  }
+  const parts = [];
+  for (const block of blocks) {
+    parts.push(block.id);
+    if (block.kind === "paragraph") {
+      for (const run of block.runs) {
+        if (run.kind !== "image") {
+          parts.push(run.text ?? "");
+        }
+        if ("bold" in run && run.bold) parts.push("b");
+        if ("italic" in run && run.italic) parts.push("i");
+        if ("token" in run && run.token) parts.push(`token:${run.token}`);
+      }
+    }
+  }
+  return parts.join("|");
+}
+function computeSectionMetadataHash(sections) {
+  if (!sections || sections.length === 0) {
+    return "";
+  }
+  const parts = [];
+  for (const section of sections) {
+    parts.push(`section:${section.sectionIndex}`);
+    if (section.numbering) {
+      const num = section.numbering;
+      parts.push(`num:${num.format ?? "decimal"}:${num.start ?? 1}`);
+    }
+    if (section.headerRefs) {
+      const refs = section.headerRefs;
+      if (refs.default) parts.push(`hdr-def:${refs.default}`);
+      if (refs.first) parts.push(`hdr-first:${refs.first}`);
+      if (refs.even) parts.push(`hdr-even:${refs.even}`);
+      if (refs.odd) parts.push(`hdr-odd:${refs.odd}`);
+    }
+    if (section.footerRefs) {
+      const refs = section.footerRefs;
+      if (refs.default) parts.push(`ftr-def:${refs.default}`);
+      if (refs.first) parts.push(`ftr-first:${refs.first}`);
+      if (refs.even) parts.push(`ftr-even:${refs.even}`);
+      if (refs.odd) parts.push(`ftr-odd:${refs.odd}`);
+    }
+  }
+  return parts.join("|");
+}
+function computeConstraintsHash(constraints) {
+  const { width, height, pageWidth, margins } = constraints;
+  const parts = [`w:${width}`, `h:${height}`];
+  if (pageWidth !== void 0) {
+    parts.push(`pw:${pageWidth}`);
+  }
+  if (margins) {
+    parts.push(`ml:${margins.left}`, `mr:${margins.right}`);
+  }
+  return parts.join("|");
+}
+class HeaderFooterCacheState {
+  constructor() {
+    this.contentHashes = /* @__PURE__ */ new Map();
+    this.constraintsHash = "";
+    this.sectionMetadataHash = "";
+  }
+  /**
+   * Checks if header/footer content has changed for a variant.
+   *
+   * @param variantKey - Unique key for the variant (e.g., 'header-default')
+   * @param blocks - Current blocks for the variant
+   * @returns True if content has changed
+   */
+  hasContentChanged(variantKey, blocks) {
+    const currentHash = computeHeaderFooterContentHash(blocks);
+    const previousHash = this.contentHashes.get(variantKey);
+    if (previousHash === void 0) {
+      this.contentHashes.set(variantKey, currentHash);
+      return false;
+    }
+    const changed = currentHash !== previousHash;
+    if (changed) {
+      this.contentHashes.set(variantKey, currentHash);
+    }
+    return changed;
+  }
+  /**
+   * Checks if constraints have changed.
+   *
+   * @param constraints - Current constraints
+   * @returns True if constraints have changed
+   */
+  hasConstraintsChanged(constraints) {
+    const currentHash = computeConstraintsHash(constraints);
+    if (this.constraintsHash === "") {
+      this.constraintsHash = currentHash;
+      return false;
+    }
+    const changed = currentHash !== this.constraintsHash;
+    if (changed) {
+      this.constraintsHash = currentHash;
+    }
+    return changed;
+  }
+  /**
+   * Checks if section metadata has changed.
+   *
+   * @param sections - Current section metadata
+   * @returns True if metadata has changed
+   */
+  hasSectionMetadataChanged(sections) {
+    const currentHash = computeSectionMetadataHash(sections);
+    if (this.sectionMetadataHash === "") {
+      this.sectionMetadataHash = currentHash;
+      return false;
+    }
+    const changed = currentHash !== this.sectionMetadataHash;
+    if (changed) {
+      this.sectionMetadataHash = currentHash;
+    }
+    return changed;
+  }
+  /**
+   * Resets all cached state.
+   * Called when performing a full cache clear.
+   */
+  reset() {
+    this.contentHashes.clear();
+    this.constraintsHash = "";
+    this.sectionMetadataHash = "";
+  }
+}
+function invalidateHeaderFooterCache(cache2, cacheState, headerBlocks, footerBlocks, constraints, sections) {
+  const invalidationReasons = [];
+  const affectedBlockIds = [];
+  if (constraints && cacheState.hasConstraintsChanged(constraints)) {
+    invalidationReasons.push("constraints changed");
+    if (headerBlocks) {
+      Object.values(headerBlocks).forEach((blocks) => {
+        if (blocks) affectedBlockIds.push(...blocks.map((b) => b.id));
+      });
+    }
+    if (footerBlocks) {
+      Object.values(footerBlocks).forEach((blocks) => {
+        if (blocks) affectedBlockIds.push(...blocks.map((b) => b.id));
+      });
+    }
+  }
+  if (sections && cacheState.hasSectionMetadataChanged(sections)) {
+    invalidationReasons.push("section metadata changed");
+    if (headerBlocks) {
+      Object.values(headerBlocks).forEach((blocks) => {
+        if (blocks) affectedBlockIds.push(...blocks.map((b) => b.id));
+      });
+    }
+    if (footerBlocks) {
+      Object.values(footerBlocks).forEach((blocks) => {
+        if (blocks) affectedBlockIds.push(...blocks.map((b) => b.id));
+      });
+    }
+  }
+  if (headerBlocks) {
+    for (const [variant, blocks] of Object.entries(headerBlocks)) {
+      if (!blocks) continue;
+      const variantKey = `header-${variant}`;
+      if (cacheState.hasContentChanged(variantKey, blocks)) {
+        invalidationReasons.push(`header ${variant} content changed`);
+        affectedBlockIds.push(...blocks.map((b) => b.id));
+      }
+    }
+  }
+  if (footerBlocks) {
+    for (const [variant, blocks] of Object.entries(footerBlocks)) {
+      if (!blocks) continue;
+      const variantKey = `footer-${variant}`;
+      if (cacheState.hasContentChanged(variantKey, blocks)) {
+        invalidationReasons.push(`footer ${variant} content changed`);
+        affectedBlockIds.push(...blocks.map((b) => b.id));
+      }
+    }
+  }
+  if (affectedBlockIds.length > 0) {
+    const uniqueBlockIds = Array.from(new Set(affectedBlockIds));
+    cache2.invalidate(uniqueBlockIds);
+    HeaderFooterCacheLogger.logInvalidation(invalidationReasons.join(", "), uniqueBlockIds);
+  }
+}
 const measureCache = new MeasureCache();
 const headerMeasureCache = new HeaderFooterLayoutCache();
+const headerFooterCacheState = new HeaderFooterCacheState();
 const layoutDebugEnabled = typeof process$1 !== "undefined" && typeof process$1.env !== "undefined" && Boolean(process$1.env.SD_DEBUG_LAYOUT);
 const perfLog = (...args) => {
   if (!layoutDebugEnabled) return;
@@ -23626,22 +24785,121 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
     `[Perf] 4.1 Measure all blocks: ${(measureEnd - measureStart).toFixed(2)}ms (${cacheMisses} measured, ${cacheHits} cached)`
   );
   const layoutStart = performance.now();
-  const layout = layoutDocument(nextBlocks, measures, {
+  let layout = layoutDocument(nextBlocks, measures, {
     ...options,
     remeasureParagraph: (block, maxWidth) => remeasureParagraph(block, maxWidth)
   });
   const layoutEnd = performance.now();
   perfLog(`[Perf] 4.2 Layout document (pagination): ${(layoutEnd - layoutStart).toFixed(2)}ms`);
+  const maxIterations = 3;
+  let currentBlocks = nextBlocks;
+  let currentMeasures = measures;
+  let iteration = 0;
+  const pageTokenStart = performance.now();
+  let totalAffectedBlocks = 0;
+  let totalRemeasureTime = 0;
+  let totalRelayoutTime = 0;
+  let converged = true;
+  if (FeatureFlags.BODY_PAGE_TOKENS) {
+    while (iteration < maxIterations) {
+      const sections = options.sectionMetadata ?? [];
+      const numberingCtx = buildNumberingContext(layout, sections);
+      PageTokenLogger.logIterationStart(iteration, layout.pages.length);
+      const tokenResult = resolvePageNumberTokens(layout, currentBlocks, currentMeasures, numberingCtx);
+      if (tokenResult.affectedBlockIds.size === 0) {
+        perfLog(`[Perf] 4.3 Page token resolution converged after ${iteration} iterations`);
+        break;
+      }
+      perfLog(`[Perf] 4.3.${iteration + 1} Page tokens resolved: ${tokenResult.affectedBlockIds.size} blocks affected`);
+      const blockSamples = Array.from(tokenResult.affectedBlockIds).slice(0, 5);
+      PageTokenLogger.logAffectedBlocks(iteration, tokenResult.affectedBlockIds, blockSamples);
+      totalAffectedBlocks += tokenResult.affectedBlockIds.size;
+      currentBlocks = currentBlocks.map((block) => tokenResult.updatedBlocks.get(block.id) ?? block);
+      measureCache.invalidate(Array.from(tokenResult.affectedBlockIds));
+      const remeasureStart = performance.now();
+      currentMeasures = await remeasureAffectedBlocks(
+        currentBlocks,
+        currentMeasures,
+        tokenResult.affectedBlockIds,
+        constraints,
+        measureBlock2
+      );
+      const remeasureEnd = performance.now();
+      const remeasureTime = remeasureEnd - remeasureStart;
+      totalRemeasureTime += remeasureTime;
+      perfLog(`[Perf] 4.3.${iteration + 1}.1 Re-measure: ${remeasureTime.toFixed(2)}ms`);
+      PageTokenLogger.logRemeasure(tokenResult.affectedBlockIds.size, remeasureTime);
+      const oldPageCount = layout.pages.length;
+      const relayoutStart = performance.now();
+      layout = layoutDocument(currentBlocks, currentMeasures, {
+        ...options,
+        remeasureParagraph: (block, maxWidth) => remeasureParagraph(block, maxWidth)
+      });
+      const relayoutEnd = performance.now();
+      const relayoutTime = relayoutEnd - relayoutStart;
+      totalRelayoutTime += relayoutTime;
+      perfLog(`[Perf] 4.3.${iteration + 1}.2 Re-layout: ${relayoutTime.toFixed(2)}ms`);
+      const newPageCount = layout.pages.length;
+      if (newPageCount === oldPageCount && iteration > 0) {
+        perfLog(`[Perf] 4.3 Page count stable at ${newPageCount} - breaking convergence loop`);
+        break;
+      }
+      iteration++;
+    }
+    if (iteration >= maxIterations) {
+      converged = false;
+      console.warn(
+        `[incrementalLayout] Page token resolution did not converge after ${maxIterations} iterations - stopping`
+      );
+    }
+  }
+  const pageTokenEnd = performance.now();
+  const totalTokenTime = pageTokenEnd - pageTokenStart;
+  if (iteration > 0) {
+    perfLog(`[Perf] 4.3 Total page token resolution time: ${totalTokenTime.toFixed(2)}ms`);
+    PageTokenLogger.logConvergence(iteration, converged, totalTokenTime);
+    globalMetrics.recordPageTokenMetrics({
+      totalTimeMs: totalTokenTime,
+      iterations: iteration,
+      affectedBlocks: totalAffectedBlocks,
+      remeasureTimeMs: totalRemeasureTime,
+      relayoutTimeMs: totalRelayoutTime,
+      converged
+    });
+  }
   let headers;
   let footers;
   if (headerFooter?.constraints && (headerFooter.headerBlocks || headerFooter.footerBlocks)) {
+    const hfStart = performance.now();
     const measureFn = headerFooter.measure ?? measureBlock2;
+    invalidateHeaderFooterCache(
+      headerMeasureCache,
+      headerFooterCacheState,
+      headerFooter.headerBlocks,
+      headerFooter.footerBlocks,
+      headerFooter.constraints,
+      options.sectionMetadata
+    );
+    const sections = options.sectionMetadata ?? [];
+    const numberingCtx = buildNumberingContext(layout, sections);
+    const pageResolver = FeatureFlags.HEADER_FOOTER_PAGE_TOKENS ? (pageNumber) => {
+      const pageIndex = pageNumber - 1;
+      const displayInfo = numberingCtx.displayPages[pageIndex];
+      return {
+        displayText: displayInfo?.displayText ?? String(pageNumber),
+        totalPages: numberingCtx.totalPages
+      };
+    } : void 0;
     if (headerFooter.headerBlocks) {
       const headerLayouts = await layoutHeaderFooterWithCache(
         headerFooter.headerBlocks,
         headerFooter.constraints,
         measureFn,
-        headerMeasureCache
+        headerMeasureCache,
+        FeatureFlags.HEADER_FOOTER_PAGE_TOKENS ? void 0 : numberingCtx.totalPages,
+        // Fallback for backward compat
+        pageResolver
+        // Use page resolver for section-aware numbering
       );
       headers = serializeHeaderFooterResults("header", headerLayouts);
     }
@@ -23650,14 +24908,23 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
         headerFooter.footerBlocks,
         headerFooter.constraints,
         measureFn,
-        headerMeasureCache
+        headerMeasureCache,
+        FeatureFlags.HEADER_FOOTER_PAGE_TOKENS ? void 0 : numberingCtx.totalPages,
+        // Fallback for backward compat
+        pageResolver
+        // Use page resolver for section-aware numbering
       );
       footers = serializeHeaderFooterResults("footer", footerLayouts);
     }
+    const hfEnd = performance.now();
+    perfLog(`[Perf] 4.4 Header/footer layout: ${(hfEnd - hfStart).toFixed(2)}ms`);
+    const cacheStats = headerMeasureCache.getStats();
+    globalMetrics.recordHeaderFooterCacheMetrics(cacheStats);
+    HeaderFooterCacheLogger.logStats(cacheStats);
   }
   return {
     layout,
-    measures,
+    measures: currentMeasures,
     dirty,
     headers,
     footers
@@ -23701,6 +24968,31 @@ const serializeHeaderFooterResults = (kind, batch) => {
   });
   return results;
 };
+function buildNumberingContext(layout, sections) {
+  const totalPages = layout.pages.length;
+  const displayPages = computeDisplayPageNumber(layout.pages, sections);
+  return {
+    totalPages,
+    displayPages
+  };
+}
+async function remeasureAffectedBlocks(blocks, measures, affectedBlockIds, constraints, measureBlock2) {
+  const updatedMeasures = [...measures];
+  for (let i = 0; i < blocks.length; i++) {
+    const block = blocks[i];
+    if (!affectedBlockIds.has(block.id)) {
+      continue;
+    }
+    try {
+      const newMeasure = await measureBlock2(block, constraints);
+      updatedMeasures[i] = newMeasure;
+      measureCache.set(block, constraints.maxWidth, constraints.maxHeight, newMeasure);
+    } catch (error) {
+      console.warn(`[incrementalLayout] Failed to re-measure block ${block.id} after token resolution:`, error);
+    }
+  }
+  return updatedMeasures;
+}
 const isAtomicFragment = (fragment) => {
   return fragment.kind === "drawing" || fragment.kind === "image";
 };
@@ -24040,7 +25332,7 @@ function computeLinePmRange$1(block, line) {
   for (let runIndex = line.fromRun; runIndex <= line.toRun; runIndex += 1) {
     const run = block.runs[runIndex];
     if (!run) continue;
-    const text = run.text ?? "";
+    const text = run.kind === "image" ? "" : run.text ?? "";
     const runLength = text.length;
     const runPmStart = run.pmStart ?? null;
     const runPmEnd = run.pmEnd ?? (runPmStart != null ? runPmStart + runLength : null);
@@ -26221,6 +27513,104 @@ function k(t) {
 ${l}
 </svg>`;
 }
+function validateHexColor(color) {
+  if (typeof color !== "string") return void 0;
+  const trimmed = color.trim();
+  if (!trimmed) return void 0;
+  const withoutHash = trimmed.startsWith("#") ? trimmed.slice(1) : trimmed;
+  const hexPattern = /^[0-9A-Fa-f]{3}$|^[0-9A-Fa-f]{6}$/;
+  if (!hexPattern.test(withoutHash)) {
+    return void 0;
+  }
+  return `#${withoutHash}`;
+}
+function addValidatedGradientStops(gradient, stops) {
+  stops.forEach((stop) => {
+    const position = typeof stop.position === "number" && Number.isFinite(stop.position) ? Math.max(0, Math.min(1, stop.position)) : 0;
+    const validatedColor = validateHexColor(stop.color);
+    if (!validatedColor) {
+      return;
+    }
+    const alpha = typeof stop.alpha === "number" && Number.isFinite(stop.alpha) ? Math.max(0, Math.min(1, stop.alpha)) : 1;
+    const stopElement = document.createElementNS("http://www.w3.org/2000/svg", "stop");
+    stopElement.setAttribute("offset", `${position * 100}%`);
+    stopElement.setAttribute("stop-color", validatedColor);
+    if (alpha < 1) {
+      stopElement.setAttribute("stop-opacity", alpha.toString());
+    }
+    gradient.appendChild(stopElement);
+  });
+}
+function createGradient$1(gradientData, gradientId) {
+  const { gradientType, stops, angle } = gradientData;
+  if (!stops || stops.length === 0) {
+    return null;
+  }
+  let gradient;
+  if (gradientType === "linear") {
+    gradient = document.createElementNS("http://www.w3.org/2000/svg", "linearGradient");
+    gradient.setAttribute("id", gradientId);
+    const radians = angle * Math.PI / 180;
+    const x1 = 50 - 50 * Math.cos(radians);
+    const y1 = 50 + 50 * Math.sin(radians);
+    const x2 = 50 + 50 * Math.cos(radians);
+    const y2 = 50 - 50 * Math.sin(radians);
+    gradient.setAttribute("x1", `${x1}%`);
+    gradient.setAttribute("y1", `${y1}%`);
+    gradient.setAttribute("x2", `${x2}%`);
+    gradient.setAttribute("y2", `${y2}%`);
+  } else {
+    gradient = document.createElementNS("http://www.w3.org/2000/svg", "radialGradient");
+    gradient.setAttribute("id", gradientId);
+    gradient.setAttribute("cx", "50%");
+    gradient.setAttribute("cy", "50%");
+    gradient.setAttribute("r", "50%");
+  }
+  addValidatedGradientStops(gradient, stops);
+  return gradient;
+}
+function applyGradientToSVG$1(svg, gradientData) {
+  try {
+    const gradientId = generateGradientId("gradient");
+    const gradient = createGradient$1(gradientData, gradientId);
+    if (!gradient) {
+      return;
+    }
+    let defs = svg.querySelector("defs");
+    if (!defs) {
+      defs = document.createElementNS("http://www.w3.org/2000/svg", "defs");
+      svg.insertBefore(defs, svg.firstChild);
+    }
+    defs.appendChild(gradient);
+    const filledElements = svg.querySelectorAll('[fill]:not([fill="none"])');
+    filledElements.forEach((el) => {
+      el.setAttribute("fill", `url(#${gradientId})`);
+    });
+  } catch (error) {
+    console.error("Failed to apply gradient to SVG:", error);
+  }
+}
+function applyAlphaToSVG$1(svg, alphaData) {
+  try {
+    const { color, alpha } = alphaData;
+    const validatedColor = validateHexColor(color);
+    if (!validatedColor) {
+      return;
+    }
+    const clampedAlpha = typeof alpha === "number" && Number.isFinite(alpha) ? Math.max(0, Math.min(1, alpha)) : 1;
+    const filledElements = svg.querySelectorAll('[fill]:not([fill="none"])');
+    filledElements.forEach((el) => {
+      el.setAttribute("fill", validatedColor);
+      el.setAttribute("fill-opacity", clampedAlpha.toString());
+    });
+  } catch (error) {
+    console.error("Failed to apply alpha to SVG:", error);
+  }
+}
+let gradientIdCounter = 0;
+function generateGradientId(prefix = "gradient") {
+  return `${prefix}-${Date.now()}-${gradientIdCounter++}-${Math.random().toString(36).substring(2, 11)}`;
+}
 const CLASS_NAMES = {
   container: "superdoc-layout",
   page: "superdoc-page",
@@ -26555,47 +27945,20 @@ const borderValueToSpec = (value) => {
   }
   return void 0;
 };
-const resolveTableBorderValue = (explicit, fallback) => {
-  const explicitSpec = borderValueToSpec(explicit);
-  if (explicitSpec) {
-    return explicitSpec;
-  }
-  return borderValueToSpec(fallback);
-};
-const createTableBorderOverlay = (doc2, fragment, tableBorders) => {
-  const top2 = borderValueToSpec(tableBorders.top ?? null);
-  const right2 = borderValueToSpec(tableBorders.right ?? null);
-  const bottom2 = borderValueToSpec(tableBorders.bottom ?? null);
-  const left2 = borderValueToSpec(tableBorders.left ?? null);
-  if (!top2 && !right2 && !bottom2 && !left2) {
-    return null;
-  }
-  const overlay = doc2.createElement("div");
-  overlay.classList.add("superdoc-table-border");
-  overlay.style.position = "absolute";
-  overlay.style.left = "0";
-  overlay.style.top = "0";
-  overlay.style.width = `${fragment.width}px`;
-  overlay.style.height = `${fragment.height}px`;
-  overlay.style.boxSizing = "border-box";
-  overlay.style.pointerEvents = "none";
-  overlay.style.zIndex = "1";
-  applyBorder(overlay, "Top", top2);
-  applyBorder(overlay, "Right", right2);
-  applyBorder(overlay, "Bottom", bottom2);
-  applyBorder(overlay, "Left", left2);
-  return overlay;
-};
 const resolveTableCellBorders = (tableBorders, rowIndex, colIndex, totalRows, totalCols) => {
   const isFirstRow = rowIndex === 0;
   const isLastRow = rowIndex === totalRows - 1;
   const isFirstCol = colIndex === 0;
   const isLastCol = colIndex === totalCols - 1;
   return {
-    top: resolveTableBorderValue(isFirstRow ? tableBorders?.top : null, tableBorders?.insideH),
-    bottom: resolveTableBorderValue(isLastRow ? tableBorders?.bottom : null, tableBorders?.insideH),
-    left: resolveTableBorderValue(isFirstCol ? tableBorders?.left : null, tableBorders?.insideV),
-    right: resolveTableBorderValue(isLastCol ? tableBorders?.right : null, tableBorders?.insideV)
+    // Top: first row gets table.top, interior rows get insideH
+    top: borderValueToSpec(isFirstRow ? tableBorders?.top : tableBorders?.insideH),
+    // Bottom: ONLY last row gets table.bottom (interior cells don't render bottom - it comes from cell below's top)
+    bottom: borderValueToSpec(isLastRow ? tableBorders?.bottom : null),
+    // Left: first col gets table.left, interior cols get insideV
+    left: borderValueToSpec(isFirstCol ? tableBorders?.left : tableBorders?.insideV),
+    // Right: ONLY last col gets table.right (interior cells don't render right - it comes from cell to right's left)
+    right: borderValueToSpec(isLastCol ? tableBorders?.right : null)
   };
 };
 const renderTableCell = (deps) => {
@@ -26621,21 +27984,37 @@ const renderTableCell = (deps) => {
   let contentElement;
   const attrs = cell?.attrs;
   const padding = attrs?.padding || { top: 2, left: 4, right: 4 };
-  if (cell && cellMeasure.paragraph.lines.length > 0) {
-    const lines = cellMeasure.paragraph.lines;
+  const paddingLeft = padding.left ?? 4;
+  const paddingTop = padding.top ?? 2;
+  const paddingRight = padding.right ?? 4;
+  const cellBlocks = cell?.blocks ?? (cell?.paragraph ? [cell.paragraph] : []);
+  const blockMeasures = cellMeasure.blocks ?? (cellMeasure.paragraph ? [cellMeasure.paragraph] : []);
+  if (cellBlocks.length > 0 && blockMeasures.length > 0) {
     const content = doc2.createElement("div");
     content.style.position = "absolute";
-    applySdtDataset(content, cell.paragraph.attrs?.sdt);
-    const paddingLeft = padding.left ?? 4;
-    const paddingTop = padding.top ?? 2;
-    const paddingRight = padding.right ?? 4;
     content.style.left = `${x + paddingLeft}px`;
     content.style.top = `${y + paddingTop}px`;
     content.style.width = `${Math.max(0, cellMeasure.width - paddingLeft - paddingRight)}px`;
-    lines.forEach((line) => {
-      const lineEl = renderLine(cell.paragraph, line, { ...context, section: "body" });
-      content.appendChild(lineEl);
-    });
+    let blockY = 0;
+    for (let i = 0; i < Math.min(blockMeasures.length, cellBlocks.length); i++) {
+      const blockMeasure = blockMeasures[i];
+      const block = cellBlocks[i];
+      if (blockMeasure.kind === "paragraph" && block?.kind === "paragraph") {
+        const paraWrapper = doc2.createElement("div");
+        paraWrapper.style.position = "absolute";
+        paraWrapper.style.top = `${blockY}px`;
+        paraWrapper.style.left = "0";
+        paraWrapper.style.width = "100%";
+        applySdtDataset(paraWrapper, block.attrs?.sdt);
+        const lines = blockMeasure.lines;
+        lines.forEach((line) => {
+          const lineEl = renderLine(block, line, { ...context, section: "body" });
+          paraWrapper.appendChild(lineEl);
+        });
+        content.appendChild(paraWrapper);
+        blockY += blockMeasure.totalHeight;
+      }
+    }
     contentElement = content;
   }
   return { cellElement: cellEl, contentElement };
@@ -26680,10 +28059,25 @@ const renderTableRow = (deps) => {
     const gridColIndex = cellMeasure.gridColumnStart ?? cellIndex;
     const totalCols = columnWidths.length;
     let resolvedBorders;
-    if (hasExplicitBorders) {
-      resolvedBorders = cellBordersAttr;
-    } else if (hasBordersAttribute) {
+    if (hasBordersAttribute && !hasExplicitBorders) {
       resolvedBorders = void 0;
+    } else if (hasExplicitBorders && tableBorders) {
+      const isFirstRow = rowIndex === 0;
+      const isLastRow = rowIndex === totalRows - 1;
+      const isFirstCol = gridColIndex === 0;
+      const isLastCol = gridColIndex === totalCols - 1;
+      resolvedBorders = {
+        // For top: use cell's if defined, otherwise use table's top for first row
+        top: cellBordersAttr.top ?? borderValueToSpec(isFirstRow ? tableBorders.top : tableBorders.insideH),
+        // For bottom: use cell's if defined, otherwise use table's bottom for last row only
+        bottom: cellBordersAttr.bottom ?? borderValueToSpec(isLastRow ? tableBorders.bottom : void 0),
+        // For left: use cell's if defined, otherwise use table's left for first col
+        left: cellBordersAttr.left ?? borderValueToSpec(isFirstCol ? tableBorders.left : tableBorders.insideV),
+        // For right: use cell's if defined, otherwise use table's right for last col only
+        right: cellBordersAttr.right ?? borderValueToSpec(isLastCol ? tableBorders.right : void 0)
+      };
+    } else if (hasExplicitBorders) {
+      resolvedBorders = cellBordersAttr;
     } else if (tableBorders) {
       resolvedBorders = resolveTableCellBorders(tableBorders, rowIndex, gridColIndex, totalRows, totalCols);
     } else {
@@ -26739,7 +28133,6 @@ const renderTableFragment = (deps) => {
   const block = lookup.block;
   const measure = lookup.measure;
   const tableBorders = block.attrs?.borders;
-  const borderOverlay = tableBorders ? createTableBorderOverlay(doc2, fragment, tableBorders) : null;
   const container = doc2.createElement("div");
   container.classList.add(CLASS_NAMES.fragment);
   applyStyles2(container, fragmentStyles);
@@ -26838,9 +28231,6 @@ const renderTableFragment = (deps) => {
     });
     y += rowMeasure.height;
   }
-  if (borderOverlay) {
-    container.appendChild(borderOverlay);
-  }
   return container;
 };
 const LIST_MARKER_GAP$1 = 8;
@@ -26853,6 +28243,8 @@ const LINK_DATASET_KEYS = {
 };
 const MAX_HREF_LENGTH = 2048;
 const SAFE_ANCHOR_PATTERN = /^[A-Za-z0-9._-]+$/;
+const MAX_DATA_URL_LENGTH = 10 * 1024 * 1024;
+const VALID_IMAGE_DATA_URL = /^data:image\/(png|jpeg|jpg|gif|svg\+xml|webp|bmp|ico|tiff?);base64,/i;
 const AMBIGUOUS_LINK_PATTERNS = /^(click here|read more|more|link|here|this|download|view)$/i;
 const TRACK_CHANGE_BASE_CLASS = {
   insert: "track-insert-dec",
@@ -26879,6 +28271,11 @@ const TRACK_CHANGE_MODIFIER_CLASS = {
     off: void 0
   }
 };
+function sanitizeUrl(href) {
+  if (typeof href !== "string") return null;
+  const sanitized = sanitizeHref(href);
+  return sanitized?.href ?? null;
+}
 const LINK_TARGET_SET = /* @__PURE__ */ new Set(["_blank", "_self", "_parent", "_top"]);
 const normalizeAnchor = (value) => {
   if (typeof value !== "string") return null;
@@ -27773,7 +29170,7 @@ const _DomPainter = class _DomPainter {
       }
       const block = lookup.block;
       const fragmentEl = this.doc.createElement("div");
-      fragmentEl.classList.add(CLASS_NAMES.fragment);
+      fragmentEl.classList.add(CLASS_NAMES.fragment, "superdoc-image-fragment");
       applyStyles$2(fragmentEl, fragmentStyles);
       this.applyFragmentFrame(fragmentEl, fragment);
       fragmentEl.style.height = `${fragment.height}px`;
@@ -27782,6 +29179,18 @@ const _DomPainter = class _DomPainter {
       if (fragment.isAnchored && fragment.zIndex != null) {
         fragmentEl.style.zIndex = String(fragment.zIndex);
       }
+      if (block.id) {
+        fragmentEl.setAttribute("data-sd-block-id", block.id);
+      }
+      if (fragment.pmStart != null) {
+        fragmentEl.dataset.pmStart = String(fragment.pmStart);
+      }
+      if (fragment.pmEnd != null) {
+        fragmentEl.dataset.pmEnd = String(fragment.pmEnd);
+      }
+      if (fragment.metadata) {
+        fragmentEl.setAttribute("data-image-metadata", JSON.stringify(fragment.metadata));
+      }
       const img = this.doc.createElement("img");
       if (block.src) {
         img.src = block.src;
@@ -27815,6 +29224,7 @@ const _DomPainter = class _DomPainter {
       this.applyFragmentFrame(fragmentEl, fragment);
       fragmentEl.style.height = `${fragment.height}px`;
       fragmentEl.style.position = "absolute";
+      fragmentEl.style.overflow = "hidden";
       if (fragment.isAnchored && fragment.zIndex != null) {
         fragmentEl.style.zIndex = String(fragment.zIndex);
       }
@@ -27872,12 +29282,13 @@ const _DomPainter = class _DomPainter {
     img.style.display = "block";
     return img;
   }
-  createVectorShapeElement(block, geometry, applyTransforms = false) {
+  createVectorShapeElement(block, geometry, applyTransforms = false, groupScaleX = 1, groupScaleY = 1) {
     const container = this.doc.createElement("div");
     container.classList.add("superdoc-vector-shape");
     container.style.width = "100%";
     container.style.height = "100%";
     container.style.position = "relative";
+    container.style.overflow = "hidden";
     const svgMarkup = block.shapeKind ? this.tryCreatePresetSvg(block) : null;
     if (svgMarkup) {
       const svgElement = this.parseSafeSvg(svgMarkup);
@@ -27885,27 +29296,193 @@ const _DomPainter = class _DomPainter {
         svgElement.setAttribute("width", "100%");
         svgElement.setAttribute("height", "100%");
         svgElement.style.display = "block";
+        if (block.fillColor && typeof block.fillColor === "object") {
+          if ("type" in block.fillColor && block.fillColor.type === "gradient") {
+            applyGradientToSVG$1(svgElement, block.fillColor);
+          } else if ("type" in block.fillColor && block.fillColor.type === "solidWithAlpha") {
+            applyAlphaToSVG$1(svgElement, block.fillColor);
+          }
+        }
         if (applyTransforms && geometry) {
           this.applyVectorShapeTransforms(svgElement, geometry);
         }
         container.appendChild(svgElement);
+        if (block.textContent && block.textContent.parts.length > 0) {
+          const textDiv = this.createFallbackTextElement(
+            block.textContent,
+            block.textAlign ?? "center",
+            block.textVerticalAlign,
+            block.textInsets,
+            groupScaleX,
+            groupScaleY
+          );
+          container.appendChild(textDiv);
+        }
         return container;
       }
     }
-    container.style.background = block.fillColor ?? "rgba(15, 23, 42, 0.1)";
-    container.style.border = `1px solid ${block.strokeColor ?? "rgba(15, 23, 42, 0.3)"}`;
+    this.applyFallbackShapeStyle(container, block);
+    if (block.textContent && block.textContent.parts.length > 0) {
+      const textDiv = this.createFallbackTextElement(
+        block.textContent,
+        block.textAlign ?? "center",
+        block.textVerticalAlign,
+        block.textInsets,
+        groupScaleX,
+        groupScaleY
+      );
+      container.appendChild(textDiv);
+    }
     if (applyTransforms && geometry) {
       this.applyVectorShapeTransforms(container, geometry);
     }
     return container;
   }
+  /**
+   * Apply fill and stroke styles to a fallback shape container
+   */
+  applyFallbackShapeStyle(container, block) {
+    if (block.fillColor === null) {
+      container.style.background = "none";
+    } else if (typeof block.fillColor === "string") {
+      container.style.background = block.fillColor;
+    } else if (typeof block.fillColor === "object" && "type" in block.fillColor) {
+      if (block.fillColor.type === "solidWithAlpha") {
+        const alpha = block.fillColor.alpha;
+        const color = block.fillColor.color;
+        container.style.background = color;
+        container.style.opacity = alpha.toString();
+      } else if (block.fillColor.type === "gradient") {
+        container.style.background = "rgba(15, 23, 42, 0.1)";
+      }
+    } else {
+      container.style.background = "rgba(15, 23, 42, 0.1)";
+    }
+    if (block.strokeColor === null) {
+      container.style.border = "none";
+    } else if (typeof block.strokeColor === "string") {
+      const strokeWidth = block.strokeWidth ?? 1;
+      container.style.border = `${strokeWidth}px solid ${block.strokeColor}`;
+    } else {
+      container.style.border = "1px solid rgba(15, 23, 42, 0.3)";
+    }
+  }
+  /**
+   * Create a fallback text element for shapes without SVG
+   * @param textContent - Text content with formatting
+   * @param textAlign - Horizontal text alignment
+   * @param textVerticalAlign - Vertical text alignment (top, center, bottom)
+   * @param textInsets - Text insets in pixels (top, right, bottom, left)
+   * @param groupScaleX - Scale factor applied by parent group (for counter-scaling)
+   * @param groupScaleY - Scale factor applied by parent group (for counter-scaling)
+   */
+  createFallbackTextElement(textContent2, textAlign, textVerticalAlign, textInsets, groupScaleX = 1, groupScaleY = 1) {
+    const textDiv = this.doc.createElement("div");
+    textDiv.style.position = "absolute";
+    textDiv.style.top = "0";
+    textDiv.style.left = "0";
+    textDiv.style.width = "100%";
+    textDiv.style.height = "100%";
+    textDiv.style.display = "flex";
+    textDiv.style.flexDirection = "column";
+    const verticalAlign = textVerticalAlign ?? "center";
+    if (verticalAlign === "top") {
+      textDiv.style.justifyContent = "flex-start";
+    } else if (verticalAlign === "bottom") {
+      textDiv.style.justifyContent = "flex-end";
+    } else {
+      textDiv.style.justifyContent = "center";
+    }
+    if (textInsets) {
+      textDiv.style.padding = `${textInsets.top}px ${textInsets.right}px ${textInsets.bottom}px ${textInsets.left}px`;
+    } else {
+      textDiv.style.padding = "10px";
+    }
+    textDiv.style.boxSizing = "border-box";
+    textDiv.style.wordWrap = "break-word";
+    textDiv.style.overflowWrap = "break-word";
+    textDiv.style.overflow = "hidden";
+    textDiv.style.minWidth = "0";
+    textDiv.style.fontSize = "12px";
+    textDiv.style.lineHeight = "1.2";
+    if (groupScaleX !== 1 || groupScaleY !== 1) {
+      const counterScaleX = 1 / groupScaleX;
+      const counterScaleY = 1 / groupScaleY;
+      textDiv.style.transform = `scale(${counterScaleX}, ${counterScaleY})`;
+      textDiv.style.transformOrigin = "top left";
+      textDiv.style.width = `${100 * groupScaleX}%`;
+      textDiv.style.height = `${100 * groupScaleY}%`;
+    }
+    if (textAlign === "center") {
+      textDiv.style.textAlign = "center";
+    } else if (textAlign === "right" || textAlign === "r") {
+      textDiv.style.textAlign = "right";
+    } else {
+      textDiv.style.textAlign = "left";
+    }
+    let currentParagraph = this.doc.createElement("div");
+    currentParagraph.style.width = "100%";
+    currentParagraph.style.minWidth = "0";
+    currentParagraph.style.whiteSpace = "normal";
+    textContent2.parts.forEach((part) => {
+      if (part.isLineBreak) {
+        textDiv.appendChild(currentParagraph);
+        currentParagraph = this.doc.createElement("div");
+        currentParagraph.style.width = "100%";
+        currentParagraph.style.minWidth = "0";
+        currentParagraph.style.whiteSpace = "normal";
+        if (part.isEmptyParagraph) {
+          currentParagraph.style.minHeight = "1em";
+        }
+      } else {
+        const span = this.doc.createElement("span");
+        span.textContent = part.text;
+        if (part.formatting) {
+          if (part.formatting.bold) {
+            span.style.fontWeight = "bold";
+          }
+          if (part.formatting.italic) {
+            span.style.fontStyle = "italic";
+          }
+          if (part.formatting.color) {
+            const validatedColor = validateHexColor(part.formatting.color);
+            if (validatedColor) {
+              span.style.color = validatedColor;
+            }
+          }
+          if (part.formatting.fontSize) {
+            span.style.fontSize = `${part.formatting.fontSize}px`;
+          }
+        }
+        currentParagraph.appendChild(span);
+      }
+    });
+    textDiv.appendChild(currentParagraph);
+    return textDiv;
+  }
   tryCreatePresetSvg(block) {
     try {
+      let fillColor;
+      if (block.fillColor === null) {
+        fillColor = "none";
+      } else if (typeof block.fillColor === "string") {
+        fillColor = block.fillColor;
+      }
+      const strokeColor = block.strokeColor === null ? "none" : typeof block.strokeColor === "string" ? block.strokeColor : void 0;
+      if (block.shapeKind === "line") {
+        const width = block.geometry.width;
+        const height = block.geometry.height;
+        const stroke = strokeColor ?? "#000000";
+        const strokeWidth = block.strokeWidth ?? 1;
+        return `<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}" viewBox="0 0 ${width} ${height}">
+  <line x1="0" y1="0" x2="${width}" y2="${height}" stroke="${stroke}" stroke-width="${strokeWidth}" />
+</svg>`;
+      }
       return k({
         preset: block.shapeKind ?? "",
         styleOverrides: () => ({
-          fill: block.fillColor ?? void 0,
-          stroke: block.strokeColor ?? void 0,
+          fill: fillColor,
+          stroke: strokeColor,
           strokeWidth: block.strokeWidth ?? void 0
         })
       });
@@ -27971,6 +29548,8 @@ const _DomPainter = class _DomPainter {
     groupEl.style.height = "100%";
     const groupTransform = block.groupTransform;
     let contentContainer = groupEl;
+    let groupScaleX = 1;
+    let groupScaleY = 1;
     if (groupTransform) {
       const inner = this.doc.createElement("div");
       inner.style.position = "absolute";
@@ -27988,10 +29567,10 @@ const _DomPainter = class _DomPainter {
       }
       const targetWidth = groupTransform.width ?? block.geometry.width ?? childWidth;
       const targetHeight = groupTransform.height ?? block.geometry.height ?? childHeight;
-      const scaleX = childWidth ? targetWidth / childWidth : 1;
-      const scaleY = childHeight ? targetHeight / childHeight : 1;
-      if (scaleX !== 1 || scaleY !== 1) {
-        transforms.push(`scale(${scaleX}, ${scaleY})`);
+      groupScaleX = childWidth ? targetWidth / childWidth : 1;
+      groupScaleY = childHeight ? targetHeight / childHeight : 1;
+      if (groupScaleX !== 1 || groupScaleY !== 1) {
+        transforms.push(`scale(${groupScaleX}, ${groupScaleY})`);
       }
       if (transforms.length > 0) {
         inner.style.transformOrigin = "top left";
@@ -28001,7 +29580,7 @@ const _DomPainter = class _DomPainter {
       contentContainer = inner;
     }
     block.shapes.forEach((child) => {
-      const childContent = this.createGroupChildContent(child);
+      const childContent = this.createGroupChildContent(child, groupScaleX, groupScaleY);
       if (!childContent) return;
       const attrs = child.attrs ?? {};
       const wrapper = this.doc.createElement("div");
@@ -28034,20 +29613,21 @@ const _DomPainter = class _DomPainter {
     });
     return groupEl;
   }
-  createGroupChildContent(child) {
+  createGroupChildContent(child, groupScaleX = 1, groupScaleY = 1) {
     if (child.shapeType === "vectorShape" && "fillColor" in child.attrs) {
       const attrs = child.attrs;
+      const childGeometry = {
+        width: attrs.width ?? 0,
+        height: attrs.height ?? 0,
+        rotation: attrs.rotation ?? 0,
+        flipH: attrs.flipH ?? false,
+        flipV: attrs.flipV ?? false
+      };
       const vectorChild = {
         drawingKind: "vectorShape",
         kind: "drawing",
         id: `${attrs.shapeId ?? child.shapeType}`,
-        geometry: {
-          width: attrs.width ?? 0,
-          height: attrs.height ?? 0,
-          rotation: attrs.rotation ?? 0,
-          flipH: attrs.flipH ?? false,
-          flipV: attrs.flipV ?? false
-        },
+        geometry: childGeometry,
         padding: void 0,
         margin: void 0,
         anchor: void 0,
@@ -28058,9 +29638,11 @@ const _DomPainter = class _DomPainter {
         shapeKind: attrs.kind,
         fillColor: attrs.fillColor,
         strokeColor: attrs.strokeColor,
-        strokeWidth: attrs.strokeWidth
+        strokeWidth: attrs.strokeWidth,
+        textContent: attrs.textContent,
+        textAlign: attrs.textAlign
       };
-      return this.createVectorShapeElement(vectorChild);
+      return this.createVectorShapeElement(vectorChild, childGeometry, false, groupScaleX, groupScaleY);
     }
     if (child.shapeType === "image" && "src" in child.attrs) {
       const attrs = child.attrs;
@@ -28250,7 +29832,16 @@ const _DomPainter = class _DomPainter {
   /**
    * Render a single run as an HTML element (span or anchor).
    */
+  /**
+   * Type guard to check if a run is an image run.
+   */
+  isImageRun(run) {
+    return run.kind === "image";
+  }
   renderRun(run, context, trackedConfig) {
+    if (this.isImageRun(run)) {
+      return this.renderImageRun(run);
+    }
     if (!run.text || !this.doc) {
       return null;
     }
@@ -28285,6 +29876,88 @@ const _DomPainter = class _DomPainter {
     this.applySdtDataset(elem, run.sdt);
     return elem;
   }
+  /**
+   * Renders an ImageRun as an inline <img> element.
+   *
+   * SECURITY NOTES:
+   * - Data URLs are validated against VALID_IMAGE_DATA_URL regex to ensure proper format
+   * - Size limit (MAX_DATA_URL_LENGTH) prevents DoS attacks from extremely large images
+   * - Only allows safe image MIME types (png, jpeg, gif, etc.) with base64 encoding
+   * - Non-data URLs are sanitized through sanitizeUrl to prevent XSS
+   *
+   * @param run - The ImageRun to render containing image source, dimensions, and spacing
+   * @returns HTMLElement (img) or null if src is missing or invalid
+   *
+   * @example
+   * ```typescript
+   * // Valid data URL
+   * renderImageRun({ kind: 'image', src: 'data:image/png;base64,iVBORw...', width: 100, height: 100 })
+   * // Returns: <img> element
+   *
+   * // Invalid MIME type
+   * renderImageRun({ kind: 'image', src: 'data:text/html;base64,PHNjcmlwdD4...', width: 100, height: 100 })
+   * // Returns: null (blocked)
+   *
+   * // HTTP URL
+   * renderImageRun({ kind: 'image', src: 'https://example.com/image.png', width: 100, height: 100 })
+   * // Returns: <img> element (after sanitization)
+   * ```
+   */
+  renderImageRun(run) {
+    if (!this.doc || !run.src) {
+      return null;
+    }
+    const img = this.doc.createElement("img");
+    const isDataUrl = typeof run.src === "string" && run.src.startsWith("data:");
+    if (isDataUrl) {
+      if (run.src.length > MAX_DATA_URL_LENGTH) {
+        return null;
+      }
+      if (!VALID_IMAGE_DATA_URL.test(run.src)) {
+        return null;
+      }
+      img.src = run.src;
+    } else {
+      const sanitized = sanitizeUrl(run.src);
+      if (sanitized) {
+        img.src = sanitized;
+      } else {
+        return null;
+      }
+    }
+    img.width = run.width;
+    img.height = run.height;
+    img.alt = run.alt ?? "";
+    if (run.title) {
+      img.title = run.title;
+    }
+    img.style.display = "inline-block";
+    img.style.verticalAlign = run.verticalAlign ?? "bottom";
+    if (run.distTop) {
+      img.style.marginTop = `${run.distTop}px`;
+    }
+    if (run.distBottom) {
+      img.style.marginBottom = `${run.distBottom}px`;
+    }
+    if (run.distLeft) {
+      img.style.marginLeft = `${run.distLeft}px`;
+    }
+    if (run.distRight) {
+      img.style.marginRight = `${run.distRight}px`;
+    }
+    img.style.zIndex = "1";
+    if (run.pmStart != null) {
+      img.dataset.pmStart = String(run.pmStart);
+    }
+    if (run.pmEnd != null) {
+      img.dataset.pmEnd = String(run.pmEnd);
+    }
+    this.applySdtDataset(img, run.sdt);
+    if (run.dataAttrs) {
+      applyRunDataAttributes(img, run.dataAttrs);
+    }
+    return img;
+  }
   renderLine(block, line, context) {
     if (!this.doc) {
       throw new Error("DomPainter: document is not available");
@@ -28356,6 +30029,16 @@ const _DomPainter = class _DomPainter {
       line.segments.forEach((segment, _segIdx) => {
         const baseRun = runs[segment.runIndex];
         if (!baseRun || baseRun.kind === "tab") return;
+        if (this.isImageRun(baseRun)) {
+          const elem2 = this.renderRun(baseRun, context, trackedConfig);
+          if (elem2) {
+            if (styleId) {
+              elem2.setAttribute("styleid", styleId);
+            }
+            el.appendChild(elem2);
+          }
+          return;
+        }
         const segmentText = baseRun.text.slice(segment.fromChar, segment.toChar);
         const segmentRun = { ...baseRun, text: segmentText };
         const elem = this.renderRun(segmentRun, context, trackedConfig);
@@ -28686,8 +30369,25 @@ const fragmentSignature = (fragment, lookup) => {
 };
 const deriveBlockVersion = (block) => {
   if (block.kind === "paragraph") {
-    return block.runs.map(
-      (run) => [
+    return block.runs.map((run) => {
+      if (run.kind === "image") {
+        const imgRun = run;
+        return [
+          "img",
+          imgRun.src,
+          imgRun.width,
+          imgRun.height,
+          imgRun.alt ?? "",
+          imgRun.title ?? "",
+          imgRun.distTop ?? "",
+          imgRun.distBottom ?? "",
+          imgRun.distLeft ?? "",
+          imgRun.distRight ?? "",
+          imgRun.pmStart ?? "",
+          imgRun.pmEnd ?? ""
+        ].join(",");
+      }
+      return [
         run.text ?? "",
         run.kind !== "tab" ? run.fontFamily : "",
         run.kind !== "tab" ? run.fontSize : "",
@@ -28703,8 +30403,8 @@ const deriveBlockVersion = (block) => {
         run.pmStart ?? "",
         run.pmEnd ?? "",
         run.kind !== "tab" ? run.token ?? "" : ""
-      ].join(",")
-    ).join("|");
+      ].join(",");
+    }).join("|");
   }
   if (block.kind === "list") {
     return block.items.map((item) => `${item.id}:${item.marker.text}:${deriveBlockVersion(item.paragraph)}`).join("|");
@@ -28762,7 +30462,7 @@ const deriveBlockVersion = (block) => {
   return block.id;
 };
 const applyRunStyles = (element, run, isLink = false) => {
-  if (run.kind === "tab") {
+  if (run.kind === "tab" || run.kind === "image") {
     return;
   }
   element.style.fontFamily = run.fontFamily;
@@ -28881,6 +30581,10 @@ const sliceRunsForLine = (block, line) => {
   for (let runIndex = line.fromRun; runIndex <= line.toRun; runIndex += 1) {
     const run = block.runs[runIndex];
     if (!run) continue;
+    if (run.kind === "image") {
+      result.push(run);
+      continue;
+    }
     const text = run.text ?? "";
     const isFirstRun = runIndex === line.fromRun;
     const isLastRun = runIndex === line.toRun;
@@ -28919,6 +30623,21 @@ const computeLinePmRange = (block, line) => {
   for (let runIndex = line.fromRun; runIndex <= line.toRun; runIndex += 1) {
     const run = block.runs[runIndex];
     if (!run) continue;
+    if (run.kind === "image") {
+      const runPmStart2 = run.pmStart ?? null;
+      const runPmEnd = run.pmEnd ?? null;
+      if (runPmStart2 == null || runPmEnd == null) {
+        continue;
+      }
+      if (pmStart == null) {
+        pmStart = runPmStart2;
+      }
+      pmEnd = runPmEnd;
+      if (runIndex === line.toRun) {
+        break;
+      }
+      continue;
+    }
     const text = run.text ?? "";
     const runLength = text.length;
     const runPmStart = run.pmStart ?? null;
@@ -28950,27 +30669,21 @@ const applyStyles$2 = (el, styles) => {
   });
 };
 const resolveRunText = (run, context) => {
+  const runToken = "token" in run ? run.token : void 0;
   if (run.kind === "tab") {
     return run.text;
   }
-  if (!run.token) {
+  if (run.kind === "image") {
+    return "";
+  }
+  if (!runToken) {
     return run.text ?? "";
   }
-  if (run.token === "pageNumber") {
-    const resolved = context.pageNumberText ?? String(context.pageNumber);
-    if (typeof process$1 !== "undefined" && process$1.env?.NODE_ENV === "development" && context.section) {
-      console.debug(
-        `[Page Number] ${context.section}: page ${context.pageNumber} of ${context.totalPages} → "${resolved}"`
-      );
-    }
-    return resolved;
+  if (runToken === "pageNumber") {
+    return context.pageNumberText ?? String(context.pageNumber);
   }
-  if (run.token === "totalPageCount") {
-    const resolved = context.totalPages ? String(context.totalPages) : run.text ?? "";
-    if (typeof process$1 !== "undefined" && process$1.env?.NODE_ENV === "development" && context.section) {
-      console.debug(`[Total Pages] ${context.section}: ${resolved}`);
-    }
-    return resolved;
+  if (runToken === "totalPageCount") {
+    return context.totalPages ? String(context.totalPages) : run.text ?? "";
   }
   return run.text ?? "";
 };
@@ -29126,6 +30839,9 @@ function calculateTypographyMetrics(fontSize, spacing) {
 function isTabRun(run) {
   return run.kind === "tab";
 }
+function isImageRun(run) {
+  return run.kind === "image";
+}
 async function measureBlock(block, constraints) {
   const normalized = normalizeConstraints(constraints);
   if (block.kind === "drawing") {
@@ -29269,6 +30985,79 @@ async function measureParagraphBlock(block, maxWidth) {
       }
       continue;
     }
+    if (isImageRun(run)) {
+      const leftSpace = run.distLeft ?? 0;
+      const rightSpace = run.distRight ?? 0;
+      const imageWidth = run.width + leftSpace + rightSpace;
+      const topSpace = run.distTop ?? 0;
+      const bottomSpace = run.distBottom ?? 0;
+      const imageHeight = run.height + topSpace + bottomSpace;
+      if (!currentLine) {
+        currentLine = {
+          fromRun: runIndex,
+          fromChar: 0,
+          toRun: runIndex,
+          toChar: 1,
+          // Images are treated as single atomic units
+          width: imageWidth,
+          maxFontSize: imageHeight,
+          // Use image height for line height calculation
+          maxWidth: availableWidth,
+          segments: [
+            {
+              runIndex,
+              fromChar: 0,
+              toChar: 1,
+              width: imageWidth
+            }
+          ]
+        };
+        availableWidth = contentWidth;
+        continue;
+      }
+      if (currentLine.width + imageWidth > currentLine.maxWidth && currentLine.width > 0) {
+        const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing);
+        const completedLine = {
+          ...currentLine,
+          ...metrics
+        };
+        addBarTabsToLine(completedLine);
+        lines.push(completedLine);
+        tabStopCursor = 0;
+        pendingTabAlignment = null;
+        currentLine = {
+          fromRun: runIndex,
+          fromChar: 0,
+          toRun: runIndex,
+          toChar: 1,
+          width: imageWidth,
+          maxFontSize: imageHeight,
+          maxWidth: contentWidth,
+          segments: [
+            {
+              runIndex,
+              fromChar: 0,
+              toChar: 1,
+              width: imageWidth
+            }
+          ]
+        };
+        availableWidth = contentWidth;
+      } else {
+        currentLine.toRun = runIndex;
+        currentLine.toChar = 1;
+        currentLine.width = roundValue(currentLine.width + imageWidth);
+        currentLine.maxFontSize = Math.max(currentLine.maxFontSize, imageHeight);
+        if (!currentLine.segments) currentLine.segments = [];
+        currentLine.segments.push({
+          runIndex,
+          fromChar: 0,
+          toChar: 1,
+          width: imageWidth
+        });
+      }
+      continue;
+    }
     const { font } = buildFontString(run);
     const tabSegments = run.text.split("	");
     let charPosInRun = 0;
@@ -29423,7 +31212,7 @@ async function measureParagraphBlock(block, maxWidth) {
     }
   }
   if (!currentLine && lines.length === 0) {
-    const fallbackFontSize = (block.runs[0]?.kind !== "tab" ? block.runs[0]?.fontSize : void 0) ?? 12;
+    const fallbackFontSize = (block.runs[0]?.kind === "text" ? block.runs[0].fontSize : void 0) ?? 12;
     const metrics = calculateTypographyMetrics(fallbackFontSize, spacing);
     const fallbackLine = {
       fromRun: 0,
@@ -29474,16 +31263,34 @@ async function measureParagraphBlock(block, maxWidth) {
 async function measureTableBlock(block, constraints) {
   const maxWidth = typeof constraints === "number" ? constraints : constraints.maxWidth;
   let columnWidths;
+  const maxCellCount = Math.max(1, Math.max(...block.rows.map((r2) => r2.cells.length)));
   if (block.columnWidths && block.columnWidths.length > 0) {
     columnWidths = [...block.columnWidths];
-    const totalWidth2 = columnWidths.reduce((a, b) => a + b, 0);
     const hasExplicitWidth = block.attrs?.tableWidth != null;
-    if (!hasExplicitWidth && totalWidth2 > maxWidth) {
-      const scale = maxWidth / totalWidth2;
-      columnWidths = columnWidths.map((w) => Math.max(1, Math.floor(w * scale)));
+    const hasFixedLayout = block.attrs?.tableLayout === "fixed";
+    if (hasExplicitWidth || hasFixedLayout) {
+      const totalWidth2 = columnWidths.reduce((a, b) => a + b, 0);
+      if (totalWidth2 > maxWidth) {
+        const scale = maxWidth / totalWidth2;
+        columnWidths = columnWidths.map((w) => Math.max(1, Math.floor(w * scale)));
+      }
+    } else {
+      if (columnWidths.length < maxCellCount) {
+        const usedWidth = columnWidths.reduce((a, b) => a + b, 0);
+        const remainingWidth = Math.max(0, maxWidth - usedWidth);
+        const missingColumns = maxCellCount - columnWidths.length;
+        const paddingWidth = Math.max(1, Math.floor(remainingWidth / missingColumns));
+        columnWidths.push(...Array.from({ length: missingColumns }, () => paddingWidth));
+      } else if (columnWidths.length > maxCellCount) {
+        columnWidths = columnWidths.slice(0, maxCellCount);
+      }
+      const totalWidth2 = columnWidths.reduce((a, b) => a + b, 0);
+      if (totalWidth2 > maxWidth) {
+        const scale = maxWidth / totalWidth2;
+        columnWidths = columnWidths.map((w) => Math.max(1, Math.floor(w * scale)));
+      }
     }
   } else {
-    const maxCellCount = Math.max(1, Math.max(...block.rows.map((r2) => r2.cells.length)));
     const columnWidth = Math.max(1, Math.floor(maxWidth / maxCellCount));
     columnWidths = Array.from({ length: maxCellCount }, () => columnWidth);
   }
@@ -29517,12 +31324,28 @@ async function measureTableBlock(block, constraints) {
           rowspanTracker[gridColIndex + c] = rowspan - 1;
         }
       }
-      const paraMeasure = await measureParagraphBlock(cell.paragraph, cellWidth);
-      const height = paraMeasure.totalHeight;
+      const cellPadding = cell.attrs?.padding ?? { top: 2, left: 4, right: 4, bottom: 2 };
+      const paddingTop = cellPadding.top ?? 2;
+      const paddingBottom = cellPadding.bottom ?? 2;
+      const paddingLeft = cellPadding.left ?? 4;
+      const paddingRight = cellPadding.right ?? 4;
+      const contentWidth = Math.max(1, cellWidth - paddingLeft - paddingRight);
+      const blockMeasures = [];
+      let contentHeight = 0;
+      const cellBlocks = cell.blocks ?? (cell.paragraph ? [cell.paragraph] : []);
+      for (const block2 of cellBlocks) {
+        const measure = await measureBlock(block2, { maxWidth: contentWidth, maxHeight: Infinity });
+        blockMeasures.push(measure);
+        const blockHeight = "totalHeight" in measure ? measure.totalHeight : "height" in measure ? measure.height : 0;
+        contentHeight += blockHeight;
+      }
+      const totalCellHeight = contentHeight + paddingTop + paddingBottom;
       cellMeasures.push({
-        paragraph: paraMeasure,
+        blocks: blockMeasures,
+        // Backward compatibility
+        paragraph: blockMeasures[0]?.kind === "paragraph" ? blockMeasures[0] : void 0,
         width: cellWidth,
-        height,
+        height: totalCellHeight,
         gridColumnStart: gridColIndex,
         colSpan: colspan,
         rowSpan: rowspan
@@ -29550,7 +31373,8 @@ async function measureTableBlock(block, constraints) {
 async function measureImageBlock(block, constraints) {
   const intrinsic = getIntrinsicImageSize(block, constraints.maxWidth);
   const maxWidth = constraints.maxWidth > 0 ? constraints.maxWidth : intrinsic.width;
-  const maxHeight = constraints.maxHeight && constraints.maxHeight > 0 ? constraints.maxHeight : Infinity;
+  const hasNegativeVerticalPosition = block.anchor?.isAnchored && (typeof block.anchor?.offsetV === "number" && block.anchor.offsetV < 0 || typeof block.margin?.top === "number" && block.margin.top < 0);
+  const maxHeight = hasNegativeVerticalPosition || !constraints.maxHeight || constraints.maxHeight <= 0 ? Infinity : constraints.maxHeight;
   const widthScale = maxWidth / intrinsic.width;
   const heightScale = maxHeight / intrinsic.height;
   const scale = Math.min(1, widthScale, heightScale);
@@ -29594,7 +31418,8 @@ async function measureDrawingBlock(block, constraints) {
   const naturalWidth = Math.max(1, rotatedBounds.width);
   const naturalHeight = Math.max(1, rotatedBounds.height);
   const maxWidth = constraints.maxWidth > 0 ? constraints.maxWidth : naturalWidth;
-  const maxHeight = constraints.maxHeight && constraints.maxHeight > 0 ? constraints.maxHeight : Infinity;
+  const hasNegativeVerticalPosition = block.anchor?.isAnchored && (typeof block.anchor?.offsetV === "number" && block.anchor.offsetV < 0 || typeof block.margin?.top === "number" && block.margin.top < 0);
+  const maxHeight = hasNegativeVerticalPosition || !constraints.maxHeight || constraints.maxHeight <= 0 ? Infinity : constraints.maxHeight;
   const widthScale = maxWidth / naturalWidth;
   const heightScale = maxHeight / naturalHeight;
   const normalizedScale = Math.min(1, widthScale, heightScale);
@@ -29705,14 +31530,14 @@ async function measureListBlock(block, constraints) {
   };
 }
 const getPrimaryRun = (paragraph) => {
-  return paragraph.runs.find((run) => run.kind !== "tab" && Boolean(run.fontFamily && run.fontSize)) || {
+  return paragraph.runs.find((run) => run.kind === "text" && Boolean(run.fontFamily && run.fontSize)) || {
     text: "",
     fontFamily: "Arial",
     fontSize: 16
   };
 };
 const measureRunWidth = (text, font, ctx2, run) => {
-  const letterSpacing = run.kind !== "tab" ? run.letterSpacing || 0 : 0;
+  const letterSpacing = run.kind === "text" ? run.letterSpacing || 0 : 0;
   const width = getMeasuredTextWidth(text, font, letterSpacing, ctx2);
   return roundValue(width);
 };
@@ -30607,8 +32432,12 @@ getBlocks_fn = function(descriptor) {
   }
   const blockIdPrefix = `hf-${descriptor.kind}-${descriptor.id}-`;
   const converterContext = __privateMethod(this, _HeaderFooterLayoutAdapter_instances, getConverterContext_fn).call(this);
+  const rootConverter = __privateGet(this, _manager).rootEditor?.converter;
+  const providedMedia = __privateGet(this, _mediaFiles);
+  const fallbackMedia = rootConverter?.media;
+  const mediaFiles = providedMedia && Object.keys(providedMedia).length > 0 ? providedMedia : fallbackMedia;
   const result = toFlowBlocks(doc2, {
-    mediaFiles: __privateGet(this, _mediaFiles),
+    mediaFiles,
     blockIdPrefix,
     converterContext
   });
@@ -30722,6 +32551,7 @@ const _PresentationEditor = class _PresentationEditor extends EventEmitter {
     __privateAdd(this, _clickCount, 0);
     __privateAdd(this, _lastClickTime, 0);
     __privateAdd(this, _lastClickPosition, { x: 0, y: 0 });
+    __privateAdd(this, _lastSelectedImageBlockId, null);
     // Remote cursor/presence state management
     /** Map of clientId -> normalized remote cursor state */
     __privateAdd(this, _remoteCursorState, /* @__PURE__ */ new Map());
@@ -30821,6 +32651,53 @@ const _PresentationEditor = class _PresentationEditor extends EventEmitter {
         }
         return;
       }
+      const fragmentHit = getFragmentAtPosition(
+        __privateGet(this, _layoutState).layout,
+        __privateGet(this, _layoutState).blocks,
+        __privateGet(this, _layoutState).measures,
+        hit.pos
+      );
+      if (fragmentHit && (fragmentHit.fragment.kind === "image" || fragmentHit.fragment.kind === "drawing")) {
+        const doc2 = __privateGet(this, _editor3).state.doc;
+        try {
+          const tr = __privateGet(this, _editor3).state.tr.setSelection(NodeSelection.create(doc2, hit.pos));
+          __privateGet(this, _editor3).view?.dispatch(tr);
+          if (__privateGet(this, _lastSelectedImageBlockId) && __privateGet(this, _lastSelectedImageBlockId) !== fragmentHit.fragment.blockId) {
+            this.emit("imageDeselected", { blockId: __privateGet(this, _lastSelectedImageBlockId) });
+          }
+          if (fragmentHit.fragment.kind === "image") {
+            const targetElement = __privateGet(this, _viewportHost).querySelector(
+              `.superdoc-image-fragment[data-pm-start="${fragmentHit.fragment.pmStart}"]`
+            );
+            if (targetElement) {
+              this.emit("imageSelected", {
+                element: targetElement,
+                blockId: fragmentHit.fragment.blockId,
+                pmStart: fragmentHit.fragment.pmStart
+              });
+              __privateSet(this, _lastSelectedImageBlockId, fragmentHit.fragment.blockId);
+            }
+          }
+        } catch (error) {
+          if (process$1.env.NODE_ENV === "development") {
+            console.warn("[PresentationEditor] Failed to create NodeSelection for atomic fragment:", error);
+          }
+        }
+        __privateMethod(this, _PresentationEditor_instances, scheduleSelectionUpdate_fn).call(this);
+        if (document.activeElement instanceof HTMLElement) {
+          document.activeElement.blur();
+        }
+        const editorDom2 = __privateGet(this, _editor3).view?.dom;
+        if (editorDom2) {
+          editorDom2.focus();
+          __privateGet(this, _editor3).view?.focus();
+        }
+        return;
+      }
+      if (__privateGet(this, _lastSelectedImageBlockId)) {
+        this.emit("imageDeselected", { blockId: __privateGet(this, _lastSelectedImageBlockId) });
+        __privateSet(this, _lastSelectedImageBlockId, null);
+      }
       const clickDepth = __privateMethod(this, _PresentationEditor_instances, registerPointerClick_fn).call(this, event);
       let handledByDepth = false;
       if (__privateGet(this, _session).mode === "body") {
@@ -31888,6 +33765,7 @@ _hoverRegion = new WeakMap();
 _clickCount = new WeakMap();
 _lastClickTime = new WeakMap();
 _lastClickPosition = new WeakMap();
+_lastSelectedImageBlockId = new WeakMap();
 _remoteCursorState = new WeakMap();
 _remoteCursorDirty = new WeakMap();
 _remoteCursorOverlay = new WeakMap();
@@ -32367,7 +34245,9 @@ initHeaderFooterRegistry_fn = function() {
   const converter = __privateGet(this, _editor3).converter;
   __privateSet(this, _headerFooterIdentifier, extractIdentifierFromConverter(converter));
   __privateSet(this, _headerFooterManager, new HeaderFooterEditorManager(__privateGet(this, _editor3)));
-  const mediaFiles = __privateGet(this, _options)?.mediaFiles ?? __privateGet(this, _editor3).storage?.image?.media;
+  const optionsMedia = __privateGet(this, _options)?.mediaFiles;
+  const storageMedia = __privateGet(this, _editor3).storage?.image?.media;
+  const mediaFiles = optionsMedia ?? storageMedia;
   __privateSet(this, _headerFooterAdapter, new HeaderFooterLayoutAdapter(
     __privateGet(this, _headerFooterManager),
     mediaFiles
@@ -32862,7 +34742,9 @@ buildHeaderFooterInput_fn = function() {
 computeHeaderFooterConstraints_fn = function() {
   const pageSize = __privateGet(this, _layoutOptions).pageSize ?? DEFAULT_PAGE_SIZE;
   const margins = __privateGet(this, _layoutOptions).margins ?? DEFAULT_MARGINS;
-  const width = pageSize.w - ((margins.left ?? DEFAULT_MARGINS.left) + (margins.right ?? DEFAULT_MARGINS.right));
+  const marginLeft = margins.left ?? DEFAULT_MARGINS.left;
+  const marginRight = margins.right ?? DEFAULT_MARGINS.right;
+  const width = pageSize.w - (marginLeft + marginRight);
   if (!Number.isFinite(width) || width <= 0) {
     return null;
   }
@@ -32870,7 +34752,10 @@ computeHeaderFooterConstraints_fn = function() {
   const height = Math.max(headerSpace, footerSpace, 1);
   return {
     width,
-    height
+    height,
+    // Pass actual page dimensions for page-relative anchor positioning in headers/footers
+    pageWidth: pageSize.w,
+    margins: { left: marginLeft, right: marginRight }
   };
 };
 updateDecorationProviders_fn = function(layout) {
@@ -32893,10 +34778,11 @@ createDecorationProvider_fn = function(kind, layout) {
     if (!variant || !variant.layout?.pages?.length) {
       return null;
     }
-    const slotPage = variant.layout.pages.find((candidate) => candidate.number === pageNumber) ?? variant.layout.pages[0];
+    const slotPage = __privateMethod(this, _PresentationEditor_instances, findHeaderFooterPageForPageNumber_fn).call(this, variant.layout.pages, pageNumber);
     if (!slotPage) {
       return null;
     }
+    const fragments = slotPage.fragments ?? [];
     const pageHeight = page?.size?.h ?? layout.pageSize?.h ?? __privateGet(this, _layoutOptions).pageSize?.h ?? DEFAULT_PAGE_SIZE.h;
     const margins = pageMargins ?? layout.pages[0]?.margins ?? __privateGet(this, _layoutOptions).margins ?? DEFAULT_MARGINS;
     const box = __privateMethod(this, _PresentationEditor_instances, computeDecorationBox_fn).call(this, kind, margins, pageHeight);
@@ -32904,7 +34790,7 @@ createDecorationProvider_fn = function(kind, layout) {
     const fallbackId = __privateGet(this, _headerFooterManager)?.getVariantId(kind, headerFooterType);
     const finalHeaderId = headerId ?? fallbackId ?? void 0;
     return {
-      fragments: slotPage.fragments,
+      fragments,
       height: box.height,
       contentHeight: variant.layout.height ?? box.height,
       offset: box.offset,
@@ -32927,6 +34813,40 @@ createDecorationProvider_fn = function(kind, layout) {
     };
   };
 };
+/**
+ * Finds the header/footer page layout for a given page number with bucket fallback.
+ *
+ * Lookup strategy:
+ * 1. Try exact match first (find page with matching number)
+ * 2. If bucketing is used, fall back to the bucket's representative page
+ * 3. Finally, fall back to the first available page
+ *
+ * Digit buckets (for large documents):
+ * - d1: pages 1-9 → representative page 5
+ * - d2: pages 10-99 → representative page 50
+ * - d3: pages 100-999 → representative page 500
+ * - d4: pages 1000+ → representative page 5000
+ *
+ * @param pages - Array of header/footer layout pages from the variant
+ * @param pageNumber - Physical page number to find layout for (1-indexed)
+ * @returns Header/footer page layout, or undefined if no suitable page found
+ */
+findHeaderFooterPageForPageNumber_fn = function(pages, pageNumber) {
+  if (!pages || pages.length === 0) {
+    return void 0;
+  }
+  const exactMatch = pages.find((p) => p.number === pageNumber);
+  if (exactMatch) {
+    return exactMatch;
+  }
+  const bucket = getBucketForPageNumber(pageNumber);
+  const representative = getBucketRepresentative(bucket);
+  const bucketMatch = pages.find((p) => p.number === representative);
+  if (bucketMatch) {
+    return bucketMatch;
+  }
+  return pages[0];
+};
 computeDecorationBox_fn = function(kind, pageMargins, pageHeight) {
   const margins = pageMargins ?? __privateGet(this, _layoutOptions).margins ?? DEFAULT_MARGINS;
   const pageSize = __privateGet(this, _layoutOptions).pageSize ?? DEFAULT_PAGE_SIZE;
@@ -44560,15 +46480,21 @@ const Image = Node$1.create({
        */
       simplePos: { rendered: false },
       extension: { rendered: false },
+      shouldStretch: {
+        default: false,
+        rendered: false
+      },
       size: {
         default: {},
-        renderDOM: ({ size, extension }) => {
+        renderDOM: ({ size, extension, shouldStretch }) => {
           let style = "";
           let { width, height } = size ?? {};
           if (width) style += `width: ${width}px;`;
           if (height && ["emf", "wmf"].includes(extension))
             style += `height: ${height}px; border: 1px solid black; position: absolute;`;
-          else if (height) style += "height: auto;";
+          else if (height && shouldStretch) {
+            style += `height: ${height}px; object-fit: fill;`;
+          } else if (height) style += "height: auto;";
           return { style };
         }
       },
@@ -44632,7 +46558,11 @@ const Image = Node$1.create({
       switch (type) {
         case "None":
           style += "position: absolute;";
-          if (attrs.behindDoc) {
+          const relativeHeight = node.attrs.originalAttributes?.relativeHeight;
+          if (relativeHeight != null) {
+            const zIndex = Math.floor(relativeHeight / 1e6);
+            style += `z-index: ${zIndex};`;
+          } else if (attrs.behindDoc) {
             style += "z-index: -1;";
           } else {
             style += "z-index: 1;";
@@ -44738,12 +46668,20 @@ const Image = Node$1.create({
             if (!style.includes("float: left;")) {
               style += "float: left;";
             }
+          } else if (!anchorData.alignH && marginOffset?.horizontal != null) {
+            const isAbsolutelyPositioned = style.includes("position: absolute;");
+            if (isAbsolutelyPositioned) {
+              style += `left: ${baseHorizontal}px;`;
+              style += "max-width: none;";
+              baseHorizontal = 0;
+            }
           }
           break;
       }
     }
     if (hasAnchorData || hasMarginOffsets) {
       const relativeFromPageV = anchorData?.vRelativeFrom === "page";
+      const relativeFromMarginV = anchorData?.vRelativeFrom === "margin";
       const maxMarginV = 500;
       const baseTop = Math.max(0, marginOffset?.top ?? 0);
       let rotationHorizontal = 0;
@@ -44764,7 +46702,7 @@ const Image = Node$1.create({
           margin.left += horizontal;
         }
       }
-      if (top2) {
+      if (top2 && !relativeFromMarginV) {
         if (relativeFromPageV && top2 >= maxMarginV) margin.top += maxMarginV;
         else margin.top += top2;
       }
@@ -45596,15 +47534,24 @@ const ContentBlock = Node$1.create({
       },
       size: {
         default: null,
-        renderDOM: ({ size }) => {
-          if (!size) return {};
+        renderDOM: (attrs) => {
+          if (!attrs.size) return {};
           let style = "";
-          if (size.top) style += `top: ${size.top}px; `;
-          if (size.left) style += `left: ${size.left}px; `;
-          if (size.width) style += `width: ${size.width.toString().endsWith("%") ? size.width : `${size.width}px`}; `;
-          if (size.height) {
-            const heightValue = size.height.toString().endsWith("%") ? size.height : `${size.height}px`;
-            style += `height: ${heightValue}; `;
+          if (attrs.size.top) style += `top: ${attrs.size.top}px; `;
+          if (attrs.size.left) style += `left: ${attrs.size.left}px; `;
+          if (attrs.size.width)
+            style += `width: ${attrs.size.width.toString().endsWith("%") ? attrs.size.width : `${attrs.size.width}px`}; `;
+          if (attrs.size.height)
+            style += `height: ${attrs.size.height.toString().endsWith("%") ? attrs.size.height : `${attrs.size.height}px`}; `;
+          if (attrs.marginOffset?.horizontal != null || attrs.marginOffset?.top != null) {
+            style += "position: absolute; ";
+            const relativeHeight = attrs.originalAttributes?.relativeHeight;
+            if (relativeHeight != null) {
+              const zIndex = Math.floor(relativeHeight / 1e6);
+              style += `z-index: ${zIndex}; `;
+            } else {
+              style += "z-index: 1; ";
+            }
           }
           return { style };
         }
@@ -45623,6 +47570,13 @@ const ContentBlock = Node$1.create({
       },
       attributes: {
         rendered: false
+      },
+      originalAttributes: {
+        rendered: false
+      },
+      marginOffset: {
+        default: null,
+        rendered: false
       }
     };
   },
@@ -46012,8 +47966,167 @@ const TableOfContents = Node$1.create({
     };
   }
 });
+function createGradient(gradientData, gradientId) {
+  const { gradientType, stops, angle } = gradientData;
+  if (!stops || stops.length === 0) {
+    return null;
+  }
+  let gradient;
+  if (gradientType === "linear") {
+    gradient = document.createElementNS("http://www.w3.org/2000/svg", "linearGradient");
+    gradient.setAttribute("id", gradientId);
+    const radians = angle * Math.PI / 180;
+    const x1 = 50 - 50 * Math.cos(radians);
+    const y1 = 50 + 50 * Math.sin(radians);
+    const x2 = 50 + 50 * Math.cos(radians);
+    const y2 = 50 - 50 * Math.sin(radians);
+    gradient.setAttribute("x1", `${x1}%`);
+    gradient.setAttribute("y1", `${y1}%`);
+    gradient.setAttribute("x2", `${x2}%`);
+    gradient.setAttribute("y2", `${y2}%`);
+  } else {
+    gradient = document.createElementNS("http://www.w3.org/2000/svg", "radialGradient");
+    gradient.setAttribute("id", gradientId);
+    gradient.setAttribute("cx", "50%");
+    gradient.setAttribute("cy", "50%");
+    gradient.setAttribute("r", "50%");
+  }
+  stops.forEach((stop) => {
+    const stopElement = document.createElementNS("http://www.w3.org/2000/svg", "stop");
+    stopElement.setAttribute("offset", `${stop.position * 100}%`);
+    stopElement.setAttribute("stop-color", stop.color);
+    if (stop.alpha != null && stop.alpha < 1) {
+      stopElement.setAttribute("stop-opacity", stop.alpha.toString());
+    }
+    gradient.appendChild(stopElement);
+  });
+  return gradient;
+}
+function createTextElement(textContent2, textAlign, width, height) {
+  const foreignObject = document.createElementNS("http://www.w3.org/2000/svg", "foreignObject");
+  foreignObject.setAttribute("x", "0");
+  foreignObject.setAttribute("y", "0");
+  foreignObject.setAttribute("width", width.toString());
+  foreignObject.setAttribute("height", height.toString());
+  const div2 = document.createElement("div");
+  div2.style.width = "100%";
+  div2.style.height = "100%";
+  div2.style.display = "flex";
+  div2.style.flexDirection = "column";
+  div2.style.justifyContent = "center";
+  div2.style.padding = "10px";
+  div2.style.boxSizing = "border-box";
+  div2.style.wordWrap = "break-word";
+  div2.style.overflowWrap = "break-word";
+  div2.style.fontSize = "12px";
+  div2.style.lineHeight = "1.2";
+  if (textAlign === "center") {
+    div2.style.textAlign = "center";
+  } else if (textAlign === "right" || textAlign === "r") {
+    div2.style.textAlign = "right";
+  } else {
+    div2.style.textAlign = "left";
+  }
+  let currentParagraph = document.createElement("div");
+  textContent2.parts.forEach((part) => {
+    if (part.isLineBreak) {
+      div2.appendChild(currentParagraph);
+      currentParagraph = document.createElement("div");
+      if (part.isEmptyParagraph) {
+        currentParagraph.style.minHeight = "1em";
+      }
+    } else {
+      const span = document.createElement("span");
+      span.textContent = part.text;
+      if (part.formatting) {
+        if (part.formatting.bold) {
+          span.style.fontWeight = "bold";
+        }
+        if (part.formatting.italic) {
+          span.style.fontStyle = "italic";
+        }
+        if (part.formatting.color) {
+          span.style.color = `#${part.formatting.color}`;
+        }
+        if (part.formatting.fontSize) {
+          span.style.fontSize = `${part.formatting.fontSize}px`;
+        }
+      }
+      currentParagraph.appendChild(span);
+    }
+  });
+  div2.appendChild(currentParagraph);
+  foreignObject.appendChild(div2);
+  return foreignObject;
+}
+function applyGradientToSVG(svg, gradientData) {
+  const { gradientType, stops, angle } = gradientData;
+  const gradientId = `gradient-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`;
+  let defs = svg.querySelector("defs");
+  if (!defs) {
+    defs = document.createElementNS("http://www.w3.org/2000/svg", "defs");
+    svg.insertBefore(defs, svg.firstChild);
+  }
+  let gradient;
+  if (gradientType === "linear") {
+    gradient = document.createElementNS("http://www.w3.org/2000/svg", "linearGradient");
+    gradient.setAttribute("id", gradientId);
+    const radians = angle * Math.PI / 180;
+    const x1 = 50 - 50 * Math.cos(radians);
+    const y1 = 50 + 50 * Math.sin(radians);
+    const x2 = 50 + 50 * Math.cos(radians);
+    const y2 = 50 - 50 * Math.sin(radians);
+    gradient.setAttribute("x1", `${x1}%`);
+    gradient.setAttribute("y1", `${y1}%`);
+    gradient.setAttribute("x2", `${x2}%`);
+    gradient.setAttribute("y2", `${y2}%`);
+  } else {
+    gradient = document.createElementNS("http://www.w3.org/2000/svg", "radialGradient");
+    gradient.setAttribute("id", gradientId);
+    gradient.setAttribute("cx", "50%");
+    gradient.setAttribute("cy", "50%");
+    gradient.setAttribute("r", "50%");
+  }
+  stops.forEach((stop) => {
+    const stopElement = document.createElementNS("http://www.w3.org/2000/svg", "stop");
+    stopElement.setAttribute("offset", `${stop.position * 100}%`);
+    stopElement.setAttribute("stop-color", stop.color);
+    if (stop.alpha != null && stop.alpha < 1) {
+      stopElement.setAttribute("stop-opacity", stop.alpha.toString());
+    }
+    gradient.appendChild(stopElement);
+  });
+  defs.appendChild(gradient);
+  const filledElements = svg.querySelectorAll('[fill]:not([fill="none"])');
+  filledElements.forEach((el) => {
+    el.setAttribute("fill", `url(#${gradientId})`);
+  });
+}
+function applyAlphaToSVG(svg, alphaData) {
+  const { color, alpha } = alphaData;
+  const filledElements = svg.querySelectorAll('[fill]:not([fill="none"])');
+  filledElements.forEach((el) => {
+    el.setAttribute("fill", color);
+    el.setAttribute("fill-opacity", alpha.toString());
+  });
+}
+function generateTransforms(attrs) {
+  const transforms = [];
+  if (attrs.rotation != null) {
+    transforms.push(`rotate(${attrs.rotation}deg)`);
+  }
+  if (attrs.flipH) {
+    transforms.push(`scaleX(-1)`);
+  }
+  if (attrs.flipV) {
+    transforms.push(`scaleY(-1)`);
+  }
+  return transforms;
+}
+const Z_INDEX_SCALE_FACTOR = 1e6;
 class VectorShapeView {
   constructor(props) {
+    __privateAdd(this, _VectorShapeView_instances);
     __publicField(this, "node");
     __publicField(this, "view");
     __publicField(this, "getPos");
@@ -46035,6 +48148,7 @@ class VectorShapeView {
   }
   mount() {
     this.buildView();
+    __privateMethod(this, _VectorShapeView_instances, ensureParentPositioned_fn).call(this);
   }
   get dom() {
     return this.root;
@@ -46049,49 +48163,264 @@ class VectorShapeView {
     element.setAttribute("data-vector-shape", "");
     element.style.width = `${attrs.width}px`;
     element.style.height = `${attrs.height}px`;
+    const positioningStyle = this.getPositioningStyle(attrs);
+    if (positioningStyle) {
+      element.style.cssText += positioningStyle;
+    }
     const transforms = this.generateTransform();
-    if (transforms.length > 0) {
-      element.style.transform = transforms.join(" ");
+    const positioningTransform = element.style.transform;
+    const combinedTransforms = [];
+    if (positioningTransform && positioningTransform.trim() !== "") {
+      combinedTransforms.push(positioningTransform.trim());
+    }
+    if (Array.isArray(transforms) && transforms.length > 0) {
+      const validTransforms = transforms.filter(
+        (t) => t !== null && t !== void 0 && typeof t === "string" && t.trim() !== ""
+      );
+      if (validTransforms.length > 0) {
+        combinedTransforms.push(...validTransforms);
+      }
     }
-    const svgTemplate = this.generateSVG({
-      kind: attrs.kind,
-      fillColor: attrs.fillColor,
-      strokeColor: attrs.strokeColor,
-      strokeWidth: attrs.strokeWidth
-    });
-    if (svgTemplate) {
-      element.innerHTML = svgTemplate;
+    if (combinedTransforms.length > 0) {
+      element.style.transform = combinedTransforms.join(" ");
+    }
+    const svg = this.createSVGElement(attrs);
+    if (svg) {
+      element.appendChild(svg);
+      if (attrs.textContent && attrs.textContent.parts) {
+        const textElement = this.createTextElement(attrs.textContent, attrs.textAlign, attrs.width, attrs.height);
+        if (textElement) {
+          svg.appendChild(textElement);
+        }
+      }
     }
     return { element };
   }
-  generateTransform() {
-    const attrs = this.node.attrs;
-    const transforms = [];
-    if (attrs.rotation != null) {
-      transforms.push(`rotate(${attrs.rotation}deg)`);
+  getPositioningStyle(attrs) {
+    const { anchorData, marginOffset, wrap, originalAttributes } = attrs;
+    if (!anchorData && !marginOffset?.horizontal && !marginOffset?.top) {
+      return "";
     }
-    if (attrs.flipH) {
-      transforms.push(`scaleX(-1)`);
+    let style = "";
+    const margin = { left: 0, right: 0, top: 0 };
+    let centered = false;
+    let floatRight = false;
+    let baseHorizontal = marginOffset?.horizontal || 0;
+    if (wrap?.type === "None") {
+      style += "position: absolute;";
+      const relativeHeight = originalAttributes?.relativeHeight;
+      if (relativeHeight != null) {
+        const zIndex = Math.floor(relativeHeight / Z_INDEX_SCALE_FACTOR);
+        style += `z-index: ${zIndex};`;
+      } else if (wrap?.attrs?.behindDoc) {
+        style += "z-index: -1;";
+      } else {
+        style += "z-index: 1;";
+      }
     }
-    if (attrs.flipV) {
-      transforms.push(`scaleY(-1)`);
+    if (anchorData) {
+      switch (anchorData.hRelativeFrom) {
+        case "page":
+          const pageStyles2 = this.editor?.converter?.pageStyles || this.editor?.options?.parentEditor?.converter?.pageStyles;
+          margin.left -= inchesToPixels(pageStyles2?.pageMargins?.left) || 0;
+          break;
+        case "margin":
+          if (anchorData.alignH === "center") {
+            style += "position: absolute; left: 50%; transform: translateX(-50%);";
+          }
+          if (anchorData.alignH === "left" || anchorData.alignH === "right") {
+            style += `position: absolute; ${anchorData.alignH}: 0;`;
+          }
+          break;
+        case "column":
+          if (anchorData.alignH === "center") {
+            centered = true;
+          } else if (anchorData.alignH === "right") {
+            floatRight = true;
+            if (!style.includes("float: right;")) {
+              style += "float: right;";
+            }
+          } else if (anchorData.alignH === "left") {
+            if (!style.includes("float: left;")) {
+              style += "float: left;";
+            }
+          } else if (!anchorData.alignH && marginOffset?.horizontal != null) {
+            const isAbsolutelyPositioned2 = style.includes("position: absolute;");
+            if (isAbsolutelyPositioned2) {
+              style += `left: ${baseHorizontal}px;`;
+              baseHorizontal = 0;
+            }
+          }
+          break;
+      }
+    }
+    const isAbsolutelyPositioned = style.includes("position: absolute;");
+    if (anchorData || marginOffset?.horizontal != null || marginOffset?.top != null) {
+      const horizontal = baseHorizontal;
+      const top2 = marginOffset?.top ?? 0;
+      if (isAbsolutelyPositioned) {
+        if (horizontal && !style.includes("left:")) {
+          style += `left: ${horizontal}px;`;
+        }
+        if (top2 != null) {
+          style += `top: ${top2}px;`;
+        }
+      } else {
+        if (horizontal) {
+          if (floatRight) {
+            margin.right += horizontal;
+          } else {
+            margin.left += horizontal;
+          }
+        }
+        if (top2 > 0) {
+          margin.top += top2;
+        }
+      }
+    }
+    if (centered) {
+      style += "margin-left: auto; margin-right: auto;";
+    } else if (!isAbsolutelyPositioned) {
+      if (margin.left) style += `margin-left: ${margin.left}px;`;
+      if (margin.right) style += `margin-right: ${margin.right}px;`;
     }
-    return transforms;
+    if (!isAbsolutelyPositioned && margin.top) style += `margin-top: ${margin.top}px;`;
+    return style;
   }
-  generateSVG({ kind, fillColor, strokeColor, strokeWidth }) {
+  generateTransform() {
+    return generateTransforms(this.node.attrs);
+  }
+  createSVGElement(attrs) {
+    const { kind, fillColor, strokeColor, strokeWidth, width, height } = attrs;
+    const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+    svg.setAttribute("width", width.toString());
+    svg.setAttribute("height", height.toString());
+    svg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
+    svg.style.display = "block";
+    const defs = document.createElementNS("http://www.w3.org/2000/svg", "defs");
+    svg.appendChild(defs);
+    let fill = "none";
+    let fillOpacity = 1;
+    if (fillColor) {
+      if (typeof fillColor === "object") {
+        if (fillColor.type === "gradient") {
+          const gradientId = `gradient-${Math.random().toString(36).slice(2, 11)}-${Date.now()}`;
+          const gradient = this.createGradient(fillColor, gradientId);
+          if (gradient) {
+            defs.appendChild(gradient);
+            fill = `url(#${gradientId})`;
+          }
+        } else if (fillColor.type === "solidWithAlpha") {
+          fill = fillColor.color;
+          fillOpacity = fillColor.alpha;
+        }
+      } else {
+        fill = fillColor;
+      }
+    }
+    const stroke = strokeColor === null ? "none" : strokeColor || "none";
+    const strokeW = strokeColor === null ? 0 : strokeColor ? strokeWidth || 1 : 0;
+    let shapeElement;
+    switch (kind) {
+      case "rect":
+        shapeElement = document.createElementNS("http://www.w3.org/2000/svg", "rect");
+        shapeElement.setAttribute("x", "0");
+        shapeElement.setAttribute("y", "0");
+        shapeElement.setAttribute("width", width.toString());
+        shapeElement.setAttribute("height", height.toString());
+        break;
+      case "roundRect":
+        shapeElement = document.createElementNS("http://www.w3.org/2000/svg", "rect");
+        shapeElement.setAttribute("x", "0");
+        shapeElement.setAttribute("y", "0");
+        shapeElement.setAttribute("width", width.toString());
+        shapeElement.setAttribute("height", height.toString());
+        const radius = Math.min(width, height) * 0.05;
+        shapeElement.setAttribute("rx", radius.toString());
+        shapeElement.setAttribute("ry", radius.toString());
+        break;
+      case "ellipse":
+        shapeElement = document.createElementNS("http://www.w3.org/2000/svg", "ellipse");
+        shapeElement.setAttribute("cx", (width / 2).toString());
+        shapeElement.setAttribute("cy", (height / 2).toString());
+        shapeElement.setAttribute("rx", (width / 2).toString());
+        shapeElement.setAttribute("ry", (height / 2).toString());
+        break;
+      case "circle":
+        shapeElement = document.createElementNS("http://www.w3.org/2000/svg", "ellipse");
+        shapeElement.setAttribute("cx", (width / 2).toString());
+        shapeElement.setAttribute("cy", (height / 2).toString());
+        shapeElement.setAttribute("rx", (width / 2).toString());
+        shapeElement.setAttribute("ry", (height / 2).toString());
+        break;
+      default:
+        try {
+          const svgTemplate = this.generateSVG({ kind, fillColor, strokeColor, strokeWidth, width, height });
+          if (svgTemplate) {
+            const tempDiv = document.createElement("div");
+            tempDiv.innerHTML = svgTemplate;
+            const tempSvg = tempDiv.querySelector("svg");
+            if (tempSvg) {
+              tempSvg.setAttribute("width", width.toString());
+              tempSvg.setAttribute("height", height.toString());
+              tempSvg.setAttribute("preserveAspectRatio", "none");
+              tempSvg.style.width = `${width}px`;
+              tempSvg.style.height = `${height}px`;
+              tempSvg.style.display = "block";
+              return tempSvg;
+            }
+          }
+        } catch (error) {
+          console.warn("Failed to generate SVG for shape:", kind, error);
+          return null;
+        }
+        return null;
+    }
+    shapeElement.setAttribute("fill", fill);
+    if (fillOpacity < 1) {
+      shapeElement.setAttribute("fill-opacity", fillOpacity.toString());
+    }
+    shapeElement.setAttribute("stroke", stroke);
+    shapeElement.setAttribute("stroke-width", strokeW.toString());
+    svg.appendChild(shapeElement);
+    return svg;
+  }
+  createGradient(gradientData, gradientId) {
+    return createGradient(gradientData, gradientId);
+  }
+  generateSVG({ kind, fillColor, strokeColor, strokeWidth, width, height }) {
     try {
+      let fill = fillColor || "none";
+      if (fillColor && typeof fillColor === "object") {
+        if (fillColor.type === "gradient") {
+          fill = "#cccccc";
+        } else if (fillColor.type === "solidWithAlpha") {
+          fill = fillColor.color;
+        }
+      }
       return k({
         preset: kind,
         styleOverrides: {
-          fill: fillColor || "none",
+          fill,
           stroke: strokeColor || "none",
           strokeWidth: strokeWidth || 0
-        }
+        },
+        width,
+        height
       });
     } catch {
       return null;
     }
   }
+  applyGradientToSVG(svg, gradientData) {
+    applyGradientToSVG(svg, gradientData);
+  }
+  applyAlphaToSVG(svg, alphaData) {
+    applyAlphaToSVG(svg, alphaData);
+  }
+  createTextElement(textContent2, textAlign, width, height) {
+    return createTextElement(textContent2, textAlign, width, height);
+  }
   buildView() {
     const { element } = this.createElement();
     this.root = element;
@@ -46100,6 +48429,37 @@ class VectorShapeView {
     return false;
   }
 }
+_VectorShapeView_instances = new WeakSet();
+/**
+ * Ensures the parent paragraph element is positioned for absolute-positioned vector shapes.
+ *
+ * For vector shapes with wrap type 'None' (absolutely positioned), the parent paragraph
+ * element must have `position: relative` to establish a containing block for CSS absolute
+ * positioning. This allows the vector shape's `top` and `left` offsets to position correctly
+ * relative to the paragraph.
+ *
+ * Uses requestAnimationFrame to defer the DOM manipulation until after the element is fully
+ * mounted in the DOM tree. This prevents race conditions where the parent element might not
+ * yet be available during the initial render phase.
+ *
+ * Only applies to wrap type 'None' - inline and floated elements do not require this setup.
+ */
+ensureParentPositioned_fn = function() {
+  const wrapType = this.node.attrs.wrap?.type;
+  if (wrapType !== "None") return;
+  if (typeof globalThis !== "undefined" && globalThis.requestAnimationFrame) {
+    globalThis.requestAnimationFrame(() => {
+      try {
+        const parent = this.root?.parentElement;
+        if (parent && parent.tagName === "P") {
+          parent.style.position = "relative";
+        }
+      } catch (error) {
+        console.warn("Failed to position parent element for vector shape:", error);
+      }
+    });
+  }
+};
 const VectorShape = Node$1.create({
   name: "vectorShape",
   group: "inline",
@@ -46175,8 +48535,42 @@ const VectorShape = Node$1.create({
           return { "data-flip-v": attrs.flipV };
         }
       },
+      wrap: {
+        default: { type: "Inline" },
+        rendered: false
+      },
+      anchorData: {
+        default: null,
+        rendered: false
+      },
+      isAnchor: {
+        rendered: false
+      },
+      marginOffset: {
+        default: {},
+        rendered: false
+      },
       drawingContent: {
         rendered: false
+      },
+      originalAttributes: {
+        rendered: false
+      },
+      textContent: {
+        default: null,
+        rendered: false
+      },
+      textAlign: {
+        default: "center",
+        rendered: false
+      },
+      textVerticalAlign: {
+        default: "center",
+        rendered: false
+      },
+      textInsets: {
+        default: null,
+        rendered: false
       }
     };
   },
@@ -46197,6 +48591,7 @@ const VectorShape = Node$1.create({
 });
 class ShapeGroupView {
   constructor(props) {
+    __privateAdd(this, _ShapeGroupView_instances);
     __publicField(this, "node");
     __publicField(this, "view");
     __publicField(this, "getPos");
@@ -46218,6 +48613,7 @@ class ShapeGroupView {
   }
   mount() {
     this.buildView();
+    __privateMethod(this, _ShapeGroupView_instances, ensureParentPositioned_fn2).call(this);
   }
   get dom() {
     return this.root;
@@ -46227,7 +48623,7 @@ class ShapeGroupView {
   }
   createElement() {
     const attrs = this.node.attrs;
-    const { groupTransform, shapes, size } = attrs;
+    const { groupTransform, shapes, size, marginOffset, originalAttributes, wrap, anchorData } = attrs;
     const container = document.createElement("div");
     container.classList.add("sd-shape-group");
     container.setAttribute("data-shape-group", "");
@@ -46237,6 +48633,55 @@ class ShapeGroupView {
     container.style.height = `${height}px`;
     container.style.position = "relative";
     container.style.display = "inline-block";
+    const wrapType = wrap?.type || "Inline";
+    if (wrapType === "None") {
+      container.style.position = "absolute";
+      if (marginOffset?.horizontal != null) {
+        container.style.left = `${marginOffset.horizontal}px`;
+      }
+      const isColumnRelative = anchorData?.hRelativeFrom === "column";
+      if (isColumnRelative && !anchorData?.alignH && marginOffset?.horizontal != null) {
+        container.style.maxWidth = "none";
+      }
+      if (marginOffset?.top != null) {
+        container.style.top = `${marginOffset.top}px`;
+      }
+      const relativeHeight = originalAttributes?.relativeHeight;
+      if (relativeHeight != null) {
+        const zIndex = Math.floor(relativeHeight / 1e6);
+        container.style.zIndex = zIndex.toString();
+      } else {
+        container.style.zIndex = "1";
+      }
+    } else if (wrapType === "Square") {
+      container.style.float = "left";
+      container.style.clear = "both";
+      if (marginOffset?.horizontal != null) {
+        container.style.marginLeft = `${marginOffset.horizontal}px`;
+      }
+      if (marginOffset?.top != null) {
+        container.style.marginTop = `${marginOffset.top}px`;
+      }
+      if (wrap?.attrs?.distLeft) {
+        container.style.marginLeft = `${(marginOffset?.horizontal || 0) + wrap.attrs.distLeft}px`;
+      }
+      if (wrap?.attrs?.distRight) {
+        container.style.marginRight = `${wrap.attrs.distRight}px`;
+      }
+      if (wrap?.attrs?.distTop) {
+        container.style.marginTop = `${(marginOffset?.top || 0) + wrap.attrs.distTop}px`;
+      }
+      if (wrap?.attrs?.distBottom) {
+        container.style.marginBottom = `${wrap.attrs.distBottom}px`;
+      }
+    } else {
+      if (marginOffset?.horizontal != null) {
+        container.style.marginLeft = `${marginOffset.horizontal}px`;
+      }
+      if (marginOffset?.top != null) {
+        container.style.marginTop = `${marginOffset.top}px`;
+      }
+    }
     const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
     svg.setAttribute("version", "1.1");
     svg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
@@ -46244,26 +48689,33 @@ class ShapeGroupView {
     svg.setAttribute("height", height.toString());
     svg.setAttribute("viewBox", `0 0 ${width} ${height}`);
     svg.style.display = "block";
+    const defs = document.createElementNS("http://www.w3.org/2000/svg", "defs");
+    svg.appendChild(defs);
     if (shapes && Array.isArray(shapes)) {
-      shapes.forEach((shape) => {
+      shapes.forEach((shape, index2) => {
         if (shape.shapeType === "vectorShape") {
-          const shapeElement = this.createShapeElement(shape, groupTransform);
+          const shapeElement = this.createShapeElement(shape, groupTransform, defs, index2);
           if (shapeElement) {
             svg.appendChild(shapeElement);
           }
+        } else if (shape.shapeType === "image") {
+          const imageElement = this.createImageElement(shape, groupTransform);
+          if (imageElement) {
+            svg.appendChild(imageElement);
+          }
         }
       });
     }
     container.appendChild(svg);
     return { element: container };
   }
-  createShapeElement(shape) {
+  createShapeElement(shape, groupTransform, defs, shapeIndex) {
     const attrs = shape.attrs;
     if (!attrs) return null;
-    const x = attrs.x || 0;
-    const y = attrs.y || 0;
-    const width = attrs.width || 100;
-    const height = attrs.height || 100;
+    const x = attrs.x ?? 0;
+    const y = attrs.y ?? 0;
+    const width = attrs.width ?? 100;
+    const height = attrs.height ?? 100;
     const g = document.createElementNS("http://www.w3.org/2000/svg", "g");
     const transforms = [];
     transforms.push(`translate(${x}, ${y})`);
@@ -46280,16 +48732,44 @@ class ShapeGroupView {
       g.setAttribute("transform", transforms.join(" "));
     }
     const shapeKind = attrs.kind || "rect";
-    const fillColor = attrs.fillColor || "#5b9bd5";
-    const strokeColor = attrs.strokeColor || "#000000";
-    const strokeWidth = attrs.strokeWidth || 1;
+    const fillColor = attrs.fillColor === null ? null : attrs.fillColor ?? "#5b9bd5";
+    const strokeColor = attrs.strokeColor === null ? null : attrs.strokeColor ?? "#000000";
+    const strokeWidth = attrs.strokeWidth ?? 1;
+    let fillValue = fillColor;
+    if (fillColor && typeof fillColor === "object" && fillColor.type === "gradient") {
+      const gradientId = `gradient-${shapeIndex}-${Date.now()}-${Math.floor(Math.random() * 1e9)}`;
+      const gradient = this.createGradient(fillColor, gradientId);
+      defs.appendChild(gradient);
+      fillValue = `url(#${gradientId})`;
+    } else if (fillColor === null) {
+      fillValue = "none";
+    } else if (typeof fillColor === "string") {
+      fillValue = fillColor;
+    }
+    if (shapeKind === "line") {
+      const line = document.createElementNS("http://www.w3.org/2000/svg", "line");
+      line.setAttribute("x1", "0");
+      line.setAttribute("y1", "0");
+      line.setAttribute("x2", width.toString());
+      line.setAttribute("y2", height.toString());
+      line.setAttribute("stroke", strokeColor === null ? "none" : strokeColor);
+      line.setAttribute("stroke-width", (strokeColor === null ? 0 : strokeWidth).toString());
+      g.appendChild(line);
+      if (attrs.textContent && attrs.textContent.parts) {
+        const textGroup = this.createTextElement(attrs.textContent, attrs.textAlign, width, height);
+        if (textGroup) {
+          g.appendChild(textGroup);
+        }
+      }
+      return g;
+    }
     try {
       const svgContent = k({
         preset: shapeKind,
         styleOverrides: {
-          fill: fillColor || "none",
-          stroke: strokeColor || "none",
-          strokeWidth: strokeWidth || 0
+          fill: fillValue || "none",
+          stroke: strokeColor === null ? "none" : strokeColor,
+          strokeWidth: strokeColor === null ? 0 : strokeWidth
         },
         width,
         height
@@ -46358,13 +48838,42 @@ class ShapeGroupView {
       const rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
       rect.setAttribute("width", width.toString());
       rect.setAttribute("height", height.toString());
-      rect.setAttribute("fill", fillColor);
-      rect.setAttribute("stroke", strokeColor);
-      rect.setAttribute("stroke-width", strokeWidth.toString());
+      rect.setAttribute("fill", fillColor === null ? "none" : typeof fillColor === "string" ? fillColor : "#cccccc");
+      rect.setAttribute("stroke", strokeColor === null ? "none" : strokeColor);
+      rect.setAttribute("stroke-width", strokeColor === null ? "0" : strokeWidth.toString());
       g.appendChild(rect);
     }
+    if (attrs.textContent && attrs.textContent.parts) {
+      const textGroup = this.createTextElement(attrs.textContent, attrs.textAlign, width, height);
+      if (textGroup) {
+        g.appendChild(textGroup);
+      }
+    }
     return g;
   }
+  createTextElement(textContent2, textAlign, width, height) {
+    return createTextElement(textContent2, textAlign, width, height);
+  }
+  createGradient(gradientData, gradientId) {
+    return createGradient(gradientData, gradientId);
+  }
+  createImageElement(shape, _groupTransform) {
+    const attrs = shape.attrs;
+    if (!attrs) return null;
+    const x = attrs.x || 0;
+    const y = attrs.y || 0;
+    const width = attrs.width || 100;
+    const height = attrs.height || 100;
+    const image = document.createElementNS("http://www.w3.org/2000/svg", "image");
+    image.setAttribute("x", x.toString());
+    image.setAttribute("y", y.toString());
+    image.setAttribute("width", width.toString());
+    image.setAttribute("height", height.toString());
+    const src = this.editor?.storage?.image?.media?.[attrs.src] ?? attrs.src;
+    image.setAttribute("href", src);
+    image.setAttribute("preserveAspectRatio", "none");
+    return image;
+  }
   buildView() {
     const { element } = this.createElement();
     this.root = element;
@@ -46373,6 +48882,37 @@ class ShapeGroupView {
     return false;
   }
 }
+_ShapeGroupView_instances = new WeakSet();
+/**
+ * Ensures the parent paragraph element is positioned for absolute-positioned shape groups.
+ *
+ * For shape groups with wrap type 'None' (absolutely positioned), the parent paragraph
+ * element must have `position: relative` to establish a containing block for CSS absolute
+ * positioning. This allows the shape group's `top` and `left` offsets to position correctly
+ * relative to the paragraph.
+ *
+ * Uses requestAnimationFrame to defer the DOM manipulation until after the element is fully
+ * mounted in the DOM tree. This prevents race conditions where the parent element might not
+ * yet be available during the initial render phase.
+ *
+ * Only applies to wrap type 'None' - inline and floated elements do not require this setup.
+ */
+ensureParentPositioned_fn2 = function() {
+  const wrapType = this.node.attrs.wrap?.type || "Inline";
+  if (wrapType !== "None") return;
+  if (typeof globalThis !== "undefined" && globalThis.requestAnimationFrame) {
+    globalThis.requestAnimationFrame(() => {
+      try {
+        const parent = this.root?.parentElement;
+        if (parent && parent.tagName === "P") {
+          parent.style.position = "relative";
+        }
+      } catch (error) {
+        console.warn("Failed to position parent element for shape group:", error);
+      }
+    });
+  }
+};
 const ShapeGroup = Node$1.create({
   name: "shapeGroup",
   group: "inline",
@@ -46429,6 +48969,17 @@ const ShapeGroup = Node$1.create({
       },
       drawingContent: {
         rendered: false
+      },
+      wrap: {
+        default: { type: "Inline" },
+        rendered: false
+      },
+      anchorData: {
+        default: null,
+        rendered: false
+      },
+      originalAttributes: {
+        rendered: false
       }
     };
   },