@stll/folio-core 0.48.0 → 0.49.0

package/dist/docx/shapeAlternateContent.d.ts

@@ -0,0 +1,25 @@
+import { Shape, ShapeAlternateContent, ShapeContent } from "../types/content.js";
+import { XmlElement } from "./xmlParser.js";
+//#region src/docx/shapeAlternateContent.d.ts
+/**
+ * Capture the `mc:AlternateContent` a shape was read from, when the shape's
+ * drawing is the sole child of the branch it came from.
+ */
+declare const captureShapeAlternateContent: ({ shape, alternateContent, branch, drawing }: {
+  shape: Shape;
+  alternateContent: XmlElement;
+  branch: XmlElement;
+  drawing: XmlElement;
+}) => ShapeAlternateContent | undefined;
+/** Re-fingerprint a capture for a shape rebuilt from an unedited projection. */
+declare const refingerprintShapeAlternateContent: (shape: Shape, verbatimXml: string) => ShapeAlternateContent;
+/**
+ * The captured `mc:AlternateContent` to write in place of the shape's drawing,
+ * or undefined when the shape must be regenerated.
+ *
+ * Replay requires the modeled shape to still match the capture. An edited shape
+ * is regenerated as a bare `w:drawing` without the stale Fallback.
+ */
+declare const replayableShapeAlternateContent: (content: ShapeContent) => string | undefined;
+//#endregion
+export { captureShapeAlternateContent, refingerprintShapeAlternateContent, replayableShapeAlternateContent };

package/dist/docx/shapeAlternateContent.js

@@ -0,0 +1,52 @@
+import { canonicalJson } from "../utils/canonicalJson.js";
+import { captureVerbatimXml } from "./verbatimCapture.js";
+import { getChildElements, getLocalName } from "./xmlParser.js";
+//#region src/docx/shapeAlternateContent.ts
+/**
+* Every modeled field, text body included: the Fallback repeats the shape's
+* geometry and its text, so an edit to either makes the captured element stale.
+*/
+const shapeFingerprint = (shape) => canonicalJson(shape);
+/**
+* Whether `element` is the only child element of its `mc:Choice` or
+* `mc:Fallback` branch.
+*
+* A branch holding more than the one drawing cannot be written back by the
+* drawing's shape alone: the siblings are parsed into their own run content,
+* and replaying the whole element would write them twice.
+*/
+const isSoleBranchChild = (branch, element) => {
+	const children = getChildElements(branch);
+	return children.length === 1 && children[0] === element;
+};
+/**
+* Capture the `mc:AlternateContent` a shape was read from, when the shape's
+* drawing is the sole child of the branch it came from.
+*/
+const captureShapeAlternateContent = ({ shape, alternateContent, branch, drawing }) => {
+	if (getLocalName(alternateContent.name ?? "") !== "AlternateContent") return;
+	if (!isSoleBranchChild(branch, drawing)) return;
+	return {
+		verbatimXml: captureVerbatimXml(alternateContent),
+		verbatimFingerprint: shapeFingerprint(shape)
+	};
+};
+/** Re-fingerprint a capture for a shape rebuilt from an unedited projection. */
+const refingerprintShapeAlternateContent = (shape, verbatimXml) => ({
+	verbatimXml,
+	verbatimFingerprint: shapeFingerprint(shape)
+});
+/**
+* The captured `mc:AlternateContent` to write in place of the shape's drawing,
+* or undefined when the shape must be regenerated.
+*
+* Replay requires the modeled shape to still match the capture. An edited shape
+* is regenerated as a bare `w:drawing` without the stale Fallback.
+*/
+const replayableShapeAlternateContent = (content) => {
+	const captured = content.alternateContent;
+	if (captured === void 0) return;
+	return captured.verbatimFingerprint === shapeFingerprint(content.shape) ? captured.verbatimXml : void 0;
+};
+//#endregion
+export { captureShapeAlternateContent, refingerprintShapeAlternateContent, replayableShapeAlternateContent };

package/dist/docx/textBoxParser.d.ts

@@ -119,8 +119,16 @@ declare function resolveTextBoxOutlineColor(textBox: document_d_exports.TextBox)
  * Get outline width in pixels
  */
 declare function getTextBoxOutlineWidthPx(textBox: document_d_exports.TextBox): number;
+/** A text-box `w:drawing`, with the `mc:AlternateContent` branch it sits in, if any. */
+type TextBoxDrawing = {
+  drawing: XmlElement;
+  alternateContent?: {
+    element: XmlElement;
+    branch: XmlElement;
+  };
+};
 type TextBoxRunScan = {
-  textBoxDrawings: XmlElement[];
+  textBoxDrawings: TextBoxDrawing[];
   vmlTextBoxes: XmlElement[];
   hasNonTextBoxContent: boolean;
 };
@@ -143,4 +151,4 @@ type ScanRunForTextBoxDrawingsOptions = {
 };
 declare const scanRunForTextBoxDrawings: ({ xmlRun, claimedByRunParser }: ScanRunForTextBoxDrawingsOptions) => TextBoxRunScan;
 //#endregion
