js.documents 7.18.5 → 7.19.1

package/dist/convert/composition-to-pdf.cjs

@@ -22,6 +22,7 @@ function executeToPdf(format, bytes, options) {
 	if (!require_convert_composition.LAYOUT_CAPABLE.has(format)) throw new Error(`executeToPdf: '${format}' has no layout engine of its own`);
 	let content;
 	let fonts;
+	let sourceFaces;
 	if (require_convert_composition.isReadOnlyContentFormat(format)) {
 		require_ports_abort.throwIfAborted(options?.signal);
 		const read = require_convert_composition.READ_ONLY_FORMAT_NODES[format].read(bytes, options);
@@ -69,10 +70,11 @@ function executeToPdf(format, bytes, options) {
 			fonts: options?.fonts,
 			onFontSubstitution: options?.onFontSubstitution
 		});
+		sourceFaces = require_fonts_registry.treeEmbeddedFontsOf(fontSource);
 	}
-	return renderToPdf(content, fonts, options);
+	return renderToPdf(content, fonts, options, sourceFaces);
 }
-function renderToPdf(content, fonts, options) {
+function renderToPdf(content, fonts, options, sourceFaces) {
 	const measurer = (0, pdf_codec.createFontMeasurer)(fonts);
 	let layout;
 	let pages;
@@ -123,7 +125,7 @@ function renderToPdf(content, fonts, options) {
 			onSubstitution: options?.onSubstitution,
 			fonts
 		});
-		options?.onDocument?.((0, document_schema_js.assembleTree)(content, pages));
+		options?.onDocument?.(reportTree(content, pages, sourceFaces));
 		return out;
 	}
 	const out = (0, pdf_codec.writePdf)(layout, {
@@ -132,9 +134,16 @@ function renderToPdf(content, fonts, options) {
 		formulas,
 		fonts
 	});
-	options?.onDocument?.((0, document_schema_js.assembleTree)(content, pages));
+	options?.onDocument?.(reportTree(content, pages, sourceFaces));
 	return out;
 }
+function reportTree(content, pages, sourceFaces) {
+	const tree = (0, document_schema_js.assembleTree)(content, pages);
+	return sourceFaces === void 0 ? tree : {
+		...tree,
+		fonts: sourceFaces
+	};
+}
 function convertDocument(source, target, bytes, options) {
 	const plan = require_convert_composition.resolveCompositionPlan(source, target);
 	if (plan === void 0) throw new require_convert_capability.UnsupportedConversionError(source, target);

package/dist/convert/composition-to-pdf.js

@@ -1,5 +1,5 @@
 import { resolveMetadataTimestamps } from "../model/metadata.js";
-import { createDocumentFontRegistry } from "../fonts/registry.js";
+import { createDocumentFontRegistry, treeEmbeddedFontsOf } from "../fonts/registry.js";
 import { convertWordprocessingToLayout } from "../layout/engine.js";
 import { convertPresentationToLayout } from "../layout/slides.js";
 import { throwIfAborted } from "../ports/abort.js";
@@ -21,6 +21,7 @@ function executeToPdf(format, bytes, options) {
 	if (!LAYOUT_CAPABLE.has(format)) throw new Error(`executeToPdf: '${format}' has no layout engine of its own`);
 	let content;
 	let fonts;
+	let sourceFaces;
 	if (isReadOnlyContentFormat(format)) {
 		throwIfAborted(options?.signal);
 		const read = READ_ONLY_FORMAT_NODES[format].read(bytes, options);
@@ -68,10 +69,11 @@ function executeToPdf(format, bytes, options) {
 			fonts: options?.fonts,
 			onFontSubstitution: options?.onFontSubstitution
 		});
+		sourceFaces = treeEmbeddedFontsOf(fontSource);
 	}
-	return renderToPdf(content, fonts, options);
+	return renderToPdf(content, fonts, options, sourceFaces);
 }
-function renderToPdf(content, fonts, options) {
+function renderToPdf(content, fonts, options, sourceFaces) {
 	const measurer = createFontMeasurer(fonts);
 	let layout;
 	let pages;
@@ -122,7 +124,7 @@ function renderToPdf(content, fonts, options) {
 			onSubstitution: options?.onSubstitution,
 			fonts
 		});
-		options?.onDocument?.(assembleTree(content, pages));
+		options?.onDocument?.(reportTree(content, pages, sourceFaces));
 		return out;
 	}
 	const out = writePdf(layout, {
@@ -131,9 +133,16 @@ function renderToPdf(content, fonts, options) {
 		formulas,
 		fonts
 	});
-	options?.onDocument?.(assembleTree(content, pages));
+	options?.onDocument?.(reportTree(content, pages, sourceFaces));
 	return out;
 }
