pdf-parser.js 3.0.8 → 4.5.2

package/dist/content-write.js

@@ -1,9 +1,9 @@
-import { o as encodeForShow } from "./afm-widths-Dxucrg7D.js";
-import { ByteWriter } from "./bytes/writer.js";
+import { h as encodeForShow } from "./afm-widths-De_QMWgC.js";
 import { pdfArray, pdfHexString, pdfNum } from "./objects.js";
+import { ByteWriter } from "./bytes/writer.js";
+import { formatNumber, writeObject } from "./serialize.js";
 import { BEZIER_KAPPA, multiplyMatrices, rotationMatrix, scaleMatrix, translationMatrix } from "./matrix.js";
 import { encodeForShowEmbedded } from "./embedded-font.js";
-import { formatNumber, writeObject } from "./serialize.js";
 //#region src/content-write.ts
 const GLYPH_SPACE_UNITS_PER_EM = 1e3;
 const EMBEDDED_HORIZONTAL_SCALE_PERCENT = 100;
@@ -312,16 +312,38 @@ function writeContentStream(items, context) {
 	const writer = new ByteWriter();
 	const substitutions = [];
 	const missingGlyphs = [];
-	for (const item of items) if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
-	else if (item.kind === "image") writeImage(writer, item, context);
-	else if (item.kind === "rect") writeRect(writer, item);
-	else if (item.kind === "line") writeLine(writer, item);
-	else if (item.kind === "ellipse") writeEllipse(writer, item);
-	else if (item.kind === "path") writePath(writer, item);
+	const markedStructure = [];
+	for (const item of items) {
+		const itemLayer = "layer" in item ? item.layer : void 0;
+		const itemStructure = "structure" in item ? item.structure : void 0;
+		const layerObjectNum = itemLayer !== void 0 ? context.layerObjectNumberOf?.(itemLayer) : void 0;
+		const marked = itemStructure !== void 0 || layerObjectNum !== void 0;
+		if (marked) {
+			writer.writeAscii("/P <<");
+			if (itemStructure !== void 0 && context.nextMcid !== void 0) {
+				const mcid = context.nextMcid();
+				markedStructure.push({
+					mcid,
+					structureId: itemStructure
+				});
+				writer.writeAscii(` /MCID ${mcid}`);
+			}
+			if (layerObjectNum !== void 0) writer.writeAscii(` /OC ${layerObjectNum} 0 R`);
+			writer.writeAscii(" >> BDC\n");
+		}
+		if (item.kind === "text") writeText(writer, item, context, substitutions, missingGlyphs);
+		else if (item.kind === "image") writeImage(writer, item, context);
+		else if (item.kind === "rect") writeRect(writer, item);
+		else if (item.kind === "line") writeLine(writer, item);
+		else if (item.kind === "ellipse") writeEllipse(writer, item);
+		else if (item.kind === "path") writePath(writer, item);
+		if (marked) writer.writeAscii("EMC\n");
+	}
 	return {
 		bytes: writer.toBytes(),
 		substitutions,
-		missingGlyphs
+		missingGlyphs,
+		markedStructure
 	};
 }
 //#endregion

package/dist/crypto/random.cjs

@@ -0,0 +1,9 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/crypto/random.ts
+function randomBytes(length) {
+	const bytes = new Uint8Array(length);
+	globalThis.crypto.getRandomValues(bytes);
+	return bytes;
+}
+//#endregion
+exports.randomBytes = randomBytes;

package/dist/crypto/random.d.cts

@@ -0,0 +1,4 @@
+//#region src/crypto/random.d.ts
+declare function randomBytes(length: number): Uint8Array<ArrayBuffer>;
+//#endregion
+export { randomBytes };

package/dist/crypto/random.d.ts

@@ -0,0 +1,4 @@
+//#region src/crypto/random.d.ts
+declare function randomBytes(length: number): Uint8Array<ArrayBuffer>;
+//#endregion
+export { randomBytes };

package/dist/crypto/random.js

@@ -0,0 +1,8 @@
+//#region src/crypto/random.ts
+function randomBytes(length) {
+	const bytes = new Uint8Array(length);
+	globalThis.crypto.getRandomValues(bytes);
+	return bytes;
+}
+//#endregion
+export { randomBytes };

package/dist/diagnostics.d.cts

@@ -1,5 +1,5 @@
 //#region src/diagnostics.d.ts
