pdf-codec 1.4.2 → 1.5.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,6 @@
 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");
 //#region src/math-font-write.ts
 const FLAG_SYMBOLIC = 4;
 const NOMINAL_STEM_V = 80;

package/dist/math-font-write.js

@@ -1,5 +1,5 @@
-import { deflate } from "./bytes/flate.js";
 import { pdfArray, pdfDict, pdfHexString, pdfName, pdfNum, pdfStream } from "./objects.js";
+import { deflate } from "./bytes/flate.js";
 //#region src/math-font-write.ts
 const FLAG_SYMBOLIC = 4;
 const NOMINAL_STEM_V = 80;

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/objects.cjs

@@ -70,6 +70,9 @@ function asNumber(obj) {
 function asName(obj) {
 	return obj?.kind === "name" ? obj.name : void 0;
 }
+function asBool(obj) {
+	return obj?.kind === "bool" ? obj.value : void 0;
+}
 function asArray(obj) {
 	return obj?.kind === "array" ? obj.items : void 0;
 }
@@ -83,6 +86,7 @@ function dictGet(dict, key) {
 }
 //#endregion
 exports.asArray = asArray;
+exports.asBool = asBool;
 exports.asDict = asDict;
 exports.asName = asName;
 exports.asNumber = asNumber;

package/dist/objects.d.cts

@@ -51,8 +51,9 @@ declare function pdfRef(num: number, gen: number): PdfObject;
 declare function isName(obj: PdfObject | undefined, name: string): boolean;
 declare function asNumber(obj: PdfObject | undefined): number | undefined;
 declare function asName(obj: PdfObject | undefined): string | undefined;
+declare function asBool(obj: PdfObject | undefined): boolean | undefined;
 declare function asArray(obj: PdfObject | undefined): PdfObject[] | undefined;
 declare function asDict(obj: PdfObject | undefined): PdfDict | undefined;
 declare function dictGet(dict: PdfDict, key: string): PdfObject | undefined;
 //#endregion
-export { PdfArray, PdfDict, PdfObject, PdfStream, asArray, asDict, asName, asNumber, dictGet, isName, pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream };
+export { PdfArray, PdfDict, PdfObject, PdfStream, asArray, asBool, asDict, asName, asNumber, dictGet, isName, pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream };

package/dist/objects.d.ts

@@ -51,8 +51,9 @@ declare function pdfRef(num: number, gen: number): PdfObject;
 declare function isName(obj: PdfObject | undefined, name: string): boolean;
 declare function asNumber(obj: PdfObject | undefined): number | undefined;
 declare function asName(obj: PdfObject | undefined): string | undefined;
+declare function asBool(obj: PdfObject | undefined): boolean | undefined;
 declare function asArray(obj: PdfObject | undefined): PdfObject[] | undefined;
 declare function asDict(obj: PdfObject | undefined): PdfDict | undefined;
 declare function dictGet(dict: PdfDict, key: string): PdfObject | undefined;
 //#endregion
-export { PdfArray, PdfDict, PdfObject, PdfStream, asArray, asDict, asName, asNumber, dictGet, isName, pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream };
+export { PdfArray, PdfDict, PdfObject, PdfStream, asArray, asBool, asDict, asName, asNumber, dictGet, isName, pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream };

package/dist/objects.js

@@ -69,6 +69,9 @@ function asNumber(obj) {
 function asName(obj) {
 	return obj?.kind === "name" ? obj.name : void 0;
 }
+function asBool(obj) {
+	return obj?.kind === "bool" ? obj.value : void 0;
+}
 function asArray(obj) {
 	return obj?.kind === "array" ? obj.items : void 0;
 }
@@ -81,4 +84,4 @@ function dictGet(dict, key) {
 	return dict.entries.get(key);
 }
 //#endregion
-export { asArray, asDict, asName, asNumber, dictGet, isName, pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream };
+export { asArray, asBool, asDict, asName, asNumber, dictGet, isName, pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream };

package/dist/read.cjs

@@ -169,6 +169,8 @@ function readPage(page, resolver, fontResolver, images, imageIdCache, sink) {
 function convertExtractedItem(item, pageMatrix, fontResolver, images, imageIdCache, resolver, sink) {
 	if (item.kind === "text") return convertText(item, pageMatrix, fontResolver);
 	if (item.kind === "rect") return convertRect(item, pageMatrix);
+	if (item.kind === "ellipse") return convertEllipse(item, pageMatrix);
+	if (item.kind === "line") return convertLine(item, pageMatrix);
 	if (item.kind === "path") return convertPath(item, pageMatrix);
 	if (item.kind === "image") return convertImage(item, pageMatrix, images, imageIdCache, resolver, sink);
 	return convertInlineImage(item, pageMatrix, images, resolver, sink);
@@ -199,7 +201,13 @@ function convertText(item, pageMatrix, fontResolver) {
 		rotationDeg: rotationDeg !== 0 ? rotationDeg : void 0
 	};
 }
-function convertRect(item, pageMatrix) {
+function paintFields(paint) {
+	return {
+		...paint.fill !== void 0 ? { fill: paint.fill } : {},
+		...paint.stroke !== void 0 ? { stroke: paint.stroke } : {}
+	};
+}
+function transformBox(item, pageMatrix) {
 	const p1 = require_matrix.applyMatrix(pageMatrix, {
 		x: item.xPt,
 		y: item.yPt
@@ -209,12 +217,43 @@ function convertRect(item, pageMatrix) {
 		y: item.yPt + item.heightPt
 	});
 	return {
-		kind: "rect",
 		xPt: Math.min(p1.x, p2.x),
 		yPt: Math.min(p1.y, p2.y),
 		widthPt: Math.abs(p2.x - p1.x),
-		heightPt: Math.abs(p2.y - p1.y),
-		fill: item.color
+		heightPt: Math.abs(p2.y - p1.y)
+	};
+}
+function convertRect(item, pageMatrix) {
+	return {
+		kind: "rect",
+		...transformBox(item, pageMatrix),
+		...paintFields(item)
+	};
+}
+function convertEllipse(item, pageMatrix) {
+	return {
+		kind: "ellipse",
+		...transformBox(item, pageMatrix),
+		...paintFields(item)
+	};
+}
+function convertLine(item, pageMatrix) {
+	const p1 = require_matrix.applyMatrix(pageMatrix, {
+		x: item.x1Pt,
+		y: item.y1Pt
+	});
+	const p2 = require_matrix.applyMatrix(pageMatrix, {
+		x: item.x2Pt,
+		y: item.y2Pt
+	});
+	return {
+		kind: "line",
+		x1Pt: p1.x,
+		y1Pt: p1.y,
+		x2Pt: p2.x,
+		y2Pt: p2.y,
+		color: item.color,
+		widthPt: item.widthPt
 	};
 }
 function transformSubpath(subpath, pageMatrix) {

package/dist/read.d.cts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as Matrix } from "./matrix-B3c2_a2f.cjs";
+import { r as Matrix } from "./matrix-BHzJESll.cjs";
 import { LayoutDocument } from "document-schema.js";
 //#region src/read.d.ts
 interface ReadPdfOptions {

package/dist/read.d.ts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as Matrix } from "./matrix-B3c2_a2f.js";
+import { r as Matrix } from "./matrix-BHzJESll.js";
 import { LayoutDocument } from "document-schema.js";
 //#region src/read.d.ts
 interface ReadPdfOptions {

package/dist/read.js

@@ -168,6 +168,8 @@ function readPage(page, resolver, fontResolver, images, imageIdCache, sink) {
 function convertExtractedItem(item, pageMatrix, fontResolver, images, imageIdCache, resolver, sink) {
 	if (item.kind === "text") return convertText(item, pageMatrix, fontResolver);
 	if (item.kind === "rect") return convertRect(item, pageMatrix);
+	if (item.kind === "ellipse") return convertEllipse(item, pageMatrix);
+	if (item.kind === "line") return convertLine(item, pageMatrix);
 	if (item.kind === "path") return convertPath(item, pageMatrix);
 	if (item.kind === "image") return convertImage(item, pageMatrix, images, imageIdCache, resolver, sink);
 	return convertInlineImage(item, pageMatrix, images, resolver, sink);
@@ -198,7 +200,13 @@ function convertText(item, pageMatrix, fontResolver) {
 		rotationDeg: rotationDeg !== 0 ? rotationDeg : void 0
 	};
 }
-function convertRect(item, pageMatrix) {
+function paintFields(paint) {
+	return {
+		...paint.fill !== void 0 ? { fill: paint.fill } : {},
+		...paint.stroke !== void 0 ? { stroke: paint.stroke } : {}
+	};
+}
+function transformBox(item, pageMatrix) {
 	const p1 = applyMatrix(pageMatrix, {
 		x: item.xPt,
 		y: item.yPt
@@ -208,12 +216,43 @@ function convertRect(item, pageMatrix) {
 		y: item.yPt + item.heightPt
 	});
 	return {
-		kind: "rect",
 		xPt: Math.min(p1.x, p2.x),
 		yPt: Math.min(p1.y, p2.y),
 		widthPt: Math.abs(p2.x - p1.x),
-		heightPt: Math.abs(p2.y - p1.y),
-		fill: item.color
+		heightPt: Math.abs(p2.y - p1.y)
+	};
+}
+function convertRect(item, pageMatrix) {
+	return {
+		kind: "rect",
+		...transformBox(item, pageMatrix),
+		...paintFields(item)
+	};
+}
+function convertEllipse(item, pageMatrix) {
+	return {
+		kind: "ellipse",
+		...transformBox(item, pageMatrix),
+		...paintFields(item)
+	};
+}
+function convertLine(item, pageMatrix) {
+	const p1 = applyMatrix(pageMatrix, {
+		x: item.x1Pt,
+		y: item.y1Pt
+	});
+	const p2 = applyMatrix(pageMatrix, {
+		x: item.x2Pt,
+		y: item.y2Pt
+	});
+	return {
+		kind: "line",
+		x1Pt: p1.x,
+		y1Pt: p1.y,
+		x2Pt: p2.x,
+		y2Pt: p2.y,
+		color: item.color,
+		widthPt: item.widthPt
 	};
 }
 function transformSubpath(subpath, pageMatrix) {

package/dist/write.cjs

@@ -2,8 +2,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_afm_widths = require("./afm-widths-BoeTOK2r.cjs");
 const require_util_base64 = require("./util/base64.cjs");
 const require_bytes_writer = require("./bytes/writer.cjs");
-const require_bytes_flate = require("./bytes/flate.cjs");
 const require_objects = require("./objects.cjs");
+const require_bytes_flate = require("./bytes/flate.cjs");
 const require_util_abort = require("./util/abort.cjs");
 const require_fonts = require("./fonts.cjs");
 const require_image_jpeg_info = require("./image/jpeg-info.cjs");

package/dist/write.js

@@ -1,8 +1,8 @@
 import { a as winAnsiGlyphName, n as widthOfCode, t as STANDARD_METRICS } from "./afm-widths-Dxucrg7D.js";
 import { base64ToBytes } from "./util/base64.js";
 import { ByteWriter, concatBytes } from "./bytes/writer.js";
-import { deflate } from "./bytes/flate.js";
 import { pdfArray, pdfDict, pdfHexString, pdfName, pdfNum, pdfRef, pdfStream } from "./objects.js";
+import { deflate } from "./bytes/flate.js";
 import { throwIfAborted } from "./util/abort.js";
 import { resolveStandardFont } from "./fonts.js";
 import { readJpegInfo } from "./image/jpeg-info.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-codec",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Hand-written, dependency-minimal PDF codec: parses arbitrary real-world PDFs and generates new ones, built on document-schema.js's LayoutDocument pivot and Zod 4 codecs.",
   "type": "module",
   "repository": {