+function reportTree(content, pages, sourceFaces) {
+	const tree = assembleTree(content, pages);
+	return sourceFaces === void 0 ? tree : {
+		...tree,
+		fonts: sourceFaces
+	};
+}
 function convertDocument(source, target, bytes, options) {
 	const plan = resolveCompositionPlan(source, target);
 	if (plan === void 0) throw new UnsupportedConversionError(source, target);

package/dist/convert/convert.d.cts

@@ -3,7 +3,7 @@ import { i as SvgDiagnosticSink } from "../diagnostics-DVAXKgcf.cjs";
 import { i as CellTypeInferenceSink } from "../cell-typing-BQ-xQ5X5.cjs";
 import { t as OmmlDiagnostic } from "../shared-c0Lp3_iY.cjs";
 import { n as HsqldbDecodeOptions } from "../rowformat-Cl2exlEh.cjs";
-import { t as DocumentFontRegistryOptions } from "../registry-Bs4IHqVQ.cjs";
+import { t as DocumentFontRegistryOptions } from "../registry-ChR2F9dJ.cjs";
 import { ContentDocument, ContentSection, DocumentTree } from "document-schema.js";
 import { PdfDiagnosticSink, WinAnsiSubstitution } from "pdf-codec";
 import { MarkdownImageResolver } from "markdown-codec";

package/dist/convert/convert.d.ts

@@ -3,7 +3,7 @@ import { i as SvgDiagnosticSink } from "../diagnostics-DVAXKgcf.js";
 import { i as CellTypeInferenceSink } from "../cell-typing-BQ-xQ5X5.js";
 import { t as OmmlDiagnostic } from "../shared-DHu5jDJf.js";
 import { n as HsqldbDecodeOptions } from "../rowformat-Cl2exlEh.js";
-import { t as DocumentFontRegistryOptions } from "../registry-913jEe6-.js";
+import { t as DocumentFontRegistryOptions } from "../registry-BrXpPnGF.js";
 import { ContentDocument, ContentSection, DocumentTree } from "document-schema.js";
 import { PdfDiagnosticSink, WinAnsiSubstitution } from "pdf-codec";
 import { OdmSection, Package } from "odf.js";

package/dist/convert/from-package.cjs

@@ -9,6 +9,7 @@ require("../layout/sheets.cjs");
 const require_layout_drawing = require("../layout/drawing.cjs");
 const require_convert_capability = require("./capability.cjs");
 const require_codecs_registry = require("../codecs/registry.cjs");
+let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
 let pdf_codec = require("pdf-codec");
 //#region src/convert/from-package.ts
@@ -231,7 +232,12 @@ function packageToLayout(pkg) {
 		heightPt: page.heightPt,
 		items: []
 	}));
-	const fonts = (0, pdf_codec.createFontRegistry)({});
+	const fonts = pkg.fonts !== void 0 && pkg.fonts.length > 0 ? (0, pdf_codec.createFontRegistry)({ sourceFonts: pkg.fonts.map((face) => ({
+		family: face.family,
+		bold: face.bold,
+		italic: face.italic,
+		bytes: require_model_bytes.requireArrayBufferBytes((0, ooxml_js.base64ToBytes)(face.base64))
+	})) }) : (0, pdf_codec.createFontRegistry)({});
 	const state = {
 		pages,
 		images: {},

package/dist/convert/from-package.js

@@ -8,6 +8,7 @@ import "../layout/sheets.js";
 import { convertVector } from "../layout/drawing.js";
 import { READ_ONLY_FORMATS } from "./capability.js";
 import { DOCUMENT_FORMAT_CODECS } from "../codecs/registry.js";
+import { base64ToBytes } from "ooxml.js";
 import { COLOR_BLACK, DEFAULT_LAYOUT_FONT, flattenTree, resolveCellFillColor } from "document-schema.js";
 import { LAYOUT_FORMAT_VERSION, createFontMeasurer, createFontRegistry, loadMathFont, writePdf } from "pdf-codec";
 //#region src/convert/from-package.ts
@@ -230,7 +231,12 @@ function packageToLayout(pkg) {
 		heightPt: page.heightPt,
 		items: []
 	}));
