documents.js 1.60.3 → 1.62.0

package/dist/{blr-types-CYYC3yYU.d.cts → blr-types-DVgO1DQ9.d.cts}

@@ -30,6 +30,6 @@ declare class FirebirdUnsupportedFieldTypeError extends Error {
   constructor(blrType: number);
 }
 declare function decodeBlrType(blrType: number): FirebirdPhysicalType;
-declare function describeFieldType(physical: FirebirdPhysicalType, lengthBytes: number, scale: number, characterLength: number | undefined): string;
+declare function describeFieldType(physical: FirebirdPhysicalType, lengthBytes: number, scale: number, characterLength: number | undefined, subType: number): string;
 //#endregion
 export { BLR_TIMESTAMP_TZ as C, FirebirdUnsupportedFieldTypeError as D, FirebirdPhysicalType as E, decodeBlrType as O, BLR_TIMESTAMP as S, BLR_VARYING2 as T, BLR_SQL_DATE as _, BLR_DEC128 as a, BLR_TEXT as b, BLR_D_FLOAT as c, BLR_FLOAT as d, BLR_INT128 as f, BLR_SHORT as g, BLR_QUAD as h, BLR_CSTRING2 as i, describeFieldType as k, BLR_EX_TIMESTAMP_TZ as l, BLR_LONG as m, BLR_BOOL as n, BLR_DEC64 as o, BLR_INT64 as p, BLR_CSTRING as r, BLR_DOUBLE as s, BLR_BLOB as t, BLR_EX_TIME_TZ as u, BLR_SQL_TIME as v, BLR_VARYING as w, BLR_TEXT2 as x, BLR_SQL_TIME_TZ as y };

package/dist/{blr-types-CYYC3yYU.d.ts → blr-types-DVgO1DQ9.d.ts}

@@ -30,6 +30,6 @@ declare class FirebirdUnsupportedFieldTypeError extends Error {
   constructor(blrType: number);
 }
 declare function decodeBlrType(blrType: number): FirebirdPhysicalType;
-declare function describeFieldType(physical: FirebirdPhysicalType, lengthBytes: number, scale: number, characterLength: number | undefined): string;
+declare function describeFieldType(physical: FirebirdPhysicalType, lengthBytes: number, scale: number, characterLength: number | undefined, subType: number): string;
 //#endregion
 export { BLR_TIMESTAMP_TZ as C, FirebirdUnsupportedFieldTypeError as D, FirebirdPhysicalType as E, decodeBlrType as O, BLR_TIMESTAMP as S, BLR_VARYING2 as T, BLR_SQL_DATE as _, BLR_DEC128 as a, BLR_TEXT as b, BLR_D_FLOAT as c, BLR_FLOAT as d, BLR_INT128 as f, BLR_SHORT as g, BLR_QUAD as h, BLR_CSTRING2 as i, describeFieldType as k, BLR_EX_TIMESTAMP_TZ as l, BLR_LONG as m, BLR_BOOL as n, BLR_DEC64 as o, BLR_INT64 as p, BLR_CSTRING as r, BLR_DOUBLE as s, BLR_BLOB as t, BLR_EX_TIME_TZ as u, BLR_SQL_TIME as v, BLR_VARYING as w, BLR_TEXT2 as x, BLR_SQL_TIME_TZ as y };

package/dist/convert/capability.cjs

