pdf-codec 3.5.3 → 3.6.0

package/dist/font-tables.cjs

@@ -64,6 +64,35 @@ function parsePost(font) {
 		underlineThickness: require_sfnt.i16(bytes, 10)
 	};
 }
+const MAC_STANDARD_GLYPH_ORDER = ".notdef .null nonmarkingreturn space exclam quotedbl numbersign dollar percent ampersand quotesingle parenleft parenright asterisk plus comma hyphen period slash zero one two three four five six seven eight nine colon semicolon less equal greater question at A B C D E F G H I J K L M N O P Q R S T U V W X Y Z bracketleft backslash bracketright asciicircum underscore grave a b c d e f g h i j k l m n o p q r s t u v w x y z braceleft bar braceright asciitilde Adieresis Aring Ccedilla Eacute Ntilde Odieresis Udieresis aacute agrave acircumflex adieresis atilde aring ccedilla eacute egrave ecircumflex edieresis iacute igrave icircumflex idieresis ntilde oacute ograve ocircumflex odieresis otilde uacute ugrave ucircumflex udieresis dagger degree cent sterling section bullet paragraph germandbls registered copyright trademark acute dieresis notequal AE Oslash infinity plusminus lessequal greaterequal yen mu partialdiff summation product pi integral ordfeminine ordmasculine Omega ae oslash questiondown exclamdown logicalnot radical florin approxequal Delta guillemotleft guillemotright ellipsis nonbreakingspace Agrave Atilde Otilde OE oe endash emdash quotedblleft quotedblright quoteleft quoteright divide lozenge ydieresis Ydieresis fraction currency guilsinglleft guilsinglright fi fl daggerdbl periodcentered quotesinglbase quotedblbase perthousand Acircumflex Ecircumflex Aacute Edieresis Egrave Iacute Icircumflex Idieresis Igrave Oacute Ocircumflex apple Ograve Uacute Ucircumflex Ugrave dotlessi circumflex tilde macron breve dotaccent ring cedilla hungarumlaut ogonek caron Lslash lslash Scaron scaron Zcaron zcaron brokenbar Eth eth Yacute yacute Thorn thorn minus multiply onesuperior twosuperior threesuperior onehalf onequarter threequarters franc Gbreve gbreve Idotaccent Scedilla scedilla Cacute cacute Ccaron ccaron dcroat".split(" ");
+const POST_VERSION_MAC_STANDARD_ORDER = 65536;
+const POST_VERSION_CUSTOM_NAMES = 131072;
+function parsePostGlyphNames(font) {
+	const bytes = require_sfnt.sfntTableBytes(font, "post");
+	if (bytes === void 0 || !require_sfnt.hasBytes(bytes, 0, POST_HEADER_SIZE)) return;
+	const version = require_sfnt.u32(bytes, 0);
+	if (version === POST_VERSION_MAC_STANDARD_ORDER) return (glyphId) => MAC_STANDARD_GLYPH_ORDER[glyphId];
+	if (version !== POST_VERSION_CUSTOM_NAMES) return;
+	if (!require_sfnt.hasBytes(bytes, POST_HEADER_SIZE, 2)) return;
+	const numGlyphs = require_sfnt.u16(bytes, POST_HEADER_SIZE);
+	const indicesOffset = 34;
+	if (!require_sfnt.hasBytes(bytes, indicesOffset, numGlyphs * 2)) return;
+	const names = [];
+	let cursor = indicesOffset + numGlyphs * 2;
+	while (require_sfnt.hasBytes(bytes, cursor, 1)) {
+		const length = require_sfnt.u8(bytes, cursor);
+		if (!require_sfnt.hasBytes(bytes, cursor + 1, length)) break;
+		let name = "";
+		for (let i = 0; i < length; i++) name += String.fromCharCode(require_sfnt.u8(bytes, cursor + 1 + i));
+		names.push(name);
+		cursor += 1 + length;
+	}
+	return (glyphId) => {
+		if (glyphId < 0 || glyphId >= numGlyphs) return;
+		const index = require_sfnt.u16(bytes, indicesOffset + glyphId * 2);
+		return index < MAC_STANDARD_GLYPH_ORDER.length ? MAC_STANDARD_GLYPH_ORDER[index] : names[index - MAC_STANDARD_GLYPH_ORDER.length];
+	};
+}
 const NAME_HEADER_SIZE = 6;
 const NAME_RECORD_SIZE = 12;
 const NAME_ID_FAMILY = 1;