-	const fonts = createFontRegistry({});
+	const fonts = pkg.fonts !== void 0 && pkg.fonts.length > 0 ? createFontRegistry({ sourceFonts: pkg.fonts.map((face) => ({
+		family: face.family,
+		bold: face.bold,
+		italic: face.italic,
+		bytes: requireArrayBufferBytes(base64ToBytes(face.base64))
+	})) }) : createFontRegistry({});
 	const state = {
 		pages,
 		images: {},

package/dist/fonts/registry.cjs

@@ -1,11 +1,22 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_fonts_odf = require("./odf.cjs");
 const require_fonts_ooxml = require("./ooxml.cjs");
+let ooxml_js = require("ooxml.js");
 let pdf_codec = require("pdf-codec");
 //#region src/fonts/registry.ts
 function extractSourceFonts(source) {
 	return source.kind === "odf" ? require_fonts_odf.extractOdfEmbeddedFonts(source.package) : require_fonts_ooxml.extractOoxmlEmbeddedFonts(source.package, source.kind);
 }
+function treeEmbeddedFontsOf(source) {
+	const faces = extractSourceFonts(source);
+	if (faces.length === 0) return;
+	return faces.map((face) => ({
+		family: face.family,
+		bold: face.bold,
+		italic: face.italic,
+		base64: (0, ooxml_js.bytesToBase64)(face.bytes)
+	}));
+}
 function createDocumentFontRegistry(source, options) {
 	return (0, pdf_codec.createFontRegistry)({
 		sourceFonts: extractSourceFonts(source),
@@ -16,3 +27,4 @@ function createDocumentFontRegistry(source, options) {
 //#endregion
 exports.createDocumentFontRegistry = createDocumentFontRegistry;
 exports.extractSourceFonts = extractSourceFonts;
+exports.treeEmbeddedFontsOf = treeEmbeddedFontsOf;

package/dist/fonts/registry.d.cts

@@ -1,2 +1,2 @@
-import { i as extractSourceFonts, n as FontSourcePackage, r as createDocumentFontRegistry, t as DocumentFontRegistryOptions } from "../registry-Bs4IHqVQ.cjs";
-export { DocumentFontRegistryOptions, FontSourcePackage, createDocumentFontRegistry, extractSourceFonts };
+import { a as treeEmbeddedFontsOf, i as extractSourceFonts, n as FontSourcePackage, r as createDocumentFontRegistry, t as DocumentFontRegistryOptions } from "../registry-ChR2F9dJ.cjs";
+export { DocumentFontRegistryOptions, FontSourcePackage, createDocumentFontRegistry, extractSourceFonts, treeEmbeddedFontsOf };

package/dist/fonts/registry.d.ts

@@ -1,2 +1,2 @@
-import { i as extractSourceFonts, n as FontSourcePackage, r as createDocumentFontRegistry, t as DocumentFontRegistryOptions } from "../registry-913jEe6-.js";
-export { DocumentFontRegistryOptions, FontSourcePackage, createDocumentFontRegistry, extractSourceFonts };
+import { a as treeEmbeddedFontsOf, i as extractSourceFonts, n as FontSourcePackage, r as createDocumentFontRegistry, t as DocumentFontRegistryOptions } from "../registry-BrXpPnGF.js";
+export { DocumentFontRegistryOptions, FontSourcePackage, createDocumentFontRegistry, extractSourceFonts, treeEmbeddedFontsOf };

package/dist/fonts/registry.js

@@ -1,10 +1,21 @@
 import { extractOdfEmbeddedFonts } from "./odf.js";
 import { extractOoxmlEmbeddedFonts } from "./ooxml.js";
+import { bytesToBase64 } from "ooxml.js";
 import { createFontRegistry } from "pdf-codec";
 //#region src/fonts/registry.ts
 function extractSourceFonts(source) {
 	return source.kind === "odf" ? extractOdfEmbeddedFonts(source.package) : extractOoxmlEmbeddedFonts(source.package, source.kind);
 }
+function treeEmbeddedFontsOf(source) {
+	const faces = extractSourceFonts(source);
+	if (faces.length === 0) return;
+	return faces.map((face) => ({
+		family: face.family,
+		bold: face.bold,
+		italic: face.italic,
+		base64: bytesToBase64(face.bytes)
+	}));
+}
 function createDocumentFontRegistry(source, options) {
 	return createFontRegistry({
 		sourceFonts: extractSourceFonts(source),
@@ -13,4 +24,4 @@ function createDocumentFontRegistry(source, options) {
 	});
 }
 //#endregion
-export { createDocumentFontRegistry, extractSourceFonts };
+export { createDocumentFontRegistry, extractSourceFonts, treeEmbeddedFontsOf };

package/dist/index.d.cts

@@ -8,7 +8,7 @@ import { n as OmmlDiagnosticKind, t as OmmlDiagnostic } from "./shared-c0Lp3_iY.
 import { CompositionHop, ConversionPlan, UnifiedConversionOptions, resolveCompositionPlan } from "./convert/composition.cjs";
 import { convertDocument } from "./convert/composition-to-pdf.cjs";
 import { n as HsqldbDecodeOptions, r as HsqldbRowFormatError } from "./rowformat-Cl2exlEh.cjs";
-import { i as extractSourceFonts, n as FontSourcePackage, r as createDocumentFontRegistry, t as DocumentFontRegistryOptions } from "./registry-Bs4IHqVQ.cjs";
+import { i as extractSourceFonts, n as FontSourcePackage, r as createDocumentFontRegistry, t as DocumentFontRegistryOptions } from "./registry-ChR2F9dJ.cjs";
 import { CsvReadOptions, CsvWriteOptions, DocumentBridgeOptions, DocumentToPdfOptions, OdbConversionOptions, OdbReportToDocxOptions, OdbReportToOdtOptions, OdbToCsvOptions, OdmToPdfOptions, OdmUnresolvedSectionError, SvgReadOptions, SvgWriteOptions, csvToMarkdown, csvToOds, csvToPdf, csvToXlsx, docToPdf, docxToMarkdown, docxToOdt, docxToPdf, docxToPptx, epubToPdf, markdownToCsv, markdownToDocx, markdownToOdt, markdownToPdf, markdownToXlsx, odbReportToDocx, odbReportToOdt, odbReportToPdf, odbToCsv, odbToXlsx, odfToPdf, odgToPdf, odgToSvg, odmToPdf, odpToOdt, odpToPdf, odpToPptx, odsToCsv, odsToPdf, odsToXlsx, odtToDocx, odtToMarkdown, odtToOdp, odtToPdf, pptToPdf, pptxToDocx, pptxToOdp, pptxToPdf, rtfToPdf, svgToOdg, svgToPdf, xlsToPdf, xlsxToCsv, xlsxToMarkdown, xlsxToOds, xlsxToPdf } from "./convert/convert.cjs";
 import { UnsupportedFontSourceFormatError, extractSourceFontsForFormat } from "./convert/document-fonts.cjs";
 import { buildDocumentBytes, layoutDocumentFromPackage } from "./convert/from-package.cjs";

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { n as OmmlDiagnosticKind, t as OmmlDiagnostic } from "./shared-DHu5jDJf.
 import { CompositionHop, ConversionPlan, UnifiedConversionOptions, resolveCompositionPlan } from "./convert/composition.js";
 import { convertDocument } from "./convert/composition-to-pdf.js";
 import { n as HsqldbDecodeOptions, r as HsqldbRowFormatError } from "./rowformat-Cl2exlEh.js";
-import { i as extractSourceFonts, n as FontSourcePackage, r as createDocumentFontRegistry, t as DocumentFontRegistryOptions } from "./registry-913jEe6-.js";
+import { i as extractSourceFonts, n as FontSourcePackage, r as createDocumentFontRegistry, t as DocumentFontRegistryOptions } from "./registry-BrXpPnGF.js";
 import { CsvReadOptions, CsvWriteOptions, DocumentBridgeOptions, DocumentToPdfOptions, OdbConversionOptions, OdbReportToDocxOptions, OdbReportToOdtOptions, OdbToCsvOptions, OdmToPdfOptions, OdmUnresolvedSectionError, SvgReadOptions, SvgWriteOptions, csvToMarkdown, csvToOds, csvToPdf, csvToXlsx, docToPdf, docxToMarkdown, docxToOdt, docxToPdf, docxToPptx, epubToPdf, markdownToCsv, markdownToDocx, markdownToOdt, markdownToPdf, markdownToXlsx, odbReportToDocx, odbReportToOdt, odbReportToPdf, odbToCsv, odbToXlsx, odfToPdf, odgToPdf, odgToSvg, odmToPdf, odpToOdt, odpToPdf, odpToPptx, odsToCsv, odsToPdf, odsToXlsx, odtToDocx, odtToMarkdown, odtToOdp, odtToPdf, pptToPdf, pptxToDocx, pptxToOdp, pptxToPdf, rtfToPdf, svgToOdg, svgToPdf, xlsToPdf, xlsxToCsv, xlsxToMarkdown, xlsxToOds, xlsxToPdf } from "./convert/convert.js";
 import { UnsupportedFontSourceFormatError, extractSourceFontsForFormat } from "./convert/document-fonts.js";
 import { buildDocumentBytes, layoutDocumentFromPackage } from "./convert/from-package.js";

package/dist/{registry-913jEe6-.d.ts → registry-BrXpPnGF.d.ts}

@@ -1,5 +1,5 @@
 import { Package } from "ooxml.js";
-import { FontSubstitution, ProvidedFont } from "document-schema.js";
+import { FontSubstitution, ProvidedFont, TreeEmbeddedFont } from "document-schema.js";
 import { FontRegistry } from "pdf-codec";
 import { Package as Package$1 } from "odf.js";
 //#region src/fonts/registry.d.ts
@@ -15,6 +15,7 @@ interface DocumentFontRegistryOptions {
   readonly onFontSubstitution?: (substitution: FontSubstitution) => void;
 }
 declare function extractSourceFonts(source: FontSourcePackage): ProvidedFont[];
+declare function treeEmbeddedFontsOf(source: FontSourcePackage): TreeEmbeddedFont[] | undefined;
 declare function createDocumentFontRegistry(source: FontSourcePackage, options?: DocumentFontRegistryOptions): FontRegistry;
 //#endregion
-export { extractSourceFonts as i, FontSourcePackage as n, createDocumentFontRegistry as r, DocumentFontRegistryOptions as t };
+export { treeEmbeddedFontsOf as a, extractSourceFonts as i, FontSourcePackage as n, createDocumentFontRegistry as r, DocumentFontRegistryOptions as t };

package/dist/{registry-Bs4IHqVQ.d.cts → registry-ChR2F9dJ.d.cts}

@@ -1,4 +1,4 @@
-import { FontSubstitution, ProvidedFont } from "document-schema.js";
+import { FontSubstitution, ProvidedFont, TreeEmbeddedFont } from "document-schema.js";
 import { FontRegistry } from "pdf-codec";
 import { Package } from "ooxml.js";
 import { Package as Package$1 } from "odf.js";
@@ -15,6 +15,7 @@ interface DocumentFontRegistryOptions {
   readonly onFontSubstitution?: (substitution: FontSubstitution) => void;
 }
 declare function extractSourceFonts(source: FontSourcePackage): ProvidedFont[];
+declare function treeEmbeddedFontsOf(source: FontSourcePackage): TreeEmbeddedFont[] | undefined;
 declare function createDocumentFontRegistry(source: FontSourcePackage, options?: DocumentFontRegistryOptions): FontRegistry;
 //#endregion
-export { extractSourceFonts as i, FontSourcePackage as n, createDocumentFontRegistry as r, DocumentFontRegistryOptions as t };
+export { treeEmbeddedFontsOf as a, extractSourceFonts as i, FontSourcePackage as n, createDocumentFontRegistry as r, DocumentFontRegistryOptions as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "7.18.5",
+  "version": "7.19.1",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -77,21 +77,21 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "archive-codec": "1.10.8",
-    "byte-codec": "1.4.2",
-    "doc-codec": "2.8.6",
-    "document-schema.js": "7.10.0",
-    "epub-codec": "1.4.0",
+    "archive-codec": "1.11.0",
+    "byte-codec": "1.5.0",
+    "doc-codec": "2.9.0",
+    "document-schema.js": "7.11.0",
+    "epub-codec": "1.5.0",
     "fflate": "0.8.3",
-    "markdown-codec": "6.6.7",
-    "odf.js": "7.24.5",
-    "ooxml.js": "8.12.0",
-    "pdf-codec": "4.6.0",
-    "ppt-codec": "1.4.11",
-    "rtf-codec": "4.3.0",
+    "markdown-codec": "6.7.0",
+    "odf.js": "7.25.0",
+    "ooxml.js": "8.14.0",
+    "pdf-codec": "4.7.0",
+    "ppt-codec": "1.6.0",
+    "rtf-codec": "4.4.0",
     "temml": "0.13.4",
-    "wpd-codec": "3.4.6",
-    "xls-codec": "4.13.0",
+    "wpd-codec": "3.5.0",
+    "xls-codec": "4.14.0",
     "zod": "4.4.3"
   },
   "devDependencies": {