oasis-editor 0.0.88 → 0.0.90

package/dist/{OasisEditorApp-Bx4I4GCm.js → OasisEditorApp-2b7y3aGj.js}

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { v as visitRun, a as assertNever, c as createSignal, b as createEditorStateFromDocument, d as createInitialEditorState, S as STANDARD_FONT_SIZES_PT, f as fontSizePxToPt, p as probeLocalFontFamilies, e as createEditorParagraphFromRuns, i as isInlineObjectRun, g as createEditorStyledRun, h as getParagraphLength, j as getParagraphText, k as getActiveZone, l as getDocumentSections, m as getActiveSectionIndex, n as getParagraphs, o as normalizeSelection, q as positionToParagraphOffset, r as paragraphOffsetToPosition, s as clampPosition, t as findParagraphIndex, u as createCollapsedSelection, w as isSelectionCollapsed, x as parseFontSizePtToPx, y as formatFontSizePt, z as createEditorParagraph, A as getBlockParagraphs, B as findParagraphTableLocation, C as buildTableCellLayout, P as PT_PER_PX, D as createEditorTableCell, E as createEditorTableRow, F as createEditorTable, G as underlineStyleToCssDecorationStyle, H as resolveImageSrc, I as listKindForTag, J as isParagraphTag, K as collectInlineRuns, L as parseParagraphStyle, M as getRunImage, N as InlineShell, O as BalloonShell, Q as DocumentShell, R as createMemo, T as buildCanvasLayoutSnapshot, U as getCaretRectFromSnapshot, V as getParagraphRectFromSnapshot, W as createComponent, X as CaretOverlay, Y as Show, Z as createRenderEffect, _ as style, $ as setAttribute, a0 as setStyleProperty, a1 as memo, a2 as template, a3 as useI18n, a4 as createEffect, a5 as insert, a6 as use, a7 as addEventListener, a8 as Dialog, a9 as delegateEvents, aa as className, ab as For, ac as UNDERLINE_STYLE_OPTIONS, ad as Tabs, ae as onMount, af as onCleanup, ag as PluginUiHost, ah as OasisEditorEditor, ai as OasisBrandMark, aj as setPreciseFontPreference, ak as setWelcomeSeen, al as enablePreciseFontMode, am as TWIPS_PER_POINT, an as PX_PER_INCH, ao as TWIPS_PER_INCH, ap as resolveEffectiveParagraphStyle, aq as resolveEffectiveTextStyleForParagraph, ar as EMU_PER_PX, as as EMU_PER_PT, at as getRunFootnoteReference, au as getRunEndnoteReference, av as iterateFootnoteReferenceRuns, aw as iterateEndnoteReferenceRuns, ax as imageContentTypeDefaults, ay as getRunFieldChar, az as getRunFieldInstruction, aA as createEditorRun, aB as JSZip, aC as imageExtensionFromMime, aD as pxToPt$1, aE as resolveFloatingObjectRect, aF as getTextBoxFloatingGeometry, aG as getPresetPathSegments, aH as projectBlocksLayout, aI as buildListLabels, aJ as textStyleToFontSizePt, aK as PX_PER_POINT, aL as DEFAULT_FONT_SIZE_PX, aM as isDoubleUnderlineStyle, aN as isWavyUnderlineStyle, aO as underlineStyleLineWidthPx, aP as underlineStyleDashArray, aQ as resolveListLabel, aR as getListLabelInset, aS as getAlignedListLabelInset, aT as getParagraphBorderInsets, aU as buildSegmentTable, aV as buildCanvasTableLayout, aW as normalizeFamily, aX as ROBOTO_FONT_FILES, aY as loadFontAsset, aZ as OFFICE_COMPAT_FONT_FAMILIES, a_ as buildSfnt, a$ as defaultFontDecoderRegistry, b0 as SfntFontProgram, b1 as collectPdfFontFamilies, b2 as projectDocumentLayout, b3 as getPageContentWidth, b4 as getPageHeaderZoneTop, b5 as getPageBodyTop, b6 as getPageColumnRects, b7 as findFootnoteReference, b8 as FOOTNOTE_MARKER_GUTTER_PX, b9 as resolveImporterForFile, ba as getDocumentSectionsCanonical, bb as getDocumentParagraphsCanonical, bc as getDocumentParagraphs, bd as getDocumentPageSettings, be as getTableCellContentWidthForParagraph, bf as on, bg as debounce, bh as unwrap, bi as perfTimer, bj as getRunTextBox, bk as createEditorDocument, bl as resolveResizedDimensions, bm as resolveTextBoxRenderHeight, bn as getToolbarStyleState, bo as getCachedCanvasImage, bp as measureParagraphMinContentWidthPx, bq as getEditableBlocksForZone, br as findParagraphLocation, bs as createSectionBoundaryParagraph, bt as normalizePageSettings, bu as DEFAULT_EDITOR_PAGE_SETTINGS, bv as markStart, bw as markEnd, bx as getParagraphEntries, by as getParagraphById, bz as createEditorFootnote, bA as createFootnoteReferenceRun, bB as renumberFootnotes, bC as getFootnoteDisplayMarker, bD as getHeadingLevel, bE as preciseFontModeVersion, bF as isPreciseFontModeEnabled, bG as resolveNamedTextStyle, bH as togglePreciseFontMode, bI as nextFontSizePt, bJ as previousFontSizePt, bK as fontSizePtToPx, bL as createDefaultToolbarPreset, bM as MenuRegistry, bN as createToolbarRegistry, bO as Editor, bP as resolveCommandRef, bQ as commandRefName, bR as createOasisEditorClient, bS as createEditorZoom, bT as startLongTaskObserver, bU as installGlobalReport, bV as applyStoredPreciseFontPreference, bW as getWelcomeSeen, bX as isLocalFontAccessSupported, bY as EDITOR_SCROLL_PADDING_PX, bZ as Toolbar, b_ as OasisEditorLoading, b$ as I18nProvider, c0 as createTranslator, c1 as createEditorLogger, c2 as registerDomStatsSurface } from "./index-Ds5uOUe8.js";
+import { v as visitRun, a as assertNever, c as createSignal, b as createEditorStateFromDocument, d as createInitialEditorState, S as STANDARD_FONT_SIZES_PT, f as fontSizePxToPt, p as probeLocalFontFamilies, e as createEditorParagraphFromRuns, i as isInlineObjectRun, g as createEditorStyledRun, h as getParagraphLength, j as getParagraphText, k as getActiveZone, l as getDocumentSections, m as getActiveSectionIndex, n as getParagraphs, o as normalizeSelection, q as positionToParagraphOffset, r as paragraphOffsetToPosition, s as clampPosition, t as findParagraphIndex, u as createCollapsedSelection, w as isSelectionCollapsed, x as parseFontSizePtToPx, y as formatFontSizePt, z as createEditorParagraph, A as getBlockParagraphs, B as findParagraphTableLocation, C as buildTableCellLayout, P as PT_PER_PX, D as createEditorTableCell, E as createEditorTableRow, F as createEditorTable, G as underlineStyleToCssDecorationStyle, H as resolveImageSrc, I as listKindForTag, J as isParagraphTag, K as collectInlineRuns, L as parseParagraphStyle, M as getRunImage, N as InlineShell, O as BalloonShell, Q as DocumentShell, R as createMemo, T as buildCanvasLayoutSnapshot, U as getCaretRectFromSnapshot, V as getParagraphRectFromSnapshot, W as createComponent, X as CaretOverlay, Y as Show, Z as createRenderEffect, _ as style, $ as setAttribute, a0 as setStyleProperty, a1 as memo, a2 as template, a3 as useI18n, a4 as createEffect, a5 as insert, a6 as use, a7 as addEventListener, a8 as Dialog, a9 as delegateEvents, aa as className, ab as For, ac as UNDERLINE_STYLE_OPTIONS, ad as Tabs, ae as onMount, af as onCleanup, ag as PluginUiHost, ah as OasisEditorEditor, ai as OasisBrandMark, aj as setPreciseFontPreference, ak as setWelcomeSeen, al as enablePreciseFontMode, am as TWIPS_PER_POINT, an as PX_PER_INCH, ao as TWIPS_PER_INCH, ap as resolveEffectiveParagraphStyle, aq as resolveEffectiveTextStyleForParagraph, ar as EMU_PER_PX, as as EMU_PER_PT, at as getRunFootnoteReference, au as getRunEndnoteReference, av as iterateFootnoteReferenceRuns, aw as iterateEndnoteReferenceRuns, ax as imageContentTypeDefaults, ay as getRunFieldChar, az as getRunFieldInstruction, aA as createEditorRun, aB as JSZip, aC as imageExtensionFromMime, aD as pxToPt$1, aE as resolveFloatingObjectRect, aF as getTextBoxFloatingGeometry, aG as getPresetPathSegments, aH as projectBlocksLayout, aI as buildListLabels, aJ as getImageFloatingGeometry, aK as textStyleToFontSizePt, aL as PX_PER_POINT, aM as DEFAULT_FONT_SIZE_PX, aN as isDoubleUnderlineStyle, aO as isWavyUnderlineStyle, aP as underlineStyleLineWidthPx, aQ as underlineStyleDashArray, aR as resolveListLabel, aS as getListLabelInset, aT as getAlignedListLabelInset, aU as getParagraphBorderInsets, aV as buildSegmentTable, aW as buildCanvasTableLayout, aX as resolveCanvasTableWidth, aY as resolveFloatingTableRect, aZ as normalizeFamily, a_ as ROBOTO_FONT_FILES, a$ as loadFontAsset, b0 as OFFICE_COMPAT_FONT_FAMILIES, b1 as buildSfnt, b2 as defaultFontDecoderRegistry, b3 as SfntFontProgram, b4 as collectPdfFontFamilies, b5 as projectDocumentLayout, b6 as getPageContentWidth, b7 as getPageHeaderZoneTop, b8 as getPageBodyTop, b9 as getPageColumnRects, ba as findFootnoteReference, bb as FOOTNOTE_MARKER_GUTTER_PX, bc as resolveImporterForFile, bd as getDocumentSectionsCanonical, be as getDocumentParagraphsCanonical, bf as getDocumentParagraphs, bg as getDocumentPageSettings, bh as getTableCellContentWidthForParagraph, bi as on, bj as debounce, bk as unwrap, bl as perfTimer, bm as getRunTextBox, bn as createEditorDocument, bo as resolveResizedDimensions, bp as resolveTextBoxRenderHeight, bq as getToolbarStyleState, br as getCachedCanvasImage, bs as measureParagraphMinContentWidthPx, bt as getEditableBlocksForZone, bu as findParagraphLocation, bv as createSectionBoundaryParagraph, bw as normalizePageSettings, bx as DEFAULT_EDITOR_PAGE_SETTINGS, by as markStart, bz as markEnd, bA as getParagraphEntries, bB as getParagraphById, bC as createEditorFootnote, bD as createFootnoteReferenceRun, bE as renumberFootnotes, bF as getFootnoteDisplayMarker, bG as getHeadingLevel, bH as preciseFontModeVersion, bI as isPreciseFontModeEnabled, bJ as resolveNamedTextStyle, bK as togglePreciseFontMode, bL as nextFontSizePt, bM as previousFontSizePt, bN as fontSizePtToPx, bO as createDefaultToolbarPreset, bP as MenuRegistry, bQ as createToolbarRegistry, bR as Editor, bS as resolveCommandRef, bT as commandRefName, bU as createOasisEditorClient, bV as createEditorZoom, bW as startLongTaskObserver, bX as installGlobalReport, bY as applyStoredPreciseFontPreference, bZ as getWelcomeSeen, b_ as isLocalFontAccessSupported, b$ as EDITOR_SCROLL_PADDING_PX, c0 as Toolbar, c1 as OasisEditorLoading, c2 as I18nProvider, c3 as createTranslator, c4 as createEditorLogger, c5 as registerDomStatsSurface } from "./index-DcElQi6c.js";
 function cloneStyle(style2) {
   return style2 ? { ...style2 } : void 0;
 }
@@ -113,20 +113,49 @@ function cloneBlocks(blocks) {
             ...block.style,
             defaultCellMargins: block.style.defaultCellMargins ? { ...block.style.defaultCellMargins } : void 0,
             floating: block.style.floating ? { ...block.style.floating } : void 0,
-            revisionXml: block.style.revisionXml ? [...block.style.revisionXml] : void 0
+            revision: block.style.revision ? {
+              ...block.style.revision,
+              previous: { ...block.style.revision.previous }
+            } : void 0
+          } : void 0,
+          gridRevision: block.gridRevision ? {
+            ...block.gridRevision,
+            previous: [...block.gridRevision.previous]
           } : void 0,
