pdf-codec 1.4.2 → 1.6.0

package/dist/interpret.js

@@ -1,6 +1,6 @@
 import { asArray, asName, asNumber, dictGet } from "./objects.js";
 import { decodeStream } from "./filters.js";
-import { IDENTITY_MATRIX, applyMatrix, multiplyMatrices, translationMatrix } from "./matrix.js";
+import { BEZIER_KAPPA, IDENTITY_MATRIX, applyMatrix, multiplyMatrices, translationMatrix } from "./matrix.js";
 import { readContentStream } from "./content-read.js";
 import { COLOR_BLACK } from "document-schema.js";
 //#region src/interpret.ts
@@ -75,26 +75,176 @@ function matrixFromOperands(operands) {
 		numAt(operands, 5)
 	];
 }
-function isAxisAligned(m) {
-	return m[1] === 0 && m[2] === 0;
+const SHAPE_ABS_TOLERANCE_PT = .001;
+const SHAPE_REL_TOLERANCE = 1e-4;
+function shapeTolerance(extentPt) {
+	return Math.max(SHAPE_ABS_TOLERANCE_PT, Math.abs(extentPt) * SHAPE_REL_TOLERANCE);
 }
-function rectFromOperands(operands, ctm) {
-	const x = numAt(operands, 0);
-	const y = numAt(operands, 1);
-	const w = numAt(operands, 2);
-	const h = numAt(operands, 3);
-	if (!isAxisAligned(ctm)) return;
-	const scaledX = x * ctm[0] + ctm[4];
-	const scaledY = y * ctm[3] + ctm[5];
-	const scaledW = w * ctm[0];
-	const scaledH = h * ctm[3];
+function nearlyEqual(a, b, tolerance) {
+	return Math.abs(a - b) <= tolerance;
+}
+function nearlyEqualPoints(a, b, tolerance) {
+	return nearlyEqual(a.x, b.x, tolerance) && nearlyEqual(a.y, b.y, tolerance);
+}
+function boundsOf(points) {
+	const xs = points.map((p) => p.x);
+	const ys = points.map((p) => p.y);
+	return {
+		minX: Math.min(...xs),
+		minY: Math.min(...ys),
+		maxX: Math.max(...xs),
+		maxY: Math.max(...ys)
+	};
+}
+function closedPolygonCorners(subpath) {
+	if (!subpath.closed) return;
+	const corners = [{
+		x: subpath.startXPt,
+		y: subpath.startYPt
+	}];
+	for (const segment of subpath.segments) {
+		if (segment.kind !== "line") return;
+		corners.push({
+			x: segment.xPt,
+			y: segment.yPt
+		});
+	}
+	const first = corners[0];
+	const last = corners[corners.length - 1];
+	if (first === void 0 || last === void 0 || corners.length < 2) return;
+	const bounds = boundsOf(corners);
+	if (nearlyEqualPoints(first, last, shapeTolerance(Math.max(bounds.maxX - bounds.minX, bounds.maxY - bounds.minY)))) corners.pop();
+	return corners;
+}
+function detectRect(subpath, paint) {
+	const corners = closedPolygonCorners(subpath);
+	if (corners?.length !== 4) return;
+	const { minX, minY, maxX, maxY } = boundsOf(corners);
+	const widthPt = maxX - minX;
+	const heightPt = maxY - minY;
+	const tolX = shapeTolerance(widthPt);
+	const tolY = shapeTolerance(heightPt);
+	if (widthPt <= tolX || heightPt <= tolY) return;
+	for (const corner of corners) {
+		if (!nearlyEqual(corner.x, minX, tolX) && !nearlyEqual(corner.x, maxX, tolX)) return;
+		if (!nearlyEqual(corner.y, minY, tolY) && !nearlyEqual(corner.y, maxY, tolY)) return;
+	}
+	for (let i = 0; i < corners.length; i += 1) {
+		const from = corners[i];
+		const to = corners[(i + 1) % corners.length];
+		if (from === void 0 || to === void 0) return;
+		if (nearlyEqual(from.x, to.x, tolX) === nearlyEqual(from.y, to.y, tolY)) return;
+	}
+	return {
+		kind: "rect",
+		xPt: minX,
+		yPt: minY,
+		widthPt,
+		heightPt,
+		fill: paint.fill,
+		stroke: paint.stroke
+	};
+}
+function cardinalExtremeOf(point, center, rx, ry, tolX, tolY) {
+	if (nearlyEqual(point.y, center.y, tolY)) {
+		if (nearlyEqual(point.x, center.x + rx, tolX)) return "right";
+		if (nearlyEqual(point.x, center.x - rx, tolX)) return "left";
+		return;
+	}
+	if (nearlyEqual(point.x, center.x, tolX)) {
+		if (nearlyEqual(point.y, center.y + ry, tolY)) return "top";
+		if (nearlyEqual(point.y, center.y - ry, tolY)) return "bottom";
+	}
+}
+function expectedEllipseControl(atExtreme, atExtremeKind, otherEnd, center, kx, ky) {
+	if (atExtremeKind === "right" || atExtremeKind === "left") return {
+		x: atExtreme.x,
+		y: center.y + Math.sign(otherEnd.y - center.y) * ky
+	};
+	return {
+		x: center.x + Math.sign(otherEnd.x - center.x) * kx,
+		y: atExtreme.y
+	};
+}
+function detectEllipse(subpath, paint) {
+	const segments = subpath.segments;
+	if (!subpath.closed || segments.length !== 4 || segments.some((segment) => segment.kind !== "cubic")) return;
+	const start = {
+		x: subpath.startXPt,
+		y: subpath.startYPt
+	};
+	const onCurve = [start];
+	for (const segment of segments.slice(0, 3)) onCurve.push({
+		x: segment.xPt,
+		y: segment.yPt
+	});
+	const { minX, minY, maxX, maxY } = boundsOf(onCurve);
+	const rx = (maxX - minX) / 2;
+	const ry = (maxY - minY) / 2;
+	const center = {
+		x: (minX + maxX) / 2,
+		y: (minY + maxY) / 2
+	};
+	const tolX = shapeTolerance(rx);
+	const tolY = shapeTolerance(ry);
+	if (rx <= tolX || ry <= tolY) return;
+	const finalSegment = segments[3];
+	if (finalSegment === void 0 || !nearlyEqualPoints({
+		x: finalSegment.xPt,
+		y: finalSegment.yPt
+	}, start, Math.max(tolX, tolY))) return;
+	const extremes = onCurve.map((point) => cardinalExtremeOf(point, center, rx, ry, tolX, tolY));
+	if (extremes.some((extreme) => extreme === void 0) || new Set(extremes).size !== 4) return;
+	const kx = rx * BEZIER_KAPPA;
+	const ky = ry * BEZIER_KAPPA;
+	const controlTolerance = Math.max(tolX, tolY);
+	for (let i = 0; i < 4; i += 1) {
+		const segment = segments[i];
+		const from = onCurve[i];
+		const fromKind = extremes[i];
+		const to = onCurve[(i + 1) % 4];
+		const toKind = extremes[(i + 1) % 4];
+		if (segment?.kind !== "cubic" || from === void 0 || to === void 0 || fromKind === void 0 || toKind === void 0) return;
+		const expectedC1 = expectedEllipseControl(from, fromKind, to, center, kx, ky);
+		const expectedC2 = expectedEllipseControl(to, toKind, from, center, kx, ky);
+		if (!nearlyEqualPoints({
+			x: segment.c1xPt,
+			y: segment.c1yPt
+		}, expectedC1, controlTolerance)) return;
+		if (!nearlyEqualPoints({
+			x: segment.c2xPt,
+			y: segment.c2yPt
+		}, expectedC2, controlTolerance)) return;
+	}
 	return {
-		xPt: scaledW >= 0 ? scaledX : scaledX + scaledW,
-		yPt: scaledH >= 0 ? scaledY : scaledY + scaledH,
-		widthPt: Math.abs(scaledW),
-		heightPt: Math.abs(scaledH)
+		kind: "ellipse",
+		xPt: minX,
+		yPt: minY,
+		widthPt: maxX - minX,
+		heightPt: maxY - minY,
+		fill: paint.fill,
+		stroke: paint.stroke
 	};
 }
+function detectLine(subpath, paint) {
+	const segment = subpath.segments[0];
+	if (subpath.closed || subpath.segments.length !== 1 || segment?.kind !== "line") return;
+	if (paint.fill !== void 0 || paint.stroke === void 0) return;
+	return {
+		kind: "line",
+		x1Pt: subpath.startXPt,
+		y1Pt: subpath.startYPt,
+		x2Pt: segment.xPt,
+		y2Pt: segment.yPt,
+		color: paint.stroke.color,
+		widthPt: paint.stroke.widthPt
+	};
+}
+function classifyShape(subpaths, paint) {
+	const subpath = subpaths[0];
+	if (subpaths.length !== 1 || subpath === void 0) return;
+	return detectRect(subpath, paint) ?? detectEllipse(subpath, paint) ?? detectLine(subpath, paint);
+}
 function interpretContentStream(bytes, resources, context) {
 	const items = [];
 	runContentStream(bytes, resources, {
@@ -120,7 +270,6 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 	const gsStack = [];
 	let gs = initialState;
 	let ts = defaultTextState();
-	let pendingRect;
 	let pathSubpaths = [];
 	let currentSubpath;
 	const finalizeCurrentSubpath = () => {
@@ -130,7 +279,6 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 		}
 	};
 	const resetPath = () => {
-		pendingRect = void 0;
 		pathSubpaths = [];
 		currentSubpath = void 0;
 	};
@@ -186,28 +334,22 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 			return;
 		}
 		if ((operator === "s" || operator === "b" || operator === "b*") && currentSubpath !== void 0) currentSubpath.closed = true;
-		if ((operator === "f" || operator === "F" || operator === "f*") && currentSubpath === void 0 && pathSubpaths.length === 1 && pendingRect !== void 0) {
-			items.push({
-				kind: "rect",
-				...pendingRect,
-				color: gs.fillColor
-			});
-			resetPath();
-			return;
-		}
 		finalizeCurrentSubpath();
 		if (pathSubpaths.length > 0) {
 			const isFillOp = operator === "f" || operator === "F" || operator === "f*" || operator === "B" || operator === "B*" || operator === "b" || operator === "b*";
 			const isStrokeOp = operator === "S" || operator === "s" || operator === "B" || operator === "B*" || operator === "b" || operator === "b*";
-			items.push({
-				kind: "path",
-				subpaths: pathSubpaths,
-				fillRule: paintFillRuleFor(operator),
+			const paint = {
 				fill: isFillOp ? gs.fillColor : void 0,
 				stroke: isStrokeOp ? {
 					color: gs.strokeColor,
 					widthPt: gs.lineWidth
 				} : void 0
+			};
+			items.push(classifyShape(pathSubpaths, paint) ?? {
+				kind: "path",
+				subpaths: pathSubpaths,
+				fillRule: paintFillRuleFor(operator),
+				...paint
 			});
 		}
 		resetPath();
@@ -394,7 +536,6 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 				break;
 			}
 			case "re":
-				pendingRect = rectFromOperands(operands, gs.ctm);
 				appendRectSubpath(operands, gs.ctm);
 				break;
 			case "m": {
@@ -409,7 +550,6 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 					segments: [],
 					closed: false
 				};
-				pendingRect = void 0;
 				break;
 			}
 			case "l": {
@@ -422,7 +562,6 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 					xPt: p.x,
 					yPt: p.y
 				});
-				pendingRect = void 0;
 				break;
 			}
 			case "c": {
@@ -447,7 +586,6 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 					xPt: p.x,
 					yPt: p.y
 				});
