js.documents 1.61.0 → 1.63.0

package/dist/convert/convert.js

@@ -7,6 +7,7 @@ import { buildOdtPackage } from "../edit/odt/content.js";
 import { buildOdpPackage } from "../edit/odp/content.js";
 import { buildOdsPackage } from "../edit/ods/content.js";
 import { buildOdgPackage } from "../edit/odg/content.js";
+import { createDocumentFontRegistry, extractSourceFonts } from "../fonts/registry.js";
 import { layoutFormula } from "../mathml/layout.js";
 import { readDocxContent } from "../ooxml/docx/read.js";
 import { readPptxContent } from "../ooxml/pptx/read.js";
@@ -30,13 +31,17 @@ import { odbTablesToSpreadsheetDocument } from "../odb/spreadsheet.js";
 import { buildXlsxPackage, decodePackage, encodePackage, readXlsxContent } from "ooxml.js";
 import { COLOR_BLACK, CONTENT_FORMAT_VERSION, DOCUMENT_PACKAGE_FORMAT_VERSION, LAYOUT_FORMAT_VERSION } from "document-schema.js";
 import { decodePackage as decodePackage$1, encodePackage as encodePackage$1, readOdfMetadata, readOdfParagraph, readOdfTable, readOdm } from "odf.js";
-import { createStandardFontMeasurer, loadMathFont, readPdf, writePdf } from "pdf-codec";
+import { createFontMeasurer, createFontRegistry, loadMathFont, readPdf, writePdf } from "pdf-codec";
 //#region src/convert/convert.ts
 function docxToPdf(bytes, options) {
 	const pkg = openDocx(bytes).toPackage();
 	const content = readDocxContent(pkg);
 	if (content.kind !== "wordprocessing") throw new Error("readDocxContent returned a non-wordprocessing ContentDocument");
-	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createStandardFontMeasurer() });
+	const fonts = createDocumentFontRegistry({
+		kind: "docx",
+		package: pkg
+	}, options);
+	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createFontMeasurer(fonts) });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content,
@@ -45,33 +50,40 @@ function docxToPdf(bytes, options) {
 	return writePdf(layout, {
 		signal: options?.signal,
 		onSubstitution: options?.onSubstitution,
-		formulas
+		formulas,
+		fonts
 	});
 }
 function odtToPdf(bytes, options) {
 	const pkg = decodePackage$1(bytes);
 	const content = readOdtContent(pkg);
-	if (content.document.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
-	const { document: layout, formulas } = convertWordprocessingToLayout(content.document, {
-		measurer: createStandardFontMeasurer(),
-		formulas: content.formulas
-	});
+	if (content.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
+	const fonts = createDocumentFontRegistry({
+		kind: "odf",
+		package: pkg
+	}, options);
+	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createFontMeasurer(fonts) });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content: content.document,
+		content,
 		layout
 	});
 	return writePdf(layout, {
 		signal: options?.signal,
 		onSubstitution: options?.onSubstitution,
-		formulas
+		formulas,
+		fonts
 	});
 }
 function pptxToPdf(bytes, options) {
 	const pkg = openPptx(bytes).toPackage();
 	const content = readPptxContent(pkg);
 	if (content.kind !== "presentation") throw new Error("readPptxContent returned a non-presentation ContentDocument");
-	const { document: layout } = convertPresentationToLayout(content, { measurer: createStandardFontMeasurer() });
+	const fonts = createDocumentFontRegistry({
+		kind: "pptx",
+		package: pkg
+	}, options);
+	const { document: layout, formulas } = convertPresentationToLayout(content, { measurer: createFontMeasurer(fonts) });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content,
@@ -79,34 +91,42 @@ function pptxToPdf(bytes, options) {
 	});
 	return writePdf(layout, {
 		signal: options?.signal,
-		onSubstitution: options?.onSubstitution
+		onSubstitution: options?.onSubstitution,
+		formulas,
+		fonts
 	});
 }
 function odpToPdf(bytes, options) {
 	const pkg = decodePackage$1(bytes);
 	const content = readOdpContent(pkg);
-	if (content.document.kind !== "presentation") throw new Error("readOdpContent returned a non-presentation ContentDocument");
-	const { document: layout, formulas } = convertPresentationToLayout(content.document, {
-		measurer: createStandardFontMeasurer(),
-		formulas: content.formulas
-	});
+	if (content.kind !== "presentation") throw new Error("readOdpContent returned a non-presentation ContentDocument");
+	const fonts = createDocumentFontRegistry({
+		kind: "odf",
+		package: pkg
+	}, options);
+	const { document: layout, formulas } = convertPresentationToLayout(content, { measurer: createFontMeasurer(fonts) });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content: content.document,
+		content,
 		layout
 	});
 	return writePdf(layout, {
 		signal: options?.signal,
 		onSubstitution: options?.onSubstitution,
-		formulas
+		formulas,
+		fonts
 	});
 }
 function odsToPdf(bytes, options) {
 	const pkg = decodePackage$1(bytes);
 	const content = readOdsContent(pkg);
 	if (content.kind !== "spreadsheet") throw new Error("readOdsContent returned a non-spreadsheet ContentDocument");
+	const fonts = createDocumentFontRegistry({
+		kind: "odf",
+		package: pkg
+	}, options);
 	const layout = convertSpreadsheetToLayout(content, {
-		measurer: createStandardFontMeasurer(),
+		measurer: createFontMeasurer(fonts),
 		signal: options?.signal
 	});
 	options?.onDocument?.({
@@ -116,14 +136,19 @@ function odsToPdf(bytes, options) {
 	});
 	return writePdf(layout, {
 		signal: options?.signal,
-		onSubstitution: options?.onSubstitution
+		onSubstitution: options?.onSubstitution,
+		fonts
 	});
 }
 function odgToPdf(bytes, options) {
 	const pkg = decodePackage$1(bytes);
 	const content = readOdgContent(pkg);
 	if (content.kind !== "drawing") throw new Error("readOdgContent returned a non-drawing ContentDocument");
-	const layout = convertDrawingToLayout(content, { measurer: createStandardFontMeasurer() });
+	const fonts = createDocumentFontRegistry({
+		kind: "odf",
+		package: pkg
+	}, options);
+	const layout = convertDrawingToLayout(content, { measurer: createFontMeasurer(fonts) });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content,
@@ -131,7 +156,8 @@ function odgToPdf(bytes, options) {
 	});
 	return writePdf(layout, {
 		signal: options?.signal,
-		onSubstitution: options?.onSubstitution
+		onSubstitution: options?.onSubstitution,
+		fonts
 	});
 }
 function markdownToPdf(bytes, options) {
@@ -139,7 +165,11 @@ function markdownToPdf(bytes, options) {
 	const text = decodeMarkdownText(bytes);
 	const content = readMarkdownContent(text, { signal: options?.signal });
 	if (content.kind !== "wordprocessing") throw new Error("readMarkdownContent returned a non-wordprocessing ContentDocument");
-	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createStandardFontMeasurer() });
+	const fonts = createFontRegistry({
+		fonts: options?.fonts,
+		onSubstitution: options?.onFontSubstitution
+	});
+	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createFontMeasurer(fonts) });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content,
@@ -148,7 +178,8 @@ function markdownToPdf(bytes, options) {
 	return writePdf(layout, {
 		signal: options?.signal,
 		onSubstitution: options?.onSubstitution,
-		formulas
+		formulas,
+		fonts
 	});
 }
 const STANDALONE_FORMULA_SIZE_PT = 18;