@@ -121,8 +150,10 @@ function parseName(font) {
 	};
 }
 //#endregion
+exports.MAC_STANDARD_GLYPH_ORDER = MAC_STANDARD_GLYPH_ORDER;
 exports.parseHead = parseHead;
 exports.parseMaxp = parseMaxp;
 exports.parseName = parseName;
 exports.parseOs2 = parseOs2;
 exports.parsePost = parsePost;
+exports.parsePostGlyphNames = parsePostGlyphNames;

package/dist/font-tables.d.cts

@@ -35,10 +35,12 @@ interface PostTable {
   readonly underlineThickness: number;
 }
 declare function parsePost(font: SfntFont): PostTable | undefined;
+declare const MAC_STANDARD_GLYPH_ORDER: readonly string[];
+declare function parsePostGlyphNames(font: SfntFont): ((glyphId: number) => string | undefined) | undefined;
 interface NameTable {
   readonly postScriptName: string | undefined;
   readonly familyName: string | undefined;
 }
 declare function parseName(font: SfntFont): NameTable | undefined;
 //#endregion
-export { HeadTable, MaxpTable, NameTable, Os2Table, PostTable, parseHead, parseMaxp, parseName, parseOs2, parsePost };
+export { HeadTable, MAC_STANDARD_GLYPH_ORDER, MaxpTable, NameTable, Os2Table, PostTable, parseHead, parseMaxp, parseName, parseOs2, parsePost, parsePostGlyphNames };

package/dist/font-tables.d.ts

@@ -35,10 +35,12 @@ interface PostTable {
   readonly underlineThickness: number;
 }
 declare function parsePost(font: SfntFont): PostTable | undefined;
+declare const MAC_STANDARD_GLYPH_ORDER: readonly string[];
+declare function parsePostGlyphNames(font: SfntFont): ((glyphId: number) => string | undefined) | undefined;
 interface NameTable {
   readonly postScriptName: string | undefined;
   readonly familyName: string | undefined;
 }
 declare function parseName(font: SfntFont): NameTable | undefined;
 //#endregion
-export { HeadTable, MaxpTable, NameTable, Os2Table, PostTable, parseHead, parseMaxp, parseName, parseOs2, parsePost };
+export { HeadTable, MAC_STANDARD_GLYPH_ORDER, MaxpTable, NameTable, Os2Table, PostTable, parseHead, parseMaxp, parseName, parseOs2, parsePost, parsePostGlyphNames };

package/dist/font-tables.js

@@ -1,4 +1,4 @@
-import { hasBytes, i16, i32, sfntTableBytes, u16, u32 } from "./sfnt.js";
+import { hasBytes, i16, i32, sfntTableBytes, u16, u32, u8 } from "./sfnt.js";
 //#region src/font-tables.ts
 const HEAD_TABLE_SIZE = 54;
 const HEAD_MAGIC_NUMBER = 1594834165;
@@ -63,6 +63,35 @@ function parsePost(font) {
 		underlineThickness: i16(bytes, 10)
 	};
 }
