@libpdf/core 0.1.1 → 0.2.1

package/dist/index.mjs

@@ -9,7 +9,7 @@ import { createCMSECDSASignature } from "pkijs";
 import { base64 } from "@scure/base";
 
 //#region package.json
-var version = "0.1.1";
+var version = "0.2.1";
 
 //#endregion
 //#region src/objects/pdf-array.ts
@@ -44,9 +44,12 @@ var PdfArray = class PdfArray {
 	}
 	/**
 	* Get item at index. Returns undefined if out of bounds.
+	* If resolver is provided, resolves indirect references.
 	*/
-	at(index) {
-		return this.items.at(index);
+	at(index, resolver) {
+		const value = this.items.at(index);
+		if (resolver && value?.type === "ref") return resolver(value) ?? void 0;
+		return value;
 	}
 	/**
 	* Set item at index. Extends array if needed.
@@ -3484,14 +3487,14 @@ var PDFAnnotation = class {
 	* Annotation subtype (e.g., "Text", "Highlight", "Link").
 	*/
 	get type() {
-		const subtype = this.dict.getName("Subtype")?.value;
+		const subtype = this.dict.getName("Subtype", this.registry.resolve.bind(this.registry))?.value;
 		return isAnnotationSubtype(subtype) ? subtype : "Text";
 	}
 	/**
 	* Annotation rectangle in page coordinates.
 	*/
 	get rect() {
-		const arr = this.dict.getArray("Rect");
+		const arr = this.dict.getArray("Rect", this.registry.resolve.bind(this.registry));
 		if (!arr || arr.length < 4) return {
 			x: 0,
 			y: 0,
@@ -3510,7 +3513,7 @@ var PDFAnnotation = class {
 	* Set the annotation rectangle.
 	*/
 	setRect(rect) {
-		const arr = this.dict.getArray("Rect");
+		const arr = this.dict.getArray("Rect", this.registry.resolve.bind(this.registry));
 		if (arr && arr.length >= 4) {
 			arr.set(0, PdfNumber.of(rect.x));
 			arr.set(1, PdfNumber.of(rect.y));
@@ -3528,7 +3531,7 @@ var PDFAnnotation = class {
 	* Text content or description of the annotation.
 	*/
 	get contents() {
-		return this.dict.getString("Contents")?.asString() ?? null;
+		return this.dict.getString("Contents", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 	}
 	/**
 	* Set the annotation contents.
@@ -3541,7 +3544,7 @@ var PDFAnnotation = class {
 	* Annotation name (unique identifier within page).
 	*/
 	get name() {
-		return this.dict.getString("NM")?.asString() ?? null;
+		return this.dict.getString("NM", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 	}
 	/**
 	* Set the annotation name.
@@ -3554,7 +3557,7 @@ var PDFAnnotation = class {
 	* Modification date.
 	*/
 	get modificationDate() {
-		return this.dict.getString("M")?.asString() ?? null;
+		return this.dict.getString("M", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 	}
 	/**
 	* Set the modification date (PDF date format).
@@ -3567,7 +3570,7 @@ var PDFAnnotation = class {
 	* Annotation flags.
 	*/
 	get flags() {
-		return this.dict.getNumber("F")?.value ?? 0;
+		return this.dict.getNumber("F", this.registry.resolve.bind(this.registry))?.value ?? 0;
 	}
 	/**
 	* Check if the annotation has a specific flag set.
@@ -3613,7 +3616,7 @@ var PDFAnnotation = class {
 	* Annotation color.
 	*/
 	get color() {
-		return parseColorArray(this.dict.getArray("C"));
+		return parseColorArray(this.dict.getArray("C", this.registry.resolve.bind(this.registry)));
 	}
 	/**
 	* Set the annotation color.
@@ -3627,13 +3630,13 @@ var PDFAnnotation = class {
 	* Get the border style.
 	*/
 	getBorderStyle() {
-		const bs = this.dict.getDict("BS");
+		const bs = this.dict.getDict("BS", this.registry.resolve.bind(this.registry));
 		if (!bs) return null;
 		const result = {
-			width: bs.getNumber("W")?.value ?? 1,
-			style: BORDER_STYLE_MAP[bs.getName("S")?.value ?? "S"] ?? "solid"
+			width: bs.getNumber("W", this.registry.resolve.bind(this.registry))?.value ?? 1,
+			style: BORDER_STYLE_MAP[bs.getName("S", this.registry.resolve.bind(this.registry))?.value ?? "S"] ?? "solid"
 		};
-		const dashArr = bs.getArray("D");
+		const dashArr = bs.getArray("D", this.registry.resolve.bind(this.registry));
 		if (dashArr) {
 			result.dashArray = [];
 			for (let i = 0; i < dashArr.length; i++) {
@@ -3658,9 +3661,8 @@ var PDFAnnotation = class {
 	* Check if the annotation has a normal appearance stream.
 	*/
 	hasNormalAppearance() {
-		let ap = this.dict.get("AP");
-		if (ap instanceof PdfRef) ap = this.registry.resolve(ap) ?? void 0;
-		if (ap instanceof PdfDict) return ap.has("N");
+		const ap = this.dict.getDict("AP", this.registry.resolve.bind(this.registry));
+		if (ap) return ap.has("N");
 		return false;
 	}
 	/**
@@ -3703,12 +3705,9 @@ var PDFAnnotation = class {
 	* Get an appearance stream by type.
 	*/
 	getAppearance(type) {
-		let ap = this.dict.get("AP");
-		if (ap instanceof PdfRef) ap = this.registry.resolve(ap) ?? void 0;
-		if (!(ap instanceof PdfDict)) return null;
-		let entry = ap.get(type);
-		if (!entry) return null;
-		if (entry instanceof PdfRef) entry = this.registry.resolve(entry) ?? void 0;
+		let ap = this.dict.getDict("AP", this.registry.resolve.bind(this.registry));
+		if (!ap) return null;
+		let entry = ap.get(type, this.registry.resolve.bind(this.registry));
 		if (entry instanceof PdfStream) return entry;
 		return null;
 	}
@@ -3716,8 +3715,7 @@ var PDFAnnotation = class {
 	* Set an appearance stream by type.
 	*/
 	setAppearance(type, stream) {
-		let ap = this.dict.get("AP");
-		if (ap instanceof PdfRef) ap = this.registry.resolve(ap) ?? void 0;
+		let ap = this.dict.getDict("AP", this.registry.resolve.bind(this.registry));
 		if (ap instanceof PdfDict) {
 			const streamRef = this.registry.register(stream);
 			ap.set(type, streamRef);
@@ -3829,7 +3827,7 @@ var PDFMarkupAnnotation = class extends PDFAnnotation {
 	* Text label for the annotation (often the author name).
 	*/
 	get title() {
-		return this.dict.getString("T")?.asString() ?? null;
+		return this.dict.getString("T", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 	}
 	/**
 	* Set the title/author.
@@ -3843,7 +3841,7 @@ var PDFMarkupAnnotation = class extends PDFAnnotation {
 	* Range 0-1, where 0 is fully transparent and 1 is fully opaque.
 	*/
 	get opacity() {
-		return this.dict.getNumber("CA")?.value ?? 1;
+		return this.dict.getNumber("CA", this.registry.resolve.bind(this.registry))?.value ?? 1;
 	}
 	/**
 	* Set the opacity.
@@ -3857,7 +3855,7 @@ var PDFMarkupAnnotation = class extends PDFAnnotation {
 	* Creation date (CreationDate).
 	*/
 	get creationDate() {
-		return this.dict.getString("CreationDate")?.asString() ?? null;
+		return this.dict.getString("CreationDate", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 	}
 	/**
 	* Set the creation date.
@@ -3870,7 +3868,7 @@ var PDFMarkupAnnotation = class extends PDFAnnotation {
 	* Subject - the subject of the annotation.
 	*/
 	get subject() {
-		return this.dict.getString("Subj")?.asString() ?? null;
+		return this.dict.getString("Subj", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 	}
 	/**
 	* Set the subject.
@@ -3935,7 +3933,7 @@ var PDFMarkupAnnotation = class extends PDFAnnotation {
 	* Intent (IT) - the intent of the markup annotation.
 	*/
 	get intent() {
-		return this.dict.getName("IT")?.value ?? null;
+		return this.dict.getName("IT", this.registry.resolve.bind(this.registry))?.value ?? null;
 	}
 };
 
@@ -3958,7 +3956,7 @@ var PDFCaretAnnotation = class extends PDFMarkupAnnotation {
 	* "P" = paragraph symbol, "None" = no symbol.
 	*/
 	get symbol() {
-		if (this.dict.getName("Sy")?.value === "P") return "P";
+		if (this.dict.getName("Sy", this.registry.resolve.bind(this.registry))?.value === "P") return "P";
 		return "None";
 	}
 	/**
@@ -3980,7 +3978,7 @@ var PDFFileAttachmentAnnotation = class extends PDFMarkupAnnotation {
 	* Icon to display.
 	*/
 	get icon() {
-		const name = this.dict.getName("Name");
+		const name = this.dict.getName("Name", this.registry.resolve.bind(this.registry));
 		if (!name) return "PushPin";
 		if (isFileAttachmentIcon(name.value)) return name.value;
 		return "PushPin";
@@ -4003,11 +4001,7 @@ var PDFFileAttachmentAnnotation = class extends PDFMarkupAnnotation {
 	* Get the file specification dictionary.
 	*/
 	getFileSpec() {
-		const fsRef = this.fileSpecRef;
-		if (!fsRef) return this.dict.getDict("FS") ?? null;
-		const resolved = this.registry.resolve(fsRef);
-		if (resolved && resolved.type === "dict") return resolved;
-		return null;
+		return this.dict.getDict("FS", this.registry.resolve.bind(this.registry)) ?? null;
 	}
 	/**
 	* Get the file name from the file specification.
@@ -4015,9 +4009,9 @@ var PDFFileAttachmentAnnotation = class extends PDFMarkupAnnotation {
 	getFileName() {
 		const fs = this.getFileSpec();
 		if (!fs) return null;
-		const uf = fs.getString("UF");
+		const uf = fs.getString("UF", this.registry.resolve.bind(this.registry));
 		if (uf) return uf.asString();
-		const f = fs.getString("F");
+		const f = fs.getString("F", this.registry.resolve.bind(this.registry));
 		if (f) return f.asString();
 		return null;
 	}
@@ -4042,7 +4036,7 @@ var PDFFreeTextAnnotation = class extends PDFMarkupAnnotation {
 	* Contains font and color operators.
 	*/
 	get defaultAppearance() {
-		return this.dict.getString("DA")?.asString() ?? null;
+		return this.dict.getString("DA", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 	}
 	/**
 	* Set the default appearance.
@@ -4055,7 +4049,7 @@ var PDFFreeTextAnnotation = class extends PDFMarkupAnnotation {
 	* Text justification: 0=left, 1=center, 2=right.
 	*/
 	get justification() {
-		switch (this.dict.getNumber("Q")?.value ?? 0) {
+		switch (this.dict.getNumber("Q", this.registry.resolve.bind(this.registry))?.value ?? 0) {
 			case 1: return "center";
 			case 2: return "right";
 			default: return "left";
@@ -4076,7 +4070,7 @@ var PDFFreeTextAnnotation = class extends PDFMarkupAnnotation {
 	* Contains CSS-style formatting.
 	*/
 	get defaultStyle() {
-		return this.dict.getString("DS")?.asString() ?? null;
+		return this.dict.getString("DS", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 	}
 	/**
 	* Set the default style.
@@ -4090,7 +4084,7 @@ var PDFFreeTextAnnotation = class extends PDFMarkupAnnotation {
 	* Can be "FreeText", "FreeTextCallout", or "FreeTextTypeWriter".
 	*/
 	get freeTextIntent() {
-		return this.dict.getName("IT")?.value ?? null;
+		return this.dict.getName("IT", this.registry.resolve.bind(this.registry))?.value ?? null;
 	}
 	/**
 	* Set the intent.
@@ -4167,7 +4161,7 @@ var PDFInkAnnotation = class extends PDFMarkupAnnotation {
 	* Each path is an array of points.
 	*/
 	get inkPaths() {
-		const inkList = this.dict.getArray("InkList");
+		const inkList = this.dict.getArray("InkList", this.registry.resolve.bind(this.registry));
 		if (!inkList) return [];
 		const paths = [];
 		for (let i = 0; i < inkList.length; i++) {
@@ -4272,7 +4266,7 @@ var PDFLineAnnotation = class extends PDFMarkupAnnotation {
 	* Get the line endpoints.
 	*/
 	get lineEndpoints() {
-		const l = this.dict.getArray("L");
+		const l = this.dict.getArray("L", this.registry.resolve.bind(this.registry));
 		if (!l || l.length < 4) return {
 			start: {
 				x: 0,
@@ -4299,7 +4293,7 @@ var PDFLineAnnotation = class extends PDFMarkupAnnotation {
 	* Set the line endpoints.
 	*/
 	setLineEndpoints(start, end) {
-		const arr = this.dict.getArray("L");
+		const arr = this.dict.getArray("L", this.registry.resolve.bind(this.registry));
 		if (arr && arr.length >= 4) {
 			arr.set(0, PdfNumber.of(start.x));
 			arr.set(1, PdfNumber.of(start.y));
@@ -4329,7 +4323,7 @@ var PDFLineAnnotation = class extends PDFMarkupAnnotation {
 	* Line ending styles [start, end].
 	*/
 	get lineEndingStyles() {
-		const le = this.dict.getArray("LE");
+		const le = this.dict.getArray("LE", this.registry.resolve.bind(this.registry));
 		if (!le || le.length < 2) return ["None", "None"];
 		const [startStyle, endStyle] = le.toArray().map((item) => item instanceof PdfName ? item.value : "None");
 		return [startStyle ?? "None", endStyle ?? "None"];
@@ -4345,7 +4339,7 @@ var PDFLineAnnotation = class extends PDFMarkupAnnotation {
 	* Interior color (fill color for closed arrow heads).
 	*/
 	get interiorColor() {
-		return parseColorArray(this.dict.getArray("IC"));
+		return parseColorArray(this.dict.getArray("IC", this.registry.resolve.bind(this.registry)));
 	}
 	/**
 	* Set the interior color.
@@ -4359,19 +4353,19 @@ var PDFLineAnnotation = class extends PDFMarkupAnnotation {
 	* Line leader length (for dimension lines).
 	*/
 	get leaderLength() {
-		return this.dict.getNumber("LL")?.value ?? 0;
+		return this.dict.getNumber("LL", this.registry.resolve.bind(this.registry))?.value ?? 0;
 	}
 	/**
 	* Line leader line extension.
 	*/
 	get leaderExtension() {
-		return this.dict.getNumber("LLE")?.value ?? 0;
+		return this.dict.getNumber("LLE", this.registry.resolve.bind(this.registry))?.value ?? 0;
 	}
 	/**
 	* Caption flag - whether to show caption with the line.
 	*/
 	get hasCaption() {
-		return this.dict.getBool("Cap")?.value ?? false;
+		return this.dict.getBool("Cap", this.registry.resolve.bind(this.registry))?.value ?? false;
 	}
 	/**
 	* Line width from border style.
@@ -4878,240 +4872,6 @@ function rectsToQuadPoints(rects) {
 	return rects.map(rectToQuadPoints);
 }
 
-//#endregion
-//#region src/helpers/unicode.ts
-/**
-* Unicode utilities for PDF text handling.
-*
-* Provides mappings between Unicode code points and PostScript glyph names.
-*/
-/**
-* Map Unicode code point to PostScript glyph name.
-* Returns undefined if no mapping exists.
-*/
-function unicodeToGlyphName(unicode) {
-	return UNICODE_TO_GLYPH.get(unicode);
-}
-/**
-* Common Unicode to glyph name mappings.
-* Covers ASCII and common Latin-1 extended characters.
-*
-* For a complete mapping, see the Adobe Glyph List:
-* https://github.com/adobe-type-tools/agl-aglfn
-*/
-const UNICODE_TO_GLYPH = new Map([
-	[32, "space"],
-	[33, "exclam"],
-	[34, "quotedbl"],
-	[35, "numbersign"],
-	[36, "dollar"],
-	[37, "percent"],
-	[38, "ampersand"],
-	[39, "quotesingle"],
-	[40, "parenleft"],
-	[41, "parenright"],
-	[42, "asterisk"],
-	[43, "plus"],
-	[44, "comma"],
-	[45, "hyphen"],
-	[46, "period"],
-	[47, "slash"],
-	[48, "zero"],
-	[49, "one"],
-	[50, "two"],
-	[51, "three"],
-	[52, "four"],
-	[53, "five"],
-	[54, "six"],
-	[55, "seven"],
-	[56, "eight"],
-	[57, "nine"],
-	[58, "colon"],
-	[59, "semicolon"],
-	[60, "less"],
-	[61, "equal"],
-	[62, "greater"],
-	[63, "question"],
-	[64, "at"],
-	[65, "A"],
-	[66, "B"],
-	[67, "C"],
-	[68, "D"],
-	[69, "E"],
-	[70, "F"],
-	[71, "G"],
-	[72, "H"],
-	[73, "I"],
-	[74, "J"],
-	[75, "K"],
-	[76, "L"],
-	[77, "M"],
-	[78, "N"],
-	[79, "O"],
-	[80, "P"],
-	[81, "Q"],
-	[82, "R"],
-	[83, "S"],
-	[84, "T"],
-	[85, "U"],
-	[86, "V"],
-	[87, "W"],
-	[88, "X"],
-	[89, "Y"],
-	[90, "Z"],
-	[91, "bracketleft"],
-	[92, "backslash"],
-	[93, "bracketright"],
-	[94, "asciicircum"],
-	[95, "underscore"],
-	[96, "grave"],
-	[97, "a"],
-	[98, "b"],
-	[99, "c"],
-	[100, "d"],
-	[101, "e"],
-	[102, "f"],
-	[103, "g"],
-	[104, "h"],
-	[105, "i"],
-	[106, "j"],
-	[107, "k"],
-	[108, "l"],
-	[109, "m"],
-	[110, "n"],
-	[111, "o"],
-	[112, "p"],
-	[113, "q"],
-	[114, "r"],
-	[115, "s"],
-	[116, "t"],
-	[117, "u"],
-	[118, "v"],
-	[119, "w"],
-	[120, "x"],
-	[121, "y"],
-	[122, "z"],
-	[123, "braceleft"],
-	[124, "bar"],
-	[125, "braceright"],
-	[126, "asciitilde"],
-	[160, "nbspace"],
-	[161, "exclamdown"],
-	[162, "cent"],
-	[163, "sterling"],
-	[164, "currency"],
-	[165, "yen"],
-	[166, "brokenbar"],
-	[167, "section"],
-	[168, "dieresis"],
-	[169, "copyright"],
-	[170, "ordfeminine"],
-	[171, "guillemotleft"],
-	[172, "logicalnot"],
-	[173, "softhyphen"],
-	[174, "registered"],
-	[175, "macron"],
-	[176, "degree"],
-	[177, "plusminus"],
-	[178, "twosuperior"],
-	[179, "threesuperior"],
-	[180, "acute"],
-	[181, "mu"],
-	[182, "paragraph"],
-	[183, "periodcentered"],
-	[184, "cedilla"],
-	[185, "onesuperior"],
-	[186, "ordmasculine"],
-	[187, "guillemotright"],
-	[188, "onequarter"],
-	[189, "onehalf"],
-	[190, "threequarters"],
-	[191, "questiondown"],
-	[192, "Agrave"],
-	[193, "Aacute"],
-	[194, "Acircumflex"],
-	[195, "Atilde"],
-	[196, "Adieresis"],
-	[197, "Aring"],
-	[198, "AE"],
-	[199, "Ccedilla"],
-	[200, "Egrave"],
-	[201, "Eacute"],
-	[202, "Ecircumflex"],
-	[203, "Edieresis"],
-	[204, "Igrave"],
-	[205, "Iacute"],
-	[206, "Icircumflex"],
-	[207, "Idieresis"],
-	[208, "Eth"],
-	[209, "Ntilde"],
-	[210, "Ograve"],
-	[211, "Oacute"],
-	[212, "Ocircumflex"],
-	[213, "Otilde"],
-	[214, "Odieresis"],
-	[215, "multiply"],
-	[216, "Oslash"],
-	[217, "Ugrave"],
-	[218, "Uacute"],
-	[219, "Ucircumflex"],
-	[220, "Udieresis"],
-	[221, "Yacute"],
-	[222, "Thorn"],
-	[223, "germandbls"],
-	[224, "agrave"],
-	[225, "aacute"],
-	[226, "acircumflex"],
-	[227, "atilde"],
-	[228, "adieresis"],
-	[229, "aring"],
-	[230, "ae"],
-	[231, "ccedilla"],
-	[232, "egrave"],
-	[233, "eacute"],
-	[234, "ecircumflex"],
-	[235, "edieresis"],
-	[236, "igrave"],
-	[237, "iacute"],
-	[238, "icircumflex"],
-	[239, "idieresis"],
-	[240, "eth"],
-	[241, "ntilde"],
-	[242, "ograve"],
-	[243, "oacute"],
-	[244, "ocircumflex"],
-	[245, "otilde"],
-	[246, "odieresis"],
-	[247, "divide"],
-	[248, "oslash"],
-	[249, "ugrave"],
-	[250, "uacute"],
-	[251, "ucircumflex"],
-	[252, "udieresis"],
-	[253, "yacute"],
-	[254, "thorn"],
-	[255, "ydieresis"],
-	[8211, "endash"],
-	[8212, "emdash"],
-	[8216, "quoteleft"],
-	[8217, "quoteright"],
-	[8218, "quotesinglbase"],
-	[8220, "quotedblleft"],
-	[8221, "quotedblright"],
-	[8222, "quotedblbase"],
-	[8224, "dagger"],
-	[8225, "daggerdbl"],
-	[8226, "bullet"],
-	[8230, "ellipsis"],
-	[8240, "perthousand"],
-	[8249, "guilsinglleft"],
-	[8250, "guilsinglright"],
-	[8364, "Euro"],
-	[8482, "trademark"],
-	[64257, "fi"],
-	[64258, "fl"]
-]);
-
 //#endregion
 //#region src/io/scanner.ts
 /**
@@ -10961,9 +10721,9 @@ function parseEmbeddedProgram(descriptor, options) {
 * Try to parse a TrueType font from /FontFile2.
 */
 function tryParseFontFile2(descriptor, options) {
-	const fontFile2 = resolveValue(descriptor.get("FontFile2"), options);
-	if (!fontFile2) return null;
-	const data = options.decodeStream(fontFile2);
+	const fontFile2 = descriptor.get("FontFile2", options.resolver);
+	if (!(fontFile2 instanceof PdfStream)) return null;
+	const data = fontFile2.getDecodedData();
 	if (!data || data.length === 0) return null;
 	try {
 		return new TrueTypeFontProgram(parseTTF(data, { isEmbedded: true }), data);
@@ -10976,10 +10736,10 @@ function tryParseFontFile2(descriptor, options) {
 * Try to parse a CFF or OpenType font from /FontFile3.
 */
 function tryParseFontFile3(descriptor, options) {
-	const fontFile3 = resolveValue(descriptor.get("FontFile3"), options);
-	if (!fontFile3) return null;
+	const fontFile3 = descriptor.get("FontFile3", options.resolver);
+	if (!(fontFile3 instanceof PdfStream)) return null;
 	const subtype = getStreamSubtype(fontFile3);
-	const data = options.decodeStream(fontFile3);
+	const data = fontFile3.getDecodedData();
 	if (!data || data.length === 0) return null;
 	try {
 		if (subtype === "OpenType") return new TrueTypeFontProgram(parseTTF(data, { isEmbedded: true }), data);
@@ -11000,9 +10760,9 @@ function tryParseFontFile3(descriptor, options) {
 * Try to parse a Type1 font from /FontFile.
 */
 function tryParseFontFile(descriptor, options) {
-	const fontFile = resolveValue(descriptor.get("FontFile"), options);
-	if (!fontFile) return null;
-	const data = options.decodeStream(fontFile);
+	const fontFile = descriptor.get("FontFile", options.resolver);
+	if (!(fontFile instanceof PdfStream)) return null;
+	const data = fontFile.getDecodedData();
 	if (!data || data.length === 0) return null;
 	try {
 		return new Type1FontProgram(parsePfb(data), data);
@@ -11035,15 +10795,7 @@ function tryAutoDetectFontFile3(data) {
 * Get the /Subtype from a stream dictionary.
 */
 function getStreamSubtype(stream) {
-	if (stream && stream instanceof PdfStream) return stream.getName("Subtype")?.value;
-}
-/**
-* Resolve a value through indirect references.
-*/
-function resolveValue(value, options) {
-	if (!value) return null;
-	if (options.resolveRef && value instanceof PdfRef) return options.resolveRef(value);
-	return value;
+	if (stream) return stream.getName("Subtype")?.value;
 }
 /**
 * Parse a font program directly from bytes.
@@ -11078,119 +10830,838 @@ function parseFontProgram(data) {
 }
 
 //#endregion
-//#region src/fonts/encodings/glyph-list.ts
+//#region src/fonts/font-descriptor.ts
 /**
-* Glyph name to Unicode mapping.
+* Font flags as defined in PDF spec Table 123.
+*/
+const FontFlags = {
+	FIXED_PITCH: 1,
+	SERIF: 2,
+	SYMBOLIC: 4,
+	SCRIPT: 8,
+	NONSYMBOLIC: 32,
+	ITALIC: 64,
+	ALL_CAP: 65536,
+	SMALL_CAP: 1 << 17,
+	FORCE_BOLD: 1 << 18
+};
+/**
+* FontDescriptor contains font metrics and flags.
+*/
+var FontDescriptor = class FontDescriptor {
+	fontName;
+	flags;
+	fontBBox;
+	italicAngle;
+	ascent;
+	descent;
+	leading;
+	capHeight;
+	xHeight;
+	stemV;
+	stemH;
+	avgWidth;
+	maxWidth;
+	missingWidth;
+	constructor(data) {
+		this.fontName = data.fontName;
+		this.flags = data.flags;
+		this.fontBBox = data.fontBBox;
+		this.italicAngle = data.italicAngle;
+		this.ascent = data.ascent;
+		this.descent = data.descent;
+		this.leading = data.leading;
+		this.capHeight = data.capHeight;
+		this.xHeight = data.xHeight;
+		this.stemV = data.stemV;
+		this.stemH = data.stemH;
+		this.avgWidth = data.avgWidth;
+		this.maxWidth = data.maxWidth;
+		this.missingWidth = data.missingWidth;
+	}
+	/** Check if font is fixed-pitch (monospace) */
+	get isFixedPitch() {
+		return (this.flags & FontFlags.FIXED_PITCH) !== 0;
+	}
+	/** Check if font is serif */
+	get isSerif() {
+		return (this.flags & FontFlags.SERIF) !== 0;
+	}
+	/** Check if font is symbolic (uses custom encoding) */
+	get isSymbolic() {
+		return (this.flags & FontFlags.SYMBOLIC) !== 0;
+	}
+	/** Check if font is script (cursive) */
+	get isScript() {
+		return (this.flags & FontFlags.SCRIPT) !== 0;
+	}
+	/** Check if font is non-symbolic (uses standard encoding) */
+	get isNonSymbolic() {
+		return (this.flags & FontFlags.NONSYMBOLIC) !== 0;
+	}
+	/** Check if font is italic */
+	get isItalic() {
+		return (this.flags & FontFlags.ITALIC) !== 0;
+	}
+	/** Check if font is all caps */
+	get isAllCap() {
+		return (this.flags & FontFlags.ALL_CAP) !== 0;
+	}
+	/** Check if font is small caps */
+	get isSmallCap() {
+		return (this.flags & FontFlags.SMALL_CAP) !== 0;
+	}
+	/** Check if font should be bold */
+	get isForceBold() {
+		return (this.flags & FontFlags.FORCE_BOLD) !== 0;
+	}
+	/**
+	* Parse FontDescriptor from a PDF dictionary.
+	*/
+	static parse(dict) {
+		const bboxArray = dict.getArray("FontBBox");
+		const fontBBox = [
+			0,
+			0,
+			0,
+			0
+		];
+		if (bboxArray && bboxArray.length >= 4) for (let i = 0; i < 4; i++) {
+			const item = bboxArray.at(i);
+			if (item instanceof PdfNumber) fontBBox[i] = item.value;
+		}
+		return new FontDescriptor({
+			fontName: dict.getName("FontName")?.value ?? "",
+			flags: dict.getNumber("Flags")?.value ?? 0,
+			fontBBox,
+			italicAngle: dict.getNumber("ItalicAngle")?.value ?? 0,
+			ascent: dict.getNumber("Ascent")?.value ?? 0,
+			descent: dict.getNumber("Descent")?.value ?? 0,
+			leading: dict.getNumber("Leading")?.value ?? 0,
+			capHeight: dict.getNumber("CapHeight")?.value ?? 0,
+			xHeight: dict.getNumber("XHeight")?.value ?? 0,
+			stemV: dict.getNumber("StemV")?.value ?? 0,
+			stemH: dict.getNumber("StemH")?.value ?? 0,
+			avgWidth: dict.getNumber("AvgWidth")?.value ?? 0,
+			maxWidth: dict.getNumber("MaxWidth")?.value ?? 0,
+			missingWidth: dict.getNumber("MissingWidth")?.value ?? 0
+		});
+	}
+};
+
+//#endregion
+//#region src/fonts/pdf-font.ts
+/**
+* Abstract base class for PDF fonts.
+*/
+var PdfFont = class {
+	/**
+	* Get width of text in points at a given font size.
+	*
+	* @param text - Unicode text to measure
+	* @param fontSize - Font size in points
+	* @returns Width in points
+	*/
+	getTextWidth(text, fontSize) {
+		let totalWidth = 0;
+		const codes = this.encodeText(text);
+		for (const code of codes) totalWidth += this.getWidth(code);
+		return totalWidth * fontSize / 1e3;
+	}
+};
+
+//#endregion
+//#region src/fonts/embedded-font.ts
+/**
+* EmbeddedFont represents a font that will be embedded into a PDF.
 *
-* This is a subset of the Adobe Glyph List (AGL) covering the glyphs
-* used in standard PDF encodings. For the full list, see:
-* https://github.com/adobe-type-tools/agl-aglfn
+* Usage:
+* ```typescript
+* const fontBytes = await fs.readFile("NotoSans-Regular.ttf");
+* const font = EmbeddedFont.fromBytes(fontBytes);
 *
-* Reference: pdf.js glyphlist.js
+* // Check if text can be encoded
+* if (font.canEncode("Hello ")) {
+*   const codes = font.encodeText("Hello ");
+*   const width = font.getTextWidth("Hello ", 12);
+* }
+* ```
 */
-const GLYPH_TO_UNICODE = {
-	space: 32,
-	exclam: 33,
-	quotedbl: 34,
-	numbersign: 35,
-	dollar: 36,
-	percent: 37,
-	ampersand: 38,
-	quotesingle: 39,
-	parenleft: 40,
-	parenright: 41,
-	asterisk: 42,
-	plus: 43,
-	comma: 44,
-	hyphen: 45,
-	period: 46,
-	slash: 47,
-	zero: 48,
-	one: 49,
-	two: 50,
-	three: 51,
-	four: 52,
-	five: 53,
-	six: 54,
-	seven: 55,
-	eight: 56,
-	nine: 57,
-	colon: 58,
-	semicolon: 59,
-	less: 60,
-	equal: 61,
-	greater: 62,
-	question: 63,
-	at: 64,
-	A: 65,
-	B: 66,
-	C: 67,
-	D: 68,
-	E: 69,
-	F: 70,
-	G: 71,
-	H: 72,
-	I: 73,
-	J: 74,
-	K: 75,
-	L: 76,
-	M: 77,
-	N: 78,
-	O: 79,
-	P: 80,
-	Q: 81,
-	R: 82,
-	S: 83,
-	T: 84,
-	U: 85,
-	V: 86,
-	W: 87,
-	X: 88,
-	Y: 89,
-	Z: 90,
-	bracketleft: 91,
-	backslash: 92,
-	bracketright: 93,
-	asciicircum: 94,
-	underscore: 95,
-	grave: 96,
-	a: 97,
-	b: 98,
-	c: 99,
-	d: 100,
-	e: 101,
-	f: 102,
-	g: 103,
-	h: 104,
-	i: 105,
-	j: 106,
-	k: 107,
-	l: 108,
-	m: 109,
-	n: 110,
-	o: 111,
-	p: 112,
-	q: 113,
-	r: 114,
-	s: 115,
-	t: 116,
-	u: 117,
-	v: 118,
-	w: 119,
-	x: 120,
-	y: 121,
-	z: 122,
-	braceleft: 123,
-	bar: 124,
-	braceright: 125,
-	asciitilde: 126,
-	exclamdown: 161,
-	cent: 162,
-	sterling: 163,
-	currency: 164,
-	yen: 165,
-	brokenbar: 166,
-	section: 167,
+var EmbeddedFont = class EmbeddedFont extends PdfFont {
+	subtype = "Type0";
+	/** Underlying font program */
+	fontProgram;
+	/** Original font data */
+	fontData;
+	/** Track used glyphs for subsetting (GID -> code points that use it) */
+	usedGlyphs = new Map([[0, /* @__PURE__ */ new Set()]]);
+	/** Track used code points for ToUnicode (codePoint -> GID) */
+	usedCodePoints = /* @__PURE__ */ new Map();
+	/** Subset tag (generated during save) */
+	_subsetTag = null;
+	/** Whether this font is used in a form field (prevents subsetting) */
+	_usedInForm = false;
+	/** Cached descriptor */
+	_descriptor = null;
+	constructor(fontProgram, fontData) {
+		super();
+		this.fontProgram = fontProgram;
+		this.fontData = fontData;
+	}
+	/**
+	* Create an EmbeddedFont from raw font bytes.
+	*
+	* @param data - TTF, OTF, or Type1 font data
+	* @param options - Embedding options
+	* @returns EmbeddedFont instance
+	* @throws {Error} if font format is not recognized
+	*/
+	static fromBytes(data, _options) {
+		return new EmbeddedFont(parseFontProgram(data), data);
+	}
+	/**
+	* Create an EmbeddedFont from an already-parsed TrueType font.
+	*/
+	static fromTrueTypeFont(font, data) {
+		return new EmbeddedFont(new TrueTypeFontProgram(font, data), data);
+	}
+	/**
+	* Get the base font name.
+	* During save, this will include a subset tag prefix (e.g., "ABCDEF+FontName").
+	*/
+	get baseFontName() {
+		const name = this.fontProgram.postScriptName ?? "Unknown";
+		return this._subsetTag ? `${this._subsetTag}+${name}` : name;
+	}
+	/**
+	* Get the font descriptor.
+	*/
+	get descriptor() {
+		if (!this._descriptor) this._descriptor = this.buildDescriptor();
+		return this._descriptor;
+	}
+	/**
+	* Get the underlying font program.
+	*/
+	get program() {
+		return this.fontProgram;
+	}
+	/**
+	* Get the original font data.
+	*/
+	get data() {
+		return this.fontData;
+	}
+	/**
+	* Get the subset tag (only available after save).
+	*/
+	get subsetTag() {
+		return this._subsetTag;
+	}
+	/**
+	* Set the subset tag (called during save).
+	*/
+	setSubsetTag(tag) {
+		this._subsetTag = tag;
+	}
+	/**
+	* Get all used glyph IDs.
+	*/
+	getUsedGlyphIds() {
+		return [...this.usedGlyphs.keys()].sort((a, b) => a - b);
+	}
+	/**
+	* Get mapping from code point to GID.
+	*/
+	getCodePointToGidMap() {
+		return new Map(this.usedCodePoints);
+	}
+	/**
+	* Get mapping from GID to Unicode code point.
+	*
+	* This is used for building the /W widths array and ToUnicode CMap.
+	* Since the content stream contains GIDs (with CIDToGIDMap /Identity),
+	* the /W array must be keyed by GID, and ToUnicode must map GID → Unicode.
+	*
+	* If multiple code points map to the same GID, returns the first one found.
+	*/
+	getGidToCodePointMap() {
+		const result = /* @__PURE__ */ new Map();
+		for (const [gid, codePoints] of this.usedGlyphs) if (codePoints.size > 0) {
+			const firstCodePoint = codePoints.values().next().value;
+			if (firstCodePoint !== void 0) result.set(gid, firstCodePoint);
+		}
+		return result;
+	}
+	/**
+	* Iterate over text, tracking glyph usage and returning codePoint/GID pairs.
+	* This is the shared implementation for encodeText and encodeTextToGids.
+	*/
+	trackAndEncode(text) {
+		const result = [];
+		for (const char of text) {
+			const codePoint = char.codePointAt(0);
+			if (codePoint === void 0) continue;
+			const gid = this.fontProgram.getGlyphId(codePoint);
+			if (!this.usedGlyphs.has(gid)) this.usedGlyphs.set(gid, /* @__PURE__ */ new Set());
+			this.usedGlyphs.get(gid).add(codePoint);
+			this.usedCodePoints.set(codePoint, gid);
+			result.push({
+				codePoint,
+				gid
+			});
+		}
+		return result;
+	}
+	/**
+	* Encode text to character codes.
+	*
+	* Returns Unicode code points, which is intuitive for users.
+	* The conversion to glyph IDs happens internally when writing to the PDF.
+	*
+	* Also tracks glyph usage for subsetting.
+	*/
+	encodeText(text) {
+		return this.trackAndEncode(text).map((e) => e.codePoint);
+	}
+	/**
+	* Encode text to glyph IDs for PDF content stream.
+	*
+	* This is an internal method used when writing to the PDF.
+	* With CIDToGIDMap /Identity, the content stream must contain GIDs.
+	*
+	* @internal
+	*/
+	encodeTextToGids(text) {
+		return this.trackAndEncode(text).map((e) => e.gid);
+	}
+	/**
+	* Convert a code point to its glyph ID.
+	*
+	* @internal
+	*/
+	codePointToGid(codePoint) {
+		return this.fontProgram.getGlyphId(codePoint);
+	}
+	/**
+	* Get width of a character in glyph units (1000 = 1 em).
+	*
+	* Takes a Unicode code point (user-friendly API).
+	*/
+	getWidth(code) {
+		const gid = this.fontProgram.getGlyphId(code);
+		const width = this.fontProgram.getAdvanceWidth(gid);
+		return Math.round(width * 1e3 / this.fontProgram.unitsPerEm);
+	}
+	/**
+	* Decode character code to Unicode string.
+	*
+	* For embedded fonts with Identity-H encoding, the code is the code point,
+	* so this just converts the code point back to a string.
+	*/
+	toUnicode(code) {
+		return String.fromCodePoint(code);
+	}
+	/**
+	* Check if the font can encode the given text.
+	* Returns true if all characters have glyphs in the font.
+	*/
+	canEncode(text) {
+		for (const char of text) {
+			const codePoint = char.codePointAt(0);
+			if (codePoint === void 0) continue;
+			if (!this.fontProgram.hasGlyph(codePoint)) return false;
+		}
+		return true;
+	}
+	/**
+	* Get the characters that cannot be encoded.
+	*/
+	getUnencodableCharacters(text) {
+		const unencodable = [];
+		for (const char of text) {
+			const codePoint = char.codePointAt(0);
+			if (codePoint === void 0) continue;
+			if (!this.fontProgram.hasGlyph(codePoint)) unencodable.push(char);
+		}
+		return unencodable;
+	}
+	/**
+	* Reset glyph usage tracking.
+	* Call this before re-encoding if you want a fresh subset.
+	*/
+	resetUsage() {
+		this.usedGlyphs.clear();
+		this.usedGlyphs.set(0, /* @__PURE__ */ new Set());
+		this.usedCodePoints.clear();
+		this._subsetTag = null;
+	}
+	/**
+	* Mark this font as used in a form field.
+	*
+	* Fonts used in form fields cannot be subsetted because users may type
+	* any character at runtime. This method is called automatically when
+	* an EmbeddedFont is used in form field appearances.
+	*/
+	markUsedInForm() {
+		this._usedInForm = true;
+	}
+	/**
+	* Check if this font is used in a form field.
+	*/
+	get usedInForm() {
+		return this._usedInForm;
+	}
+	/**
+	* Check if this font can be subsetted.
+	*
+	* Returns false if the font is used in a form field (since users can
+	* type any character at runtime).
+	*/
+	canSubset() {
+		return !this._usedInForm;
+	}
+	/**
+	* Get width of text in points at a given font size.
+	*
+	* Alias for getTextWidth() to match Standard14Font API.
+	*
+	* @param text - The text to measure
+	* @param size - Font size in points
+	* @returns Width in points
+	*/
+	widthOfTextAtSize(text, size) {
+		return this.getTextWidth(text, size);
+	}
+	/**
+	* Get the height of the font at a given size.
+	*
+	* This returns the full height from descender to ascender.
+	*
+	* @param size - Font size in points
+	* @returns Height in points
+	*/
+	heightAtSize(size) {
+		const desc = this.descriptor;
+		if (!desc) return size;
+		return (desc.ascent - desc.descent) * size / 1e3;
+	}
+	/**
+	* Calculate font size needed to achieve a specific text height.
+	*
+	* @param height - Desired height in points
+	* @returns Font size in points
+	*/
+	sizeAtHeight(height) {
+		const desc = this.descriptor;
+		if (!desc) return height;
+		const unitsHeight = desc.ascent - desc.descent;
+		return height * 1e3 / unitsHeight;
+	}
+	/**
+	* Calculate font size needed for text to fit a specific width.
+	*
+	* @param text - The text to measure
+	* @param width - Desired width in points
+	* @returns Font size in points
+	*/
+	sizeAtWidth(text, width) {
+		if (text.length === 0) return 0;
+		const codes = this.encodeText(text);
+		let totalWidth = 0;
+		for (const code of codes) totalWidth += this.getWidth(code);
+		if (totalWidth === 0) return 0;
+		return width * 1e3 / totalWidth;
+	}
+	/**
+	* Build a FontDescriptor from the font program.
+	*/
+	buildDescriptor() {
+		const program = this.fontProgram;
+		const bbox = program.bbox;
+		const scale = 1e3 / program.unitsPerEm;
+		return new FontDescriptor({
+			fontName: program.postScriptName ?? "Unknown",
+			flags: this.computeFlags(),
+			fontBBox: [
+				Math.round(bbox[0] * scale),
+				Math.round(bbox[1] * scale),
+				Math.round(bbox[2] * scale),
+				Math.round(bbox[3] * scale)
+			],
+			italicAngle: program.italicAngle,
+			ascent: Math.round(program.ascent * scale),
+			descent: Math.round(program.descent * scale),
+			leading: 0,
+			capHeight: Math.round(program.capHeight * scale),
+			xHeight: Math.round(program.xHeight * scale),
+			stemV: program.stemV,
+			stemH: 0,
+			avgWidth: 0,
+			maxWidth: 0,
+			missingWidth: this.getWidth(0)
+		});
+	}
+	/**
+	* Compute font flags for the descriptor.
+	*/
+	computeFlags() {
+		let flags = 0;
+		if (this.fontProgram.isFixedPitch) flags |= 1;
+		flags |= 4;
+		if (this.fontProgram.italicAngle !== 0) flags |= 64;
+		return flags;
+	}
+};
+
+//#endregion
+//#region src/helpers/unicode.ts
+/**
+* Unicode utilities for PDF text handling.
+*
+* Provides mappings between Unicode code points and PostScript glyph names.
+*/
+/**
+* Map Unicode code point to PostScript glyph name.
+* Returns undefined if no mapping exists.
+*/
+function unicodeToGlyphName(unicode) {
+	return UNICODE_TO_GLYPH.get(unicode);
+}
+/**
+* Common Unicode to glyph name mappings.
+* Covers ASCII and common Latin-1 extended characters.
+*
+* For a complete mapping, see the Adobe Glyph List:
+* https://github.com/adobe-type-tools/agl-aglfn
+*/
+const UNICODE_TO_GLYPH = new Map([
+	[32, "space"],
+	[33, "exclam"],
+	[34, "quotedbl"],
+	[35, "numbersign"],
+	[36, "dollar"],
+	[37, "percent"],
+	[38, "ampersand"],
+	[39, "quotesingle"],
+	[40, "parenleft"],
+	[41, "parenright"],
+	[42, "asterisk"],
+	[43, "plus"],
+	[44, "comma"],
+	[45, "hyphen"],
+	[46, "period"],
+	[47, "slash"],
+	[48, "zero"],
+	[49, "one"],
+	[50, "two"],
+	[51, "three"],
+	[52, "four"],
+	[53, "five"],
+	[54, "six"],
+	[55, "seven"],
+	[56, "eight"],
+	[57, "nine"],
+	[58, "colon"],
+	[59, "semicolon"],
+	[60, "less"],
+	[61, "equal"],
+	[62, "greater"],
+	[63, "question"],
+	[64, "at"],
+	[65, "A"],
+	[66, "B"],
+	[67, "C"],
+	[68, "D"],
+	[69, "E"],
+	[70, "F"],
+	[71, "G"],
+	[72, "H"],
+	[73, "I"],
+	[74, "J"],
+	[75, "K"],
+	[76, "L"],
+	[77, "M"],
+	[78, "N"],
+	[79, "O"],
+	[80, "P"],
+	[81, "Q"],
+	[82, "R"],
+	[83, "S"],
+	[84, "T"],
+	[85, "U"],
+	[86, "V"],
+	[87, "W"],
+	[88, "X"],
+	[89, "Y"],
+	[90, "Z"],
+	[91, "bracketleft"],
+	[92, "backslash"],
+	[93, "bracketright"],
+	[94, "asciicircum"],
+	[95, "underscore"],
+	[96, "grave"],
+	[97, "a"],
+	[98, "b"],
+	[99, "c"],
+	[100, "d"],
+	[101, "e"],
+	[102, "f"],
+	[103, "g"],
+	[104, "h"],
+	[105, "i"],
+	[106, "j"],
+	[107, "k"],
+	[108, "l"],
+	[109, "m"],
+	[110, "n"],
+	[111, "o"],
+	[112, "p"],
+	[113, "q"],
+	[114, "r"],
+	[115, "s"],
+	[116, "t"],
+	[117, "u"],
+	[118, "v"],
+	[119, "w"],
+	[120, "x"],
+	[121, "y"],
+	[122, "z"],
+	[123, "braceleft"],
+	[124, "bar"],
+	[125, "braceright"],
+	[126, "asciitilde"],
+	[160, "nbspace"],
+	[161, "exclamdown"],
+	[162, "cent"],
+	[163, "sterling"],
+	[164, "currency"],
+	[165, "yen"],
+	[166, "brokenbar"],
+	[167, "section"],
+	[168, "dieresis"],
+	[169, "copyright"],
+	[170, "ordfeminine"],
+	[171, "guillemotleft"],
+	[172, "logicalnot"],
+	[173, "softhyphen"],
+	[174, "registered"],
+	[175, "macron"],
+	[176, "degree"],
+	[177, "plusminus"],
+	[178, "twosuperior"],
+	[179, "threesuperior"],
+	[180, "acute"],
+	[181, "mu"],
+	[182, "paragraph"],
+	[183, "periodcentered"],
+	[184, "cedilla"],
+	[185, "onesuperior"],
+	[186, "ordmasculine"],
+	[187, "guillemotright"],
+	[188, "onequarter"],
+	[189, "onehalf"],
+	[190, "threequarters"],
+	[191, "questiondown"],
+	[192, "Agrave"],
+	[193, "Aacute"],
+	[194, "Acircumflex"],
+	[195, "Atilde"],
+	[196, "Adieresis"],
+	[197, "Aring"],
+	[198, "AE"],
+	[199, "Ccedilla"],
+	[200, "Egrave"],
+	[201, "Eacute"],
+	[202, "Ecircumflex"],
+	[203, "Edieresis"],
+	[204, "Igrave"],
+	[205, "Iacute"],
+	[206, "Icircumflex"],
+	[207, "Idieresis"],
+	[208, "Eth"],
+	[209, "Ntilde"],
+	[210, "Ograve"],
+	[211, "Oacute"],
+	[212, "Ocircumflex"],
+	[213, "Otilde"],
+	[214, "Odieresis"],
+	[215, "multiply"],
+	[216, "Oslash"],
+	[217, "Ugrave"],
+	[218, "Uacute"],
+	[219, "Ucircumflex"],
+	[220, "Udieresis"],
+	[221, "Yacute"],
+	[222, "Thorn"],
+	[223, "germandbls"],
+	[224, "agrave"],
+	[225, "aacute"],
+	[226, "acircumflex"],
+	[227, "atilde"],
+	[228, "adieresis"],
+	[229, "aring"],
+	[230, "ae"],
+	[231, "ccedilla"],
+	[232, "egrave"],
+	[233, "eacute"],
+	[234, "ecircumflex"],
+	[235, "edieresis"],
+	[236, "igrave"],
+	[237, "iacute"],
+	[238, "icircumflex"],
+	[239, "idieresis"],
+	[240, "eth"],
+	[241, "ntilde"],
+	[242, "ograve"],
+	[243, "oacute"],
+	[244, "ocircumflex"],
+	[245, "otilde"],
+	[246, "odieresis"],
+	[247, "divide"],
+	[248, "oslash"],
+	[249, "ugrave"],
+	[250, "uacute"],
+	[251, "ucircumflex"],
+	[252, "udieresis"],
+	[253, "yacute"],
+	[254, "thorn"],
+	[255, "ydieresis"],
+	[8211, "endash"],
+	[8212, "emdash"],
+	[8216, "quoteleft"],
+	[8217, "quoteright"],
+	[8218, "quotesinglbase"],
+	[8220, "quotedblleft"],
+	[8221, "quotedblright"],
+	[8222, "quotedblbase"],
+	[8224, "dagger"],
+	[8225, "daggerdbl"],
+	[8226, "bullet"],
+	[8230, "ellipsis"],
+	[8240, "perthousand"],
+	[8249, "guilsinglleft"],
+	[8250, "guilsinglright"],
+	[8364, "Euro"],
+	[8482, "trademark"],
+	[64257, "fi"],
+	[64258, "fl"]
+]);
+
+//#endregion
+//#region src/fonts/encodings/glyph-list.ts
+/**
+* Glyph name to Unicode mapping.
+*
+* This is a subset of the Adobe Glyph List (AGL) covering the glyphs
+* used in standard PDF encodings. For the full list, see:
+* https://github.com/adobe-type-tools/agl-aglfn
+*
+* Reference: pdf.js glyphlist.js
+*/
+const GLYPH_TO_UNICODE = {
+	space: 32,
+	exclam: 33,
+	quotedbl: 34,
+	numbersign: 35,
+	dollar: 36,
+	percent: 37,
+	ampersand: 38,
+	quotesingle: 39,
+	parenleft: 40,
+	parenright: 41,
+	asterisk: 42,
+	plus: 43,
+	comma: 44,
+	hyphen: 45,
+	period: 46,
+	slash: 47,
+	zero: 48,
+	one: 49,
+	two: 50,
+	three: 51,
+	four: 52,
+	five: 53,
+	six: 54,
+	seven: 55,
+	eight: 56,
+	nine: 57,
+	colon: 58,
+	semicolon: 59,
+	less: 60,
+	equal: 61,
+	greater: 62,
+	question: 63,
+	at: 64,
+	A: 65,
+	B: 66,
+	C: 67,
+	D: 68,
+	E: 69,
+	F: 70,
+	G: 71,
+	H: 72,
+	I: 73,
+	J: 74,
+	K: 75,
+	L: 76,
+	M: 77,
+	N: 78,
+	O: 79,
+	P: 80,
+	Q: 81,
+	R: 82,
+	S: 83,
+	T: 84,
+	U: 85,
+	V: 86,
+	W: 87,
+	X: 88,
+	Y: 89,
+	Z: 90,
+	bracketleft: 91,
+	backslash: 92,
+	bracketright: 93,
+	asciicircum: 94,
+	underscore: 95,
+	grave: 96,
+	a: 97,
+	b: 98,
+	c: 99,
+	d: 100,
+	e: 101,
+	f: 102,
+	g: 103,
+	h: 104,
+	i: 105,
+	j: 106,
+	k: 107,
+	l: 108,
+	m: 109,
+	n: 110,
+	o: 111,
+	p: 112,
+	q: 113,
+	r: 114,
+	s: 115,
+	t: 116,
+	u: 117,
+	v: 118,
+	w: 119,
+	x: 120,
+	y: 121,
+	z: 122,
+	braceleft: 123,
+	bar: 124,
+	braceright: 125,
+	asciitilde: 126,
+	exclamdown: 161,
+	cent: 162,
+	sterling: 163,
+	currency: 164,
+	yen: 165,
+	brokenbar: 166,
+	section: 167,
 	dieresis: 168,
 	copyright: 169,
 	ordfeminine: 170,
@@ -13316,147 +13787,6 @@ var ZapfDingbatsEncoding = class ZapfDingbatsEncoding extends SimpleEncoding {
 	}
 };
 
-//#endregion
-//#region src/fonts/font-descriptor.ts
-/**
-* Font flags as defined in PDF spec Table 123.
-*/
-const FontFlags = {
-	FIXED_PITCH: 1,
-	SERIF: 2,
-	SYMBOLIC: 4,
-	SCRIPT: 8,
-	NONSYMBOLIC: 32,
-	ITALIC: 64,
-	ALL_CAP: 65536,
-	SMALL_CAP: 1 << 17,
-	FORCE_BOLD: 1 << 18
-};
-/**
-* FontDescriptor contains font metrics and flags.
-*/
-var FontDescriptor = class FontDescriptor {
-	fontName;
-	flags;
-	fontBBox;
-	italicAngle;
-	ascent;
-	descent;
-	leading;
-	capHeight;
-	xHeight;
-	stemV;
-	stemH;
-	avgWidth;
-	maxWidth;
-	missingWidth;
-	constructor(data) {
-		this.fontName = data.fontName;
-		this.flags = data.flags;
-		this.fontBBox = data.fontBBox;
-		this.italicAngle = data.italicAngle;
-		this.ascent = data.ascent;
-		this.descent = data.descent;
-		this.leading = data.leading;
-		this.capHeight = data.capHeight;
-		this.xHeight = data.xHeight;
-		this.stemV = data.stemV;
-		this.stemH = data.stemH;
-		this.avgWidth = data.avgWidth;
-		this.maxWidth = data.maxWidth;
-		this.missingWidth = data.missingWidth;
-	}
-	/** Check if font is fixed-pitch (monospace) */
-	get isFixedPitch() {
-		return (this.flags & FontFlags.FIXED_PITCH) !== 0;
-	}
-	/** Check if font is serif */
-	get isSerif() {
-		return (this.flags & FontFlags.SERIF) !== 0;
-	}
-	/** Check if font is symbolic (uses custom encoding) */
-	get isSymbolic() {
-		return (this.flags & FontFlags.SYMBOLIC) !== 0;
-	}
-	/** Check if font is script (cursive) */
-	get isScript() {
-		return (this.flags & FontFlags.SCRIPT) !== 0;
-	}
-	/** Check if font is non-symbolic (uses standard encoding) */
-	get isNonSymbolic() {
-		return (this.flags & FontFlags.NONSYMBOLIC) !== 0;
-	}
-	/** Check if font is italic */
-	get isItalic() {
-		return (this.flags & FontFlags.ITALIC) !== 0;
-	}
-	/** Check if font is all caps */
-	get isAllCap() {
-		return (this.flags & FontFlags.ALL_CAP) !== 0;
-	}
-	/** Check if font is small caps */
-	get isSmallCap() {
-		return (this.flags & FontFlags.SMALL_CAP) !== 0;
-	}
-	/** Check if font should be bold */
-	get isForceBold() {
-		return (this.flags & FontFlags.FORCE_BOLD) !== 0;
-	}
-	/**
-	* Parse FontDescriptor from a PDF dictionary.
-	*/
-	static parse(dict) {
-		const bboxArray = dict.getArray("FontBBox");
-		const fontBBox = [
-			0,
-			0,
-			0,
-			0
-		];
-		if (bboxArray && bboxArray.length >= 4) for (let i = 0; i < 4; i++) {
-			const item = bboxArray.at(i);
-			if (item && item.type === "number") fontBBox[i] = item.value;
-		}
-		return new FontDescriptor({
-			fontName: dict.getName("FontName")?.value ?? "",
-			flags: dict.getNumber("Flags")?.value ?? 0,
-			fontBBox,
-			italicAngle: dict.getNumber("ItalicAngle")?.value ?? 0,
-			ascent: dict.getNumber("Ascent")?.value ?? 0,
-			descent: dict.getNumber("Descent")?.value ?? 0,
-			leading: dict.getNumber("Leading")?.value ?? 0,
-			capHeight: dict.getNumber("CapHeight")?.value ?? 0,
-			xHeight: dict.getNumber("XHeight")?.value ?? 0,
-			stemV: dict.getNumber("StemV")?.value ?? 0,
-			stemH: dict.getNumber("StemH")?.value ?? 0,
-			avgWidth: dict.getNumber("AvgWidth")?.value ?? 0,
-			maxWidth: dict.getNumber("MaxWidth")?.value ?? 0,
-			missingWidth: dict.getNumber("MissingWidth")?.value ?? 0
-		});
-	}
-};
-
-//#endregion
-//#region src/fonts/pdf-font.ts
-/**
-* Abstract base class for PDF fonts.
-*/
-var PdfFont = class {
-	/**
-	* Get width of text in points at a given font size.
-	*
-	* @param text - Unicode text to measure
-	* @param fontSize - Font size in points
-	* @returns Width in points
-	*/
-	getTextWidth(text, fontSize) {
-		let totalWidth = 0;
-		const codes = this.encodeText(text);
-		for (const code of codes) totalWidth += this.getWidth(code);
-		return totalWidth * fontSize / 1e3;
-	}
-};
-
 //#endregion
 //#region src/fonts/standard-14.ts
 /**
@@ -16695,25 +17025,6 @@ const FONT_GLYPH_WIDTHS = {
 
 //#endregion
 //#region src/fonts/simple-font.ts
-/**
-* SimpleFont - Base class for single-byte encoded fonts.
-*
-* This handles TrueType, Type1, and Type3 fonts which use single-byte
-* character codes (0-255).
-*
-* Font structure:
-* <<
-*   /Type /Font
-*   /Subtype /TrueType  (or /Type1, /Type3)
-*   /BaseFont /Helvetica
-*   /FirstChar 32
-*   /LastChar 255
-*   /Widths [278 278 355 ...]
-*   /Encoding /WinAnsiEncoding  (or dict with /Differences)
-*   /FontDescriptor 10 0 R
-*   /ToUnicode 11 0 R
-* >>
-*/
 const isSimpleFontSubtype = (subtype) => {
 	return subtype === "TrueType" || subtype === "Type1" || subtype === "Type3" || subtype === "MMType1";
 };
@@ -16850,34 +17161,25 @@ var SimpleFont = class extends PdfFont {
 * Parse a SimpleFont from a PDF font dictionary.
 */
 function parseSimpleFont(dict, options = {}) {
-	const subtypeName = dict.getName("Subtype");
+	const subtypeName = dict.getName("Subtype", options.resolver);
 	const subtype = isSimpleFontSubtype(subtypeName?.value) ? subtypeName.value : "TrueType";
-	const baseFontName = dict.getName("BaseFont")?.value ?? "Unknown";
-	const firstChar = dict.getNumber("FirstChar")?.value ?? 0;
-	const lastChar = dict.getNumber("LastChar")?.value ?? 255;
-	let w = dict.get("Widths");
-	let widthsArray = null;
-	if (w instanceof PdfRef && options.resolveRef) w = options.resolveRef(w) ?? void 0;
-	if (w instanceof PdfArray) widthsArray = w;
+	const baseFontName = dict.getName("BaseFont", options.resolver)?.value ?? "Unknown";
+	const firstChar = dict.getNumber("FirstChar", options.resolver)?.value ?? 0;
+	const lastChar = dict.getNumber("LastChar", options.resolver)?.value ?? 255;
+	let widthsArray = dict.getArray("Widths", options.resolver);
 	const widths = [];
 	if (widthsArray) for (let i = 0; i < widthsArray.length; i++) {
-		const item = widthsArray.at(i);
+		const item = widthsArray.at(i, options.resolver);
 		if (item instanceof PdfNumber) widths.push(item.value);
 		else widths.push(0);
 	}
-	const encoding = parseEncoding(dict, options.resolveRef);
+	const encoding = parseEncoding(dict, options.resolver);
 	let descriptor = null;
 	let embeddedProgram = null;
-	const descriptorRef = dict.get("FontDescriptor");
-	if (descriptorRef && options.resolveRef) {
-		const descriptorDict = options.resolveRef(descriptorRef);
-		if (descriptorDict && "getString" in descriptorDict) {
-			descriptor = FontDescriptor.parse(descriptorDict);
-			if (options.decodeStream) embeddedProgram = parseEmbeddedProgram(descriptorDict, {
-				decodeStream: options.decodeStream,
-				resolveRef: options.resolveRef
-			});
-		}
+	const fontDescriptor = dict.getDict("FontDescriptor", options.resolver);
+	if (fontDescriptor) {
+		descriptor = FontDescriptor.parse(fontDescriptor);
+		embeddedProgram = parseEmbeddedProgram(fontDescriptor, { resolver: options.resolver });
 	}
 	return new SimpleFont({
 		subtype,
@@ -16894,36 +17196,31 @@ function parseSimpleFont(dict, options = {}) {
 /**
 * Parse encoding from font dictionary.
 */
-function parseEncoding(dict, resolveRef) {
-	const encodingValue = dict.get("Encoding");
+function parseEncoding(dict, resolver) {
+	const encodingValue = dict.get("Encoding", resolver);
 	if (!encodingValue) {
-		const baseFontName = dict.getName("BaseFont")?.value ?? "";
+		const baseFontName = dict.getName("BaseFont", resolver)?.value ?? "";
 		if (baseFontName === "Symbol") return SymbolEncoding.instance;
 		if (baseFontName === "ZapfDingbats") return ZapfDingbatsEncoding.instance;
 		return StandardEncoding.instance;
 	}
-	if (encodingValue.type === "name") return getEncodingByName(encodingValue.value);
-	if (encodingValue.type === "dict") return parseEncodingDict(encodingValue);
-	if (encodingValue.type === "ref" && resolveRef) {
-		const resolved = resolveRef(encodingValue);
-		if (resolved && resolved.type === "dict") return parseEncodingDict(resolved);
-	}
+	if (encodingValue instanceof PdfName) return getEncodingByName(encodingValue.value);
+	if (encodingValue instanceof PdfDict) return parseEncodingDict(encodingValue, resolver);
 	return WinAnsiEncoding.instance;
 }
 /**
 * Parse encoding dictionary.
 */
-function parseEncodingDict(dict) {
-	const baseEncodingName = dict.getName("BaseEncoding");
+function parseEncodingDict(dict, resolver) {
+	const baseEncodingName = dict.getName("BaseEncoding", resolver);
 	const baseEncoding = baseEncodingName ? getEncodingByName(baseEncodingName.value) : WinAnsiEncoding.instance;
-	const differencesArray = dict.getArray("Differences");
+	const differencesArray = dict.getArray("Differences", resolver);
 	if (!differencesArray || differencesArray.length === 0) return baseEncoding;
 	const items = [];
 	for (let i = 0; i < differencesArray.length; i++) {
 		const item = differencesArray.at(i);
 		if (item) {
-			if (item.type === "number") items.push(item.value);
-			else if (item.type === "name") items.push(item.value);
+			if (item instanceof PdfNumber || item instanceof PdfName) items.push(item.value);
 		}
 	}
 	return new DifferencesEncoding(baseEncoding, DifferencesEncoding.parseDifferencesArray(items));
@@ -16945,6 +17242,15 @@ function getEncodingByName(name) {
 //#endregion
 //#region src/document/forms/form-font.ts
 /**
+* Form font types for use in form fields.
+*
+* Supports two font types:
+* - EmbeddedFont: Full font with metrics and subsetting
+* - ExistingFont: Lightweight wrapper for fonts already in the PDF
+*
+* PDF Reference: Section 12.7.3.3 "Variable Text"
+*/
+/**
 * Existing font from PDF's default resources.
 *
 * This is a lightweight wrapper for fonts already present in the PDF,
@@ -17068,18 +17374,11 @@ function mapToStandardFont(name) {
 function parseExistingFont(name, fontObj, registry) {
 	let ref = null;
 	let simpleFont = null;
-	if (fontObj?.type === "ref") {
+	if (fontObj instanceof PdfRef) {
 		ref = fontObj;
 		const resolved = registry.getObject(fontObj);
-		if (resolved?.type === "dict") try {
-			const resolveRef = (r) => {
-				if (r instanceof PdfRef) {
-					const obj = registry.getObject(r);
-					if (obj instanceof PdfDict || obj instanceof PdfArray || obj instanceof PdfStream) return obj;
-				}
-				return null;
-			};
-			simpleFont = parseSimpleFont(resolved, { resolveRef });
+		if (resolved instanceof PdfDict) try {
+			simpleFont = parseSimpleFont(resolved, { resolver: registry.resolve.bind(registry) });
 		} catch (err) {
 			console.warn(err);
 		}
@@ -17090,7 +17389,7 @@ function parseExistingFont(name, fontObj, registry) {
 * Check if a font is an EmbeddedFont.
 */
 function isEmbeddedFont(font) {
-	return "encodeText" in font && "getUsedGlyphIds" in font;
+	return font instanceof EmbeddedFont;
 }
 /**
 * Check if a font is an ExistingFont.
@@ -18348,11 +18647,11 @@ var WidgetAnnotation = class {
 	getOnValue() {
 		const ap = this.dict.getDict("AP");
 		if (!ap) return null;
-		const n = ap.get("N");
+		const resolve = this.registry.resolve.bind(this.registry);
+		const n = ap.get("N", resolve);
 		if (!n) return null;
-		const nResolved = n.type === "ref" ? this.registry.getObject(n) : n;
-		if (nResolved instanceof PdfDict && !(nResolved instanceof PdfStream)) {
-			for (const key$1 of nResolved.keys()) if (key$1.value !== "Off") return key$1.value;
+		if (n instanceof PdfDict && !(n instanceof PdfStream)) {
+			for (const key$1 of n.keys()) if (key$1.value !== "Off") return key$1.value;
 		}
 		return null;
 	}
@@ -18365,11 +18664,11 @@ var WidgetAnnotation = class {
 	hasAppearancesForStates(states) {
 		const ap = this.dict.getDict("AP");
 		if (!ap) return false;
-		const n = ap.get("N");
+		const resolve = this.registry.resolve.bind(this.registry);
+		const n = ap.get("N", resolve);
 		if (!n) return false;
-		const nResolved = n.type === "ref" ? this.registry.getObject(n) : n;
-		if (nResolved instanceof PdfDict && !(nResolved instanceof PdfStream)) {
-			for (const state of states) if (!nResolved.has(state)) return false;
+		if (n instanceof PdfDict && !(n instanceof PdfStream)) {
+			for (const state of states) if (!n.has(state)) return false;
 			return true;
 		}
 		return states.length === 0;
@@ -18390,15 +18689,13 @@ var WidgetAnnotation = class {
 	getNormalAppearance(state) {
 		const ap = this.dict.getDict("AP");
 		if (!ap) return null;
-		let n = ap.get("N");
+		const resolve = this.registry.resolve.bind(this.registry);
+		const n = ap.get("N", resolve);
 		if (!n) return null;
-		if (n instanceof PdfRef) n = this.registry.resolve(n) ?? void 0;
 		if (n instanceof PdfStream) return n;
 		if (n instanceof PdfDict) {
 			const stateKey = state ?? this.appearanceState ?? "Off";
-			let stateEntry = n.get(stateKey);
-			if (!stateEntry) return null;
-			if (stateEntry instanceof PdfRef) stateEntry = this.registry.resolve(stateEntry) ?? void 0;
+			const stateEntry = n.get(stateKey, resolve);
 			if (stateEntry instanceof PdfStream) return stateEntry;
 			return null;
 		}
@@ -18410,15 +18707,13 @@ var WidgetAnnotation = class {
 	getRolloverAppearance(state) {
 		const ap = this.dict.getDict("AP");
 		if (!ap) return null;
-		let r = ap.get("R");
+		const resolve = this.registry.resolve.bind(this.registry);
+		const r = ap.get("R", resolve);
 		if (!r) return null;
-		if (r instanceof PdfRef) r = this.registry.resolve(r) ?? void 0;
 		if (r instanceof PdfStream) return r;
 		if (r instanceof PdfDict) {
 			const stateKey = state ?? this.appearanceState ?? "Off";
-			let stateEntry = r.get(stateKey);
-			if (!stateEntry) return null;
-			if (stateEntry instanceof PdfRef) stateEntry = this.registry.resolve(stateEntry) ?? void 0;
+			const stateEntry = r.get(stateKey, resolve);
 			if (stateEntry instanceof PdfStream) return stateEntry;
 			return null;
 		}
@@ -18430,15 +18725,13 @@ var WidgetAnnotation = class {
 	getDownAppearance(state) {
 		const ap = this.dict.getDict("AP");
 		if (!ap) return null;
-		let d = ap.get("D");
+		const resolve = this.registry.resolve.bind(this.registry);
+		const d = ap.get("D", resolve);
 		if (!d) return null;
-		if (d instanceof PdfRef) d = this.registry.resolve(d) ?? void 0;
 		if (d instanceof PdfStream) return d;
 		if (d instanceof PdfDict) {
 			const stateKey = state ?? this.appearanceState ?? "Off";
-			let stateEntry = d.get(stateKey);
-			if (!stateEntry) return null;
-			if (stateEntry instanceof PdfRef) stateEntry = this.registry.resolve(stateEntry) ?? void 0;
+			const stateEntry = d.get(stateKey, resolve);
 			if (stateEntry instanceof PdfStream) return stateEntry;
 			return null;
 		}
@@ -18468,14 +18761,8 @@ var WidgetAnnotation = class {
 	* Get appearance characteristics (/MK dictionary).
 	*/
 	getAppearanceCharacteristics() {
-		const mkEntry = this.dict.get("MK");
-		if (!mkEntry) return null;
-		let mk = null;
-		if (mkEntry instanceof PdfDict) mk = mkEntry;
-		else if (mkEntry.type === "ref") {
-			const resolved = this.registry.getObject(mkEntry);
-			if (resolved instanceof PdfDict) mk = resolved;
-		}
+		const resolve = this.registry.resolve.bind(this.registry);
+		const mk = this.dict.getDict("MK", resolve);
 		if (!mk) return null;
 		return {
 			rotation: mk.getNumber("R")?.value ?? 0,
@@ -18614,11 +18901,8 @@ var FormField = class {
 		while (current) {
 			if (visited.has(current)) break;
 			visited.add(current);
-			const value = current.get(key$1);
-			if (value !== void 0) {
-				if (value instanceof PdfRef) return this.registry.getObject(value);
-				return value;
-			}
+			const value = current.get(key$1, this.registry.resolve.bind(this.registry));
+			if (value !== void 0) return value;
 			const parentRef = current.getRef("Parent");
 			if (!parentRef) break;
 			const obj = this.registry.getObject(parentRef);
@@ -18859,8 +19143,7 @@ var TerminalField = class extends FormField {
 	* This ensures getAppearanceCharacteristics() can work synchronously.
 	*/
 	resolveMK(dict) {
-		const mkEntry = dict.get("MK");
-		if (mkEntry instanceof PdfRef) this.registry.resolve(mkEntry);
+		dict.getDict("MK", this.registry.resolve.bind(this.registry));
 	}
 	/**
 	* Add a widget to this field's /Kids array.
@@ -19210,12 +19493,6 @@ var ListBoxField = class extends TerminalField {
 //#endregion
 //#region src/document/forms/fields/other-fields.ts
 /**
-* Other field types: Signature, Button, and Unknown.
-*
-* PDF Reference: Section 12.7.4.5 "Signature Fields"
-* PDF Reference: Section 12.7.4.2 "Button Fields"
-*/
-/**
 * Signature field.
 */
 var SignatureField = class extends TerminalField {
@@ -19230,13 +19507,7 @@ var SignatureField = class extends TerminalField {
 	* Get signature dictionary (if signed).
 	*/
 	getSignatureDict() {
-		const v = this.dict.get("V");
-		if (!v) return null;
-		if (v instanceof PdfRef) {
-			const resolved = this.registry.getObject(v);
-			return resolved instanceof PdfDict ? resolved : null;
-		}
-		return v instanceof PdfDict ? v : null;
+		return this.dict.getDict("V", this.registry.resolve.bind(this.registry)) ?? null;
 	}
 	/**
 	* Signature fields don't have simple values.
@@ -19322,7 +19593,7 @@ var RadioField = class extends TerminalField {
 	* that are different from the widget appearance state names.
 	*/
 	getExportValues() {
-		const opt = this.dict.getArray("Opt");
+		const opt = this.dict.getArray("Opt", this.registry.resolve.bind(this.registry));
 		if (!opt) return this.getOptions();
 		const values = [];
 		for (let i = 0; i < opt.length; i++) {
@@ -19441,11 +19712,6 @@ var TextField = class extends TerminalField {
 //#endregion
 //#region src/document/forms/fields/factory.ts
 /**
-* Form field factory function.
-*
-* Creates the appropriate field type based on /FT and /Ff values.
-*/
-/**
 * Create a terminal FormField instance based on /FT and /Ff.
 *
 * This factory creates only terminal fields (value-holding fields with widgets).
@@ -19473,15 +19739,15 @@ function createFormField(dict, ref, registry, acroForm, name) {
 function getInheritableFieldName(dict, key$1, registry) {
 	let current = dict;
 	const visited = /* @__PURE__ */ new Set();
+	const resolve = registry.resolve.bind(registry);
 	while (current) {
 		if (visited.has(current)) break;
 		visited.add(current);
-		const value = current.get(key$1);
-		if (value instanceof PdfName) return value.value;
-		const parentRef = current.getRef("Parent");
-		if (!parentRef) break;
-		const obj = registry.getObject(parentRef);
-		current = obj instanceof PdfDict ? obj : null;
+		const value = current.getName(key$1, resolve);
+		if (value) return value.value;
+		const parent = current.getDict("Parent", resolve);
+		if (!parent) break;
+		current = parent;
 	}
 	return null;
 }
@@ -19491,15 +19757,15 @@ function getInheritableFieldName(dict, key$1, registry) {
 function getInheritableFieldNumber(dict, key$1, registry) {
 	let current = dict;
 	const visited = /* @__PURE__ */ new Set();
+	const resolve = registry.resolve.bind(registry);
 	while (current) {
 		if (visited.has(current)) break;
 		visited.add(current);
-		const value = current.get(key$1);
-		if (value instanceof PdfNumber) return value.value;
-		const parentRef = current.getRef("Parent");
-		if (!parentRef) break;
-		const obj = registry.getObject(parentRef);
-		current = obj instanceof PdfDict ? obj : null;
+		const value = current.getNumber(key$1, resolve);
+		if (value) return value.value;
+		const parent = current.getDict("Parent", resolve);
+		if (!parent) break;
+		current = parent;
 	}
 	return 0;
 }
@@ -19554,7 +19820,9 @@ var FieldTree = class FieldTree {
 	* @returns A fully-loaded FieldTree
 	*/
 	static load(acroForm, registry) {
-		const fieldsArray = acroForm.getDict().getArray("Fields");
+		const dict = acroForm.getDict();
+		const resolve = registry.resolve.bind(registry);
+		const fieldsArray = dict.getArray("Fields", resolve);
 		if (!fieldsArray) return new FieldTree([]);
 		const visited = /* @__PURE__ */ new Set();
 		const fields = [];
@@ -19580,7 +19848,7 @@ var FieldTree = class FieldTree {
 			if (item instanceof PdfRef) item = registry.resolve(item) ?? void 0;
 			if (item instanceof PdfDict) fieldDict = item;
 			if (!fieldDict) continue;
-			const partialName = fieldDict.getString("T")?.asString() ?? "";
+			const partialName = fieldDict.getString("T", resolve)?.asString() ?? "";
 			const fullName = parentName ? partialName ? `${parentName}.${partialName}` : parentName : partialName;
 			if (checkIsTerminalField(fieldDict, registry)) {
 				const field = createFormField(fieldDict, ref, registry, acroForm, fullName);
@@ -19593,7 +19861,7 @@ var FieldTree = class FieldTree {
 				nonTerminal.parent = parent;
 				fields.push(nonTerminal);
 				if (parent instanceof NonTerminalField) parent.addChild(nonTerminal);
-				const kids = fieldDict.getArray("Kids");
+				const kids = fieldDict.getArray("Kids", resolve);
 				if (kids) for (let i = 0; i < kids.length; i++) queue.push({
 					item: kids.at(i),
 					parentName: fullName,
@@ -19663,7 +19931,8 @@ var FieldTree = class FieldTree {
 * - Its /Kids contain widgets (no /T) rather than child fields (have /T)
 */
 function checkIsTerminalField(dict, registry) {
-	const kids = dict.getArray("Kids");
+	const resolve = registry.resolve.bind(registry);
+	const kids = dict.getArray("Kids", resolve);
 	if (!kids || kids.length === 0) return true;
 	let firstKid = kids.at(0);
 	if (!firstKid) return true;
@@ -19773,7 +20042,7 @@ var FormFlattener = class {
 		for (const pageRef of pageRefs) {
 			const pageDict = this.registry.resolve(pageRef);
 			if (!(pageDict instanceof PdfDict)) continue;
-			const annots = pageDict.getArray("Annots");
+			const annots = pageDict.getArray("Annots", this.registry.resolve.bind(this.registry));
 			if (!annots) continue;
 			for (let i = 0; i < annots.length; i++) {
 				const annotRef = annots.at(i);
@@ -19794,12 +20063,13 @@ var FormFlattener = class {
 	flattenWidgetsOnPage(pageRef, widgets) {
 		const pageDict = this.registry.resolve(pageRef);
 		if (!(pageDict instanceof PdfDict)) return;
-		let resources = pageDict.getDict("Resources");
+		const resolve = this.registry.resolve.bind(this.registry);
+		let resources = pageDict.getDict("Resources", resolve);
 		if (!resources) {
 			resources = new PdfDict();
 			pageDict.set("Resources", resources);
 		}
-		let xObjects = resources.getDict("XObject");
+		let xObjects = resources.getDict("XObject", resolve);
 		if (!xObjects) {
 			xObjects = new PdfDict();
 			resources.set("XObject", xObjects);
@@ -19833,7 +20103,7 @@ var FormFlattener = class {
 	* Per PDFBox: BBox must exist and have width/height > 0.
 	*/
 	isVisibleAppearance(appearance) {
-		const bbox = appearance.getArray("BBox");
+		const bbox = appearance.getArray("BBox", this.registry.resolve.bind(this.registry));
 		if (!bbox || bbox.length < 4) return false;
 		const [x1, y1, x2, y2] = bbox.toArray().map((item) => item instanceof PdfNumber ? item.value : 0);
 		const width = Math.abs((x2 ?? 0) - (x1 ?? 0));
@@ -19935,7 +20205,7 @@ var FormFlattener = class {
 	* Get the appearance stream's transformation matrix.
 	*/
 	getAppearanceMatrix(appearance) {
-		const matrixArray = appearance.getArray("Matrix");
+		const matrixArray = appearance.getArray("Matrix", this.registry.resolve.bind(this.registry));
 		if (!matrixArray || matrixArray.length < 6) return Matrix.identity();
 		const [a, b, c, d, e, f] = matrixArray.toArray().map((item) => item instanceof PdfNumber ? item.value : 0);
 		return new Matrix(a ?? 0, b ?? 0, c ?? 0, d ?? 0, e ?? 0, f ?? 0);
@@ -19944,7 +20214,7 @@ var FormFlattener = class {
 	* Get appearance BBox, with fallback.
 	*/
 	getAppearanceBBox(appearance) {
-		const bbox = appearance.getArray("BBox");
+		const bbox = appearance.getArray("BBox", this.registry.resolve.bind(this.registry));
 		if (!bbox || bbox.length < 4) return [
 			0,
 			0,
@@ -19963,14 +20233,7 @@ var FormFlattener = class {
 	* Remove specific annotations from page.
 	*/
 	removeAnnotations(page, toRemove) {
-		const annotsEntry = page.get("Annots");
-		if (!annotsEntry) return;
-		let annots = null;
-		if (annotsEntry instanceof PdfArray) annots = annotsEntry;
-		else if (annotsEntry instanceof PdfRef) {
-			const resolved = this.registry.resolve(annotsEntry);
-			if (resolved instanceof PdfArray) annots = resolved;
-		}
+		const annots = page.getArray("Annots", this.registry.resolve.bind(this.registry));
 		if (!annots) return;
 		const remaining = [];
 		for (let i = 0; i < annots.length; i++) {
@@ -20036,11 +20299,8 @@ var AcroForm = class AcroForm {
 	* @param pageTree Optional page tree for efficient page lookups during flattening
 	*/
 	static load(catalog, registry, pageTree) {
-		let acroFormEntry = catalog.get("AcroForm");
-		if (!acroFormEntry) return null;
-		let dict = null;
-		if (acroFormEntry instanceof PdfRef) acroFormEntry = registry.resolve(acroFormEntry) ?? void 0;
-		if (acroFormEntry instanceof PdfDict) dict = acroFormEntry;
+		const resolve = registry.resolve.bind(registry);
+		const dict = catalog.getDict("AcroForm", resolve);
 		if (!dict) return null;
 		return new AcroForm(dict, registry, pageTree ?? null);
 	}
@@ -20048,11 +20308,7 @@ var AcroForm = class AcroForm {
 	* Default resources dictionary (fonts, etc.).
 	*/
 	getDefaultResources() {
-		let dr = this.dict.get("DR");
-		if (!dr) return null;
-		if (dr instanceof PdfRef) dr = this.registry.resolve(dr) ?? void 0;
-		if (dr instanceof PdfDict) return dr;
-		return null;
+		return this.dict.getDict("DR", this.registry.resolve.bind(this.registry)) ?? null;
 	}
 	/**
 	* Default appearance string.
@@ -20216,9 +20472,10 @@ var AcroForm = class AcroForm {
 	ensureExistingFontsLoaded() {
 		if (this.existingFontsCache !== null) return;
 		this.existingFontsCache = /* @__PURE__ */ new Map();
-		const dr = this.dict.getDict("DR");
+		const resolve = this.registry.resolve.bind(this.registry);
+		const dr = this.dict.getDict("DR", resolve);
 		if (!dr) return;
-		const fonts = dr.getDict("Font");
+		const fonts = dr.getDict("Font", resolve);
 		if (!fonts) return;
 		for (const key$1 of fonts.keys()) {
 			const fontName = key$1.value;
@@ -20393,12 +20650,13 @@ var AcroForm = class AcroForm {
 	* @returns The font name used in the /DR dictionary
 	*/
 	addFontToResources(fontRef, name) {
-		let dr = this.dict.getDict("DR");
+		const resolve = this.registry.resolve.bind(this.registry);
+		let dr = this.dict.getDict("DR", resolve);
 		if (!dr) {
 			dr = new PdfDict();
 			this.dict.set("DR", dr);
 		}
-		let fontsDict = dr.getDict("Font");
+		let fontsDict = dr.getDict("Font", resolve);
 		if (!fontsDict) {
 			fontsDict = new PdfDict();
 			dr.set("Font", fontsDict);
@@ -20482,371 +20740,8 @@ var AcroForm = class AcroForm {
 	}
 };
 
-//#endregion
-//#region src/fonts/embedded-font.ts
-/**
-* EmbeddedFont represents a font that will be embedded into a PDF.
-*
-* Usage:
-* ```typescript
-* const fontBytes = await fs.readFile("NotoSans-Regular.ttf");
-* const font = EmbeddedFont.fromBytes(fontBytes);
-*
-* // Check if text can be encoded
-* if (font.canEncode("Hello ")) {
-*   const codes = font.encodeText("Hello ");
-*   const width = font.getTextWidth("Hello ", 12);
-* }
-* ```
-*/
-var EmbeddedFont = class EmbeddedFont extends PdfFont {
-	subtype = "Type0";
-	/** Underlying font program */
-	fontProgram;
-	/** Original font data */
-	fontData;
-	/** Track used glyphs for subsetting (GID -> code points that use it) */
-	usedGlyphs = new Map([[0, /* @__PURE__ */ new Set()]]);
-	/** Track used code points for ToUnicode (codePoint -> GID) */
-	usedCodePoints = /* @__PURE__ */ new Map();
-	/** Subset tag (generated during save) */
-	_subsetTag = null;
-	/** Whether this font is used in a form field (prevents subsetting) */
-	_usedInForm = false;
-	/** Cached descriptor */
-	_descriptor = null;
-	constructor(fontProgram, fontData) {
-		super();
-		this.fontProgram = fontProgram;
-		this.fontData = fontData;
-	}
-	/**
-	* Create an EmbeddedFont from raw font bytes.
-	*
-	* @param data - TTF, OTF, or Type1 font data
-	* @param options - Embedding options
-	* @returns EmbeddedFont instance
-	* @throws {Error} if font format is not recognized
-	*/
-	static fromBytes(data, _options) {
-		return new EmbeddedFont(parseFontProgram(data), data);
-	}
-	/**
-	* Create an EmbeddedFont from an already-parsed TrueType font.
-	*/
-	static fromTrueTypeFont(font, data) {
-		return new EmbeddedFont(new TrueTypeFontProgram(font, data), data);
-	}
-	/**
-	* Get the base font name.
-	* During save, this will include a subset tag prefix (e.g., "ABCDEF+FontName").
-	*/
-	get baseFontName() {
-		const name = this.fontProgram.postScriptName ?? "Unknown";
-		return this._subsetTag ? `${this._subsetTag}+${name}` : name;
-	}
-	/**
-	* Get the font descriptor.
-	*/
-	get descriptor() {
-		if (!this._descriptor) this._descriptor = this.buildDescriptor();
-		return this._descriptor;
-	}
-	/**
-	* Get the underlying font program.
-	*/
-	get program() {
-		return this.fontProgram;
-	}
-	/**
-	* Get the original font data.
-	*/
-	get data() {
-		return this.fontData;
-	}
-	/**
-	* Get the subset tag (only available after save).
-	*/
-	get subsetTag() {
-		return this._subsetTag;
-	}
-	/**
-	* Set the subset tag (called during save).
-	*/
-	setSubsetTag(tag) {
-		this._subsetTag = tag;
-	}
-	/**
-	* Get all used glyph IDs.
-	*/
-	getUsedGlyphIds() {
-		return [...this.usedGlyphs.keys()].sort((a, b) => a - b);
-	}
-	/**
-	* Get mapping from code point to GID.
-	*/
-	getCodePointToGidMap() {
-		return new Map(this.usedCodePoints);
-	}
-	/**
-	* Get mapping from GID to Unicode code point.
-	*
-	* This is used for building the /W widths array and ToUnicode CMap.
-	* Since the content stream contains GIDs (with CIDToGIDMap /Identity),
-	* the /W array must be keyed by GID, and ToUnicode must map GID → Unicode.
-	*
-	* If multiple code points map to the same GID, returns the first one found.
-	*/
-	getGidToCodePointMap() {
-		const result = /* @__PURE__ */ new Map();
-		for (const [gid, codePoints] of this.usedGlyphs) if (codePoints.size > 0) {
-			const firstCodePoint = codePoints.values().next().value;
-			if (firstCodePoint !== void 0) result.set(gid, firstCodePoint);
-		}
-		return result;
-	}
-	/**
-	* Iterate over text, tracking glyph usage and returning codePoint/GID pairs.
-	* This is the shared implementation for encodeText and encodeTextToGids.
-	*/
-	trackAndEncode(text) {
-		const result = [];
-		for (const char of text) {
-			const codePoint = char.codePointAt(0);
-			if (codePoint === void 0) continue;
-			const gid = this.fontProgram.getGlyphId(codePoint);
-			if (!this.usedGlyphs.has(gid)) this.usedGlyphs.set(gid, /* @__PURE__ */ new Set());
-			this.usedGlyphs.get(gid).add(codePoint);
-			this.usedCodePoints.set(codePoint, gid);
-			result.push({
-				codePoint,
-				gid
-			});
-		}
-		return result;
-	}
-	/**
-	* Encode text to character codes.
-	*
-	* Returns Unicode code points, which is intuitive for users.
-	* The conversion to glyph IDs happens internally when writing to the PDF.
-	*
-	* Also tracks glyph usage for subsetting.
-	*/
-	encodeText(text) {
-		return this.trackAndEncode(text).map((e) => e.codePoint);
-	}
-	/**
-	* Encode text to glyph IDs for PDF content stream.
-	*
-	* This is an internal method used when writing to the PDF.
-	* With CIDToGIDMap /Identity, the content stream must contain GIDs.
-	*
-	* @internal
-	*/
-	encodeTextToGids(text) {
-		return this.trackAndEncode(text).map((e) => e.gid);
-	}
-	/**
-	* Convert a code point to its glyph ID.
-	*
-	* @internal
-	*/
-	codePointToGid(codePoint) {
-		return this.fontProgram.getGlyphId(codePoint);
-	}
-	/**
-	* Get width of a character in glyph units (1000 = 1 em).
-	*
-	* Takes a Unicode code point (user-friendly API).
-	*/
-	getWidth(code) {
-		const gid = this.fontProgram.getGlyphId(code);
-		const width = this.fontProgram.getAdvanceWidth(gid);
-		return Math.round(width * 1e3 / this.fontProgram.unitsPerEm);
-	}
-	/**
-	* Decode character code to Unicode string.
-	*
-	* For embedded fonts with Identity-H encoding, the code is the code point,
-	* so this just converts the code point back to a string.
-	*/
-	toUnicode(code) {
-		return String.fromCodePoint(code);
-	}
-	/**
-	* Check if the font can encode the given text.
-	* Returns true if all characters have glyphs in the font.
-	*/
-	canEncode(text) {
-		for (const char of text) {
-			const codePoint = char.codePointAt(0);
-			if (codePoint === void 0) continue;
-			if (!this.fontProgram.hasGlyph(codePoint)) return false;
-		}
-		return true;
-	}
-	/**
-	* Get the characters that cannot be encoded.
-	*/
-	getUnencodableCharacters(text) {
-		const unencodable = [];
-		for (const char of text) {
-			const codePoint = char.codePointAt(0);
-			if (codePoint === void 0) continue;
-			if (!this.fontProgram.hasGlyph(codePoint)) unencodable.push(char);
-		}
-		return unencodable;
-	}
-	/**
-	* Reset glyph usage tracking.
-	* Call this before re-encoding if you want a fresh subset.
-	*/
-	resetUsage() {
-		this.usedGlyphs.clear();
-		this.usedGlyphs.set(0, /* @__PURE__ */ new Set());
-		this.usedCodePoints.clear();
-		this._subsetTag = null;
-	}
-	/**
-	* Mark this font as used in a form field.
-	*
-	* Fonts used in form fields cannot be subsetted because users may type
-	* any character at runtime. This method is called automatically when
-	* an EmbeddedFont is used in form field appearances.
-	*/
-	markUsedInForm() {
-		this._usedInForm = true;
-	}
-	/**
-	* Check if this font is used in a form field.
-	*/
-	get usedInForm() {
-		return this._usedInForm;
-	}
-	/**
-	* Check if this font can be subsetted.
-	*
-	* Returns false if the font is used in a form field (since users can
-	* type any character at runtime).
-	*/
-	canSubset() {
-		return !this._usedInForm;
-	}
-	/**
-	* Get width of text in points at a given font size.
-	*
-	* Alias for getTextWidth() to match Standard14Font API.
-	*
-	* @param text - The text to measure
-	* @param size - Font size in points
-	* @returns Width in points
-	*/
-	widthOfTextAtSize(text, size) {
-		return this.getTextWidth(text, size);
-	}
-	/**
-	* Get the height of the font at a given size.
-	*
-	* This returns the full height from descender to ascender.
-	*
-	* @param size - Font size in points
-	* @returns Height in points
-	*/
-	heightAtSize(size) {
-		const desc = this.descriptor;
-		if (!desc) return size;
-		return (desc.ascent - desc.descent) * size / 1e3;
-	}
-	/**
-	* Calculate font size needed to achieve a specific text height.
-	*
-	* @param height - Desired height in points
-	* @returns Font size in points
-	*/
-	sizeAtHeight(height) {
-		const desc = this.descriptor;
-		if (!desc) return height;
-		const unitsHeight = desc.ascent - desc.descent;
-		return height * 1e3 / unitsHeight;
-	}
-	/**
-	* Calculate font size needed for text to fit a specific width.
-	*
-	* @param text - The text to measure
-	* @param width - Desired width in points
-	* @returns Font size in points
-	*/
-	sizeAtWidth(text, width) {
-		if (text.length === 0) return 0;
-		const codes = this.encodeText(text);
-		let totalWidth = 0;
-		for (const code of codes) totalWidth += this.getWidth(code);
-		if (totalWidth === 0) return 0;
-		return width * 1e3 / totalWidth;
-	}
-	/**
-	* Build a FontDescriptor from the font program.
-	*/
-	buildDescriptor() {
-		const program = this.fontProgram;
-		const bbox = program.bbox;
-		const scale = 1e3 / program.unitsPerEm;
-		return new FontDescriptor({
-			fontName: program.postScriptName ?? "Unknown",
-			flags: this.computeFlags(),
-			fontBBox: [
-				Math.round(bbox[0] * scale),
-				Math.round(bbox[1] * scale),
-				Math.round(bbox[2] * scale),
-				Math.round(bbox[3] * scale)
-			],
-			italicAngle: program.italicAngle,
-			ascent: Math.round(program.ascent * scale),
-			descent: Math.round(program.descent * scale),
-			leading: 0,
-			capHeight: Math.round(program.capHeight * scale),
-			xHeight: Math.round(program.xHeight * scale),
-			stemV: program.stemV,
-			stemH: 0,
-			avgWidth: 0,
-			maxWidth: 0,
-			missingWidth: this.getWidth(0)
-		});
-	}
-	/**
-	* Compute font flags for the descriptor.
-	*/
-	computeFlags() {
-		let flags = 0;
-		if (this.fontProgram.isFixedPitch) flags |= 1;
-		flags |= 4;
-		if (this.fontProgram.italicAngle !== 0) flags |= 64;
-		return flags;
-	}
-};
-
 //#endregion
 //#region src/fonts/cid-font.ts
-/**
-* CIDFont - Descendant font for Type0 composite fonts.
-*
-* CIDFonts contain the actual glyph descriptions and metrics for
-* composite (Type0) fonts. They use CIDs (Character IDs) to identify
-* glyphs rather than character codes.
-*
-* Font structure:
-* <<
-*   /Type /Font
-*   /Subtype /CIDFontType2  (or /CIDFontType0)
-*   /BaseFont /NotoSansCJK-Regular
-*   /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>
-*   /FontDescriptor 14 0 R
-*   /W [1 [500 600] 100 200 500]  % Complex width format
-*   /DW 1000
-*   /CIDToGIDMap /Identity
-* >>
-*/
 const isCIDFontSubtype = (subtype) => {
 	return subtype === "CIDFontType0" || subtype === "CIDFontType2";
 };
@@ -21011,7 +20906,7 @@ function parseCIDFont(dict, options = {}) {
 		ordering: "Identity",
 		supplement: 0
 	};
-	const sysInfoDict = dict.getDict("CIDSystemInfo");
+	const sysInfoDict = dict.getDict("CIDSystemInfo", options.resolver);
 	if (sysInfoDict) cidSystemInfo = {
 		registry: sysInfoDict.getString("Registry")?.asString() ?? "Adobe",
 		ordering: sysInfoDict.getString("Ordering")?.asString() ?? "Identity",
@@ -21019,30 +20914,23 @@ function parseCIDFont(dict, options = {}) {
 	};
 	const defaultWidth = dict.getNumber("DW")?.value ?? 1e3;
 	let widths = new CIDWidthMap();
-	let w = dict.get("W");
+	let w = dict.get("W", options.resolver);
 	let wArray = null;
-	if (w instanceof PdfRef && options.resolveRef) w = options.resolveRef(w) ?? void 0;
 	if (w instanceof PdfArray) wArray = w;
 	if (wArray) widths = parseCIDWidths(wArray);
 	let descriptor = null;
 	let embeddedProgram = null;
-	const descriptorRef = dict.get("FontDescriptor");
-	if (descriptorRef && options.resolveRef) {
-		const descriptorDict = options.resolveRef(descriptorRef);
-		if (descriptorDict && descriptorDict.type === "dict") {
-			descriptor = FontDescriptor.parse(descriptorDict);
-			if (options.decodeStream) embeddedProgram = parseEmbeddedProgram(descriptorDict, {
-				decodeStream: options.decodeStream,
-				resolveRef: options.resolveRef
-			});
-		}
+	const fontDescriptor = dict.getDict("FontDescriptor", options.resolver);
+	if (fontDescriptor) {
+		descriptor = FontDescriptor.parse(fontDescriptor);
+		embeddedProgram = parseEmbeddedProgram(fontDescriptor, { resolver: options.resolver });
 	}
 	let cidToGidMap = "Identity";
-	const cidToGidValue = dict.get("CIDToGIDMap");
+	const cidToGidValue = dict.get("CIDToGIDMap", options.resolver);
 	if (cidToGidValue) {
-		if (cidToGidValue.type === "name" && cidToGidValue.value === "Identity") cidToGidMap = "Identity";
-		if (cidToGidValue.type === "stream" && options.decodeStream) {
-			const mapData = options.decodeStream(cidToGidValue);
+		if (cidToGidValue instanceof PdfName && cidToGidValue.value === "Identity") cidToGidMap = "Identity";
+		if (cidToGidValue instanceof PdfStream) {
+			const mapData = cidToGidValue.getDecodedData();
 			if (mapData && mapData.length >= 2) {
 				const numEntries = mapData.length / 2;
 				cidToGidMap = new Uint16Array(numEntries);
@@ -21324,24 +21212,6 @@ function bytesToLatin1$1(data) {
 //#endregion
 //#region src/fonts/composite-font.ts
 /**
-* CompositeFont - Type0 composite font for CJK and Unicode text.
-*
-* Composite fonts (Type0) combine:
-* - A CMap (character code to CID mapping)
-* - One or more CIDFonts (the actual glyph data)
-* - Optional ToUnicode map (for text extraction)
-*
-* Font structure:
-* <<
-*   /Type /Font
-*   /Subtype /Type0
-*   /BaseFont /NotoSansCJK-Regular
-*   /Encoding /Identity-H  (or stream)
-*   /DescendantFonts [12 0 R]
-*   /ToUnicode 13 0 R
-* >>
-*/
-/**
 * CompositeFont handles Type0 composite fonts (CJK, Unicode).
 */
 var CompositeFont = class extends PdfFont {
@@ -21416,40 +21286,28 @@ var CompositeFont = class extends PdfFont {
 * Parse CMap from encoding value.
 */
 function parseCMapFromEncoding(encodingValue, options) {
-	if (!encodingValue || typeof encodingValue !== "object") return CMap.identityH();
-	const enc = encodingValue;
-	if (enc.type === "name" && enc.value) return CMap.getPredefined(enc.value) ?? CMap.identityH();
-	if (enc.type === "stream" && options.decodeStream) {
-		const data = options.decodeStream(encodingValue);
+	let encoding = encodingValue;
+	if (encoding instanceof PdfRef && options.resolver) encoding = options.resolver(encoding) ?? void 0;
+	if (encoding instanceof PdfName && encoding.value) return CMap.getPredefined(encoding.value) ?? CMap.identityH();
+	if (encoding instanceof PdfStream) {
+		const data = encoding.getDecodedData();
 		return data ? parseCMap(data) : CMap.identityH();
 	}
-	if (enc.type === "ref" && options.resolveRef && options.decodeStream) {
-		const resolved = options.resolveRef(encodingValue);
-		if (resolved && resolved.type === "stream") {
-			const data = options.decodeStream(resolved);
-			return data ? parseCMap(data) : CMap.identityH();
-		}
-	}
 	return CMap.identityH();
 }
 /**
 * Parse a CompositeFont from a PDF font dictionary.
 */
 function parseCompositeFont(dict, options = {}) {
-	const baseFontName = dict.getName("BaseFont")?.value ?? "Unknown";
-	const cmap = parseCMapFromEncoding(dict.get("Encoding"), options);
+	const baseFontName = dict.getName("BaseFont", options.resolver)?.value ?? "Unknown";
+	const cmap = parseCMapFromEncoding(dict.get("Encoding", options.resolver), options);
 	let cidFont;
-	let descendants = dict.get("DescendantFonts");
+	let descendants = dict.get("DescendantFonts", options.resolver);
 	let descendantsArray = null;
-	if (descendants instanceof PdfRef && options.resolveRef) descendants = options.resolveRef(descendants) ?? void 0;
 	if (descendants instanceof PdfArray) descendantsArray = descendants;
 	if (descendantsArray && descendantsArray.length > 0) {
-		const firstDescendant = descendantsArray.at(0);
-		if (firstDescendant?.type === "ref" && options.resolveRef) {
-			const cidFontDict = options.resolveRef(firstDescendant);
-			if (cidFontDict?.type === "dict") cidFont = parseCIDFont(cidFontDict, options);
-			else cidFont = createDefaultCIDFont(baseFontName);
-		} else if (firstDescendant?.type === "dict") cidFont = parseCIDFont(firstDescendant, options);
+		const firstDescendant = descendantsArray.at(0, options.resolver);
+		if (firstDescendant instanceof PdfDict) cidFont = parseCIDFont(firstDescendant, options);
 		else cidFont = createDefaultCIDFont(baseFontName);
 	} else cidFont = createDefaultCIDFont(baseFontName);
 	return new CompositeFont({
@@ -21480,7 +21338,7 @@ function createDefaultCIDFont(baseFontName) {
 * @returns A SimpleFont or CompositeFont instance
 */
 function parseFont(dict, options = {}) {
-	switch (dict.getName("Subtype")?.value) {
+	switch (dict.getName("Subtype", options.resolver)?.value) {
 		case "Type0": return parseCompositeFont(dict, options);
 		case "TrueType":
 		case "Type1":
@@ -24306,8 +24164,8 @@ var PDFPage = class PDFPage {
 	* Page rotation in degrees (0, 90, 180, or 270).
 	*/
 	get rotation() {
-		const rotate = this.dict.get("Rotate");
-		if (rotate instanceof PdfNumber) {
+		const rotate = this.dict.getNumber("Rotate", this.ctx.resolve.bind(this.ctx));
+		if (rotate) {
 			const value = rotate.value % 360;
 			if (value === 90 || value === -270) return 90;
 			if (value === 180 || value === -180) return 180;
@@ -24332,8 +24190,7 @@ var PDFPage = class PDFPage {
 	* a new empty dict is created on this page.
 	*/
 	getResources() {
-		let resources = this.dict.get("Resources");
-		if (resources instanceof PdfRef) resources = this.ctx.resolve(resources) ?? void 0;
+		let resources = this.dict.get("Resources", this.ctx.resolve.bind(this.ctx));
 		if (resources instanceof PdfDict) return resources;
 		resources = new PdfDict();
 		this.dict.set("Resources", resources);
@@ -25014,13 +24871,9 @@ var PDFPage = class PDFPage {
 		for (let i = 0; i < annotsArray.length; i++) {
 			const entry = annotsArray.at(i);
 			if (!entry) continue;
-			let annotDict = null;
-			let annotRef = null;
-			if (entry instanceof PdfRef) {
-				annotRef = entry;
-				const resolved = this.ctx.resolve(entry);
-				if (resolved instanceof PdfDict) annotDict = resolved;
-			} else if (entry instanceof PdfDict) annotDict = entry;
+			const resolved = entry instanceof PdfRef ? this.ctx.resolve(entry) : entry;
+			const annotRef = entry instanceof PdfRef ? entry : null;
+			const annotDict = resolved instanceof PdfDict ? resolved : null;
 			if (!annotDict) continue;
 			if (isWidgetAnnotation(annotDict)) continue;
 			if (isPopupAnnotation(annotDict)) continue;
@@ -25042,13 +24895,9 @@ var PDFPage = class PDFPage {
 		for (let i = 0; i < annotsArray.length; i++) {
 			let entry = annotsArray.at(i);
 			if (!entry) continue;
-			let annotDict = null;
-			let annotRef = null;
-			if (entry instanceof PdfRef) {
-				annotRef = entry;
-				entry = this.ctx.resolve(entry) ?? void 0;
-			}
-			if (entry instanceof PdfDict) annotDict = entry;
+			const resolved = entry instanceof PdfRef ? this.ctx.resolve(entry) : entry;
+			const annotRef = entry instanceof PdfRef ? entry : null;
+			const annotDict = resolved instanceof PdfDict ? resolved : null;
 			if (!annotDict || !isPopupAnnotation(annotDict)) continue;
 			popups.push(new PDFPopupAnnotation(annotDict, annotRef, this.ctx.registry));
 		}
@@ -25497,16 +25346,24 @@ var PDFPage = class PDFPage {
 	prependContent(content) {
 		const existingContents = this.dict.get("Contents");
 		const newContent = this.createContentStream(`${content}\n`);
-		if (!existingContents) this.dict.set("Contents", newContent);
-		else if (existingContents instanceof PdfRef) {
+		if (!existingContents) {
+			this.dict.set("Contents", newContent);
+			return;
+		}
+		if (existingContents instanceof PdfRef) {
 			this.dict.set("Contents", new PdfArray([newContent, existingContents]));
 			this._contentWrapped = true;
-		} else if (existingContents instanceof PdfStream) {
+			return;
+		}
+		if (existingContents instanceof PdfStream) {
 			this.dict.set("Contents", new PdfArray([newContent, existingContents]));
 			this._contentWrapped = true;
-		} else if (existingContents instanceof PdfArray) {
+			return;
+		}
+		if (existingContents instanceof PdfArray) {
 			existingContents.insert(0, newContent);
 			this._contentWrapped = true;
+			return;
 		}
 	}
 	/** Track whether we've already wrapped the original content in q/Q */
@@ -25529,19 +25386,25 @@ var PDFPage = class PDFPage {
 			this._contentWrapped = true;
 			const qStream = this.createContentStream("q\n");
 			const QStream = this.createContentStream("\nQ");
-			if (existingContents instanceof PdfRef) this.dict.set("Contents", new PdfArray([
-				qStream,
-				existingContents,
-				QStream,
-				newContent
-			]));
-			else if (existingContents instanceof PdfStream) this.dict.set("Contents", new PdfArray([
-				qStream,
-				existingContents,
-				QStream,
-				newContent
-			]));
-			else if (existingContents instanceof PdfArray) {
+			if (existingContents instanceof PdfRef) {
+				this.dict.set("Contents", new PdfArray([
+					qStream,
+					existingContents,
+					QStream,
+					newContent
+				]));
+				return;
+			}
+			if (existingContents instanceof PdfStream) {
+				this.dict.set("Contents", new PdfArray([
+					qStream,
+					existingContents,
+					QStream,
+					newContent
+				]));
+				return;
+			}
+			if (existingContents instanceof PdfArray) {
 				const newArray = new PdfArray([qStream]);
 				for (let i = 0; i < existingContents.length; i++) {
 					const item = existingContents.at(i);
@@ -25550,18 +25413,20 @@ var PDFPage = class PDFPage {
 				newArray.push(QStream);
 				newArray.push(newContent);
 				this.dict.set("Contents", newArray);
+				return;
 			}
-		} else {
-			const contents = this.dict.get("Contents");
-			if (contents instanceof PdfArray) contents.push(newContent);
-			else if (contents !== void 0) this.dict.set("Contents", new PdfArray([contents, newContent]));
 		}
+		if (existingContents instanceof PdfArray) {
+			existingContents.push(newContent);
+			return;
+		}
+		if (existingContents !== void 0) this.dict.set("Contents", new PdfArray([existingContents, newContent]));
 	}
 	/**
 	* Get a box (MediaBox, CropBox, etc.) from the page dictionary.
 	*/
 	getBox(name) {
-		const box = this.dict.get(name);
+		const box = this.dict.get(name, this.ctx.resolve.bind(this.ctx));
 		if (!(box instanceof PdfArray) || box.length < 4) return null;
 		const x1 = box.at(0);
 		const y1 = box.at(1);
@@ -25598,7 +25463,7 @@ var PDFPage = class PDFPage {
 	*/
 	addFontResource(font) {
 		const resources = this.getResources();
-		let fonts = resources.get("Font");
+		let fonts = resources.get("Font", this.ctx.resolve.bind(this.ctx));
 		if (!(fonts instanceof PdfDict)) {
 			fonts = new PdfDict();
 			resources.set("Font", fonts);
@@ -25606,7 +25471,7 @@ var PDFPage = class PDFPage {
 		if (typeof font === "string") {
 			if (!isStandard14Font(font)) throw new Error(`Unknown Standard 14 font: ${font}`);
 			for (const [existingName, value] of fonts) if (value instanceof PdfDict) {
-				const baseFont = value.get("BaseFont");
+				const baseFont = value.get("BaseFont", this.ctx.resolve.bind(this.ctx));
 				if (baseFont instanceof PdfName && baseFont.value === font) return existingName.value;
 			}
 			const fontDict = PdfDict.of({
@@ -25699,21 +25564,14 @@ var PDFPage = class PDFPage {
 	* Get the concatenated content stream bytes.
 	*/
 	getContentBytes() {
-		const contents = this.dict.get("Contents");
+		const contents = this.dict.get("Contents", this.ctx.resolve.bind(this.ctx));
 		if (!contents) return new Uint8Array(0);
-		if (contents instanceof PdfRef && this.ctx) {
-			const stream = this.ctx.resolve(contents);
-			if (stream instanceof PdfStream) return stream.getDecodedData();
-		}
 		if (contents instanceof PdfStream) return contents.getDecodedData();
 		if (contents instanceof PdfArray) {
 			const chunks = [];
 			for (let i = 0; i < contents.length; i++) {
-				const item = contents.at(i);
-				if (item instanceof PdfRef && this.ctx) {
-					const stream = this.ctx.resolve(item);
-					if (stream instanceof PdfStream) chunks.push(stream.getDecodedData());
-				} else if (item instanceof PdfStream) chunks.push(item.getDecodedData());
+				const item = contents.at(i, this.ctx.resolve.bind(this.ctx));
+				if (item instanceof PdfStream) chunks.push(item.getDecodedData());
 			}
 			return this.concatenateChunks(chunks);
 		}
@@ -25744,17 +25602,11 @@ var PDFPage = class PDFPage {
 	resolveInheritedResources() {
 		let currentDict = this.dict;
 		while (currentDict) {
-			const resourcesEntry = currentDict.get("Resources");
-			if (resourcesEntry instanceof PdfRef) {
-				const resolved = this.ctx.resolve(resourcesEntry);
-				if (resolved instanceof PdfDict) return resolved;
-			} else if (resourcesEntry instanceof PdfDict) return resourcesEntry;
-			const parentEntry = currentDict.get("Parent");
-			if (parentEntry instanceof PdfRef) {
-				const parent = this.ctx.resolve(parentEntry);
-				if (parent instanceof PdfDict) currentDict = parent;
-				else break;
-			} else break;
+			const resources = currentDict.get("Resources", this.ctx.resolve.bind(this.ctx));
+			if (resources instanceof PdfDict) return resources;
+			const parent = currentDict.get("Parent", this.ctx.resolve.bind(this.ctx));
+			if (parent instanceof PdfDict) currentDict = parent;
+			else break;
 		}
 		return null;
 	}
@@ -25764,81 +25616,22 @@ var PDFPage = class PDFPage {
 	createFontResolver() {
 		const resourcesDict = this.resolveInheritedResources();
 		if (!resourcesDict) return () => null;
-		let fontDict = null;
-		const fontEntry = resourcesDict.get("Font");
-		if (fontEntry instanceof PdfRef && this.ctx) {
-			const resolved = this.ctx.resolve(fontEntry);
-			if (resolved instanceof PdfDict) fontDict = resolved;
-		} else if (fontEntry instanceof PdfDict) fontDict = fontEntry;
-		if (!fontDict) return () => null;
+		const font = resourcesDict.getDict("Font", this.ctx.resolve.bind(this.ctx));
+		if (!font) return () => null;
 		const fontCache = /* @__PURE__ */ new Map();
-		for (const [nameObj, fontEntry$1] of fontDict) {
-			const name = nameObj.value;
-			let fontDictEntry = null;
-			if (fontEntry$1 instanceof PdfRef && this.ctx) {
-				const resolved = this.ctx.resolve(fontEntry$1);
-				if (resolved instanceof PdfDict) fontDictEntry = resolved;
-			} else if (fontEntry$1 instanceof PdfDict) fontDictEntry = fontEntry$1;
-			if (!fontDictEntry) continue;
+		for (const [key$1, entry] of font) {
+			const name = key$1.value;
+			const resolved = entry instanceof PdfRef ? this.ctx.resolve(entry) : entry;
+			let entryDict = resolved instanceof PdfDict ? resolved : null;
+			if (!entryDict) continue;
 			let toUnicodeMap = null;
-			const toUnicodeEntry = fontDictEntry.get("ToUnicode");
-			if (toUnicodeEntry && this.ctx) {
-				let toUnicodeStream = null;
-				if (toUnicodeEntry instanceof PdfRef) {
-					const resolved = this.ctx.resolve(toUnicodeEntry);
-					if (resolved instanceof PdfStream) toUnicodeStream = resolved;
-				} else if (toUnicodeEntry instanceof PdfStream) toUnicodeStream = toUnicodeEntry;
-				if (toUnicodeStream) try {
-					toUnicodeMap = parseToUnicode(toUnicodeStream.getDecodedData());
-				} catch {}
-			}
-			const resolvedRefs = /* @__PURE__ */ new Map();
-			const decodedStreams = /* @__PURE__ */ new Map();
-			const preResolveValue = (value) => {
-				if (value instanceof PdfRef) {
-					const key$1 = `${value.objectNumber} ${value.generation} R`;
-					if (resolvedRefs.has(key$1)) return;
-					const resolved = this.ctx.resolve(value);
-					if (resolved instanceof PdfDict || resolved instanceof PdfArray || resolved instanceof PdfStream) {
-						resolvedRefs.set(key$1, resolved);
-						if (resolved instanceof PdfStream) try {
-							const decoded = resolved.getDecodedData();
-							decodedStreams.set(key$1, decoded);
-						} catch {}
-						preResolveValue(resolved);
-					}
-				} else if (value instanceof PdfDict) for (const [, v] of value) preResolveValue(v);
-				else if (value instanceof PdfArray) for (let i = 0; i < value.length; i++) preResolveValue(value.at(i));
-			};
-			preResolveValue(fontDictEntry.get("DescendantFonts"));
-			preResolveValue(fontDictEntry.get("FontDescriptor"));
-			preResolveValue(fontDictEntry.get("Encoding"));
-			preResolveValue(fontDictEntry.get("Widths"));
-			const pdfFont = parseFont(fontDictEntry, {
-				resolveRef: (ref) => {
-					if (ref instanceof PdfRef && this.ctx) {
-						const obj = this.ctx.resolve(ref);
-						if (obj instanceof PdfDict || obj instanceof PdfArray || obj instanceof PdfStream) return obj;
-					}
-					return null;
-				},
-				decodeStream: (stream) => {
-					if (stream instanceof PdfRef) {
-						const key$1 = `${stream.objectNumber} ${stream.generation} R`;
-						const decoded = decodedStreams.get(key$1);
-						if (decoded) return decoded;
-						const preResolved = resolvedRefs.get(key$1);
-						if (preResolved instanceof PdfStream) return preResolved.data;
-					}
-					if (stream instanceof PdfStream) {
-						for (const [key$1, resolved] of resolvedRefs) if (resolved === stream) {
-							const decoded = decodedStreams.get(key$1);
-							if (decoded) return decoded;
-						}
-						return stream.data;
-					}
-					return null;
-				},
+			const toUnicode = entryDict.get("ToUnicode", this.ctx.resolve.bind(this.ctx));
+			const toUnicodeStream = toUnicode instanceof PdfStream ? toUnicode : null;
+			if (toUnicodeStream) try {
+				toUnicodeMap = parseToUnicode(toUnicodeStream.getDecodedData());
+			} catch {}
+			const pdfFont = parseFont(entryDict, {
+				resolver: this.ctx.resolve.bind(this.ctx),
 				toUnicodeMap
 			});
 			fontCache.set(name, pdfFont);
@@ -25939,9 +25732,9 @@ var PDFLinkAnnotation = class extends PDFAnnotation {
 	* Get the URI if this is an external link.
 	*/
 	get uri() {
-		const action = this.dict.getDict("A");
+		const action = this.dict.getDict("A", this.registry.resolve.bind(this.registry));
 		if (action) {
-			if (action.getName("S")?.value === "URI") return action.getString("URI")?.asString() ?? null;
+			if (action.getName("S", this.registry.resolve.bind(this.registry))?.value === "URI") return action.getString("URI", this.registry.resolve.bind(this.registry))?.asString() ?? null;
 		}
 		return null;
 	}
@@ -25949,12 +25742,12 @@ var PDFLinkAnnotation = class extends PDFAnnotation {
 	* Get the destination if this is an internal link.
 	*/
 	get destination() {
-		const dest = this.dict.get("Dest");
+		const dest = this.dict.get("Dest", this.registry.resolve.bind(this.registry));
 		if (dest) return this.parseDestination(dest);
-		const action = this.dict.getDict("A");
+		const action = this.dict.getDict("A", this.registry.resolve.bind(this.registry));
 		if (action) {
-			if (action.getName("S")?.value === "GoTo") {
-				const d = action.get("D");
+			if (action.getName("S", this.registry.resolve.bind(this.registry))?.value === "GoTo") {
+				const d = action.get("D", this.registry.resolve.bind(this.registry));
 				if (d) return this.parseDestination(d);
 			}
 		}
@@ -25974,12 +25767,12 @@ var PDFLinkAnnotation = class extends PDFAnnotation {
 			type: "goto",
 			destination: dest
 		};
-		const action = this.dict.getDict("A");
+		const action = this.dict.getDict("A", this.registry.resolve.bind(this.registry));
 		if (action) {
-			const actionType = action.getName("S")?.value;
+			const actionType = action.getName("S", this.registry.resolve.bind(this.registry))?.value;
 			if (actionType === "GoToR") {
-				const file = action.getString("F")?.asString() ?? "";
-				const d = action.get("D");
+				const file = action.getString("F", this.registry.resolve.bind(this.registry))?.asString() ?? "";
+				const d = action.get("D", this.registry.resolve.bind(this.registry));
 				return {
 					type: "gotoRemote",
 					file,
@@ -25994,7 +25787,7 @@ var PDFLinkAnnotation = class extends PDFAnnotation {
 	* Highlight mode when the link is clicked.
 	*/
 	get highlightMode() {
-		switch (this.dict.getName("H")?.value) {
+		switch (this.dict.getName("H", this.registry.resolve.bind(this.registry))?.value) {
 			case "N": return "None";
 			case "I": return "Invert";
 			case "O": return "Outline";
@@ -26183,7 +25976,7 @@ var PDFUnknownAnnotation = class extends PDFAnnotation {};
 * @returns The appropriate annotation class instance
 */
 function createAnnotation(dict, ref, registry) {
-	const subtypeName = dict.getName("Subtype")?.value;
+	const subtypeName = dict.getName("Subtype", registry.resolve.bind(registry))?.value;
 	switch (isAnnotationSubtype(subtypeName) ? subtypeName : "Text") {
 		case "Text": return new PDFTextAnnotation(dict, ref, registry);
 		case "Link": return new PDFLinkAnnotation(dict, ref, registry);
@@ -26209,14 +26002,14 @@ function createAnnotation(dict, ref, registry) {
 /**
 * Check if an annotation is a Widget (form field).
 */
-function isWidgetAnnotation(dict) {
-	return dict.getName("Subtype")?.value === "Widget";
+function isWidgetAnnotation(dict, registry) {
+	return dict.getName("Subtype", registry?.resolve.bind(registry))?.value === "Widget";
 }
 /**
 * Check if an annotation is a Popup.
 */
-function isPopupAnnotation(dict) {
-	return dict.getName("Subtype")?.value === "Popup";
+function isPopupAnnotation(dict, registry) {
+	return dict.getName("Subtype", registry?.resolve.bind(registry))?.value === "Popup";
 }
 
 //#endregion
@@ -26264,19 +26057,14 @@ var AnnotationFlattener = class {
 	* @returns Number of annotations flattened
 	*/
 	flattenPage(pageDict, options = {}) {
-		let annotsEntry = pageDict.get("Annots");
-		if (!annotsEntry) return 0;
-		if (annotsEntry instanceof PdfRef) annotsEntry = this.registry.resolve(annotsEntry) ?? void 0;
-		let annots = annotsEntry instanceof PdfArray ? annotsEntry : null;
+		let annots = pageDict.getArray("Annots", this.registry.resolve.bind(this.registry));
 		if (!annots || annots.length === 0) return 0;
-		let resources = pageDict.get("Resources");
-		if (resources instanceof PdfRef) resources = this.registry.resolve(resources) ?? void 0;
+		let resources = pageDict.get("Resources", this.registry.resolve.bind(this.registry));
 		if (!(resources instanceof PdfDict)) {
 			resources = new PdfDict();
 			pageDict.set("Resources", resources);
 		}
-		let xObjects = resources.get("XObject");
-		if (xObjects instanceof PdfRef) xObjects = this.registry.resolve(xObjects) ?? void 0;
+		let xObjects = resources.get("XObject", this.registry.resolve.bind(this.registry));
 		if (!(xObjects instanceof PdfDict)) {
 			xObjects = new PdfDict();
 			resources.set("XObject", xObjects);
@@ -26286,19 +26074,20 @@ var AnnotationFlattener = class {
 		let xObjectIndex = 0;
 		let flattenedCount = 0;
 		for (let i = 0; i < annots.length; i++) {
-			const entry = annots.at(i);
+			let entry = annots.at(i);
 			if (!entry) continue;
 			let annotDict = null;
 			let annotRef = null;
 			if (entry instanceof PdfRef) {
 				annotRef = entry;
-				const resolved = this.registry.resolve(entry);
-				if (resolved instanceof PdfDict) annotDict = resolved;
-			} else if (entry instanceof PdfDict) annotDict = entry;
+				entry = this.registry.resolve(entry) ?? void 0;
+			}
+			if (entry instanceof PdfDict) annotDict = entry;
 			if (!annotDict) continue;
 			if (isWidgetAnnotation(annotDict)) continue;
 			if (isPopupAnnotation(annotDict)) continue;
-			const subtype = annotDict.getName("Subtype")?.value;
+			const subtypeName = annotDict.getName("Subtype")?.value;
+			const subtype = isAnnotationSubtype(subtypeName) ? subtypeName : null;
 			if (!subtype) continue;
 			if (subtype === "Link") {
 				if (options.removeLinks) {
@@ -26407,9 +26196,7 @@ var AnnotationFlattener = class {
 	* Get annotation rectangle as [x1, y1, x2, y2].
 	*/
 	getAnnotationRect(annotDict) {
-		let rectArray = annotDict.get("Rect");
-		if (rectArray instanceof PdfRef) rectArray = this.registry.resolve(rectArray) ?? void 0;
-		let rect = rectArray instanceof PdfArray ? rectArray : null;
+		const rect = annotDict.getArray("Rect", this.registry.resolve.bind(this.registry));
 		if (!rect || rect.length < 4) return [
 			0,
 			0,
@@ -26471,7 +26258,7 @@ var AnnotationFlattener = class {
 	* Get appearance BBox, with fallback.
 	*/
 	getAppearanceBBox(appearance) {
-		const bbox = appearance.getArray("BBox");
+		const bbox = appearance.getArray("BBox", this.registry.resolve.bind(this.registry));
 		if (!bbox || bbox.length < 4) return [
 			0,
 			0,
@@ -26490,7 +26277,7 @@ var AnnotationFlattener = class {
 	* Get the appearance stream's transformation matrix.
 	*/
 	getAppearanceMatrix(appearance) {
-		const matrixArray = appearance.getArray("Matrix");
+		const matrixArray = appearance.getArray("Matrix", this.registry.resolve.bind(this.registry));
 		if (!matrixArray || matrixArray.length < 6) return Matrix.identity();
 		const [a, b, c, d, e, f] = matrixArray.toArray().map((item) => item instanceof PdfNumber ? item.value : 0);
 		return new Matrix(a ?? 0, b ?? 0, c ?? 0, d ?? 0, e ?? 0, f ?? 0);
@@ -26499,7 +26286,7 @@ var AnnotationFlattener = class {
 	* Check if appearance stream has valid dimensions.
 	*/
 	isVisibleAppearance(appearance) {
-		const bbox = appearance.getArray("BBox");
+		const bbox = appearance.getArray("BBox", this.registry.resolve.bind(this.registry));
 		if (!bbox || bbox.length < 4) return false;
 		const [x1, y1, x2, y2] = bbox.toArray().map((item) => item instanceof PdfNumber ? item.value : 0);
 		const width = Math.abs((x2 ?? 0) - (x1 ?? 0));
@@ -26515,6 +26302,8 @@ var AnnotationFlattener = class {
 	}
 	/**
 	* Wrap existing page content in q...Q and append new content.
+	*
+	* @todo Consider using PDFPage API for this.
 	*/
 	wrapAndAppendContent(page, newContent) {
 		const existing = page.get("Contents");
@@ -26563,7 +26352,8 @@ var AnnotationFlattener = class {
 		if (annotsEntry instanceof PdfRef) {
 			const resolved = this.registry.resolve(annotsEntry);
 			annots = resolved instanceof PdfArray ? resolved : void 0;
-		} else if (annotsEntry instanceof PdfArray) annots = annotsEntry;
+		}
+		if (annotsEntry instanceof PdfArray) annots = annotsEntry;
 		if (!annots) return;
 		const indicesToRemove = [];
 		for (let i = 0; i < annots.length; i++) {
@@ -27745,17 +27535,10 @@ function parseDefaultConfig(dDict, resolve) {
 function hasLayers(ctx) {
 	const catalog = ctx.catalog.getDict();
 	if (!catalog) return false;
-	let ocProperties = catalog.get("OCProperties");
-	if (!ocProperties) return false;
-	let ocPropsDict = null;
-	if (ocProperties instanceof PdfRef) ocProperties = ctx.resolve(ocProperties) ?? void 0;
-	if (ocProperties instanceof PdfDict) ocPropsDict = ocProperties;
+	const resolve = ctx.resolve.bind(ctx);
+	const ocPropsDict = catalog.getDict("OCProperties", resolve);
 	if (!ocPropsDict) return false;
-	let ocgs = ocPropsDict.get("OCGs");
-	if (!ocgs) return false;
-	let ocgsArray = null;
-	if (ocgs instanceof PdfRef) ocgs = ctx.resolve(ocgs) ?? void 0;
-	if (ocgs instanceof PdfArray) ocgsArray = ocgs;
+	const ocgsArray = ocPropsDict.getArray("OCGs", resolve);
 	if (!ocgsArray || ocgsArray.length === 0) return false;
 	return true;
 }
@@ -27768,19 +27551,12 @@ function hasLayers(ctx) {
 function getLayers(ctx) {
 	const catalog = ctx.catalog.getDict();
 	if (!catalog) return [];
-	let ocProperties = catalog.get("OCProperties");
-	if (!ocProperties) return [];
-	let ocPropsDict = null;
-	if (ocProperties instanceof PdfRef) ocProperties = ctx.resolve(ocProperties) ?? void 0;
-	if (ocProperties instanceof PdfDict) ocPropsDict = ocProperties;
+	const resolve = ctx.resolve.bind(ctx);
+	const ocPropsDict = catalog.getDict("OCProperties", resolve);
 	if (!ocPropsDict) return [];
-	let ocgs = ocPropsDict.get("OCGs");
-	if (!ocgs) return [];
-	let ocgsArray = null;
-	if (ocgs instanceof PdfRef) ocgs = ctx.resolve(ocgs) ?? void 0;
-	if (ocgs instanceof PdfArray) ocgsArray = ocgs;
+	const ocgsArray = ocPropsDict.getArray("OCGs", resolve);
 	if (!ocgsArray) return [];
-	const defaultConfig = parseDefaultConfig(ocPropsDict.get("D"), (ref) => ctx.resolve(ref));
+	const defaultConfig = parseDefaultConfig(ocPropsDict.get("D"), resolve);
 	const layers = [];
 	for (const item of ocgsArray) {
 		if (!(item instanceof PdfRef)) continue;
@@ -30834,22 +30610,36 @@ var DocumentParser = class {
 			else throw error;
 		}
 		const lengthResolver = (ref) => {
-			const key$1 = `${ref.objectNumber} ${ref.generation}`;
-			const cached = cache.get(key$1);
-			if (cached && cached.type === "number") return cached.value;
+			const cacheKey = `${ref.objectNumber} ${ref.generation}`;
+			const cached = cache.get(cacheKey);
+			if (cached instanceof PdfNumber) return cached.value;
 			const entry = xref.get(ref.objectNumber);
-			if (entry?.type === "uncompressed") {
-				const savedPosition = this.scanner.position;
-				try {
-					const result = new IndirectObjectParser(this.scanner).parseObjectAt(entry.offset);
-					if (result.value.type === "number") {
-						cache.set(key$1, result.value);
-						this.scanner.moveTo(savedPosition);
-						return result.value.value;
+			if (!entry || entry.type === "free") return null;
+			const savedPosition = this.scanner.position;
+			try {
+				let lengthObj = null;
+				if (entry.type === "uncompressed") lengthObj = new IndirectObjectParser(this.scanner).parseObjectAt(entry.offset).value;
+				else {
+					const streamEntry = xref.get(entry.streamObjNum);
+					if (streamEntry?.type === "uncompressed") {
+						let objStreamParser = objectStreamCache.get(entry.streamObjNum);
+						if (!objStreamParser) {
+							const streamResult = new IndirectObjectParser(this.scanner).parseObjectAt(streamEntry.offset);
+							if (streamResult.value instanceof PdfStream) {
+								objStreamParser = new ObjectStreamParser(streamResult.value);
+								objectStreamCache.set(entry.streamObjNum, objStreamParser);
+							}
+						}
+						if (objStreamParser) lengthObj = objStreamParser.getObject(entry.indexInStream);
 					}
-				} catch {
-					this.scanner.moveTo(savedPosition);
 				}
+				this.scanner.moveTo(savedPosition);
+				if (lengthObj instanceof PdfNumber) {
+					cache.set(cacheKey, lengthObj);
+					return lengthObj.value;
+				}
+			} catch {
+				this.scanner.moveTo(savedPosition);
 			}
 			return null;
 		};
@@ -30944,7 +30734,7 @@ var DocumentParser = class {
 				if (type?.value === "Page") {
 					if (currentRef) pages.push(currentRef);
 				} else if (type?.value === "Pages") {
-					const kids = nodeOrRef.getArray("Kids");
+					const kids = nodeOrRef.getArray("Kids", getObject);
 					if (kids) for (let i = 0; i < kids.length; i++) {
 						const kid = kids.at(i);
 						if (kid instanceof PdfRef) walkNode(kid);
@@ -31733,12 +31523,7 @@ function decodeFilename(str) {
 * @returns The stream if found, null if external reference or missing
 */
 function getEmbeddedFileStream(fileSpec, resolver) {
-	const efEntry = fileSpec.get("EF");
-	let ef = null;
-	if (efEntry instanceof PdfRef) {
-		const resolved = resolver(efEntry);
-		if (resolved instanceof PdfDict) ef = resolved;
-	} else if (efEntry instanceof PdfDict) ef = efEntry;
+	const ef = fileSpec.getDict("EF", resolver);
 	if (!ef) return null;
 	const streamRef = ef.getRef("F") ?? ef.getRef("UF");
 	if (!streamRef) return null;
@@ -31765,12 +31550,7 @@ function parseFileSpec(fileSpec, name, resolver) {
 	if (desc) info.description = desc.asString();
 	const subtype = stream.getName("Subtype");
 	if (subtype) info.mimeType = subtype.value.replaceAll("#2F", "/").replaceAll("#20", " ");
-	const paramsEntry = stream.get("Params");
-	let params = null;
-	if (paramsEntry instanceof PdfRef) {
-		const resolved = resolver(paramsEntry);
-		if (resolved instanceof PdfDict) params = resolved;
-	} else if (paramsEntry instanceof PdfDict) params = paramsEntry;
+	const params = stream.getDict("Params", resolver);
 	if (params) {
 		const size = params.getNumber("Size");
 		if (size) info.size = size.value;
@@ -31881,12 +31661,7 @@ var NameTree = class {
 			let found = false;
 			while (lo$1 <= hi$1) {
 				const mid = lo$1 + hi$1 >>> 1;
-				const kidRef = kids.at(mid);
-				if (!(kidRef instanceof PdfRef)) {
-					lo$1 = mid + 1;
-					continue;
-				}
-				const kid = this.resolver(kidRef);
+				const kid = kids.at(mid, this.resolver);
 				if (!(kid instanceof PdfDict)) {
 					lo$1 = mid + 1;
 					continue;
@@ -31929,16 +31704,10 @@ var NameTree = class {
 			else if (cmp > 0) lo = mid + 1;
 			else {
 				const valueIndex = keyIndex + 1;
-				const value = names.at(valueIndex);
-				if (value instanceof PdfRef) return this.resolver(value);
-				return value ?? null;
+				return names.at(valueIndex, this.resolver) ?? null;
 			}
 		}
-		for (let i = 0; i < names.length; i += 2) if (extractKey(names.at(i)) === key$1) {
-			const value = names.at(i + 1);
-			if (value instanceof PdfRef) return this.resolver(value);
-			return value ?? null;
-		}
+		for (let i = 0; i < names.length; i += 2) if (extractKey(names.at(i)) === key$1) return names.at(i + 1, this.resolver) ?? null;
 		return null;
 	}
 	/**
@@ -31965,15 +31734,17 @@ var NameTree = class {
 			}
 			if (node.has("Kids")) {
 				const kids = node.getArray("Kids");
-				if (kids) for (const kidRef of kids) {
-					if (!(kidRef instanceof PdfRef)) continue;
-					const refKey$1 = `${kidRef.objectNumber}:${kidRef.generation}`;
-					if (visited.has(refKey$1)) {
-						console.warn(`NameTree: circular reference detected at ${refKey$1}`);
-						continue;
+				if (kids) for (let i = 0; i < kids.length; i++) {
+					const kidRef = kids.at(i);
+					if (kidRef instanceof PdfRef) {
+						const refKey$1 = `${kidRef.objectNumber}:${kidRef.generation}`;
+						if (visited.has(refKey$1)) {
+							console.warn(`NameTree: circular reference detected at ${refKey$1}`);
+							continue;
+						}
+						visited.add(refKey$1);
 					}
-					visited.add(refKey$1);
-					const kid = this.resolver(kidRef);
+					const kid = kids.at(i, this.resolver);
 					if (kid instanceof PdfDict) queue.push({
 						node: kid,
 						depth: depth + 1
@@ -31984,9 +31755,8 @@ var NameTree = class {
 				if (names) for (let i = 0; i < names.length; i += 2) {
 					const key$1 = extractKey(names.at(i));
 					if (key$1 === null) continue;
-					let value = names.at(i + 1) ?? null;
-					if (value instanceof PdfRef) value = this.resolver(value);
-					if (value !== null && value !== void 0) yield [key$1, value];
+					const value = names.at(i + 1, this.resolver);
+					if (value !== void 0) yield [key$1, value];
 				}
 			}
 		}
@@ -32253,9 +32023,7 @@ var PDFCatalog = class {
 	* Get the /Names dictionary.
 	*/
 	getNames() {
-		let namesEntry = this.dict.get("Names");
-		if (namesEntry instanceof PdfRef) namesEntry = this.registry.resolve(namesEntry) ?? void 0;
-		return namesEntry instanceof PdfDict ? namesEntry : null;
+		return this.dict.getDict("Names", this.registry.resolve.bind(this.registry)) ?? null;
 	}
 	/**
 	* Get or create the /Names dictionary.
@@ -32279,12 +32047,7 @@ var PDFCatalog = class {
 			this._embeddedFilesTree = null;
 			return null;
 		}
-		const embeddedFilesEntry = names.get("EmbeddedFiles");
-		let embeddedFiles = null;
-		if (embeddedFilesEntry instanceof PdfRef) {
-			const resolved = this.registry.resolve(embeddedFilesEntry);
-			if (resolved instanceof PdfDict) embeddedFiles = resolved;
-		} else if (embeddedFilesEntry instanceof PdfDict) embeddedFiles = embeddedFilesEntry;
+		const embeddedFiles = names.getDict("EmbeddedFiles", this.registry.resolve.bind(this.registry));
 		if (!embeddedFiles) {
 			this._embeddedFilesTree = null;
 			return null;
@@ -34978,14 +34741,7 @@ var PDFForm = class PDFForm {
 		for (const pageRef of pageRefs) {
 			const pageDict = this._ctx.registry.resolve(pageRef);
 			if (!(pageDict instanceof PdfDict)) continue;
-			const annotsEntry = pageDict.get("Annots");
-			if (!annotsEntry) continue;
-			let annots = null;
-			if (annotsEntry instanceof PdfArray) annots = annotsEntry;
-			else if (annotsEntry instanceof PdfRef) {
-				const resolved = this._ctx.registry.resolve(annotsEntry);
-				if (resolved instanceof PdfArray) annots = resolved;
-			}
+			const annots = pageDict.getArray("Annots", this._ctx.registry.resolve.bind(this._ctx.registry));
 			if (!annots) continue;
 			for (let i = annots.length - 1; i >= 0; i--) {
 				const item = annots.at(i);
@@ -35946,49 +35702,28 @@ var DSSBuilder = class DSSBuilder {
 	*/
 	static async fromCatalog(catalog, registry, options) {
 		const builder = new DSSBuilder(registry, options);
-		const dssVal = catalog.get("DSS");
-		if (!dssVal) return builder;
-		let dss;
-		if (dssVal instanceof PdfDict) dss = dssVal;
-		else if (dssVal instanceof PdfRef) {
-			const resolved = registry.resolve(dssVal);
-			if (!(resolved instanceof PdfDict)) return builder;
-			dss = resolved;
-		} else return builder;
+		const resolve = registry.resolve.bind(registry);
+		const dss = catalog.getDict("DSS", resolve);
+		if (!dss) return builder;
 		await builder.loadExistingData(dss, "Certs", builder.certMap, builder.existingCertRefs);
 		await builder.loadExistingData(dss, "OCSPs", builder.ocspMap, builder.existingOcspRefs);
 		await builder.loadExistingData(dss, "CRLs", builder.crlMap, builder.existingCrlRefs);
-		const vriVal = dss.get("VRI");
-		if (vriVal) {
-			let vri;
-			if (vriVal instanceof PdfDict) vri = vriVal;
-			else if (vriVal instanceof PdfRef) {
-				const resolved = registry.resolve(vriVal);
-				if (!(resolved instanceof PdfDict)) return builder;
-				vri = resolved;
-			} else return builder;
-			for (const key$1 of vri.keys()) {
-				const entryVal = vri.get(key$1);
-				if (entryVal) {
-					let entry;
-					if (entryVal instanceof PdfDict) entry = entryVal;
-					else if (entryVal instanceof PdfRef) {
-						const resolved = registry.resolve(entryVal);
-						if (!(resolved instanceof PdfDict)) continue;
-						entry = resolved;
-					} else continue;
-					const certHashes = await builder.extractRefHashes(entry, "Cert", builder.certMap);
-					const ocspHashes = await builder.extractRefHashes(entry, "OCSP", builder.ocspMap);
-					const crlHashes = await builder.extractRefHashes(entry, "CRL", builder.crlMap);
-					let timestamp;
-					if (entry.get("TU") instanceof PdfString) timestamp = /* @__PURE__ */ new Date();
-					builder.vriEntries.set(key$1.value.toUpperCase(), {
-						certHashes,
-						ocspHashes,
-						crlHashes,
-						timestamp
-					});
-				}
+		const vri = dss.getDict("VRI", resolve);
+		if (vri) for (const key$1 of vri.keys()) {
+			const entryVal = vri.get(key$1, resolve);
+			const entry = entryVal instanceof PdfDict ? entryVal : null;
+			if (entry) {
+				const certHashes = await builder.extractRefHashes(entry, "Cert", builder.certMap);
+				const ocspHashes = await builder.extractRefHashes(entry, "OCSP", builder.ocspMap);
+				const crlHashes = await builder.extractRefHashes(entry, "CRL", builder.crlMap);
+				let timestamp;
+				if (entry.getString("TU", resolve)) timestamp = /* @__PURE__ */ new Date();
+				builder.vriEntries.set(key$1.value.toUpperCase(), {
+					certHashes,
+					ocspHashes,
+					crlHashes,
+					timestamp
+				});
 			}
 		}
 		return builder;
@@ -36069,11 +35804,8 @@ var DSSBuilder = class DSSBuilder {
 	* Load existing data from DSS array.
 	*/
 	async loadExistingData(dss, key$1, dataMap, refMap) {
-		let arrayVal = dss.get(key$1);
-		if (!arrayVal) return;
-		let array;
-		if (arrayVal instanceof PdfRef) arrayVal = this.registry.resolve(arrayVal) ?? void 0;
-		if (arrayVal instanceof PdfArray) array = arrayVal;
+		const resolve = this.registry.resolve.bind(this.registry);
+		const array = dss.getArray(key$1, resolve);
 		if (!array) return;
 		for (const item of array) if (item instanceof PdfRef) {
 			const stream = this.registry.resolve(item);
@@ -36093,10 +35825,8 @@ var DSSBuilder = class DSSBuilder {
 	*/
 	async extractRefHashes(entry, key$1, dataMap) {
 		const hashes = [];
-		let arrayVal = entry.get(key$1);
-		if (!arrayVal) return hashes;
-		if (arrayVal instanceof PdfRef) arrayVal = this.registry.resolve(arrayVal) ?? void 0;
-		const array = arrayVal instanceof PdfArray ? arrayVal : null;
+		const resolve = this.registry.resolve.bind(this.registry);
+		const array = entry.getArray(key$1, resolve);
 		if (!array) return hashes;
 		for (const item of array) if (item instanceof PdfRef) {
 			const stream = this.registry.resolve(item);
@@ -38324,12 +38054,8 @@ var PDF = class PDF {
 	*/
 	getOrCreateViewerPreferences() {
 		const catalog = this.ctx.catalog.getDict();
-		const existing = catalog.get("ViewerPreferences");
-		if (existing instanceof PdfDict) return existing;
-		if (existing instanceof PdfRef) {
-			const resolved = this.ctx.registry.getObject(existing);
-			if (resolved instanceof PdfDict) return resolved;
-		}
+		const existing = catalog.getDict("ViewerPreferences", this.ctx.resolve.bind(this.ctx));
+		if (existing) return existing;
 		const prefs = new PdfDict();
 		catalog.set("ViewerPreferences", prefs);
 		return prefs;
@@ -38380,24 +38106,9 @@ var PDF = class PDF {
 		if (!ref) return null;
 		const dict = this.ctx.resolve(ref);
 		if (!(dict instanceof PdfDict)) return null;
-		this.ensurePageResourcesResolved(dict);
 		return new PDFPage(ref, dict, index, this.ctx);
 	}
 	/**
-	* Ensure page resources are resolved (not a reference).
-	*
-	* Pages may have Resources as a PdfRef pointing to a shared resources dict.
-	* The sync getResources() method on PDFPage needs the actual dict, not a ref.
-	* This resolves the reference and replaces it in the page dict.
-	*/
-	ensurePageResourcesResolved(pageDict) {
-		const resources = pageDict.get("Resources");
-		if (resources instanceof PdfRef) {
-			const resolved = this.ctx.resolve(resources);
-			if (resolved instanceof PdfDict) pageDict.set("Resources", resolved.clone());
-		}
-	}
-	/**
 	* Add a new blank page.
 	*
 	* @param options - Page size, rotation, and insertion position
@@ -38582,14 +38293,12 @@ var PDF = class PDF {
 		if (!srcPage) throw new RangeError(`Page index ${pageIndex} out of bounds`);
 		const contentData = this.getPageContentData(source, srcPage);
 		const copier = new ObjectCopier(source, this, { includeAnnotations: false });
-		let srcResources = srcPage.dict.get("Resources");
-		let resources = void 0;
-		if (srcResources instanceof PdfRef) srcResources = source.getObject(srcResources) ?? void 0;
-		if (srcResources instanceof PdfDict) {
+		const srcResources = srcPage.dict.getDict("Resources", source.getObject.bind(source));
+		let resources;
+		if (srcResources) {
 			const copied = await copier.copyObject(srcResources);
-			if (copied instanceof PdfDict) resources = copied;
-		}
-		if (!resources) resources = new PdfDict();
+			resources = copied instanceof PdfDict ? copied : new PdfDict();
+		} else resources = new PdfDict();
 		const mediaBox = srcPage.getMediaBox();
 		const formXObject = PdfStream.fromDict({
 			Type: PdfName.of("XObject"),
@@ -38609,13 +38318,9 @@ var PDF = class PDF {
 	* Get the concatenated content stream data from a page.
 	*/
 	getPageContentData(source, page) {
-		const contents = page.dict.get("Contents");
+		const contents = page.dict.get("Contents", source.getObject.bind(source));
 		if (!contents) return new Uint8Array(0);
-		if (contents instanceof PdfRef) {
-			const stream = source.getObject(contents);
-			if (stream instanceof PdfStream) return stream.getDecodedData();
-			return new Uint8Array(0);
-		}
+		if (contents instanceof PdfStream) return contents.getDecodedData();
 		if (contents instanceof PdfArray) {
 			const chunks = [];
 			for (let i = 0; i < contents.length; i++) {
@@ -38637,7 +38342,6 @@ var PDF = class PDF {
 			}
 			return result;
 		}
-		if (contents instanceof PdfStream) return contents.getDecodedData();
 		return new Uint8Array(0);
 	}
 	/**