-export { ParagraphParserFn, ScanRunForTextBoxDrawingsOptions, TableParserFn, TextBoxRunScan, extractTextBoxContentElements, getTextBoxContentElement, getTextBoxDimensionsPx, getTextBoxHeightPx, getTextBoxMarginsPx, getTextBoxOutlineWidthPx, getTextBoxText, getTextBoxWidthPx, hasTextBoxContent, hasTextBoxFill, hasTextBoxOutline, isFloatingTextBox, isShapeTextBox, isTextBoxDrawing, parseTextBox, parseTextBoxContent, parseTextBoxFromShape, resolveTextBoxFillColor, resolveTextBoxOutlineColor, scanRunForTextBoxDrawings };
+export { ParagraphParserFn, ScanRunForTextBoxDrawingsOptions, TableParserFn, TextBoxDrawing, TextBoxRunScan, extractTextBoxContentElements, getTextBoxContentElement, getTextBoxDimensionsPx, getTextBoxHeightPx, getTextBoxMarginsPx, getTextBoxOutlineWidthPx, getTextBoxText, getTextBoxWidthPx, hasTextBoxContent, hasTextBoxFill, hasTextBoxOutline, isFloatingTextBox, isShapeTextBox, isTextBoxDrawing, parseTextBox, parseTextBoxContent, parseTextBoxFromShape, resolveTextBoxFillColor, resolveTextBoxOutlineColor, scanRunForTextBoxDrawings };

package/dist/docx/textBoxParser.js