+const MAC_STANDARD_GLYPH_ORDER = ".notdef .null nonmarkingreturn space exclam quotedbl numbersign dollar percent ampersand quotesingle parenleft parenright asterisk plus comma hyphen period slash zero one two three four five six seven eight nine colon semicolon less equal greater question at A B C D E F G H I J K L M N O P Q R S T U V W X Y Z bracketleft backslash bracketright asciicircum underscore grave a b c d e f g h i j k l m n o p q r s t u v w x y z braceleft bar braceright asciitilde Adieresis Aring Ccedilla Eacute Ntilde Odieresis Udieresis aacute agrave acircumflex adieresis atilde aring ccedilla eacute egrave ecircumflex edieresis iacute igrave icircumflex idieresis ntilde oacute ograve ocircumflex odieresis otilde uacute ugrave ucircumflex udieresis dagger degree cent sterling section bullet paragraph germandbls registered copyright trademark acute dieresis notequal AE Oslash infinity plusminus lessequal greaterequal yen mu partialdiff summation product pi integral ordfeminine ordmasculine Omega ae oslash questiondown exclamdown logicalnot radical florin approxequal Delta guillemotleft guillemotright ellipsis nonbreakingspace Agrave Atilde Otilde OE oe endash emdash quotedblleft quotedblright quoteleft quoteright divide lozenge ydieresis Ydieresis fraction currency guilsinglleft guilsinglright fi fl daggerdbl periodcentered quotesinglbase quotedblbase perthousand Acircumflex Ecircumflex Aacute Edieresis Egrave Iacute Icircumflex Idieresis Igrave Oacute Ocircumflex apple Ograve Uacute Ucircumflex Ugrave dotlessi circumflex tilde macron breve dotaccent ring cedilla hungarumlaut ogonek caron Lslash lslash Scaron scaron Zcaron zcaron brokenbar Eth eth Yacute yacute Thorn thorn minus multiply onesuperior twosuperior threesuperior onehalf onequarter threequarters franc Gbreve gbreve Idotaccent Scedilla scedilla Cacute cacute Ccaron ccaron dcroat".split(" ");
+const POST_VERSION_MAC_STANDARD_ORDER = 65536;
+const POST_VERSION_CUSTOM_NAMES = 131072;
+function parsePostGlyphNames(font) {
+	const bytes = sfntTableBytes(font, "post");
+	if (bytes === void 0 || !hasBytes(bytes, 0, POST_HEADER_SIZE)) return;
+	const version = u32(bytes, 0);
+	if (version === POST_VERSION_MAC_STANDARD_ORDER) return (glyphId) => MAC_STANDARD_GLYPH_ORDER[glyphId];
+	if (version !== POST_VERSION_CUSTOM_NAMES) return;
+	if (!hasBytes(bytes, POST_HEADER_SIZE, 2)) return;
+	const numGlyphs = u16(bytes, POST_HEADER_SIZE);
+	const indicesOffset = 34;
+	if (!hasBytes(bytes, indicesOffset, numGlyphs * 2)) return;
+	const names = [];
+	let cursor = indicesOffset + numGlyphs * 2;
+	while (hasBytes(bytes, cursor, 1)) {
+		const length = u8(bytes, cursor);
+		if (!hasBytes(bytes, cursor + 1, length)) break;
+		let name = "";
+		for (let i = 0; i < length; i++) name += String.fromCharCode(u8(bytes, cursor + 1 + i));
+		names.push(name);
+		cursor += 1 + length;
+	}
+	return (glyphId) => {
+		if (glyphId < 0 || glyphId >= numGlyphs) return;
+		const index = u16(bytes, indicesOffset + glyphId * 2);
+		return index < MAC_STANDARD_GLYPH_ORDER.length ? MAC_STANDARD_GLYPH_ORDER[index] : names[index - MAC_STANDARD_GLYPH_ORDER.length];
+	};
+}
 const NAME_HEADER_SIZE = 6;
 const NAME_RECORD_SIZE = 12;
 const NAME_ID_FAMILY = 1;
@@ -120,4 +149,4 @@ function parseName(font) {
 	};
 }
 //#endregion
-export { parseHead, parseMaxp, parseName, parseOs2, parsePost };
+export { MAC_STANDARD_GLYPH_ORDER, parseHead, parseMaxp, parseName, parseOs2, parsePost, parsePostGlyphNames };

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-W02fJh-k.cjs");
+const require_afm_widths = require("./afm-widths-BTu0IDp2.cjs");
 const require_image_ccitt = require("./image/ccitt.cjs");
 const require_image_jbig2_errors = require("./image/jbig2-errors.cjs");
 const require_image_jbig2 = require("./image/jbig2.cjs");

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as STANDARD_METRICS } from "./afm-widths-B6KdmpRF.js";
+import { t as STANDARD_METRICS } from "./afm-widths-De_QMWgC.js";
 import { decodeCcittFax } from "./image/ccitt.js";
 import { Jbig2ParseError, Jbig2UnsupportedError } from "./image/jbig2-errors.js";
 import { decodeJbig2Embedded } from "./image/jbig2.js";