-          tblGridChangeXml: block.tblGridChangeXml,
           rows: block.rows.map((row) => ({
             ...row,
+            conditionalStyle: row.conditionalStyle ? { ...row.conditionalStyle } : void 0,
             style: row.style ? {
               ...row.style,
-              revisionXml: row.style.revisionXml ? [...row.style.revisionXml] : void 0
+              revision: row.style.revision ? { ...row.style.revision } : void 0,
+              propertyRevision: row.style.propertyRevision ? {
+                ...row.style.propertyRevision,
+                previous: { ...row.style.propertyRevision.previous }
+              } : void 0
             } : void 0,
             cells: row.cells.map((cell) => ({
               ...cell,
+              conditionalStyle: cell.conditionalStyle ? { ...cell.conditionalStyle } : void 0,
+              mergeRevisionState: cell.mergeRevisionState ? {
+                ...cell.mergeRevisionState,
+                previousCells: cell.mergeRevisionState.previousCells.map(
+                  (previousCell) => ({
+                    ...previousCell,
+                    mergeRevisionState: void 0,
+                    style: previousCell.style ? { ...previousCell.style } : void 0,
+                    blocks: cloneParagraphs(previousCell.blocks)
+                  })
+                )
+              } : void 0,
               style: cell.style ? {
                 ...cell.style,
-                revisionXml: cell.style.revisionXml ? [...cell.style.revisionXml] : void 0
+                revision: cell.style.revision ? { ...cell.style.revision } : void 0,
+                propertyRevision: cell.style.propertyRevision ? {
+                  ...cell.style.propertyRevision,
+                  previous: {
+                    ...cell.style.propertyRevision.previous
+                  }
+                } : void 0
               } : void 0,
               blocks: cloneParagraphs(cell.blocks)
             }))
@@ -153,23 +182,54 @@ function cloneBlock(block) {
           ...block.style,
           defaultCellMargins: block.style.defaultCellMargins ? { ...block.style.defaultCellMargins } : void 0,
           floating: block.style.floating ? { ...block.style.floating } : void 0,
-          revisionXml: block.style.revisionXml ? [...block.style.revisionXml] : void 0
+          revision: block.style.revision ? {
+            ...block.style.revision,
+            previous: { ...block.style.revision.previous }
+          } : void 0
+        } : void 0,
+        gridRevision: block.gridRevision ? {
+          ...block.gridRevision,
+          previous: [...block.gridRevision.previous]
         } : void 0,
-        tblGridChangeXml: block.tblGridChangeXml,
         rows: block.rows.map((row) => ({
           ...row,
+          conditionalStyle: row.conditionalStyle ? { ...row.conditionalStyle } : void 0,
           style: row.style ? {
             ...row.style,
-            revisionXml: row.style.revisionXml ? [...row.style.revisionXml] : void 0
+            revision: row.style.revision ? { ...row.style.revision } : void 0,
+            propertyRevision: row.style.propertyRevision ? {
+              ...row.style.propertyRevision,
+              previous: { ...row.style.propertyRevision.previous }
+            } : void 0
           } : void 0,
           cells: row.cells.map((cell) => ({
             ...cell,
+            conditionalStyle: cell.conditionalStyle ? { ...cell.conditionalStyle } : void 0,
+            mergeRevisionState: cell.mergeRevisionState ? {
+              ...cell.mergeRevisionState,
+              previousCells: cell.mergeRevisionState.previousCells.map(
+                (previousCell) => ({
+                  ...previousCell,
+                  mergeRevisionState: void 0,
+                  style: previousCell.style ? { ...previousCell.style } : void 0,
+                  blocks: previousCell.blocks.map(
+                    (paragraph) => cloneBlock(paragraph)
+                  )
+                })
+              )
+            } : void 0,
             colSpan: cell.colSpan ?? void 0,
             rowSpan: cell.rowSpan ?? void 0,
             vMerge: cell.vMerge ?? void 0,
             style: cell.style ? {
               ...cell.style,
-              revisionXml: cell.style.revisionXml ? [...cell.style.revisionXml] : void 0
+              revision: cell.style.revision ? { ...cell.style.revision } : void 0,
+              propertyRevision: cell.style.propertyRevision ? {
+                ...cell.style.propertyRevision,
+                previous: {
+                  ...cell.style.propertyRevision.previous
+                }
+              } : void 0
             } : void 0,
             blocks: cell.blocks.map((paragraph) => ({
               ...paragraph,
@@ -26566,6 +26626,17 @@ function createEditorDialogs() {
       tableIndentLeft: "",
       tableWrapping: "none",
       floatingSummary: "",
+      floatingHorizontalAnchor: "margin",
+      floatingVerticalAnchor: "text",
+      floatingX: "0",
+      floatingY: "0",
+      floatingXAlign: "",
+      floatingYAlign: "",
+      floatingDistanceTop: "0",
+      floatingDistanceRight: "0",
+      floatingDistanceBottom: "0",
+      floatingDistanceLeft: "0",
+      floatingOverlap: "overlap",
       rowHeight: "",
       rowHeightRule: "",
       repeatHeader: false,
@@ -26589,6 +26660,10 @@ function createEditorDialogs() {
       borderRight: false,
       borderBottom: false,
       borderLeft: false,
+      borderStart: false,
+      borderEnd: false,
+      borderTopLeftToBottomRight: false,
+      borderTopRightToBottomLeft: false,
       shading: "",
       altTitle: "",
       altDescription: ""
@@ -28546,6 +28621,13 @@ function createParagraphDialogBridge(deps) {
     applyParagraphDialogValues
   };
 }
+function createTableRevisionMetadata() {
+  return {
+    id: `rev:${Math.random().toString(36).slice(2, 9)}`,
+    author: "User",
+    date: Date.now()
+  };
+}
 function patchStyleValue(style2, key, value) {
   const nextStyle = { ...style2 ?? {} };
   if (value === null) {
@@ -28720,10 +28802,20 @@ function setTableCellStyleValue(state, key, value) {
       selectedParagraphIds.add(id);
     }
   }
-  const updateCell = (cell) => ({
-    ...cell,
-    style: patchStyleValue(cell.style, key, value)
-  });
+  const updateCell = (cell) => {
+    let style2 = cell.style;
+    if (state.trackChangesEnabled && key !== "revision" && key !== "propertyRevision" && !(style2 == null ? void 0 : style2.propertyRevision)) {
+      style2 = {
+        ...style2 ?? {},
+        propertyRevision: {
+          ...createTableRevisionMetadata(),
+          type: "property",
+          previous: { ...style2 ?? {} }
+        }
+      };
+    }
+    return { ...cell, style: patchStyleValue(style2, key, value) };
+  };
   const nextSections = getDocumentSections(state.document).map((section) => ({
     ...section,
     blocks: updateTableCellsInBlocks(
@@ -28771,10 +28863,20 @@ function collectLinearSelectedParagraphIds(state) {
 }
 function setTableStyleValue(state, key, value) {
   const selectedParagraphIds = collectLinearSelectedParagraphIds(state);
-  const updateTable = (table) => ({
-    ...table,
-    style: patchStyleValue(table.style, key, value)
-  });
+  const updateTable = (table) => {
+    let style2 = table.style;
+    if (state.trackChangesEnabled && key !== "revision" && !(style2 == null ? void 0 : style2.revision)) {
+      style2 = {
+        ...style2 ?? {},
+        revision: {
+          ...createTableRevisionMetadata(),
+          type: "property",
+          previous: { ...style2 ?? {} }
+        }
+      };
+    }
+    return { ...table, style: patchStyleValue(style2, key, value) };
+  };
   const updateBlocks = (blocks) => {
     return blocks.map((block) => {
       if (block.type === "paragraph") return block;
@@ -28798,9 +28900,20 @@ function setTableStyleValue(state, key, value) {
 function setActiveTableStyleValue(state, tableId, key, value) {
   const updateTable = (table) => {
     if (table.id !== tableId) return table;
+    let style2 = table.style;
+    if (state.trackChangesEnabled && key !== "revision" && !(style2 == null ? void 0 : style2.revision)) {
+      style2 = {
+        ...style2 ?? {},
+        revision: {
+          ...createTableRevisionMetadata(),
+          type: "property",
+          previous: { ...style2 ?? {} }
+        }
+      };
+    }
     return {
       ...table,
-      style: patchStyleValue(table.style, key, value)
+      style: patchStyleValue(style2, key, value)
     };
   };
   return updateStateSections(
@@ -28813,7 +28926,20 @@ function setSelectedTableRowStyleValue(state, key, value) {
   if (!target) return state;
   const updateTable = (table) => {
     const nextRows = table.rows.map(
-      (row, rowIndex) => rowIndex === target.loc.rowIndex ? { ...row, style: patchStyleValue(row.style, key, value) } : row
+      (row, rowIndex) => rowIndex === target.loc.rowIndex ? (() => {
+        let style2 = row.style;
+        if (state.trackChangesEnabled && key !== "revision" && key !== "propertyRevision" && !(style2 == null ? void 0 : style2.propertyRevision)) {
+          style2 = {
+            ...style2 ?? {},
+            propertyRevision: {
+              ...createTableRevisionMetadata(),
+              type: "property",
+              previous: { ...style2 ?? {} }
+            }
+          };
+        }
+        return { ...row, style: patchStyleValue(style2, key, value) };
+      })() : row
     );
     return { ...table, rows: nextRows };
   };
@@ -28824,9 +28950,26 @@ function setSelectedTableRowHeader(state, value) {
   if (!target) return state;
   const updateTable = (table) => ({
     ...table,
-    rows: table.rows.map(
-      (row, rowIndex) => rowIndex === target.loc.rowIndex ? { ...row, isHeader: value === null ? void 0 : value } : row
-    )
+    rows: table.rows.map((row, rowIndex) => {
+      if (rowIndex !== target.loc.rowIndex) return row;
+      let style2 = row.style;
+      if (state.trackChangesEnabled && !(style2 == null ? void 0 : style2.propertyRevision)) {
+        style2 = {
+          ...style2 ?? {},
+          propertyRevision: {
+            ...createTableRevisionMetadata(),
+            type: "property",
+            previous: { ...style2 ?? {}, isHeader: row.isHeader }
+          }
+        };
+      }
+      const isHeader = value === null ? void 0 : value;
+      return {
+        ...row,
+        isHeader,
+        style: patchStyleValue(style2, "isHeader", isHeader ?? null)
+      };
+    })
   });
   return updateActiveTableBlocks(state, updateTable);
 }
@@ -28836,9 +28979,20 @@ function setTableRowHeight(state, tableId, rowIndex, height) {
     const nextRows = [...table.rows];
     const row = nextRows[rowIndex];
     if (row) {
+      let style2 = row.style;
+      if (state.trackChangesEnabled && !(style2 == null ? void 0 : style2.propertyRevision)) {
+        style2 = {
+          ...style2 ?? {},
+          propertyRevision: {
+            ...createTableRevisionMetadata(),
+            type: "property",
+            previous: { ...style2 ?? {} }
+          }
+        };
+      }
       nextRows[rowIndex] = {
         ...row,
-        style: patchStyleValue(row.style, "height", height)
+        style: patchStyleValue(style2, "height", height)
       };
     }
     return { ...table, rows: nextRows };
@@ -28904,6 +29058,7 @@ function setTableColumnWidths(state, tableId, columnWidths, tableWidth, tableInd
     }
     const nextRows = table.rows.map((row, rowIndex) => {
       const nextCells = row.cells.map((cell, cellIndex) => {
+        var _a2, _b;
         const entry = tableLayout.find(
           (item) => item.rowIndex === rowIndex && item.cellIndex === cellIndex
         );
@@ -28911,11 +29066,17 @@ function setTableColumnWidths(state, tableId, columnWidths, tableWidth, tableInd
         const rightVisualColumnIndex = entry.visualColumnIndex + entry.colSpan - 1;
         const newWidth = columnWidths[rightVisualColumnIndex];
         if (newWidth !== void 0 && entry.colSpan === 1) {
+          const propertyRevision = state.trackChangesEnabled && !((_a2 = cell.style) == null ? void 0 : _a2.propertyRevision) ? {
+            ...createTableRevisionMetadata(),
+            type: "property",
+            previous: { ...cell.style ?? {} }
+          } : (_b = cell.style) == null ? void 0 : _b.propertyRevision;
           return {
             ...cell,
             style: {
               ...cell.style ?? {},
-              width: typeof newWidth === "number" ? newWidth : newWidth
+              width: typeof newWidth === "number" ? newWidth : newWidth,
+              ...propertyRevision ? { propertyRevision } : {}
             }
           };
         }
@@ -28924,6 +29085,13 @@ function setTableColumnWidths(state, tableId, columnWidths, tableWidth, tableInd
       return { ...row, cells: nextCells };
     });
     const nextStyle = { ...table.style ?? {} };
+    if (state.trackChangesEnabled && !nextStyle.revision && (tableWidth !== void 0 || tableIndentLeft !== void 0)) {
+      nextStyle.revision = {
+        ...createTableRevisionMetadata(),
+        type: "property",
+        previous: { ...table.style ?? {} }
+      };
+    }
     if (tableWidth !== void 0) {
       nextStyle.width = tableWidth;
     }
@@ -28934,6 +29102,11 @@ function setTableColumnWidths(state, tableId, columnWidths, tableWidth, tableInd
       ...table,
       rows: nextRows,
       gridCols: hasGridOverride && canResolveGrid ? nextGridCols : table.gridCols,
+      gridRevision: state.trackChangesEnabled && hasGridOverride && canResolveGrid && !table.gridRevision ? {
+        ...createTableRevisionMetadata(),
+        type: "grid",
+        previous: [...table.gridCols ?? []]
+      } : table.gridRevision,
       style: Object.keys(nextStyle).length > 0 ? nextStyle : void 0
     };
   };
@@ -28944,6 +29117,7 @@ function setTableColumnWidths(state, tableId, columnWidths, tableWidth, tableInd
 }
 function insertTableAtSelection(state, rows, cols) {
   const initialCellWidth = `${100 / Math.max(1, cols)}%`;
+  const insertionRevision = state.trackChangesEnabled ? createTableRevisionMetadata() : void 0;
   const tableRows = [];
   for (let rowIndex = 0; rowIndex < rows; rowIndex += 1) {
     const cells = [];
@@ -28955,7 +29129,13 @@ function insertTableAtSelection(state, rows, cols) {
         }
       });
     }
-    tableRows.push(createEditorTableRow(cells));
+    const row = createEditorTableRow(cells);
+    if (insertionRevision) {
+      row.style = {
+        revision: { ...insertionRevision, type: "insert" }
+      };
+    }
+    tableRows.push(row);
   }
   const table = {
     ...createEditorTable(tableRows),
@@ -29026,6 +29206,17 @@ const EMPTY_INITIAL = {
   tableIndentLeft: "",
   tableWrapping: "none",
   floatingSummary: "",
+  floatingHorizontalAnchor: "margin",
+  floatingVerticalAnchor: "text",
+  floatingX: "0",
+  floatingY: "0",
+  floatingXAlign: "",
+  floatingYAlign: "",
+  floatingDistanceTop: "0",
+  floatingDistanceRight: "0",
+  floatingDistanceBottom: "0",
+  floatingDistanceLeft: "0",
+  floatingOverlap: "overlap",
   rowHeight: "",
   rowHeightRule: "",
   repeatHeader: false,
@@ -29049,6 +29240,10 @@ const EMPTY_INITIAL = {
   borderRight: false,
   borderBottom: false,
   borderLeft: false,
+  borderStart: false,
+  borderEnd: false,
+  borderTopLeftToBottomRight: false,
+  borderTopRightToBottomLeft: false,
   shading: "",
   altTitle: "",
   altDescription: ""
@@ -29105,7 +29300,7 @@ function buildFloatingSummary(table) {
   return Object.entries(floating).map(([key, value]) => `${key}=${value}`).join(", ");
 }
 function buildInitialValues(ctx, activeTab = "table") {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
   const tableWidth = serializeWidth((_a = ctx.table.style) == null ? void 0 : _a.width);
   const row = ctx.table.rows[ctx.rowIndex];
   const cell = row == null ? void 0 : row.cells[ctx.cellIndex];
@@ -29118,7 +29313,11 @@ function buildInitialValues(ctx, activeTab = "table") {
     style2.borderTop,
     style2.borderRight,
     style2.borderBottom,
-    style2.borderLeft
+    style2.borderLeft,
+    style2.borderStart,
+    style2.borderEnd,
+    style2.borderTopLeftToBottomRight,
+    style2.borderTopRightToBottomLeft
   ].filter(isVisibleBorder);
   const sharedBorder = candidateBorders[0];
   const floatingSummary = buildFloatingSummary(ctx.table);
@@ -29131,11 +29330,26 @@ function buildInitialValues(ctx, activeTab = "table") {
     tableIndentLeft: serializeWidth((_f = ctx.table.style) == null ? void 0 : _f.indentLeft).value,
     tableWrapping: floatingSummary ? "around" : "none",
     floatingSummary,
+    floatingHorizontalAnchor: ((_h = (_g = ctx.table.style) == null ? void 0 : _g.floating) == null ? void 0 : _h.horizontalAnchor) ?? "margin",
+    floatingVerticalAnchor: ((_j = (_i = ctx.table.style) == null ? void 0 : _i.floating) == null ? void 0 : _j.verticalAnchor) ?? "text",
+    floatingX: ((_l = (_k = ctx.table.style) == null ? void 0 : _k.floating) == null ? void 0 : _l.x) != null ? String(ctx.table.style.floating.x) : "0",
+    floatingY: ((_n = (_m = ctx.table.style) == null ? void 0 : _m.floating) == null ? void 0 : _n.y) != null ? String(ctx.table.style.floating.y) : "0",
+    floatingXAlign: ((_p = (_o = ctx.table.style) == null ? void 0 : _o.floating) == null ? void 0 : _p.xAlign) ?? "",
+    floatingYAlign: ((_r = (_q = ctx.table.style) == null ? void 0 : _q.floating) == null ? void 0 : _r.yAlign) ?? "",
+    floatingDistanceTop: String(((_t = (_s = ctx.table.style) == null ? void 0 : _s.floating) == null ? void 0 : _t.distanceTop) ?? 0),
+    floatingDistanceRight: String(
+      ((_v = (_u = ctx.table.style) == null ? void 0 : _u.floating) == null ? void 0 : _v.distanceRight) ?? 0
+    ),
+    floatingDistanceBottom: String(
+      ((_x = (_w = ctx.table.style) == null ? void 0 : _w.floating) == null ? void 0 : _x.distanceBottom) ?? 0
+    ),
+    floatingDistanceLeft: String(((_z = (_y = ctx.table.style) == null ? void 0 : _y.floating) == null ? void 0 : _z.distanceLeft) ?? 0),
+    floatingOverlap: ((_A = ctx.table.style) == null ? void 0 : _A.tblOverlap) ?? "overlap",
     rowHeight: rowHeight.value,
-    rowHeightRule: ((_g = row == null ? void 0 : row.style) == null ? void 0 : _g.heightRule) ?? "",
+    rowHeightRule: ((_B = row == null ? void 0 : row.style) == null ? void 0 : _B.heightRule) ?? "",
     repeatHeader: Boolean(row == null ? void 0 : row.isHeader),
-    allowBreakAcrossPages: ((_h = row == null ? void 0 : row.style) == null ? void 0 : _h.cantSplit) !== true,
-    hiddenRow: ((_i = row == null ? void 0 : row.style) == null ? void 0 : _i.hidden) === true,
+    allowBreakAcrossPages: ((_C = row == null ? void 0 : row.style) == null ? void 0 : _C.cantSplit) !== true,
+    hiddenRow: ((_D = row == null ? void 0 : row.style) == null ? void 0 : _D.hidden) === true,
     columnWidth: columnWidth.value,
     cellWidth: cellWidth.value,
     cellVerticalAlign: style2.verticalAlign ?? "",
@@ -29154,9 +29368,17 @@ function buildInitialValues(ctx, activeTab = "table") {
     borderRight: isVisibleBorder(style2.borderRight),
     borderBottom: isVisibleBorder(style2.borderBottom),
     borderLeft: isVisibleBorder(style2.borderLeft),
+    borderStart: isVisibleBorder(style2.borderStart),
+    borderEnd: isVisibleBorder(style2.borderEnd),
+    borderTopLeftToBottomRight: isVisibleBorder(
+      style2.borderTopLeftToBottomRight
+    ),
+    borderTopRightToBottomLeft: isVisibleBorder(
+      style2.borderTopRightToBottomLeft
+    ),
     shading: style2.shading ?? "",
-    altTitle: ((_j = ctx.table.style) == null ? void 0 : _j.altTitle) ?? "",
-    altDescription: ((_k = ctx.table.style) == null ? void 0 : _k.altDescription) ?? ""
+    altTitle: ((_E = ctx.table.style) == null ? void 0 : _E.altTitle) ?? "",
+    altDescription: ((_F = ctx.table.style) == null ? void 0 : _F.altDescription) ?? ""
   };
 }
 function setCellStyle(state, key, value) {
@@ -29174,14 +29396,36 @@ function applyTableProperties(state, values) {
   const ctx = resolveActiveTableContext(state);
   if (!ctx) return state;
   let next = state;
-  next = setActiveTableStyleValue(next, ctx.tableId, "width", values.tableWidth);
-  next = setActiveTableStyleValue(next, ctx.tableId, "align", values.tableAlign);
+  next = setActiveTableStyleValue(
+    next,
+    ctx.tableId,
+    "width",
+    values.tableWidth
+  );
+  next = setActiveTableStyleValue(
+    next,
+    ctx.tableId,
+    "align",
+    values.tableAlign
+  );
   next = setActiveTableStyleValue(
     next,
     ctx.tableId,
     "indentLeft",
     values.tableIndentLeft
   );
+  next = setActiveTableStyleValue(
+    next,
+    ctx.tableId,
+    "floating",
+    values.tableFloating
+  );
+  next = setActiveTableStyleValue(
+    next,
+    ctx.tableId,
+    "tblOverlap",
+    values.tableOverlap
+  );
   next = setActiveTableStyleValue(
     next,
     ctx.tableId,
@@ -29222,6 +29466,18 @@ function applyTableProperties(state, values) {
   next = setCellStyle(next, "borderRight", values.borders.right);
   next = setCellStyle(next, "borderBottom", values.borders.bottom);
   next = setCellStyle(next, "borderLeft", values.borders.left);
+  next = setCellStyle(next, "borderStart", values.borders.start);
+  next = setCellStyle(next, "borderEnd", values.borders.end);
+  next = setCellStyle(
+    next,
+    "borderTopLeftToBottomRight",
+    values.borders.topLeftToBottomRight
+  );
+  next = setCellStyle(
+    next,
+    "borderTopRightToBottomLeft",
+    values.borders.topRightToBottomLeft
+  );
   next = setCellStyle(next, "shading", values.shading);
   return next;
 }
@@ -31619,7 +31875,7 @@ function ParagraphDialog(props) {
   });
 }
 delegateEvents(["input", "click"]);
-var _tmpl$$5 = /* @__PURE__ */ template(`<div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><input type=number class=oasis-editor-dialog-input min=0 step=1>`), _tmpl$2$1 = /* @__PURE__ */ template(`<label class=oasis-editor-dialog-style-toggle><input type=checkbox>`), _tmpl$3$1 = /* @__PURE__ */ template(`<button class="oasis-editor-dialog-button oasis-editor-dialog-button-secondary"data-testid=editor-table-properties-cancel>`), _tmpl$4$1 = /* @__PURE__ */ template(`<button class="oasis-editor-dialog-button oasis-editor-dialog-button-primary"data-testid=editor-table-properties-apply>`), _tmpl$5$1 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-row><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-table-width-unit><option value=points></option><option value=percent></option></select></div></div></fieldset><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-style-row></div><div class=oasis-editor-dialog-row></div></fieldset><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-style-row><button type=button class="oasis-editor-dialog-button oasis-editor-dialog-button-secondary"disabled data-testid=editor-table-properties-positioning></button></div><div class=oasis-editor-dialog-help-text>`), _tmpl$6$1 = /* @__PURE__ */ template(`<label class=oasis-editor-dialog-style-toggle><input type=radio name=table-align>`), _tmpl$7 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><div class=oasis-editor-dialog-row><div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-row-height-rule><option value></option><option value=atLeast></option><option value=exact></option></select></div></div><div class=oasis-editor-dialog-style-row>`), _tmpl$8 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><div class=oasis-editor-dialog-row>`), _tmpl$9 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><div class=oasis-editor-dialog-row><div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-cell-valign><option value></option><option value=top></option><option value=middle></option><option value=bottom></option></select></div><div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-cell-direction><option value></option><option value=lrTb>lrTb</option><option value=tbRl>tbRl</option><option value=btLr>btLr</option><option value=lrTbV>lrTbV</option><option value=tbRlV>tbRlV</option></select></div></div><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-style-row></div></fieldset><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-row></div></fieldset><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-row><div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-border-style><option value=none></option><option value=solid></option><option value=dashed></option><option value=dotted></option></select></div><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><input type=color class=oasis-editor-dialog-input data-testid=editor-table-properties-border-color></div><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><input type=color class=oasis-editor-dialog-input data-testid=editor-table-properties-shading></div></div><div class=oasis-editor-dialog-style-row></div><div class=oasis-editor-table-properties-cell-preview data-testid=editor-table-properties-cell-preview>`), _tmpl$0 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><input class=oasis-editor-dialog-input data-testid=editor-table-properties-alt-title></div><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><textarea class="oasis-editor-dialog-input oasis-editor-table-properties-textarea"data-testid=editor-table-properties-alt-description>`);
+var _tmpl$$5 = /* @__PURE__ */ template(`<div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><input type=number class=oasis-editor-dialog-input step=1>`), _tmpl$2$1 = /* @__PURE__ */ template(`<label class=oasis-editor-dialog-style-toggle><input type=checkbox>`), _tmpl$3$1 = /* @__PURE__ */ template(`<button class="oasis-editor-dialog-button oasis-editor-dialog-button-secondary"data-testid=editor-table-properties-cancel>`), _tmpl$4$1 = /* @__PURE__ */ template(`<button class="oasis-editor-dialog-button oasis-editor-dialog-button-primary"data-testid=editor-table-properties-apply>`), _tmpl$5$1 = /* @__PURE__ */ template(`<div class=oasis-editor-dialog-row><label class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><span class=oasis-editor-dialog-label></span><select class=oasis-editor-dialog-input data-testid=editor-table-properties-floating-h-anchor><option value=margin></option><option value=page></option><option value=text></option></select></label><label class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><span class=oasis-editor-dialog-label></span><select class=oasis-editor-dialog-input data-testid=editor-table-properties-floating-v-anchor><option value=margin></option><option value=page></option><option value=text>`), _tmpl$6$1 = /* @__PURE__ */ template(`<div class=oasis-editor-dialog-row><label class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><span class=oasis-editor-dialog-label></span><select class=oasis-editor-dialog-input data-testid=editor-table-properties-floating-x-align><option value></option></select></label><label class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><span class=oasis-editor-dialog-label></span><select class=oasis-editor-dialog-input data-testid=editor-table-properties-floating-y-align><option value>`), _tmpl$7 = /* @__PURE__ */ template(`<div class=oasis-editor-dialog-row>`), _tmpl$8 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-row><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-table-width-unit><option value=points></option><option value=percent></option></select></div></div></fieldset><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-style-row></div><div class=oasis-editor-dialog-row></div></fieldset><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-style-row>`), _tmpl$9 = /* @__PURE__ */ template(`<label class=oasis-editor-dialog-style-toggle><input type=radio name=table-align>`), _tmpl$0 = /* @__PURE__ */ template(`<option>`), _tmpl$1 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><div class=oasis-editor-dialog-row><div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-row-height-rule><option value></option><option value=atLeast></option><option value=exact></option></select></div></div><div class=oasis-editor-dialog-style-row>`), _tmpl$10 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><div class=oasis-editor-dialog-row>`), _tmpl$11 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><div class=oasis-editor-dialog-row><div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-cell-valign><option value></option><option value=top></option><option value=middle></option><option value=bottom></option></select></div><div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-cell-direction><option value></option><option value=lrTb>lrTb</option><option value=tbRl>tbRl</option><option value=btLr>btLr</option><option value=lrTbV>lrTbV</option><option value=tbRlV>tbRlV</option></select></div></div><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-style-row></div></fieldset><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-row></div></fieldset><fieldset class=oasis-editor-font-dialog-fieldset><legend></legend><div class=oasis-editor-dialog-row><div class="oasis-editor-dialog-input-group oasis-editor-dialog-input-group-grow"><label class=oasis-editor-dialog-label></label><select class=oasis-editor-dialog-input data-testid=editor-table-properties-border-style><option value=none></option><option value=solid></option><option value=dashed></option><option value=dotted></option></select></div><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><input type=color class=oasis-editor-dialog-input data-testid=editor-table-properties-border-color></div><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><input type=color class=oasis-editor-dialog-input data-testid=editor-table-properties-shading></div></div><div class=oasis-editor-dialog-style-row></div><div class=oasis-editor-table-properties-cell-preview data-testid=editor-table-properties-cell-preview>`), _tmpl$12 = /* @__PURE__ */ template(`<div class=oasis-editor-table-properties-panel><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><input class=oasis-editor-dialog-input data-testid=editor-table-properties-alt-title></div><div class=oasis-editor-dialog-input-group><label class=oasis-editor-dialog-label></label><textarea class="oasis-editor-dialog-input oasis-editor-table-properties-textarea"data-testid=editor-table-properties-alt-description>`);
 const DEFAULT_BORDER_WIDTH_PT = 0.5;
 const DEFAULT_BORDER_COLOR = "#000000";
 function parseNumber(value) {
@@ -31649,6 +31905,17 @@ function TablePropertiesDialog(props) {
   const [tableAlign, setTableAlign] = createSignal("");
   const [tableIndentLeft, setTableIndentLeft] = createSignal("");
   const [tableWrapping, setTableWrapping] = createSignal("none");
+  const [floatingHorizontalAnchor, setFloatingHorizontalAnchor] = createSignal("margin");
+  const [floatingVerticalAnchor, setFloatingVerticalAnchor] = createSignal("text");
+  const [floatingX, setFloatingX] = createSignal("");
+  const [floatingY, setFloatingY] = createSignal("");
+  const [floatingXAlign, setFloatingXAlign] = createSignal("");
+  const [floatingYAlign, setFloatingYAlign] = createSignal("");
+  const [floatingDistanceTop, setFloatingDistanceTop] = createSignal("");
+  const [floatingDistanceRight, setFloatingDistanceRight] = createSignal("");
+  const [floatingDistanceBottom, setFloatingDistanceBottom] = createSignal("");
+  const [floatingDistanceLeft, setFloatingDistanceLeft] = createSignal("");
+  const [floatingOverlap, setFloatingOverlap] = createSignal("overlap");
   const [rowHeight, setRowHeight] = createSignal("");
   const [rowHeightRule, setRowHeightRule] = createSignal("");
   const [repeatHeader, setRepeatHeader] = createSignal(false);
@@ -31672,6 +31939,10 @@ function TablePropertiesDialog(props) {
   const [borderRight, setBorderRight] = createSignal(false);
   const [borderBottom, setBorderBottom] = createSignal(false);
   const [borderLeft, setBorderLeft] = createSignal(false);
+  const [borderStart, setBorderStart] = createSignal(false);
+  const [borderEnd, setBorderEnd] = createSignal(false);
+  const [borderTlBr, setBorderTlBr] = createSignal(false);
+  const [borderTrBl, setBorderTrBl] = createSignal(false);
   const [shading, setShading] = createSignal("");
   const [altTitle, setAltTitle] = createSignal("");
   const [altDescription, setAltDescription] = createSignal("");
@@ -31683,6 +31954,17 @@ function TablePropertiesDialog(props) {
     setTableAlign(props.initial.tableAlign);
     setTableIndentLeft(props.initial.tableIndentLeft);
     setTableWrapping(props.initial.tableWrapping);
+    setFloatingHorizontalAnchor(props.initial.floatingHorizontalAnchor);
+    setFloatingVerticalAnchor(props.initial.floatingVerticalAnchor);
+    setFloatingX(props.initial.floatingX);
+    setFloatingY(props.initial.floatingY);
+    setFloatingXAlign(props.initial.floatingXAlign);
+    setFloatingYAlign(props.initial.floatingYAlign);
+    setFloatingDistanceTop(props.initial.floatingDistanceTop);
+    setFloatingDistanceRight(props.initial.floatingDistanceRight);
+    setFloatingDistanceBottom(props.initial.floatingDistanceBottom);
+    setFloatingDistanceLeft(props.initial.floatingDistanceLeft);
+    setFloatingOverlap(props.initial.floatingOverlap);
     setRowHeight(props.initial.rowHeight);
     setRowHeightRule(props.initial.rowHeightRule);
     setRepeatHeader(props.initial.repeatHeader);
@@ -31706,6 +31988,10 @@ function TablePropertiesDialog(props) {
     setBorderRight(props.initial.borderRight);
     setBorderBottom(props.initial.borderBottom);
     setBorderLeft(props.initial.borderLeft);
+    setBorderStart(props.initial.borderStart);
+    setBorderEnd(props.initial.borderEnd);
+    setBorderTlBr(props.initial.borderTopLeftToBottomRight);
+    setBorderTrBl(props.initial.borderTopRightToBottomLeft);
     setShading(props.initial.shading);
     setAltTitle(props.initial.altTitle);
     setAltDescription(props.initial.altDescription);
@@ -31727,6 +32013,25 @@ function TablePropertiesDialog(props) {
       tableWidth: parseWidth(tableWidth(), tableWidthUnit()),
       tableAlign: tableAlign() || null,
       tableIndentLeft: parseWidth(tableIndentLeft(), "points"),
+      tableFloating: tableWrapping() === "around" ? {
+        horizontalAnchor: floatingHorizontalAnchor(),
+        verticalAnchor: floatingVerticalAnchor(),
+        ...floatingXAlign() ? {
+          xAlign: floatingXAlign()
+        } : {
+          x: parseNumber(floatingX()) ?? 0
+        },
+        ...floatingYAlign() ? {
+          yAlign: floatingYAlign()
+        } : {
+          y: parseNumber(floatingY()) ?? 0
+        },
+        distanceTop: parseNumber(floatingDistanceTop()) ?? 0,
+        distanceRight: parseNumber(floatingDistanceRight()) ?? 0,
+        distanceBottom: parseNumber(floatingDistanceBottom()) ?? 0,
+        distanceLeft: parseNumber(floatingDistanceLeft()) ?? 0
+      } : null,
+      tableOverlap: tableWrapping() === "around" ? floatingOverlap() : null,
       rowHeight: parseWidth(rowHeight(), "points"),
       rowHeightRule: rowHeightRule() || null,
       repeatHeader: repeatHeader(),
@@ -31749,7 +32054,11 @@ function TablePropertiesDialog(props) {
         top: borderTop() ? border : null,
         right: borderRight() ? border : null,
         bottom: borderBottom() ? border : null,
-        left: borderLeft() ? border : null
+        left: borderLeft() ? border : null,
+        start: borderStart() ? border : null,
+        end: borderEnd() ? border : null,
+        topLeftToBottomRight: borderTlBr() ? border : null,
+        topRightToBottomLeft: borderTrBl() ? border : null
       },
       shading: shading().trim() || null,
       altTitle: altTitle().trim() || null,
@@ -31757,10 +32066,11 @@ function TablePropertiesDialog(props) {
     }, props.initial);
     props.onClose();
   };
-  const numericInput = (label, value, setter, testId, disabled = false) => (() => {
+  const numericInput = (label, value, setter, testId, disabled = false, allowNegative = false) => (() => {
     var _el$ = _tmpl$$5(), _el$2 = _el$.firstChild, _el$3 = _el$2.nextSibling;
     insert(_el$2, label);
     _el$3.$$input = (e) => setter(e.currentTarget.value);
+    setAttribute(_el$3, "min", allowNegative ? void 0 : "0");
     _el$3.disabled = disabled;
     setAttribute(_el$3, "data-testid", testId);
     createRenderEffect(() => _el$3.value = value());
@@ -31817,7 +32127,7 @@ function TablePropertiesDialog(props) {
             label: t("table.tabTable"),
             testId: "editor-table-properties-tab-table",
             panel: (() => {
-              var _el$8 = _tmpl$5$1(), _el$9 = _el$8.firstChild, _el$0 = _el$9.firstChild, _el$1 = _el$0.nextSibling, _el$10 = _el$1.firstChild, _el$11 = _el$10.firstChild, _el$12 = _el$11.nextSibling, _el$13 = _el$12.firstChild, _el$14 = _el$13.nextSibling, _el$15 = _el$9.nextSibling, _el$16 = _el$15.firstChild, _el$17 = _el$16.nextSibling, _el$18 = _el$17.nextSibling, _el$19 = _el$15.nextSibling, _el$20 = _el$19.firstChild, _el$21 = _el$20.nextSibling, _el$22 = _el$21.firstChild, _el$23 = _el$21.nextSibling;
+              var _el$8 = _tmpl$8(), _el$9 = _el$8.firstChild, _el$0 = _el$9.firstChild, _el$1 = _el$0.nextSibling, _el$10 = _el$1.firstChild, _el$11 = _el$10.firstChild, _el$12 = _el$11.nextSibling, _el$13 = _el$12.firstChild, _el$14 = _el$13.nextSibling, _el$15 = _el$9.nextSibling, _el$16 = _el$15.firstChild, _el$17 = _el$16.nextSibling, _el$18 = _el$17.nextSibling, _el$19 = _el$15.nextSibling, _el$20 = _el$19.firstChild, _el$21 = _el$20.nextSibling;
               insert(_el$0, () => t("table.sizeSection"));
               insert(_el$1, () => numericInput(t("table.preferredWidth"), tableWidth, setTableWidth, "editor-table-properties-table-width"), _el$10);
               insert(_el$11, () => t("table.measureIn"));
@@ -31826,19 +32136,72 @@ function TablePropertiesDialog(props) {
               insert(_el$14, () => t("table.percent"));
               insert(_el$16, () => t("table.alignmentSection"));
               insert(_el$17, () => ["left", "center", "right"].map((align) => (() => {
-                var _el$24 = _tmpl$6$1(), _el$25 = _el$24.firstChild;
-                _el$25.addEventListener("change", () => setTableAlign(align));
-                setAttribute(_el$25, "data-testid", `editor-table-properties-align-${align}`);
-                insert(_el$24, () => t(`table.align${align[0].toUpperCase()}${align.slice(1)}`), null);
-                createRenderEffect(() => _el$25.checked = tableAlign() === align);
-                return _el$24;
+                var _el$45 = _tmpl$9(), _el$46 = _el$45.firstChild;
+                _el$46.addEventListener("change", () => setTableAlign(align));
+                setAttribute(_el$46, "data-testid", `editor-table-properties-align-${align}`);
+                insert(_el$45, () => t(`table.align${align[0].toUpperCase()}${align.slice(1)}`), null);
+                createRenderEffect(() => _el$46.checked = tableAlign() === align);
+                return _el$45;
               })()));
               insert(_el$18, () => numericInput(t("table.indentFromLeft"), tableIndentLeft, setTableIndentLeft, "editor-table-properties-indent-left"));
               insert(_el$20, () => t("table.textWrappingSection"));
-              insert(_el$21, () => checkbox(t("table.wrapNone"), () => tableWrapping() === "none", () => setTableWrapping("none"), "editor-table-properties-wrap-none"), _el$22);
-              insert(_el$21, () => checkbox(t("table.wrapAround"), () => tableWrapping() === "around", () => setTableWrapping("around"), "editor-table-properties-wrap-around", !props.initial.floatingSummary), _el$22);
-              insert(_el$22, () => t("table.positioning"));
-              insert(_el$23, () => props.initial.floatingSummary || t("table.positioningReadOnly"));
+              insert(_el$21, () => checkbox(t("table.wrapNone"), () => tableWrapping() === "none", () => setTableWrapping("none"), "editor-table-properties-wrap-none"), null);
+              insert(_el$21, () => checkbox(t("table.wrapAround"), () => tableWrapping() === "around", () => setTableWrapping("around"), "editor-table-properties-wrap-around"), null);
+              insert(_el$19, createComponent(Show, {
+                get when() {
+                  return tableWrapping() === "around";
+                },
+                get children() {
+                  return [(() => {
+                    var _el$22 = _tmpl$5$1(), _el$23 = _el$22.firstChild, _el$24 = _el$23.firstChild, _el$25 = _el$24.nextSibling, _el$26 = _el$25.firstChild, _el$27 = _el$26.nextSibling, _el$28 = _el$27.nextSibling, _el$29 = _el$23.nextSibling, _el$30 = _el$29.firstChild, _el$31 = _el$30.nextSibling, _el$32 = _el$31.firstChild, _el$33 = _el$32.nextSibling, _el$34 = _el$33.nextSibling;
+                    insert(_el$24, () => t("table.horizontalAnchor"));
+                    _el$25.addEventListener("change", (e) => setFloatingHorizontalAnchor(e.currentTarget.value));
+                    insert(_el$26, () => t("table.anchorMargin"));
+                    insert(_el$27, () => t("table.anchorPage"));
+                    insert(_el$28, () => t("table.anchorText"));
+                    insert(_el$30, () => t("table.verticalAnchor"));
+                    _el$31.addEventListener("change", (e) => setFloatingVerticalAnchor(e.currentTarget.value));
+                    insert(_el$32, () => t("table.anchorMargin"));
+                    insert(_el$33, () => t("table.anchorPage"));
+                    insert(_el$34, () => t("table.anchorText"));
+                    createRenderEffect(() => _el$25.value = floatingHorizontalAnchor());
+                    createRenderEffect(() => _el$31.value = floatingVerticalAnchor());
+                    return _el$22;
+                  })(), (() => {
+                    var _el$35 = _tmpl$6$1(), _el$36 = _el$35.firstChild, _el$37 = _el$36.firstChild, _el$38 = _el$37.nextSibling, _el$39 = _el$38.firstChild, _el$40 = _el$36.nextSibling, _el$41 = _el$40.firstChild, _el$42 = _el$41.nextSibling, _el$43 = _el$42.firstChild;
+                    insert(_el$35, () => numericInput(t("table.positionX"), floatingX, setFloatingX, "editor-table-properties-floating-x", Boolean(floatingXAlign()), true), _el$36);
+                    insert(_el$35, () => numericInput(t("table.positionY"), floatingY, setFloatingY, "editor-table-properties-floating-y", Boolean(floatingYAlign()), true), _el$36);
+                    insert(_el$37, () => t("table.horizontalAlignment"));
+                    _el$38.addEventListener("change", (e) => setFloatingXAlign(e.currentTarget.value));
+                    insert(_el$39, () => t("table.explicitOffset"));
+                    insert(_el$38, () => ["left", "center", "right", "inside", "outside"].map((value) => (() => {
+                      var _el$47 = _tmpl$0();
+                      _el$47.value = value;
+                      insert(_el$47, value);
+                      return _el$47;
+                    })()), null);
+                    insert(_el$41, () => t("table.verticalAlignment"));
+                    _el$42.addEventListener("change", (e) => setFloatingYAlign(e.currentTarget.value));
+                    insert(_el$43, () => t("table.explicitOffset"));
+                    insert(_el$42, () => ["top", "center", "bottom", "inside", "outside"].map((value) => (() => {
+                      var _el$48 = _tmpl$0();
+                      _el$48.value = value;
+                      insert(_el$48, value);
+                      return _el$48;
+                    })()), null);
+                    createRenderEffect(() => _el$38.value = floatingXAlign());
+                    createRenderEffect(() => _el$42.value = floatingYAlign());
+                    return _el$35;
+                  })(), (() => {
+                    var _el$44 = _tmpl$7();
+                    insert(_el$44, () => numericInput(t("table.distanceTop"), floatingDistanceTop, setFloatingDistanceTop, "editor-table-properties-floating-distance-top"), null);
+                    insert(_el$44, () => numericInput(t("table.distanceRight"), floatingDistanceRight, setFloatingDistanceRight, "editor-table-properties-floating-distance-right"), null);
+                    insert(_el$44, () => numericInput(t("table.distanceBottom"), floatingDistanceBottom, setFloatingDistanceBottom, "editor-table-properties-floating-distance-bottom"), null);
+                    insert(_el$44, () => numericInput(t("table.distanceLeft"), floatingDistanceLeft, setFloatingDistanceLeft, "editor-table-properties-floating-distance-left"), null);
+                    return _el$44;
+                  })(), memo(() => checkbox(t("table.allowOverlap"), () => floatingOverlap() === "overlap", (value) => setFloatingOverlap(value ? "overlap" : "never"), "editor-table-properties-floating-overlap"))];
+                }
+              }), null);
               createRenderEffect(() => _el$12.value = tableWidthUnit());
               return _el$8;
             })()
@@ -31847,56 +32210,56 @@ function TablePropertiesDialog(props) {
             label: t("table.tabRow"),
             testId: "editor-table-properties-tab-row",
             panel: (() => {
-              var _el$26 = _tmpl$7(), _el$27 = _el$26.firstChild, _el$28 = _el$27.firstChild, _el$29 = _el$28.firstChild, _el$30 = _el$29.nextSibling, _el$31 = _el$30.firstChild, _el$32 = _el$31.nextSibling, _el$33 = _el$32.nextSibling, _el$34 = _el$27.nextSibling;
-              insert(_el$27, () => numericInput(t("table.rowHeight"), rowHeight, setRowHeight, "editor-table-properties-row-height"), _el$28);
-              insert(_el$29, () => t("table.rowHeightRule"));
-              _el$30.addEventListener("change", (e) => setRowHeightRule(e.currentTarget.value));
-              insert(_el$31, () => t("table.rowAuto"));
-              insert(_el$32, () => t("table.rowAtLeast"));
-              insert(_el$33, () => t("table.rowExactly"));
-              insert(_el$34, () => checkbox(t("table.repeatHeader"), repeatHeader, setRepeatHeader, "editor-table-properties-repeat-header"), null);
-              insert(_el$34, () => checkbox(t("table.allowBreakAcrossPages"), allowBreakAcrossPages, setAllowBreakAcrossPages, "editor-table-properties-allow-break"), null);
-              insert(_el$34, () => checkbox(t("table.hiddenRow"), hiddenRow, setHiddenRow, "editor-table-properties-hidden-row"), null);
-              createRenderEffect(() => _el$30.value = rowHeightRule());
-              return _el$26;
+              var _el$49 = _tmpl$1(), _el$50 = _el$49.firstChild, _el$51 = _el$50.firstChild, _el$52 = _el$51.firstChild, _el$53 = _el$52.nextSibling, _el$54 = _el$53.firstChild, _el$55 = _el$54.nextSibling, _el$56 = _el$55.nextSibling, _el$57 = _el$50.nextSibling;
+              insert(_el$50, () => numericInput(t("table.rowHeight"), rowHeight, setRowHeight, "editor-table-properties-row-height"), _el$51);
+              insert(_el$52, () => t("table.rowHeightRule"));
+              _el$53.addEventListener("change", (e) => setRowHeightRule(e.currentTarget.value));
+              insert(_el$54, () => t("table.rowAuto"));
+              insert(_el$55, () => t("table.rowAtLeast"));
+              insert(_el$56, () => t("table.rowExactly"));
+              insert(_el$57, () => checkbox(t("table.repeatHeader"), repeatHeader, setRepeatHeader, "editor-table-properties-repeat-header"), null);
+              insert(_el$57, () => checkbox(t("table.allowBreakAcrossPages"), allowBreakAcrossPages, setAllowBreakAcrossPages, "editor-table-properties-allow-break"), null);
+              insert(_el$57, () => checkbox(t("table.hiddenRow"), hiddenRow, setHiddenRow, "editor-table-properties-hidden-row"), null);
+              createRenderEffect(() => _el$53.value = rowHeightRule());
+              return _el$49;
             })()
           }, {
             id: "column",
             label: t("table.tabColumn"),
             testId: "editor-table-properties-tab-column",
             panel: (() => {
-              var _el$35 = _tmpl$8(), _el$36 = _el$35.firstChild;
-              insert(_el$36, () => numericInput(t("table.columnWidth"), columnWidth, setColumnWidth, "editor-table-properties-column-width"));
-              return _el$35;
+              var _el$58 = _tmpl$10(), _el$59 = _el$58.firstChild;
+              insert(_el$59, () => numericInput(t("table.columnWidth"), columnWidth, setColumnWidth, "editor-table-properties-column-width"));
+              return _el$58;
             })()
           }, {
             id: "cell",
             label: t("table.tabCell"),
             testId: "editor-table-properties-tab-cell",
             panel: (() => {
-              var _el$37 = _tmpl$9(), _el$38 = _el$37.firstChild, _el$39 = _el$38.firstChild, _el$40 = _el$39.firstChild, _el$41 = _el$40.nextSibling, _el$42 = _el$41.firstChild, _el$43 = _el$42.nextSibling, _el$44 = _el$43.nextSibling, _el$45 = _el$44.nextSibling, _el$46 = _el$39.nextSibling, _el$47 = _el$46.firstChild, _el$48 = _el$47.nextSibling, _el$49 = _el$48.firstChild, _el$50 = _el$38.nextSibling, _el$51 = _el$50.firstChild, _el$52 = _el$51.nextSibling, _el$53 = _el$50.nextSibling, _el$54 = _el$53.firstChild, _el$55 = _el$54.nextSibling, _el$56 = _el$53.nextSibling, _el$57 = _el$56.firstChild, _el$58 = _el$57.nextSibling, _el$59 = _el$58.firstChild, _el$60 = _el$59.firstChild, _el$61 = _el$60.nextSibling, _el$62 = _el$61.firstChild, _el$63 = _el$62.nextSibling, _el$64 = _el$63.nextSibling, _el$65 = _el$64.nextSibling, _el$66 = _el$59.nextSibling, _el$67 = _el$66.firstChild, _el$68 = _el$67.nextSibling, _el$69 = _el$66.nextSibling, _el$70 = _el$69.firstChild, _el$71 = _el$70.nextSibling, _el$72 = _el$58.nextSibling, _el$73 = _el$72.nextSibling;
-              insert(_el$38, () => numericInput(t("table.cellWidth"), cellWidth, setCellWidth, "editor-table-properties-cell-width"), _el$39);
-              insert(_el$40, () => t("table.verticalAlignment"));
-              _el$41.addEventListener("change", (e) => setCellVerticalAlign(e.currentTarget.value));
-              insert(_el$42, () => t("table.inherit"));
-              insert(_el$43, () => t("table.valignTop"));
-              insert(_el$44, () => t("table.valignMiddle"));
-              insert(_el$45, () => t("table.valignBottom"));
-              insert(_el$47, () => t("table.textDirection"));
-              _el$48.addEventListener("change", (e) => setCellTextDirection(e.currentTarget.value));
-              insert(_el$49, () => t("table.inherit"));
-              insert(_el$51, () => t("table.options"));
-              insert(_el$52, () => checkbox(t("table.noWrap"), cellNoWrap, setCellNoWrap, "editor-table-properties-cell-nowrap"), null);
-              insert(_el$52, () => checkbox(t("table.fitText"), cellFitText, setCellFitText, "editor-table-properties-cell-fit-text"), null);
-              insert(_el$52, () => checkbox(t("table.hideMark"), cellHideMark, setCellHideMark, "editor-table-properties-cell-hide-mark"), null);
-              insert(_el$54, () => t("table.cellMargins"));
-              insert(_el$55, () => numericInput(t("paragraph.borderSideTop"), marginTop, setMarginTop, "editor-table-properties-margin-top"), null);
-              insert(_el$55, () => numericInput(t("paragraph.borderSideRight"), marginRight, setMarginRight, "editor-table-properties-margin-right"), null);
-              insert(_el$55, () => numericInput(t("paragraph.borderSideBottom"), marginBottom, setMarginBottom, "editor-table-properties-margin-bottom"), null);
-              insert(_el$55, () => numericInput(t("paragraph.borderSideLeft"), marginLeft, setMarginLeft, "editor-table-properties-margin-left"), null);
-              insert(_el$57, () => t("paragraph.bordersSection"));
-              insert(_el$60, () => t("paragraph.borderStyleLabel"));
-              _el$61.addEventListener("change", (e) => {
+              var _el$60 = _tmpl$11(), _el$61 = _el$60.firstChild, _el$62 = _el$61.firstChild, _el$63 = _el$62.firstChild, _el$64 = _el$63.nextSibling, _el$65 = _el$64.firstChild, _el$66 = _el$65.nextSibling, _el$67 = _el$66.nextSibling, _el$68 = _el$67.nextSibling, _el$69 = _el$62.nextSibling, _el$70 = _el$69.firstChild, _el$71 = _el$70.nextSibling, _el$72 = _el$71.firstChild, _el$73 = _el$61.nextSibling, _el$74 = _el$73.firstChild, _el$75 = _el$74.nextSibling, _el$76 = _el$73.nextSibling, _el$77 = _el$76.firstChild, _el$78 = _el$77.nextSibling, _el$79 = _el$76.nextSibling, _el$80 = _el$79.firstChild, _el$81 = _el$80.nextSibling, _el$82 = _el$81.firstChild, _el$83 = _el$82.firstChild, _el$84 = _el$83.nextSibling, _el$85 = _el$84.firstChild, _el$86 = _el$85.nextSibling, _el$87 = _el$86.nextSibling, _el$88 = _el$87.nextSibling, _el$89 = _el$82.nextSibling, _el$90 = _el$89.firstChild, _el$91 = _el$90.nextSibling, _el$92 = _el$89.nextSibling, _el$93 = _el$92.firstChild, _el$94 = _el$93.nextSibling, _el$95 = _el$81.nextSibling, _el$96 = _el$95.nextSibling;
+              insert(_el$61, () => numericInput(t("table.cellWidth"), cellWidth, setCellWidth, "editor-table-properties-cell-width"), _el$62);
+              insert(_el$63, () => t("table.verticalAlignment"));
+              _el$64.addEventListener("change", (e) => setCellVerticalAlign(e.currentTarget.value));
+              insert(_el$65, () => t("table.inherit"));
+              insert(_el$66, () => t("table.valignTop"));
+              insert(_el$67, () => t("table.valignMiddle"));
+              insert(_el$68, () => t("table.valignBottom"));
+              insert(_el$70, () => t("table.textDirection"));
+              _el$71.addEventListener("change", (e) => setCellTextDirection(e.currentTarget.value));
+              insert(_el$72, () => t("table.inherit"));
+              insert(_el$74, () => t("table.options"));
+              insert(_el$75, () => checkbox(t("table.noWrap"), cellNoWrap, setCellNoWrap, "editor-table-properties-cell-nowrap"), null);
+              insert(_el$75, () => checkbox(t("table.fitText"), cellFitText, setCellFitText, "editor-table-properties-cell-fit-text"), null);
+              insert(_el$75, () => checkbox(t("table.hideMark"), cellHideMark, setCellHideMark, "editor-table-properties-cell-hide-mark"), null);
+              insert(_el$77, () => t("table.cellMargins"));
+              insert(_el$78, () => numericInput(t("paragraph.borderSideTop"), marginTop, setMarginTop, "editor-table-properties-margin-top"), null);
+              insert(_el$78, () => numericInput(t("paragraph.borderSideRight"), marginRight, setMarginRight, "editor-table-properties-margin-right"), null);
+              insert(_el$78, () => numericInput(t("paragraph.borderSideBottom"), marginBottom, setMarginBottom, "editor-table-properties-margin-bottom"), null);
+              insert(_el$78, () => numericInput(t("paragraph.borderSideLeft"), marginLeft, setMarginLeft, "editor-table-properties-margin-left"), null);
+              insert(_el$80, () => t("paragraph.bordersSection"));
+              insert(_el$83, () => t("paragraph.borderStyleLabel"));
+              _el$84.addEventListener("change", (e) => {
                 const next = e.currentTarget.value;
                 setBorderStyle(next);
                 if (next === "none") {
@@ -31904,6 +32267,10 @@ function TablePropertiesDialog(props) {
                   setBorderRight(false);
                   setBorderBottom(false);
                   setBorderLeft(false);
+                  setBorderStart(false);
+                  setBorderEnd(false);
+                  setBorderTlBr(false);
+                  setBorderTrBl(false);
                 } else if (!borderTop() && !borderRight() && !borderBottom() && !borderLeft()) {
                   setBorderTop(true);
                   setBorderRight(true);
@@ -31911,48 +32278,52 @@ function TablePropertiesDialog(props) {
                   setBorderLeft(true);
                 }
               });
-              insert(_el$62, () => t("paragraph.borderNone"));
-              insert(_el$63, () => t("paragraph.borderSolid"));
-              insert(_el$64, () => t("paragraph.borderDashed"));
-              insert(_el$65, () => t("paragraph.borderDotted"));
-              insert(_el$58, () => numericInput(t("paragraph.borderWidthLabel"), borderWidth, setBorderWidth, "editor-table-properties-border-width", borderStyle() === "none"), _el$66);
-              insert(_el$67, () => t("paragraph.borderColorLabel"));
-              _el$68.$$input = (e) => setBorderColor(e.currentTarget.value);
-              insert(_el$70, () => t("paragraph.shadingLabel"));
-              _el$71.$$input = (e) => setShading(e.currentTarget.value);
-              insert(_el$72, () => checkbox(t("paragraph.borderSideTop"), borderTop, setBorderTop, "editor-table-properties-border-top", borderStyle() === "none"), null);
-              insert(_el$72, () => checkbox(t("paragraph.borderSideRight"), borderRight, setBorderRight, "editor-table-properties-border-right", borderStyle() === "none"), null);
-              insert(_el$72, () => checkbox(t("paragraph.borderSideBottom"), borderBottom, setBorderBottom, "editor-table-properties-border-bottom", borderStyle() === "none"), null);
-              insert(_el$72, () => checkbox(t("paragraph.borderSideLeft"), borderLeft, setBorderLeft, "editor-table-properties-border-left", borderStyle() === "none"), null);
+              insert(_el$85, () => t("paragraph.borderNone"));
+              insert(_el$86, () => t("paragraph.borderSolid"));
+              insert(_el$87, () => t("paragraph.borderDashed"));
+              insert(_el$88, () => t("paragraph.borderDotted"));
+              insert(_el$81, () => numericInput(t("paragraph.borderWidthLabel"), borderWidth, setBorderWidth, "editor-table-properties-border-width", borderStyle() === "none"), _el$89);
+              insert(_el$90, () => t("paragraph.borderColorLabel"));
+              _el$91.$$input = (e) => setBorderColor(e.currentTarget.value);
+              insert(_el$93, () => t("paragraph.shadingLabel"));
+              _el$94.$$input = (e) => setShading(e.currentTarget.value);
+              insert(_el$95, () => checkbox(t("paragraph.borderSideTop"), borderTop, setBorderTop, "editor-table-properties-border-top", borderStyle() === "none"), null);
+              insert(_el$95, () => checkbox(t("paragraph.borderSideRight"), borderRight, setBorderRight, "editor-table-properties-border-right", borderStyle() === "none"), null);
+              insert(_el$95, () => checkbox(t("paragraph.borderSideBottom"), borderBottom, setBorderBottom, "editor-table-properties-border-bottom", borderStyle() === "none"), null);
+              insert(_el$95, () => checkbox(t("paragraph.borderSideLeft"), borderLeft, setBorderLeft, "editor-table-properties-border-left", borderStyle() === "none"), null);
+              insert(_el$95, () => checkbox(t("table.borderStart"), borderStart, setBorderStart, "editor-table-properties-border-start", borderStyle() === "none"), null);
+              insert(_el$95, () => checkbox(t("table.borderEnd"), borderEnd, setBorderEnd, "editor-table-properties-border-end", borderStyle() === "none"), null);
+              insert(_el$95, () => checkbox(t("table.borderTlBr"), borderTlBr, setBorderTlBr, "editor-table-properties-border-tlbr", borderStyle() === "none"), null);
+              insert(_el$95, () => checkbox(t("table.borderTrBl"), borderTrBl, setBorderTrBl, "editor-table-properties-border-trbl", borderStyle() === "none"), null);
               createRenderEffect((_p$) => {
                 var _v$ = borderStyle() === "none", _v$2 = borderPreview();
-                _v$ !== _p$.e && (_el$68.disabled = _p$.e = _v$);
-                _p$.t = style(_el$73, _v$2, _p$.t);
+                _v$ !== _p$.e && (_el$91.disabled = _p$.e = _v$);
+                _p$.t = style(_el$96, _v$2, _p$.t);
                 return _p$;
               }, {
                 e: void 0,
                 t: void 0
               });
-              createRenderEffect(() => _el$41.value = cellVerticalAlign());
-              createRenderEffect(() => _el$48.value = cellTextDirection());
-              createRenderEffect(() => _el$61.value = borderStyle());
-              createRenderEffect(() => _el$68.value = borderColor() || DEFAULT_BORDER_COLOR);
-              createRenderEffect(() => _el$71.value = shading() || "#ffffff");
-              return _el$37;
+              createRenderEffect(() => _el$64.value = cellVerticalAlign());
+              createRenderEffect(() => _el$71.value = cellTextDirection());
+              createRenderEffect(() => _el$84.value = borderStyle());
+              createRenderEffect(() => _el$91.value = borderColor() || DEFAULT_BORDER_COLOR);
+              createRenderEffect(() => _el$94.value = shading() || "#ffffff");
+              return _el$60;
             })()
           }, {
             id: "altText",
             label: t("table.tabAltText"),
             testId: "editor-table-properties-tab-alt-text",
             panel: (() => {
-              var _el$74 = _tmpl$0(), _el$75 = _el$74.firstChild, _el$76 = _el$75.firstChild, _el$77 = _el$76.nextSibling, _el$78 = _el$75.nextSibling, _el$79 = _el$78.firstChild, _el$80 = _el$79.nextSibling;
-              insert(_el$76, () => t("table.altTitle"));
-              _el$77.$$input = (e) => setAltTitle(e.currentTarget.value);
-              insert(_el$79, () => t("table.altDescription"));
-              _el$80.$$input = (e) => setAltDescription(e.currentTarget.value);
-              createRenderEffect(() => _el$77.value = altTitle());
-              createRenderEffect(() => _el$80.value = altDescription());
-              return _el$74;
+              var _el$97 = _tmpl$12(), _el$98 = _el$97.firstChild, _el$99 = _el$98.firstChild, _el$100 = _el$99.nextSibling, _el$101 = _el$98.nextSibling, _el$102 = _el$101.firstChild, _el$103 = _el$102.nextSibling;
+              insert(_el$99, () => t("table.altTitle"));
+              _el$100.$$input = (e) => setAltTitle(e.currentTarget.value);
+              insert(_el$102, () => t("table.altDescription"));
+              _el$103.$$input = (e) => setAltDescription(e.currentTarget.value);
+              createRenderEffect(() => _el$100.value = altTitle());
+              createRenderEffect(() => _el$103.value = altDescription());
+              return _el$97;
             })()
           }];
         }
@@ -32810,6 +33181,35 @@ function serializeParagraphBorders(style2) {
 const DEFAULT_TABLE_BORDER_COLOR = "6F6F6F";
 const DEFAULT_TABLE_BORDER_WIDTH_PT = 0.75;
 const DEFAULT_CELL_PADDING_LEFT_RIGHT_PT = 5.4;
+function serializeRevisionAttrs(revision) {
+  const numericId = /^\d+$/.test(revision.id) ? revision.id : String(
+    Array.from(revision.id).reduce(
+      (hash, character) => hash * 31 + character.charCodeAt(0) >>> 0,
+      0
+    )
+  );
+  const date = Number.isFinite(revision.date) ? new Date(revision.date).toISOString() : (/* @__PURE__ */ new Date(0)).toISOString();
+  return `w:id="${numericId}" w:author="${escapeXml(revision.author)}" w:date="${date}"`;
+}
+function serializeConditionalFlags(flags) {
+  if (!flags || Object.keys(flags).length === 0) return "";
+  const attributes = [
+    ["firstRow", "firstRow"],
+    ["lastRow", "lastRow"],
+    ["firstColumn", "firstCol"],
+    ["lastColumn", "lastCol"],
+    ["oddVBand", "band1Vert"],
+    ["evenVBand", "band2Vert"],
+    ["oddHBand", "band1Horz"],
+    ["evenHBand", "band2Horz"],
+    ["firstRowFirstColumn", "nwCell"],
+    ["firstRowLastColumn", "neCell"],
+    ["lastRowFirstColumn", "swCell"],
+    ["lastRowLastColumn", "seCell"]
+  ];
+  const xml = attributes.filter(([, key]) => flags[key] !== void 0).map(([name, key]) => `w:${name}="${flags[key] ? "1" : "0"}"`).join(" ");
+  return xml ? `<w:cnfStyle ${xml}/>` : "";
+}
 function serializeOnOffElement(tag, value) {
   if (value === void 0) {
     return "";
@@ -32900,7 +33300,9 @@ function serializeTableDefaultCellMargins(margins) {
   const parts = [];
   const edge = (name, value) => {
     if (value !== void 0 && Number.isFinite(value)) {
-      parts.push(`<w:${name} w:w="${pointsToTwips(value) ?? 0}" w:type="dxa"/>`);
+      parts.push(
+        `<w:${name} w:w="${pointsToTwips(value) ?? 0}" w:type="dxa"/>`
+      );
     }
   };
   edge("top", margins.top);
@@ -32912,9 +33314,11 @@ function serializeTableDefaultCellMargins(margins) {
   return parts.length > 0 ? `<w:tblCellMar>${parts.join("")}</w:tblCellMar>` : "";
 }
 function serializeTableCellProperties(cell, fallbackWidthPt) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const colSpan = Math.max(1, Math.floor(cell.colSpan ?? 1));
   const parts = [];
+  const conditional = serializeConditionalFlags(cell.conditionalStyle);
+  if (conditional) parts.push(conditional);
   const widthXml = serializeCellWidth(((_a = cell.style) == null ? void 0 : _a.width) ?? fallbackWidthPt);
   if (widthXml) {
     parts.push(widthXml);
@@ -32956,11 +33360,33 @@ function serializeTableCellProperties(cell, fallbackWidthPt) {
   if (hideMark) {
     parts.push(hideMark);
   }
-  if ((_j = (_i = cell.style) == null ? void 0 : _i.revisionXml) == null ? void 0 : _j.length) {
-    parts.push(...cell.style.revisionXml);
+  if ((_i = cell.style) == null ? void 0 : _i.propertyRevision) {
+    const revision = cell.style.propertyRevision;
+    const previous = serializeTableCellProperties({
+      ...cell,
+      style: revision.previous
+    });
+    parts.push(
+      `<w:tcPrChange ${serializeRevisionAttrs(revision)}>${previous}</w:tcPrChange>`
+    );
+  }
+  if ((_j = cell.style) == null ? void 0 : _j.revision) {
+    const revision = cell.style.revision;
+    const element = revision.type === "insert" ? "cellIns" : revision.type === "delete" ? "cellDel" : "cellMerge";
+    const mergeAttrs = revision.type === "merge" ? `${((_k = revision.previous) == null ? void 0 : _k.vMerge) ? ` w:vMergeOrig="${revision.previous.vMerge === "restart" ? "rest" : "cont"}"` : ""}${cell.vMerge ? ` w:vMerge="${cell.vMerge === "restart" ? "rest" : "cont"}"` : ""}` : "";
+    parts.push(
+      `<w:${element} ${serializeRevisionAttrs(revision)}${mergeAttrs}/>`
+    );
   }
   return parts.length > 0 ? `<w:tcPr>${parts.join("")}</w:tcPr>` : "";
 }
+function serializeTableCellStyleXml(style2) {
+  return serializeTableCellProperties({
+    id: "table-style-cell",
+    blocks: [],
+    style: style2
+  });
+}
 function serializeGridSkip(tag, value) {
   if (value === void 0 || !Number.isFinite(value)) {
     return "";
@@ -32983,10 +33409,12 @@ function serializeTableRowHeightFromStyle(heightValue, heightRule) {
 }
 function serializeTableRowHeight(row) {
   var _a, _b;
-  return serializeTableRowHeightFromStyle((_a = row.style) == null ? void 0 : _a.height, (_b = row.style) == null ? void 0 : _b.heightRule);
+  return serializeTableRowHeightFromStyle(
+    (_a = row.style) == null ? void 0 : _a.height,
+    (_b = row.style) == null ? void 0 : _b.heightRule
+  );
 }
 function serializeTableRowStyleXml(style2) {
-  var _a;
   if (!style2) return "";
   const parts = [];
   const gridBefore = serializeGridSkip("gridBefore", style2.gridBefore);
@@ -32997,49 +33425,104 @@ function serializeTableRowStyleXml(style2) {
   if (widthBefore) parts.push(widthBefore);
   const widthAfter = serializeDocxWidthElement("wAfter", style2.widthAfter);
   if (widthAfter) parts.push(widthAfter);
-  const cellSpacingXml = serializeDocxWidthElement("tblCellSpacing", style2.cellSpacing);
+  const cellSpacingXml = serializeDocxWidthElement(
+    "tblCellSpacing",
+    style2.cellSpacing
+  );
   if (cellSpacingXml) parts.push(cellSpacingXml);
-  const heightXml = serializeTableRowHeightFromStyle(style2.height, style2.heightRule);
+  const heightXml = serializeTableRowHeightFromStyle(
+    style2.height,
+    style2.heightRule
+  );
   if (heightXml) parts.push(heightXml);
   const cantSplit = serializeOnOffElement("cantSplit", style2.cantSplit);
   if (cantSplit) parts.push(cantSplit);
   const hidden = serializeOnOffElement("hidden", style2.hidden);
   if (hidden) parts.push(hidden);
-  if ((_a = style2.revisionXml) == null ? void 0 : _a.length) parts.push(...style2.revisionXml);
+  const header = serializeOnOffElement("tblHeader", style2.isHeader);
+  if (header) parts.push(header);
   return parts.length > 0 ? `<w:trPr>${parts.join("")}</w:trPr>` : "";
 }
 function serializeTableRowProperties(row) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const parts = [];
+  const conditional = serializeConditionalFlags(row.conditionalStyle);
+  if (conditional) parts.push(conditional);
   const gridBefore = serializeGridSkip("gridBefore", (_a = row.style) == null ? void 0 : _a.gridBefore);
   if (gridBefore) parts.push(gridBefore);
   const gridAfter = serializeGridSkip("gridAfter", (_b = row.style) == null ? void 0 : _b.gridAfter);
   if (gridAfter) parts.push(gridAfter);
-  const widthBefore = serializeDocxWidthElement("wBefore", (_c = row.style) == null ? void 0 : _c.widthBefore);
+  const widthBefore = serializeDocxWidthElement(
+    "wBefore",
+    (_c = row.style) == null ? void 0 : _c.widthBefore
+  );
   if (widthBefore) parts.push(widthBefore);
   const widthAfter = serializeDocxWidthElement("wAfter", (_d = row.style) == null ? void 0 : _d.widthAfter);
   if (widthAfter) parts.push(widthAfter);
-  const cellSpacingXml = serializeDocxWidthElement("tblCellSpacing", (_e = row.style) == null ? void 0 : _e.cellSpacing);
+  const cellSpacingXml = serializeDocxWidthElement(
+    "tblCellSpacing",
+    (_e = row.style) == null ? void 0 : _e.cellSpacing
+  );
   if (cellSpacingXml) parts.push(cellSpacingXml);
   const height = serializeTableRowHeight(row);
   if (height) parts.push(height);
   const cantSplit = serializeOnOffElement("cantSplit", (_f = row.style) == null ? void 0 : _f.cantSplit);
   if (cantSplit) parts.push(cantSplit);
-  if (row.isHeader) parts.push("<w:tblHeader/>");
-  const hidden = serializeOnOffElement("hidden", (_g = row.style) == null ? void 0 : _g.hidden);
+  if (((_g = row.style) == null ? void 0 : _g.isHeader) ?? row.isHeader) parts.push("<w:tblHeader/>");
+  const hidden = serializeOnOffElement("hidden", (_h = row.style) == null ? void 0 : _h.hidden);
   if (hidden) parts.push(hidden);
-  if ((_i = (_h = row.style) == null ? void 0 : _h.revisionXml) == null ? void 0 : _i.length) parts.push(...row.style.revisionXml);
+  if ((_i = row.style) == null ? void 0 : _i.propertyRevision) {
+    const revision = row.style.propertyRevision;
+    parts.push(
+      `<w:trPrChange ${serializeRevisionAttrs(revision)}>${serializeTableRowStyleXml(revision.previous)}</w:trPrChange>`
+    );
+  }
+  if (((_j = row.style) == null ? void 0 : _j.revision) && row.style.revision.type !== "merge") {
+    const revision = row.style.revision;
+    const element = revision.type === "insert" ? "ins" : "del";
+    parts.push(`<w:${element} ${serializeRevisionAttrs(revision)}/>`);
+  }
   return parts.length > 0 ? `<w:trPr>${parts.join("")}</w:trPr>` : "";
 }
 function serializeFloatingTableProperties(floating) {
   if (!floating || Object.keys(floating).length === 0) {
     return "";
   }
-  const attrs = Object.entries(floating).map(([key, value]) => `w:${key}="${escapeXml(value)}"`).join(" ");
+  const twips = (value) => {
+    const converted = pointsToTwips(value);
+    return converted === null ? void 0 : String(converted);
+  };
+  const values = {
+    horzAnchor: floating.horizontalAnchor,
+    vertAnchor: floating.verticalAnchor,
+    tblpX: twips(floating.x),
+    tblpY: twips(floating.y),
+    tblpXSpec: floating.xAlign,
+    tblpYSpec: floating.yAlign,
+    topFromText: twips(floating.distanceTop),
+    rightFromText: twips(floating.distanceRight),
+    bottomFromText: twips(floating.distanceBottom),
+    leftFromText: twips(floating.distanceLeft)
+  };
+  const attrs = Object.entries(values).filter((entry) => entry[1] !== void 0).map(([key, value]) => `w:${key}="${escapeXml(value)}"`).join(" ");
   return `<w:tblpPr ${attrs}/>`;
 }
+function serializeTableBorders(style2) {
+  const borders = style2 == null ? void 0 : style2.borders;
+  if (!borders) return "";
+  const edges = [
+    ["top", borders.borderTop],
+    ["left", borders.borderLeft],
+    ["bottom", borders.borderBottom],
+    ["right", borders.borderRight],
+    ["insideH", borders.borderInsideH],
+    ["insideV", borders.borderInsideV]
+  ];
+  const xml = edges.filter((entry) => !!entry[1]).map(([name, border]) => `<w:${name} ${serializeDocxBorderAttrs(border)}`).join("");
+  return xml ? `<w:tblBorders>${xml}</w:tblBorders>` : "";
+}
 function serializeTableProperties(table) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const parts = [];
   if ((_a = table.style) == null ? void 0 : _a.styleId) {
     parts.push(`<w:tblStyle w:val="${escapeXml(table.style.styleId)}"/>`);
@@ -33080,6 +33563,8 @@ function serializeTableProperties(table) {
   if (defaultMarginsXml) {
     parts.push(defaultMarginsXml);
   }
+  const tableBorders = serializeTableBorders(table.style);
+  if (tableBorders) parts.push(tableBorders);
   const indentXml = serializeDocxWidthElement(
     "tblInd",
     (_j = table.style) == null ? void 0 : _j.indentLeft
@@ -33088,15 +33573,25 @@ function serializeTableProperties(table) {
     parts.push(indentXml);
   }
   parts.push(`<w:tblLayout w:type="${((_k = table.style) == null ? void 0 : _k.layout) ?? "fixed"}"/>`);
-  const bidiVisual = serializeOnOffElement("bidiVisual", (_l = table.style) == null ? void 0 : _l.bidiVisual);
+  const bidiVisual = serializeOnOffElement(
+    "bidiVisual",
+    (_l = table.style) == null ? void 0 : _l.bidiVisual
+  );
   if (bidiVisual) {
     parts.push(bidiVisual);
   }
   if ((_m = table.style) == null ? void 0 : _m.tblOverlap) {
     parts.push(`<w:tblOverlap w:val="${escapeXml(table.style.tblOverlap)}"/>`);
   }
-  if ((_o = (_n = table.style) == null ? void 0 : _n.revisionXml) == null ? void 0 : _o.length) {
-    parts.push(...table.style.revisionXml);
+  if ((_n = table.style) == null ? void 0 : _n.revision) {
+    const revision = table.style.revision;
+    const previous = serializeTableProperties({
+      ...table,
+      style: revision.previous
+    });
+    parts.push(
+      `<w:tblPrChange ${serializeRevisionAttrs(revision)}>${previous}</w:tblPrChange>`
+    );
   }
   return `<w:tblPr>${parts.join("")}</w:tblPr>`;
 }
@@ -33127,7 +33622,7 @@ function serializeTableXml(table, serializeParagraphXml2) {
     }).join("");
     return `<w:tr>${row.tblPrExXml ?? ""}${serializeTableRowProperties(row)}${cellsXml}</w:tr>`;
   }).join("");
-  const gridXml = table.gridCols ? `<w:tblGrid>${table.gridCols.map((width) => `<w:gridCol w:w="${pointsToTwips(width) ?? 0}"/>`).join("")}${table.tblGridChangeXml ?? ""}</w:tblGrid>` : "";
+  const gridXml = table.gridCols ? `<w:tblGrid>${table.gridCols.map((width) => `<w:gridCol w:w="${pointsToTwips(width) ?? 0}"/>`).join("")}${table.gridRevision ? `<w:tblGridChange ${serializeRevisionAttrs(table.gridRevision)}><w:tblGrid>${table.gridRevision.previous.map((width) => `<w:gridCol w:w="${pointsToTwips(width) ?? 0}"/>`).join("")}</w:tblGrid></w:tblGridChange>` : ""}</w:tblGrid>` : "";
   return `<w:tbl>${serializeTableProperties(table)}${gridXml}${rowsXml}</w:tbl>`;
 }
 function materializeParagraphStyle(paragraph, styles) {
@@ -33180,6 +33675,16 @@ function materializeRunStyle(run, paragraphStyleId, styles) {
     noProof: effective.noProof,
     webHidden: effective.webHidden,
     specVanish: effective.specVanish,
+    rtl: effective.rtl,
+    complexScript: effective.complexScript,
+    snapToGrid: effective.snapToGrid,
+    fitText: effective.fitText,
+    emphasisMark: effective.emphasisMark,
+    textBorder: effective.textBorder,
+    outline: effective.outline,
+    shadow: effective.shadow,
+    emboss: effective.emboss,
+    imprint: effective.imprint,
     textEffect: effective.textEffect,
     characterScale: effective.characterScale,
     characterSpacing: effective.characterSpacing,
@@ -33477,15 +33982,23 @@ function serializeRunProperties(styles) {
   }
   if (styles.strike) parts.push("<w:strike/>");
   if (styles.doubleStrike) parts.push("<w:dstrike/>");
+  if (styles.outline) parts.push("<w:outline/>");
+  if (styles.shadow) parts.push("<w:shadow/>");
+  if (styles.emboss) parts.push("<w:emboss/>");
+  if (styles.imprint) parts.push("<w:imprint/>");
   if (styles.smallCaps) parts.push("<w:smallCaps/>");
   if (styles.allCaps) parts.push("<w:caps/>");
   if (styles.hidden) parts.push("<w:vanish/>");
   if (styles.noProof) parts.push("<w:noProof/>");
   if (styles.webHidden) parts.push("<w:webHidden/>");
   if (styles.specVanish) parts.push("<w:specVanish/>");
+  if (styles.snapToGrid === false) parts.push('<w:snapToGrid w:val="0"/>');
   if (styles.textEffect) {
     parts.push(`<w:effect w:val="${escapeXml(styles.textEffect)}"/>`);
   }
+  if (styles.textBorder) {
+    parts.push(`<w:bdr ${serializeDocxBorderAttrs(styles.textBorder)}`);
+  }
   if (styles.characterScale !== void 0 && styles.characterScale !== null && Number.isFinite(styles.characterScale)) {
     parts.push(
       `<w:w w:val="${Math.max(1, Math.round(styles.characterScale))}"/>`
@@ -33553,6 +34066,17 @@ function serializeRunProperties(styles) {
       `<w:shd w:val="clear" w:color="auto" w:fill="${normalizeDocxColor(styles.shading, "FFFFFF")}"/>`
     );
   }
+  if (styles.fitText !== void 0 && styles.fitText !== null && Number.isFinite(styles.fitText)) {
+    const twips = pointsToSignedTwips(styles.fitText);
+    if (twips !== null && twips > 0) {
+      parts.push(`<w:fitText w:val="${twips}"/>`);
+    }
+  }
+  if (styles.rtl) parts.push("<w:rtl/>");
+  if (styles.complexScript) parts.push("<w:cs/>");
+  if (styles.emphasisMark) {
+    parts.push(`<w:em w:val="${escapeXml(styles.emphasisMark)}"/>`);
+  }
   if (styles.language) {
     const attrs = [];
     if (styles.language.value) {
@@ -34282,6 +34806,9 @@ const CONDITIONAL_TYPE_ORDER = [
   "seCell"
 ];
 function serializeConditionalTcPr(cond) {
+  if (cond.cellStyle) {
+    return serializeTableCellStyleXml(cond.cellStyle);
+  }
   const parts = [];
   if (cond.borders) {
     const b = cond.borders;
@@ -34305,12 +34832,63 @@ function serializeConditionalTcPr(cond) {
   }
   return parts.length > 0 ? `<w:tcPr>${parts.join("")}</w:tcPr>` : "";
 }
+function serializeWidthElement(name, value) {
+  if (typeof value === "number") {
+    return `<w:${name} w:w="${pointsToTwips(value) ?? 0}" w:type="dxa"/>`;
+  }
+  if (typeof value === "string" && value.endsWith("%")) {
+    const percent = Number.parseFloat(value);
+    return Number.isFinite(percent) ? `<w:${name} w:w="${Math.round(percent * 50)}" w:type="pct"/>` : "";
+  }
+  return value === "auto" ? `<w:${name} w:w="0" w:type="auto"/>` : "";
+}
+function serializeTableStyleProperties(style2) {
+  if (!style2) return "";
+  const parts = [];
+  if (style2.rowBandSize !== void 0)
+    parts.push(`<w:tblStyleRowBandSize w:val="${style2.rowBandSize}"/>`);
+  if (style2.colBandSize !== void 0)
+    parts.push(`<w:tblStyleColBandSize w:val="${style2.colBandSize}"/>`);
+  const width = serializeWidthElement("tblW", style2.width);
+  if (width) parts.push(width);
+  const indent = serializeWidthElement("tblInd", style2.indentLeft);
+  if (indent) parts.push(indent);
+  const spacing = serializeWidthElement("tblCellSpacing", style2.cellSpacing);
+  if (spacing) parts.push(spacing);
+  if (style2.align) parts.push(`<w:jc w:val="${style2.align}"/>`);
+  if (style2.layout) parts.push(`<w:tblLayout w:type="${style2.layout}"/>`);
+  if (style2.bidiVisual !== void 0)
+    parts.push(`<w:bidiVisual w:val="${style2.bidiVisual ? "1" : "0"}"/>`);
+  if (style2.defaultCellMargins) {
+    const margins = Object.entries(style2.defaultCellMargins).map(
+      ([name, value]) => `<w:${name} w:w="${pointsToTwips(value) ?? 0}" w:type="dxa"/>`
+    ).join("");
+    if (margins) parts.push(`<w:tblCellMar>${margins}</w:tblCellMar>`);
+  }
+  if (style2.borders) {
+    const edges = [
+      ["top", style2.borders.borderTop],
+      ["left", style2.borders.borderLeft],
+      ["bottom", style2.borders.borderBottom],
+      ["right", style2.borders.borderRight],
+      ["insideH", style2.borders.borderInsideH],
+      ["insideV", style2.borders.borderInsideV]
+    ];
+    const borders = edges.filter(
+      (entry) => !!entry[1]
+    ).map(([name, border]) => `<w:${name} ${serializeDocxBorderAttrs(border)}`).join("");
+    if (borders) parts.push(`<w:tblBorders>${borders}</w:tblBorders>`);
+  }
+  return parts.length > 0 ? `<w:tblPr>${parts.join("")}</w:tblPr>` : "";
+}
 function serializeConditionalBlock(type, cond) {
   const parts = [];
   const pPr = cond.paragraphStyle ? serializeParagraphStyleXml(cond.paragraphStyle) : "";
   if (pPr) parts.push(pPr);
   const rPr = cond.textStyle ? serializeRunProperties(cond.textStyle) : "";
   if (rPr) parts.push(rPr);
+  const tblPr = serializeTableStyleProperties(cond.tableStyle);
+  if (tblPr) parts.push(tblPr);
   const trPr = cond.rowStyle ? serializeTableRowStyleXml(cond.rowStyle) : "";
   if (trPr) parts.push(trPr);
   const tcPr = serializeConditionalTcPr(cond);
@@ -34355,22 +34933,8 @@ function serializeNamedStyle(style2) {
   }
   if (style2.type === "table" && style2.tableStyle) {
     const ts = style2.tableStyle;
-    const tblPrParts = [];
-    if (ts.rowBandSize !== void 0) {
-      tblPrParts.push(`<w:tblStyleRowBandSize w:val="${ts.rowBandSize}"/>`);
-    }
-    if (ts.colBandSize !== void 0) {
-      tblPrParts.push(`<w:tblStyleColBandSize w:val="${ts.colBandSize}"/>`);
-    }
-    if (ts.indentLeft !== void 0) {
-      const val = typeof ts.indentLeft === "number" ? pointsToTwips(ts.indentLeft) : null;
-      if (val !== null) {
-        tblPrParts.push(`<w:tblInd w:w="${val}" w:type="dxa"/>`);
-      }
-    }
-    if (tblPrParts.length > 0) {
-      parts.push(`<w:tblPr>${tblPrParts.join("")}</w:tblPr>`);
-    }
+    const tblPr = serializeTableStyleProperties(ts);
+    if (tblPr) parts.push(tblPr);
     if (ts.conditionalFormats) {
       const orderedKeys = [
         ...CONDITIONAL_TYPE_ORDER.filter((k) => k in ts.conditionalFormats),
@@ -34388,7 +34952,7 @@ function serializeNamedStyle(style2) {
     }
   }
   const typeAttr = style2.type === "character" ? "character" : style2.type === "table" ? "table" : "paragraph";
-  return `<w:style w:type="${typeAttr}" w:styleId="${escapeXml(style2.id)}">${parts.join("")}</w:style>`;
+  return `<w:style w:type="${typeAttr}" w:styleId="${escapeXml(style2.id)}"${style2.isDefault ? ' w:default="1"' : ""}>${parts.join("")}</w:style>`;
 }
 function buildStylesXml(styles) {
   const styleElements = Object.values(styles).map(serializeNamedStyle).join("");
@@ -35326,6 +35890,10 @@ async function drawFloatingTextBoxesForParagraph(options) {
       if (!(textBox == null ? void 0 : textBox.floating)) {
         continue;
       }
+      const isBehind = Boolean(textBox.floating.behindDoc);
+      if (options.layer && options.layer === "behind" !== isBehind) {
+        continue;
+      }
       const slot = slotByOffset.get(fragment.startOffset);
       const anchorLeft = contentLeft + ((slot == null ? void 0 : slot.left) ?? 0);
       const lineTop = paragraphTop + line.top;
@@ -35515,6 +36083,42 @@ function resolveFragmentBounds(line, fragment, fontSizePx) {
     right: (nextSlot == null ? void 0 : nextSlot.left) ?? last.left + fontSizePx * 0.55
   };
 }
+async function drawFloatingImagesForParagraph(options) {
+  for (const line of options.lines) {
+    const slots = new Map(line.slots.map((slot) => [slot.offset, slot]));
+    for (const fragment of line.fragments) {
+      const image = fragment.image;
+      if (!(image == null ? void 0 : image.floating)) continue;
+      const isBehind = Boolean(image.floating.behindDoc);
+      if (options.layer === "behind" !== isBehind) continue;
+      const slot = slots.get(fragment.startOffset);
+      const rect = resolveFloatingObjectRect({
+        object: getImageFloatingGeometry(image),
+        pageSettings: options.pageSettings,
+        contentLeft: options.contentLeft,
+        contentTop: options.contentTop,
+        contentWidth: options.contentWidth,
+        paragraphTop: options.paragraphTop,
+        lineTop: options.paragraphTop + line.top,
+        anchorLeft: options.contentLeft + ((slot == null ? void 0 : slot.left) ?? 0)
+      });
+      const resourceName = await registerPdfImageRun(
+        options.writer,
+        options.document,
+        image
+      );
+      if (!resourceName) continue;
+      options.writer.drawImage(options.pageIndex, {
+        resourceName,
+        x: pxToPt$1(rect.x),
+        y: pxToPt$1(rect.y),
+        width: pxToPt$1(rect.width),
+        height: pxToPt$1(rect.height),
+        rotation: image.rotation
+      });
+    }
+  }
+}
 function drawFragmentHighlight(writer, pageIndex, line, fragment, originX, originY, styles) {
   if (!styles.highlight) {
     return;
@@ -35555,6 +36159,63 @@ function drawFragmentShading(writer, pageIndex, line, fragment, originX, originY
     fill: styles.shading
   });
 }
+function drawFragmentBorder(writer, pageIndex, line, fragment, originX, originY, styles) {
+  const border = styles.textBorder;
+  if (!border || border.type === "none" || border.width <= 0) {
+    return;
+  }
+  const bounds = resolveFragmentBounds(
+    line,
+    fragment,
+    styles.fontSize ?? DEFAULT_FONT_SIZE_PX
+  );
+  if (!bounds) {
+    return;
+  }
+  writer.drawRect(pageIndex, {
+    x: pxToPt$1(originX + bounds.left),
+    y: pxToPt$1(originY + line.top + 1),
+    width: pxToPt$1(Math.max(0, bounds.right - bounds.left)),
+    height: pxToPt$1(Math.max(2, line.height - 2)),
+    stroke: border.color,
+    lineWidth: pxToPt$1(Math.max(0.5, border.width * PX_PER_POINT))
+  });
+}
+const PDF_EMPHASIS_GLYPH = {
+  dot: "•",
+  comma: "‚",
+  circle: "○",
+  underDot: "•"
+};
+function drawFragmentEmphasis(writer, pageIndex, line, fragment, originX, originY, styles) {
+  const mark = styles.emphasisMark;
+  if (!mark || mark === "none") {
+    return;
+  }
+  const glyph = PDF_EMPHASIS_GLYPH[mark];
+  if (!glyph) {
+    return;
+  }
+  const slots = resolveFragmentSlots(line, fragment);
+  const below = mark === "underDot";
+  const size = Math.max(4, line.height * 0.35);
+  const y = below ? originY + line.top + line.height + size : originY + line.top + size;
+  for (let i = 0; i < slots.length; i += 1) {
+    const slot = slots[i];
+    if (slot.char === " " || slot.char === "	" || slot.char === "\n") {
+      continue;
+    }
+    const next = slots[i + 1];
+    const centerX = next ? (slot.left + next.left) / 2 : slot.left + line.height * 0.25;
+    writer.drawText(pageIndex, {
+      x: pxToPt$1(originX + centerX - size * 0.25),
+      y: pxToPt$1(y),
+      text: glyph,
+      fontSize: pxToPt$1(size),
+      color: styles.color ?? "#000000"
+    });
+  }
+}
 function drawFragmentDecoration(writer, pageIndex, line, fragment, originX, originY, styles, kind) {
   const bounds = resolveFragmentBounds(
     line,
@@ -35754,6 +36415,9 @@ async function drawInlineTextBoxFragment(writer, pageIndex, line, fragment, docu
 async function drawFragmentText(writer, pageIndex, paragraph, line, fragment, document2, originX, originY, fontRegistry, drawers) {
   var _a;
   if (fragment.image) {
+    if (fragment.image.floating) {
+      return;
+    }
     const slot = line.slots.find(
       (candidate) => candidate.offset === fragment.startOffset
     ) ?? line.slots.find((candidate) => candidate.offset >= fragment.startOffset);
@@ -35832,6 +36496,15 @@ async function drawFragmentText(writer, pageIndex, paragraph, line, fragment, do
     originY,
     styles
   );
+  drawFragmentBorder(
+    writer,
+    pageIndex,
+    line,
+    fragment,
+    originX,
+    originY,
+    styles
+  );
   drawTabLeaders(
     writer,
     pageIndex,
@@ -35844,42 +36517,50 @@ async function drawFragmentText(writer, pageIndex, paragraph, line, fragment, do
     styles.color ?? "#000000"
   );
   const paragraphAlign = resolveEffectiveParagraphStyle(paragraph.style, document2.styles).align ?? "left";
-  if (paragraphAlign === "justify") {
-    const chunks = groupSlotChunksByWhitespace(chars);
-    for (const chunk of chunks) {
-      const chunkText = chunk.map((c) => styles.allCaps ? c.char.toUpperCase() : c.char).join("");
-      if (chunkText.length === 0) continue;
+  const baseTextOptions = {
+    fontSize: fontSizePt,
+    bold: styles.bold,
+    italic: styles.italic,
+    fontResourceName: fontFace.writerResourceName,
+    characterSpacing: styles.characterSpacing ?? 0,
+    horizontalScale: styles.characterScale ?? 100
+  };
+  const mainColor = styles.color ?? "#000000";
+  const offsetPt = pxToPt$1(1);
+  const emitChunk = (leftPx, text2) => {
+    if (styles.emboss || styles.imprint) {
+      const dir = styles.imprint ? 1 : -1;
       writer.drawText(pageIndex, {
-        x: pxToPt$1(originX + chunk[0].left),
-        y: pxToPt$1(baselineY),
-        text: chunkText,
-        fontSize: fontSizePt,
-        color: styles.color ?? "#000000",
-        bold: styles.bold,
-        italic: styles.italic,
-        fontResourceName: fontFace.writerResourceName,
-        characterSpacing: styles.characterSpacing ?? 0,
-        horizontalScale: styles.characterScale ?? 100
+        ...baseTextOptions,
+        x: pxToPt$1(leftPx) + offsetPt * dir,
+        y: pxToPt$1(baselineY) + offsetPt * dir,
+        text: text2,
+        color: "#BFBFBF"
       });
     }
-  } else {
-    const chunks = groupSlotChunksByOffsetGaps(chars);
-    for (const chunk of chunks) {
-      const chunkText = chunk.map((c) => styles.allCaps ? c.char.toUpperCase() : c.char).join("");
-      if (chunkText.length === 0) continue;
+    if (styles.shadow) {
       writer.drawText(pageIndex, {
-        x: pxToPt$1(originX + chunk[0].left),
-        y: pxToPt$1(baselineY),
-        text: chunkText,
-        fontSize: fontSizePt,
-        color: styles.color ?? "#000000",
-        bold: styles.bold,
-        italic: styles.italic,
-        fontResourceName: fontFace.writerResourceName,
-        characterSpacing: styles.characterSpacing ?? 0,
-        horizontalScale: styles.characterScale ?? 100
+        ...baseTextOptions,
+        x: pxToPt$1(leftPx) + offsetPt,
+        y: pxToPt$1(baselineY) + offsetPt,
+        text: text2,
+        color: "#808080"
       });
     }
+    writer.drawText(pageIndex, {
+      ...baseTextOptions,
+      x: pxToPt$1(leftPx),
+      y: pxToPt$1(baselineY),
+      text: text2,
+      color: mainColor,
+      renderMode: styles.outline ? 1 : 0
+    });
+  };
+  const chunks = paragraphAlign === "justify" ? groupSlotChunksByWhitespace(chars) : groupSlotChunksByOffsetGaps(chars);
+  for (const chunk of chunks) {
+    const chunkText = chunk.map((c) => styles.allCaps ? c.char.toUpperCase() : c.char).join("");
+    if (chunkText.length === 0) continue;
+    emitChunk(originX + chunk[0].left, chunkText);
   }
   if (styles.underline) {
     drawFragmentDecoration(
@@ -35917,6 +36598,17 @@ async function drawFragmentText(writer, pageIndex, paragraph, line, fragment, do
       "doubleStrike"
     );
   }
+  if (styles.emphasisMark) {
+    drawFragmentEmphasis(
+      writer,
+      pageIndex,
+      line,
+      fragment,
+      originX,
+      originY,
+      styles
+    );
+  }
 }
 function getListOrdinals(document2) {
   return buildListLabels(document2);
@@ -36082,6 +36774,28 @@ function drawCellBorders(writer, pageIndex, cell, originX, originY) {
     bottom
   );
   drawCellEdge(writer, pageIndex, cell.borders.left, left, top, left, bottom);
+  if (cell.borders.topLeftToBottomRight) {
+    drawCellEdge(
+      writer,
+      pageIndex,
+      cell.borders.topLeftToBottomRight,
+      left,
+      top,
+      right,
+      bottom
+    );
+  }
+  if (cell.borders.topRightToBottomLeft) {
+    drawCellEdge(
+      writer,
+      pageIndex,
+      cell.borders.topRightToBottomLeft,
+      right,
+      top,
+      left,
+      bottom
+    );
+  }
 }
 async function drawTableBlock(writer, pageIndex, block, document2, originX, originY, contentWidth, fontRegistry, listOrdinals, drawers) {
   if (block.sourceBlock.type !== "table") {
@@ -36114,6 +36828,17 @@ async function drawTableBlock(writer, pageIndex, block, document2, originX, orig
   }
   for (const cell of tableLayout.cells) {
     drawCellBorders(writer, pageIndex, cell, originX, originY);
+    if (cell.revision) {
+      const color = cell.revision.type === "insert" ? "#059669" : cell.revision.type === "delete" ? "#dc2626" : "#d97706";
+      writer.drawRect(pageIndex, {
+        x: pxToPt$1(originX + cell.left + 1),
+        y: pxToPt$1(originY + cell.top + 1),
+        width: pxToPt$1(Math.max(0, cell.width - 2)),
+        height: pxToPt$1(Math.max(0, cell.height - 2)),
+        stroke: color,
+        lineWidth: pxToPt$1(2)
+      });
+    }
   }
   for (const cell of tableLayout.cells) {
     for (const paragraphLayout of cell.paragraphs) {
@@ -36134,6 +36859,7 @@ async function drawTableBlock(writer, pageIndex, block, document2, originX, orig
 }
 const blockDrawers = { drawParagraph, drawTableBlock };
 async function drawBlockList(writer, pageIndex, blocks, document2, originX, originY, contentWidth, fontRegistry, listOrdinals, pageSettings) {
+  var _a;
   if (!blocks || blocks.length === 0) {
     return;
   }
@@ -36161,6 +36887,34 @@ async function drawBlockList(writer, pageIndex, blocks, document2, originX, orig
           boxTop,
           contentWidth
         );
+        if (pageSettings) {
+          await drawFloatingImagesForParagraph({
+            writer,
+            pageIndex,
+            lines: block.layout.lines,
+            document: document2,
+            pageSettings,
+            contentLeft: originX,
+            contentTop,
+            contentWidth,
+            paragraphTop: textTop,
+            layer: "behind"
+          });
+          await drawFloatingTextBoxesForParagraph({
+            writer,
+            document: document2,
+            fontRegistry,
+            pageIndex,
+            lines: block.layout.lines,
+            pageSettings,
+            contentLeft: originX,
+            contentTop,
+            contentWidth,
+            paragraphTop: boxTop,
+            drawers: blockDrawers,
+            layer: "behind"
+          });
+        }
         await drawParagraph(
           writer,
           pageIndex,
@@ -36174,6 +36928,18 @@ async function drawBlockList(writer, pageIndex, blocks, document2, originX, orig
           blockDrawers
         );
         if (pageSettings) {
+          await drawFloatingImagesForParagraph({
+            writer,
+            pageIndex,
+            lines: block.layout.lines,
+            document: document2,
+            pageSettings,
+            contentLeft: originX,
+            contentTop,
+            contentWidth,
+            paragraphTop: textTop,
+            layer: "front"
+          });
           await drawFloatingTextBoxesForParagraph({
             writer,
             document: document2,
@@ -36185,12 +36951,44 @@ async function drawBlockList(writer, pageIndex, blocks, document2, originX, orig
             contentTop,
             contentWidth,
             paragraphTop: boxTop,
-            drawers: blockDrawers
+            drawers: blockDrawers,
+            layer: "front"
           });
         }
         break;
       }
       case "table":
+        if (((_a = block.sourceBlock.style) == null ? void 0 : _a.floating) && pageSettings) {
+          const width = resolveCanvasTableWidth(
+            block.sourceBlock,
+            contentWidth
+          );
+          const rect = resolveFloatingTableRect({
+            floating: block.sourceBlock.style.floating,
+            pageSettings,
+            contentLeft: originX,
+            contentTop,
+            contentWidth,
+            anchorTop: cursorY,
+            width,
+            height: block.floatingTableHeight ?? 1,
+            pageIndex
+          });
+          rect.y += block.floatingTableOffsetY ?? 0;
+          await drawTableBlock(
+            writer,
+            pageIndex,
+            { ...block, estimatedHeight: rect.height },
+            document2,
+            rect.x,
+            rect.y,
+            contentWidth,
+            fontRegistry,
+            listOrdinals,
+            blockDrawers
+          );
+          break;
+        }
         await drawTableBlock(
           writer,
           pageIndex,
@@ -36382,227 +37180,6 @@ class PdfFontRegistry {
     return matchedFamilies;
   }
 }
-class SimpleTextLayouter {
-  constructor(font) {
-    this.font = font;
-  }
-  layout(text) {
-    const glyphs = [];
-    const positions = [];
-    let advanceWidth = 0;
-    for (const char of text) {
-      const codePoint = char.codePointAt(0) ?? 65533;
-      const glyphId = this.font.glyphForCodePoint(codePoint);
-      const glyphAdvance = this.font.advanceWidthForGlyph(glyphId);
-      glyphs.push({
-        id: glyphId,
-        codePoints: glyphId === 0 ? [65533] : [codePoint],
-        advanceWidth: glyphAdvance
-      });
-      positions.push({ xAdvance: glyphAdvance });
-      advanceWidth += glyphAdvance;
-    }
-    return { glyphs, positions, advanceWidth };
-  }
-}
-function view(bytes) {
-  return new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
-}
-function u16(bytes, offset) {
-  return view(bytes).getUint16(offset);
-}
-function i16(bytes, offset) {
-  return view(bytes).getInt16(offset);
-}
-function writeU16(target, offset, value) {
-  view(target).setUint16(offset, value, false);
-}
-function writeU32(target, offset, value) {
-  view(target).setUint32(offset, value, false);
-}
-function pad4(length) {
-  return length + 3 & -4;
-}
-function concat(chunks) {
-  const total = chunks.reduce((sum, chunk) => sum + pad4(chunk.byteLength), 0);
-  const result = new Uint8Array(total);
-  let offset = 0;
-  for (const chunk of chunks) {
-    result.set(chunk, offset);
-    offset += pad4(chunk.byteLength);
-  }
-  return result;
-}
-function readLoca(loca, indexToLocFormat) {
-  const offsets = [];
-  const table = view(loca);
-  if (indexToLocFormat === 0) {
-    for (let offset = 0; offset + 1 < loca.byteLength; offset += 2) {
-      offsets.push(table.getUint16(offset) * 2);
-    }
-  } else {
-    for (let offset = 0; offset + 3 < loca.byteLength; offset += 4) {
-      offsets.push(table.getUint32(offset));
-    }
-  }
-  return offsets;
-}
-function glyphRange(offsets, glyphId) {
-  const start = offsets[glyphId];
-  const end = offsets[glyphId + 1];
-  return start === void 0 || end === void 0 ? null : { start, end };
-}
-function collectCompositeGlyphs(glyph, addGlyph) {
-  if (glyph.byteLength < 10 || i16(glyph, 0) >= 0) {
-    return;
-  }
-  let offset = 10;
-  let flags = 0;
-  do {
-    if (offset + 4 > glyph.byteLength) return;
-    flags = u16(glyph, offset);
-    addGlyph(u16(glyph, offset + 2));
-    offset += 4;
-    offset += flags & 1 ? 4 : 2;
-    if (flags & 8) offset += 2;
-    else if (flags & 64) offset += 4;
-    else if (flags & 128) offset += 8;
-  } while (flags & 32);
-}
-function subsetClosure(font, initialGlyphs) {
-  const glyf = font.getRawTableData("glyf");
-  const loca = font.getRawTableData("loca");
-  const head = font.getRawTableData("head");
-  if (!glyf || !loca || !head) {
-    return Array.from(/* @__PURE__ */ new Set([0, ...initialGlyphs])).sort((a, b) => a - b);
-  }
-  const offsets = readLoca(loca, u16(head, 50));
-  const used = /* @__PURE__ */ new Set([0, ...initialGlyphs]);
-  const stack = Array.from(used);
-  while (stack.length > 0) {
-    const glyphId = stack.pop();
-    const range = glyphRange(offsets, glyphId);
-    if (!range || range.end <= range.start || range.end > glyf.byteLength) {
-      continue;
-    }
-    const glyph = glyf.slice(range.start, range.end);
-    collectCompositeGlyphs(glyph, (componentId) => {
-      if (!used.has(componentId)) {
-        used.add(componentId);
-        stack.push(componentId);
-      }
-    });
-  }
-  return Array.from(used).sort((a, b) => a - b);
-}
-function buildLoca(offsets) {
-  const loca = new Uint8Array(offsets.length * 4);
-  offsets.forEach((offset, index) => writeU32(loca, index * 4, offset));
-  return loca;
-}
-function buildHmtx(font, maxGlyphId) {
-  const hmtx = new Uint8Array((maxGlyphId + 1) * 4);
-  for (let glyphId = 0; glyphId <= maxGlyphId; glyphId += 1) {
-    writeU16(hmtx, glyphId * 4, font.advanceWidthForGlyph(glyphId));
-    writeU16(hmtx, glyphId * 4 + 2, 0);
-  }
-  return hmtx;
-}
-function buildSubsetTables(font, glyphIds) {
-  const glyf = font.getRawTableData("glyf");
-  const loca = font.getRawTableData("loca");
-  const head = font.getRawTableData("head");
-  const hhea = font.getRawTableData("hhea");
-  const maxp = font.getRawTableData("maxp");
-  const cmap = font.getRawTableData("cmap");
-  if (!glyf || !loca || !head || !hhea || !maxp || !cmap) {
-    throw new Error("Missing required TrueType tables for subsetting");
-  }
-  const maxGlyphId = Math.max(0, ...glyphIds);
-  const used = new Set(glyphIds);
-  const sourceOffsets = readLoca(loca, u16(head, 50));
-  const locaOffsets = [];
-  const glyfChunks = [];
-  let glyfOffset = 0;
-  for (let glyphId = 0; glyphId <= maxGlyphId; glyphId += 1) {
-    locaOffsets.push(glyfOffset);
-    const range = glyphRange(sourceOffsets, glyphId);
-    if (used.has(glyphId) && range && range.end > range.start) {
-      const glyph = glyf.slice(range.start, range.end);
-      glyfChunks.push(glyph);
-      glyfOffset += pad4(glyph.byteLength);
-    }
-  }
-  locaOffsets.push(glyfOffset);
-  const newHead = head.slice();
-  writeU32(newHead, 8, 0);
-  writeU16(newHead, 50, 1);
-  const newHhea = hhea.slice();
-  writeU16(newHhea, 34, maxGlyphId + 1);
-  const newMaxp = maxp.slice();
-  writeU16(newMaxp, 4, maxGlyphId + 1);
-  const tables = {
-    cmap,
-    head: newHead,
-    hhea: newHhea,
-    hmtx: buildHmtx(font, maxGlyphId),
-    loca: buildLoca(locaOffsets),
-    maxp: newMaxp,
-    glyf: concat(glyfChunks)
-  };
-  for (const tag of ["OS/2", "name", "post"]) {
-    const table = font.getRawTableData(tag);
-    if (table) tables[tag] = table;
-  }
-  return tables;
-}
-class TrueTypePdfFontSubsetter {
-  createSubset(font, glyphs) {
-    const unicodeByGlyph = /* @__PURE__ */ new Map();
-    const initialGlyphs = [];
-    for (const glyph of glyphs) {
-      initialGlyphs.push(glyph.id);
-      if (!unicodeByGlyph.has(glyph.id)) {
-        unicodeByGlyph.set(glyph.id, glyph.codePoints);
-      }
-    }
-    const glyphIds = subsetClosure(font, initialGlyphs);
-    const tables = buildSubsetTables(font, glyphIds);
-    const fontFile = buildSfnt(
-      65536,
-      new Map(
-        Object.entries(tables).map(([tag, data]) => [
-          tag.charCodeAt(0) << 24 | tag.charCodeAt(1) << 16 | tag.charCodeAt(2) << 8 | tag.charCodeAt(3),
-          data
-        ])
-      )
-    ).ttf;
-    const maxGlyphId = Math.max(0, ...glyphIds);
-    const widths = [];
-    const unicode = [];
-    for (let glyphId = 0; glyphId <= maxGlyphId; glyphId += 1) {
-      widths[glyphId] = font.advanceWidthForGlyph(glyphId) / font.unitsPerEm * 1e3;
-      unicode[glyphId] = unicodeByGlyph.get(glyphId) ?? [0];
-    }
-    return {
-      fontFile,
-      widths,
-      unicode,
-      encodeGlyph: (glyphId) => glyphId
-    };
-  }
-}
-function parseEmbeddedFontSync(sourceBytes) {
-  const sfntBytes = defaultFontDecoderRegistry.decodeSync(sourceBytes);
-  return SfntFontProgram.parse(sfntBytes);
-}
-function createPdfEmbeddableFont(program) {
-  return {
-    program,
-    layouter: new SimpleTextLayouter(program),
-    subsetter: new TrueTypePdfFontSubsetter()
-  };
-}
 const PDF_HEADER = "%PDF-1.4\n% Oasis PDF\n";
 const DEFAULT_PDF_FONT_RESOURCES = [
   { kind: "base14", resourceName: "F1", baseFont: "Helvetica" },
@@ -36796,53 +37373,15 @@ function textMarkerComment(value) {
   );
   return `% OasisText ${encodePdfUtf16Hex(codePoints)}`;
 }
-class OasisPdfWriter {
-  constructor(fontResources = DEFAULT_PDF_FONT_RESOURCES) {
-    __publicField(this, "pages", []);
-    __publicField(this, "fontResources", /* @__PURE__ */ new Map());
-    __publicField(this, "unicodeFontStates", /* @__PURE__ */ new Map());
-    __publicField(this, "usedFontResourceNames", /* @__PURE__ */ new Set());
-    __publicField(this, "imageResources", /* @__PURE__ */ new Map());
-    for (const resource of fontResources) {
-      this.registerFontResource(resource);
-    }
+class PdfContentStream {
+  constructor(page, fonts, images) {
+    this.page = page;
+    this.fonts = fonts;
+    this.images = images;
   }
-  registerFontResource(resource) {
-    this.fontResources.set(resource.resourceName, resource);
-    if (resource.kind === "unicode" && !this.unicodeFontStates.has(resource.resourceName)) {
-      const font = createPdfEmbeddableFont(
-        parseEmbeddedFontSync(resource.fontData)
-      );
-      const scale = 1e3 / font.program.unitsPerEm;
-      const notdef = {
-        id: 0,
-        codePoints: [0],
-        advanceWidth: font.program.advanceWidthForGlyph(0)
-      };
-      this.unicodeFontStates.set(resource.resourceName, {
-        resource,
-        font,
-        usedGlyphs: /* @__PURE__ */ new Map([[0, notdef]]),
-        scale,
-        layoutCache: /* @__PURE__ */ new Map()
-      });
-    }
-  }
-  addPage(size) {
-    this.pages.push({
-      width: Math.max(1, size.width),
-      height: Math.max(1, size.height),
-      commands: [],
-      imageResourceNames: /* @__PURE__ */ new Set()
-    });
-    return this.pages.length - 1;
-  }
-  getPageCount() {
-    return this.pages.length;
-  }
-  drawRect(pageIndex, options) {
-    const page = this.pages[pageIndex];
-    if (!page || options.width <= 0 || options.height <= 0) {
+  drawRect(options) {
+    const page = this.page;
+    if (options.width <= 0 || options.height <= 0) {
       return;
     }
     const commands = ["q"];
@@ -36872,11 +37411,8 @@ class OasisPdfWriter {
     commands.push("Q");
     page.commands.push(commands.join("\n"));
   }
-  drawLine(pageIndex, options) {
-    const page = this.pages[pageIndex];
-    if (!page) {
-      return;
-    }
+  drawLine(options) {
+    const page = this.page;
     const dashCommand = options.dashArray && options.dashArray.length > 0 ? `[${options.dashArray.map((value) => formatNumber(value)).join(" ")}] 0 d` : null;
     const commands = [
       "q",
@@ -36897,9 +37433,9 @@ class OasisPdfWriter {
   // Fills/strokes an arbitrary path. Segment coordinates are in points with a
   // top-left origin (callers convert px→pt, like drawRect/drawLine); the y axis
   // is flipped here to the PDF bottom-left origin.
-  drawPath(pageIndex, options) {
-    const page = this.pages[pageIndex];
-    if (!page || options.segments.length === 0) {
+  drawPath(options) {
+    const page = this.page;
+    if (options.segments.length === 0) {
       return;
     }
     if (!options.fill && !options.stroke) {
@@ -36948,24 +37484,18 @@ class OasisPdfWriter {
   }
   // Saves the graphics state (`q`). Pair with restoreGraphicsState. Any draw
   // commands emitted in between inherit the current transform/clip.
-  saveGraphicsState(pageIndex) {
-    const page = this.pages[pageIndex];
-    if (page) {
-      page.commands.push("q");
-    }
+  saveGraphicsState() {
+    this.page.commands.push("q");
   }
-  restoreGraphicsState(pageIndex) {
-    const page = this.pages[pageIndex];
-    if (page) {
-      page.commands.push("Q");
-    }
+  restoreGraphicsState() {
+    this.page.commands.push("Q");
   }
   // Concatenates a clockwise rotation (in degrees, matching the canvas/editor
   // convention) about a top-left-origin point onto the current CTM. Must sit
   // inside a saveGraphicsState/restoreGraphicsState pair.
-  rotateAbout(pageIndex, centerX, centerY, degrees) {
-    const page = this.pages[pageIndex];
-    if (!page || !degrees) {
+  rotateAbout(centerX, centerY, degrees) {
+    const page = this.page;
+    if (!degrees) {
       return;
     }
     const cyf = page.height - centerY;
@@ -36980,9 +37510,9 @@ class OasisPdfWriter {
   }
   // Intersects the clip path with a rectangle (top-left origin). Must sit inside
   // a saveGraphicsState/restoreGraphicsState pair so the clip can be undone.
-  clipRect(pageIndex, x, y, width, height) {
-    const page = this.pages[pageIndex];
-    if (!page || width <= 0 || height <= 0) {
+  clipRect(x, y, width, height) {
+    const page = this.page;
+    if (width <= 0 || height <= 0) {
       return;
     }
     page.commands.push(
@@ -36991,48 +37521,42 @@ class OasisPdfWriter {
       "n"
     );
   }
-  drawText(pageIndex, options) {
-    const page = this.pages[pageIndex];
-    if (!page || options.text.length === 0) {
+  drawText(options) {
+    if (options.text.length === 0) {
       return;
     }
-    const fontResourceName = resolveFontName(options);
-    this.usedFontResourceNames.add(fontResourceName);
-    const unicodeFont = this.unicodeFontStates.get(fontResourceName);
-    if (unicodeFont) {
-      this.drawUnicodeText(page, unicodeFont, options);
+    const fontResourceName = this.fonts.resolveAndMarkFontName(options);
+    const unicodeState = this.fonts.getUnicodeState(fontResourceName);
+    const showCommand = unicodeState ? this.fonts.buildUnicodeShowCommand(unicodeState, options.text) : `<${encodePdfHexString(options.text)}> Tj`;
+    if (showCommand === null) {
       return;
     }
+    this.emitTextBlock(fontResourceName, showCommand, options);
+  }
+  emitTextBlock(fontResourceName, showCommand, options) {
+    const page = this.page;
     page.commands.push(
       [
         textMarkerComment(options.text),
         "BT",
         colorCommand(options.color, "rg", [0, 0, 0]),
         `/${fontResourceName} ${formatNumber(options.fontSize ?? 12)} Tf`,
+        ...options.renderMode && options.renderMode !== 0 ? [
+          colorCommand(options.color, "RG", [0, 0, 0]),
+          `${formatNumber(Math.max(0.3, (options.fontSize ?? 12) * 0.03))} w`,
+          `${options.renderMode} Tr`
+        ] : [],
         ...options.horizontalScale && options.horizontalScale > 0 && options.horizontalScale !== 100 ? [`${formatNumber(options.horizontalScale)} Tz`] : [],
         ...options.characterSpacing && options.characterSpacing !== 0 ? [`${formatNumber(options.characterSpacing)} Tc`] : [],
         `${formatNumber(options.x)} ${formatNumber(page.height - options.y)} Td`,
-        `<${encodePdfHexString(options.text)}> Tj`,
+        showCommand,
         "ET"
       ].join("\n")
     );
   }
-  registerImageResource(resource) {
-    const resourceName = resource.resourceName ?? `Im${this.imageResources.size + 1}`;
-    if (!this.imageResources.has(resourceName)) {
-      this.imageResources.set(resourceName, {
-        resourceName,
-        width: Math.max(1, Math.round(resource.width)),
-        height: Math.max(1, Math.round(resource.height)),
-        data: resource.data,
-        filter: resource.filter
-      });
-    }
-    return resourceName;
-  }
-  drawImage(pageIndex, options) {
-    const page = this.pages[pageIndex];
-    if (!page || options.width <= 0 || options.height <= 0 || !this.imageResources.has(options.resourceName)) {
+  drawImage(options) {
+    const page = this.page;
+    if (options.width <= 0 || options.height <= 0 || !this.images.has(options.resourceName)) {
       return;
     }
     page.imageResourceNames.add(options.resourceName);
@@ -37083,72 +37607,292 @@ class OasisPdfWriter {
       ].join("\n")
     );
   }
-  layoutUnicodeText(state, text) {
-    const cached = state.layoutCache.get(text);
-    if (cached) {
-      return cached;
+}
+class SimpleTextLayouter {
+  constructor(font) {
+    this.font = font;
+  }
+  layout(text) {
+    const glyphs = [];
+    const positions = [];
+    let advanceWidth = 0;
+    for (const char of text) {
+      const codePoint = char.codePointAt(0) ?? 65533;
+      const glyphId = this.font.glyphForCodePoint(codePoint);
+      const glyphAdvance = this.font.advanceWidthForGlyph(glyphId);
+      glyphs.push({
+        id: glyphId,
+        codePoints: glyphId === 0 ? [65533] : [codePoint],
+        advanceWidth: glyphAdvance
+      });
+      positions.push({ xAdvance: glyphAdvance });
+      advanceWidth += glyphAdvance;
     }
-    const run = state.font.layouter.layout(text);
-    state.layoutCache.set(text, run);
-    return run;
+    return { glyphs, positions, advanceWidth };
   }
-  encodeUnicodeGlyphRun(state, run) {
-    return run.glyphs.map((glyph, index) => {
-      if (!state.usedGlyphs.has(glyph.id)) {
-        state.usedGlyphs.set(glyph.id, glyph);
+}
+function view(bytes) {
+  return new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+}
+function u16(bytes, offset) {
+  return view(bytes).getUint16(offset);
+}
+function i16(bytes, offset) {
+  return view(bytes).getInt16(offset);
+}
+function writeU16(target, offset, value) {
+  view(target).setUint16(offset, value, false);
+}
+function writeU32(target, offset, value) {
+  view(target).setUint32(offset, value, false);
+}
+function pad4(length) {
+  return length + 3 & -4;
+}
+function concat(chunks) {
+  const total = chunks.reduce((sum, chunk) => sum + pad4(chunk.byteLength), 0);
+  const result = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    result.set(chunk, offset);
+    offset += pad4(chunk.byteLength);
+  }
+  return result;
+}
+function readLoca(loca, indexToLocFormat) {
+  const offsets = [];
+  const table = view(loca);
+  if (indexToLocFormat === 0) {
+    for (let offset = 0; offset + 1 < loca.byteLength; offset += 2) {
+      offsets.push(table.getUint16(offset) * 2);
+    }
+  } else {
+    for (let offset = 0; offset + 3 < loca.byteLength; offset += 4) {
+      offsets.push(table.getUint32(offset));
+    }
+  }
+  return offsets;
+}
+function glyphRange(offsets, glyphId) {
+  const start = offsets[glyphId];
+  const end = offsets[glyphId + 1];
+  return start === void 0 || end === void 0 ? null : { start, end };
+}
+function collectCompositeGlyphs(glyph, addGlyph) {
+  if (glyph.byteLength < 10 || i16(glyph, 0) >= 0) {
+    return;
+  }
+  let offset = 10;
+  let flags = 0;
+  do {
+    if (offset + 4 > glyph.byteLength) return;
+    flags = u16(glyph, offset);
+    addGlyph(u16(glyph, offset + 2));
+    offset += 4;
+    offset += flags & 1 ? 4 : 2;
+    if (flags & 8) offset += 2;
+    else if (flags & 64) offset += 4;
+    else if (flags & 128) offset += 8;
+  } while (flags & 32);
+}
+function subsetClosure(font, initialGlyphs) {
+  const glyf = font.getRawTableData("glyf");
+  const loca = font.getRawTableData("loca");
+  const head = font.getRawTableData("head");
+  if (!glyf || !loca || !head) {
+    return Array.from(/* @__PURE__ */ new Set([0, ...initialGlyphs])).sort((a, b) => a - b);
+  }
+  const offsets = readLoca(loca, u16(head, 50));
+  const used = /* @__PURE__ */ new Set([0, ...initialGlyphs]);
+  const stack = Array.from(used);
+  while (stack.length > 0) {
+    const glyphId = stack.pop();
+    const range = glyphRange(offsets, glyphId);
+    if (!range || range.end <= range.start || range.end > glyf.byteLength) {
+      continue;
+    }
+    const glyph = glyf.slice(range.start, range.end);
+    collectCompositeGlyphs(glyph, (componentId) => {
+      if (!used.has(componentId)) {
+        used.add(componentId);
+        stack.push(componentId);
       }
-      const position = run.positions[index];
-      const nominalWidth = glyph.advanceWidth * state.scale;
-      const desiredAdvance = ((position == null ? void 0 : position.xAdvance) ?? glyph.advanceWidth) * state.scale;
-      return { glyphId: glyph.id, nominalWidth, desiredAdvance };
     });
   }
-  drawUnicodeText(page, state, options) {
-    const run = this.layoutUnicodeText(state, options.text);
+  return Array.from(used).sort((a, b) => a - b);
+}
+function buildLoca(offsets) {
+  const loca = new Uint8Array(offsets.length * 4);
+  offsets.forEach((offset, index) => writeU32(loca, index * 4, offset));
+  return loca;
+}
+function buildHmtx(font, maxGlyphId) {
+  const hmtx = new Uint8Array((maxGlyphId + 1) * 4);
+  for (let glyphId = 0; glyphId <= maxGlyphId; glyphId += 1) {
+    writeU16(hmtx, glyphId * 4, font.advanceWidthForGlyph(glyphId));
+    writeU16(hmtx, glyphId * 4 + 2, 0);
+  }
+  return hmtx;
+}
+function buildSubsetTables(font, glyphIds) {
+  const glyf = font.getRawTableData("glyf");
+  const loca = font.getRawTableData("loca");
+  const head = font.getRawTableData("head");
+  const hhea = font.getRawTableData("hhea");
+  const maxp = font.getRawTableData("maxp");
+  const cmap = font.getRawTableData("cmap");
+  if (!glyf || !loca || !head || !hhea || !maxp || !cmap) {
+    throw new Error("Missing required TrueType tables for subsetting");
+  }
+  const maxGlyphId = Math.max(0, ...glyphIds);
+  const used = new Set(glyphIds);
+  const sourceOffsets = readLoca(loca, u16(head, 50));
+  const locaOffsets = [];
+  const glyfChunks = [];
+  let glyfOffset = 0;
+  for (let glyphId = 0; glyphId <= maxGlyphId; glyphId += 1) {
+    locaOffsets.push(glyfOffset);
+    const range = glyphRange(sourceOffsets, glyphId);
+    if (used.has(glyphId) && range && range.end > range.start) {
+      const glyph = glyf.slice(range.start, range.end);
+      glyfChunks.push(glyph);
+      glyfOffset += pad4(glyph.byteLength);
+    }
+  }
+  locaOffsets.push(glyfOffset);
+  const newHead = head.slice();
+  writeU32(newHead, 8, 0);
+  writeU16(newHead, 50, 1);
+  const newHhea = hhea.slice();
+  writeU16(newHhea, 34, maxGlyphId + 1);
+  const newMaxp = maxp.slice();
+  writeU16(newMaxp, 4, maxGlyphId + 1);
+  const tables = {
+    cmap,
+    head: newHead,
+    hhea: newHhea,
+    hmtx: buildHmtx(font, maxGlyphId),
+    loca: buildLoca(locaOffsets),
+    maxp: newMaxp,
+    glyf: concat(glyfChunks)
+  };
+  for (const tag of ["OS/2", "name", "post"]) {
+    const table = font.getRawTableData(tag);
+    if (table) tables[tag] = table;
+  }
+  return tables;
+}
+class TrueTypePdfFontSubsetter {
+  createSubset(font, glyphs) {
+    const unicodeByGlyph = /* @__PURE__ */ new Map();
+    const initialGlyphs = [];
+    for (const glyph of glyphs) {
+      initialGlyphs.push(glyph.id);
+      if (!unicodeByGlyph.has(glyph.id)) {
+        unicodeByGlyph.set(glyph.id, glyph.codePoints);
+      }
+    }
+    const glyphIds = subsetClosure(font, initialGlyphs);
+    const tables = buildSubsetTables(font, glyphIds);
+    const fontFile = buildSfnt(
+      65536,
+      new Map(
+        Object.entries(tables).map(([tag, data]) => [
+          tag.charCodeAt(0) << 24 | tag.charCodeAt(1) << 16 | tag.charCodeAt(2) << 8 | tag.charCodeAt(3),
+          data
+        ])
+      )
+    ).ttf;
+    const maxGlyphId = Math.max(0, ...glyphIds);
+    const widths = [];
+    const unicode = [];
+    for (let glyphId = 0; glyphId <= maxGlyphId; glyphId += 1) {
+      widths[glyphId] = font.advanceWidthForGlyph(glyphId) / font.unitsPerEm * 1e3;
+      unicode[glyphId] = unicodeByGlyph.get(glyphId) ?? [0];
+    }
+    return {
+      fontFile,
+      widths,
+      unicode,
+      encodeGlyph: (glyphId) => glyphId
+    };
+  }
+}
+function parseEmbeddedFontSync(sourceBytes) {
+  const sfntBytes = defaultFontDecoderRegistry.decodeSync(sourceBytes);
+  return SfntFontProgram.parse(sfntBytes);
+}
+function createPdfEmbeddableFont(program) {
+  return {
+    program,
+    layouter: new SimpleTextLayouter(program),
+    subsetter: new TrueTypePdfFontSubsetter()
+  };
+}
+class PdfFontTable {
+  constructor(fontResources) {
+    __publicField(this, "fontResources", /* @__PURE__ */ new Map());
+    __publicField(this, "unicodeFontStates", /* @__PURE__ */ new Map());
+    __publicField(this, "usedFontResourceNames", /* @__PURE__ */ new Set());
+    for (const resource of fontResources) {
+      this.registerFontResource(resource);
+    }
+  }
+  registerFontResource(resource) {
+    this.fontResources.set(resource.resourceName, resource);
+    if (resource.kind === "unicode" && !this.unicodeFontStates.has(resource.resourceName)) {
+      const font = createPdfEmbeddableFont(
+        parseEmbeddedFontSync(resource.fontData)
+      );
+      const scale = 1e3 / font.program.unitsPerEm;
+      const notdef = {
+        id: 0,
+        codePoints: [0],
+        advanceWidth: font.program.advanceWidthForGlyph(0)
+      };
+      this.unicodeFontStates.set(resource.resourceName, {
+        resource,
+        font,
+        usedGlyphs: /* @__PURE__ */ new Map([[0, notdef]]),
+        scale,
+        layoutCache: /* @__PURE__ */ new Map()
+      });
+    }
+  }
+  /** Resolves the font resource a run uses and marks it as referenced. */
+  resolveAndMarkFontName(options) {
+    const fontResourceName = resolveFontName(options);
+    this.usedFontResourceNames.add(fontResourceName);
+    return fontResourceName;
+  }
+  getUnicodeState(resourceName) {
+    return this.unicodeFontStates.get(resourceName);
+  }
+  /**
+   * Builds the glyph-show operator (`<...> Tj` or `[...] TJ`) for an embedded
+   * Unicode run, recording the glyphs used for subsetting. Returns `null` when
+   * the run produced no glyphs so the caller can skip emission entirely.
+   */
+  buildUnicodeShowCommand(state, text) {
+    const run = this.layoutUnicodeText(state, text);
     const encoded = this.encodeUnicodeGlyphRun(state, run);
     if (encoded.length === 0) {
-      return;
+      return null;
     }
     const usesAdjustments = encoded.some(
       (glyph) => Math.abs(glyph.nominalWidth - glyph.desiredAdvance) > 0.01
     );
-    const textCommand = usesAdjustments ? `[${encoded.map((glyph) => {
+    return usesAdjustments ? `[${encoded.map((glyph) => {
       const adjustment = glyph.nominalWidth - glyph.desiredAdvance;
       return adjustment === 0 ? `<${encodeGlyphHex(glyph.glyphId)}>` : `<${encodeGlyphHex(glyph.glyphId)}> ${formatNumber(adjustment)}`;
     }).join(" ")}] TJ` : `<${encoded.map((glyph) => encodeGlyphHex(glyph.glyphId)).join("")}> Tj`;
-    page.commands.push(
-      [
-        textMarkerComment(options.text),
-        "BT",
-        colorCommand(options.color, "rg", [0, 0, 0]),
-        `/${state.resource.resourceName} ${formatNumber(options.fontSize ?? 12)} Tf`,
-        ...options.horizontalScale && options.horizontalScale > 0 && options.horizontalScale !== 100 ? [`${formatNumber(options.horizontalScale)} Tz`] : [],
-        ...options.characterSpacing && options.characterSpacing !== 0 ? [`${formatNumber(options.characterSpacing)} Tc`] : [],
-        `${formatNumber(options.x)} ${formatNumber(page.height - options.y)} Td`,
-        textCommand,
-        "ET"
-      ].join("\n")
-    );
   }
-  toArrayBuffer() {
-    const bytes = this.toUint8Array();
-    return Uint8Array.from(bytes).buffer;
-  }
-  toBlob() {
-    return new Blob([this.toArrayBuffer()], { type: "application/pdf" });
-  }
-  toUint8Array() {
-    if (this.pages.length === 0) {
-      this.addPage({ width: 612, height: 792 });
-    }
-    const objects = [];
-    const addObject = (body2) => {
-      const id = objects.length + 1;
-      objects.push({ id, body: body2 });
-      return id;
-    };
-    const catalogObjectId = addObject("");
-    const pagesObjectId = addObject("");
+  /**
+   * Emits the font objects (base-14 dictionaries and embedded Unicode font
+   * programs) for every referenced resource and returns the `/Font` resource
+   * dictionary XML for page objects.
+   */
+  buildFontObjects(addObject) {
     const fontResourceEntries = Array.from(this.fontResources.values()).filter(
       (resource) => resource.kind === "base14" || this.usedFontResourceNames.has(resource.resourceName)
     );
@@ -37161,86 +37905,28 @@ class OasisPdfWriter {
       }
       return addObject(fontResourceObjectBody(font));
     });
-    const fontResourceXml = fontResourceEntries.map((font, index) => `/${font.resourceName} ${fontObjectIds[index]} 0 R`).join(" ");
-    const imageObjectIds = /* @__PURE__ */ new Map();
-    for (const image of this.imageResources.values()) {
-      imageObjectIds.set(
-        image.resourceName,
-        this.addImageObject(image, addObject)
-      );
-    }
-    const pageObjectIds = [];
-    for (const page of this.pages) {
-      const stream = `${page.commands.join("\n")}
-`;
-      const contentObjectId = addObject(
-        `<< /Length ${byteLength(stream)} >>
-stream
-${stream}endstream`
-      );
-      const imageResourceXml = Array.from(page.imageResourceNames).map((resourceName) => {
-        const objectId = imageObjectIds.get(resourceName);
-        return objectId ? `/${resourceName} ${objectId} 0 R` : "";
-      }).filter(Boolean).join(" ");
-      const xObjectResourceXml = imageResourceXml ? ` /XObject << ${imageResourceXml} >>` : "";
-      const pageObjectId = addObject(
-        [
-          "<< /Type /Page",
-          `/Parent ${pagesObjectId} 0 R`,
-          `/MediaBox [0 0 ${formatNumber(page.width)} ${formatNumber(page.height)}]`,
-          `/Resources << /Font << ${fontResourceXml} >>${xObjectResourceXml} >>`,
-          `/Contents ${contentObjectId} 0 R`,
-          ">>"
-        ].join("\n")
-      );
-      pageObjectIds.push(pageObjectId);
-    }
-    objects[catalogObjectId - 1].body = `<< /Type /Catalog /Pages ${pagesObjectId} 0 R >>`;
-    objects[pagesObjectId - 1].body = [
-      "<< /Type /Pages",
-      `/Kids [${pageObjectIds.map((id) => `${id} 0 R`).join(" ")}]`,
-      `/Count ${pageObjectIds.length}`,
-      ">>"
-    ].join("\n");
-    let body = PDF_HEADER;
-    const offsets = [0];
-    for (const object of objects) {
-      offsets[object.id] = byteLength(body);
-      body += `${object.id} 0 obj
-${object.body}
-endobj
-`;
-    }
-    const xrefOffset = byteLength(body);
-    body += `xref
-0 ${objects.length + 1}
-`;
-    body += "0000000000 65535 f \n";
-    for (const object of objects) {
-      body += `${String(offsets[object.id] ?? 0).padStart(10, "0")} 00000 n 
-`;
+    const resourceXml = fontResourceEntries.map((font, index) => `/${font.resourceName} ${fontObjectIds[index]} 0 R`).join(" ");
+    return { resourceXml };
+  }
+  layoutUnicodeText(state, text) {
+    const cached = state.layoutCache.get(text);
+    if (cached) {
+      return cached;
     }
-    body += [
-      "trailer",
-      `<< /Size ${objects.length + 1} /Root ${catalogObjectId} 0 R >>`,
-      "startxref",
-      String(xrefOffset),
-      "%%EOF",
-      ""
-    ].join("\n");
-    return new TextEncoder().encode(body);
+    const run = state.font.layouter.layout(text);
+    state.layoutCache.set(text, run);
+    return run;
   }
-  addImageObject(resource, addObject) {
-    return addObject(
-      asciiHexImageStreamObjectBody(resource.data, [
-        "/Type /XObject",
-        "/Subtype /Image",
-        `/Width ${resource.width}`,
-        `/Height ${resource.height}`,
-        "/ColorSpace /DeviceRGB",
-        "/BitsPerComponent 8"
-      ])
-    );
+  encodeUnicodeGlyphRun(state, run) {
+    return run.glyphs.map((glyph, index) => {
+      if (!state.usedGlyphs.has(glyph.id)) {
+        state.usedGlyphs.set(glyph.id, glyph);
+      }
+      const position = run.positions[index];
+      const nominalWidth = glyph.advanceWidth * state.scale;
+      const desiredAdvance = ((position == null ? void 0 : position.xAdvance) ?? glyph.advanceWidth) * state.scale;
+      return { glyphId: glyph.id, nominalWidth, desiredAdvance };
+    });
   }
   addUnicodeFontObjects(state, addObject) {
     const subset = state.font.subsetter.createSubset(
@@ -37318,6 +38004,200 @@ endobj
     );
   }
 }
+class PdfImageTable {
+  constructor() {
+    __publicField(this, "imageResources", /* @__PURE__ */ new Map());
+  }
+  registerImageResource(resource) {
+    const resourceName = resource.resourceName ?? `Im${this.imageResources.size + 1}`;
+    if (!this.imageResources.has(resourceName)) {
+      this.imageResources.set(resourceName, {
+        resourceName,
+        width: Math.max(1, Math.round(resource.width)),
+        height: Math.max(1, Math.round(resource.height)),
+        data: resource.data,
+        filter: resource.filter
+      });
+    }
+    return resourceName;
+  }
+  has(resourceName) {
+    return this.imageResources.has(resourceName);
+  }
+  /** Emits each registered image object, keyed by resource name for page maps. */
+  buildImageObjects(addObject) {
+    const imageObjectIds = /* @__PURE__ */ new Map();
+    for (const image of this.imageResources.values()) {
+      imageObjectIds.set(
+        image.resourceName,
+        this.addImageObject(image, addObject)
+      );
+    }
+    return imageObjectIds;
+  }
+  addImageObject(resource, addObject) {
+    return addObject(
+      asciiHexImageStreamObjectBody(resource.data, [
+        "/Type /XObject",
+        "/Subtype /Image",
+        `/Width ${resource.width}`,
+        `/Height ${resource.height}`,
+        "/ColorSpace /DeviceRGB",
+        "/BitsPerComponent 8"
+      ])
+    );
+  }
+}
+function serializePdfDocument(pages, fonts, images) {
+  const objects = [];
+  const addObject = (body2) => {
+    const id = objects.length + 1;
+    objects.push({ id, body: body2 });
+    return id;
+  };
+  const catalogObjectId = addObject("");
+  const pagesObjectId = addObject("");
+  const { resourceXml: fontResourceXml } = fonts.buildFontObjects(addObject);
+  const imageObjectIds = images.buildImageObjects(addObject);
+  const pageObjectIds = [];
+  for (const page of pages) {
+    const stream = `${page.commands.join("\n")}
+`;
+    const contentObjectId = addObject(
+      `<< /Length ${byteLength(stream)} >>
+stream
+${stream}endstream`
+    );
+    const imageResourceXml = Array.from(page.imageResourceNames).map((resourceName) => {
+      const objectId = imageObjectIds.get(resourceName);
+      return objectId ? `/${resourceName} ${objectId} 0 R` : "";
+    }).filter(Boolean).join(" ");
+    const xObjectResourceXml = imageResourceXml ? ` /XObject << ${imageResourceXml} >>` : "";
+    const pageObjectId = addObject(
+      [
+        "<< /Type /Page",
+        `/Parent ${pagesObjectId} 0 R`,
+        `/MediaBox [0 0 ${formatNumber(page.width)} ${formatNumber(page.height)}]`,
+        `/Resources << /Font << ${fontResourceXml} >>${xObjectResourceXml} >>`,
+        `/Contents ${contentObjectId} 0 R`,
+        ">>"
+      ].join("\n")
+    );
+    pageObjectIds.push(pageObjectId);
+  }
+  objects[catalogObjectId - 1].body = `<< /Type /Catalog /Pages ${pagesObjectId} 0 R >>`;
+  objects[pagesObjectId - 1].body = [
+    "<< /Type /Pages",
+    `/Kids [${pageObjectIds.map((id) => `${id} 0 R`).join(" ")}]`,
+    `/Count ${pageObjectIds.length}`,
+    ">>"
+  ].join("\n");
+  let body = PDF_HEADER;
+  const offsets = [0];
+  for (const object of objects) {
+    offsets[object.id] = byteLength(body);
+    body += `${object.id} 0 obj
+${object.body}
+endobj
+`;
+  }
+  const xrefOffset = byteLength(body);
+  body += `xref
+0 ${objects.length + 1}
+`;
+  body += "0000000000 65535 f \n";
+  for (const object of objects) {
+    body += `${String(offsets[object.id] ?? 0).padStart(10, "0")} 00000 n 
+`;
+  }
+  body += [
+    "trailer",
+    `<< /Size ${objects.length + 1} /Root ${catalogObjectId} 0 R >>`,
+    "startxref",
+    String(xrefOffset),
+    "%%EOF",
+    ""
+  ].join("\n");
+  return new TextEncoder().encode(body);
+}
+class OasisPdfWriter {
+  constructor(fontResources = DEFAULT_PDF_FONT_RESOURCES) {
+    __publicField(this, "pages", []);
+    __publicField(this, "streams", []);
+    __publicField(this, "fonts");
+    __publicField(this, "images", new PdfImageTable());
+    this.fonts = new PdfFontTable(fontResources);
+  }
+  registerFontResource(resource) {
+    this.fonts.registerFontResource(resource);
+  }
+  addPage(size) {
+    const page = {
+      width: Math.max(1, size.width),
+      height: Math.max(1, size.height),
+      commands: [],
+      imageResourceNames: /* @__PURE__ */ new Set()
+    };
+    this.pages.push(page);
+    this.streams.push(new PdfContentStream(page, this.fonts, this.images));
+    return this.pages.length - 1;
+  }
+  getPageCount() {
+    return this.pages.length;
+  }
+  drawRect(pageIndex, options) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.drawRect(options);
+  }
+  drawLine(pageIndex, options) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.drawLine(options);
+  }
+  drawPath(pageIndex, options) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.drawPath(options);
+  }
+  saveGraphicsState(pageIndex) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.saveGraphicsState();
+  }
+  restoreGraphicsState(pageIndex) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.restoreGraphicsState();
+  }
+  rotateAbout(pageIndex, centerX, centerY, degrees) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.rotateAbout(centerX, centerY, degrees);
+  }
+  clipRect(pageIndex, x, y, width, height) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.clipRect(x, y, width, height);
+  }
+  drawText(pageIndex, options) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.drawText(options);
+  }
+  registerImageResource(resource) {
+    return this.images.registerImageResource(resource);
+  }
+  drawImage(pageIndex, options) {
+    var _a;
+    (_a = this.streams[pageIndex]) == null ? void 0 : _a.drawImage(options);
+  }
+  toArrayBuffer() {
+    const bytes = this.toUint8Array();
+    return Uint8Array.from(bytes).buffer;
+  }
+  toBlob() {
+    return new Blob([this.toArrayBuffer()], { type: "application/pdf" });
+  }
+  toUint8Array() {
+    if (this.pages.length === 0) {
+      this.addPage({ width: 612, height: 792 });
+    }
+    return serializePdfDocument(this.pages, this.fonts, this.images);
+  }
+}
 const FOOTNOTE_BLOCK_GAP_PX = 2;
 async function exportEditorDocumentToPdf(document2) {
   document2 = renumberImageCaptionsInDocument(document2);
@@ -40043,6 +40923,15 @@ function createTableSelectionResolvers(deps) {
   };
 }
 function createTableCellSpanOperations(deps) {
+  const cloneCellSnapshot = (cell) => ({
+    ...cell,
+    style: cell.style ? { ...cell.style } : void 0,
+    conditionalStyle: cell.conditionalStyle ? { ...cell.conditionalStyle } : void 0,
+    mergeRevisionState: void 0,
+    blocks: cell.blocks.map(
+      (block) => cloneBlock(block)
+    )
+  });
   const mergeSelectedTableCells = (current) => {
     const range = deps.resolveHorizontalTableCellRange(current);
     if (!range) {
@@ -40064,6 +40953,7 @@ function createTableCellSpanOperations(deps) {
     if (selectedCells.length < 2) {
       return current;
     }
+    const revision = current.trackChangesEnabled ? createTableRevisionMetadata() : void 0;
     const mergedCell = {
       ...selectedCells[0],
       colSpan: selectedCells.reduce(
@@ -40072,7 +40962,27 @@ function createTableCellSpanOperations(deps) {
       ),
       blocks: selectedCells.flatMap(
         (cell) => cell.blocks.map((paragraph) => cloneBlock(paragraph))
-      )
+      ),
+      ...revision ? {
+        style: {
+          ...selectedCells[0].style ?? {},
+          revision: {
+            ...revision,
+            type: "merge",
+            previous: {
+              colSpan: selectedCells[0].colSpan,
+              rowSpan: selectedCells[0].rowSpan,
+              vMerge: selectedCells[0].vMerge
+            }
+          }
+        },
+        mergeRevisionState: {
+          revisionId: revision.id,
+          orientation: "horizontal",
+          currentCellCount: 1,
+          previousCells: selectedCells.map(cloneCellSnapshot)
+        }
+      } : {}
     };
     row.cells.splice(range.startCellIndex, selectedCells.length, mergedCell);
     const nextParagraph = mergedCell.blocks[0];
@@ -40120,13 +41030,34 @@ function createTableCellSpanOperations(deps) {
     )) {
       return current;
     }
+    const revision = current.trackChangesEnabled ? createTableRevisionMetadata() : void 0;
     const mergedCell = {
       ...selectedCells[0],
       rowSpan: selectedCells.length,
       vMerge: "restart",
       blocks: selectedCells.flatMap(
         (cell) => cell.blocks.map((paragraph) => cloneBlock(paragraph))
-      )
+      ),
+      ...revision ? {
+        style: {
+          ...selectedCells[0].style ?? {},
+          revision: {
+            ...revision,
+            type: "merge",
+            previous: {
+              colSpan: selectedCells[0].colSpan,
+              rowSpan: selectedCells[0].rowSpan,
+              vMerge: selectedCells[0].vMerge
+            }
+          }
+        },
+        mergeRevisionState: {
+          revisionId: revision.id,
+          orientation: "vertical",
+          currentCellCount: 1,
+          previousCells: selectedCells.map(cloneCellSnapshot)
+        }
+      } : {}
     };
     tableBlock.rows[range.startRowIndex].cells[range.cellIndex] = mergedCell;
     for (let rowIndex = range.startRowIndex + 1; rowIndex <= range.endRowIndex; rowIndex += 1) {
@@ -40184,9 +41115,38 @@ function createTableCellSpanOperations(deps) {
     if (!cell || span <= 1 || cell.vMerge !== "restart") {
       return current;
     }
+    const previousCell = cloneCellSnapshot(cell);
+    const revision = current.trackChangesEnabled ? createTableRevisionMetadata() : void 0;
+    const preservedColSpan = Math.max(1, cell.colSpan ?? 1);
     cell.rowSpan = void 0;
     cell.vMerge = void 0;
-    const preservedColSpan = Math.max(1, cell.colSpan ?? 1);
+    if (revision) {
+      cell.style = {
+        ...cell.style ?? {},
+        revision: {
+          ...revision,
+          type: "merge",
+          previous: {
+            colSpan: previousCell.colSpan,
+            rowSpan: previousCell.rowSpan,
+            vMerge: previousCell.vMerge
+          }
+        }
+      };
+      cell.mergeRevisionState = {
+        revisionId: revision.id,
+        orientation: "vertical",
+        currentCellCount: 1,
+        previousCells: [
+          previousCell,
+          ...Array.from({ length: span - 1 }, (_, offset) => {
+            var _a2;
+            const prior = (_a2 = tableBlock.rows[location.rowIndex + offset + 1]) == null ? void 0 : _a2.cells[location.cellIndex];
+            return prior ? cloneCellSnapshot(prior) : createEditorTableCell([], preservedColSpan);
+          })
+        ]
+      };
+    }
     for (let offset = 1; offset < span; offset += 1) {
       const row = tableBlock.rows[location.rowIndex + offset];
       if (!row) {
@@ -40236,13 +41196,35 @@ function createTableCellSpanOperations(deps) {
     if (!row || !cell || span <= 1) {
       return current;
     }
+    const previousCell = cloneCellSnapshot(cell);
+    const revision = current.trackChangesEnabled ? createTableRevisionMetadata() : void 0;
     const nextCells = [
       {
         ...cell,
         colSpan: 1,
         blocks: cell.blocks.map(
           (paragraph) => cloneBlock(paragraph)
-        )
+        ),
+        ...revision ? {
+          style: {
+            ...cell.style ?? {},
+            revision: {
+              ...revision,
+              type: "merge",
+              previous: {
+                colSpan: previousCell.colSpan,
+                rowSpan: previousCell.rowSpan,
+                vMerge: previousCell.vMerge
+              }
+            }
+          },
+          mergeRevisionState: {
+            revisionId: revision.id,
+            orientation: "horizontal",
+            currentCellCount: span,
+            previousCells: [previousCell]
+          }
+        } : {}
       },
       ...Array.from(
         { length: span - 1 },
@@ -40351,6 +41333,15 @@ function createTableRowColumnOperations(deps) {
           );
         })
       );
+      if (current.trackChangesEnabled) {
+        blankRow.style = {
+          ...blankRow.style ?? {},
+          revision: {
+            ...createTableRevisionMetadata(),
+            type: "insert"
+          }
+        };
+      }
       tableBlock.rows.splice(insertIndex, 0, blankRow);
       const targetVisualColumn = (selectedEntry == null ? void 0 : selectedEntry.visualColumnIndex) ?? location.cellIndex;
       const targetCell2 = findCellAtVisualColumn(blankRow, targetVisualColumn);
@@ -40385,6 +41376,15 @@ function createTableRowColumnOperations(deps) {
         )
       )
     );
+    if (current.trackChangesEnabled) {
+      blankRow.style = {
+        ...blankRow.style ?? {},
+        revision: {
+          ...createTableRevisionMetadata(),
+          type: "insert"
+        }
+      };
+    }
     tableBlock.rows.splice(insertIndex, 0, blankRow);
     const targetCell = blankRow.cells[Math.min(location.cellIndex, blankRow.cells.length - 1)];
     const nextParagraph = (targetCell == null ? void 0 : targetCell.blocks[0]) ?? ((_b = blankRow.cells.find(
@@ -40420,13 +41420,23 @@ function createTableRowColumnOperations(deps) {
     if (!tableBlock || tableBlock.type !== "table") {
       return current;
     }
-    if (tableBlock.rows.length <= 1) {
+    if (tableBlock.rows.length <= 1 && !current.trackChangesEnabled) {
       return current;
     }
     const rowToDelete = tableBlock.rows[location.rowIndex];
     if (!rowToDelete) {
       return current;
     }
+    if (current.trackChangesEnabled) {
+      rowToDelete.style = {
+        ...rowToDelete.style ?? {},
+        revision: {
+          ...createTableRevisionMetadata(),
+          type: "delete"
+        }
+      };
+      return updateBlocksInCurrentSection(current, targetBlocks, location.zone);
+    }
     const blockedByRestartCell = rowToDelete.cells.some(
       (cell) => cell.vMerge !== "continue" && Math.max(1, cell.rowSpan ?? 1) > 1
     );
@@ -40512,13 +41522,34 @@ function createTableRowColumnOperations(deps) {
         for (const cell of row.cells) {
           const span = Math.max(1, cell.colSpan ?? 1);
           if (!inserted && insertVisualColumn <= visualCursor) {
-            nextCells.push(createEditorTableCell([createEditorParagraph("")]));
+            const insertedCell = createEditorTableCell([
+              createEditorParagraph("")
+            ]);
+            if (current.trackChangesEnabled) {
+              insertedCell.style = {
+                revision: {
+                  ...createTableRevisionMetadata(),
+                  type: "insert"
+                }
+              };
+            }
+            nextCells.push(insertedCell);
             inserted = true;
           }
           if (!inserted && visualCursor < insertVisualColumn && insertVisualColumn < visualCursor + span) {
             nextCells.push({
               ...cell,
-              colSpan: span + 1
+              colSpan: span + 1,
+              ...current.trackChangesEnabled ? {
+                style: {
+                  ...cell.style ?? {},
+                  revision: {
+                    ...createTableRevisionMetadata(),
+                    type: "merge",
+                    previous: { colSpan: cell.colSpan }
+                  }
+                }
+              } : {}
             });
             inserted = true;
           } else {
@@ -40527,7 +41558,18 @@ function createTableRowColumnOperations(deps) {
           visualCursor += span;
         }
         if (!inserted) {
-          nextCells.push(createEditorTableCell([createEditorParagraph("")]));
+          const insertedCell = createEditorTableCell([
+            createEditorParagraph("")
+          ]);
+          if (current.trackChangesEnabled) {
+            insertedCell.style = {
+              revision: {
+                ...createTableRevisionMetadata(),
+                type: "insert"
+              }
+            };
+          }
+          nextCells.push(insertedCell);
         }
         row.cells = nextCells;
       }
@@ -40562,11 +41604,16 @@ function createTableRowColumnOperations(deps) {
       )
     );
     for (const row of tableBlock.rows) {
-      row.cells.splice(
-        insertIndex,
-        0,
-        createEditorTableCell([createEditorParagraph("")])
-      );
+      const insertedCell = createEditorTableCell([createEditorParagraph("")]);
+      if (current.trackChangesEnabled) {
+        insertedCell.style = {
+          revision: {
+            ...createTableRevisionMetadata(),
+            type: "insert"
+          }
+        };
+      }
+      row.cells.splice(insertIndex, 0, insertedCell);
     }
     const targetRow = tableBlock.rows[location.rowIndex];
     const targetCell = targetRow == null ? void 0 : targetRow.cells[insertIndex];
@@ -40605,6 +41652,26 @@ function createTableRowColumnOperations(deps) {
     if (getTableVisualWidth(tableBlock) <= 1) {
       return current;
     }
+    if (current.trackChangesEnabled) {
+      const layout = buildTableCellLayout(tableBlock);
+      const selected = layout.find(
+        (entry) => entry.rowIndex === location.rowIndex && entry.cellIndex === location.cellIndex
+      );
+      const visualColumn = (selected == null ? void 0 : selected.visualColumnIndex) ?? location.cellIndex;
+      for (const row of tableBlock.rows) {
+        const cell = findCellAtVisualColumn(row, visualColumn);
+        if (cell) {
+          cell.style = {
+            ...cell.style ?? {},
+            revision: {
+              ...createTableRevisionMetadata(),
+              type: "delete"
+            }
+          };
+        }
+      }
+      return updateBlocksInCurrentSection(current, targetBlocks, location.zone);
+    }
     const hasHorizontalSpansInTable = tableBlock.rows.some(
       (row) => row.cells.some((cell) => Math.max(1, cell.colSpan ?? 1) > 1)
     );
@@ -43040,6 +44107,7 @@ function createEditorTableDrag(deps) {
     null
   );
   const [startClientY, setStartClientY] = createSignal(0);
+  const [startClientX, setStartClientX] = createSignal(0);
   const [mousePos, setMousePos] = createSignal({ x: 0, y: 0 });
   const stopDrag = () => {
     setDragging(false);
@@ -43093,9 +44161,32 @@ function createEditorTableDrag(deps) {
         event.clientY
       );
       const tableId = info == null ? void 0 : info.tableId;
-      if (pos && tableId) {
+      if (tableId) {
         deps.applyTransactionalState((current) => {
-          return moveBlockToPosition(current, tableId, pos);
+          var _a;
+          const findTable = () => {
+            for (const zone of ["main", "header", "footer"]) {
+              const blocks = getEditableBlocksForZone(current, zone);
+              const table2 = blocks.find(
+                (block) => block.type === "table" && block.id === tableId
+              );
+              if (table2) return table2;
+            }
+            return void 0;
+          };
+          const table = findTable();
+          if ((table == null ? void 0 : table.type) === "table" && ((_a = table.style) == null ? void 0 : _a.floating)) {
+            const floating = table.style.floating;
+            const pointsPerPixel = 72 / 96;
+            return setActiveTableStyleValue(current, tableId, "floating", {
+              ...floating,
+              x: (floating.x ?? 0) + (event.clientX - startClientX()) * pointsPerPixel,
+              y: (floating.y ?? 0) + (event.clientY - startClientY()) * pointsPerPixel,
+              xAlign: void 0,
+              yAlign: void 0
+            });
+          }
+          return pos ? moveBlockToPosition(current, tableId, pos) : current;
         });
       }
     }
@@ -43116,6 +44207,7 @@ function createEditorTableDrag(deps) {
       offsetY: event.clientY - handleRect.top
     });
     setStartClientY(event.clientY);
+    setStartClientX(event.clientX);
     setMousePos({ x: event.clientX, y: event.clientY });
     setDragging(false);
     setDropTargetPos(null);
@@ -44192,6 +45284,51 @@ function createEditorRevisionController(deps) {
       }
       if (foundRevision) break;
     }
+    const findInBlocks = (blocks) => {
+      var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k;
+      for (const block of blocks) {
+        if (block.type === "paragraph") continue;
+        if (((_b2 = (_a2 = block.style) == null ? void 0 : _a2.revision) == null ? void 0 : _b2.id) === revisionId) {
+          return block.style.revision;
+        }
+        if (((_c2 = block.gridRevision) == null ? void 0 : _c2.id) === revisionId) return block.gridRevision;
+        for (const row of block.rows) {
+          if (((_e = (_d = row.style) == null ? void 0 : _d.revision) == null ? void 0 : _e.id) === revisionId) return row.style.revision;
+          if (((_g = (_f = row.style) == null ? void 0 : _f.propertyRevision) == null ? void 0 : _g.id) === revisionId) {
+            return row.style.propertyRevision;
+          }
+          for (const cell of row.cells) {
+            if (((_i = (_h = cell.style) == null ? void 0 : _h.revision) == null ? void 0 : _i.id) === revisionId) {
+              return cell.style.revision;
+            }
+            if (((_k = (_j = cell.style) == null ? void 0 : _j.propertyRevision) == null ? void 0 : _k.id) === revisionId) {
+              return cell.style.propertyRevision;
+            }
+            const nested = findInBlocks(cell.blocks);
+            if (nested) return nested;
+          }
+        }
+      }
+      return void 0;
+    };
+    if (!foundRevision) {
+      for (const section of getDocumentSections(deps.state().document)) {
+        for (const blocks of [
+          section.blocks,
+          section.header,
+          section.firstPageHeader,
+          section.evenPageHeader,
+          section.footer,
+          section.firstPageFooter,
+          section.evenPageFooter
+        ]) {
+          if (!blocks) continue;
+          foundRevision = findInBlocks(blocks);
+          if (foundRevision) break;
+        }
+        if (foundRevision) break;
+      }
+    }
     if (!foundRevision) return;
     const rect = event.currentTarget.getBoundingClientRect();
     const surfaceRect = (_b = deps.surfaceRef()) == null ? void 0 : _b.getBoundingClientRect();
@@ -44545,6 +45682,148 @@ function toggleTrackChanges(state) {
     trackChangesEnabled: !state.trackChangesEnabled
   };
 }
+function transformTableRevisionBlocks(blocks, revisionId, accept) {
+  return blocks.flatMap((block) => {
+    var _a;
+    if (block.type === "paragraph") return [block];
+    let style2 = block.style;
+    if (((_a = style2 == null ? void 0 : style2.revision) == null ? void 0 : _a.id) === revisionId) {
+      if (accept) {
+        const { revision: _revision, ...current } = style2;
+        style2 = current;
+      } else {
+        style2 = { ...style2.revision.previous };
+      }
+    }
+    let gridCols = block.gridCols;
+    let gridRevision = block.gridRevision;
+    if ((gridRevision == null ? void 0 : gridRevision.id) === revisionId) {
+      gridCols = accept ? gridCols : [...gridRevision.previous];
+      gridRevision = void 0;
+    }
+    const sourceRows = block.rows.map((row) => ({
+      ...row,
+      cells: [...row.cells]
+    }));
+    for (let rowIndex = 0; rowIndex < sourceRows.length; rowIndex += 1) {
+      const row = sourceRows[rowIndex];
+      for (let cellIndex = 0; cellIndex < row.cells.length; cellIndex += 1) {
+        const cell = row.cells[cellIndex];
+        const mergeState = cell.mergeRevisionState;
+        if (!mergeState || mergeState.revisionId !== revisionId) continue;
+        if (accept) {
+          const { mergeRevisionState: _state, ...acceptedCell } = cell;
+          row.cells[cellIndex] = acceptedCell;
+          continue;
+        }
+        if (mergeState.orientation === "horizontal") {
+          row.cells.splice(
+            cellIndex,
+            mergeState.currentCellCount,
+            ...mergeState.previousCells
+          );
+        } else {
+          mergeState.previousCells.forEach((previousCell, offset) => {
+            const targetRow = sourceRows[rowIndex + offset];
+            if (targetRow) targetRow.cells[cellIndex] = previousCell;
+          });
+        }
+      }
+    }
+    const rows = sourceRows.flatMap((row) => {
+      var _a2, _b, _c, _d;
+      if (((_b = (_a2 = row.style) == null ? void 0 : _a2.revision) == null ? void 0 : _b.id) === revisionId) {
+        const remove = accept && row.style.revision.type === "delete" || !accept && row.style.revision.type === "insert";
+        if (remove) return [];
+      }
+      let rowStyle = row.style;
+      if (((_c = rowStyle == null ? void 0 : rowStyle.propertyRevision) == null ? void 0 : _c.id) === revisionId) {
+        if (accept) {
+          const { propertyRevision: _revision, ...current } = rowStyle;
+          rowStyle = current;
+        } else {
+          rowStyle = {
+            ...rowStyle.propertyRevision.previous,
+            revision: rowStyle.revision
+          };
+        }
+      }
+      if (((_d = rowStyle == null ? void 0 : rowStyle.revision) == null ? void 0 : _d.id) === revisionId) {
+        const { revision: _revision, ...current } = rowStyle;
+        rowStyle = current;
+      }
+      const cells = row.cells.flatMap((cell) => {
+        var _a3, _b2, _c2, _d2, _e;
+        if (((_b2 = (_a3 = cell.style) == null ? void 0 : _a3.revision) == null ? void 0 : _b2.id) === revisionId) {
+          const remove = accept && cell.style.revision.type === "delete" || !accept && cell.style.revision.type === "insert";
+          if (remove) return [];
+        }
+        let cellStyle = cell.style;
+        if (((_c2 = cellStyle == null ? void 0 : cellStyle.propertyRevision) == null ? void 0 : _c2.id) === revisionId) {
+          if (accept) {
+            const { propertyRevision: _revision, ...current } = cellStyle;
+            cellStyle = current;
+          } else {
+            cellStyle = {
+              ...cellStyle.propertyRevision.previous,
+              revision: cellStyle.revision
+            };
+          }
+        }
+        let nextCell = {
+          ...cell,
+          style: cellStyle,
+          blocks: transformTableRevisionBlocks(
+            cell.blocks,
+            revisionId,
+            accept
+          )
+        };
+        if (((_d2 = cellStyle == null ? void 0 : cellStyle.revision) == null ? void 0 : _d2.id) === revisionId && ((_e = cell.mergeRevisionState) == null ? void 0 : _e.revisionId) !== revisionId) {
+          const revision = cellStyle.revision;
+          const { revision: _revision, ...current } = cellStyle;
+          nextCell = {
+            ...nextCell,
+            ...accept || revision.type !== "merge" ? {} : revision.previous,
+            style: current
+          };
+        }
+        return [nextCell];
+      });
+      return [
+        {
+          ...row,
+          isHeader: rowStyle && "isHeader" in rowStyle ? rowStyle.isHeader : row.isHeader,
+          style: rowStyle,
+          cells
+        }
+      ];
+    });
+    if (rows.length === 0) return [];
+    return [{ ...block, style: style2, gridCols, gridRevision, rows }];
+  });
+}
+function transformTableRevision(state, revisionId, accept) {
+  const sections = getDocumentSections(state.document).map((section) => ({
+    ...section,
+    blocks: transformTableRevisionBlocks(section.blocks, revisionId, accept),
+    header: section.header ? transformTableRevisionBlocks(section.header, revisionId, accept) : void 0,
+    firstPageHeader: section.firstPageHeader ? transformTableRevisionBlocks(
+      section.firstPageHeader,
+      revisionId,
+      accept
+    ) : void 0,
+    evenPageHeader: section.evenPageHeader ? transformTableRevisionBlocks(section.evenPageHeader, revisionId, accept) : void 0,
+    footer: section.footer ? transformTableRevisionBlocks(section.footer, revisionId, accept) : void 0,
+    firstPageFooter: section.firstPageFooter ? transformTableRevisionBlocks(
+      section.firstPageFooter,
+      revisionId,
+      accept
+    ) : void 0,
+    evenPageFooter: section.evenPageFooter ? transformTableRevisionBlocks(section.evenPageFooter, revisionId, accept) : void 0
+  }));
+  return { ...state, document: { ...state.document, sections } };
+}
 function acceptRevision(state, revisionId) {
   const paragraphs = getParagraphs(state);
   const nextParagraphs = paragraphs.map((paragraph) => {
@@ -44567,7 +45846,7 @@ function acceptRevision(state, revisionId) {
     }
     return buildParagraphFromRuns(paragraph, nextRuns);
   });
-  return cloneStateWithParagraphs(
+  const textState = cloneStateWithParagraphs(
     state,
     nextParagraphs,
     preserveSelectionByParagraphOffsets(
@@ -44575,6 +45854,7 @@ function acceptRevision(state, revisionId) {
       normalizeSelection(state)
     )
   );
+  return transformTableRevision(textState, revisionId, true);
 }
 function rejectRevision(state, revisionId) {
   const paragraphs = getParagraphs(state);
@@ -44598,7 +45878,7 @@ function rejectRevision(state, revisionId) {
     }
     return buildParagraphFromRuns(paragraph, nextRuns);
   });
-  return cloneStateWithParagraphs(
+  const textState = cloneStateWithParagraphs(
     state,
     nextParagraphs,
     preserveSelectionByParagraphOffsets(
@@ -44606,6 +45886,40 @@ function rejectRevision(state, revisionId) {
       normalizeSelection(state)
     )
   );
+  return transformTableRevision(textState, revisionId, false);
+}
+function collectTableRevisionIds(blocks, selectedParagraphIds, revisionIds) {
+  var _a, _b, _c, _d, _e;
+  for (const block of blocks) {
+    if (block.type === "paragraph") continue;
+    const tableSelected = block.rows.some(
+      (row) => row.cells.some(
+        (cell) => cell.blocks.some((paragraph) => selectedParagraphIds.has(paragraph.id))
+      )
+    );
+    if (tableSelected) {
+      if ((_a = block.style) == null ? void 0 : _a.revision) revisionIds.add(block.style.revision.id);
+      if (block.gridRevision) revisionIds.add(block.gridRevision.id);
+    }
+    for (const row of block.rows) {
+      const selectedCells = row.cells.filter(
+        (cell) => cell.blocks.some((paragraph) => selectedParagraphIds.has(paragraph.id))
+      );
+      if (selectedCells.length > 0) {
+        if ((_b = row.style) == null ? void 0 : _b.revision) revisionIds.add(row.style.revision.id);
+        if ((_c = row.style) == null ? void 0 : _c.propertyRevision) {
+          revisionIds.add(row.style.propertyRevision.id);
+        }
+      }
+      for (const cell of selectedCells) {
+        if ((_d = cell.style) == null ? void 0 : _d.revision) revisionIds.add(cell.style.revision.id);
+        if ((_e = cell.style) == null ? void 0 : _e.propertyRevision) {
+          revisionIds.add(cell.style.propertyRevision.id);
+        }
+        collectTableRevisionIds(cell.blocks, selectedParagraphIds, revisionIds);
+      }
+    }
+  }
 }
 function acceptRevisionsInSelection(state) {
   var _a;
@@ -44623,6 +45937,24 @@ function acceptRevisionsInSelection(state) {
       }
     }
   }
+  const selectedParagraphIds = new Set(
+    paragraphs.slice(normalized.startIndex, normalized.endIndex + 1).map((paragraph) => paragraph.id)
+  );
+  for (const section of getDocumentSections(state.document)) {
+    for (const blocks of [
+      section.blocks,
+      section.header,
+      section.firstPageHeader,
+      section.evenPageHeader,
+      section.footer,
+      section.firstPageFooter,
+      section.evenPageFooter
+    ]) {
+      if (blocks) {
+        collectTableRevisionIds(blocks, selectedParagraphIds, revisionIds);
+      }
+    }
+  }
   let nextState = state;
   for (const revisionId of revisionIds) {
     nextState = acceptRevision(nextState, revisionId);
@@ -44645,6 +45977,24 @@ function rejectRevisionsInSelection(state) {
       }
     }
   }
+  const selectedParagraphIds = new Set(
+    paragraphs.slice(normalized.startIndex, normalized.endIndex + 1).map((paragraph) => paragraph.id)
+  );
+  for (const section of getDocumentSections(state.document)) {
+    for (const blocks of [
+      section.blocks,
+      section.header,
+      section.firstPageHeader,
+      section.evenPageHeader,
+      section.footer,
+      section.firstPageFooter,
+      section.evenPageFooter
+    ]) {
+      if (blocks) {
+        collectTableRevisionIds(blocks, selectedParagraphIds, revisionIds);
+      }
+    }
+  }
   let nextState = state;
   for (const revisionId of revisionIds) {
     nextState = rejectRevision(nextState, revisionId);