@stll/folio-core 0.29.0 → 0.30.0

package/dist/layout-painter/renderTable.js

@@ -2,7 +2,7 @@ import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
 import { buildTableCellFloatingZones, getTableCellContentWidth, getTableCellFloatingImages } from "../layout-engine/measure/tableCellFloating.js";
 import { createTableCellFlowState, finishTableCellFlow, placeTableCellBlock } from "../layout-engine/measure/tableCellFlow.js";
 import { buildTableCellGrid, buildTableCellPlacements, getSourceCellAt } from "../layout-engine/measure/tableCellGrid.js";
-import { resolveTableInlinePlacement } from "../layout-engine/measure/tableInlinePlacement.js";
+import { resolveTableInlineOffset, resolveTableInlinePlacement } from "../layout-engine/measure/tableInlinePlacement.js";
 import { isFloatingImageRun, isFloatingTextBoxBlock, resolveTableCellPadding, tableColumnsArePinned } from "../layout-engine/types.js";
 import { applySanitizedImageSrc } from "../utils/sanitizeImageSrc.js";
 import { emuToPixels } from "../utils/units.js";
@@ -134,7 +134,7 @@ function renderCellContent({ cell, cellMeasure, context, doc, contentWidthOverri
 		} else if (block?.kind === "table" && measure?.kind === "table") {
 			const tableBlock = block;
 			const tableMeasure = measure;
-			const nestedTableEl = renderNestedTable(tableBlock, tableMeasure, context, doc);
+			const nestedTableEl = renderNestedTable(tableBlock, tableMeasure, context, doc, contentWidth);
 			nestedTableEl.style.position = "relative";
 			const placement = placeTableCellBlock(flowState, tableBlock, tableMeasure);
 			if (placement.leadingSpacing > 0) {
@@ -224,13 +224,18 @@ function tableHasFloatingCellContent(block) {
 /**
 * Render a nested table (within a cell)
 */
-function renderNestedTable(block, measure, context, doc) {
+function renderNestedTable(block, measure, context, doc, frameWidth = context.contentWidth ?? measure.totalWidth) {
 	const tableEl = doc.createElement("div");
 	tableEl.className = `${TABLE_CLASS_NAMES.table} layout-nested-table`;
 	tableEl.style.position = "relative";
 	tableEl.style.width = `${measure.totalWidth}px`;
 	tableEl.style.display = "block";
 	const placement = resolveTableInlinePlacement(block);
+	const tableInlineOffset = resolveTableInlineOffset({
+		table: block,
+		frameWidth,
+		tableWidth: measure.totalWidth
+	});
 	if (placement.alignment === "center") {
 		tableEl.style.marginLeft = "auto";
 		tableEl.style.marginRight = "auto";
@@ -277,7 +282,13 @@ function renderNestedTable(block, measure, context, doc) {
 			bidi: block.bidi === true,
 			columnsPinned,
 			cellGrid,
-			cellPlacements
+			cellPlacements,
+			inlineOffset: resolveTableInlineOffset({
+				table: block,
+				rowJustification: row.justification,
+				frameWidth,
+				tableWidth: measure.totalWidth
+			}) - tableInlineOffset
 		});
 		tableEl.append(rowEl);
 		y += rowMeasure.height;
@@ -433,11 +444,11 @@ function renderTableCell({ cell, cellMeasure, x, width, rowHeight, borderFlags,
 	return cellEl;
 }
 const hasVisibleBorder = (border) => border !== void 0 && border.style !== "none" && border.style !== "nil";
-function renderTableRow({ row, rowMeasure, rowIndex, y, columnWidths, totalRows, context, doc, rowYPositions, isFirstRowInFragment, bidi = false, columnsPinned = false, cellGrid, cellPlacements, contentClip, pageContentPosition }) {
+function renderTableRow({ row, rowMeasure, rowIndex, y, columnWidths, totalRows, context, doc, rowYPositions, isFirstRowInFragment, bidi = false, columnsPinned = false, cellGrid, cellPlacements, contentClip, pageContentPosition, inlineOffset = 0 }) {
 	const rowEl = doc.createElement("div");
 	rowEl.className = TABLE_CLASS_NAMES.row;
 	rowEl.style.position = "absolute";
-	rowEl.style.left = "0";
+	rowEl.style.left = `${inlineOffset}px`;
 	rowEl.style.top = `${y}px`;
 	rowEl.style.width = "100%";
 	rowEl.style.height = `${rowMeasure.height}px`;
@@ -484,7 +495,7 @@ function renderTableRow({ row, rowMeasure, rowIndex, y, columnWidths, totalRows,
 			...contentClip ? { contentClip } : {},
 			...pageContentPosition ? { pageContentPosition: {
 				geometry: pageContentPosition.geometry,
-				x: pageContentPosition.x + cellLeft,
+				x: pageContentPosition.x + inlineOffset + cellLeft,
 				y: pageContentPosition.y
 			} } : {}
 		});

package/dist/layout-painter/renderTextBox.d.ts

@@ -12,7 +12,7 @@ declare const TEXTBOX_CLASS_NAMES: {
  */
 type RenderTextBoxFragmentOptions = {
   document?: Document;
-  renderTable?: (block: TableBlock, measure: TableMeasure, context: RenderContext, document: Document) => HTMLElement;
+  renderTable?: (block: TableBlock, measure: TableMeasure, context: RenderContext, document: Document, frameWidth?: number) => HTMLElement;
 };
 /**
  * Render a text box fragment to DOM

package/dist/layout-painter/renderTextBox.js

@@ -36,6 +36,11 @@ function renderTextBoxFragment(fragment, block, measure, context, options = {})
 	}
 	const margins = block.margins ?? DEFAULT_TEXTBOX_MARGINS;
 	containerEl.style.padding = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`;
+	if (block.verticalAlign === "middle" || block.verticalAlign === "bottom") {
+		containerEl.style.display = "flex";
+		containerEl.style.flexDirection = "column";
+		containerEl.style.justifyContent = block.verticalAlign === "middle" ? "center" : "flex-end";
+	}
 	containerEl.dataset["blockId"] = String(fragment.blockId);
 	if (fragment.pmStart !== void 0) containerEl.dataset["pmStart"] = String(fragment.pmStart);
 	if (fragment.pmEnd !== void 0) containerEl.dataset["pmEnd"] = String(fragment.pmEnd);
@@ -48,7 +53,7 @@ function renderTextBoxFragment(fragment, block, measure, context, options = {})
 		if (!contentBlock || !contentMeasure || !placement) continue;
 		if (contentBlock.kind === "table" && contentMeasure.kind === "table") {
 			if (!options.renderTable) panic("renderTextBoxFragment: a nested table renderer is required for table content");
-			const tableEl = options.renderTable(contentBlock, contentMeasure, context, doc);
+			const tableEl = options.renderTable(contentBlock, contentMeasure, context, doc, innerWidth);
 			tableEl.style.marginTop = `${placement.leadingSpacing}px`;
 			containerEl.append(tableEl);
 			continue;

package/dist/model.d.ts

@@ -1,11 +1,11 @@
 import { document_d_exports } from "./types/document.js";
 import { DeriveBlockIdInput, FolioBlockId, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
-import { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES } from "./types/documentEnumValues.js";
+import { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, normalizeShapeTextAnchor } from "./types/documentEnumValues.js";
 import { types_d_exports } from "./layout-engine/types.js";
 import { measureTypes_d_exports } from "./layout-engine/measure/measureTypes.js";
 export * from "@stll/docx-core/model";
 declare namespace model_d_exports {
-  export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, DeriveBlockIdInput, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, FolioBlockId, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_d_exports as Layout, measureTypes_d_exports as Measure, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId };
+  export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, DeriveBlockIdInput, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, FolioBlockId, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_d_exports as Layout, measureTypes_d_exports as Measure, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor };
 }
 //#endregion
-export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, DeriveBlockIdInput, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, FolioBlockId, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_d_exports as Layout, type measureTypes_d_exports as Measure, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId };
+export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, DeriveBlockIdInput, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, FolioBlockId, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_d_exports as Layout, type measureTypes_d_exports as Measure, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor };

package/dist/model.js

@@ -1,4 +1,4 @@
 import { types_exports } from "./layout-engine/types.js";
 import { deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
-import { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES } from "./types/documentEnumValues.js";
-export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_exports as Layout, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId };
+import { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, normalizeShapeTextAnchor } from "./types/documentEnumValues.js";
+export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_exports as Layout, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId, normalizeShapeTextAnchor };

package/dist/paged-layout/sectionBlockWidths.d.ts

@@ -6,14 +6,28 @@ type ComputePerBlockMeasureInput = {
   bodyConfig: SectionLayoutConfig;
   finalConfig: SectionLayoutConfig;
 };
+type PerBlockPhysicalPageGeometry = {
+  pageHeights: number[];
+  pageWidths: number[];
+  marginTops: number[];
+  marginLefts: number[];
+  marginRights: number[];
+  marginBottoms: number[];
+};
 type PerBlockMeasureInputs = {
   widths: number[];
+  /** Authored section top, retained for section-relative text-box semantics. */
   marginTops: number[];
   pageHeights: number[];
   pageWidths: number[];
   marginLefts: number[];
   marginRights: number[];
   marginBottoms: number[];
+  /** Absolute page X of the active column's content origin. */
+  contentLefts: number[];
+  columnIndices: number[];
+  columnCounts: number[];
+  physicalPageGeometry: PerBlockPhysicalPageGeometry;
 };
 /**
  * Compute per-block measurement widths by scanning for section breaks.

package/dist/paged-layout/sectionBlockWidths.js

@@ -1,5 +1,18 @@
 import { collectSectionConfigs } from "../layout-engine/index.js";
+import { hasPageBreakBefore } from "../layout-engine/keep-together.js";
+import { calculateColumnLefts, calculateColumnWidths } from "../layout-engine/paginator.js";
+import { normalizeSectionBreakType } from "../layout-engine/section-breaks.js";
 //#region src/paged-layout/sectionBlockWidths.ts
+function resolvePreBlockPageTransition(block, config) {
+	if (!hasPageBreakBefore(block)) return { type: "none" };
+	return {
+		type: "physicalPage",
+		geometry: {
+			pageSize: config.pageSize,
+			margins: config.margins
+		}
+	};
+}
 const SINGLE_COLUMN_LAYOUT = {
 	count: 1,
 	gap: 0
@@ -20,40 +33,105 @@ function computePerBlockWidths({ blocks, bodyConfig, finalConfig }) {
 	}).widths;
 }
 function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
-	function colWidth(cw, cols, columnIndex) {
-		if (cols.count <= 1) return cw;
-		const authoredWidth = cols.widths?.[columnIndex];
-		if (authoredWidth !== void 0) return authoredWidth;
-		return Math.floor((cw - (cols.count - 1) * cols.gap) / cols.count);
-	}
-	function contentWidth(config) {
-		return config.pageSize.w - config.margins.left - config.margins.right;
-	}
 	const { configs: sectionConfigs, breakIndices } = collectSectionConfigs(blocks, bodyConfig, finalConfig);
 	let sectionIdx = 0;
 	let columnIndex = 0;
+	let measuredSectionIdx = -1;
+	let activeColumns = SINGLE_COLUMN_LAYOUT;
+	let activeColumnWidths = [];
+	let activeContentLefts = [];
+	let columnGeometryDirty = true;
 	const widths = [];
 	const marginTops = [];
+	const physicalMarginTops = [];
 	const pageHeights = [];
 	const pageWidths = [];
 	const marginLefts = [];
 	const marginRights = [];
 	const marginBottoms = [];
+	const physicalPageHeights = [];
+	const physicalPageWidths = [];
+	const physicalMarginLefts = [];
+	const physicalMarginRights = [];
+	const physicalMarginBottoms = [];
+	const contentLefts = [];
+	const columnIndices = [];
+	const columnCounts = [];
+	const initialConfig = sectionConfigs[0] ?? finalConfig;
+	let physicalPageGeometry = {
+		pageSize: initialConfig.pageSize,
+		margins: initialConfig.margins
+	};
+	let hasPhysicalPageContent = false;
 	for (let i = 0; i < blocks.length; i++) {
 		const config = sectionConfigs[sectionIdx] ?? finalConfig;
-		const columns = config.columns ?? SINGLE_COLUMN_LAYOUT;
-		widths.push(colWidth(contentWidth(config), columns, columnIndex));
+		const block = blocks[i];
+		const preBlockTransition = resolvePreBlockPageTransition(block, config);
+		switch (preBlockTransition.type) {
+			case "physicalPage":
+				physicalPageGeometry = preBlockTransition.geometry;
+				hasPhysicalPageContent = false;
+				columnGeometryDirty = true;
+				columnIndex = 0;
+				break;
+			case "none": break;
+			default:
+		}
+		if (measuredSectionIdx !== sectionIdx || columnGeometryDirty) {
+			activeColumns = config.columns ?? SINGLE_COLUMN_LAYOUT;
+			activeColumnWidths = calculateColumnWidths(physicalPageGeometry.pageSize.w, physicalPageGeometry.margins.left, physicalPageGeometry.margins.right, activeColumns);
+			activeContentLefts = calculateColumnLefts(physicalPageGeometry.margins.left, activeColumnWidths, activeColumns);
+			measuredSectionIdx = sectionIdx;
+			columnGeometryDirty = false;
+		}
+		widths.push(activeColumnWidths[columnIndex] ?? activeColumnWidths[0] ?? 0);
+		contentLefts.push(activeContentLefts[columnIndex] ?? physicalPageGeometry.margins.left);
+		columnIndices.push(columnIndex);
+		columnCounts.push(activeColumns.count);
 		marginTops.push(config.margins.top);
+		physicalMarginTops.push(physicalPageGeometry.margins.top);
 		pageHeights.push(config.pageSize.h);
 		pageWidths.push(config.pageSize.w);
 		marginLefts.push(config.margins.left);
 		marginRights.push(config.margins.right);
 		marginBottoms.push(config.margins.bottom);
+		physicalPageHeights.push(physicalPageGeometry.pageSize.h);
+		physicalPageWidths.push(physicalPageGeometry.pageSize.w);
+		physicalMarginLefts.push(physicalPageGeometry.margins.left);
+		physicalMarginRights.push(physicalPageGeometry.margins.right);
+		physicalMarginBottoms.push(physicalPageGeometry.margins.bottom);
 		if (sectionIdx < breakIndices.length && i === breakIndices[sectionIdx]) {
+			const sectionBreak = block;
+			const nextConfig = sectionConfigs[sectionIdx + 1] ?? finalConfig;
+			if (!(sectionBreak?.kind === "sectionBreak" && normalizeSectionBreakType(sectionBreak.type) === "continuous" && hasPhysicalPageContent && Math.round(nextConfig.pageSize.w) === Math.round(physicalPageGeometry.pageSize.w) && Math.round(nextConfig.pageSize.h) === Math.round(physicalPageGeometry.pageSize.h))) {
+				physicalPageGeometry = {
+					pageSize: nextConfig.pageSize,
+					margins: nextConfig.margins
+				};
+				hasPhysicalPageContent = false;
+			}
+			columnGeometryDirty = true;
 			sectionIdx++;
 			columnIndex = 0;
-		} else if (blocks[i]?.kind === "pageBreak") columnIndex = 0;
-		else if (blocks[i]?.kind === "columnBreak") columnIndex = (columnIndex + 1) % columns.count;
+		} else if (block.kind === "pageBreak") {
+			physicalPageGeometry = {
+				pageSize: config.pageSize,
+				margins: config.margins
+			};
+			hasPhysicalPageContent = false;
+			columnGeometryDirty = true;
+			columnIndex = 0;
+		} else if (block.kind === "columnBreak") {
+			if (columnIndex + 1 >= activeColumns.count) {
+				physicalPageGeometry = {
+					pageSize: config.pageSize,
+					margins: config.margins
+				};
+				hasPhysicalPageContent = false;
+				columnGeometryDirty = true;
+			}
+			columnIndex = (columnIndex + 1) % activeColumns.count;
+		} else hasPhysicalPageContent = true;
 	}
 	return {
 		widths,
@@ -62,7 +140,18 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 		pageWidths,
 		marginLefts,
 		marginRights,
-		marginBottoms
+		marginBottoms,
+		contentLefts,
+		columnIndices,
+		columnCounts,
+		physicalPageGeometry: {
+			pageHeights: physicalPageHeights,
+			pageWidths: physicalPageWidths,
+			marginTops: physicalMarginTops,
+			marginLefts: physicalMarginLefts,
+			marginRights: physicalMarginRights,
+			marginBottoms: physicalMarginBottoms
+		}
 	};
 }
 //#endregion

package/dist/prosemirror/attrs/index.js

@@ -1,4 +1,5 @@
 import { EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES } from "../../types/documentEnumValues.js";
+import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { isParagraphDirection } from "../paragraphDirection.js";
 import { TRACKED_CHANGE_PROVENANCE_VALUES } from "../schema/marks.js";
 import { panic } from "better-result";
@@ -276,6 +277,7 @@ const readTableAttrs = (node) => {
 		"insideH",
 		"insideV"
 	]);
+	optionalOneOf(attrs, "_resolvedJustification", "table.attrs._resolvedJustification", issues, TABLE_JUSTIFICATION_VALUES);
 	optionalBoolean(attrs, "_resolvedBidi", "table.attrs._resolvedBidi", issues);
 	optionalRecord(attrs, "_originalFormatting", "table.attrs._originalFormatting", issues);
 	return attrsResult(attrs, issues);
@@ -289,6 +291,7 @@ const readTableRowAttrs = (node) => {
 	optionalOneOf(attrs, "heightRule", "tableRow.attrs.heightRule", issues, TABLE_ROW_HEIGHT_RULE_VALUES);
 	optionalBoolean(attrs, "isHeader", "tableRow.attrs.isHeader", issues);
 	optionalBoolean(attrs, "hidden", "tableRow.attrs.hidden", issues);
+	optionalOneOf(attrs, "_resolvedJustification", "tableRow.attrs._resolvedJustification", issues, TABLE_JUSTIFICATION_VALUES);
 	optionalRecord(attrs, "_originalFormatting", "tableRow.attrs._originalFormatting", issues);
 	optionalTableRowRevision(attrs, "trIns", issues);
 	optionalTableRowRevision(attrs, "trDel", issues);
@@ -595,7 +598,15 @@ const readCharacterSpacingMarkAttrs = (mark) => {
 	optionalNumber(attrs, "position", "characterSpacing.attrs.position", issues);
 	optionalNumber(attrs, "scale", "characterSpacing.attrs.scale", issues);
 	optionalNumber(attrs, "kerning", "characterSpacing.attrs.kerning", issues);
-	return attrsResult(attrs, issues);
+	const result = attrsResult(attrs, issues);
+	if (!result.ok) return result;
+	const { scale, ...rest } = result.value;
+	const horizontalScale = normalizeHorizontalScalePercent(scale);
+	result.value = {
+		...rest,
+		...horizontalScale !== void 0 ? { scale: horizontalScale } : {}
+	};
+	return result;
 };
 const expectCharacterSpacingMarkAttrs = (mark) => expectCachedMarkAttrs(mark, characterSpacingAttrsCache, readCharacterSpacingMarkAttrs, "character spacing attrs");
 const readEmphasisMarkAttrs = (mark) => {

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,6 +1,7 @@
 import { numPrEqual } from "../../docx/numberingParser.js";
 import { ShapeOutlineStyleSchema, narrowEnum } from "../../docx/parserEnums.js";
-import { OUTLINE_STYLE_CSS_ALIASES } from "../../types/documentEnumValues.js";
+import { OUTLINE_STYLE_CSS_ALIASES, normalizeShapeTextAnchor } from "../../types/documentEnumValues.js";
+import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { pixelsToEmu } from "../../utils/units.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
@@ -1573,7 +1574,8 @@ function marksToTextFormatting(marks, options) {
 			const attrs = expectCharacterSpacingMarkAttrs(mark);
 			if (attrs.spacing !== void 0) formatting.spacing = attrs.spacing;
 			if (attrs.position !== void 0) formatting.position = attrs.position;
-			if (attrs.scale !== void 0) formatting.scale = attrs.scale;
+			const horizontalScale = normalizeHorizontalScalePercent(attrs.scale);
+			if (horizontalScale !== void 0) formatting.scale = horizontalScale;
 			if (attrs.kerning !== void 0) formatting.kerning = attrs.kerning;
 			break;
 		}
@@ -2014,6 +2016,7 @@ function tableCellAttrsToFormatting(attrs) {
 */
 function convertPMTextBox(node) {
 	const attrs = expectTextBoxAttrs(node);
+	const verticalAlign = normalizeShapeTextAnchor(attrs.verticalAlign);
 	const childBlocks = [];
 	node.forEach((child) => {
 		if (child.type.name === "paragraph") childBlocks.push(convertPMParagraph(child));
@@ -2033,6 +2036,7 @@ function convertPMTextBox(node) {
 			}],
 			...attrs.autoFit !== void 0 ? { autoFit: attrs.autoFit } : {},
 			...attrs.textWrap !== void 0 ? { textWrap: attrs.textWrap } : {},
+			...verticalAlign !== void 0 ? { anchor: verticalAlign } : {},
 			margins: (() => {
 				const m = {};
 				if (typeof attrs.marginTop === "number") m.top = pixelsToEmu(attrs.marginTop);

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,5 +1,6 @@
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
+import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
@@ -802,6 +803,7 @@ function convertTable(table, styleResolver, context) {
 	const resolvedTableBorders = table.formatting?.borders ?? tableStyle?.tblPr?.borders ?? fallbackTableStyle?.tblPr?.borders;
 	const fallbackTableIndent = fallbackTableStyle?.tblPr?.indent;
 	const resolvedTableIndent = table.formatting?.indent ?? tableStyle?.tblPr?.indent ?? (fallbackTableIndent?.value === 0 ? void 0 : fallbackTableIndent);
+	const resolvedTableJustification = tableStyle?.tblPr?.justification ?? fallbackTableStyle?.tblPr?.justification;
 	const resolvedTableBidi = table.formatting?.bidi ?? tableStyle?.tblPr?.bidi ?? fallbackTableStyle?.tblPr?.bidi;
 	const tableCellMargins = table.formatting?.cellMargins ?? tableStyle?.tblPr?.cellMargins ?? fallbackTableStyle?.tblPr?.cellMargins;
 	let cellMarginsAttr;
@@ -824,6 +826,7 @@ function convertTable(table, styleResolver, context) {
 	if (table.formatting?.look) attrs.look = table.formatting.look;
 	if (table.formatting?.borders) attrs.borders = table.formatting.borders;
 	if (resolvedTableIndent) attrs._resolvedIndent = resolvedTableIndent;
+	if (resolvedTableJustification) attrs._resolvedJustification = resolvedTableJustification;
 	if (resolvedTableBidi !== void 0) attrs._resolvedBidi = resolvedTableBidi;
 	if (table.formatting) attrs._originalFormatting = table.formatting;
 	if (table.propertyChanges && table.propertyChanges.length > 0) attrs.tblPrChange = [...table.propertyChanges];
@@ -863,7 +866,8 @@ function convertTable(table, styleResolver, context) {
 			})();
 		})();
 		if (bandingEnabledH && !isFirstRowStyled && !isLastRow) dataRowIndex++;
-		return convertTableRow(row, styleResolver, context, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr);
+		const resolvedRowJustification = tableStyle?.trPr?.justification ?? fallbackTableStyle?.trPr?.justification;
+		return convertTableRow(row, styleResolver, context, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr, resolvedRowJustification);
 	});
 	return schema.node("table", attrs, rows);
 }
@@ -880,11 +884,12 @@ function countTableColumns(rows) {
 /**
 * Convert a TableRow to a ProseMirror table row node
 */
-function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins) {
+function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins, resolvedJustification) {
 	const attrsWithoutStructuralChange = { isHeader: !!row.formatting?.header };
 	if (row.formatting?.height?.value !== void 0) attrsWithoutStructuralChange.height = row.formatting.height.value;
 	if (row.formatting?.heightRule) attrsWithoutStructuralChange.heightRule = row.formatting.heightRule;
 	if (row.formatting?.hidden) attrsWithoutStructuralChange.hidden = true;
+	if (resolvedJustification) attrsWithoutStructuralChange._resolvedJustification = resolvedJustification;
 	if (row.formatting) attrsWithoutStructuralChange._originalFormatting = row.formatting;
 	if (row.propertyChanges && row.propertyChanges.length > 0) attrsWithoutStructuralChange.trPrChange = [...row.propertyChanges];
 	let attrs = attrsWithoutStructuralChange;
@@ -1493,7 +1498,7 @@ function textFormattingToMarks(formatting, options) {
 	if (formatting.smallCaps) marks.push(schema.mark("smallCaps"));
 	const spacing = typeof formatting.spacing === "number" ? formatting.spacing : null;
 	const position = typeof formatting.position === "number" ? formatting.position : null;
-	const scale = typeof formatting.scale === "number" ? formatting.scale : null;
+	const scale = normalizeHorizontalScalePercent(formatting.scale) ?? null;
 	const kerning = typeof formatting.kerning === "number" ? formatting.kerning : null;
 	if (spacing !== null || position !== null || scale !== null || kerning !== null) marks.push(schema.mark("characterSpacing", {
 		spacing,
@@ -1764,6 +1769,7 @@ function textBoxFromShape(shape, textBody) {
 	if (textBody.margins) textBox.margins = textBody.margins;
 	if (textBody.autoFit) textBox.autoFit = textBody.autoFit;
 	if (textBody.textWrap) textBox.textWrap = textBody.textWrap;
+	if (textBody.anchor) textBox.verticalAlign = textBody.anchor;
 	return textBox;
 }
 /**
@@ -1839,6 +1845,7 @@ function convertTextBox(textBox, styleResolver, options) {
 		height: heightPx,
 		autoFit: textBox.autoFit,
 		textWrap: textBox.textWrap,
+		verticalAlign: textBox.verticalAlign,
 		textBoxId: textBox.id,
 		fillColor,
 		outlineWidth,

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

@@ -1,3 +1,4 @@
+import { getHorizontalScaleFactor, normalizeHorizontalScalePercent, parseHorizontalScalePercent } from "../../../utils/horizontalScale.js";
 import { formatPx, twipsToPixels } from "../../../utils/units.js";
 import { expectCharacterSpacingMarkAttrs } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
@@ -28,12 +29,13 @@ const CharacterSpacingExtension = createMarkExtension({
 			getAttrs: (dom) => ({
 				spacing: dom.dataset["spacing"] ? Number(dom.dataset["spacing"]) : null,
 				position: dom.dataset["position"] ? Number(dom.dataset["position"]) : null,
-				scale: dom.dataset["scale"] ? Number(dom.dataset["scale"]) : null,
+				scale: parseHorizontalScalePercent(dom.dataset["scale"]),
 				kerning: dom.dataset["kerning"] ? Number(dom.dataset["kerning"]) : null
 			})
 		}],
 		toDOM(mark) {
-			const { spacing, position, scale, kerning } = expectCharacterSpacingMarkAttrs(mark);
+			const { spacing, position, scale: authoredScale, kerning } = expectCharacterSpacingMarkAttrs(mark);
+			const scale = normalizeHorizontalScalePercent(authoredScale);
 			const styles = [];
 			const dataAttrs = { class: "docx-char-spacing" };
 			if (spacing !== void 0 && spacing !== 0) {
@@ -45,10 +47,12 @@ const CharacterSpacingExtension = createMarkExtension({
 				styles.push(`vertical-align: ${formatPx(px)}`);
 				dataAttrs["data-position"] = String(position);
 			}
-			if (scale !== void 0 && scale !== 100) {
-				styles.push(`transform: scaleX(${scale / 100})`);
-				styles.push("display: inline-block");
+			if (scale !== void 0) {
 				dataAttrs["data-scale"] = String(scale);
+				if (scale !== 100) {
+					styles.push(`transform: scaleX(${getHorizontalScaleFactor(scale)})`);
+					styles.push("display: inline-block");
+				}
 			}
 			if (kerning !== void 0) dataAttrs["data-kerning"] = String(kerning);
 			if (styles.length > 0) dataAttrs["style"] = styles.join("; ");

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

@@ -154,6 +154,7 @@ const tableSpec = {
 		look: { default: null },
 		borders: { default: null },
 		_resolvedIndent: { default: null },
+		_resolvedJustification: { default: null },
 		_resolvedBidi: { default: null },
 		_originalFormatting: { default: null },
 		tblPrChange: { default: null },
@@ -200,6 +201,7 @@ const tableRowSpec = {
 		heightRule: { default: null },
 		isHeader: { default: false },
 		hidden: { default: false },
+		_resolvedJustification: { default: null },
 		_originalFormatting: { default: null },
 		trPrChange: { default: null },
 		trIns: { default: null },

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

@@ -1,4 +1,4 @@
-import { IMAGE_WRAP_TYPE_VALUES } from "../../../types/documentEnumValues.js";
+import { IMAGE_WRAP_TYPE_VALUES, normalizeShapeTextAnchor } from "../../../types/documentEnumValues.js";
 import { expectTextBoxAttrs } from "../../attrs/index.js";
 import { createNodeExtension } from "../create.js";
 //#region src/prosemirror/extensions/nodes/TextBoxExtension.ts
@@ -21,6 +21,9 @@ function parseTextBoxAutoFit(raw) {
 function parseTextBoxTextWrap(raw) {
 	if (raw === "none" || raw === "square") return raw;
 }
+function parseTextBoxVerticalAlign(raw) {
+	return normalizeShapeTextAnchor(raw);
+}
 const TextBoxExtension = createNodeExtension({
 	name: "textBox",
 	schemaNodeName: "textBox",
@@ -68,6 +71,7 @@ const TextBoxExtension = createNodeExtension({
 				const wrapType = parseTextBoxWrapType(d["wrapType"]);
 				const autoFit = parseTextBoxAutoFit(d["autoFit"]);
 				const textWrap = parseTextBoxTextWrap(d["textWrap"]);
+				const verticalAlign = parseTextBoxVerticalAlign(d["verticalAlign"]);
 				return {
 					...d["width"] ? { width: Number(d["width"]) } : {},
 					...d["height"] ? { height: Number(d["height"]) } : {},
@@ -82,7 +86,7 @@ const TextBoxExtension = createNodeExtension({
 					...d["marginBottom"] ? { marginBottom: Number(d["marginBottom"]) } : {},
 					...d["marginLeft"] ? { marginLeft: Number(d["marginLeft"]) } : {},
 					...d["marginRight"] ? { marginRight: Number(d["marginRight"]) } : {},
-					...d["verticalAlign"] ? { verticalAlign: d["verticalAlign"] } : {},
+					...verticalAlign ? { verticalAlign } : {},
 					...d["displayMode"] ? { displayMode: d["displayMode"] } : {},
 					...d["cssFloat"] ? { cssFloat: d["cssFloat"] } : {},
 					...wrapType ? { wrapType } : {},

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

@@ -571,6 +571,8 @@ type TableAttrs = {
   borders?: document_d_exports.TableBorders;
   /** Effective table indent after style resolution. PM-only; never serialized. */
   _resolvedIndent?: NonNullable<document_d_exports.TableFormatting["indent"]>;
+  /** Style-derived table justification fallback. PM-only; never serialized. */
+  _resolvedJustification?: NonNullable<document_d_exports.TableFormatting["justification"]>;
   /** Effective table direction after style resolution. PM-only; never serialized. */
   _resolvedBidi?: boolean;
   /** Original table formatting from DOCX for lossless round-trip serialization */
@@ -596,6 +598,8 @@ type TableRowAttrs = {
   isHeader?: boolean;
   /** Whether the row is hidden (`w:hidden`) */
   hidden?: boolean;
+  /** Style-derived row justification fallback. PM-only; never serialized. */
+  _resolvedJustification?: NonNullable<document_d_exports.TableRowFormatting["justification"]>;
   /** Original row formatting from DOCX for lossless round-trip serialization */
   _originalFormatting?: document_d_exports.TableRowFormatting;
   /** Tracked row property changes (w:trPrChange) for round-trip + accept/reject */