package/dist/interpret.cjs

@@ -9,10 +9,8 @@ let document_schema_js = require("document-schema.js");
 const MAX_FORM_XOBJECT_DEPTH = 12;
 const FALLBACK_GLYPH_WIDTH_PER_1000 = 500;
 const DEFAULT_LINE_WIDTH_PT = 1;
-function defaultTextState() {
+function initialTextParameters() {
 	return {
-		tm: require_matrix.IDENTITY_MATRIX,
-		tlm: require_matrix.IDENTITY_MATRIX,
 		fontResourceName: void 0,
 		fontSizePt: 0,
 		charSpace: 0,
@@ -22,16 +20,22 @@ function defaultTextState() {
 		rise: 0
 	};
 }
-function computeTrm(ctm, ts) {
+function defaultTextObjectState() {
+	return {
+		tm: require_matrix.IDENTITY_MATRIX,
+		tlm: require_matrix.IDENTITY_MATRIX
+	};
+}
+function computeTrm(gs, text) {
 	const fontMatrix = [
-		ts.fontSizePt * ts.horizScale,
+		gs.fontSizePt * gs.horizScale,
 		0,
 		0,
-		ts.fontSizePt,
+		gs.fontSizePt,
 		0,
-		ts.rise
+		gs.rise
 	];
-	return require_matrix.multiplyMatrices(require_matrix.multiplyMatrices(fontMatrix, ts.tm), ctm);
+	return require_matrix.multiplyMatrices(require_matrix.multiplyMatrices(fontMatrix, text.tm), gs.ctm);
 }
 function numAt(operands, index) {
 	return require_objects.asNumber(operands[index]) ?? 0;
@@ -271,7 +275,8 @@ function interpretContentStream(bytes, resources, context) {
 		ctm: require_matrix.IDENTITY_MATRIX,
 		fillColor: document_schema_js.COLOR_BLACK,
 		strokeColor: document_schema_js.COLOR_BLACK,
-		lineWidth: DEFAULT_LINE_WIDTH_PT
+		lineWidth: DEFAULT_LINE_WIDTH_PT,
+		...initialTextParameters()
 	}, context, items, 0, []);
 	return items;
 }
@@ -289,7 +294,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 	const operations = require_content_read.readContentStream(bytes, context.sink);
 	const gsStack = [];
 	let gs = initialState;
-	let ts = defaultTextState();
+	let text = defaultTextObjectState();
 	let pathSubpaths = [];
 	let currentSubpath;
 	const inScope = (key) => {
@@ -407,26 +412,28 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 		resetPath();
 	};
 	const advanceThroughString = (codes) => {
-		if (ts.fontResourceName === void 0) return;
+		const fontResourceName = gs.fontResourceName;
+		if (fontResourceName === void 0) return;
 		let offset = 0;
 		while (offset < codes.length) {
-			const glyph = context.fontMetrics.glyphAdvance(ts.fontResourceName, resources, codes, offset);
+			const glyph = context.fontMetrics.glyphAdvance(fontResourceName, resources, codes, offset);
 			if (glyph === void 0) context.sink({
 				code: "pdf/font-not-resolved",
 				severity: "warning",
-				message: `could not resolve font resource /${ts.fontResourceName} to compute a glyph advance; assuming a fallback width`
+				message: `could not resolve font resource /${fontResourceName} to compute a glyph advance; assuming a fallback width`
 			});
 			const widthPer1000 = glyph?.widthPer1000 ?? FALLBACK_GLYPH_WIDTH_PER_1000;
 			const byteLength = glyph?.byteLengthConsumed ?? 1;
 			const isSingleByteSpace = byteLength === 1 && codes[offset] === 32;
-			const tx = (widthPer1000 / 1e3 * ts.fontSizePt + ts.charSpace + (isSingleByteSpace ? ts.wordSpace : 0)) * ts.horizScale;
-			ts.tm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(tx, 0), ts.tm);
+			const tx = (widthPer1000 / 1e3 * gs.fontSizePt + gs.charSpace + (isSingleByteSpace ? gs.wordSpace : 0)) * gs.horizScale;
+			text.tm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(tx, 0), text.tm);
 			offset += byteLength;
 		}
 	};
 	const showTextArray = (elements) => {
-		if (ts.fontResourceName === void 0) return;
-		const startMatrix = computeTrm(gs.ctm, ts);
+		const fontResourceName = gs.fontResourceName;
+		if (fontResourceName === void 0) return;
+		const startMatrix = computeTrm(gs, text);
 		const chunks = [];
 		let totalLength = 0;
 		for (const el of elements) if (el.kind === "string") {
@@ -434,8 +441,8 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			totalLength += el.bytes.length;
 			advanceThroughString(el.bytes);
 		} else if (el.kind === "number") {
-			const adjustment = -(el.value / 1e3) * ts.fontSizePt * ts.horizScale;
-			ts.tm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(adjustment, 0), ts.tm);
+			const adjustment = -(el.value / 1e3) * gs.fontSizePt * gs.horizScale;
+			text.tm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(adjustment, 0), text.tm);
 		}
 		if (totalLength === 0) return;
 		const combined = new Uint8Array(totalLength);
