pdf-parser.js 5.2.26 → 5.2.28

package/dist/afm-widths.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
+const require_afm_widths = require("./afm-widths-BHD2HZIL.cjs");
 exports.STANDARD_METRICS = require_afm_widths.STANDARD_METRICS;
 exports.widthOfCode = require_afm_widths.widthOfCode;

package/dist/afm-widths.js

@@ -1,2 +1,2 @@
-import { n as widthOfCode, t as STANDARD_METRICS } from "./afm-widths-blUDDjlI.js";
+import { n as widthOfCode, t as STANDARD_METRICS } from "./afm-widths-B_IGbGky.js";
 export { STANDARD_METRICS, widthOfCode };

package/dist/annotations.cjs

@@ -74,11 +74,13 @@ function annotString(annot, key) {
 	const obj = require_objects.dictGet(annot, key);
 	return obj?.kind === "string" ? require_pdf_text.decodePdfString(obj.bytes) : void 0;
 }
+const QUAD_POINT_COORDINATES_PER_QUAD = 8;
+const QUAD_POINT_LAST_CORNER_INDEX = 3;
 function markupFields(annot, pageMatrix) {
 	const quadPoints = require_objects.asArray(require_objects.dictGet(annot, "QuadPoints"));
-	if (quadPoints === void 0 || quadPoints.length < 8 || quadPoints.length % 8 !== 0) return {};
+	if (quadPoints === void 0 || quadPoints.length < QUAD_POINT_COORDINATES_PER_QUAD || quadPoints.length % QUAD_POINT_COORDINATES_PER_QUAD !== 0) return {};
 	const quads = [];
-	for (let i = 0; i < quadPoints.length; i += 8) {
+	for (let i = 0; i < quadPoints.length; i += QUAD_POINT_COORDINATES_PER_QUAD) {
 		const corner = (index) => {
 			const x = require_objects.asNumber(quadPoints[i + index * 2]) ?? 0;
 			const y = require_objects.asNumber(quadPoints[i + index * 2 + 1]) ?? 0;
@@ -95,7 +97,7 @@ function markupFields(annot, pageMatrix) {
 			corner(0),
 			corner(1),
 			corner(2),
-			corner(3)
+			corner(QUAD_POINT_LAST_CORNER_INDEX)
 		]);
 	}
 	return { quads };

package/dist/annotations.d.cts

@@ -1,9 +1,9 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
 import { r as Matrix } from "./matrix-B7_SBKQ5.cjs";
-import { n as PdfDict } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 import { LayoutAnnotation } from "./layout.cjs";
 //#region src/annotations.d.ts
-declare function readPageAnnotations(page: PdfDict, pageMatrix: Matrix, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutAnnotation[];
+declare function readPageAnnotations(page: PdfDict, pageMatrix: Matrix, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutAnnotation[];
 //#endregion
 export { readPageAnnotations };

package/dist/annotations.d.ts

@@ -1,9 +1,9 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
 import { r as Matrix } from "./matrix-B7_SBKQ5.js";
-import { n as PdfDict } from "./objects-B7HdMeWS.js";
+import { n as PdfDict } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 import { LayoutAnnotation } from "./layout.js";
 //#region src/annotations.d.ts
-declare function readPageAnnotations(page: PdfDict, pageMatrix: Matrix, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutAnnotation[];
+declare function readPageAnnotations(page: PdfDict, pageMatrix: Matrix, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutAnnotation[];
 //#endregion
 export { readPageAnnotations };

package/dist/annotations.js

@@ -73,11 +73,13 @@ function annotString(annot, key) {
 	const obj = dictGet(annot, key);
 	return obj?.kind === "string" ? decodePdfString(obj.bytes) : void 0;
 }
+const QUAD_POINT_COORDINATES_PER_QUAD = 8;
+const QUAD_POINT_LAST_CORNER_INDEX = 3;
 function markupFields(annot, pageMatrix) {
 	const quadPoints = asArray(dictGet(annot, "QuadPoints"));
-	if (quadPoints === void 0 || quadPoints.length < 8 || quadPoints.length % 8 !== 0) return {};
+	if (quadPoints === void 0 || quadPoints.length < QUAD_POINT_COORDINATES_PER_QUAD || quadPoints.length % QUAD_POINT_COORDINATES_PER_QUAD !== 0) return {};
 	const quads = [];
-	for (let i = 0; i < quadPoints.length; i += 8) {
+	for (let i = 0; i < quadPoints.length; i += QUAD_POINT_COORDINATES_PER_QUAD) {
 		const corner = (index) => {
 			const x = asNumber(quadPoints[i + index * 2]) ?? 0;
 			const y = asNumber(quadPoints[i + index * 2 + 1]) ?? 0;
@@ -94,7 +96,7 @@ function markupFields(annot, pageMatrix) {
 			corner(0),
 			corner(1),
 			corner(2),
-			corner(3)
+			corner(QUAD_POINT_LAST_CORNER_INDEX)
 		]);
 	}
 	return { quads };

package/dist/attachments.d.cts

@@ -1,8 +1,8 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 import { LayoutAttachment } from "./layout.cjs";
 //#region src/attachments.d.ts
-declare function readAttachments(catalog: PdfDict, pages: readonly PdfDict[], resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutAttachment[];
+declare function readAttachments(catalog: PdfDict, pages: readonly PdfDict[], resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutAttachment[];
 //#endregion
 export { readAttachments };

package/dist/attachments.d.ts

@@ -1,8 +1,8 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict } from "./objects-B7HdMeWS.js";
+import { n as PdfDict } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 import { LayoutAttachment } from "./layout.js";
 //#region src/attachments.d.ts
-declare function readAttachments(catalog: PdfDict, pages: readonly PdfDict[], resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutAttachment[];
+declare function readAttachments(catalog: PdfDict, pages: readonly PdfDict[], resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutAttachment[];
 //#endregion
 export { readAttachments };

package/dist/builtin-encoding.cjs

@@ -1,12 +1,18 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
+const require_afm_widths = require("./afm-widths-BHD2HZIL.cjs");
 const require_sfnt = require("./sfnt.cjs");
 const require_cff = require("./cff.cjs");
 const require_cmap_table = require("./cmap-table.cjs");
 const require_font_tables = require("./font-tables.cjs");
 //#region src/builtin-encoding.ts
+const PRIVATE_USE_BMP_START = 57344;
+const PRIVATE_USE_BMP_END = 63743;
+const PRIVATE_USE_PLANE_A_START = 983040;
+const PRIVATE_USE_PLANE_A_END = 1048573;
+const PRIVATE_USE_PLANE_B_START = 1048576;
+const PRIVATE_USE_PLANE_B_END = 1114109;
 function isPrivateUse(codePoint) {
-	return codePoint >= 57344 && codePoint <= 63743 || codePoint >= 983040 && codePoint <= 1048573 || codePoint >= 1048576 && codePoint <= 1114109;
+	return codePoint >= PRIVATE_USE_BMP_START && codePoint <= PRIVATE_USE_BMP_END || codePoint >= PRIVATE_USE_PLANE_A_START && codePoint <= PRIVATE_USE_PLANE_A_END || codePoint >= PRIVATE_USE_PLANE_B_START && codePoint <= PRIVATE_USE_PLANE_B_END;
 }
 function encodingFromSources(sources) {
 	const { codeToGlyphId, codeToName, glyphIdToName, glyphIdToUnicode } = sources;
@@ -29,11 +35,15 @@ function encodingFromSources(sources) {
 	} : void 0;
 }
 const SYMBOL_CMAP_CODE_BASE = 61440;
+const CMAP_PLATFORM_MICROSOFT = 3;
+const CMAP_MICROSOFT_ENCODING_SYMBOL = 0;
+const CMAP_MICROSOFT_ENCODING_UNICODE_FULL_REPERTOIRE = 10;
+const CMAP_MICROSOFT_ENCODING_UNICODE_BMP = 1;
 function symbolSubtable(subtables) {
-	return subtables.find((s) => s.platformId === 3 && s.encodingId === 0) ?? subtables.find((s) => s.platformId === 1 && s.encodingId === 0);
+	return subtables.find((s) => s.platformId === CMAP_PLATFORM_MICROSOFT && s.encodingId === CMAP_MICROSOFT_ENCODING_SYMBOL) ?? subtables.find((s) => s.platformId === 1 && s.encodingId === 0);
 }
 function unicodeSubtable(subtables) {
-	return subtables.find((s) => s.platformId === 3 && s.encodingId === 10) ?? subtables.find((s) => s.platformId === 3 && s.encodingId === 1) ?? subtables.find((s) => s.platformId === 0);
+	return subtables.find((s) => s.platformId === CMAP_PLATFORM_MICROSOFT && s.encodingId === CMAP_MICROSOFT_ENCODING_UNICODE_FULL_REPERTOIRE) ?? subtables.find((s) => s.platformId === CMAP_PLATFORM_MICROSOFT && s.encodingId === CMAP_MICROSOFT_ENCODING_UNICODE_BMP) ?? subtables.find((s) => s.platformId === 0);
 }
 function invertUnicodeSubtable(subtable) {
 	let inverse;
@@ -64,6 +74,7 @@ const CFF_PREDEFINED_CHARSET_ISO_ADOBE = 0;
 const CFF_PREDEFINED_ENCODING_STANDARD = 0;
 const CFF_ENCODING_FORMAT_MASK = 127;
 const CFF_ENCODING_SUPPLEMENT_FLAG = 128;
+const CFF_ENCODING_SUPPLEMENT_RECORD_SIZE = 3;
 function readCffCharset(bytes, offset, glyphCount) {
 	const sidByGlyph = /* @__PURE__ */ new Map();
 	if (offset === CFF_PREDEFINED_CHARSET_ISO_ADOBE) {
@@ -131,10 +142,10 @@ function readCffEncoding(bytes, offset, glyphCount, glyphBySid) {
 		const nSups = require_sfnt.u8(bytes, cursor);
 		cursor += 1;
 		for (let i = 0; i < nSups; i++) {
-			if (!require_sfnt.hasBytes(bytes, cursor, 3)) return glyphByCode;
+			if (!require_sfnt.hasBytes(bytes, cursor, CFF_ENCODING_SUPPLEMENT_RECORD_SIZE)) return glyphByCode;
 			const glyphId = glyphBySid.get(require_sfnt.u16(bytes, cursor + 1));
 			if (glyphId !== void 0) glyphByCode.set(require_sfnt.u8(bytes, cursor), glyphId);
-			cursor += 3;
+			cursor += CFF_ENCODING_SUPPLEMENT_RECORD_SIZE;
 		}
 	}
 	return glyphByCode;

package/dist/builtin-encoding.js

@@ -1,11 +1,17 @@
-import { c as glyphNameToUnicode, d as standardGlyphName } from "./afm-widths-blUDDjlI.js";
+import { c as glyphNameToUnicode, d as standardGlyphName } from "./afm-widths-B_IGbGky.js";
 import { hasBytes, parseSfnt, sfntTableBytes, u16, u8 } from "./sfnt.js";
 import { cffStringForSid, parseCffDict, readCffIndex } from "./cff.js";
 import { readCmapSubtables } from "./cmap-table.js";
 import { parsePostGlyphNames } from "./font-tables.js";
 //#region src/builtin-encoding.ts
+const PRIVATE_USE_BMP_START = 57344;
+const PRIVATE_USE_BMP_END = 63743;
+const PRIVATE_USE_PLANE_A_START = 983040;
+const PRIVATE_USE_PLANE_A_END = 1048573;
+const PRIVATE_USE_PLANE_B_START = 1048576;
+const PRIVATE_USE_PLANE_B_END = 1114109;
 function isPrivateUse(codePoint) {
-	return codePoint >= 57344 && codePoint <= 63743 || codePoint >= 983040 && codePoint <= 1048573 || codePoint >= 1048576 && codePoint <= 1114109;
+	return codePoint >= PRIVATE_USE_BMP_START && codePoint <= PRIVATE_USE_BMP_END || codePoint >= PRIVATE_USE_PLANE_A_START && codePoint <= PRIVATE_USE_PLANE_A_END || codePoint >= PRIVATE_USE_PLANE_B_START && codePoint <= PRIVATE_USE_PLANE_B_END;
 }
 function encodingFromSources(sources) {
 	const { codeToGlyphId, codeToName, glyphIdToName, glyphIdToUnicode } = sources;
@@ -28,11 +34,15 @@ function encodingFromSources(sources) {
 	} : void 0;
 }
 const SYMBOL_CMAP_CODE_BASE = 61440;
+const CMAP_PLATFORM_MICROSOFT = 3;
+const CMAP_MICROSOFT_ENCODING_SYMBOL = 0;
+const CMAP_MICROSOFT_ENCODING_UNICODE_FULL_REPERTOIRE = 10;
+const CMAP_MICROSOFT_ENCODING_UNICODE_BMP = 1;
 function symbolSubtable(subtables) {
-	return subtables.find((s) => s.platformId === 3 && s.encodingId === 0) ?? subtables.find((s) => s.platformId === 1 && s.encodingId === 0);
+	return subtables.find((s) => s.platformId === CMAP_PLATFORM_MICROSOFT && s.encodingId === CMAP_MICROSOFT_ENCODING_SYMBOL) ?? subtables.find((s) => s.platformId === 1 && s.encodingId === 0);
 }
 function unicodeSubtable(subtables) {
-	return subtables.find((s) => s.platformId === 3 && s.encodingId === 10) ?? subtables.find((s) => s.platformId === 3 && s.encodingId === 1) ?? subtables.find((s) => s.platformId === 0);
+	return subtables.find((s) => s.platformId === CMAP_PLATFORM_MICROSOFT && s.encodingId === CMAP_MICROSOFT_ENCODING_UNICODE_FULL_REPERTOIRE) ?? subtables.find((s) => s.platformId === CMAP_PLATFORM_MICROSOFT && s.encodingId === CMAP_MICROSOFT_ENCODING_UNICODE_BMP) ?? subtables.find((s) => s.platformId === 0);
 }
 function invertUnicodeSubtable(subtable) {
 	let inverse;
@@ -63,6 +73,7 @@ const CFF_PREDEFINED_CHARSET_ISO_ADOBE = 0;
 const CFF_PREDEFINED_ENCODING_STANDARD = 0;
 const CFF_ENCODING_FORMAT_MASK = 127;
 const CFF_ENCODING_SUPPLEMENT_FLAG = 128;
+const CFF_ENCODING_SUPPLEMENT_RECORD_SIZE = 3;
 function readCffCharset(bytes, offset, glyphCount) {
 	const sidByGlyph = /* @__PURE__ */ new Map();
 	if (offset === CFF_PREDEFINED_CHARSET_ISO_ADOBE) {
@@ -130,10 +141,10 @@ function readCffEncoding(bytes, offset, glyphCount, glyphBySid) {
 		const nSups = u8(bytes, cursor);
 		cursor += 1;
 		for (let i = 0; i < nSups; i++) {
-			if (!hasBytes(bytes, cursor, 3)) return glyphByCode;
+			if (!hasBytes(bytes, cursor, CFF_ENCODING_SUPPLEMENT_RECORD_SIZE)) return glyphByCode;
 			const glyphId = glyphBySid.get(u16(bytes, cursor + 1));
 			if (glyphId !== void 0) glyphByCode.set(u8(bytes, cursor), glyphId);
-			cursor += 3;
+			cursor += CFF_ENCODING_SUPPLEMENT_RECORD_SIZE;
 		}
 	}
 	return glyphByCode;

package/dist/bytes/crc32.cjs

@@ -3,6 +3,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const CRC32_POLYNOMIAL = 3988292384;
 const BYTE_VALUES = 256;
 const BITS_PER_BYTE = 8;
+const BYTE_MASK = 255;
+const CRC32_INVERT_MASK = 4294967295;
 const CRC32_TABLE = (() => {
 	const table = new Uint32Array(BYTE_VALUES);
 	for (let n = 0; n < BYTE_VALUES; n++) {
@@ -13,9 +15,9 @@ const CRC32_TABLE = (() => {
 	return table;
 })();
 function crc32(bytes) {
-	let crc = 4294967295;
-	for (const byte of bytes) crc = CRC32_TABLE[(crc ^ byte) & 255] ^ crc >>> 8;
-	return (crc ^ 4294967295) >>> 0;
+	let crc = CRC32_INVERT_MASK;
+	for (const byte of bytes) crc = CRC32_TABLE[(crc ^ byte) & BYTE_MASK] ^ crc >>> BITS_PER_BYTE;
+	return (crc ^ CRC32_INVERT_MASK) >>> 0;
 }
 //#endregion
 exports.crc32 = crc32;

package/dist/bytes/crc32.js

@@ -2,6 +2,8 @@
 const CRC32_POLYNOMIAL = 3988292384;
 const BYTE_VALUES = 256;
 const BITS_PER_BYTE = 8;
+const BYTE_MASK = 255;
+const CRC32_INVERT_MASK = 4294967295;
 const CRC32_TABLE = (() => {
 	const table = new Uint32Array(BYTE_VALUES);
 	for (let n = 0; n < BYTE_VALUES; n++) {
@@ -12,9 +14,9 @@ const CRC32_TABLE = (() => {
 	return table;
 })();
 function crc32(bytes) {
-	let crc = 4294967295;
-	for (const byte of bytes) crc = CRC32_TABLE[(crc ^ byte) & 255] ^ crc >>> 8;
-	return (crc ^ 4294967295) >>> 0;
+	let crc = CRC32_INVERT_MASK;
+	for (const byte of bytes) crc = CRC32_TABLE[(crc ^ byte) & BYTE_MASK] ^ crc >>> BITS_PER_BYTE;
+	return (crc ^ CRC32_INVERT_MASK) >>> 0;
 }
 //#endregion
 export { crc32 };

package/dist/bytes/flate.cjs

@@ -2,7 +2,6 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_bytes_writer = require("./writer.cjs");
 const require_bytes_reader = require("./reader.cjs");
 let fflate = require("fflate");
-//#region src/bytes/flate.ts
 const MAX_INFLATE_OUTPUT_BYTES = 536870912;
 function deflate(data, level) {
 	return (0, fflate.zlibSync)(data, level === void 0 ? void 0 : { level });

package/dist/bytes/flate.js

@@ -1,7 +1,6 @@
 import { concatBytes } from "./writer.js";
 import { isAsciiWhitespace } from "./reader.js";
 import { Unzlib, inflateSync, unzlibSync, zlibSync } from "fflate";
-//#region src/bytes/flate.ts
 const MAX_INFLATE_OUTPUT_BYTES = 536870912;
 function deflate(data, level) {
 	return zlibSync(data, level === void 0 ? void 0 : { level });

package/dist/cff-bounds.cjs

@@ -17,6 +17,11 @@ const CS_OPERAND_MEDIUM_BIAS = 108;
 const CS_OPERAND_MEDIUM_FIRST_BYTE_BIAS = 247;
 const CS_OPERAND_NEGATIVE_MEDIUM_FIRST_BYTE_BIAS = 251;
 const BYTE_RADIX = 256;
+const INT16_SIGN_BIT = 32768;
+const INT16_MODULUS = 65536;
+const CS_OPERAND_INT16_TOTAL_LENGTH = 3;
+const CS_OPERAND_FIXED_BYTE_LENGTH = 4;
+const CS_OPERAND_FIXED_TOTAL_LENGTH = 5;
 const FIXED_POINT_SCALE = 65536;
 const OP_HSTEM = 1;
 const OP_VSTEM = 3;
@@ -53,6 +58,13 @@ const SUBR_BIAS_MEDIUM = 1131;
 const SUBR_BIAS_LARGE = 32768;
 const HINT_MASK_BITS_PER_BYTE = 8;
 const STEM_ARGS_PER_STEM = 2;
+const CURVE_ARG_COUNT = 6;
+const CURVE_DY2_OFFSET = 3;
+const CURVE_DX3_OFFSET = 4;
+const CURVE_DY3_OFFSET = 5;
+const QUAD_CURVE_ARG_COUNT = 4;
+const QUAD_CURVE_LAST_OFFSET = 3;
+const QUAD_CURVE_WITH_EXTRA_ARG_COUNT = 5;
 const MAX_OPERAND_STACK = 48;
 const MAX_SUBR_DEPTH = 10;
 const MAX_OPERATIONS_PER_GLYPH = 1e5;
@@ -62,28 +74,48 @@ function subrBias(count) {
 	if (count < SUBR_BIAS_MEDIUM_LIMIT) return SUBR_BIAS_MEDIUM;
 	return SUBR_BIAS_LARGE;
 }
-function includePoint(box, x, y) {
-	box.minX = Math.min(box.minX, x);
-	box.minY = Math.min(box.minY, y);
-	box.maxX = Math.max(box.maxX, x);
-	box.maxY = Math.max(box.maxY, y);
-	box.drawn = true;
-}
+var BoundsBox = class {
+	minX = Infinity;
+	minY = Infinity;
+	maxX = -Infinity;
+	maxY = -Infinity;
+	drawn = false;
+	includePoint(x, y) {
+		this.minX = Math.min(this.minX, x);
+		this.minY = Math.min(this.minY, y);
+		this.maxX = Math.max(this.maxX, x);
+		this.maxY = Math.max(this.maxY, y);
+		this.drawn = true;
+	}
+	includeXExtent(value) {
+		this.minX = Math.min(this.minX, value);
+		this.maxX = Math.max(this.maxX, value);
+	}
+	includeYExtent(value) {
+		this.minY = Math.min(this.minY, value);
+		this.maxY = Math.max(this.maxY, value);
+	}
+	markDrawn() {
+		this.drawn = true;
+	}
+};
+const CUBIC_BERNSTEIN_COEFFICIENT = 3;
+const QUADRATIC_FORMULA_COEFFICIENT = 4;
 function cubicAt(p0, p1, p2, p3, t) {
 	const s = 1 - t;
-	return s * s * s * p0 + 3 * s * s * t * p1 + 3 * s * t * t * p2 + t * t * t * p3;
+	return s * s * s * p0 + CUBIC_BERNSTEIN_COEFFICIENT * s * s * t * p1 + CUBIC_BERNSTEIN_COEFFICIENT * s * t * t * p2 + t * t * t * p3;
 }
 function includeCubicAxis(p0, p1, p2, p3, apply) {
 	apply(p0);
 	apply(p3);
-	const a = -p0 + 3 * p1 - 3 * p2 + p3;
+	const a = -p0 + CUBIC_BERNSTEIN_COEFFICIENT * p1 - CUBIC_BERNSTEIN_COEFFICIENT * p2 + p3;
 	const b = 2 * (p0 - 2 * p1 + p2);
 	const c = p1 - p0;
 	const roots = [];
 	if (a === 0) {
 		if (b !== 0) roots.push(-c / b);
 	} else {
-		const discriminant = b * b - 4 * a * c;
+		const discriminant = b * b - QUADRATIC_FORMULA_COEFFICIENT * a * c;
 		if (discriminant >= 0) {
 			const root = Math.sqrt(discriminant);
 			roots.push((-b + root) / (2 * a), (-b - root) / (2 * a));
@@ -93,14 +125,12 @@ function includeCubicAxis(p0, p1, p2, p3, apply) {
 }
 function includeCubic(box, x0, y0, x1, y1, x2, y2, x3, y3) {
 	includeCubicAxis(x0, x1, x2, x3, (value) => {
-		box.minX = Math.min(box.minX, value);
-		box.maxX = Math.max(box.maxX, value);
+		box.includeXExtent(value);
 	});
 	includeCubicAxis(y0, y1, y2, y3, (value) => {
-		box.minY = Math.min(box.minY, value);
-		box.maxY = Math.max(box.maxY, value);
+		box.includeYExtent(value);
 	});
-	box.drawn = true;
+	box.markDrawn();
 }
 function curveTo(state, dx1, dy1, dx2, dy2, dx3, dy3) {
 	const x0 = state.x;
@@ -116,10 +146,10 @@ function curveTo(state, dx1, dy1, dx2, dy2, dx3, dy3) {
 	state.y = y3;
 }
 function lineTo(state, dx, dy) {
-	includePoint(state.box, state.x, state.y);
+	state.box.includePoint(state.x, state.y);
 	state.x += dx;
 	state.y += dy;
-	includePoint(state.box, state.x, state.y);
+	state.box.includePoint(state.x, state.y);
 }
 function moveTo(state, dx, dy) {
 	state.x += dx;
@@ -136,15 +166,15 @@ function readOperand(code, offset) {
 		if (!require_sfnt.hasBytes(code, offset + 1, 2)) return;
 		const raw = require_sfnt.u16(code, offset + 1);
 		return {
-			value: raw >= 32768 ? raw - 65536 : raw,
-			endOffset: offset + 3
+			value: raw >= INT16_SIGN_BIT ? raw - INT16_MODULUS : raw,
+			endOffset: offset + CS_OPERAND_INT16_TOTAL_LENGTH
 		};
 	}
 	if (b0 === CS_OPERAND_FIXED) {
-		if (!require_sfnt.hasBytes(code, offset + 1, 4)) return;
+		if (!require_sfnt.hasBytes(code, offset + 1, CS_OPERAND_FIXED_BYTE_LENGTH)) return;
 		return {
 			value: (require_sfnt.u32(code, offset + 1) | 0) / FIXED_POINT_SCALE,
-			endOffset: offset + 5
+			endOffset: offset + CS_OPERAND_FIXED_TOTAL_LENGTH
 		};
 	}
 	if (b0 >= CS_OPERAND_SMALL_FIRST && b0 <= CS_OPERAND_SMALL_LAST) return {
@@ -231,20 +261,20 @@ function execute(code, state, context, depth) {
 				break;
 			}
 			case OP_RRCURVETO:
-				for (let k = 0; k + 5 < stack.length; k += 6) curveTo(state, stack[k], stack[k + 1], stack[k + 2], stack[k + 3], stack[k + 4], stack[k + 5]);
+				for (let k = 0; k + CURVE_DY3_OFFSET < stack.length; k += CURVE_ARG_COUNT) curveTo(state, stack[k], stack[k + 1], stack[k + 2], stack[k + CURVE_DY2_OFFSET], stack[k + CURVE_DX3_OFFSET], stack[k + CURVE_DY3_OFFSET]);
 				stack.length = 0;
 				break;
 			case OP_RCURVELINE: {
 				let k = 0;
-				for (; k + 5 < stack.length - 2; k += 6) curveTo(state, stack[k], stack[k + 1], stack[k + 2], stack[k + 3], stack[k + 4], stack[k + 5]);
+				for (; k + CURVE_DY3_OFFSET < stack.length - 2; k += CURVE_ARG_COUNT) curveTo(state, stack[k], stack[k + 1], stack[k + 2], stack[k + CURVE_DY2_OFFSET], stack[k + CURVE_DX3_OFFSET], stack[k + CURVE_DY3_OFFSET]);
 				if (k + 1 < stack.length) lineTo(state, stack[k], stack[k + 1]);
 				stack.length = 0;
 				break;
 			}
 			case OP_RLINECURVE: {
 				let k = 0;
-				for (; k + 1 < stack.length - 6; k += 2) lineTo(state, stack[k], stack[k + 1]);
-				if (k + 5 < stack.length) curveTo(state, stack[k], stack[k + 1], stack[k + 2], stack[k + 3], stack[k + 4], stack[k + 5]);
+				for (; k + 1 < stack.length - CURVE_ARG_COUNT; k += 2) lineTo(state, stack[k], stack[k + 1]);
+				if (k + CURVE_DY3_OFFSET < stack.length) curveTo(state, stack[k], stack[k + 1], stack[k + 2], stack[k + CURVE_DY2_OFFSET], stack[k + CURVE_DX3_OFFSET], stack[k + CURVE_DY3_OFFSET]);
 				stack.length = 0;
 				break;
 			}
@@ -252,14 +282,14 @@ function execute(code, state, context, depth) {
 			case OP_HHCURVETO: {
 				let k = 0;
 				let firstCross = 0;
-				if (stack.length % 4 === 1) {
+				if (stack.length % QUAD_CURVE_ARG_COUNT === 1) {
 					firstCross = stack[0];
 					k = 1;
 				}
-				for (; k + 3 < stack.length; k += 4) {
+				for (; k + QUAD_CURVE_LAST_OFFSET < stack.length; k += QUAD_CURVE_ARG_COUNT) {
 					const cross = k <= 1 ? firstCross : 0;
-					if (b0 === OP_VVCURVETO) curveTo(state, cross, stack[k], stack[k + 1], stack[k + 2], 0, stack[k + 3]);
-					else curveTo(state, stack[k], cross, stack[k + 1], stack[k + 2], stack[k + 3], 0);
+					if (b0 === OP_VVCURVETO) curveTo(state, cross, stack[k], stack[k + 1], stack[k + 2], 0, stack[k + QUAD_CURVE_LAST_OFFSET]);
+					else curveTo(state, stack[k], cross, stack[k + 1], stack[k + 2], stack[k + QUAD_CURVE_LAST_OFFSET], 0);
 				}
 				stack.length = 0;
 				break;
@@ -268,11 +298,11 @@ function execute(code, state, context, depth) {
 			case OP_HVCURVETO: {
 				let horizontal = b0 === OP_HVCURVETO;
 				let k = 0;
-				while (stack.length - k >= 4) {
-					const extra = stack.length - k === 5 ? stack[k + 4] : 0;
-					if (horizontal) curveTo(state, stack[k], 0, stack[k + 1], stack[k + 2], extra, stack[k + 3]);
-					else curveTo(state, 0, stack[k], stack[k + 1], stack[k + 2], stack[k + 3], extra);
-					k += 4;
+				while (stack.length - k >= QUAD_CURVE_ARG_COUNT) {
+					const extra = stack.length - k === QUAD_CURVE_WITH_EXTRA_ARG_COUNT ? stack[k + QUAD_CURVE_ARG_COUNT] : 0;
+					if (horizontal) curveTo(state, stack[k], 0, stack[k + 1], stack[k + 2], extra, stack[k + QUAD_CURVE_LAST_OFFSET]);
+					else curveTo(state, 0, stack[k], stack[k + 1], stack[k + 2], stack[k + QUAD_CURVE_LAST_OFFSET], extra);
+					k += QUAD_CURVE_ARG_COUNT;
 					horizontal = !horizontal;
 				}
 				stack.length = 0;
@@ -307,25 +337,29 @@ function execute(code, state, context, depth) {
 	}
 	return true;
 }
+const FLEX_ARG_COUNT = 13;
+const HFLEX_ARG_COUNT = 7;
+const HFLEX1_ARG_COUNT = 9;
+const FLEX1_ARG_COUNT = 11;
 function executeEscaped(operator, state) {
 	const stack = state.stack;
 	const startY = state.y;
 	if (operator === ESC_FLEX) {
-		if (stack.length < 13) return false;
+		if (stack.length < FLEX_ARG_COUNT) return false;
 		curveTo(state, stack[0], stack[1], stack[2], stack[3], stack[4], stack[5]);
 		curveTo(state, stack[6], stack[7], stack[8], stack[9], stack[10], stack[11]);
 		stack.length = 0;
 		return true;
 	}
 	if (operator === ESC_HFLEX) {
-		if (stack.length < 7) return false;
+		if (stack.length < HFLEX_ARG_COUNT) return false;
 		curveTo(state, stack[0], 0, stack[1], stack[2], stack[3], 0);
 		curveTo(state, stack[4], 0, stack[5], -stack[2], stack[6], 0);
 		stack.length = 0;
 		return true;
 	}
 	if (operator === ESC_HFLEX1) {
-		if (stack.length < 9) return false;
+		if (stack.length < HFLEX1_ARG_COUNT) return false;
 		curveTo(state, stack[0], stack[1], stack[2], stack[3], stack[4], 0);
 		const dy5 = stack[7];
 		curveTo(state, stack[5], 0, stack[6], dy5, stack[8], startY - (state.y + dy5));
@@ -333,7 +367,7 @@ function executeEscaped(operator, state) {
 		return true;
 	}
 	if (operator === ESC_FLEX1) {
-		if (stack.length < 11) return false;
+		if (stack.length < FLEX1_ARG_COUNT) return false;
 		const startX = state.x;
 		let dx = 0;
 		let dy = 0;
@@ -408,13 +442,7 @@ function computeBounds(glyphId, context) {
 		stems: 0,
 		widthParsed: false,
 		operations: 0,
-		box: {
-			minX: Infinity,
-			minY: Infinity,
-			maxX: -Infinity,
-			maxY: -Infinity,
-			drawn: false
-		}
+		box: new BoundsBox()
 	};
 	if (!execute(code, state, context, 0) || !state.box.drawn) return;
 	return {