@stll/folio-core 0.47.0 → 0.47.2

package/dist/ai-edits/apply.d.ts

@@ -57,6 +57,8 @@ type ApplyFolioAIEditOperationsOptions = {
    * still describes a table by its cell texts.
    */
   tableTemplates?: FolioTableTemplates;
+  /** What a replacement does with a background the text it replaces carries. */
+  replacementBackground?: FolioReplacementBackground;
 };
 /**
  * How an apply batch cuts the redline for a replacement. Word-level by
@@ -68,6 +70,20 @@ type ApplyFolioAIEditOperationsOptions = {
 type FolioWordDiffOptions = {
   granularity?: WordDiffGranularity;
 };
+/**
+ * What a replacement does with a highlight or `w:shd` the text it replaces
+ * carries.
+ *
+ * `clear` is the authoring default: text typed over a highlighted placeholder
+ * is new text, and keeping the marker that said "fill this in" would carry it
+ * into the finished document. `keep` is for a caller that states the
+ * replacement's own run properties rather than letting it inherit them — a
+ * comparison reproducing a revised document holds the properties that document
+ * has, and clearing them first records a run-property change it takes straight
+ * back, which reaches the reader as a revision whose before and after are the
+ * same.
+ */
+type FolioReplacementBackground = "clear" | "keep";
 /**
  * An apply result plus where the batch left the revision-id counter.
  *
@@ -88,4 +104,4 @@ type FolioAIEditApplyOutcome = FolioAIEditApplyResult & {
 declare const applyFolioAIEditOperations: (options: ApplyFolioAIEditOperationsOptions) => FolioAIEditApplyOutcome;
 declare const previewFolioAIEditOperations: (options: ApplyFolioAIEditOperationsOptions) => FolioAIEditApplyOutcome;
 //#endregion
-export { FolioAIEditApplyOutcome, FolioAIEditView, FolioRevisionStamp, FolioWordDiffOptions, applyFolioAIEditOperations, previewFolioAIEditOperations };
+export { FolioAIEditApplyOutcome, FolioAIEditView, FolioReplacementBackground, FolioRevisionStamp, FolioWordDiffOptions, applyFolioAIEditOperations, previewFolioAIEditOperations };

package/dist/ai-edits/apply.js

@@ -578,8 +578,8 @@ const formattingChangesForAuthoredFormatting = (authoredFormatting, formatting)
 	}
 	return changes;
 };
-const clearReplacementBackground = ({ tr, schema, from, to, mode, revisionIdSeed, author, date, initials, suggestionId = null, styleResolver }) => {
-	if (![schema.marks["highlight"], schema.marks["runShading"]].some((markType) => markType !== void 0 && tr.doc.rangeHasMark(from, to, markType))) return {
+const clearReplacementBackground = ({ tr, schema, from, to, mode, replacementBackground, revisionIdSeed, author, date, initials, suggestionId = null, styleResolver }) => {
+	if (!(replacementBackground === "clear" && [schema.marks["highlight"], schema.marks["runShading"]].some((markType) => markType !== void 0 && tr.doc.rangeHasMark(from, to, markType)))) return {
 		type: "applied",
 		transaction: tr,
 		revisionIds: [],
@@ -1241,7 +1241,7 @@ const buildInsertedParagraphs = ({ item, schema, formattingFromStyle, mode, auth
 		nextRevisionId
 	};
 };
-const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode = "tracked-changes", author = "AI", initials, createCommentId, revisionStamp, revisionIdSeed, wordDiff, wordDiffMode = "bounded", tableTemplates }) => {
+const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode = "tracked-changes", author = "AI", initials, createCommentId, revisionStamp, revisionIdSeed, wordDiff, wordDiffMode = "bounded", tableTemplates, replacementBackground = "clear" }) => {
 	const applied = [];
 	const skipped = [];
 	const normalizations = [];
@@ -1532,6 +1532,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode =
 					from: item.from,
 					to: item.to,
 					mode,
+					replacementBackground,
 					revisionIdSeed: revisionIdBackgroundSeed,
 					author,
 					date,
@@ -1659,6 +1660,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations, mode =
 						from: item.from,
 						to: item.to,
 						mode,
+						replacementBackground,
 						revisionIdSeed: revisionIdBackgroundSeed,
 						author,
 						date,

package/dist/ai-edits/headless.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { FolioTableTemplates } from "./table-template.js";
 import { FolioAIBlock, FolioAIEditApplyMode, FolioAIEditApplyResult, FolioAIEditOperation, FolioAIEditSnapshot } from "./types.js";
-import { FolioRevisionStamp, FolioWordDiffOptions } from "./apply.js";
+import { FolioReplacementBackground, FolioRevisionStamp, FolioWordDiffOptions } from "./apply.js";
 import { ImportReferencedStyleDefinitionsResult } from "../compare/style-resources.js";
 import { InlineProvenanceTargetOptions } from "../compare/inline-provenance.js";
 import { MatchInlineAtomsOptions } from "../compare/inline-atoms.js";
@@ -124,6 +124,13 @@ type FolioApplyDocumentOperationsToStoryOptions = FolioApplyDocumentOperationsOp
    * every table, row and cell property on the way.
    */
   tableTemplates?: FolioTableTemplates;
+  /**
+   * What a replacement in the batch does with a highlight or `w:shd` the text
+   * it replaces carries. Clearing it is the authoring default; a caller that
+   * states the replacement's own run properties — `compareDocx` reproducing
+   * the target document — keeps them instead.
+   */
+  replacementBackground?: FolioReplacementBackground;
 };
 type FolioHeaderFooterStoryHandle = Extract<FolioEditableDocumentStoryHandle, {
   type: "header" | "footer";
@@ -382,7 +389,7 @@ declare class FolioDocxReviewer {
    */
   applyDocumentOperations(batch: FolioDocumentOperationBatch, options?: FolioApplyDocumentOperationsOptions): FolioDocumentOperationResult;
   /** Apply a versioned operation batch to one editable document story. */
-  applyDocumentOperationsToStory({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates }: FolioApplyDocumentOperationsToStoryOptions): FolioDocumentOperationResult;
+  applyDocumentOperationsToStory({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground }: FolioApplyDocumentOperationsToStoryOptions): FolioDocumentOperationResult;
   private applyDocumentOperationsInternal;
   /** Undo the latest unchanged document-operation batch and its created comments. */
   undoDocumentOperations(undoHandle: FolioDocumentOperationUndoHandle): FolioDocumentOperationUndoResult;

package/dist/ai-edits/headless.js

@@ -782,7 +782,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		});
 	}
 	/** Apply a versioned operation batch to one editable document story. */