@@ -444,15 +451,15 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			combined.set(chunk, at);
 			at += chunk.length;
 		}
-		const endMatrix = computeTrm(gs.ctm, ts);
+		const endMatrix = computeTrm(gs, text);
 		pushItem({
 			kind: "text",
 			codes: combined,
-			fontResourceName: ts.fontResourceName,
+			fontResourceName,
 			resources,
 			startMatrix,
 			endMatrix,
-			sizePt: ts.fontSizePt,
+			sizePt: gs.fontSizePt,
 			color: gs.fillColor
 		});
 	};
@@ -464,8 +471,8 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 		}]);
 	};
 	const nextLine = () => {
-		ts.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(0, -ts.leading), ts.tlm);
-		ts.tm = ts.tlm;
+		text.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(0, -gs.leading), text.tlm);
+		text.tm = text.tlm;
 	};
 	const handleDo = (name) => {
 		if (name === void 0) return;
@@ -711,39 +718,60 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 				emitPaint(operator);
 				break;
 			case "BT":
-				ts = defaultTextState();
+				text = defaultTextObjectState();
 				break;
 			case "Tf":
-				ts.fontResourceName = require_objects.asName(operands[0]);
-				ts.fontSizePt = numAt(operands, 1);
+				gs = {
+					...gs,
+					fontResourceName: require_objects.asName(operands[0]),
+					fontSizePt: numAt(operands, 1)
+				};
 				break;
 			case "Tc":
-				ts.charSpace = numAt(operands, 0);
+				gs = {
+					...gs,
+					charSpace: numAt(operands, 0)
+				};
 				break;
 			case "Tw":
-				ts.wordSpace = numAt(operands, 0);
+				gs = {
+					...gs,
+					wordSpace: numAt(operands, 0)
+				};
 				break;
 			case "Tz":
-				ts.horizScale = numAt(operands, 0) / 100;
+				gs = {
+					...gs,
+					horizScale: numAt(operands, 0) / 100
+				};
 				break;
 			case "TL":
-				ts.leading = numAt(operands, 0);
+				gs = {
+					...gs,
+					leading: numAt(operands, 0)
+				};
 				break;
 			case "Ts":
-				ts.rise = numAt(operands, 0);
+				gs = {
+					...gs,
+					rise: numAt(operands, 0)
+				};
 				break;
 			case "Td":
-				ts.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(numAt(operands, 0), numAt(operands, 1)), ts.tlm);
-				ts.tm = ts.tlm;
+				text.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(numAt(operands, 0), numAt(operands, 1)), text.tlm);
+				text.tm = text.tlm;
 				break;
 			case "TD":
-				ts.leading = -numAt(operands, 1);
-				ts.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(numAt(operands, 0), numAt(operands, 1)), ts.tlm);
-				ts.tm = ts.tlm;
+				gs = {
+					...gs,
+					leading: -numAt(operands, 1)
+				};
+				text.tlm = require_matrix.multiplyMatrices(require_matrix.translationMatrix(numAt(operands, 0), numAt(operands, 1)), text.tlm);
+				text.tm = text.tlm;
 				break;
 			case "Tm":