-				pendingRect = void 0;
 				break;
 			}
 			case "v":
@@ -471,7 +609,6 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 						yPt: p.y
 					});
 				}
-				pendingRect = void 0;
 				break;
 			case "y": {
 				const c1 = applyMatrix(gs.ctm, {
@@ -491,12 +628,10 @@ function runContentStream(bytes, resources, initialState, context, items, depth)
 					xPt: p.x,
 					yPt: p.y
 				});
-				pendingRect = void 0;
 				break;
 			}
 			case "h":
 				if (currentSubpath !== void 0) currentSubpath.closed = true;
-				pendingRect = void 0;
 				break;
 			case "w":
 				gs = {

package/dist/math-font-write.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_bytes_flate = require("./bytes/flate.cjs");
 const require_objects = require("./objects.cjs");
+const require_bytes_flate = require("./bytes/flate.cjs");
+const require_tounicode = require("./tounicode.cjs");
 //#region src/math-font-write.ts
 const FLAG_SYMBOLIC = 4;
 const NOMINAL_STEM_V = 80;
@@ -37,36 +38,6 @@ function buildFontFileStream(font, compress) {
 	} : { Subtype: require_objects.pdfName("CIDFontType0C") });
 	return require_objects.pdfStream(dict, compress ? require_bytes_flate.deflate(font.cffBytes) : font.cffBytes);
 }