-	applyDocumentOperationsToStory({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates }) {
+	applyDocumentOperationsToStory({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground }) {
 		return this.applyDocumentOperationsInternal({
 			story,
 			batch,
@@ -790,10 +790,11 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			...revisionStamp !== void 0 && { revisionStamp },
 			...wordDiff !== void 0 && { wordDiff },
 			...tableTemplates !== void 0 && { tableTemplates },
+			...replacementBackground !== void 0 && { replacementBackground },
 			createUndoEntry: true
 		});
 	}
-	applyDocumentOperationsInternal({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates, createUndoEntry }) {
+	applyDocumentOperationsInternal({ story, batch, snapshot, revisionStamp, wordDiff, tableTemplates, replacementBackground, createUndoEntry }) {
 		const beforeState = this.requireEditableStoryState(story);
 		const createdCommentsLengthBefore = this.createdComments.length;
 		const view = {
@@ -811,6 +812,7 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			...revisionStamp !== void 0 && { revisionStamp },
 			...wordDiff !== void 0 && { wordDiff },
 			...tableTemplates !== void 0 && { tableTemplates },
+			...replacementBackground !== void 0 && { replacementBackground },
 			createCommentId: (text) => {
 				const comment = createReviewerComment(this.nextCommentId(), text, this.author);
 				this.createdComments.push(comment);

package/dist/compare/compare.js

@@ -573,7 +573,8 @@ const applyComparison = ({ reviewer, revisionStamp, granularity, revisionFormat,
 					mode: "tracked-changes",
 					operations: plan.operations
 				},
-				tableTemplates: resolveTableTemplates(targetTables, plan.tableTemplates)
+				tableTemplates: resolveTableTemplates(targetTables, plan.tableTemplates),
+				replacementBackground: "keep"
 			});
 			if (nextRevisionId === void 0) panic("The applier did not report where it left the revision-id counter", { story: pair.baseStory });
 			idSeed = nextRevisionId;

package/dist/compare/content-alignment.js

@@ -482,6 +482,37 @@ const groupFolioContentTableRows = (blocks) => {
 	}
 	return [...rows.values()];
 };
+/**
+* Which uninterrupted run of its own cell each block belongs to.
+*
+* A cell holds paragraphs and nested tables, and the nested table splits the
+* cell's paragraphs into runs: the ones before it and the ones after it are
+* separate sequences, because nothing moves a block from one side of a table
+* to the other. Aligned as one sequence they pair across it, and the plan that
+* follows can neither move the base paragraph past the nested table nor delete
+* the one it left behind when that paragraph ends the cell. So the runs are
+* aligned separately, the way rows and cells already are.
+*
+* Document order is the whole input: a cell's blocks are contiguous until a
+* block of another cell interrupts them, and inside one table segment the only
+* cell that can interrupt another is one of a table nested in it.
+*/
+const cellRunOrdinals = (blocks) => {
+	const ordinals = /* @__PURE__ */ new Map();
+	const runByCell = /* @__PURE__ */ new Map();
+	let previousKey = null;
+	for (const block of blocks) {
+		const { table } = block;
+		if (!table) continue;
+		const key = `${String(table.tableIndex)}:${String(table.rowIndex)}:${String(table.cellIndex)}`;
+		const seen = runByCell.get(key) ?? -1;
+		const run = key === previousKey ? seen : seen + 1;
+		runByCell.set(key, run);
+		ordinals.set(block, run);
+		previousKey = key;
+	}
+	return ordinals;
+};
 const groupTables = (blocks) => {
 	const tables = /* @__PURE__ */ new Map();
 	for (const block of blocks) {
@@ -1013,7 +1044,7 @@ const alignProfiledContentSequence = ({ base, revised, workSession, canPair = ()
 	return aligned;
 };
 const rowLocation = (row) => row.at(0)?.table ?? null;
-const alignRowCells = ({ baseRow, revisedRow, workSession, moveScopeContext, stableIdMismatch, idStability, baseColumnKeys, revisedColumnKeys }) => {
+const alignRowCells = ({ baseRow, revisedRow, workSession, moveScopeContext, stableIdMismatch, idStability, baseColumnKeys, revisedColumnKeys, cellRuns }) => {
 	const byCell = (row, columnKeys) => {
 		const cells = /* @__PURE__ */ new Map();
 		for (const block of row) {
@@ -1024,47 +1055,62 @@ const alignRowCells = ({ baseRow, revisedRow, workSession, moveScopeContext, sta
 				if (alignedColumn === void 0) return panic("A paired table cell has no aligned grid column", { gridColumnIndex: table.gridColumnIndex });
 				cellIndex = alignedColumn;
 			}
-			const blocks = cells.get(cellIndex);
+			const runs = cells.get(cellIndex) ?? /* @__PURE__ */ new Map();
+			cells.set(cellIndex, runs);
+			const run = cellRuns.get(block) ?? 0;
+			const blocks = runs.get(run);
 			if (blocks) blocks.push(block);
-			else cells.set(cellIndex, [block]);
+			else runs.set(run, [block]);
 		}
 		return cells;
 	};
+	const ascending = (left, right) => left - right;
 	const baseCells = byCell(baseRow, baseColumnKeys);
 	const revisedCells = byCell(revisedRow, revisedColumnKeys);
-	const cellIndexes = [.../* @__PURE__ */ new Set([...baseCells.keys(), ...revisedCells.keys()])].toSorted((left, right) => left - right);
+	const cellIndexes = [.../* @__PURE__ */ new Set([...baseCells.keys(), ...revisedCells.keys()])].toSorted(ascending);
 	const steps = [];
 	for (const cellIndex of cellIndexes) {
-		const baseBlocks = baseCells.get(cellIndex) ?? [];
-		const revisedBlocks = revisedCells.get(cellIndex) ?? [];
-		const aligned = alignFolioContentBlocksInScope(baseBlocks, revisedBlocks, {
+		const baseRuns = baseCells.get(cellIndex) ?? /* @__PURE__ */ new Map();
+		const revisedRuns = revisedCells.get(cellIndex) ?? /* @__PURE__ */ new Map();
+		const runOrdinals = [.../* @__PURE__ */ new Set([...baseRuns.keys(), ...revisedRuns.keys()])].toSorted(ascending);
+		for (const run of runOrdinals) steps.push(...alignCellRun({
+			baseBlocks: baseRuns.get(run) ?? [],
+			revisedBlocks: revisedRuns.get(run) ?? [],
 			workSession,
-			idStability,
+			moveScopeContext,
 			stableIdMismatch,
-			structuralScope: "pairedTableCell"
-		}).flatMap((event) => {
-			if (event.type === "pair" && !contentBlocksShareContainerPath(event.baseBlock, event.revisedBlock)) return [{
-				type: "baseOnly",
-				block: event.baseBlock
-			}, {
-				type: "revisedOnly",
-				block: event.revisedBlock
-			}];
-			return [event];
-		});
-		const bucketByContainerPath = /* @__PURE__ */ new Map();
-		const bucketForBlock = (block) => {
-			const path = containerPathKeyOf(block);
-			const existing = bucketByContainerPath.get(path);
-			if (existing !== void 0) return existing;
-			const bucket = moveScopeContext.nextTableCellBucket++;
-			bucketByContainerPath.set(path, bucket);
-			return bucket;
-		};
-		steps.push(...scopedAlignmentSteps(aligned, moveScopeContext, bucketForBlock));
+			idStability
+		}));
 	}
 	return steps;
 };
+const alignCellRun = ({ baseBlocks, revisedBlocks, workSession, moveScopeContext, stableIdMismatch, idStability }) => {
+	const aligned = alignFolioContentBlocksInScope(baseBlocks, revisedBlocks, {
+		workSession,
+		idStability,
+		stableIdMismatch,
+		structuralScope: "pairedTableCell"
+	}).flatMap((event) => {
+		if (event.type === "pair" && !contentBlocksShareContainerPath(event.baseBlock, event.revisedBlock)) return [{
+			type: "baseOnly",
+			block: event.baseBlock
+		}, {
+			type: "revisedOnly",
+			block: event.revisedBlock
+		}];
+		return [event];
+	});
+	const bucketByContainerPath = /* @__PURE__ */ new Map();
+	const bucketForBlock = (block) => {
+		const path = containerPathKeyOf(block);
+		const existing = bucketByContainerPath.get(path);
+		if (existing !== void 0) return existing;
+		const bucket = moveScopeContext.nextTableCellBucket++;
+		bucketByContainerPath.set(path, bucket);
+		return bucket;
+	};
+	return scopedAlignmentSteps(aligned, moveScopeContext, bucketForBlock);
+};
 const pairTableRows = ({ baseRows, revisedRows, workSession, idStability }) => {
 	const profile = (row) => ({
 		item: row,
@@ -1097,7 +1143,7 @@ const pairTableRows = ({ baseRows, revisedRows, workSession, idStability }) => {
 		}
 	});
 };
-const alignTableRows = ({ rows, workSession, moveScopeContext, stableIdMismatch, idStability, baseColumnKeys, revisedColumnKeys }) => {
+const alignTableRows = ({ rows, workSession, moveScopeContext, stableIdMismatch, idStability, baseColumnKeys, revisedColumnKeys, cellRuns }) => {
 	const steps = [];
 	const pushRow = (row, side) => {
 		const location = rowLocation(row);
@@ -1123,7 +1169,8 @@ const alignTableRows = ({ rows, workSession, moveScopeContext, stableIdMismatch,
 				stableIdMismatch,
 				idStability,
 				baseColumnKeys,
-				revisedColumnKeys
+				revisedColumnKeys,
+				cellRuns
 			}));
 			break;
 		default: panic("Unhandled table row alignment", { alignment });
@@ -1148,7 +1195,7 @@ const rowCellSpansEqual = (baseRow, revisedRow) => {
 	});
 };
 const rowHasVerticalSpan = (row) => row.some(({ table }) => table !== void 0 && table.rowSpan > 1);
-const buildTablePlan = ({ baseBlocks, revisedBlocks, workSession, moveScopeContext, stableIdMismatch, idStability }) => {
+const buildTablePlan = ({ baseBlocks, revisedBlocks, workSession, moveScopeContext, stableIdMismatch, idStability, cellRuns }) => {
 	const resolveIdStability = idStability ?? folioContentIdStability;
 	const columns = alignTableColumns(baseBlocks, revisedBlocks);
 	const rows = pairTableRows({
@@ -1169,13 +1216,15 @@ const buildTablePlan = ({ baseBlocks, revisedBlocks, workSession, moveScopeConte
 			stableIdMismatch,
 			idStability: resolveIdStability,
 			baseColumnKeys: columns?.baseColumnKeys,
-			revisedColumnKeys: columns?.revisedColumnKeys
+			revisedColumnKeys: columns?.revisedColumnKeys,
+			cellRuns
 		})]
 	};
 };
 const buildTableSegmentPlan = ({ baseBlocks, revisedBlocks, workSession, moveScopeContext, stableIdMismatch, idStability }) => {
 	const baseTables = groupTables(baseBlocks);
 	const revisedTables = groupTables(revisedBlocks);
+	const cellRuns = new Map([...cellRunOrdinals(baseBlocks), ...cellRunOrdinals(revisedBlocks)]);
 	const resolveIdStability = idStability ?? folioContentIdStability;
 	const profile = (blocks) => ({
 		item: blocks,
@@ -1197,7 +1246,8 @@ const buildTableSegmentPlan = ({ baseBlocks, revisedBlocks, workSession, moveSco
 				workSession,
 				moveScopeContext,
 				stableIdMismatch,
-				idStability: resolveIdStability
+				idStability: resolveIdStability,
+				cellRuns
 			});
 			steps.push(...table.steps);
 			representable &&= table.representable;

package/dist/document-operations.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "./types/document.js";
 import { FolioTableTemplates } from "./ai-edits/table-template.js";
 import { FolioAIEditAppliedOperation, FolioAIEditApplyMode, FolioAIEditNormalization, FolioAIEditOperation, FolioAIEditPrecondition, FolioAIEditSkippedOperation, FolioAIEditSnapshot, FolioAITextRangeHandle } from "./ai-edits/types.js";
-import { FolioAIEditView, FolioRevisionStamp, FolioWordDiffOptions } from "./ai-edits/apply.js";
+import { FolioAIEditView, FolioReplacementBackground, FolioRevisionStamp, FolioWordDiffOptions } from "./ai-edits/apply.js";
 //#region src/document-operations.d.ts
 declare const FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION: 1;
 /** Direct paragraph-alignment values accepted by the operation contract. */
@@ -282,7 +282,14 @@ type ApplyFolioDocumentOperationsOptions = {
    * copying the target document's — hands the whole thing over instead.
    */
   tableTemplates?: FolioTableTemplates;
+  /**
+   * What a replacement in the batch does with a highlight or `w:shd` the text
+   * it replaces carries. Clearing it is the authoring default; a caller that
+   * states the replacement's own run properties — a comparison reproducing the
+   * revised document — keeps them instead.
+   */
+  replacementBackground?: FolioReplacementBackground;
 };
-declare const applyFolioDocumentOperations: ({ view, snapshot, batch, story, author, createCommentId, createUndoHandle, revisionStamp, wordDiff, tableTemplates }: ApplyFolioDocumentOperationsOptions) => FolioDocumentOperationResult;
+declare const applyFolioDocumentOperations: ({ view, snapshot, batch, story, author, createCommentId, createUndoHandle, revisionStamp, wordDiff, tableTemplates, replacementBackground }: ApplyFolioDocumentOperationsOptions) => FolioDocumentOperationResult;
 //#endregion
 export { ApplyFolioDocumentOperationsOptions, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_BATCH_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PAGE_BREAK_CLEAR_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FolioDocumentOperation, FolioDocumentOperationAffectedTarget, FolioDocumentOperationBatch, FolioDocumentOperationBatchPrecondition, FolioDocumentOperationCapabilities, FolioDocumentOperationIssue, FolioDocumentOperationMode, FolioDocumentOperationPrecondition, FolioDocumentOperationQueuedOperation, FolioDocumentOperationReceipt, FolioDocumentOperationRecovery, FolioDocumentOperationResult, FolioDocumentOperationResultBase, FolioDocumentOperationStatus, FolioDocumentOperationStory, FolioDocumentOperationType, FolioDocumentOperationUndoFailureReason, FolioDocumentOperationUndoHandle, FolioDocumentOperationUndoResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch };

package/dist/document-operations.js

@@ -1183,7 +1183,7 @@ const getFolioDocumentOperationReceiptsForStory = ({ operations, applied, story
 	});
 	return receipts;
 };
-const applyFolioDocumentOperations = ({ view, snapshot, batch, story = "main", author, createCommentId, createUndoHandle, revisionStamp, wordDiff, tableTemplates }) => {
+const applyFolioDocumentOperations = ({ view, snapshot, batch, story = "main", author, createCommentId, createUndoHandle, revisionStamp, wordDiff, tableTemplates, replacementBackground }) => {
 	const parsedBatch = parseFolioDocumentOperationBatch(batch);
 	const apply = ({ targetView, targetCreateCommentId = createCommentId, preview = false }) => {
 		return (preview ? previewFolioAIEditOperations : applyFolioAIEditOperations)({
@@ -1195,7 +1195,8 @@ const applyFolioDocumentOperations = ({ view, snapshot, batch, story = "main", a
 			...targetCreateCommentId !== void 0 && { createCommentId: targetCreateCommentId },
 			...revisionStamp !== void 0 && { revisionStamp },
 			...wordDiff !== void 0 && { wordDiff },
-			...tableTemplates !== void 0 && { tableTemplates }
+			...tableTemplates !== void 0 && { tableTemplates },
+			...replacementBackground !== void 0 && { replacementBackground }
 		});
 	};
 	const preview = () => apply({

package/dist/docx/notePropertiesParser.js

@@ -52,7 +52,11 @@ function parseFootnoteProperties(element) {
 	const numFmtEl = findChild(element, "w", "numFmt");
 	if (numFmtEl) {
 		const numFmt = parseNumberFormat(getAttribute(numFmtEl, "w", "val"));
-		if (numFmt !== void 0) props.numFmt = numFmt;
+		if (numFmt !== void 0) {
+			props.numFmt = numFmt;
+			const format = getAttribute(numFmtEl, "w", "format");
+			if (format !== null) props.numFmtFormat = format;
+		}
 	}
 	const numStartEl = findChild(element, "w", "numStart");
 	if (numStartEl) {
@@ -81,7 +85,11 @@ function parseEndnoteProperties(element) {
 	const numFmtEl = findChild(element, "w", "numFmt");
 	if (numFmtEl) {
 		const numFmt = parseNumberFormat(getAttribute(numFmtEl, "w", "val"));
-		if (numFmt !== void 0) props.numFmt = numFmt;
+		if (numFmt !== void 0) {
+			props.numFmt = numFmt;
+			const format = getAttribute(numFmtEl, "w", "format");
+			if (format !== null) props.numFmtFormat = format;
+		}
 	}
 	const numStartEl = findChild(element, "w", "numStart");
 	if (numStartEl) {

package/dist/docx/numberingParser.d.ts

@@ -24,7 +24,7 @@ type NumberingMap = {
  * @returns NumberingMap with definitions and helper functions
  */
 declare function parseNumbering(numberingXml: string | null): NumberingMap;
-/** A `w:numFmt` as the model holds it: the token, plus what `custom` defers to. */
+/** A `w:numFmt` as the model holds it: its token and authored format metadata. */
 type ResolvedNumFmt = Pick<document_d_exports.ListLevel, "numFmt" | "numFmtFormat">;
 /**
  * The width a `custom` format's zero-padded first token counts to, or
@@ -35,14 +35,6 @@ type ResolvedNumFmt = Pick<document_d_exports.ListLevel, "numFmt" | "numFmtForma
  * way; the width is the digit count of the first token, clamped to five.
  */
 declare const customNumberFormatPadWidth: (format: string | undefined) => number | undefined;
-/**
- * The `@w:format` a level's `w:numFmt` writes, which only `custom` carries.
- *
- * `custom` is the reserved member that defers to another attribute, so the
- * comparison lives here, in the module the reserved-value registry names as
- * its owner, rather than in the serializer that needs the answer.
- */
-declare const customNumberFormatOf: (level: ResolvedNumFmt) => string | undefined;
 /** What the marker renderer counts a level in; `custom` decides by pad width. */
 declare const counterFormatOf: (level: ResolvedNumFmt) => document_d_exports.CounterFormat;
 /** {@link MARKER_ALIGNMENT} for a level that may not state a justification. */
@@ -92,4 +84,4 @@ declare function isBulletLevel(level: document_d_exports.ListLevel): boolean;
 /** Whether a numbering level reserves horizontal space for a visible marker. */
 declare const numberingLevelHasMarkerSlot: (level: Pick<document_d_exports.ListLevel, "numFmt">) => boolean;
 //#endregion
-export { NumberingMap, computeListRendering, counterFormatOf, createNumberingMap, customNumberFormatOf, customNumberFormatPadWidth, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerAlignmentForLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };
+export { NumberingMap, computeListRendering, counterFormatOf, createNumberingMap, customNumberFormatPadWidth, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerAlignmentForLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/numberingParser.js

@@ -248,16 +248,16 @@ function parseListLevel(element) {
 * Resolve a `<w:numFmt>` element, or null when it is absent or carries a token
 * outside `ST_NumberFormat` (an mc:Fallback can then supply the rendering).
 *
-* `custom` stays `custom`, with its `@w:format` beside it. It used to be
-* decoded here into a synthetic `decimalZero{3,4,5}` the enumeration does not
-* declare, which the serializer wrote back as a `w:val` no consumer can read.
-* The pad width belongs to the renderer, not to the model.
+* `@w:format` stays beside every admitted token exactly as authored. `custom`
+* used to be decoded here into a synthetic `decimalZero{3,4,5}` the
+* enumeration does not declare, which the serializer wrote back as a `w:val`
+* no consumer can read. The pad-width interpretation belongs to the renderer,
+* not to the model; preservation belongs to every schema-valid `CT_NumFmt`.
 */
 function resolveNumFmt(numFmtEl) {
 	if (!numFmtEl) return null;
 	const numFmt = narrowEnum(getAttribute(numFmtEl, "w", "val"), NumberFormatSchema);
 	if (numFmt === void 0) return null;
-	if (numFmt !== "custom") return { numFmt };
 	const format = getAttribute(numFmtEl, "w", "format");
 	return format === null ? { numFmt } : {
 		numFmt,
@@ -293,14 +293,6 @@ const customNumberFormatPadWidth = (format) => {
 	if (!/^0+1$/u.test(firstToken)) return;
 	return Math.min(firstToken.length, 5);
 };
-/**
-* The `@w:format` a level's `w:numFmt` writes, which only `custom` carries.
-*
-* `custom` is the reserved member that defers to another attribute, so the
-* comparison lives here, in the module the reserved-value registry names as
-* its owner, rather than in the serializer that needs the answer.
-*/
-const customNumberFormatOf = (level) => level.numFmt === "custom" ? level.numFmtFormat : void 0;
 /** What the marker renderer counts a level in; `custom` decides by pad width. */
 const counterFormatOf = (level) => {
 	if (level.numFmt !== "custom") return level.numFmt;
@@ -511,4 +503,4 @@ function isBulletLevel(level) {
 /** Whether a numbering level reserves horizontal space for a visible marker. */
 const numberingLevelHasMarkerSlot = (level) => level.numFmt !== "none";
 //#endregion
-export { computeListRendering, counterFormatOf, createNumberingMap, customNumberFormatOf, customNumberFormatPadWidth, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerAlignmentForLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };
+export { computeListRendering, counterFormatOf, createNumberingMap, customNumberFormatPadWidth, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, markerAlignmentForLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/runParser.js

@@ -16,7 +16,7 @@ import { resolveThemeFontRef } from "./themeParser.js";
 import { parsePropertyChangeInfo } from "./trackedChangeInfo.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
 import { parseVmlImageContent, shouldPreserveRawVmlPict } from "./vmlImageParser.js";
-import { WORDPROCESSINGML_NAMESPACE_URIS, cloneWithXmlnsDeclarations, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getLocalName, getNamespaceUri, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, selectAlternateContentBranch } from "./xmlParser.js";
+import { WORDPROCESSINGML_NAMESPACE_URIS, cloneWithXmlnsDeclarations, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getLocalName, getNamespaceUri, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, parseOnOffAttribute, selectAlternateContentBranch } from "./xmlParser.js";
 import { DRAWING_RAW_XML_MODES } from "@stll/docx-core/model";
 //#region src/docx/runParser.ts
 /**
@@ -486,19 +486,25 @@ function parseSymbolContent(element) {
 * Parse footnote reference (w:footnoteReference)
 */
 function parseFootnoteReference(element) {
-	return {
+	const reference = {
 		type: "footnoteRef",
 		id: parseNumericAttribute(element, "w", "id") ?? 0
 	};
+	const customMarkFollows = parseOnOffAttribute(element, "w", "customMarkFollows");
+	if (customMarkFollows !== void 0) reference.customMarkFollows = customMarkFollows;
+	return reference;
 }
 /**
 * Parse endnote reference (w:endnoteReference)
 */
 function parseEndnoteReference(element) {
-	return {
+	const reference = {
 		type: "endnoteRef",
 		id: parseNumericAttribute(element, "w", "id") ?? 0
 	};
+	const customMarkFollows = parseOnOffAttribute(element, "w", "customMarkFollows");
+	if (customMarkFollows !== void 0) reference.customMarkFollows = customMarkFollows;
+	return reference;
 }
 /**
 * Parse field character (w:fldChar)
@@ -670,7 +676,7 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 		case "cr":
 			contents.push({
 				type: "break",
-				breakType: "textWrapping"
+				sourceElement: "cr"
 			});
 			break;
 		case "AlternateContent": {

package/dist/docx/serializer/numberingSerializer.js

@@ -1,6 +1,5 @@
 import { serializeParagraphPropertySet } from "../../internal/paragraphFormattingSerialization.js";
 import { serializePreservedAttributes } from "../attributeRemainder.js";
-import { customNumberFormatOf } from "../numberingParser.js";
 import { serializePartElement } from "./partNamespaces.js";
 import { serializeTextFormatting } from "./textFormattingSerializer.js";
 import { intAttr } from "./xmlUtils.js";
@@ -9,8 +8,8 @@ import { serializeSequenceChildren } from "@stll/docx-core/schema";
 //#region src/docx/serializer/numberingSerializer.ts
 /** Serialize one `w:lvl`. */
 function serializeLevel(level) {
-	const customFormat = customNumberFormatOf(level);
-	const numFmtFormat = customFormat === void 0 ? "" : ` w:format="${escapeXmlAttribute(customFormat)}"`;
+	let numFmtFormat = "";
+	if (level.numFmtFormat !== void 0) numFmtFormat = ` w:format="${escapeXmlAttribute(level.numFmtFormat)}"`;
 	const pPr = level.pPr === void 0 ? "" : serializeParagraphPropertySet({ formatting: level.pPr }) || "<w:pPr/>";
 	const rPr = level.rPr === void 0 ? "" : serializeTextFormatting(level.rPr) || "<w:rPr/>";
 	const lvlTextAttrs = [`w:val="${escapeXmlAttribute(level.lvlText)}"`];

package/dist/docx/serializer/runSerializer.js

@@ -76,6 +76,7 @@ function serializeTabContent(content) {
 * Serialize break content (w:br)
 */
 function serializeBreakContent(content) {
+	if (content.sourceElement === "cr") return "<w:cr/>";
 	const attrs = [];
 	if (content.breakType === "page") attrs.push("w:type=\"page\"");
 	else if (content.breakType === "column") attrs.push("w:type=\"column\"");
@@ -94,8 +95,10 @@ function serializeSymbolContent(content) {
 * Serialize footnote/endnote reference
 */
 function serializeNoteReference(content) {
-	if (content.type === "footnoteRef") return `<w:footnoteReference w:id="${content.id}"/>`;
-	return `<w:endnoteReference w:id="${content.id}"/>`;
+	let customMarkFollows = "";
+	if (content.customMarkFollows !== void 0) customMarkFollows = ` w:customMarkFollows="${content.customMarkFollows ? "1" : "0"}"`;
+	if (content.type === "footnoteRef") return `<w:footnoteReference w:id="${content.id}"${customMarkFollows}/>`;
+	return `<w:endnoteReference w:id="${content.id}"${customMarkFollows}/>`;
 }
 /**
 * Serialize field character (w:fldChar)

package/dist/docx/serializer/sectionPropertiesSerializer.js

@@ -13,7 +13,11 @@ function serializeFootnoteProperties(props) {
 	if (!props) return "";
 	const parts = [];
 	if (props.position) parts.push(`<w:pos w:val="${props.position}"/>`);
-	if (props.numFmt) parts.push(`<w:numFmt w:val="${props.numFmt}"/>`);
+	if (props.numFmt) {
+		let format = "";
+		if (props.numFmtFormat !== void 0) format = ` w:format="${escapeXmlAttribute(props.numFmtFormat)}"`;
+		parts.push(`<w:numFmt w:val="${props.numFmt}"${format}/>`);
+	}
 	if (props.numStart !== void 0) parts.push(`<w:numStart w:val="${intAttr(props.numStart)}"/>`);
 	if (props.numRestart) parts.push(`<w:numRestart w:val="${props.numRestart}"/>`);
 	return parts.length > 0 ? `<w:footnotePr>${parts.join("")}</w:footnotePr>` : "";
@@ -25,7 +29,11 @@ function serializeEndnoteProperties(props) {
 	if (!props) return "";
 	const parts = [];
 	if (props.position) parts.push(`<w:pos w:val="${props.position}"/>`);
-	if (props.numFmt) parts.push(`<w:numFmt w:val="${props.numFmt}"/>`);
+	if (props.numFmt) {
+		let format = "";
+		if (props.numFmtFormat !== void 0) format = ` w:format="${escapeXmlAttribute(props.numFmtFormat)}"`;
+		parts.push(`<w:numFmt w:val="${props.numFmt}"${format}/>`);
+	}
 	if (props.numStart !== void 0) parts.push(`<w:numStart w:val="${intAttr(props.numStart)}"/>`);
 	if (props.numRestart) parts.push(`<w:numRestart w:val="${props.numRestart}"/>`);
 	return parts.length > 0 ? `<w:endnotePr>${parts.join("")}</w:endnotePr>` : "";

package/dist/docx/serializer/tableSerializer.js

@@ -529,10 +529,11 @@ function serializeCellContent(content, serializeParagraph) {
 */
 function serializeTableCell(cell, serializeParagraph) {
 	const parts = [];
+	const id = cell.id === void 0 ? "" : ` w:id="${escapeXmlAttribute(cell.id)}"`;
 	const tcPrXml = serializeTableCellFormatting(cell.formatting, cell.propertyChanges, cell.structuralChange);
 	if (tcPrXml) parts.push(tcPrXml);
 	parts.push(serializeCellContent(cell.content, serializeParagraph));
-	return `<w:tc>${parts.join("")}</w:tc>`;
+	return `<w:tc${id}>${parts.join("")}</w:tc>`;
 }
 /**
 * A container's verbatim sink and its bookmark markers, as one positioned list.

package/dist/docx/tableParser.js

@@ -12,7 +12,7 @@ import { TABLE_LOOK_FLAGS } from "./tableLook.js";
 import { parsePropertyChangeInfo, parseTrackedChangeInfo } from "./trackedChangeInfo.js";
 import { percentageSpelling, transitionalSlotEncoding } from "./transitionalSpelling.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
-import { cloneElement, findChild, findChildren, findWordprocessingChild, getAttribute, getLocalName, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, parseOnOffAttribute, parseTableMeasurementValue, selectAlternateContentBranch } from "./xmlParser.js";
+import { WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, findChild, findChildren, findWordprocessingChild, getAttribute, getAttributeByNamespaceUri, getLocalName, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, parseOnOffAttribute, parseTableMeasurementValue, selectAlternateContentBranch } from "./xmlParser.js";
 //#region src/docx/tableParser.ts
 /**
 * Sanity cap on `w:gridSpan` (and the derived table column count). Word's
@@ -833,7 +833,7 @@ function parseCellContent(tcElement, styles, theme, numbering, rels, media, opti
 		if (preserved?.children) captured.push(...preserved.children);
 	};
 	dispatchCellChildren(tcElement, options);
-	if (!modelled.some((block) => block.type === "paragraph" || block.type === "table")) modelled.push({
+	if (modelled.findLast((block) => block.type === "paragraph" || block.type === "table")?.type !== "paragraph") modelled.push({
 		type: "paragraph",
 		content: []
 	});
@@ -858,6 +858,8 @@ function parseTableCell(tcElement, styles, theme, numbering, rels, media, option
 		type: "tableCell",
 		content: []
 	};
+	const id = getAttributeByNamespaceUri(tcElement, WORDPROCESSINGML_NAMESPACE_URIS, "id");
+	if (id !== null) cell.id = id;
 	const tcPrElement = findChild(tcElement, "w", "tcPr");
 	const formatting = parseTableCellProperties(tcPrElement);
 	if (formatting) cell.formatting = formatting;

package/dist/prosemirror/attrs/index.js

@@ -89,6 +89,7 @@ const TEXT_BOX_TRACKED_CHANGE_TYPES = [
 	"moveTo"
 ];
 const HARD_BREAK_TYPES = ["column", "textWrapping"];
+const HARD_BREAK_SOURCE_ELEMENTS = ["br", "cr"];
 const PAGE_BREAK_CLEAR_VALUES = [
 	"none",
 	"left",
@@ -269,8 +270,19 @@ const readHardBreakAttrs = (node) => {
 	const attrs = attrsRecord(node.attrs);
 	const issues = [];
 	expectNodeType(node, "hardBreak", issues);
+	optionalOneOf(attrs, "sourceElement", "hardBreak.attrs.sourceElement", issues, HARD_BREAK_SOURCE_ELEMENTS);
 	optionalOneOf(attrs, "breakType", "hardBreak.attrs.breakType", issues, HARD_BREAK_TYPES);
 	optionalOneOf(attrs, "clear", "hardBreak.attrs.clear", issues, PAGE_BREAK_CLEAR_VALUES);
+	if (attrs["sourceElement"] === "cr") {
+		if (attrs["breakType"] !== void 0 && attrs["breakType"] !== null) issues.push({
+			path: "hardBreak.attrs.breakType",
+			message: "Not allowed on a carriage-return element."
+		});
+		if (attrs["clear"] !== void 0 && attrs["clear"] !== null) issues.push({
+			path: "hardBreak.attrs.clear",
+			message: "Not allowed on a carriage-return element."
+		});
+	}
 	return attrsResult(attrs, issues);
 };
 const expectHardBreakAttrs = (node) => expectCachedNodeAttrs(node, hardBreakAttrsCache, readHardBreakAttrs, "hard break attrs");
@@ -386,6 +398,7 @@ const readTableCellAttrs = (node) => {
 	const attrs = attrsRecord(node.attrs);
 	const issues = [];
 	expectNodeTypeOneOf(node, ["tableCell", "tableHeader"], issues);
+	optionalString(attrs, "_docxCellId", "tableCell.attrs._docxCellId", issues);
 	requiredNumber(attrs, "colspan", "tableCell.attrs.colspan", issues);
 	requiredNumber(attrs, "rowspan", "tableCell.attrs.rowspan", issues);
 	optionalOneOf(attrs, "_omittedGridSlot", "tableCell.attrs._omittedGridSlot", issues, OMITTED_GRID_SLOT_VALUES);
@@ -767,6 +780,7 @@ const readFootnoteRefMarkAttrs = (mark) => {
 	requiredStringOrNumber(attrs, "id", "footnoteRef.attrs.id", issues);
 	optionalOneOf(attrs, "noteType", "footnoteRef.attrs.noteType", issues, NOTE_TYPES);
 	optionalOneOf(attrs, "vertAlign", "footnoteRef.attrs.vertAlign", issues, NOTE_REF_VERT_ALIGNS);
+	optionalBoolean(attrs, "customMarkFollows", "footnoteRef.attrs.customMarkFollows", issues);
 	return attrsResult(attrs, issues);
 };
 const expectFootnoteRefMarkAttrs = (mark) => expectCachedMarkAttrs(mark, footnoteRefAttrsCache, readFootnoteRefMarkAttrs, "footnote reference attrs");
@@ -1018,6 +1032,9 @@ const readHyperlinkMarkAttrs = (mark) => {
 	requiredString(attrs, "href", "hyperlink.attrs.href", issues);
 	optionalString(attrs, "tooltip", "hyperlink.attrs.tooltip", issues);
 	optionalString(attrs, "rId", "hyperlink.attrs.rId", issues);
+	optionalString(attrs, "target", "hyperlink.attrs.target", issues);
+	optionalBoolean(attrs, "history", "hyperlink.attrs.history", issues);
+	optionalString(attrs, "docLocation", "hyperlink.attrs.docLocation", issues);
 	validateNonNegativeInteger(attrs["_docxHyperlinkIndex"], "hyperlink.attrs._docxHyperlinkIndex", issues);
 	return attrsResult(attrs, issues);
 };
@@ -2612,6 +2629,9 @@ const optionalEmptyHyperlinkArray = (value, issues) => {
 		optionalString(item, "anchor", `${itemPath}.anchor`, issues);
 		optionalString(item, "tooltip", `${itemPath}.tooltip`, issues);
 		optionalString(item, "rId", `${itemPath}.rId`, issues);
+		optionalString(item, "target", `${itemPath}.target`, issues);
+		optionalBoolean(item, "history", `${itemPath}.history`, issues);
+		optionalString(item, "docLocation", `${itemPath}.docLocation`, issues);
 	}
 };
 //#endregion

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1643,6 +1643,9 @@ function createEmptyHyperlink(attrs) {
 	if (attrs.anchor !== void 0) hyperlink.anchor = attrs.anchor;
 	if (attrs.tooltip !== void 0) hyperlink.tooltip = attrs.tooltip;
 	if (attrs.rId !== void 0) hyperlink.rId = attrs.rId;
+	if (attrs.target !== void 0) hyperlink.target = attrs.target;
+	if (attrs.history !== void 0) hyperlink.history = attrs.history;
+	if (attrs.docLocation !== void 0) hyperlink.docLocation = attrs.docLocation;
 	return hyperlink;
 }
 function getCommentMarkIds(marks) {
@@ -1684,6 +1687,9 @@ function getLinkKey(mark) {
 		attrs.href,
 		attrs.rId ?? "",
 		attrs.tooltip ?? "",
+		attrs.target ?? "",
+		attrs.history === void 0 ? "" : String(attrs.history),
+		attrs.docLocation ?? "",
 		attrs._docxHyperlinkIndex ?? ""
 	].join("\0");
 }
@@ -1701,21 +1707,24 @@ function getMarksKey(marks) {
 function createHyperlink(linkMark) {
 	const attrs = expectHyperlinkMarkAttrs(linkMark);
 	const href = attrs.href;
-	if (href.startsWith("#")) {
-		const hyperlink = {
-			type: "hyperlink",
-			anchor: href.slice(1),
-			children: []
-		};
-		if (attrs.tooltip) hyperlink.tooltip = attrs.tooltip;
-		return hyperlink;
-	}
+	const metadata = {
+		...attrs.tooltip === void 0 ? {} : { tooltip: attrs.tooltip },
+		...attrs.target === void 0 ? {} : { target: attrs.target },
+		...attrs.history === void 0 ? {} : { history: attrs.history },
+		...attrs.docLocation === void 0 ? {} : { docLocation: attrs.docLocation }
+	};
+	if (href.startsWith("#")) return {
+		type: "hyperlink",
+		anchor: href.slice(1),
+		...metadata,
+		children: []
+	};
 	const hyperlink = {
 		type: "hyperlink",
 		href,
+		...metadata,
 		children: []
 	};
-	if (attrs.tooltip) hyperlink.tooltip = attrs.tooltip;
 	if (attrs.rId) hyperlink.rId = attrs.rId;
 	return hyperlink;
 }
@@ -1831,12 +1840,14 @@ function getNoteReferenceVertAlign(noteAttrs, marks) {
 }
 function createNoteReferenceRun(noteRefMark, marks, formattingContext) {
 	const noteAttrs = expectFootnoteRefMarkAttrs(noteRefMark);
+	const noteRef = {
+		type: noteAttrs.noteType === "endnote" ? "endnoteRef" : "footnoteRef",
+		id: typeof noteAttrs.id === "string" ? Number.parseInt(noteAttrs.id, 10) || 0 : noteAttrs.id
+	};
+	if (noteAttrs.customMarkFollows !== void 0) noteRef.customMarkFollows = noteAttrs.customMarkFollows;
 	const run = {
 		type: "run",
-		content: [{
-			type: noteAttrs.noteType === "endnote" ? "endnoteRef" : "footnoteRef",
-			id: typeof noteAttrs.id === "string" ? Number.parseInt(noteAttrs.id, 10) || 0 : noteAttrs.id
-		}]
+		content: [noteRef]
 	};
 	const formatting = getAtomRunFormattingFromMarks(marks, formattingContext);
 	const vertAlign = getNoteReferenceVertAlign(noteAttrs, marks);
@@ -2045,8 +2056,12 @@ function createPageBreakCarrierRun({ baseParagraphFormatting, clear, inheritedFo
 function createBreakRun(attrs, marks, formattingContext) {
 	const run = {
 		type: "run",
-		content: [{
+		content: [attrs.sourceElement === "cr" ? {
+			type: "break",
+			sourceElement: "cr"
+		} : {
 			type: "break",
+			...attrs.sourceElement !== void 0 ? { sourceElement: attrs.sourceElement } : {},
 			...attrs.breakType !== void 0 ? { breakType: attrs.breakType } : {},
 			...attrs.clear !== void 0 ? { clear: attrs.clear } : {}
 		}]
@@ -3305,6 +3320,7 @@ function convertPMTableCell(node, documentCounts, styleResolver = null) {
 		type: "tableCell",
 		content
 	};
+	if (attrs._docxCellId !== void 0) cell.id = attrs._docxCellId;
 	const cellFormatting = tableCellAttrsToFormatting(attrs);
 	if (cellFormatting) cell.formatting = cellFormatting;
 	if (Array.isArray(attrs.tcPrChange) && attrs.tcPrChange.length > 0) cell.propertyChanges = [...attrs.tcPrChange];

package/dist/prosemirror/conversion/toProseDoc.js

@@ -492,7 +492,10 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 						...content.href !== void 0 ? { href: content.href } : {},
 						...content.anchor !== void 0 ? { anchor: content.anchor } : {},
 						...content.tooltip !== void 0 ? { tooltip: content.tooltip } : {},
-						...content.rId !== void 0 ? { rId: content.rId } : {}
+						...content.rId !== void 0 ? { rId: content.rId } : {},
+						...content.target !== void 0 ? { target: content.target } : {},
+						...content.history !== void 0 ? { history: content.history } : {},
+						...content.docLocation !== void 0 ? { docLocation: content.docLocation } : {}
 					});
 					break;
 				}
@@ -1325,6 +1328,7 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 		colspan: formatting?.gridSpan ?? 1,
 		rowspan
 	};
+	if (cell.id !== void 0) attrs._docxCellId = cell.id;
 	if (effectiveFormatting.width.type === "value") {
 		attrs.width = effectiveFormatting.width.value;
 		if (effectiveFormatting.width.widthType) attrs.widthType = effectiveFormatting.width.widthType;
@@ -2064,6 +2068,7 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 		case "break":
 			if (content.breakType === "textWrapping" || !content.breakType) {
 				const attrs = {
+					...content.sourceElement !== void 0 ? { sourceElement: content.sourceElement } : {},
 					...content.breakType !== void 0 ? { breakType: content.breakType } : {},
 					...content.clear !== void 0 ? { clear: content.clear } : {}
 				};
@@ -2095,7 +2100,8 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 			const footnoteMark = schema.mark("footnoteRef", {
 				id: content.id.toString(),
 				noteType: "footnote",
-				vertAlign: noteReferenceVertAlign(formatting?.vertAlign)
+				vertAlign: noteReferenceVertAlign(formatting?.vertAlign),
+				customMarkFollows: content.customMarkFollows
 			});
 			return [schema.text(content.id.toString(), [...marks, footnoteMark])];
 		}
@@ -2103,7 +2109,8 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 			const endnoteMark = schema.mark("footnoteRef", {
 				id: content.id.toString(),
 				noteType: "endnote",
-				vertAlign: noteReferenceVertAlign(formatting?.vertAlign)
+				vertAlign: noteReferenceVertAlign(formatting?.vertAlign),
+				customMarkFollows: content.customMarkFollows
 			});
 			return [schema.text(content.id.toString(), [...marks, endnoteMark])];
 		}
@@ -2284,6 +2291,9 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 		href,
 		tooltip: hyperlink.tooltip,
 		rId: hyperlink.rId,
+		target: hyperlink.target,
+		history: hyperlink.history,
+		docLocation: hyperlink.docLocation,
 		_docxHyperlinkIndex: hyperlinkIndex
 	});
 	for (const { content: child, stack } of withInlineWrapperStacks(hyperlink.children)) {

package/dist/prosemirror/extensions/marks/FootnoteRefExtension.js

@@ -20,7 +20,8 @@ const FootnoteRefExtension = createMarkExtension({
 		attrs: {
 			id: {},
 			noteType: { default: "footnote" },
-			vertAlign: { default: null }
+			vertAlign: { default: null },
+			customMarkFollows: { default: null }
 		},
 		parseDOM: [
 			{

package/dist/prosemirror/extensions/marks/HyperlinkExtension.js

@@ -82,6 +82,9 @@ const HyperlinkExtension = createMarkExtension({
 			href: {},
 			tooltip: { default: null },
 			rId: { default: null },
+			target: { default: null },
+			history: { default: null },
+			docLocation: { default: null },
 			_docxHyperlinkIndex: { default: null }
 		},
 		inclusive: false,
@@ -89,14 +92,15 @@ const HyperlinkExtension = createMarkExtension({
 			tag: "a[href]",
 			getAttrs: (dom) => ({
 				href: sanitizeStoredHref(dom.getAttribute("href") ?? void 0),
-				tooltip: dom.getAttribute("title") ?? void 0
+				tooltip: dom.getAttribute("title") ?? void 0,
+				target: dom.getAttribute("target") ?? void 0
 			})
 		}],
 		toDOM(mark) {
-			const { href, tooltip } = expectHyperlinkMarkAttrs(mark);
+			const { href, target, tooltip } = expectHyperlinkMarkAttrs(mark);
 			const domAttrs = {
 				href: sanitizeStoredHref(href),
-				...anchorTargetAttrs(void 0)
+				...anchorTargetAttrs(target)
 			};
 			if (tooltip) domAttrs["title"] = tooltip;
 			return [

package/dist/prosemirror/extensions/nodes/HardBreakExtension.js

@@ -12,6 +12,7 @@ const HardBreakExtension = createNodeExtension({
 		inline: true,
 		group: "inline",
 		attrs: {
+			sourceElement: { default: null },
 			breakType: { default: null },
 			clear: { default: null }
 		},
@@ -22,15 +23,18 @@ const HardBreakExtension = createNodeExtension({
 				if (!(node instanceof HTMLElement)) return null;
 				const breakType = node.dataset["docxBreakType"];
 				const clear = node.dataset["docxBreakClear"];
+				const sourceElement = node.dataset["docxSourceElement"];
 				const attrs = {};
+				if (sourceElement === "br" || sourceElement === "cr") attrs["sourceElement"] = sourceElement;
 				if (breakType === "column" || breakType === "textWrapping") attrs["breakType"] = breakType;
 				if (clear === "none" || clear === "left" || clear === "right" || clear === "all") attrs["clear"] = clear;
 				return Object.keys(attrs).length > 0 ? attrs : null;
 			}
 		}],
 		toDOM(node) {
-			const { breakType, clear } = expectHardBreakAttrs(node);
+			const { sourceElement, breakType, clear } = expectHardBreakAttrs(node);
 			const attrs = {};
+			if (sourceElement !== void 0) attrs["data-docx-source-element"] = sourceElement;
 			if (breakType !== void 0) attrs["data-docx-break-type"] = breakType;
 			if (clear !== void 0) attrs["data-docx-break-clear"] = clear;
 			return Object.keys(attrs).length > 0 ? ["br", attrs] : ["br"];

package/dist/prosemirror/extensions/nodes/TableExtension.js

@@ -39,6 +39,43 @@ const preserveOmittedGridSlots = (command) => (state, dispatch, view) => {
 	if (table && hasOmittedGridSlots(table)) return false;
 	return command(state, dispatch, view);
 };
+const preserveSourceCellIdentity = (command) => (state, dispatch, view) => {
+	if (!command(state, void 0, view)) return false;
+	if (!dispatch) return true;
+	const rect = selectedRect(state);
+	const sourceRelativePosition = rect.map.map.at(rect.top * rect.map.width + rect.left);
+	if (sourceRelativePosition === void 0) return panic("The selected table cell is absent from its table map");
+	const sourceCell = rect.table.nodeAt(sourceRelativePosition);
+	if (!sourceCell) return panic("The selected table cell is absent from its table map");
+	const sourceId = expectTableCellAttrs(sourceCell)._docxCellId;
+	return command(state, (tr) => {
+		if (sourceId === void 0 || sourceId === null) {
+			dispatch(tr);
+			return;
+		}
+		const mappedTablePosition = tr.mapping.map(rect.tableStart - 1, -1);
+		const table = tr.doc.nodeAt(mappedTablePosition);
+		if (!table) return panic("The split-cell transaction lost its table");
+		const tableStart = mappedTablePosition + 1;
+		const map = TableMap.get(table);
+		const survivingRelativePosition = map.map.at(rect.top * map.width + rect.left);
+		if (survivingRelativePosition === void 0) return panic("The surviving table cell is absent from its table map");
+		const cleared = /* @__PURE__ */ new Set();
+		for (let row = rect.top; row < rect.bottom; row++) for (let column = rect.left; column < rect.right; column++) {
+			const relativePosition = map.map.at(row * map.width + column);
+			if (relativePosition === void 0) return panic("A split table cell is absent from its table map");
+			if (relativePosition === survivingRelativePosition || cleared.has(relativePosition)) continue;
+			cleared.add(relativePosition);
+			const cell = table.nodeAt(relativePosition);
+			if (!cell) return panic("A split table cell is absent from its table map");
+			tr.setNodeMarkup(tableStart + relativePosition, null, {
+				...cell.attrs,
+				_docxCellId: null
+			});
+		}
+		dispatch(tr);
+	}, view);
+};
 const isOneOf = (value, values) => value !== null && value !== void 0 && values.some((allowed) => allowed === value);
 /** Map CSS border-style to OOXML border style. */
 function cssBorderStyleToOoxml(cssStyle) {
@@ -334,6 +371,7 @@ const tableCellSpec = {
 	tableRole: "cell",
 	isolating: true,
 	attrs: {
+		_docxCellId: { default: null },
 		colspan: { default: 1 },
 		rowspan: { default: 1 },
 		_omittedGridSlot: { default: null },
@@ -402,6 +440,7 @@ const tableHeaderSpec = {
 	tableRole: "header_cell",
 	isolating: true,
 	attrs: {
+		_docxCellId: { default: null },
 		colspan: { default: 1 },
 		rowspan: { default: 1 },
 		_omittedGridSlot: { default: null },
@@ -2004,7 +2043,7 @@ const TablePluginExtension = createExtension({
 				selectRow: () => selectRow,
 				selectColumn: () => selectColumn,
 				mergeCells: () => preserveOmittedGridSlots(mergeCells),
-				splitCell: () => preserveOmittedGridSlots(splitCell),
+				splitCell: () => preserveOmittedGridSlots(preserveSourceCellIdentity(splitCell)),
 				setCellBorder: (side, spec, clearOthers) => setCellBorder(side, spec, clearOthers),
 				setTableBorders: (preset, borderSpec) => setTableBorders(preset, borderSpec),
 				setTableBorderPreset: (preset) => setTableBorderPreset(preset),

package/dist/prosemirror/runFormattingInlineCarriers.js

@@ -1,5 +1,6 @@
 import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { expectFieldAttrs, expectPreservedXmlAttrs, expectSymbolAttrs } from "./attrs/index.js";
+import { PRESERVED_XML_LEVELS } from "./schema/nodes.js";
 import { panic } from "better-result";
 import { Mark } from "prosemirror-model";
 //#region src/prosemirror/runFormattingInlineCarriers.ts
@@ -31,6 +32,22 @@ const RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS = Object.freeze({
 	textBoxAnchor: "not-a-run"
 });
 const dispositionsByName = new Map(Object.entries(RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS));
+/**
+* One preserved capture is a `w:r` child and the other is a `w:p` child, and
+* the map above can only name the node type.
+*
+* Only the run-level capture serializes inside a `w:r`, so only it has a
+* `w:rPr` to carry; the save path already branches on the same level. A
+* paragraph-level capture is the markup Word writes BETWEEN runs — `w:proofErr`
+* above all — and treating it as a carrier makes every consumer of this map
+* wrong in the same way: formatting marks put on it are dropped on save, and a
+* comparison is asked to line up the base's proofing annotations with the
+* revised document's own, which no redline can do.
+*/
+const PRESERVED_XML_DISPOSITIONS = {
+	[PRESERVED_XML_LEVELS.run]: "preserved-xml-run",
+	[PRESERVED_XML_LEVELS.inline]: "not-a-run"
+};
 const CONTROL_CHARACTER_BY_DISPOSITION = Object.freeze({
 	"break-run": "\n",
 	"field-run": null,
@@ -73,7 +90,7 @@ const runFormattingInlineAtomDisposition = (node) => {
 	if (!node.isInline || !node.isAtom) return null;
 	const disposition = dispositionsByName.get(node.type.name);
 	if (!disposition) return panic(`Inline atom ${JSON.stringify(node.type.name)} has no run-formatting disposition`);
-	return disposition;
+	return disposition === "preserved-xml-run" ? PRESERVED_XML_DISPOSITIONS[expectPreservedXmlAttrs(node).level] : disposition;
 };
 /** Apply a mark set without changing a carrier's text or serialized ownership. */
 const applyMarksToRunFormattingRepresentation = ({ tr, representation, marks }) => {

package/dist/prosemirror/schema/marks.d.ts

@@ -81,6 +81,7 @@ type FootnoteRefAttrs = {
   id: string | number;
   noteType?: "footnote" | "endnote";
   vertAlign?: "baseline" | "superscript";
+  customMarkFollows?: document_d_exports.NoteReferenceContent["customMarkFollows"];
 };
 type CommentAttrs = {
   commentId: number;
@@ -271,6 +272,9 @@ type HyperlinkAttrs = {
   href: string;
   tooltip?: string;
   rId?: string;
+  target?: document_d_exports.Hyperlink["target"];
+  history?: document_d_exports.Hyperlink["history"];
+  docLocation?: document_d_exports.Hyperlink["docLocation"];
   _docxHyperlinkIndex?: number;
 };
 //#endregion

package/dist/prosemirror/schema/nodes.d.ts

@@ -7,6 +7,12 @@ import { ParagraphNumberingAttr } from "../numberingAttr.js";
 import { ParagraphDirection } from "../paragraphDirection.js";
 //#region src/prosemirror/schema/nodes.d.ts
 type HardBreakAttrs = {
+  sourceElement: "cr";
+  breakType?: never;
+  clear?: never;
+} | {
+  /** Absent and `br` both serialize as the standard break element. */
+  sourceElement?: "br";
   /** Absent means the source `w:br` omitted `w:type`. */
   breakType?: "column" | "textWrapping";
   clear?: "none" | "left" | "right" | "all";
@@ -216,6 +222,9 @@ type ParagraphAttrs = {
     anchor?: document_d_exports.Hyperlink["anchor"];
     tooltip?: document_d_exports.Hyperlink["tooltip"];
     rId?: document_d_exports.Hyperlink["rId"];
+    target?: document_d_exports.Hyperlink["target"];
+    history?: document_d_exports.Hyperlink["history"];
+    docLocation?: document_d_exports.Hyperlink["docLocation"];
   }[];
   /**
    * Run-in heading flag: this paragraph's mark carries
@@ -1056,6 +1065,8 @@ type SuggestedStructuralMarker = {
  * Table cell attributes
  */
 type TableCellAttrs = {
+  /** Authored OOXML cell identifier. */
+  _docxCellId?: document_d_exports.TableCell["id"];
   /** Column span */
   colspan: number;
   /** Row span */

package/dist/utils/tableOperations.d.ts

@@ -5,7 +5,7 @@ type TablePropertiesCommand = {
   widthType?: document_d_exports.TableWidthType | null;
   justification?: document_d_exports.TableAlignment | null;
 };
-declare const TABLE_PROPERTY_JUSTIFICATIONS: readonly ("start" | "center" | "end" | "left" | "right")[];
+declare const TABLE_PROPERTY_JUSTIFICATIONS: readonly document_d_exports.TableAlignment[];
 declare const toTablePropertyJustification: (value: string | null | undefined) => NonNullable<TablePropertiesCommand["justification"]>;
 type TableAction = "addRowAbove" | "addRowBelow" | "addColumnLeft" | "addColumnRight" | "deleteRow" | "deleteColumn" | "mergeCells" | "splitCell" | "deleteTable" | "selectTable" | "selectRow" | "selectColumn" | "borderAll" | "borderOutside" | "borderInside" | "borderNone" | "borderTop" | "borderBottom" | "borderLeft" | "borderRight" | {
   type: "cellFillColor";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.47.0",
+  "version": "0.47.2",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -128,7 +128,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.25.0",
+    "@stll/docx-core": "^0.25.1",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": ">=0.4.0 <1.0.0",
     "better-result": "3.0.1",