-				ts.tlm = matrixFromOperands(operands);
-				ts.tm = ts.tlm;
+				text.tlm = matrixFromOperands(operands);
+				text.tm = text.tlm;
 				break;
 			case "T*":
 				nextLine();
@@ -760,8 +788,11 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 				break;
 			}
 			case "\"": {
-				ts.wordSpace = numAt(operands, 0);
-				ts.charSpace = numAt(operands, 1);
+				gs = {
+					...gs,
+					wordSpace: numAt(operands, 0),
+					charSpace: numAt(operands, 1)
+				};
 				nextLine();
 				const str = operands[2];
 				if (str?.kind === "string") showText(str.bytes);

package/dist/interpret.js

@@ -8,10 +8,8 @@ import { COLOR_BLACK } from "document-schema.js";
 const MAX_FORM_XOBJECT_DEPTH = 12;
 const FALLBACK_GLYPH_WIDTH_PER_1000 = 500;
 const DEFAULT_LINE_WIDTH_PT = 1;
-function defaultTextState() {
+function initialTextParameters() {
 	return {
-		tm: IDENTITY_MATRIX,
-		tlm: IDENTITY_MATRIX,
 		fontResourceName: void 0,
 		fontSizePt: 0,
 		charSpace: 0,
@@ -21,16 +19,22 @@ function defaultTextState() {
 		rise: 0
 	};
 }
-function computeTrm(ctm, ts) {
+function defaultTextObjectState() {
+	return {
+		tm: IDENTITY_MATRIX,
+		tlm: IDENTITY_MATRIX
+	};
+}
+function computeTrm(gs, text) {
 	const fontMatrix = [
-		ts.fontSizePt * ts.horizScale,
+		gs.fontSizePt * gs.horizScale,
 		0,
 		0,
-		ts.fontSizePt,
+		gs.fontSizePt,
 		0,
-		ts.rise
+		gs.rise
 	];
-	return multiplyMatrices(multiplyMatrices(fontMatrix, ts.tm), ctm);
+	return multiplyMatrices(multiplyMatrices(fontMatrix, text.tm), gs.ctm);
 }
 function numAt(operands, index) {
 	return asNumber(operands[index]) ?? 0;
@@ -270,7 +274,8 @@ function interpretContentStream(bytes, resources, context) {
 		ctm: IDENTITY_MATRIX,
 		fillColor: COLOR_BLACK,
 		strokeColor: COLOR_BLACK,
-		lineWidth: DEFAULT_LINE_WIDTH_PT
+		lineWidth: DEFAULT_LINE_WIDTH_PT,
+		...initialTextParameters()
 	}, context, items, 0, []);
 	return items;
 }
@@ -288,7 +293,7 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 	const operations = readContentStream(bytes, context.sink);
 	const gsStack = [];
 	let gs = initialState;
-	let ts = defaultTextState();
+	let text = defaultTextObjectState();
 	let pathSubpaths = [];
 	let currentSubpath;
 	const inScope = (key) => {
@@ -406,26 +411,28 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 		resetPath();
 	};
 	const advanceThroughString = (codes) => {
-		if (ts.fontResourceName === void 0) return;
+		const fontResourceName = gs.fontResourceName;
+		if (fontResourceName === void 0) return;
 		let offset = 0;
 		while (offset < codes.length) {
-			const glyph = context.fontMetrics.glyphAdvance(ts.fontResourceName, resources, codes, offset);
+			const glyph = context.fontMetrics.glyphAdvance(fontResourceName, resources, codes, offset);
 			if (glyph === void 0) context.sink({
 				code: "pdf/font-not-resolved",
 				severity: "warning",
-				message: `could not resolve font resource /${ts.fontResourceName} to compute a glyph advance; assuming a fallback width`
+				message: `could not resolve font resource /${fontResourceName} to compute a glyph advance; assuming a fallback width`
 			});
 			const widthPer1000 = glyph?.widthPer1000 ?? FALLBACK_GLYPH_WIDTH_PER_1000;
 			const byteLength = glyph?.byteLengthConsumed ?? 1;
 			const isSingleByteSpace = byteLength === 1 && codes[offset] === 32;
-			const tx = (widthPer1000 / 1e3 * ts.fontSizePt + ts.charSpace + (isSingleByteSpace ? ts.wordSpace : 0)) * ts.horizScale;
-			ts.tm = multiplyMatrices(translationMatrix(tx, 0), ts.tm);
+			const tx = (widthPer1000 / 1e3 * gs.fontSizePt + gs.charSpace + (isSingleByteSpace ? gs.wordSpace : 0)) * gs.horizScale;
+			text.tm = multiplyMatrices(translationMatrix(tx, 0), text.tm);
 			offset += byteLength;
 		}
 	};
 	const showTextArray = (elements) => {
-		if (ts.fontResourceName === void 0) return;
-		const startMatrix = computeTrm(gs.ctm, ts);
+		const fontResourceName = gs.fontResourceName;
+		if (fontResourceName === void 0) return;
+		const startMatrix = computeTrm(gs, text);
 		const chunks = [];
 		let totalLength = 0;
 		for (const el of elements) if (el.kind === "string") {
@@ -433,8 +440,8 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			totalLength += el.bytes.length;
 			advanceThroughString(el.bytes);
 		} else if (el.kind === "number") {
-			const adjustment = -(el.value / 1e3) * ts.fontSizePt * ts.horizScale;
-			ts.tm = multiplyMatrices(translationMatrix(adjustment, 0), ts.tm);
+			const adjustment = -(el.value / 1e3) * gs.fontSizePt * gs.horizScale;
+			text.tm = multiplyMatrices(translationMatrix(adjustment, 0), text.tm);
 		}
 		if (totalLength === 0) return;
 		const combined = new Uint8Array(totalLength);
@@ -443,15 +450,15 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			combined.set(chunk, at);
 			at += chunk.length;
 		}
-		const endMatrix = computeTrm(gs.ctm, ts);
+		const endMatrix = computeTrm(gs, text);
 		pushItem({
 			kind: "text",
 			codes: combined,
-			fontResourceName: ts.fontResourceName,
+			fontResourceName,
 			resources,
 			startMatrix,
 			endMatrix,
-			sizePt: ts.fontSizePt,
+			sizePt: gs.fontSizePt,
 			color: gs.fillColor
 		});
 	};
@@ -463,8 +470,8 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 		}]);
 	};
 	const nextLine = () => {
-		ts.tlm = multiplyMatrices(translationMatrix(0, -ts.leading), ts.tlm);
-		ts.tm = ts.tlm;
+		text.tlm = multiplyMatrices(translationMatrix(0, -gs.leading), text.tlm);
+		text.tm = text.tlm;
 	};
 	const handleDo = (name) => {
 		if (name === void 0) return;
@@ -710,39 +717,60 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 				emitPaint(operator);
 				break;
 			case "BT":
-				ts = defaultTextState();
+				text = defaultTextObjectState();
 				break;
 			case "Tf":
-				ts.fontResourceName = asName(operands[0]);
-				ts.fontSizePt = numAt(operands, 1);
+				gs = {
+					...gs,
+					fontResourceName: asName(operands[0]),
+					fontSizePt: numAt(operands, 1)
+				};
 				break;
 			case "Tc":
-				ts.charSpace = numAt(operands, 0);
+				gs = {
+					...gs,
+					charSpace: numAt(operands, 0)
+				};
 				break;
 			case "Tw":
-				ts.wordSpace = numAt(operands, 0);
+				gs = {
+					...gs,
+					wordSpace: numAt(operands, 0)
+				};
 				break;
 			case "Tz":
-				ts.horizScale = numAt(operands, 0) / 100;
+				gs = {
+					...gs,
+					horizScale: numAt(operands, 0) / 100
+				};
 				break;
 			case "TL":
-				ts.leading = numAt(operands, 0);
+				gs = {
+					...gs,
+					leading: numAt(operands, 0)
+				};
 				break;
 			case "Ts":
-				ts.rise = numAt(operands, 0);
+				gs = {
+					...gs,
+					rise: numAt(operands, 0)
+				};
 				break;
 			case "Td":
-				ts.tlm = multiplyMatrices(translationMatrix(numAt(operands, 0), numAt(operands, 1)), ts.tlm);
-				ts.tm = ts.tlm;
+				text.tlm = multiplyMatrices(translationMatrix(numAt(operands, 0), numAt(operands, 1)), text.tlm);
+				text.tm = text.tlm;
 				break;
 			case "TD":
-				ts.leading = -numAt(operands, 1);
-				ts.tlm = multiplyMatrices(translationMatrix(numAt(operands, 0), numAt(operands, 1)), ts.tlm);
-				ts.tm = ts.tlm;
+				gs = {
+					...gs,
+					leading: -numAt(operands, 1)
+				};
+				text.tlm = multiplyMatrices(translationMatrix(numAt(operands, 0), numAt(operands, 1)), text.tlm);
+				text.tm = text.tlm;
 				break;
 			case "Tm":
-				ts.tlm = matrixFromOperands(operands);
-				ts.tm = ts.tlm;
+				text.tlm = matrixFromOperands(operands);
+				text.tm = text.tlm;
 				break;
 			case "T*":
 				nextLine();
@@ -759,8 +787,11 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 				break;
 			}
 			case "\"": {
-				ts.wordSpace = numAt(operands, 0);
-				ts.charSpace = numAt(operands, 1);
+				gs = {
+					...gs,
+					wordSpace: numAt(operands, 0),
+					charSpace: numAt(operands, 1)
+				};
 				nextLine();
 				const str = operands[2];
 				if (str?.kind === "string") showText(str.bytes);

package/dist/layout.d.cts

@@ -440,6 +440,7 @@ declare const LayoutAnnotationSchema: z.ZodObject<{
       odf: "odf";
       markdown: "markdown";
       pdf: "pdf";
+      epub: "epub";
     }>;
     xml: z.ZodString;
   }, z.core.$strict>>;