@@ -156,9 +187,10 @@ const STANDALONE_FORMULA_MARGIN_PT = 72;
 function odfToPdf(bytes, options) {
 	throwIfAborted(options?.signal);
 	const pkg = decodePackage$1(bytes);
-	const formula = readOdfFormulaContent(pkg);
+	const content = readOdfFormulaContent(pkg);
+	if (content.kind !== "formula") throw new Error("readOdfFormulaContent returned a non-formula ContentDocument");
 	const metrics = loadMathFont().metricsAt(STANDALONE_FORMULA_SIZE_PT);
-	const { box } = layoutFormula(formula.mathml, {
+	const { box } = layoutFormula(content.formula.mathml, {
 		metrics,
 		sizePt: STANDALONE_FORMULA_SIZE_PT,
 		color: COLOR_BLACK
@@ -171,7 +203,7 @@ function odfToPdf(bytes, options) {
 	}, PAGE_SIZE_A4.heightPt);
 	const layout = {
 		formatVersion: LAYOUT_FORMAT_VERSION,
-		metadata: formula.metadata,
+		metadata: content.metadata,
 		pages: [{
 			widthPt: PAGE_SIZE_A4.widthPt,
 			heightPt: PAGE_SIZE_A4.heightPt,
@@ -179,6 +211,11 @@ function odfToPdf(bytes, options) {
 		}],
 		images: {}
 	};
+	options?.onDocument?.({
+		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
+		content,
+		layout
+	});
 	throwIfAborted(options?.signal);
 	return writePdf(layout, {
 		signal: options?.signal,
@@ -285,14 +322,14 @@ function pdfToMarkdown(bytes, options) {
 function odtToDocx(bytes, options) {
 	throwIfAborted(options?.signal);
 	const pkg = decodePackage$1(bytes);
-	const content = readOdtContent(pkg).document;
+	const content = readOdtContent(pkg);
 	if (content.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
 	throwIfAborted(options?.signal);
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content
 	});
-	return encodePackage(buildDocxPackage(content));
+	return encodePackage(buildDocxPackage(content, { onMathDiagnostic: options?.onMathDiagnostic }));
 }
 function docxToOdt(bytes, options) {
 	throwIfAborted(options?.signal);
@@ -309,7 +346,7 @@ function docxToOdt(bytes, options) {
 function odpToPptx(bytes, options) {
 	throwIfAborted(options?.signal);
 	const pkg = decodePackage$1(bytes);
-	const content = readOdpContent(pkg).document;
+	const content = readOdpContent(pkg);
 	if (content.kind !== "presentation") throw new Error("readOdpContent returned a non-presentation ContentDocument");
 	throwIfAborted(options?.signal);
 	options?.onDocument?.({
@@ -364,7 +401,7 @@ function markdownToDocx(bytes, options) {
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content
 	});
-	return encodePackage(buildDocxPackage(content));
+	return encodePackage(buildDocxPackage(content, { onMathDiagnostic: options?.onMathDiagnostic }));
 }
 function docxToMarkdown(bytes, options) {
 	throwIfAborted(options?.signal);
@@ -394,7 +431,7 @@ function markdownToOdt(bytes, options) {
 function odtToMarkdown(bytes, options) {
 	throwIfAborted(options?.signal);
 	const pkg = decodePackage$1(bytes);
-	const content = readOdtContent(pkg).document;
+	const content = readOdtContent(pkg);
 	if (content.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
 	throwIfAborted(options?.signal);
 	options?.onDocument?.({
@@ -411,7 +448,9 @@ function xlsxToPdf(bytes, options) {
 	return odsToPdf(odsBytes, {
 		signal: options?.signal,
 		onSubstitution: options?.onSubstitution,
-		onDocument: options?.onDocument
+		onDocument: options?.onDocument,
+		fonts: options?.fonts,
+		onFontSubstitution: options?.onFontSubstitution
 	});
 }
 function pdfToXlsx(bytes, options) {
@@ -467,6 +506,10 @@ function odmToPdf(bytes, options) {
 	const odm = readOdm(pkg);
 	const unresolvedHrefs = [];
 	const chapterSections = [];
+	const sourceFonts = extractSourceFonts({
+		kind: "odf",
+		package: pkg
+	});
 	for (const section of odm.sections) {
 		throwIfAborted(options?.signal);
 		if (section.inlineContent !== void 0) {
@@ -479,7 +522,11 @@ function odmToPdf(bytes, options) {
 			continue;
 		}
 		const chapterPkg = decodePackage$1(chapterBytes);
-		const chapterContent = readOdtContent(chapterPkg).document;
+		sourceFonts.push(...extractSourceFonts({
+			kind: "odf",
+			package: chapterPkg
+		}));
+		const chapterContent = readOdtContent(chapterPkg);
 		if (chapterContent.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
 		chapterSections.push(chapterContent.sections);
 	}
@@ -499,16 +546,23 @@ function odmToPdf(bytes, options) {
 		metadata: readOdfMetadata(pkg),
 		sections: combinedSections
 	};
-	const { document: layout } = convertWordprocessingToLayout(content, { measurer: createStandardFontMeasurer() });
+	const fonts = createFontRegistry({
+		sourceFonts,
+		fonts: options?.fonts,
+		onSubstitution: options?.onFontSubstitution
+	});
+	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createFontMeasurer(fonts) });
 	return writePdf(layout, {
 		signal: options?.signal,
-		onSubstitution: options?.onSubstitution
+		onSubstitution: options?.onSubstitution,
+		formulas,
+		fonts
 	});
 }
 function odbToXlsx(bytes, options) {
 	throwIfAborted(options?.signal);
 	const pkg = decodePackage$1(bytes);
-	const tables = readOdbTables(pkg);
+	const tables = readOdbTables(pkg, { timeZone: options?.timeZone });
 	throwIfAborted(options?.signal);
 	const content = odbTablesToSpreadsheetDocument(tables);
 	return encodePackage(buildXlsxPackage(content));
@@ -516,7 +570,7 @@ function odbToXlsx(bytes, options) {
 function odbToCsv(bytes, options) {
 	throwIfAborted(options?.signal);
 	const pkg = decodePackage$1(bytes);
-	const tables = readOdbTables(pkg);
+	const tables = readOdbTables(pkg, { timeZone: options?.timeZone });
 	throwIfAborted(options?.signal);
 	return buildOdbTableCsv(tables, options?.table);
 }

package/dist/convert/local.cjs

@@ -13,6 +13,13 @@ function substitutionDiagnostic(substitution, context) {
 		pageIndex: context.pageIndex
 	};
 }
+function fontSubstitutionDiagnostic(substitution) {
+	return {
+		severity: "info",
+		code: "font/substituted",
+		message: `"${`${substitution.requestedFamily}${substitution.requestedBold ? " bold" : ""}${substitution.requestedItalic ? " italic" : ""}`}" is not available; ${substitution.reason === "vendored-substitute" ? `substituted the metric-compatible "${substitution.resolvedFamily}"` : `substituted another face of "${substitution.resolvedFamily}"`}`
+	};
+}
 function fromPdfDiagnostic(diagnostic) {
 	return {
 		severity: diagnostic.severity,
@@ -23,7 +30,7 @@ function fromPdfDiagnostic(diagnostic) {
 }
 function createLocalDocumentConverter() {
 	return {
-		contractVersion: 2,
+		contractVersion: 3,
 		conversions: SUPPORTED_CONVERSIONS,
 		convert(request, options) {
 			const { source, targetFormat } = request;
@@ -32,6 +39,10 @@ function createLocalDocumentConverter() {
 			const onDocument = (pkg) => {
 				documentPackage = pkg;
 			};
+			const onFontSubstitution = (substitution) => {
+				diagnostics.push(fontSubstitutionDiagnostic(substitution));
+				options.onFontSubstitution?.(substitution);
+			};
 			const strategy = require_convert_capability.resolveConversionPath(source.format, targetFormat);
 			if (strategy?.kind !== "direct") return Promise.reject(/* @__PURE__ */ new Error(`unsupported conversion: ${source.format} -> ${targetFormat}`));
 			const edge = strategy.edge;
@@ -39,7 +50,9 @@ function createLocalDocumentConverter() {
 				const bytes = edge.convert(source.bytes, {
 					signal: options.signal,
 					onSubstitution: (s, c) => diagnostics.push(substitutionDiagnostic(s, c)),
-					onDocument
+					onDocument,
+					fonts: options.fonts,
+					onFontSubstitution
 				});
 				return Promise.resolve({
 					document: {

package/dist/convert/local.js

@@ -12,6 +12,13 @@ function substitutionDiagnostic(substitution, context) {
 		pageIndex: context.pageIndex
 	};
 }
+function fontSubstitutionDiagnostic(substitution) {
+	return {
+		severity: "info",
+		code: "font/substituted",
+		message: `"${`${substitution.requestedFamily}${substitution.requestedBold ? " bold" : ""}${substitution.requestedItalic ? " italic" : ""}`}" is not available; ${substitution.reason === "vendored-substitute" ? `substituted the metric-compatible "${substitution.resolvedFamily}"` : `substituted another face of "${substitution.resolvedFamily}"`}`
+	};
+}
 function fromPdfDiagnostic(diagnostic) {
 	return {
 		severity: diagnostic.severity,
@@ -22,7 +29,7 @@ function fromPdfDiagnostic(diagnostic) {
 }
 function createLocalDocumentConverter() {
 	return {
-		contractVersion: 2,
+		contractVersion: 3,
 		conversions: SUPPORTED_CONVERSIONS,
 		convert(request, options) {
 			const { source, targetFormat } = request;
@@ -31,6 +38,10 @@ function createLocalDocumentConverter() {
 			const onDocument = (pkg) => {
 				documentPackage = pkg;
 			};
+			const onFontSubstitution = (substitution) => {
+				diagnostics.push(fontSubstitutionDiagnostic(substitution));
+				options.onFontSubstitution?.(substitution);
+			};
 			const strategy = resolveConversionPath(source.format, targetFormat);
 			if (strategy?.kind !== "direct") return Promise.reject(/* @__PURE__ */ new Error(`unsupported conversion: ${source.format} -> ${targetFormat}`));
 			const edge = strategy.edge;
@@ -38,7 +49,9 @@ function createLocalDocumentConverter() {
 				const bytes = edge.convert(source.bytes, {
 					signal: options.signal,
 					onSubstitution: (s, c) => diagnostics.push(substitutionDiagnostic(s, c)),
-					onDocument
+					onDocument,
+					fonts: options.fonts,
+					onFontSubstitution
 				});
 				return Promise.resolve({
 					document: {

package/dist/convert/port.d.cts

@@ -1,4 +1,5 @@
 import { DocumentPackage } from "document-schema.js";
+import { FontSubstitution, ProvidedFont } from "pdf-codec";
 //#region src/convert/port.d.ts
 type DocumentFormat = 'docx' | 'pptx' | 'xlsx' | 'odt' | 'odp' | 'ods' | 'odg' | 'odf' | 'markdown' | 'pdf';
 interface DocumentPayload {
@@ -20,15 +21,18 @@ interface ConversionResult {
   readonly diagnostics: readonly Diagnostic[];
   readonly package?: DocumentPackage;
 }
+interface ConversionOptions {
+  readonly signal: AbortSignal;
+  readonly fonts?: readonly ProvidedFont[];
+  readonly onFontSubstitution?: (substitution: FontSubstitution) => void;
+}
 interface DocumentConverter {
   readonly contractVersion: number;
   readonly conversions: readonly {
     readonly source: DocumentFormat;
     readonly target: DocumentFormat;
   }[];
-  convert(request: ConversionRequest, options: {
-    readonly signal: AbortSignal;
-  }): Promise<ConversionResult>;
+  convert(request: ConversionRequest, options: ConversionOptions): Promise<ConversionResult>;
 }
 //#endregion
-export { ConversionRequest, ConversionResult, Diagnostic, DocumentConverter, DocumentFormat, DocumentPayload };
+export { ConversionOptions, ConversionRequest, ConversionResult, Diagnostic, DocumentConverter, DocumentFormat, DocumentPayload };

package/dist/convert/port.d.ts

@@ -1,4 +1,5 @@
 import { DocumentPackage } from "document-schema.js";
+import { FontSubstitution, ProvidedFont } from "pdf-codec";
 //#region src/convert/port.d.ts
 type DocumentFormat = 'docx' | 'pptx' | 'xlsx' | 'odt' | 'odp' | 'ods' | 'odg' | 'odf' | 'markdown' | 'pdf';
 interface DocumentPayload {
@@ -20,15 +21,18 @@ interface ConversionResult {
   readonly diagnostics: readonly Diagnostic[];
   readonly package?: DocumentPackage;
 }
+interface ConversionOptions {
+  readonly signal: AbortSignal;
+  readonly fonts?: readonly ProvidedFont[];
+  readonly onFontSubstitution?: (substitution: FontSubstitution) => void;
+}
 interface DocumentConverter {
   readonly contractVersion: number;
   readonly conversions: readonly {
     readonly source: DocumentFormat;
     readonly target: DocumentFormat;
   }[];
-  convert(request: ConversionRequest, options: {
-    readonly signal: AbortSignal;
-  }): Promise<ConversionResult>;
+  convert(request: ConversionRequest, options: ConversionOptions): Promise<ConversionResult>;
 }
 //#endregion
-export { ConversionRequest, ConversionResult, Diagnostic, DocumentConverter, DocumentFormat, DocumentPayload };
+export { ConversionOptions, ConversionRequest, ConversionResult, Diagnostic, DocumentConverter, DocumentFormat, DocumentPayload };

package/dist/edit/docx/content.cjs

@@ -1,17 +1,45 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_model_units = require("../../model/units.cjs");
 const require_edit_docx_editor = require("./editor.cjs");
+const require_model_formula = require("../../model/formula.cjs");
 let ooxml_js = require("ooxml.js");
 //#region src/edit/docx/content.ts
-function buildDocxPackage(content) {
+function buildDocxPackage(content, options) {
 	if (content.kind !== "wordprocessing") throw new Error("buildDocxPackage requires a wordprocessing ContentDocument");
 	const editor = require_edit_docx_editor.createDocx();
 	content.sections.forEach((section, sectionIndex) => {
 		if (sectionIndex > 0) editor.body.appendPageBreak();
-		for (const block of section.blocks) appendBlock(editor.body, block);
+		appendBlocks(editor.body, section.blocks, options);
 	});
 	return editor.toPackage();
 }
+function isMergeableImageParagraph(block) {
+	return block.kind === "paragraph" && block.runs.every((run) => run.text === "");
+}
+function appendBlocks(body, blocks, options) {
+	let index = 0;
+	while (index < blocks.length) {
+		const block = blocks[index];
+		const next = blocks[index + 1];
+		if (block !== void 0 && isMergeableImageParagraph(block) && next?.kind === "image") {
+			const paragraph = body.appendParagraph();
+			paragraph.styleId = block.styleId;
+			paragraph.alignment = block.alignment;
+			paragraph.list = block.list;
+			paragraph.insertImageAfter({
+				format: next.format,
+				bytes: (0, ooxml_js.base64ToBytes)(next.base64),
+				widthPt: next.widthPt,
+				heightPt: next.heightPt,
+				altText: next.altText
+			});
+			index += 2;
+			continue;
+		}
+		if (block !== void 0) appendBlock(body, block, options);
+		index += 1;
+	}
+}
 function populateParagraph(paragraph, block) {
 	paragraph.styleId = block.styleId;
 	paragraph.alignment = block.alignment;
@@ -30,32 +58,57 @@ function populateParagraph(paragraph, block) {
 		if (run.color !== void 0) docxRun.color = run.color;
 	}
 }
+function populateCellBlocks(cell, blocks) {
+	const [firstBlock, ...restBlocks] = blocks;
+	const firstParagraph = cell.paragraphs()[0];
+	if (firstBlock?.kind === "paragraph" && firstParagraph !== void 0) populateParagraph(firstParagraph, firstBlock);
+	else if (firstBlock !== void 0) appendCellBlock(cell, firstBlock);
+	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
+}
 function appendTable(body, block) {
 	const columns = block.columnWidthsPt.length;
 	if (block.rows.length === 0 || columns === 0) return;
 	const table = body.appendTable({
-		rows: block.rows.length,
+		rows: 0,
 		columns,
 		columnWidthsTwips: block.columnWidthsPt.map(require_model_units.ptToTwips)
 	});
-	block.rows.forEach((row, rowIndex) => {
-		const tableRow = table.rows()[rowIndex];
-		if (tableRow === void 0) return;
+	const verticalMerges = /* @__PURE__ */ new Map();
+	block.rows.forEach((row) => {
+		const domCells = table.appendRow(row.cells.length).cells();
+		let colIndex = 0;
 		row.cells.forEach((cell, cellIndex) => {
-			const tableCell = tableRow.cells()[cellIndex];
+			const tableCell = domCells[cellIndex];
 			if (tableCell === void 0) return;
-			const [firstBlock, ...restBlocks] = cell.blocks;
-			const firstParagraph = tableCell.paragraphs()[0];
-			if (firstBlock?.kind === "paragraph" && firstParagraph !== void 0) populateParagraph(firstParagraph, firstBlock);
-			else if (firstBlock !== void 0) appendCellBlock(tableCell, firstBlock);
-			for (const remaining of restBlocks) appendCellBlock(tableCell, remaining);
+			const active = verticalMerges.get(colIndex);
+			if (active !== void 0 && active.rowsRemaining > 0) {
+				if (active.gridSpan > 1) tableCell.colSpan = active.gridSpan;
+				tableCell.verticalMerge = "continue";
+				verticalMerges.set(colIndex, {
+					rowsRemaining: active.rowsRemaining - 1,
+					gridSpan: active.gridSpan
+				});
+				colIndex += active.gridSpan;
+				return;
+			}
+			const span = cell.colSpan ?? 1;
+			if (span > 1) tableCell.colSpan = span;
+			if (cell.rowSpan !== void 0 && cell.rowSpan > 1) {
+				tableCell.verticalMerge = "restart";
+				verticalMerges.set(colIndex, {
+					rowsRemaining: cell.rowSpan - 1,
+					gridSpan: span
+				});
+			}
+			populateCellBlocks(tableCell, cell.blocks);
+			colIndex += span;
 		});
 	});
 }
 function appendCellBlock(cell, block) {
 	if (block.kind === "paragraph") populateParagraph(cell.appendParagraph(), block);
 }
-function appendBlock(body, block) {
+function appendBlock(body, block, options) {
 	if (block.kind === "paragraph") populateParagraph(body.appendParagraph(), block);
 	else if (block.kind === "image") body.appendParagraph().insertImageAfter({
 		format: block.format,
@@ -66,6 +119,15 @@ function appendBlock(body, block) {
 	});
 	else if (block.kind === "pageBreak") body.appendPageBreak();
 	else if (block.kind === "table") appendTable(body, block);
+	else if (block.kind === "embeddedObject") appendEmbeddedObject(body, block, options);
+}
+function appendEmbeddedObject(body, block, options) {
+	const formula = require_model_formula.formulaOfBlock(block);
+	if (formula === void 0) return;
+	const paragraph = body.appendParagraph();
+	const { written, diagnostics } = paragraph.appendOfficeMath(formula.mathml);
+	for (const diagnostic of diagnostics) options?.onMathDiagnostic?.(diagnostic, { sourcePath: block.sourcePath });
+	if (!written) paragraph.appendRun({ text: require_model_formula.formulaPlaceholderText(formula) });
 }
 //#endregion
 exports.buildDocxPackage = buildDocxPackage;

package/dist/edit/docx/content.d.cts

@@ -1,6 +1,12 @@
+import { t as OmmlDiagnostic } from "../../write-DuyfnbL_.cjs";
 import { ContentDocument } from "document-schema.js";
 import { Package } from "ooxml.js";
 //#region src/edit/docx/content.d.ts
-declare function buildDocxPackage(content: ContentDocument): Package;
+interface BuildDocxPackageOptions {
+  readonly onMathDiagnostic?: (diagnostic: OmmlDiagnostic, context: {
+    readonly sourcePath?: string;
+  }) => void;
+}
+declare function buildDocxPackage(content: ContentDocument, options?: BuildDocxPackageOptions): Package;
 //#endregion
-export { buildDocxPackage };
+export { BuildDocxPackageOptions, buildDocxPackage };

package/dist/edit/docx/content.d.ts

@@ -1,6 +1,12 @@
+import { t as OmmlDiagnostic } from "../../write-Zqwx6pka.js";
 import { Package } from "ooxml.js";
 import { ContentDocument } from "document-schema.js";
 //#region src/edit/docx/content.d.ts
-declare function buildDocxPackage(content: ContentDocument): Package;
+interface BuildDocxPackageOptions {
+  readonly onMathDiagnostic?: (diagnostic: OmmlDiagnostic, context: {
+    readonly sourcePath?: string;
+  }) => void;
+}
+declare function buildDocxPackage(content: ContentDocument, options?: BuildDocxPackageOptions): Package;
 //#endregion
-export { buildDocxPackage };
+export { BuildDocxPackageOptions, buildDocxPackage };