-type PdfDiagnosticSeverity = 'info' | 'warning';
+type PdfDiagnosticSeverity = "info" | "warning";
 interface PdfDiagnostic {
   readonly code: string;
   readonly severity: PdfDiagnosticSeverity;

package/dist/diagnostics.d.ts

@@ -1,5 +1,5 @@
 //#region src/diagnostics.d.ts
-type PdfDiagnosticSeverity = 'info' | 'warning';
+type PdfDiagnosticSeverity = "info" | "warning";
 interface PdfDiagnostic {
   readonly code: string;
   readonly severity: PdfDiagnosticSeverity;

package/dist/document.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_objects = require("./objects.cjs");
 const require_bytes_reader = require("./bytes/reader.cjs");
+const require_filters = require("./filters.cjs");
 const require_lexer = require("./lexer.cjs");
 const require_diagnostics = require("./diagnostics.cjs");
-const require_objects = require("./objects.cjs");
 const require_encrypt = require("./encrypt.cjs");
-const require_filters = require("./filters.cjs");
 const require_parse = require("./parse.cjs");
 const require_xref = require("./xref.cjs");
 //#region src/document.ts
@@ -150,10 +150,12 @@ function openPdfDocument(bytes, sink) {
 		decryptor = require_encrypt.createStandardDecryptor(encryptDict, firstFileId(xref.trailer), sink);
 	}
 	const catalog = requireCatalog(resolveDict(require_objects.dictGet(xref.trailer, "Root")));
+	const originalLeaves = /* @__PURE__ */ new Map();
 	function pages() {
 		const pagesRoot = resolveDict(require_objects.dictGet(catalog, "Pages"));
 		if (pagesRoot === void 0) return [];
 		const result = [];
+		originalLeaves.clear();
 		walkPageTree(pagesRoot, {}, /* @__PURE__ */ new Set(), result);
 		return result;
 	}
@@ -176,6 +178,7 @@ function openPdfDocument(bytes, sink) {
 		if (kids === void 0) {
 			const entries = new Map(node.entries);
 			for (const key of INHERITABLE_PAGE_KEYS) if (!entries.has(key) && merged[key] !== void 0) entries.set(key, merged[key]);
+			originalLeaves.set(node, result.length);
 			result.push({
 				kind: "dict",
 				entries
@@ -187,11 +190,17 @@ function openPdfDocument(bytes, sink) {
 			if (kidDict !== void 0) walkPageTree(kidDict, merged, visited, result);
 		}
 	}
+	function pageIndex(obj) {
+		const dict = require_objects.asDict(resolve(obj));
+		return dict !== void 0 ? originalLeaves.get(dict) : void 0;
+	}
 	return {
 		trailer: xref.trailer,
+		catalog,
 		resolve,
 		resolveDict,
-		pages
+		pages,
+		pageIndex
 	};
 }
 //#endregion

package/dist/document.d.cts

@@ -1,11 +1,13 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { PdfDict, PdfObject } from "./objects.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
 //#region src/document.d.ts
 interface PdfDocument {
   readonly trailer: PdfDict;
+  readonly catalog: PdfDict;
   resolve(obj: PdfObject | undefined): PdfObject | undefined;
   resolveDict(obj: PdfObject | undefined): PdfDict | undefined;
   pages(): PdfDict[];
+  pageIndex(obj: PdfObject | undefined): number | undefined;
 }
 declare function openPdfDocument(bytes: Uint8Array<ArrayBuffer>, sink: PdfDiagnosticSink): PdfDocument;
 //#endregion

package/dist/document.d.ts

@@ -1,11 +1,13 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { PdfDict, PdfObject } from "./objects.js";
+import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
 //#region src/document.d.ts
 interface PdfDocument {
   readonly trailer: PdfDict;
+  readonly catalog: PdfDict;
   resolve(obj: PdfObject | undefined): PdfObject | undefined;
   resolveDict(obj: PdfObject | undefined): PdfDict | undefined;
   pages(): PdfDict[];
+  pageIndex(obj: PdfObject | undefined): number | undefined;
 }
 declare function openPdfDocument(bytes: Uint8Array<ArrayBuffer>, sink: PdfDiagnosticSink): PdfDocument;
 //#endregion

package/dist/document.js

@@ -1,9 +1,9 @@
+import { asArray, asDict, asNumber, dictGet, isName, pdfNull } from "./objects.js";
 import { ByteReader } from "./bytes/reader.js";
+import { decodeStream } from "./filters.js";
 import { nextToken } from "./lexer.js";
 import { PdfEncryptedError, PdfParseError } from "./diagnostics.js";
-import { asArray, asDict, asNumber, dictGet, isName, pdfNull } from "./objects.js";
 import { createStandardDecryptor } from "./encrypt.js";
-import { decodeStream } from "./filters.js";
 import { parseIndirectObject, parseValue } from "./parse.js";
 import { readXref } from "./xref.js";
 //#region src/document.ts
@@ -149,10 +149,12 @@ function openPdfDocument(bytes, sink) {
 		decryptor = createStandardDecryptor(encryptDict, firstFileId(xref.trailer), sink);
 	}
 	const catalog = requireCatalog(resolveDict(dictGet(xref.trailer, "Root")));
+	const originalLeaves = /* @__PURE__ */ new Map();
 	function pages() {
 		const pagesRoot = resolveDict(dictGet(catalog, "Pages"));
 		if (pagesRoot === void 0) return [];
 		const result = [];
+		originalLeaves.clear();
 		walkPageTree(pagesRoot, {}, /* @__PURE__ */ new Set(), result);
 		return result;
 	}
@@ -175,6 +177,7 @@ function openPdfDocument(bytes, sink) {
 		if (kids === void 0) {
 			const entries = new Map(node.entries);
 			for (const key of INHERITABLE_PAGE_KEYS) if (!entries.has(key) && merged[key] !== void 0) entries.set(key, merged[key]);
+			originalLeaves.set(node, result.length);
 			result.push({
 				kind: "dict",
 				entries
@@ -186,11 +189,17 @@ function openPdfDocument(bytes, sink) {
 			if (kidDict !== void 0) walkPageTree(kidDict, merged, visited, result);
 		}
 	}
+	function pageIndex(obj) {
+		const dict = asDict(resolve(obj));
+		return dict !== void 0 ? originalLeaves.get(dict) : void 0;
+	}
 	return {
 		trailer: xref.trailer,
+		catalog,
 		resolve,
 		resolveDict,
-		pages
+		pages,
+		pageIndex
 	};
 }
 //#endregion

package/dist/{embedded-font-fREdbxnr.d.ts → embedded-font-B4p9a3O3.d.ts}

@@ -1,4 +1,5 @@
 import { t as SfntFont } from "./sfnt-V08bb5ut.js";
+import { t as GsubShaper } from "./gsub-table-BRTQ8EUW.js";
 //#region src/embedded-font.d.ts
 declare const NOTDEF_GLYPH_ID = 0;
 interface EmbeddedFaceMetrics {
@@ -27,6 +28,7 @@ interface EmbeddedFace {
   glyphId(codePoint: number): number | undefined;
   glyphSpaceWidth(glyphId: number): number;
   kernGlyphSpace(leftGlyphId: number, rightGlyphId: number): number;
+  readonly gsubShaper: GsubShaper | undefined;
 }
 declare function loadEmbeddedFace(font: SfntFont): EmbeddedFace | undefined;
 interface EmbeddedFaceSubstitution {
@@ -43,6 +45,6 @@ interface EmbeddedShow {
   readonly kerns: readonly EmbeddedKern[];
 }
 declare function encodeForShowEmbedded(text: string, face: EmbeddedFace): EmbeddedShow;
-declare function collectEmbeddedGlyphs(texts: Iterable<string>, face: EmbeddedFace): ReadonlyMap<number, number>;
+declare function collectEmbeddedGlyphs(texts: Iterable<string>, face: EmbeddedFace): ReadonlyMap<number, readonly number[]>;
 //#endregion
 export { EmbeddedShow as a, encodeForShowEmbedded as c, EmbeddedKern as i, loadEmbeddedFace as l, EmbeddedFaceMetrics as n, NOTDEF_GLYPH_ID as o, EmbeddedFaceSubstitution as r, collectEmbeddedGlyphs as s, EmbeddedFace as t };

package/dist/{embedded-font-BU6Jgcof.d.cts → embedded-font-oc65VGlr.d.cts}

@@ -1,4 +1,5 @@
 import { t as SfntFont } from "./sfnt-V08bb5ut.cjs";
+import { t as GsubShaper } from "./gsub-table-URczLd85.cjs";
 //#region src/embedded-font.d.ts
 declare const NOTDEF_GLYPH_ID = 0;
 interface EmbeddedFaceMetrics {
@@ -27,6 +28,7 @@ interface EmbeddedFace {
   glyphId(codePoint: number): number | undefined;
   glyphSpaceWidth(glyphId: number): number;
   kernGlyphSpace(leftGlyphId: number, rightGlyphId: number): number;
+  readonly gsubShaper: GsubShaper | undefined;
 }
 declare function loadEmbeddedFace(font: SfntFont): EmbeddedFace | undefined;
 interface EmbeddedFaceSubstitution {
@@ -43,6 +45,6 @@ interface EmbeddedShow {
   readonly kerns: readonly EmbeddedKern[];
 }
 declare function encodeForShowEmbedded(text: string, face: EmbeddedFace): EmbeddedShow;
-declare function collectEmbeddedGlyphs(texts: Iterable<string>, face: EmbeddedFace): ReadonlyMap<number, number>;
+declare function collectEmbeddedGlyphs(texts: Iterable<string>, face: EmbeddedFace): ReadonlyMap<number, readonly number[]>;
 //#endregion
 export { EmbeddedShow as a, encodeForShowEmbedded as c, EmbeddedKern as i, loadEmbeddedFace as l, EmbeddedFaceMetrics as n, NOTDEF_GLYPH_ID as o, EmbeddedFaceSubstitution as r, collectEmbeddedGlyphs as s, EmbeddedFace as t };

package/dist/embedded-font-write.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_bytes_crc32 = require("./bytes/crc32.cjs");
 const require_objects = require("./objects.cjs");
 const require_bytes_flate = require("./bytes/flate.cjs");
+const require_bytes_crc32 = require("./bytes/crc32.cjs");
 const require_tounicode = require("./tounicode.cjs");
 //#region src/embedded-font-write.ts
 const FLAG_SERIF = 2;

package/dist/embedded-font-write.d.cts

@@ -1,5 +1,5 @@
-import { PdfDict, PdfObject } from "./objects.cjs";
-import { t as EmbeddedFace } from "./embedded-font-BU6Jgcof.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { t as EmbeddedFace } from "./embedded-font-oc65VGlr.cjs";
 import { SfntSubsetResult } from "./sfnt-subset.cjs";
 //#region src/embedded-font-write.d.ts
 declare function embeddedSubsetTag(postScriptName: string, glyphIds: readonly number[]): string;
@@ -17,6 +17,6 @@ interface EmbeddedFontObjects {
   readonly fontFile: PdfObject;
   readonly toUnicode: PdfObject;
 }
-declare function buildEmbeddedFontObjects(face: EmbeddedFace, subset: SfntSubsetResult, usedGlyphs: ReadonlyMap<number, number>, refs: EmbeddedFontObjectRefs, compress: boolean): EmbeddedFontObjects;
+declare function buildEmbeddedFontObjects(face: EmbeddedFace, subset: SfntSubsetResult, usedGlyphs: ReadonlyMap<number, readonly number[]>, refs: EmbeddedFontObjectRefs, compress: boolean): EmbeddedFontObjects;
 //#endregion
 export { EmbeddedFontObjectRefs, EmbeddedFontObjects, buildEmbeddedFontObjects, embeddedSubsetTag };

package/dist/embedded-font-write.d.ts

@@ -1,5 +1,5 @@
-import { PdfDict, PdfObject } from "./objects.js";
-import { t as EmbeddedFace } from "./embedded-font-fREdbxnr.js";
+import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
+import { t as EmbeddedFace } from "./embedded-font-B4p9a3O3.js";
 import { SfntSubsetResult } from "./sfnt-subset.js";
 //#region src/embedded-font-write.d.ts
 declare function embeddedSubsetTag(postScriptName: string, glyphIds: readonly number[]): string;
@@ -17,6 +17,6 @@ interface EmbeddedFontObjects {
   readonly fontFile: PdfObject;
   readonly toUnicode: PdfObject;
 }
-declare function buildEmbeddedFontObjects(face: EmbeddedFace, subset: SfntSubsetResult, usedGlyphs: ReadonlyMap<number, number>, refs: EmbeddedFontObjectRefs, compress: boolean): EmbeddedFontObjects;
+declare function buildEmbeddedFontObjects(face: EmbeddedFace, subset: SfntSubsetResult, usedGlyphs: ReadonlyMap<number, readonly number[]>, refs: EmbeddedFontObjectRefs, compress: boolean): EmbeddedFontObjects;
 //#endregion
 export { EmbeddedFontObjectRefs, EmbeddedFontObjects, buildEmbeddedFontObjects, embeddedSubsetTag };

package/dist/embedded-font-write.js

@@ -1,6 +1,6 @@
-import { crc32 } from "./bytes/crc32.js";
 import { pdfArray, pdfDict, pdfHexString, pdfName, pdfNum, pdfStream } from "./objects.js";
 import { deflate } from "./bytes/flate.js";
+import { crc32 } from "./bytes/crc32.js";
 import { buildToUnicodeCMap } from "./tounicode.js";
 //#region src/embedded-font-write.ts
 const FLAG_SERIF = 2;

package/dist/embedded-font.cjs

@@ -4,6 +4,7 @@ const require_cmap_table = require("./cmap-table.cjs");
 const require_font_tables = require("./font-tables.cjs");
 const require_glyf = require("./glyf.cjs");
 const require_gpos_table = require("./gpos-table.cjs");
+const require_gsub_table = require("./gsub-table.cjs");
 const require_hmtx_table = require("./hmtx-table.cjs");
 //#region src/embedded-font.ts
 const GLYPH_SPACE_UNITS_PER_EM = 1e3;
@@ -57,10 +58,12 @@ function readEmbeddedFace(font) {
 	const scale = (designUnits) => scaleToGlyphSpace(designUnits, unitsPerEm);
 	const capHeight = resolveCapHeight(font, cmap, os2?.sCapHeight, hhea.ascent);
 	const kern = require_gpos_table.buildGposKernLookup(font);
+	const gsubShaper = require_gsub_table.buildGsubShaper(font);
 	return {
 		font,
 		postScriptName: name.postScriptName,
 		numGlyphs: maxp.numGlyphs,
+		gsubShaper,
 		metrics: {
 			unitsPerEm,
 			ascentGlyphSpace: scale(hhea.ascent),
@@ -109,30 +112,31 @@ function parseHhea(font) {
 }
 const CID_BYTE_LENGTH = 2;
 function encodeForShowEmbedded(text, face) {
-	const glyphIds = [];
+	const resolvedGlyphIds = [];
 	const substitutions = [];
-	const kerns = [];
-	let width1000 = 0;
 	for (const character of text) {
 		const glyphId = face.glyphId(character.codePointAt(0));
 		if (glyphId === void 0) substitutions.push({ from: character });
-		const shown = glyphId ?? 0;
-		const previous = glyphIds[glyphIds.length - 1];
-		if (previous !== void 0) {
-			const adjustment1000 = face.kernGlyphSpace(previous, shown);
+		resolvedGlyphIds.push(glyphId ?? 0);
+	}
+	const shownGlyphIds = face.gsubShaper === void 0 ? resolvedGlyphIds : face.gsubShaper(resolvedGlyphIds).glyphIds;
+	const kerns = [];
+	let width1000 = 0;
+	for (const [index, shown] of shownGlyphIds.entries()) {
+		if (index > 0) {
+			const adjustment1000 = face.kernGlyphSpace(shownGlyphIds[index - 1], shown);
 			if (adjustment1000 !== 0) {
 				kerns.push({
-					codeOffset: glyphIds.length * CID_BYTE_LENGTH,
+					codeOffset: index * CID_BYTE_LENGTH,
 					adjustment1000
 				});
 				width1000 += adjustment1000;
 			}
 		}
-		glyphIds.push(shown);
 		width1000 += face.glyphSpaceWidth(shown);
 	}
-	const codes = new Uint8Array(glyphIds.length * CID_BYTE_LENGTH);
-	glyphIds.forEach((glyphId, index) => {
+	const codes = new Uint8Array(shownGlyphIds.length * CID_BYTE_LENGTH);
+	shownGlyphIds.forEach((glyphId, index) => {
 		codes[index * CID_BYTE_LENGTH] = glyphId >> 8 & 255;
 		codes[index * CID_BYTE_LENGTH + 1] = glyphId & 255;
 	});
@@ -145,10 +149,37 @@ function encodeForShowEmbedded(text, face) {
 }
 function collectEmbeddedGlyphs(texts, face) {
 	const used = /* @__PURE__ */ new Map();
-	for (const text of texts) for (const character of text) {
-		const codePoint = character.codePointAt(0);
-		const glyphId = face.glyphId(codePoint);
-		if (glyphId !== void 0 && !used.has(glyphId)) used.set(glyphId, codePoint);
+	for (const text of texts) {
+		const resolvedGlyphIds = [];
+		const codePoints = [];
+		for (const character of text) {
+			const codePoint = character.codePointAt(0);
+			const glyphId = face.glyphId(codePoint);
+			if (glyphId === void 0) {
+				resolvedGlyphIds.push(0);
+				codePoints.push(void 0);
+			} else {
+				resolvedGlyphIds.push(glyphId);
+				codePoints.push(codePoint);
+			}
+		}
+		const shaping = face.gsubShaper === void 0 ? {
+			glyphIds: resolvedGlyphIds,
+			spans: resolvedGlyphIds.map(() => 1)
+		} : face.gsubShaper(resolvedGlyphIds);
+		let cursor = 0;
+		for (const [index, glyphId] of shaping.glyphIds.entries()) {
+			const span = shaping.spans[index];
+			const sequence = [];
+			for (let s = 0; s < span; s++) {
+				const codePoint = codePoints[cursor + s];
+				if (codePoint !== void 0) sequence.push(codePoint);
+			}
+			cursor += span;
+			if (glyphId !== 0 && sequence.length > 0) {
+				if (used.get(glyphId) === void 0) used.set(glyphId, sequence);
+			}
+		}
 	}
 	return used;
 }

package/dist/embedded-font.d.cts

@@ -1,2 +1,2 @@
-import { a as EmbeddedShow, c as encodeForShowEmbedded, i as EmbeddedKern, l as loadEmbeddedFace, n as EmbeddedFaceMetrics, o as NOTDEF_GLYPH_ID, r as EmbeddedFaceSubstitution, s as collectEmbeddedGlyphs, t as EmbeddedFace } from "./embedded-font-BU6Jgcof.cjs";
+import { a as EmbeddedShow, c as encodeForShowEmbedded, i as EmbeddedKern, l as loadEmbeddedFace, n as EmbeddedFaceMetrics, o as NOTDEF_GLYPH_ID, r as EmbeddedFaceSubstitution, s as collectEmbeddedGlyphs, t as EmbeddedFace } from "./embedded-font-oc65VGlr.cjs";
 export { EmbeddedFace, EmbeddedFaceMetrics, EmbeddedFaceSubstitution, EmbeddedKern, EmbeddedShow, NOTDEF_GLYPH_ID, collectEmbeddedGlyphs, encodeForShowEmbedded, loadEmbeddedFace };

package/dist/embedded-font.d.ts

@@ -1,2 +1,2 @@
-import { a as EmbeddedShow, c as encodeForShowEmbedded, i as EmbeddedKern, l as loadEmbeddedFace, n as EmbeddedFaceMetrics, o as NOTDEF_GLYPH_ID, r as EmbeddedFaceSubstitution, s as collectEmbeddedGlyphs, t as EmbeddedFace } from "./embedded-font-fREdbxnr.js";
+import { a as EmbeddedShow, c as encodeForShowEmbedded, i as EmbeddedKern, l as loadEmbeddedFace, n as EmbeddedFaceMetrics, o as NOTDEF_GLYPH_ID, r as EmbeddedFaceSubstitution, s as collectEmbeddedGlyphs, t as EmbeddedFace } from "./embedded-font-B4p9a3O3.js";
 export { EmbeddedFace, EmbeddedFaceMetrics, EmbeddedFaceSubstitution, EmbeddedKern, EmbeddedShow, NOTDEF_GLYPH_ID, collectEmbeddedGlyphs, encodeForShowEmbedded, loadEmbeddedFace };

package/dist/embedded-font.js

@@ -3,6 +3,7 @@ import { buildCmapLookup } from "./cmap-table.js";
 import { parseHead, parseMaxp, parseName, parseOs2, parsePost } from "./font-tables.js";
 import { parseGlyf } from "./glyf.js";
 import { buildGposKernLookup } from "./gpos-table.js";
+import { buildGsubShaper } from "./gsub-table.js";
 import { parseHmtx } from "./hmtx-table.js";
 //#region src/embedded-font.ts
 const GLYPH_SPACE_UNITS_PER_EM = 1e3;
@@ -56,10 +57,12 @@ function readEmbeddedFace(font) {
 	const scale = (designUnits) => scaleToGlyphSpace(designUnits, unitsPerEm);
 	const capHeight = resolveCapHeight(font, cmap, os2?.sCapHeight, hhea.ascent);
 	const kern = buildGposKernLookup(font);
+	const gsubShaper = buildGsubShaper(font);
 	return {
 		font,
 		postScriptName: name.postScriptName,
 		numGlyphs: maxp.numGlyphs,
+		gsubShaper,
 		metrics: {
 			unitsPerEm,
 			ascentGlyphSpace: scale(hhea.ascent),
@@ -108,30 +111,31 @@ function parseHhea(font) {
 }
 const CID_BYTE_LENGTH = 2;
 function encodeForShowEmbedded(text, face) {
-	const glyphIds = [];
+	const resolvedGlyphIds = [];
 	const substitutions = [];
-	const kerns = [];
-	let width1000 = 0;
 	for (const character of text) {
 		const glyphId = face.glyphId(character.codePointAt(0));
 		if (glyphId === void 0) substitutions.push({ from: character });
-		const shown = glyphId ?? 0;
-		const previous = glyphIds[glyphIds.length - 1];
-		if (previous !== void 0) {
-			const adjustment1000 = face.kernGlyphSpace(previous, shown);
+		resolvedGlyphIds.push(glyphId ?? 0);
+	}
+	const shownGlyphIds = face.gsubShaper === void 0 ? resolvedGlyphIds : face.gsubShaper(resolvedGlyphIds).glyphIds;
+	const kerns = [];
+	let width1000 = 0;
+	for (const [index, shown] of shownGlyphIds.entries()) {
+		if (index > 0) {
+			const adjustment1000 = face.kernGlyphSpace(shownGlyphIds[index - 1], shown);
 			if (adjustment1000 !== 0) {
 				kerns.push({
-					codeOffset: glyphIds.length * CID_BYTE_LENGTH,
+					codeOffset: index * CID_BYTE_LENGTH,
 					adjustment1000
 				});
 				width1000 += adjustment1000;
 			}
 		}
-		glyphIds.push(shown);
 		width1000 += face.glyphSpaceWidth(shown);
 	}
-	const codes = new Uint8Array(glyphIds.length * CID_BYTE_LENGTH);
-	glyphIds.forEach((glyphId, index) => {
+	const codes = new Uint8Array(shownGlyphIds.length * CID_BYTE_LENGTH);
+	shownGlyphIds.forEach((glyphId, index) => {
 		codes[index * CID_BYTE_LENGTH] = glyphId >> 8 & 255;
 		codes[index * CID_BYTE_LENGTH + 1] = glyphId & 255;
 	});
@@ -144,10 +148,37 @@ function encodeForShowEmbedded(text, face) {
 }
 function collectEmbeddedGlyphs(texts, face) {
 	const used = /* @__PURE__ */ new Map();
-	for (const text of texts) for (const character of text) {
-		const codePoint = character.codePointAt(0);
-		const glyphId = face.glyphId(codePoint);
-		if (glyphId !== void 0 && !used.has(glyphId)) used.set(glyphId, codePoint);
+	for (const text of texts) {
+		const resolvedGlyphIds = [];
+		const codePoints = [];
+		for (const character of text) {
+			const codePoint = character.codePointAt(0);
+			const glyphId = face.glyphId(codePoint);
+			if (glyphId === void 0) {
+				resolvedGlyphIds.push(0);
+				codePoints.push(void 0);
+			} else {
+				resolvedGlyphIds.push(glyphId);
+				codePoints.push(codePoint);
+			}
+		}
+		const shaping = face.gsubShaper === void 0 ? {
+			glyphIds: resolvedGlyphIds,
+			spans: resolvedGlyphIds.map(() => 1)
+		} : face.gsubShaper(resolvedGlyphIds);
+		let cursor = 0;
+		for (const [index, glyphId] of shaping.glyphIds.entries()) {
+			const span = shaping.spans[index];
+			const sequence = [];
+			for (let s = 0; s < span; s++) {
+				const codePoint = codePoints[cursor + s];
+				if (codePoint !== void 0) sequence.push(codePoint);
+			}
+			cursor += span;
+			if (glyphId !== 0 && sequence.length > 0) {
+				if (used.get(glyphId) === void 0) used.set(glyphId, sequence);
+			}
+		}
 	}
 	return used;
 }

package/dist/encoding.cjs

@@ -1,5 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BoeTOK2r.cjs");
+const require_afm_widths = require("./afm-widths-BTu0IDp2.cjs");
+exports.MACROMAN_GLYPH_NAMES = require_afm_widths.MACROMAN_GLYPH_NAMES;
+exports.STANDARD_GLYPH_NAMES = require_afm_widths.STANDARD_GLYPH_NAMES;
+exports.SYMBOL_GLYPH_NAMES = require_afm_widths.SYMBOL_GLYPH_NAMES;
 exports.WINANSI_GLYPH_NAMES = require_afm_widths.WINANSI_GLYPH_NAMES;
+exports.ZAPFDINGBATS_GLYPH_NAMES = require_afm_widths.ZAPFDINGBATS_GLYPH_NAMES;
 exports.glyphNameToUnicode = require_afm_widths.glyphNameToUnicode;
+exports.macRomanGlyphName = require_afm_widths.macRomanGlyphName;
+exports.namedEncodingGlyphName = require_afm_widths.namedEncodingGlyphName;
+exports.standardGlyphName = require_afm_widths.standardGlyphName;
+exports.symbolGlyphName = require_afm_widths.symbolGlyphName;
 exports.winAnsiGlyphName = require_afm_widths.winAnsiGlyphName;
+exports.zapfDingbatsGlyphName = require_afm_widths.zapfDingbatsGlyphName;

package/dist/encoding.d.cts

@@ -1,6 +1,15 @@
 //#region src/encoding.d.ts
 declare const WINANSI_GLYPH_NAMES: readonly string[];
 declare function winAnsiGlyphName(code: number): string | undefined;
+declare const SYMBOL_GLYPH_NAMES: readonly string[];
+declare function symbolGlyphName(code: number): string | undefined;
+declare const ZAPFDINGBATS_GLYPH_NAMES: readonly string[];
+declare const STANDARD_GLYPH_NAMES: readonly string[];
+declare function standardGlyphName(code: number): string | undefined;
+declare const MACROMAN_GLYPH_NAMES: readonly string[];
+declare function macRomanGlyphName(code: number): string | undefined;
+declare function namedEncodingGlyphName(encodingName: string): ((code: number) => string | undefined) | undefined;
+declare function zapfDingbatsGlyphName(code: number): string | undefined;
 declare function glyphNameToUnicode(name: string): number | undefined;
 //#endregion
-export { WINANSI_GLYPH_NAMES, glyphNameToUnicode, winAnsiGlyphName };
+export { MACROMAN_GLYPH_NAMES, STANDARD_GLYPH_NAMES, SYMBOL_GLYPH_NAMES, WINANSI_GLYPH_NAMES, ZAPFDINGBATS_GLYPH_NAMES, glyphNameToUnicode, macRomanGlyphName, namedEncodingGlyphName, standardGlyphName, symbolGlyphName, winAnsiGlyphName, zapfDingbatsGlyphName };

package/dist/encoding.d.ts

@@ -1,6 +1,15 @@
 //#region src/encoding.d.ts
 declare const WINANSI_GLYPH_NAMES: readonly string[];
 declare function winAnsiGlyphName(code: number): string | undefined;
+declare const SYMBOL_GLYPH_NAMES: readonly string[];
+declare function symbolGlyphName(code: number): string | undefined;
+declare const ZAPFDINGBATS_GLYPH_NAMES: readonly string[];
+declare const STANDARD_GLYPH_NAMES: readonly string[];
+declare function standardGlyphName(code: number): string | undefined;
+declare const MACROMAN_GLYPH_NAMES: readonly string[];
+declare function macRomanGlyphName(code: number): string | undefined;
+declare function namedEncodingGlyphName(encodingName: string): ((code: number) => string | undefined) | undefined;
+declare function zapfDingbatsGlyphName(code: number): string | undefined;
 declare function glyphNameToUnicode(name: string): number | undefined;
 //#endregion
-export { WINANSI_GLYPH_NAMES, glyphNameToUnicode, winAnsiGlyphName };
+export { MACROMAN_GLYPH_NAMES, STANDARD_GLYPH_NAMES, SYMBOL_GLYPH_NAMES, WINANSI_GLYPH_NAMES, ZAPFDINGBATS_GLYPH_NAMES, glyphNameToUnicode, macRomanGlyphName, namedEncodingGlyphName, standardGlyphName, symbolGlyphName, winAnsiGlyphName, zapfDingbatsGlyphName };

package/dist/encoding.js

@@ -1,2 +1,2 @@
-import { a as winAnsiGlyphName, i as glyphNameToUnicode, r as WINANSI_GLYPH_NAMES } from "./afm-widths-Dxucrg7D.js";
-export { WINANSI_GLYPH_NAMES, glyphNameToUnicode, winAnsiGlyphName };
+import { a as SYMBOL_GLYPH_NAMES, c as glyphNameToUnicode, d as standardGlyphName, f as symbolGlyphName, i as STANDARD_GLYPH_NAMES, l as macRomanGlyphName, m as zapfDingbatsGlyphName, o as WINANSI_GLYPH_NAMES, p as winAnsiGlyphName, r as MACROMAN_GLYPH_NAMES, s as ZAPFDINGBATS_GLYPH_NAMES, u as namedEncodingGlyphName } from "./afm-widths-De_QMWgC.js";
+export { MACROMAN_GLYPH_NAMES, STANDARD_GLYPH_NAMES, SYMBOL_GLYPH_NAMES, WINANSI_GLYPH_NAMES, ZAPFDINGBATS_GLYPH_NAMES, glyphNameToUnicode, macRomanGlyphName, namedEncodingGlyphName, standardGlyphName, symbolGlyphName, winAnsiGlyphName, zapfDingbatsGlyphName };