@@ -654,6 +655,7 @@ declare const LayoutPageSchema: z.ZodObject<{
         odf: "odf";
         markdown: "markdown";
         pdf: "pdf";
+        epub: "epub";
       }>;
       xml: z.ZodString;
     }, z.core.$strict>>;
@@ -981,6 +983,7 @@ declare const LayoutDocumentSchema: z.ZodObject<{
           odf: "odf";
           markdown: "markdown";
           pdf: "pdf";
+          epub: "epub";
         }>;
         xml: z.ZodString;
       }, z.core.$strict>>;
@@ -1044,6 +1047,7 @@ declare const LayoutDocumentSchema: z.ZodObject<{
       odf: "odf";
       markdown: "markdown";
       pdf: "pdf";
+      epub: "epub";
     }>;
     xml: z.ZodString;
   }, z.core.$strict>>>;

package/dist/layout.d.ts

@@ -440,6 +440,7 @@ declare const LayoutAnnotationSchema: z.ZodObject<{
       odf: "odf";
       markdown: "markdown";
       pdf: "pdf";
+      epub: "epub";
     }>;
     xml: z.ZodString;
   }, z.core.$strict>>;
@@ -654,6 +655,7 @@ declare const LayoutPageSchema: z.ZodObject<{
         odf: "odf";
         markdown: "markdown";
         pdf: "pdf";
+        epub: "epub";
       }>;
       xml: z.ZodString;
     }, z.core.$strict>>;
@@ -981,6 +983,7 @@ declare const LayoutDocumentSchema: z.ZodObject<{
           odf: "odf";
           markdown: "markdown";
           pdf: "pdf";
+          epub: "epub";
         }>;
         xml: z.ZodString;
       }, z.core.$strict>>;
@@ -1044,6 +1047,7 @@ declare const LayoutDocumentSchema: z.ZodObject<{
       odf: "odf";
       markdown: "markdown";
       pdf: "pdf";
+      epub: "epub";
     }>;
     xml: z.ZodString;
   }, z.core.$strict>>>;

package/dist/math-font.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_util_base64 = require("./util/base64.cjs");
 const require_sfnt = require("./sfnt.cjs");
-const require_cff_bounds = require("./cff-bounds.cjs");
 const require_cmap_table = require("./cmap-table.cjs");
+const require_cff_bounds = require("./cff-bounds.cjs");
 const require_hmtx_table = require("./hmtx-table.cjs");
 const require_assets_stix_two_math_font = require("./assets/stix-two-math-font.cjs");
 const require_math_stretch = require("./math-stretch.cjs");