@@ -328,9 +328,12 @@ const scanRunForTextBoxDrawings = ({ xmlRun, claimedByRunParser }) => {
 	const textBoxDrawings = [];
 	const vmlTextBoxes = [];
 	let hasNonTextBoxContent = false;
-	const visitDrawing = (drawingEl) => {
+	const visitDrawing = (drawingEl, alternateContent) => {
 		if (isTextBoxDrawing(drawingEl)) {
-			textBoxDrawings.push(drawingEl);
+			textBoxDrawings.push({
+				drawing: drawingEl,
+				...alternateContent === void 0 ? {} : { alternateContent }
+			});
 			return;
 		}
 		hasNonTextBoxContent = true;
@@ -355,7 +358,10 @@ const scanRunForTextBoxDrawings = ({ xmlRun, claimedByRunParser }) => {
 				if (!branch) return false;
 				let found = false;
 				for (const innerEl of getChildElements(branch)) if (getLocalName(innerEl.name ?? "") === "drawing") {
-					visitDrawing(innerEl);
+					visitDrawing(innerEl, {
+						element: el,
+						branch
+					});
 					found = true;
 				}
 				return found;

package/dist/internal/headlessRevisionResolution.js

@@ -1,6 +1,8 @@
 import { recreateProseNodeWithParagraphPropertySource } from "../docx/paragraphPropertySource.js";
 import { expectRunPropertyChangeMarkAttrs } from "../prosemirror/attrs/index.js";
+import { resolutionRemovesControl, withoutResolvedEnclosures } from "../prosemirror/contentControlRevisions.js";
 import "../prosemirror/extensions/nodes/SdtExtension.js";
+import { continuedRunMarks } from "../prosemirror/rejoinRunCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../prosemirror/runFormattingMarkNames.js";
 import { reconstructRejectedRunFormattingMarks } from "../prosemirror/runPropertyChangeResolution.js";
 import { paragraphRunStyleContext } from "../prosemirror/runStyleFormatting.js";
@@ -75,8 +77,26 @@ const resolveInlineNode = ({ node, context, paragraphScope }) => {
 	if (context.keepType) marks = marks.filter((mark) => mark.type !== context.keepType);
 	return marksEqual(marks, node.marks) ? node : node.mark(marks);
 };
+/**
+* The pieces a revision split off its run, one run again: the headless half of
+* `rejoinRunsAt`, over the children of one inline container.
+*/
+const rejoinResolvedRuns = ({ children, resolvedBoundaries, paragraphScope, context }) => {
+	for (const index of [...resolvedBoundaries].toSorted((left, right) => left - right)) {
+		const left = children[index - 1];
+		const right = children[index];
+		if (!left || !right) continue;
+		const marks = continuedRunMarks({
+			left,
+			right,
+			context: () => resolveParagraphRunStyleScope(paragraphScope, context.styleResolver),
+			styleResolver: context.styleResolver
+		});
+		if (marks !== null) children[index] = right.mark(marks);
+	}
+};
 const resolveInlineContent = ({ node, position, context, inheritedParagraphScope }) => {
-	const paragraphScope = node.type.name === "paragraph" && context.mode === "reject" ? { paragraph: node } : inheritedParagraphScope;
+	const paragraphScope = node.type.name === "paragraph" ? { paragraph: node } : inheritedParagraphScope;
 	const replacementRangeStart = context.replacementRanges.length;
 	let resolvedNode = node;
 	if (node.isInline) {
@@ -96,7 +116,21 @@ const resolveInlineContent = ({ node, position, context, inheritedParagraphScope
 		resolvedNode = resolved;
 		if (resolvedNode.isLeaf) return resolvedNode;
 	}
+	if (resolutionRemovesControl({
+		control: resolvedNode,
+		removeType: context.removeType,
+		resolves: () => true
+	})) {
+		context.replacementRanges.push({
+			from: position,
+			to: position + node.nodeSize,
+			newSize: 0
+		});
+		return null;
+	}
 	const children = [];
+	/** Indices into `children` where resolved content began or ended. */
+	const resolvedBoundaries = /* @__PURE__ */ new Set();
 	const contentStart = resolvedNode.type.name === "doc" ? 0 : position + 1;
 	let contentChanged = false;
 	resolvedNode.forEach((child, offset) => {
@@ -106,20 +140,23 @@ const resolveInlineContent = ({ node, position, context, inheritedParagraphScope
 			context,
 			...paragraphScope !== void 0 ? { inheritedParagraphScope: paragraphScope } : {}
 		});
+		if (resolved !== child) {
+			contentChanged = true;
+			resolvedBoundaries.add(children.length);
+		}
 		if (resolved) {
 			children.push(resolved);
-			contentChanged ||= resolved !== child;
-		} else contentChanged = true;
+			if (resolved !== child) resolvedBoundaries.add(children.length);
+		}
+	});
+	const resolvedAttrs = resolvedNode.type.name === "sdt" ? withoutResolvedEnclosures(resolvedNode, () => true) ?? resolvedNode.attrs : resolvedNode.attrs;
+	if (!contentChanged && resolvedAttrs === resolvedNode.attrs) return resolvedNode;
+	if (contentChanged && resolvedNode.inlineContent) rejoinResolvedRuns({
+		children,
+		resolvedBoundaries,
+		paragraphScope,
+		context
 	});
-	if (!contentChanged) return resolvedNode;
-	if (children.length === 0 && node.childCount > 0 && resolvedNode.type.name === "sdt") {
-		context.replacementRanges.splice(replacementRangeStart, context.replacementRanges.length - replacementRangeStart, {
-			from: position,
-			to: position + node.nodeSize,
-			newSize: 0
-		});
-		return null;
-	}
 	let resolvedContent = Fragment.fromArray(children);
 	if (!resolvedNode.type.validContent(resolvedContent)) {
 		const fitted = resolvedNode.type.createAndFill(resolvedNode.attrs, resolvedContent, resolvedNode.marks);
@@ -143,7 +180,7 @@ const resolveInlineContent = ({ node, position, context, inheritedParagraphScope
 		from: position,
 		to: position + resolvedNode.nodeSize
 	});
-	return rebuildNode(node, resolvedNode.attrs, resolvedContent, resolvedNode.marks);
+	return rebuildNode(node, resolvedAttrs, resolvedContent, resolvedNode.marks);
 };
 const coalesceReplacementRanges = (replacementRanges) => {
 	const coalesced = [];

package/dist/layout-bridge/convert/toFlowBlocks.js

@@ -1,4 +1,4 @@
-import { convertBulletToUnicode } from "../../docx/bulletMarkers.js";
+import { bulletMarkerFontName, convertBulletToUnicode } from "../../docx/bulletMarkers.js";
 import { resolveDocumentGridLinePitch } from "../../docx/documentGrid.js";
 import { getFontAlternate } from "../../fonts/fontAlternates.js";
 import { buildPageBreakRunDescendantIndex } from "../../internal/pageBreakRunDescendantIndex.js";
@@ -1053,7 +1053,7 @@ function resolveDeletedListMarker(previousListAttrs, listCounterState) {
 		const marker = computeListMarker(previousListAttrs, listCounterState);
 		if (marker) return marker;
 	}
-	if (previousListAttrs.listMarker) return previousListAttrs.listIsBullet ? convertBulletToUnicode(previousListAttrs.listMarker) : previousListAttrs.listMarker;
+	if (previousListAttrs.listMarker) return previousListAttrs.listIsBullet ? convertBulletToUnicode(previousListAttrs.listMarker, bulletMarkerFontName(previousListAttrs.listMarkerFormatting)) : previousListAttrs.listMarker;
 	if (previousListAttrs.listIsBullet) return "•";
 	return null;
 }
@@ -1219,7 +1219,7 @@ function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStre
 	}
 	const resolvedMarker = applyMarkerAllCaps(advanceVisibleListMarker(pmAttrs, listCounterStreams).marker, pmAttrs.listMarkerAllCaps);
 	if (resolvedMarker !== null) attrs.listMarker = resolvedMarker;
-	else if (pmAttrs.listMarker) attrs.listMarker = pmAttrs.listIsBullet ? convertBulletToUnicode(pmAttrs.listMarker) : pmAttrs.listMarker;
+	else if (pmAttrs.listMarker) attrs.listMarker = pmAttrs.listIsBullet ? convertBulletToUnicode(pmAttrs.listMarker, bulletMarkerFontName(pmAttrs.listMarkerFormatting)) : pmAttrs.listMarker;
 	if (pmAttrs.listIsBullet !== void 0) attrs.listIsBullet = pmAttrs.listIsBullet;
 	if (pmAttrs.listMarkerHidden) attrs.listMarkerHidden = true;
 	if (attrs.listMarker !== void 0 || pmAttrs.listMarkerFormatting) {
@@ -1243,7 +1243,7 @@ function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStre
 	const dtf = pmAttrs.defaultTextFormatting;
 	if (dtf) {
 		if (dtf.fontSize !== void 0) attrs.defaultFontSize = dtf.fontSize / 2;
-		if (attrs.listMarker !== void 0 && !attrs.listMarkerHidden && dtf.fontSizeCs !== void 0 && (dtf.fontSize === void 0 || dtf.fontSizeCs > dtf.fontSize)) attrs.listParagraphMarkFontSize = dtf.fontSizeCs / 2;
+		if (attrs.listMarker !== void 0 && !attrs.listMarkerHidden && (attrs.bidi === true || dtf.rtl === true || dtf.cs === true) && dtf.fontSizeCs !== void 0 && (dtf.fontSize === void 0 || dtf.fontSizeCs > dtf.fontSize)) attrs.listParagraphMarkFontSize = dtf.fontSizeCs / 2;
 		if (dtf.fontFamily) {
 			const resolvedFamily = resolveWesternThemeFont(dtf.fontFamily, theme);
 			if (resolvedFamily) {
@@ -1847,6 +1847,24 @@ function inlineEffectExtentPx(wrapType, extent) {
 	};
 	return resolved.top === 0 && resolved.bottom === 0 && resolved.left === 0 && resolved.right === 0 ? void 0 : resolved;
 }
+const GRADIENT_POSITION_SCALE = 1e5;
+/**
+* A linear `a:gradFill` with its stop colors resolved through the theme. A path
+* gradient (`a:path`) is not painted: nothing here places its focus.
+*/
+function resolveLinearGradientFill(fill, theme) {
+	const gradient = fill?.gradient;
+	if (gradient === void 0 || gradient.type !== "linear" || gradient.stops.length === 0) return;
+	const stops = gradient.stops.map((stop) => ({
+		offset: Math.min(1, Math.max(0, stop.position / GRADIENT_POSITION_SCALE)),
+		color: resolveColor(stop.color, theme)
+	})).toSorted((left, right) => left.offset - right.offset);
+	return {
+		angle: gradient.angle ?? 0,
+		scaled: gradient.scaled ?? false,
+		stops
+	};
+}
 /** Convert a textBox PM node to a TextBoxBlock. */
 function convertTextBoxNode(node, startPos, opts) {
 	const attrs = expectTextBoxAttrs(node);
@@ -1879,6 +1897,10 @@ function convertTextBoxNode(node, startPos, opts) {
 	if (attrs.autoFit !== void 0) textBox.autoFit = attrs.autoFit;
 	if (attrs.textWrap !== void 0) textBox.textWrap = attrs.textWrap;
 	if (attrs.fillColor !== void 0) textBox.fillColor = attrs.fillColor;
+	else {
+		const fillGradient = resolveLinearGradientFill(attrs.gradientFill, opts.theme);
+		if (fillGradient !== void 0) textBox.fillGradient = fillGradient;
+	}
 	if (attrs.outlineWidth !== void 0) textBox.outlineWidth = attrs.outlineWidth;
 	if (attrs.outlineColor !== void 0) textBox.outlineColor = attrs.outlineColor;
 	if (attrs.outlineStyle !== void 0) textBox.outlineStyle = attrs.outlineStyle;

package/dist/layout-engine/index.d.ts

@@ -1,4 +1,4 @@
-import { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, MathRun, Measure, MeasuredLine, NOTE_SEPARATOR_RULE_THICKNESS, NOTE_SEPARATOR_WIDTH_FRACTION, NoteAreaLayout, NoteSeparatorKind, NoteSeparatorRule, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionPageNumbering, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, resolveTableCellPadding, resolveTableWidthPx, stripFlowBlockPmAnchors, tableColumnsArePinned } from "./types.js";
+import { BlockId, BorderStyle, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, MathRun, Measure, MeasuredLine, NOTE_SEPARATOR_RULE_THICKNESS, NOTE_SEPARATOR_WIDTH_FRACTION, NoteAreaLayout, NoteSeparatorKind, NoteSeparatorRule, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionPageNumbering, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxGradientFill, TextBoxMeasure, TextRun, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, resolveTableCellPadding, resolveTableWidthPx, stripFlowBlockPmAnchors, tableColumnsArePinned } from "./types.js";
 import { PageState, Paginator, PaginatorOptions, createPaginator } from "./paginator.js";
 import { KeepNextChain, calculateChainHeight, computeKeepNextChains, getMidChainIndices, hasKeepLines, hasPageBreakBefore } from "./keep-together.js";
 import { resolveSectionHeaderFooterRefs } from "./headerFooterRefs.js";
@@ -42,4 +42,4 @@ declare function layoutDocument(blocks: FlowBlock[], measures: Measure[], option
  */
 declare function getHeaderRowsHeight(measure: TableMeasure, headerRowCount: number): number;
 //#endregion
-export { BlockId, BorderStyle, type BreakDecision, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, type KeepNextChain, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, MathRun, Measure, MeasuredLine, NOTE_SEPARATOR_RULE_THICKNESS, NOTE_SEPARATOR_WIDTH_FRACTION, NoteAreaLayout, NoteSeparatorKind, NoteSeparatorRule, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, type PageState, type Paginator, type PaginatorOptions, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionLayoutConfig, SectionPageNumbering, type SectionState, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxMeasure, TextRun, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, getTableRowLeadingWidth, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, resolveTableCellPadding, resolveTableWidthPx, scheduleSectionBreak, stripFlowBlockPmAnchors, tableColumnsArePinned };
+export { BlockId, BorderStyle, type BreakDecision, CellBorderSpec, CellBorders, ColumnBreakBlock, ColumnBreakMeasure, ColumnLayout, DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, DocumentPosition, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, FieldRun, FloatingTablePosition, FlowBlock, FootnoteContent, Fragment, FragmentBase, HeaderFooterContent, HeaderFooterContentHeights, HeaderFooterLayout, HitTestResult, HyperlinkInfo, ImageBlock, ImageFragment, ImageMeasure, ImageRun, ImageRunPosition, type KeepNextChain, Layout, LayoutOptions, LineBreakRun, ListMarkerFormatting, MathRun, Measure, MeasuredLine, NOTE_SEPARATOR_RULE_THICKNESS, NOTE_SEPARATOR_WIDTH_FRACTION, NoteAreaLayout, NoteSeparatorKind, NoteSeparatorRule, Page, PageBreakBlock, PageBreakMeasure, PageHeaderFooterRefs, PageMargins, type PageState, type Paginator, type PaginatorOptions, ParagraphAttrs, ParagraphBlock, ParagraphBorders, ParagraphFragment, ParagraphIndent, ParagraphMeasure, ParagraphSpacing, RenderedPageBreakRun, Run, RunFormatting, SdtGroup, SectionBreakBlock, SectionBreakMeasure, SectionLayoutConfig, SectionPageNumbering, type SectionState, TabAlignment, TabRun, TabStop, TableBlock, TableCell, TableCellMeasure, TableFragment, TableMeasure, TableRow, TableRowMeasure, TextBoxBlock, TextBoxFlowAttrs, TextBoxFragment, TextBoxGradientFill, TextBoxMeasure, TextRun, applyContextualSpacing, applyPendingToActive, assertExhaustiveFlowBlock, calculateChainHeight, collectSectionConfigs, computeKeepNextChains, createInitialSectionState, createPaginator, findPageIndexContainingPmPos, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, getHeaderRowsHeight, getMidChainIndices, getTableRowLeadingWidth, hasKeepLines, hasPageBreakBefore, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, layoutDocument, resolveSectionHeaderFooterRefs, resolveTableCellPadding, resolveTableWidthPx, scheduleSectionBreak, stripFlowBlockPmAnchors, tableColumnsArePinned };

package/dist/layout-engine/index.js

@@ -13,7 +13,7 @@ import { assertExhaustiveFlowBlock, findPageIndexContainingPmPos } from "./pmPag
 import { INITIAL_RENDERED_BREAK_STATE, PAGE_ADVANCE, reconcileAfterBlock, reconcileBreakBeforeBlock, recordReflowBoundary } from "./renderedBreakReconciliation.js";
 import { applyPendingToActive, createInitialSectionState, getEffectiveColumns, getEffectiveMargins, getEffectivePageSize, normalizeSectionBreakType, physicalColumnRegionIsShared, scheduleSectionBreak } from "./section-breaks.js";
 import { applySectionVerticalAlignment } from "./sectionVerticalAlignment.js";
-import { buildTableRowBreakInfo, getRowContinuationSkip, snapRowBreak } from "./tableRowBreak.js";
+import { buildTableRowBreakInfo, getRowContinuationSkip, snapRowBreak, tableKeepNextOpeningHeight } from "./tableRowBreak.js";
 import { bandFragmentX, bandTopContentY, isPageFrameRelativeAnchor } from "./textBoxFlow.js";
 import { DEFAULT_TEXTBOX_MARGINS, DEFAULT_TEXTBOX_WIDTH, FOOTNOTE_ENTRY_MARGIN_BOTTOM, FOOTNOTE_FALLBACK_LINE_HEIGHT, FOOTNOTE_SEPARATOR_HEIGHT, NOTE_SEPARATOR_RULE_THICKNESS, NOTE_SEPARATOR_WIDTH_FRACTION, floatingTextBoxReservesBand, floatingTextBoxWrapsText, getTableRowLeadingWidth, isFloatingImageRun, isFloatingTextBoxBlock, isListNumPr, isTextWrappingFloatingImageRun, resolveTableCellPadding, resolveTableWidthPx, stripFlowBlockPmAnchors, tableColumnsArePinned } from "./types.js";
 import { panic } from "better-result";
@@ -194,6 +194,7 @@ function layoutDocumentPass(blocks, measures, options) {
 		...options.mirrorMargins === true ? { mirrorMargins: true } : {},
 		...options.firstPageMargins !== void 0 ? { firstPageMargins: options.firstPageMargins } : {},
 		...options.sectionEvenPageMargins !== void 0 ? { sectionEvenPageMargins: options.sectionEvenPageMargins } : {},
+		...options.sectionFirstPageMargins !== void 0 ? { sectionFirstPageMargins: options.sectionFirstPageMargins } : {},
 		columns: initialConfig.columns ?? DEFAULT_COLUMNS,
 		pageNumbering: initialConfig.pageNumbering,
 		...options.footnoteReservedHeights !== void 0 ? { footnoteReservedHeights: options.footnoteReservedHeights } : {},
@@ -234,7 +235,7 @@ function layoutDocumentPass(blocks, measures, options) {
 		renderedBreakState = breakDecision.state;
 		const chain = keepNextChains.get(i);
 		if (chain && !midChainIndices.has(i)) {
-			const chainHeight = calculateChainHeight(chain, blocks, measures, paginator.getCurrentState().trailingSpacing);
+			const chainHeight = calculateChainHeight(chain, blocks, measures, paginator.getCurrentState().trailingSpacing, tableKeepNextOpeningHeight);
 			const pageBeforeChainLayout = paginator.getCurrentState().page.number;
 			paginator.ensureFits(chainHeight);
 			if (paginator.getCurrentState().page.number > pageBeforeChainLayout) renderedBreakState = recordReflowBoundary(renderedBreakState, true);
@@ -1070,6 +1071,32 @@ function startSectionInPlace(paginator, nextSectionConfig, nextSectionIndex) {
 	paginator.retargetCurrentBlankPage();
 }
 /**
+* Whether a section opening on `target` would give two consecutive sheets page
+* numbers that are both odd or both even under `w:evenAndOddHeaders` (§17.10.1). Odd and
+* even page numbers alternate between right- and left-hand sheets, so a
+* `w:pgNumType w:start` restart that repeats whether the previous sheet's number is odd or even
+* needs a blank sheet between them.
+*/
+function sectionStartRepeatsOddEven(paginator, target) {
+	if (target.page.headerFooterRefs?.evenAndOddHeaders !== true) return false;
+	const previous = paginator.states.at(-2)?.page;
+	if (previous === void 0 || previous.number !== target.page.number - 1) return false;
+	return previous.logicalNumber % 2 === target.page.logicalNumber % 2;
+}
+/**
+* Keep the blank sheet the section break opened as a filler with no page
+* furniture, and open the section again on the following sheet so its first
+* page keeps the restarted page number.
+*/
+function insertOddEvenFillerPage(paginator, filler, sectionIndex, sectionConfig) {
+	filler.page.headerFooterRefs = {};
+	paginator.startSection({
+		sectionIndex,
+		pageNumbering: sectionConfig.pageNumbering
+	});
+	paginator.forcePageBreak();
+}
+/**
 * Handle a section break block.
 * @param block - The section break block (current section's properties)
 * @param paginator - The paginator instance
@@ -1078,14 +1105,16 @@ function startSectionInPlace(paginator, nextSectionConfig, nextSectionIndex) {
 */
 function handleSectionBreak(_block, paginator, nextSectionConfig, nextSectionType, nextSectionIndex) {
 	switch (nextSectionType) {
-		case "nextPage":
+		case "nextPage": {
 			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins);
 			if (nextSectionIndex !== void 0) paginator.startSection({
 				sectionIndex: nextSectionIndex,
 				pageNumbering: nextSectionConfig.pageNumbering
 			});
-			paginator.forcePageBreak({ coalesceBlankPage: true });
+			const target = paginator.forcePageBreak({ coalesceBlankPage: true });
+			if (nextSectionIndex !== void 0 && sectionStartRepeatsOddEven(paginator, target)) insertOddEvenFillerPage(paginator, target, nextSectionIndex, nextSectionConfig);
 			break;
+		}
 		case "evenPage":
 			if (paginator.forcePageBreak({ coalesceBlankPage: true }).page.number % 2 !== 0) paginator.forcePageBreak();
 			paginator.updatePageLayout(nextSectionConfig.pageSize, nextSectionConfig.margins);

package/dist/layout-engine/keep-together.d.ts

@@ -1,4 +1,4 @@
-import { FlowBlock, Measure } from "./types.js";
+import { FlowBlock, Measure, TableBlock, TableMeasure } from "./types.js";
 //#region src/layout-engine/keep-together.d.ts
 /**
  * A chain of paragraphs that Word keeps with following content. This includes
@@ -36,12 +36,15 @@ declare function computeKeepNextChains(blocks: FlowBlock[]): Map<number, KeepNex
  * reservation continues through it; otherwise the chain stops after the
  * opening, because a later split cannot separate it from its predecessor.
  *
+ * A table anchor contributes `tableOpeningHeight`: the part of the table
+ * that must start on the same page as the paragraph before it.
+ *
  * A paragraph measure's `totalHeight` already includes its own spacing before
  * and after. The chain accounts for spacing separately (collapsing each gap to
  * the larger side, as the paginator does), so members contribute only their
  * line advances; otherwise every gap would be reserved twice.
  */
-declare function calculateChainHeight(chain: KeepNextChain, blocks: FlowBlock[], measures: Measure[], incomingSpacing?: number): number;
+declare function calculateChainHeight(chain: KeepNextChain, blocks: FlowBlock[], measures: Measure[], incomingSpacing?: number, tableOpeningHeight?: (block: TableBlock, measure: TableMeasure) => number): number;
 /**
  * Get the set of indices that are mid-chain (not chain starters).
  * These should skip the keepNext check since their chain starter already decided.

package/dist/layout-engine/keep-together.js

@@ -102,12 +102,15 @@ function minimumOpeningLineCount(block, measure) {
 * reservation continues through it; otherwise the chain stops after the
 * opening, because a later split cannot separate it from its predecessor.
 *
+* A table anchor contributes `tableOpeningHeight`: the part of the table
+* that must start on the same page as the paragraph before it.
+*
 * A paragraph measure's `totalHeight` already includes its own spacing before
 * and after. The chain accounts for spacing separately (collapsing each gap to
 * the larger side, as the paginator does), so members contribute only their
 * line advances; otherwise every gap would be reserved twice.
 */
-function calculateChainHeight(chain, blocks, measures, incomingSpacing = 0) {
+function calculateChainHeight(chain, blocks, measures, incomingSpacing = 0, tableOpeningHeight) {
 	const firstMemberIndex = chain.memberIndices.at(0);
 	if (firstMemberIndex === void 0) return 0;
 	const firstBlock = blocks[firstMemberIndex];
@@ -125,6 +128,7 @@ function calculateChainHeight(chain, blocks, measures, incomingSpacing = 0) {
 		if (successorIndex === void 0) continue;
 		const successorBlock = blocks[successorIndex];
 		const successorMeasure = measures[successorIndex];
+		if (tableOpeningHeight !== void 0 && successorBlock?.kind === "table" && successorMeasure?.kind === "table" && successorBlock.floating === void 0) return totalHeight + trailingSpacing + tableOpeningHeight(successorBlock, successorMeasure);
 		if (successorBlock?.kind !== "paragraph" || successorMeasure?.kind !== "paragraph") return totalHeight;
 		totalHeight += collapseParagraphSpacing({
 			before: successorBlock.attrs?.spacing?.before ?? 0,

package/dist/layout-engine/measure/advanceComposition.js

@@ -1,6 +1,8 @@
 import { getHorizontalScaleFactor } from "../../utils/horizontalScale.js";
 import { SCRIPT_CLASS, hasComplexScript, hasEastAsiaSlotText, scriptClassOf, segmentByScript } from "../../utils/scriptSegments.js";
 import { applyComplexScriptFormatting, hasComplexScriptFormatting } from "./complexScriptFormatting.js";
+import "./measureHelpers.js";
+import { SMALL_CAPS_SCALE, smallCapsMask, smallCapsSegments } from "./smallCapsCasing.js";
 //#region src/layout-engine/measure/advanceComposition.ts
 /**
 * The arithmetic that turns raw glyph advances into measured widths.
@@ -50,6 +52,38 @@ const glyphAdvanceStyle = (style) => {
 };
 const needsPerScriptFonts = (style, text) => style.eastAsiaFontFamily !== void 0 && hasEastAsiaSlotText(text, style.eastAsiaHint) || hasComplexScriptFormatting(style) && hasComplexScript(text);
 /**
+* Width of a `w:smallCaps` string: its lowercase letters (and the whitespace
+* that follows them — see smallCapsCasing.ts) draw at `SMALL_CAPS_SCALE` of
+* the style's size, everything else at full size. A small segment is measured
+* at that literal, smaller size — not the full-size advance scaled by
+* arithmetic — mirroring {@link canvasMeasureTextWidth}'s
+* `measureSmallCapsWidth` so the two backends agree; each segment still
+* resolves its own per-script font, the same as the plain (non-small-caps)
+* path below.
+*/
+const smallCapsGlyphWidth = (text, style, advanceOf) => {
+	const segmentStyle = { ...style };
+	delete segmentStyle.fontVariant;
+	delete segmentStyle.letterSpacing;
+	delete segmentStyle.horizontalScale;
+	const smallSegmentStyle = {
+		...segmentStyle,
+		fontSize: (segmentStyle.fontSize ?? 11) * SMALL_CAPS_SCALE
+	};
+	let total = 0;
+	for (const segment of smallCapsSegments(text)) {
+		const activeStyle = segment.small ? smallSegmentStyle : segmentStyle;
+		total += needsPerScriptFonts(activeStyle, segment.text) ? segmentByScript(segment.text, activeStyle.eastAsiaHint).reduce((sum, scriptSegment) => sum + advanceOf(scriptSegment.text, glyphAdvanceStyle(scriptStyle(activeStyle, scriptSegment.script))), 0) : advanceOf(segment.text, activeStyle);
+	}
+	return total;
+};
+/** The un-spaced, un-scaled glyph width `composeTextWidth` spaces and scales. */
+const glyphWidthOf = ({ source, style, transformed, letterSpacing, advanceOf }) => {
+	if (!source.forceComplexScript && style.fontVariant === "small-caps") return smallCapsGlyphWidth(transformed, style, advanceOf);
+	if (!source.forceComplexScript && !letterSpacing && needsPerScriptFonts(style, transformed)) return segmentByScript(transformed, style.eastAsiaHint).reduce((sum, segment) => sum + advanceOf(segment.text, glyphAdvanceStyle(scriptStyle(style, segment.script))), 0);
+	return advanceOf(transformed, style);
+};
+/**
 * Width of a string: the advance width used for line breaking, never the
 * painted (ink) extent, which includes overhang a break decision must ignore.
 */
@@ -59,7 +93,13 @@ const composeTextWidth = ({ text, style: source, advanceOf }) => {
 	const transformed = applyMeasurementTextTransform(text, style);
 	const letterSpacing = style.letterSpacing ?? 0;
 	const horizontalScale = getHorizontalScaleFactor(style.horizontalScale);
-	const glyphWidth = !source.forceComplexScript && !letterSpacing && needsPerScriptFonts(style, transformed) ? segmentByScript(transformed, style.eastAsiaHint).reduce((sum, segment) => sum + advanceOf(segment.text, glyphAdvanceStyle(scriptStyle(style, segment.script))), 0) : advanceOf(transformed, style);
+	const glyphWidth = glyphWidthOf({
+		source,
+		style,
+		transformed,
+		letterSpacing,
+		advanceOf
+	});
 	const codePoints = countCodePoints(transformed);
 	return (letterSpacing && codePoints > 1 ? glyphWidth + letterSpacing * (codePoints - 1) : glyphWidth) * horizontalScale;
 };
@@ -92,10 +132,16 @@ const composeRunMeasurement = ({ text, style: source, metrics, advanceOf, advanc
 		perScript
 	});
 	let codePointIndex = 0;
+	const smallCapsAt = style.fontVariant === "small-caps" ? smallCapsMask(text) : void 0;
 	for (const char of text) {
 		const cp = char.codePointAt(0);
-		const charStyle = perScript ? scriptStyle(style, scriptClassOf(cp, style.eastAsiaHint)) : style;
-		let charWidth = shaped.get(codePointIndex) ?? advanceOf(applyMeasurementTextTransform(char, style), charStyle);
+		const isSmallCap = smallCapsAt?.[codePointIndex] ?? false;
+		const scriptedStyle = perScript ? scriptStyle(style, scriptClassOf(cp, style.eastAsiaHint)) : style;
+		const charStyle = isSmallCap ? {
+			...scriptedStyle,
+			fontSize: (scriptedStyle.fontSize ?? 11) * SMALL_CAPS_SCALE
+		} : scriptedStyle;
+		let charWidth = shaped.get(codePointIndex) ?? advanceOf(isSmallCap ? char.toLocaleUpperCase() : applyMeasurementTextTransform(char, style), charStyle);
 		if (letterSpacing && offset + char.length < text.length) charWidth += letterSpacing;
 		charWidth *= scale;
 		charWidths.push(charWidth);

package/dist/layout-engine/measure/measureBlocks.js

@@ -1,6 +1,7 @@
 import { hasPageBreakBefore } from "../keep-together.js";
 import { recordMeasureBlock, recordMeasureBlockError } from "../layoutInstrumentation.js";
 import { isParagraphFrameTextBox } from "../paragraphFrame.js";
+import { resolveTableSpacing } from "../paragraphSpacing.js";
 import { sectionStartAdvanceOf } from "../section-breaks.js";
 import { bandFragmentX, bandTopContentY, isPageFrameRelativeAnchor } from "../textBoxFlow.js";
 import { getTextBoxGroupId } from "../textBoxGroup.js";
@@ -97,6 +98,7 @@ function measureTableBlock(tableBlock, contentWidth, fieldValues) {
 		}
 	}
 	const cellGrid = buildTableCellGrid(tableBlock.rows, columnWidths.length);
+	const spacingRows = resolveTableSpacing(tableBlock).rows;
 	const cellSpacing = tableBlock.cellSpacing;
 	const bordersSeparated = (cellSpacing ?? 0) > 0;
 	const rowCount = tableBlock.rows.length;
@@ -104,7 +106,7 @@ function measureTableBlock(tableBlock, contentWidth, fieldValues) {
 	const rows = tableBlock.rows.map((row, rowIdx) => {
 		let columnIndex = getFirstAvailableColumn(cellGrid, rowIdx, row.gridBefore ?? 0);
 		return {
-			cells: row.cells.map((cell) => {
+			cells: row.cells.map((cell, cellIdx) => {
 				const colSpan = cell.colSpan ?? 1;
 				let cellWidth = 0;
 				for (let c = 0; c < colSpan && columnIndex + c < columnWidths.length; c++) cellWidth += columnWidths[columnIndex + c] ?? 0;
@@ -121,7 +123,7 @@ function measureTableBlock(tableBlock, contentWidth, fieldValues) {
 					width: cellWidth,
 					height: 0
 				};
-				if (!keepSingleLine) wrapTableCellParagraphsAroundFloats(cell, cellMeasure, cellContentWidth, fieldValues);
+				if (!keepSingleLine) wrapTableCellParagraphsAroundFloats(spacingRows[rowIdx]?.cells[cellIdx] ?? cell, cellMeasure, cellContentWidth, fieldValues);
 				if (cell.colSpan !== void 0) cellMeasure.colSpan = cell.colSpan;
 				if (cell.rowSpan !== void 0) cellMeasure.rowSpan = cell.rowSpan;
 				return cellMeasure;
@@ -141,7 +143,7 @@ function measureTableBlock(tableBlock, contentWidth, fieldValues) {
 			}));
 			continue;
 		}
-		const sourceRowCells = tableBlock.rows[rowIdx]?.cells;
+		const sourceRowCells = spacingRows[rowIdx]?.cells;
 		let maxCellHeightWithBorders = 0;
 		let maxCellInsets = 0;
 		for (let cellIdx = 0; cellIdx < row.cells.length; cellIdx++) {