@@ -39,6 +39,7 @@ const FORMAT_CAPABILITIES = {
 	},
 	odf: {
 		format: "odf",
+		variant: "formula",
 		hasLayoutPath: false
 	},
 	markdown: {

package/dist/convert/capability.d.cts

@@ -1,7 +1,7 @@
 import { DocumentBridgeOptions, DocumentToPdfOptions, PdfToDocumentOptions } from "./convert.cjs";
 import { DocumentFormat } from "./port.cjs";
 //#region src/convert/capability.d.ts
-type ContentVariant = 'wordprocessing' | 'presentation' | 'spreadsheet' | 'drawing';
+type ContentVariant = 'wordprocessing' | 'presentation' | 'spreadsheet' | 'drawing' | 'formula';
 interface FormatCapability {
   readonly format: DocumentFormat;
   readonly variant?: ContentVariant;

package/dist/convert/capability.d.ts

@@ -1,7 +1,7 @@
 import { DocumentBridgeOptions, DocumentToPdfOptions, PdfToDocumentOptions } from "./convert.js";
 import { DocumentFormat } from "./port.js";
 //#region src/convert/capability.d.ts
-type ContentVariant = 'wordprocessing' | 'presentation' | 'spreadsheet' | 'drawing';
+type ContentVariant = 'wordprocessing' | 'presentation' | 'spreadsheet' | 'drawing' | 'formula';
 interface FormatCapability {
   readonly format: DocumentFormat;
   readonly variant?: ContentVariant;

package/dist/convert/capability.js

@@ -38,6 +38,7 @@ const FORMAT_CAPABILITIES = {
 	},
 	odf: {
 		format: "odf",
+		variant: "formula",
 		hasLayoutPath: false
 	},
 	markdown: {

package/dist/convert/convert.cjs

@@ -52,14 +52,11 @@ function docxToPdf(bytes, options) {
 function odtToPdf(bytes, options) {
 	const pkg = (0, odf_js.decodePackage)(bytes);
 	const content = require_odf_odt_read.readOdtContent(pkg);
-	if (content.document.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
-	const { document: layout, formulas } = require_layout_engine.convertWordprocessingToLayout(content.document, {
-		measurer: (0, pdf_codec.createStandardFontMeasurer)(),
-		formulas: content.formulas
-	});
+	if (content.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
+	const { document: layout, formulas } = require_layout_engine.convertWordprocessingToLayout(content, { measurer: (0, pdf_codec.createStandardFontMeasurer)() });
 	options?.onDocument?.({
 		formatVersion: document_schema_js.DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content: content.document,
+		content,
 		layout
 	});
 	return (0, pdf_codec.writePdf)(layout, {
@@ -72,7 +69,7 @@ function pptxToPdf(bytes, options) {
 	const pkg = require_edit_pptx_editor.openPptx(bytes).toPackage();
 	const content = require_ooxml_pptx_read.readPptxContent(pkg);
 	if (content.kind !== "presentation") throw new Error("readPptxContent returned a non-presentation ContentDocument");
-	const { document: layout } = require_layout_slides.convertPresentationToLayout(content, { measurer: (0, pdf_codec.createStandardFontMeasurer)() });
+	const { document: layout, formulas } = require_layout_slides.convertPresentationToLayout(content, { measurer: (0, pdf_codec.createStandardFontMeasurer)() });
 	options?.onDocument?.({
 		formatVersion: document_schema_js.DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content,
@@ -80,20 +77,18 @@ function pptxToPdf(bytes, options) {
 	});
 	return (0, pdf_codec.writePdf)(layout, {
 		signal: options?.signal,
-		onSubstitution: options?.onSubstitution
+		onSubstitution: options?.onSubstitution,
+		formulas
 	});
 }
 function odpToPdf(bytes, options) {
 	const pkg = (0, odf_js.decodePackage)(bytes);
 	const content = require_odf_odp_read.readOdpContent(pkg);
-	if (content.document.kind !== "presentation") throw new Error("readOdpContent returned a non-presentation ContentDocument");
-	const { document: layout, formulas } = require_layout_slides.convertPresentationToLayout(content.document, {
-		measurer: (0, pdf_codec.createStandardFontMeasurer)(),
-		formulas: content.formulas
-	});
+	if (content.kind !== "presentation") throw new Error("readOdpContent returned a non-presentation ContentDocument");
+	const { document: layout, formulas } = require_layout_slides.convertPresentationToLayout(content, { measurer: (0, pdf_codec.createStandardFontMeasurer)() });
 	options?.onDocument?.({
 		formatVersion: document_schema_js.DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content: content.document,
+		content,
 		layout
 	});
 	return (0, pdf_codec.writePdf)(layout, {
@@ -157,9 +152,10 @@ const STANDALONE_FORMULA_MARGIN_PT = 72;
 function odfToPdf(bytes, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
 	const pkg = (0, odf_js.decodePackage)(bytes);
-	const formula = require_odf_formula_read.readOdfFormulaContent(pkg);
+	const content = require_odf_formula_read.readOdfFormulaContent(pkg);
+	if (content.kind !== "formula") throw new Error("readOdfFormulaContent returned a non-formula ContentDocument");
 	const metrics = (0, pdf_codec.loadMathFont)().metricsAt(STANDALONE_FORMULA_SIZE_PT);
-	const { box } = require_mathml_layout.layoutFormula(formula.mathml, {
+	const { box } = require_mathml_layout.layoutFormula(content.formula.mathml, {
 		metrics,
 		sizePt: STANDALONE_FORMULA_SIZE_PT,
 		color: document_schema_js.COLOR_BLACK
@@ -172,7 +168,7 @@ function odfToPdf(bytes, options) {
 	}, document_schema_js.PAGE_SIZE_A4.heightPt);
 	const layout = {
 		formatVersion: document_schema_js.LAYOUT_FORMAT_VERSION,
-		metadata: formula.metadata,
+		metadata: content.metadata,
 		pages: [{
 			widthPt: document_schema_js.PAGE_SIZE_A4.widthPt,
 			heightPt: document_schema_js.PAGE_SIZE_A4.heightPt,
@@ -180,6 +176,11 @@ function odfToPdf(bytes, options) {
 		}],
 		images: {}
 	};
+	options?.onDocument?.({
+		formatVersion: document_schema_js.DOCUMENT_PACKAGE_FORMAT_VERSION,
+		content,
+		layout
+	});
 	require_ports_abort.throwIfAborted(options?.signal);
 	return (0, pdf_codec.writePdf)(layout, {
 		signal: options?.signal,
@@ -286,14 +287,14 @@ function pdfToMarkdown(bytes, options) {
 function odtToDocx(bytes, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
 	const pkg = (0, odf_js.decodePackage)(bytes);
-	const content = require_odf_odt_read.readOdtContent(pkg).document;
+	const content = require_odf_odt_read.readOdtContent(pkg);
 	if (content.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
 	require_ports_abort.throwIfAborted(options?.signal);
 	options?.onDocument?.({
 		formatVersion: document_schema_js.DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content
 	});
-	return (0, ooxml_js.encodePackage)(require_edit_docx_content.buildDocxPackage(content));
+	return (0, ooxml_js.encodePackage)(require_edit_docx_content.buildDocxPackage(content, { onMathDiagnostic: options?.onMathDiagnostic }));
 }
 function docxToOdt(bytes, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
@@ -310,7 +311,7 @@ function docxToOdt(bytes, options) {
 function odpToPptx(bytes, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
 	const pkg = (0, odf_js.decodePackage)(bytes);
-	const content = require_odf_odp_read.readOdpContent(pkg).document;
+	const content = require_odf_odp_read.readOdpContent(pkg);
 	if (content.kind !== "presentation") throw new Error("readOdpContent returned a non-presentation ContentDocument");
 	require_ports_abort.throwIfAborted(options?.signal);
 	options?.onDocument?.({
@@ -365,7 +366,7 @@ function markdownToDocx(bytes, options) {
 		formatVersion: document_schema_js.DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content
 	});
-	return (0, ooxml_js.encodePackage)(require_edit_docx_content.buildDocxPackage(content));
+	return (0, ooxml_js.encodePackage)(require_edit_docx_content.buildDocxPackage(content, { onMathDiagnostic: options?.onMathDiagnostic }));
 }
 function docxToMarkdown(bytes, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
@@ -395,7 +396,7 @@ function markdownToOdt(bytes, options) {
 function odtToMarkdown(bytes, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
 	const pkg = (0, odf_js.decodePackage)(bytes);
-	const content = require_odf_odt_read.readOdtContent(pkg).document;
+	const content = require_odf_odt_read.readOdtContent(pkg);
 	if (content.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
 	require_ports_abort.throwIfAborted(options?.signal);
 	options?.onDocument?.({
@@ -480,7 +481,7 @@ function odmToPdf(bytes, options) {
 			continue;
 		}
 		const chapterPkg = (0, odf_js.decodePackage)(chapterBytes);
-		const chapterContent = require_odf_odt_read.readOdtContent(chapterPkg).document;
+		const chapterContent = require_odf_odt_read.readOdtContent(chapterPkg);
 		if (chapterContent.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
 		chapterSections.push(chapterContent.sections);
 	}
@@ -500,16 +501,17 @@ function odmToPdf(bytes, options) {
 		metadata: (0, odf_js.readOdfMetadata)(pkg),
 		sections: combinedSections
 	};
-	const { document: layout } = require_layout_engine.convertWordprocessingToLayout(content, { measurer: (0, pdf_codec.createStandardFontMeasurer)() });
+	const { document: layout, formulas } = require_layout_engine.convertWordprocessingToLayout(content, { measurer: (0, pdf_codec.createStandardFontMeasurer)() });
 	return (0, pdf_codec.writePdf)(layout, {
 		signal: options?.signal,
-		onSubstitution: options?.onSubstitution
+		onSubstitution: options?.onSubstitution,
+		formulas
 	});
 }
 function odbToXlsx(bytes, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
 	const pkg = (0, odf_js.decodePackage)(bytes);
-	const tables = require_odb_read.readOdbTables(pkg);
+	const tables = require_odb_read.readOdbTables(pkg, { timeZone: options?.timeZone });
 	require_ports_abort.throwIfAborted(options?.signal);
 	const content = require_odb_spreadsheet.odbTablesToSpreadsheetDocument(tables);
 	return (0, ooxml_js.encodePackage)((0, ooxml_js.buildXlsxPackage)(content));
@@ -517,7 +519,7 @@ function odbToXlsx(bytes, options) {
 function odbToCsv(bytes, options) {
 	require_ports_abort.throwIfAborted(options?.signal);
 	const pkg = (0, odf_js.decodePackage)(bytes);
-	const tables = require_odb_read.readOdbTables(pkg);
+	const tables = require_odb_read.readOdbTables(pkg, { timeZone: options?.timeZone });
 	require_ports_abort.throwIfAborted(options?.signal);
 	return require_odb_csv.buildOdbTableCsv(tables, options?.table);
 }

package/dist/convert/convert.d.cts

@@ -1,3 +1,5 @@
+import { n as HsqldbDecodeOptions } from "../rowformat-Cl2exlEh.cjs";
+import { t as OmmlDiagnostic } from "../write-DuyfnbL_.cjs";
 import { ContentSection, DocumentPackage } from "document-schema.js";
 import { OdmSection, Package } from "odf.js";
 import { PdfDiagnosticSink, WinAnsiSubstitution } from "pdf-codec";
@@ -32,6 +34,9 @@ declare function pdfToMarkdown(bytes: Uint8Array<ArrayBuffer>, options?: PdfToDo
 interface DocumentBridgeOptions {
   readonly signal?: AbortSignal;
   readonly onDocument?: (pkg: DocumentPackage) => void;
+  readonly onMathDiagnostic?: (diagnostic: OmmlDiagnostic, context: {
+    readonly sourcePath?: string;
+  }) => void;
 }
 declare function odtToDocx(bytes: Uint8Array<ArrayBuffer>, options?: DocumentBridgeOptions): Uint8Array<ArrayBuffer>;
 declare function docxToOdt(bytes: Uint8Array<ArrayBuffer>, options?: DocumentBridgeOptions): Uint8Array<ArrayBuffer>;
@@ -54,10 +59,11 @@ declare class OdmUnresolvedSectionError extends Error {
 }
 declare function inlineOdmSectionToContentSection(section: OdmSection, pkg: Package): ContentSection;
 declare function odmToPdf(bytes: Uint8Array<ArrayBuffer>, options?: OdmToPdfOptions): Uint8Array<ArrayBuffer>;
-declare function odbToXlsx(bytes: Uint8Array<ArrayBuffer>, options?: DocumentBridgeOptions): Uint8Array<ArrayBuffer>;
-interface OdbToCsvOptions extends DocumentBridgeOptions {
+interface OdbConversionOptions extends DocumentBridgeOptions, HsqldbDecodeOptions {}
+declare function odbToXlsx(bytes: Uint8Array<ArrayBuffer>, options?: OdbConversionOptions): Uint8Array<ArrayBuffer>;
+interface OdbToCsvOptions extends OdbConversionOptions {
   readonly table?: string;
 }
 declare function odbToCsv(bytes: Uint8Array<ArrayBuffer>, options?: OdbToCsvOptions): Uint8Array<ArrayBuffer>;
 //#endregion
-export { DocumentBridgeOptions, DocumentToPdfOptions, OdbToCsvOptions, OdmToPdfOptions, OdmUnresolvedSectionError, PdfToDocumentOptions, docxToMarkdown, docxToOdt, docxToPdf, inlineOdmSectionToContentSection, markdownToDocx, markdownToOdt, markdownToPdf, odbToCsv, odbToXlsx, odfToPdf, odgToPdf, odmToPdf, odpToPdf, odpToPptx, odsToPdf, odsToXlsx, odtToDocx, odtToMarkdown, odtToPdf, pdfToDocx, pdfToMarkdown, pdfToOdg, pdfToOdp, pdfToOds, pdfToOdt, pdfToPptx, pdfToXlsx, pptxToOdp, pptxToPdf, xlsxToOds, xlsxToPdf };
+export { DocumentBridgeOptions, DocumentToPdfOptions, OdbConversionOptions, OdbToCsvOptions, OdmToPdfOptions, OdmUnresolvedSectionError, PdfToDocumentOptions, docxToMarkdown, docxToOdt, docxToPdf, inlineOdmSectionToContentSection, markdownToDocx, markdownToOdt, markdownToPdf, odbToCsv, odbToXlsx, odfToPdf, odgToPdf, odmToPdf, odpToPdf, odpToPptx, odsToPdf, odsToXlsx, odtToDocx, odtToMarkdown, odtToPdf, pdfToDocx, pdfToMarkdown, pdfToOdg, pdfToOdp, pdfToOds, pdfToOdt, pdfToPptx, pdfToXlsx, pptxToOdp, pptxToPdf, xlsxToOds, xlsxToPdf };

package/dist/convert/convert.d.ts

@@ -1,3 +1,5 @@
+import { n as HsqldbDecodeOptions } from "../rowformat-Cl2exlEh.js";
+import { t as OmmlDiagnostic } from "../write-Zqwx6pka.js";
 import { ContentSection, DocumentPackage } from "document-schema.js";
 import { OdmSection, Package } from "odf.js";
 import { PdfDiagnosticSink, WinAnsiSubstitution } from "pdf-codec";
@@ -32,6 +34,9 @@ declare function pdfToMarkdown(bytes: Uint8Array<ArrayBuffer>, options?: PdfToDo
 interface DocumentBridgeOptions {
   readonly signal?: AbortSignal;
   readonly onDocument?: (pkg: DocumentPackage) => void;
+  readonly onMathDiagnostic?: (diagnostic: OmmlDiagnostic, context: {
+    readonly sourcePath?: string;
+  }) => void;
 }
 declare function odtToDocx(bytes: Uint8Array<ArrayBuffer>, options?: DocumentBridgeOptions): Uint8Array<ArrayBuffer>;
 declare function docxToOdt(bytes: Uint8Array<ArrayBuffer>, options?: DocumentBridgeOptions): Uint8Array<ArrayBuffer>;
@@ -54,10 +59,11 @@ declare class OdmUnresolvedSectionError extends Error {
 }
 declare function inlineOdmSectionToContentSection(section: OdmSection, pkg: Package): ContentSection;
 declare function odmToPdf(bytes: Uint8Array<ArrayBuffer>, options?: OdmToPdfOptions): Uint8Array<ArrayBuffer>;
-declare function odbToXlsx(bytes: Uint8Array<ArrayBuffer>, options?: DocumentBridgeOptions): Uint8Array<ArrayBuffer>;
-interface OdbToCsvOptions extends DocumentBridgeOptions {
+interface OdbConversionOptions extends DocumentBridgeOptions, HsqldbDecodeOptions {}
+declare function odbToXlsx(bytes: Uint8Array<ArrayBuffer>, options?: OdbConversionOptions): Uint8Array<ArrayBuffer>;
+interface OdbToCsvOptions extends OdbConversionOptions {
   readonly table?: string;
 }
 declare function odbToCsv(bytes: Uint8Array<ArrayBuffer>, options?: OdbToCsvOptions): Uint8Array<ArrayBuffer>;
 //#endregion
-export { DocumentBridgeOptions, DocumentToPdfOptions, OdbToCsvOptions, OdmToPdfOptions, OdmUnresolvedSectionError, PdfToDocumentOptions, docxToMarkdown, docxToOdt, docxToPdf, inlineOdmSectionToContentSection, markdownToDocx, markdownToOdt, markdownToPdf, odbToCsv, odbToXlsx, odfToPdf, odgToPdf, odmToPdf, odpToPdf, odpToPptx, odsToPdf, odsToXlsx, odtToDocx, odtToMarkdown, odtToPdf, pdfToDocx, pdfToMarkdown, pdfToOdg, pdfToOdp, pdfToOds, pdfToOdt, pdfToPptx, pdfToXlsx, pptxToOdp, pptxToPdf, xlsxToOds, xlsxToPdf };
+export { DocumentBridgeOptions, DocumentToPdfOptions, OdbConversionOptions, OdbToCsvOptions, OdmToPdfOptions, OdmUnresolvedSectionError, PdfToDocumentOptions, docxToMarkdown, docxToOdt, docxToPdf, inlineOdmSectionToContentSection, markdownToDocx, markdownToOdt, markdownToPdf, odbToCsv, odbToXlsx, odfToPdf, odgToPdf, odmToPdf, odpToPdf, odpToPptx, odsToPdf, odsToXlsx, odtToDocx, odtToMarkdown, odtToPdf, pdfToDocx, pdfToMarkdown, pdfToOdg, pdfToOdp, pdfToOds, pdfToOdt, pdfToPptx, pdfToXlsx, pptxToOdp, pptxToPdf, xlsxToOds, xlsxToPdf };

package/dist/convert/convert.js

@@ -51,14 +51,11 @@ function docxToPdf(bytes, options) {
 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 { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createStandardFontMeasurer() });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content: content.document,
+		content,
 		layout
 	});
 	return writePdf(layout, {
@@ -71,7 +68,7 @@ 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 { document: layout, formulas } = convertPresentationToLayout(content, { measurer: createStandardFontMeasurer() });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
 		content,
@@ -79,20 +76,18 @@ function pptxToPdf(bytes, options) {
 	});
 	return writePdf(layout, {
 		signal: options?.signal,
-		onSubstitution: options?.onSubstitution
+		onSubstitution: options?.onSubstitution,
+		formulas
 	});
 }
 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 { document: layout, formulas } = convertPresentationToLayout(content, { measurer: createStandardFontMeasurer() });
 	options?.onDocument?.({
 		formatVersion: DOCUMENT_PACKAGE_FORMAT_VERSION,
-		content: content.document,
+		content,
 		layout
 	});
 	return writePdf(layout, {
@@ -156,9 +151,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 +167,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 +175,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 +286,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 +310,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 +365,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 +395,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?.({
@@ -479,7 +480,7 @@ function odmToPdf(bytes, options) {
 			continue;
 		}
 		const chapterPkg = decodePackage$1(chapterBytes);
-		const chapterContent = readOdtContent(chapterPkg).document;
+		const chapterContent = readOdtContent(chapterPkg);
 		if (chapterContent.kind !== "wordprocessing") throw new Error("readOdtContent returned a non-wordprocessing ContentDocument");
 		chapterSections.push(chapterContent.sections);
 	}
@@ -499,16 +500,17 @@ function odmToPdf(bytes, options) {
 		metadata: readOdfMetadata(pkg),
 		sections: combinedSections
 	};
-	const { document: layout } = convertWordprocessingToLayout(content, { measurer: createStandardFontMeasurer() });
+	const { document: layout, formulas } = convertWordprocessingToLayout(content, { measurer: createStandardFontMeasurer() });
 	return writePdf(layout, {
 		signal: options?.signal,
-		onSubstitution: options?.onSubstitution
+		onSubstitution: options?.onSubstitution,
+		formulas
 	});
 }
 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 +518,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/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 };