-function codePointToUtf16BEHex(codePoint) {
-	const text = String.fromCodePoint(codePoint);
-	let hex = "";
-	for (let i = 0; i < text.length; i++) hex += text.charCodeAt(i).toString(16).padStart(4, "0");
-	return hex;
-}
-function buildToUnicodeCMap(usedGlyphs) {
-	const sortedGids = [...usedGlyphs.keys()].sort((a, b) => a - b);
-	const lines = [
-		"/CIDInit /ProcSet findresource begin",
-		"12 dict begin",
-		"begincmap",
-		"/CIDSystemInfo << /Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def",
-		"/CMapName /Adobe-Identity-UCS def",
-		"/CMapType 2 def",
-		"1 begincodespacerange",
-		"<0000> <FFFF>",
-		"endcodespacerange",
-		`${sortedGids.length} beginbfchar`
-	];
-	for (const gid of sortedGids) {
-		const codePoint = usedGlyphs.get(gid);
-		if (codePoint === void 0) continue;
-		lines.push(`<${gid.toString(16).padStart(4, "0")}> <${codePointToUtf16BEHex(codePoint)}>`);
-	}
-	lines.push("endbfchar", "endcmap", "CMapName currentdict /CMap defineresource pop", "end", "end");
-	const text = `${lines.join("\n")}\n`;
-	const bytes = new TextEncoder().encode(text);
-	return require_objects.pdfStream(require_objects.pdfDict({}), bytes);
-}
 function buildMathFontObjects(font, usedGlyphs, refs, compress) {
 	const cidFont = require_objects.pdfDict({
 		Type: require_objects.pdfName("Font"),
@@ -93,7 +64,7 @@ function buildMathFontObjects(font, usedGlyphs, refs, compress) {
 		cidFont,
 		descriptor: buildFontDescriptor(font, refs.fontFileRef),
 		fontFile: buildFontFileStream(font, compress),
-		toUnicode: buildToUnicodeCMap(usedGlyphs)
+		toUnicode: require_tounicode.buildToUnicodeCMap(usedGlyphs)
 	};
 }
 //#endregion

package/dist/math-font-write.js

@@ -1,5 +1,6 @@
-import { deflate } from "./bytes/flate.js";
 import { pdfArray, pdfDict, pdfHexString, pdfName, pdfNum, pdfStream } from "./objects.js";
+import { deflate } from "./bytes/flate.js";
+import { buildToUnicodeCMap } from "./tounicode.js";
 //#region src/math-font-write.ts
 const FLAG_SYMBOLIC = 4;
 const NOMINAL_STEM_V = 80;
@@ -36,36 +37,6 @@ function buildFontFileStream(font, compress) {
 	} : { Subtype: pdfName("CIDFontType0C") });
 	return pdfStream(dict, compress ? deflate(font.cffBytes) : font.cffBytes);
 }
-function codePointToUtf16BEHex(codePoint) {
-	const text = String.fromCodePoint(codePoint);
-	let hex = "";
-	for (let i = 0; i < text.length; i++) hex += text.charCodeAt(i).toString(16).padStart(4, "0");
-	return hex;
-}
-function buildToUnicodeCMap(usedGlyphs) {
-	const sortedGids = [...usedGlyphs.keys()].sort((a, b) => a - b);
-	const lines = [
-		"/CIDInit /ProcSet findresource begin",
-		"12 dict begin",
-		"begincmap",
-		"/CIDSystemInfo << /Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def",
-		"/CMapName /Adobe-Identity-UCS def",
-		"/CMapType 2 def",
-		"1 begincodespacerange",
-		"<0000> <FFFF>",
-		"endcodespacerange",
-		`${sortedGids.length} beginbfchar`
-	];
-	for (const gid of sortedGids) {
-		const codePoint = usedGlyphs.get(gid);
-		if (codePoint === void 0) continue;
-		lines.push(`<${gid.toString(16).padStart(4, "0")}> <${codePointToUtf16BEHex(codePoint)}>`);
-	}
-	lines.push("endbfchar", "endcmap", "CMapName currentdict /CMap defineresource pop", "end", "end");
-	const text = `${lines.join("\n")}\n`;
-	const bytes = new TextEncoder().encode(text);
-	return pdfStream(pdfDict({}), bytes);
-}
 function buildMathFontObjects(font, usedGlyphs, refs, compress) {
 	const cidFont = pdfDict({
 		Type: pdfName("Font"),

package/dist/math-font.cjs

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_sfnt = require("./sfnt.cjs");
+const require_cmap_table = require("./cmap-table.cjs");
 const require_util_base64 = require("./util/base64.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_sfnt = require("./sfnt.cjs");
-const require_math_cmap = require("./math-cmap.cjs");
-const require_math_hmtx = require("./math-hmtx.cjs");
 const require_math_table = require("./math-table.cjs");
 //#region src/math-font.ts
 function toPt(designUnits, unitsPerEm, sizePt) {
@@ -65,6 +65,7 @@ function loadMathFont() {
 	if (cached !== void 0) return cached;
 	const bytes = require_util_base64.base64ToBytes(require_assets_stix_two_math_font.STIX_TWO_MATH_FONT_BASE64);
 	const sfnt = require_sfnt.parseSfnt(bytes);
+	if (sfnt === void 0) throw new Error("embedded math font is not a readable sfnt container");
 	const headBytes = require_sfnt.sfntTableBytes(sfnt, "head");
 	const hheaBytes = require_sfnt.sfntTableBytes(sfnt, "hhea");
 	const os2Bytes = require_sfnt.sfntTableBytes(sfnt, "OS/2");
@@ -76,8 +77,9 @@ function loadMathFont() {
 	const bboxMin = [require_sfnt.i16(headBytes, 36), require_sfnt.i16(headBytes, 38)];
 	const bboxMax = [require_sfnt.i16(headBytes, 40), require_sfnt.i16(headBytes, 42)];
 	const capHeight = os2Bytes === void 0 ? ascentDesignUnits : require_sfnt.i16(os2Bytes, 88);
-	const cmap = require_math_cmap.buildCmapLookup(sfnt);
-	const hmtx = require_math_hmtx.parseHmtx(sfnt);
+	const cmap = require_cmap_table.buildCmapLookup(sfnt);
+	if (cmap === void 0) throw new Error("embedded math font has no readable cmap subtable");
+	const hmtx = require_hmtx_table.parseHmtx(sfnt);
 	const math = require_math_table.parseMathTable(sfnt);
 	cached = {
 		font: {

package/dist/math-font.js

@@ -1,8 +1,8 @@
+import { i16, parseSfnt, sfntTableBytes, u16 } from "./sfnt.js";
+import { buildCmapLookup } from "./cmap-table.js";
 import { base64ToBytes } from "./util/base64.js";
+import { parseHmtx } from "./hmtx-table.js";
 import { STIX_TWO_MATH_FONT_BASE64 } from "./assets/stix-two-math-font.js";
-import { i16, parseSfnt, sfntTableBytes, u16 } from "./sfnt.js";
-import { buildCmapLookup } from "./math-cmap.js";
-import { parseHmtx } from "./math-hmtx.js";
 import { parseMathTable } from "./math-table.js";
 //#region src/math-font.ts
 function toPt(designUnits, unitsPerEm, sizePt) {
@@ -64,6 +64,7 @@ function loadMathFont() {
 	if (cached !== void 0) return cached;
 	const bytes = base64ToBytes(STIX_TWO_MATH_FONT_BASE64);
 	const sfnt = parseSfnt(bytes);
+	if (sfnt === void 0) throw new Error("embedded math font is not a readable sfnt container");
 	const headBytes = sfntTableBytes(sfnt, "head");
 	const hheaBytes = sfntTableBytes(sfnt, "hhea");
 	const os2Bytes = sfntTableBytes(sfnt, "OS/2");
@@ -76,6 +77,7 @@ function loadMathFont() {
 	const bboxMax = [i16(headBytes, 40), i16(headBytes, 42)];
 	const capHeight = os2Bytes === void 0 ? ascentDesignUnits : i16(os2Bytes, 88);
 	const cmap = buildCmapLookup(sfnt);
+	if (cmap === void 0) throw new Error("embedded math font has no readable cmap subtable");
 	const hmtx = parseHmtx(sfnt);
 	const math = parseMathTable(sfnt);
 	cached = {

package/dist/math-table.d.cts

@@ -1,4 +1,4 @@
-import { SfntFont } from "./sfnt.cjs";
+import { t as SfntFont } from "./sfnt-V08bb5ut.cjs";
 //#region src/math-table.d.ts
 interface MathConstants {
   readonly scriptPercentScaleDown: number;

package/dist/math-table.d.ts

@@ -1,4 +1,4 @@
-import { SfntFont } from "./sfnt.js";
+import { t as SfntFont } from "./sfnt-V08bb5ut.js";
 //#region src/math-table.d.ts
 interface MathConstants {
   readonly scriptPercentScaleDown: number;

package/dist/{matrix-B3c2_a2f.d.cts → matrix-BHzJESll.d.cts}

@@ -9,10 +9,11 @@ interface Point {
 declare function applyMatrix(m: Matrix, point: Point): Point;
 declare function translationMatrix(x: number, y: number): Matrix;
 declare function scaleMatrix(sx: number, sy: number): Matrix;
+declare const BEZIER_KAPPA = 0.5522847498;
 declare function rotationMatrix(degrees: number): Matrix;
 declare function matrixScaleX(m: Matrix): number;
 declare function matrixScaleY(m: Matrix): number;
 declare function matrixRotationDegrees(m: Matrix): number;
 declare function rotatePointAboutCenter(point: Point, center: Point, degrees: number): Point;
 //#endregion
-export { matrixRotationDegrees as a, multiplyMatrices as c, scaleMatrix as d, translationMatrix as f, applyMatrix as i, rotatePointAboutCenter as l, Matrix as n, matrixScaleX as o, Point as r, matrixScaleY as s, IDENTITY_MATRIX as t, rotationMatrix as u };
+export { applyMatrix as a, matrixScaleY as c, rotationMatrix as d, scaleMatrix as f, Point as i, multiplyMatrices as l, IDENTITY_MATRIX as n, matrixRotationDegrees as o, translationMatrix as p, Matrix as r, matrixScaleX as s, BEZIER_KAPPA as t, rotatePointAboutCenter as u };

package/dist/{matrix-B3c2_a2f.d.ts → matrix-BHzJESll.d.ts}

@@ -9,10 +9,11 @@ interface Point {
 declare function applyMatrix(m: Matrix, point: Point): Point;
 declare function translationMatrix(x: number, y: number): Matrix;
 declare function scaleMatrix(sx: number, sy: number): Matrix;
+declare const BEZIER_KAPPA = 0.5522847498;
 declare function rotationMatrix(degrees: number): Matrix;
 declare function matrixScaleX(m: Matrix): number;
 declare function matrixScaleY(m: Matrix): number;
 declare function matrixRotationDegrees(m: Matrix): number;
 declare function rotatePointAboutCenter(point: Point, center: Point, degrees: number): Point;
 //#endregion
-export { matrixRotationDegrees as a, multiplyMatrices as c, scaleMatrix as d, translationMatrix as f, applyMatrix as i, rotatePointAboutCenter as l, Matrix as n, matrixScaleX as o, Point as r, matrixScaleY as s, IDENTITY_MATRIX as t, rotationMatrix as u };
+export { applyMatrix as a, matrixScaleY as c, rotationMatrix as d, scaleMatrix as f, Point as i, multiplyMatrices as l, IDENTITY_MATRIX as n, matrixRotationDegrees as o, translationMatrix as p, Matrix as r, matrixScaleX as s, BEZIER_KAPPA as t, rotatePointAboutCenter as u };

package/dist/matrix.cjs

@@ -47,6 +47,7 @@ function scaleMatrix(sx, sy) {
 		0
 	];
 }
+const BEZIER_KAPPA = .5522847498;
 function rotationMatrix(degrees) {
 	const radians = degrees * Math.PI / 180;
 	const cos = Math.cos(radians);
@@ -81,6 +82,7 @@ function rotatePointAboutCenter(point, center, degrees) {
 	};
 }
 //#endregion
+exports.BEZIER_KAPPA = BEZIER_KAPPA;
 exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
 exports.applyMatrix = applyMatrix;
 exports.matrixRotationDegrees = matrixRotationDegrees;

package/dist/matrix.d.cts

@@ -1,2 +1,2 @@
-import { a as matrixRotationDegrees, c as multiplyMatrices, d as scaleMatrix, f as translationMatrix, i as applyMatrix, l as rotatePointAboutCenter, n as Matrix, o as matrixScaleX, r as Point, s as matrixScaleY, t as IDENTITY_MATRIX, u as rotationMatrix } from "./matrix-B3c2_a2f.cjs";
-export { IDENTITY_MATRIX, Matrix, Point, applyMatrix, matrixRotationDegrees, matrixScaleX, matrixScaleY, multiplyMatrices, rotatePointAboutCenter, rotationMatrix, scaleMatrix, translationMatrix };
+import { a as applyMatrix, c as matrixScaleY, d as rotationMatrix, f as scaleMatrix, i as Point, l as multiplyMatrices, n as IDENTITY_MATRIX, o as matrixRotationDegrees, p as translationMatrix, r as Matrix, s as matrixScaleX, t as BEZIER_KAPPA, u as rotatePointAboutCenter } from "./matrix-BHzJESll.cjs";
+export { BEZIER_KAPPA, IDENTITY_MATRIX, Matrix, Point, applyMatrix, matrixRotationDegrees, matrixScaleX, matrixScaleY, multiplyMatrices, rotatePointAboutCenter, rotationMatrix, scaleMatrix, translationMatrix };

package/dist/matrix.d.ts

@@ -1,2 +1,2 @@
-import { a as matrixRotationDegrees, c as multiplyMatrices, d as scaleMatrix, f as translationMatrix, i as applyMatrix, l as rotatePointAboutCenter, n as Matrix, o as matrixScaleX, r as Point, s as matrixScaleY, t as IDENTITY_MATRIX, u as rotationMatrix } from "./matrix-B3c2_a2f.js";
-export { IDENTITY_MATRIX, Matrix, Point, applyMatrix, matrixRotationDegrees, matrixScaleX, matrixScaleY, multiplyMatrices, rotatePointAboutCenter, rotationMatrix, scaleMatrix, translationMatrix };
+import { a as applyMatrix, c as matrixScaleY, d as rotationMatrix, f as scaleMatrix, i as Point, l as multiplyMatrices, n as IDENTITY_MATRIX, o as matrixRotationDegrees, p as translationMatrix, r as Matrix, s as matrixScaleX, t as BEZIER_KAPPA, u as rotatePointAboutCenter } from "./matrix-BHzJESll.js";
+export { BEZIER_KAPPA, IDENTITY_MATRIX, Matrix, Point, applyMatrix, matrixRotationDegrees, matrixScaleX, matrixScaleY, multiplyMatrices, rotatePointAboutCenter, rotationMatrix, scaleMatrix, translationMatrix };

package/dist/matrix.js

@@ -46,6 +46,7 @@ function scaleMatrix(sx, sy) {
 		0
 	];
 }
+const BEZIER_KAPPA = .5522847498;
 function rotationMatrix(degrees) {
 	const radians = degrees * Math.PI / 180;
 	const cos = Math.cos(radians);
@@ -80,4 +81,4 @@ function rotatePointAboutCenter(point, center, degrees) {
 	};
 }
 //#endregion
-export { IDENTITY_MATRIX, applyMatrix, matrixRotationDegrees, matrixScaleX, matrixScaleY, multiplyMatrices, rotatePointAboutCenter, rotationMatrix, scaleMatrix, translationMatrix };
+export { BEZIER_KAPPA, IDENTITY_MATRIX, applyMatrix, matrixRotationDegrees, matrixScaleX, matrixScaleY, multiplyMatrices, rotatePointAboutCenter, rotationMatrix, scaleMatrix, translationMatrix };

package/dist/measure.cjs

@@ -1,7 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_afm_widths = require("./afm-widths-BoeTOK2r.cjs");
-const require_fonts = require("./fonts.cjs");
+const require_embedded_font = require("./embedded-font.cjs");
+const require_font_registry = require("./font-registry.cjs");
 //#region src/measure.ts
+const GLYPH_SPACE_UNITS_PER_EM = 1e3;
 const DEFAULT_WIDTH_CORRECTIONS = {
 	calibri: .92,
 	aptos: .93,
@@ -13,42 +15,91 @@ const DEFAULT_WIDTH_CORRECTIONS = {
 function normalizeFamilyKey(family) {
 	return family.toLowerCase().replace(/[^a-z0-9]/g, "");
 }
-function createStandardFontMeasurer(options = {}) {
+const EMBEDDED_HORIZONTAL_SCALE = 1;
+const DEFAULT_VERTICAL_METRIC_POLICY = "hhea";
+function verticalMetricsFor(face, policy) {
+	const m = face.metrics;
+	const hhea = {
+		ascentGlyphSpace: m.ascentGlyphSpace,
+		descentGlyphSpace: m.descentGlyphSpace,
+		lineGapGlyphSpace: m.lineGapGlyphSpace
+	};
+	if (policy === "os2Typo") {
+		if (m.typoAscentGlyphSpace === void 0 || m.typoDescentGlyphSpace === void 0 || m.typoLineGapGlyphSpace === void 0) return hhea;
+		return {
+			ascentGlyphSpace: m.typoAscentGlyphSpace,
+			descentGlyphSpace: m.typoDescentGlyphSpace,
+			lineGapGlyphSpace: m.typoLineGapGlyphSpace
+		};
+	}
+	if (policy === "os2Win") {
+		if (m.winAscentGlyphSpace === void 0 || m.winDescentGlyphSpace === void 0) return hhea;
+		return {
+			ascentGlyphSpace: m.winAscentGlyphSpace,
+			descentGlyphSpace: m.winDescentGlyphSpace,
+			lineGapGlyphSpace: 0
+		};
+	}
+	return hhea;
+}
+function createFontMeasurer(registry, options = {}) {
 	const corrections = {
 		...DEFAULT_WIDTH_CORRECTIONS,
 		...options.widthCorrectionByFamily
 	};
-	function correctionFor(family) {
+	const verticalPolicy = options.verticalMetrics ?? "hhea";
+	function standardWidthCorrectionFor(family) {
 		return corrections[normalizeFamilyKey(family)] ?? 1;
 	}
-	function standardNameFor(font) {
-		return require_fonts.resolveStandardFont(font.family, font.weight === "bold", font.style === "italic").standardName;
+	function resolve(font) {
+		return require_font_registry.resolveFaceWithRegistry(registry, font);
 	}
 	return {
 		widthOfTextAtSize(text, font, sizePt) {
-			const { width1000 } = require_afm_widths.encodeForShow(text, standardNameFor(font));
-			return width1000 / 1e3 * sizePt * correctionFor(font.family);
+			const face = resolve(font);
+			if (face.kind === "embedded") return require_embedded_font.encodeForShowEmbedded(text, face.face).width1000 / GLYPH_SPACE_UNITS_PER_EM * sizePt;
+			const { width1000 } = require_afm_widths.encodeForShow(text, face.standardName);
+			return width1000 / GLYPH_SPACE_UNITS_PER_EM * sizePt * standardWidthCorrectionFor(font.family);
 		},
 		lineHeightAtSize(font, sizePt) {
-			return require_afm_widths.STANDARD_METRICS[standardNameFor(font)].lineHeightEm * sizePt;
+			const face = resolve(font);
+			if (face.kind === "embedded") {
+				const vertical = verticalMetricsFor(face.face, verticalPolicy);
+				return (vertical.ascentGlyphSpace - vertical.descentGlyphSpace + vertical.lineGapGlyphSpace) / GLYPH_SPACE_UNITS_PER_EM * sizePt;
+			}
+			return require_afm_widths.STANDARD_METRICS[face.standardName].lineHeightEm * sizePt;
 		},
 		ascenderAtSize(font, sizePt) {
-			return require_afm_widths.STANDARD_METRICS[standardNameFor(font)].ascender / 1e3 * sizePt;
+			const face = resolve(font);
+			if (face.kind === "embedded") return verticalMetricsFor(face.face, verticalPolicy).ascentGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * sizePt;
+			return require_afm_widths.STANDARD_METRICS[face.standardName].ascender / GLYPH_SPACE_UNITS_PER_EM * sizePt;
 		},
 		descenderAtSize(font, sizePt) {
-			return require_afm_widths.STANDARD_METRICS[standardNameFor(font)].descender / 1e3 * sizePt;
+			const face = resolve(font);
+			if (face.kind === "embedded") return verticalMetricsFor(face.face, verticalPolicy).descentGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * sizePt;
+			return require_afm_widths.STANDARD_METRICS[face.standardName].descender / GLYPH_SPACE_UNITS_PER_EM * sizePt;
 		},
 		underlineAtSize(font, sizePt) {
-			const metrics = require_afm_widths.STANDARD_METRICS[standardNameFor(font)];
+			const face = resolve(font);
+			if (face.kind === "embedded") return {
+				offsetPt: face.face.metrics.underlinePositionGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * sizePt,
+				thicknessPt: face.face.metrics.underlineThicknessGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * sizePt
+			};
+			const metrics = require_afm_widths.STANDARD_METRICS[face.standardName];
 			return {
-				offsetPt: metrics.underlinePosition / 1e3 * sizePt,
-				thicknessPt: metrics.underlineThickness / 1e3 * sizePt
+				offsetPt: metrics.underlinePosition / GLYPH_SPACE_UNITS_PER_EM * sizePt,
+				thicknessPt: metrics.underlineThickness / GLYPH_SPACE_UNITS_PER_EM * sizePt
 			};
 		},
 		horizontalScaleFor(font) {
-			return correctionFor(font.family);
+			return resolve(font).kind === "embedded" ? EMBEDDED_HORIZONTAL_SCALE : standardWidthCorrectionFor(font.family);
 		}
 	};
 }
+function createStandardFontMeasurer(options = {}) {
+	return createFontMeasurer(void 0, options);
+}
 //#endregion
+exports.DEFAULT_VERTICAL_METRIC_POLICY = DEFAULT_VERTICAL_METRIC_POLICY;
+exports.createFontMeasurer = createFontMeasurer;
 exports.createStandardFontMeasurer = createStandardFontMeasurer;