@embedpdf/core-annotation 3.0.0-next.3 → 3.0.0-next.5

package/dist/index.js

@@ -1,5 +1,5 @@
 import { NO_ANNOTATION_FLAGS } from "@embedpdf/engine-core/runtime";
-import { applyPoint, applyRect, invert, isQuarterTurn, pdfToContentMatrix, rotateAbout } from "@embedpdf/core-geometry";
+import { applyPoint, applyRect, invert, isQuarterTurn, pdfToContentMatrix, rotateAbout, textQuadBounds, textQuadPoints, textQuadRing } from "@embedpdf/core-geometry";
 //#region src/kinds.ts
 const OPACITY = {
 	key: "opacity",
@@ -1463,9 +1463,12 @@ const DEFAULT_CHROME_GEOM = {
 };
 /** Normalize degrees into `[0, 360)`. */
 const normalizeDeg = (d) => (d % 360 + 360) % 360;
-/** A geom's applied rotation (deg), or 0 for the non-rotatable kinds. */
+/** A geom's applied rotation (deg), or 0 for the non-rotatable kinds. A
+*  caret's `rot` is AUTHORING metadata (its text's baseline tilt): reported
+*  here so the renderer and selection chrome follow it, while the caret's
+*  caps (not movable/resizable) keep every rotate gesture away from it. */
 function geomRotation(g) {
-	if (g.t === "rect" || g.t === "line" || g.t === "poly" || g.t === "ink" || g.t === "text") return g.rot ?? 0;
+	if (g.t === "rect" || g.t === "line" || g.t === "poly" || g.t === "ink" || g.t === "text" || g.t === "caret") return g.rot ?? 0;
 	return 0;
 }
 const rectCenter = (r) => ({
@@ -1487,7 +1490,7 @@ function centroidOf(g) {
 		x: (g.a.x + g.b.x) / 2,
 		y: (g.a.y + g.b.y) / 2
 	};
-	const pts = g.t === "poly" ? g.points : g.t === "ink" ? g.strokes.flat() : g.quads.flat();
+	const pts = g.t === "poly" ? g.points : g.t === "ink" ? g.strokes.flat() : g.quads.flatMap(textQuadPoints);
 	let sx = 0;
 	let sy = 0;
 	for (const p of pts) {
@@ -1500,9 +1503,12 @@ function centroidOf(g) {
 		y: sy / n
 	};
 }
-/** Is this kind rotatable (the geometry carries a meaningful `rot`)? */
+/** Does the geometry carry a meaningful `rot` (an oriented local box exists)?
+*  ORIENTATION is a geometry fact; whether the USER may rotate is the separate
+*  `caps.rotatable` gate — a caret is oriented (it rides its text's tilt) yet
+*  offers no rotate gesture. */
 function isRotatableGeom(g) {
-	return g.t === "rect" || g.t === "line" || g.t === "poly" || g.t === "ink" || g.t === "text" && !g.callout;
+	return g.t === "rect" || g.t === "line" || g.t === "poly" || g.t === "ink" || g.t === "caret" || g.t === "text" && !g.callout;
 }
 /**
 * Rotate a geom by `deltaDeg` (clockwise) about `pivot`.
@@ -1511,7 +1517,10 @@ function isRotatableGeom(g) {
 *    pivot IS the box centre this is a pure `rot += delta`.
 *  - VERTEX (`line`/`poly`/`ink`): map every point through the rotation AND bump
 *    the advisory `rot` (the points stay the authoritative visual).
-* Non-rotatable kinds (caret/quads, callouts) are returned unchanged.
+* Kinds without a rotate VERB are returned unchanged: quads and callouts, and
+* also the caret — oriented (`isRotatableGeom`) but text-anchored, so its tilt
+* is authoring metadata that no gesture edits (`geomResetRotation` still
+* clears it).
 */
 function geomRotateAbout(g, pivot, deltaDeg) {
 	if (deltaDeg === 0) return g;
@@ -1571,7 +1580,7 @@ function apFrameSize(g) {
 		width: g.rect.width,
 		height: g.rect.height
 	};
-	const b = unionRect(g.t === "line" ? [g.a, g.b] : g.t === "poly" ? g.points : g.t === "ink" ? g.strokes.flat() : g.quads.flat());
+	const b = unionRect(g.t === "line" ? [g.a, g.b] : g.t === "poly" ? g.points : g.t === "ink" ? g.strokes.flat() : g.quads.flatMap(textQuadPoints));
 	return {
 		width: b.width,
 		height: b.height
@@ -1680,7 +1689,7 @@ function fitStampBox(center, desired, page, rotCW) {
 function geomResetRotation(g) {
 	const rot = geomRotation(g);
 	if (!rot) return g;
-	if (g.t === "rect" || g.t === "text") return {
+	if (g.t === "rect" || g.t === "text" || g.t === "caret") return {
 		...g,
 		rot: 0
 	};
@@ -1697,7 +1706,7 @@ function geomResetRotation(g) {
 function obbFromGeom(g, strokeWidth, border) {
 	if (!isRotatableGeom(g)) return null;
 	const rot = geomRotation(g);
-	if (g.t === "rect" || g.t === "text") {
+	if (g.t === "rect" || g.t === "text" || g.t === "caret") {
 		const c = rectCenter(g.rect);
 		return {
 			corners: rectCornerPoints(g.rect).map((p) => rotatePoint(p, c, rot)),
@@ -2002,6 +2011,77 @@ function caretRectFromTextEnd(lineRect) {
 		height
 	};
 }
+/**
+* Caret box for a text-edit anchor: half the glyph's ink height, centered on
+* the TRAILING baseline corner in READING direction (`advance` decides which
+* end — RTL carets land on the visual left), sitting on the baseline. The box
+* stays axis-aligned; use {@link caretGeomFromAnchor} for the tilt-carrying
+* geometry.
+*/
+function caretRectFromAnchor(anchor) {
+	const q = anchor.glyphQuad;
+	const ink = Math.hypot(q.lowerStart.x - q.upperStart.x, q.lowerStart.y - q.upperStart.y);
+	const size = Math.max(ink / 2, 1);
+	const corner = anchor.advance > 0 ? q.lowerEnd : q.lowerStart;
+	return {
+		x: corner.x - size / 2,
+		y: corner.y - size,
+		width: size,
+		height: size
+	};
+}
+/** Rotations closer than ~0.05° to upright stay upright (float noise guard). */
+const CARET_ROT_EPSILON = .05;
+/**
+* Caret GEOMETRY for a text-edit anchor: the box-family pair — an UNROTATED
+* box whose centre sits half a caret-size ascent-ward of the trailing
+* baseline corner, plus `rot` = the text's baseline tilt (deg, CW in y-down
+* content space). Rotating the box about its centre by `rot` lands it
+* hugging the rotated baseline, symbol pointing at its text. For upright
+* anchors this degenerates EXACTLY to {@link caretRectFromAnchor} with no
+* `rot` key — the dominant case is byte-identical.
+*/
+function caretGeomFromAnchor(anchor) {
+	const q = anchor.glyphQuad;
+	const ink = Math.hypot(q.lowerStart.x - q.upperStart.x, q.lowerStart.y - q.upperStart.y);
+	const size = Math.max(ink / 2, 1);
+	const corner = anchor.advance > 0 ? q.lowerEnd : q.lowerStart;
+	const bx = q.lowerEnd.x - q.lowerStart.x;
+	const by = q.lowerEnd.y - q.lowerStart.y;
+	const rot = Math.hypot(bx, by) > 0 ? normalizeDeg(Math.atan2(by, bx) * 180 / Math.PI) : 0;
+	if (rot < CARET_ROT_EPSILON || rot > 360 - CARET_ROT_EPSILON) return {
+		t: "caret",
+		rect: {
+			x: corner.x - size / 2,
+			y: corner.y - size,
+			width: size,
+			height: size
+		}
+	};
+	const ux = (q.upperStart.x - q.lowerStart.x) / ink;
+	const uy = (q.upperStart.y - q.lowerStart.y) / ink;
+	const cx = corner.x + ux * size / 2;
+	const cy = corner.y + uy * size / 2;
+	return {
+		t: "caret",
+		rect: {
+			x: cx - size / 2,
+			y: cy - size / 2,
+			width: size,
+			height: size
+		},
+		rot
+	};
+}
+/** Map a TextQuad's corners through a point function (names ride along). */
+function mapTextQuad(q, f) {
+	return {
+		upperStart: f(q.upperStart),
+		upperEnd: f(q.upperEnd),
+		lowerStart: f(q.lowerStart),
+		lowerEnd: f(q.lowerEnd)
+	};
+}
 /** Miter limit shared by the bounds math AND the SVG renderer (`stroke-miterlimit`),
 *  so the computed box and the drawn stroke always agree on where a sharp join
 *  bevels instead of spiking. 10 = the PDF default (also what the baked /AP uses). */
@@ -2150,7 +2230,7 @@ function geomVisualBounds(g, strokeWidth, border) {
 		return expandRect(unionRect(all), strokeWidth / 2);
 	}
 	if (g.t === "rect" || g.t === "text" || g.t === "caret") return g.rect;
-	if (g.t === "quads") return expandRect(unionRect(g.quads.flat()), strokeWidth / 2);
+	if (g.t === "quads") return expandRect(unionRect(g.quads.flatMap(textQuadPoints)), strokeWidth / 2);
 	if (g.t === "ink") return expandRect(unionRect(g.strokes.flat()), strokeWidth / 2);
 	const pts = strokeOutlinePoints(g.t === "line" ? [g.a, g.b] : g.points, g.t === "poly" && g.closed, strokeWidth);
 	for (const seg of endingSegs(g)) for (const node of endingNodes(seg.tip, seg.angle, seg.ending, strokeWidth)) if (node.kind === "poly") pts.push(...strokeOutlinePoints(node.points, node.closed, strokeWidth));
@@ -2286,7 +2366,7 @@ function geomBounds(g) {
 	if (g.t === "line") return rectFromPoints(g.a, g.b);
 	if (g.t === "poly") return unionRect(g.points);
 	if (g.t === "ink") return unionRect(g.strokes.flat());
-	return unionRect(g.quads.flat());
+	return unionRect(g.quads.flatMap(textQuadPoints));
 }
 /**
 * Is the content point ON the annotation: within `margin` of the stroke, or
@@ -2299,7 +2379,7 @@ function geomBounds(g) {
 */
 function geomHit(g, p, margin, filled, strokeWidth) {
 	const tol = margin + strokeWidth / 2;
-	if ((g.t === "rect" || g.t === "text" && !g.callout) && (g.rot ?? 0) !== 0) p = rotatePoint(p, rectCenter(g.rect), -(g.rot ?? 0));
+	if ((g.t === "rect" || g.t === "caret" || g.t === "text" && !g.callout) && (g.rot ?? 0) !== 0) p = rotatePoint(p, rectCenter(g.rect), -(g.rot ?? 0));
 	if (g.t === "caret") return rectContains(expandRect(g.rect, margin), p);
 	if (g.t === "text") {
 		const rot = g.callout ? g.rot ?? 0 : 0;
@@ -2374,7 +2454,7 @@ function geomHit(g, p, margin, filled, strokeWidth) {
 		for (const stroke of g.strokes) for (let i = 0; i < stroke.length - 1; i++) if (segDist(p, stroke[i], stroke[i + 1]) <= tol) return true;
 		return false;
 	}
-	return g.quads.some((q) => rectContains(unionRect(q), p));
+	return g.quads.some((q) => pointInQuad(p, textQuadRing(q)));
 }
 function geomHandles(g) {
 	if (g.t === "rect" || g.t === "text") {
@@ -2463,7 +2543,7 @@ function geomTranslate(g, d) {
 	};
 	return {
 		...g,
-		quads: g.quads.map((q) => q.map(mv))
+		quads: g.quads.map((q) => mapTextQuad(q, mv))
 	};
 }
 const OPPOSITE_HANDLE = {
@@ -2636,12 +2716,7 @@ function geomScene(g, strokeWidth = 0, border) {
 	}));
 	return g.quads.map((q) => ({
 		kind: "poly",
-		points: [
-			q[0],
-			q[1],
-			q[3],
-			q[2]
-		],
+		points: textQuadRing(q),
 		closed: true
 	}));
 }
@@ -3664,10 +3739,10 @@ function update(m, msg) {
 		case "createPointer": return createPointer(m, msg.phase, msg.subtype, msg.in, msg.preset, msg.intent, msg.deferInkCommit, msg.straightenInk, msg.clickCreate, msg.flags);
 		case "finishInkDraft": return finishInkCreate(m);
 		case "finishCreationDraft": return finishPolyCreate(m);
-		case "createCaret": return createCaret(m, msg.pon, msg.rect, msg.flags);
-		case "createReplaceText": return createReplaceText(m, msg.pon, msg.rects, msg.endRect, msg.preset);
-		case "createMarkup": return createMarkup(m, msg.subtype, msg.pon, msg.rects, msg.preset, msg.flags);
-		case "setMarkupPreview": return setMarkupPreview(m, msg.subtype, msg.rectsByPage, msg.preset);
+		case "createCaret": return createCaret(m, msg.pon, msg.anchor, msg.flags);
+		case "createReplaceText": return createReplaceText(m, msg.pon, msg.quads, msg.anchor, msg.preset);
+		case "createMarkup": return createMarkup(m, msg.subtype, msg.pon, msg.quads, msg.preset, msg.flags);
+		case "setMarkupPreview": return setMarkupPreview(m, msg.subtype, msg.quadsByPage, msg.preset);
 		case "clearMarkupPreview": return m.preview ? [{
 			...m,
 			preview: null
@@ -4468,33 +4543,22 @@ function finishPolyCreate(m) {
 		id
 	}]];
 }
-/** Per-line selection rects → /QuadPoints quads (content space, y-down: UL, UR,
-*  LL, LR). Shared by markup creation and the live preview. */
-const rectsToQuads = (rects) => rects.filter((r) => r.width > 0 && r.height > 0).map((r) => [
-	{
-		x: r.x,
-		y: r.y
-	},
-	{
-		x: r.x + r.width,
-		y: r.y
-	},
-	{
-		x: r.x,
-		y: r.y + r.height
-	},
-	{
-		x: r.x + r.width,
-		y: r.y + r.height
-	}
-]);
+/** Drop degenerate segment quads (zero-length baseline or ink extent). Area is
+*  the cross product of the two edge vectors — orientation-safe. */
+const usableQuads = (quads) => quads.filter((q) => {
+	const ux = q.upperEnd.x - q.upperStart.x;
+	const uy = q.upperEnd.y - q.upperStart.y;
+	const sx = q.lowerStart.x - q.upperStart.x;
+	const sy = q.lowerStart.y - q.upperStart.y;
+	return Math.abs(ux * sy - uy * sx) > 0;
+});
 /**
 * Build a text-markup annotation from the selection's per-line rects. The new
 * annotation is `vector` (rendered live by the overlay) and selected, mirroring
 * `createPointer`. One call per page the selection spans. Clears any live preview.
 */
-function createMarkup(m, subtype, pon, rects, preset = subtype, flags) {
-	const quads = rectsToQuads(rects);
+function createMarkup(m, subtype, pon, segmentQuads, preset = subtype, flags) {
+	const quads = usableQuads(segmentQuads);
 	if (!quads.length) return [m, []];
 	const id = `tmp:${m.seq + 1}`;
 	const annot = {
@@ -4535,9 +4599,9 @@ function createMarkup(m, subtype, pon, rects, preset = subtype, flags) {
 * (`/IT /StrikeOutTextEdit`, `/IRT` caret, `/RT /Group`). Persistence performs
 * the two ordered writes and rolls the primary back if the subordinate fails.
 */
-function createReplaceText(m, pon, rects, textEndRect, preset = "replace-text") {
-	const quads = rectsToQuads(rects);
-	if (!quads.length || textEndRect.width <= 0 || textEndRect.height <= 0) return [m, []];
+function createReplaceText(m, pon, segmentQuads, anchor, preset = "replace-text") {
+	const quads = usableQuads(segmentQuads);
+	if (!quads.length) return [m, []];
 	const primaryId = `tmp:${m.seq + 1}`;
 	const strikeoutId = `tmp:${m.seq + 2}`;
 	const style = styleFromProps(defaultsFor(m, preset));
@@ -4547,10 +4611,7 @@ function createReplaceText(m, pon, rects, textEndRect, preset = "replace-text")
 		pon,
 		subtype: "caret",
 		intent: "replace",
-		geom: {
-			t: "caret",
-			rect: caretRectFromTextEnd(textEndRect)
-		},
+		geom: caretGeomFromAnchor(anchor),
 		style,
 		flags: DRAWN_FLAGS,
 		source: "vector"
@@ -4593,20 +4654,17 @@ function createReplaceText(m, pon, rects, textEndRect, preset = "replace-text")
 		members: [strikeoutId]
 	}]];
 }
-function createCaret(m, pon, textEndRect, flags) {
-	if (textEndRect.width <= 0 || textEndRect.height <= 0) return [m, []];
+function createCaret(m, pon, anchor, flags) {
+	const caretGeom = caretGeomFromAnchor(anchor);
+	if (caretGeom.rect.width <= 0 || caretGeom.rect.height <= 0) return [m, []];
 	const id = `tmp:${m.seq + 1}`;
-	const def = defaultsFor(m, "caret");
 	const annot = {
 		id,
 		ref: null,
 		pon,
 		subtype: "caret",
-		geom: {
-			t: "caret",
-			rect: caretRectFromTextEnd(textEndRect)
-		},
-		style: styleFromProps(def),
+		geom: caretGeom,
+		style: styleFromProps(defaultsFor(m, "caret")),
 		flags: {
 			...DRAWN_FLAGS,
 			...flags
@@ -4629,11 +4687,11 @@ function createCaret(m, pon, textEndRect, flags) {
 		id
 	}]];
 }
-/** Set / replace the live markup preview from the selection's per-page rects. */
-function setMarkupPreview(m, subtype, rectsByPage, preset = subtype) {
+/** Set / replace the live markup preview from the selection's per-page quads. */
+function setMarkupPreview(m, subtype, quadsByPage, preset = subtype) {
 	const byPage = {};
-	for (const k in rectsByPage) {
-		const quads = rectsToQuads(rectsByPage[k]);
+	for (const k in quadsByPage) {
+		const quads = usableQuads(quadsByPage[k]);
 		if (quads.length) byPage[Number(k)] = quads;
 	}
 	return [{
@@ -4972,70 +5030,99 @@ function shapePaint(style, closed) {
 		...style.border.kind === "cloudy" ? { join: "round" } : {}
 	};
 }
-/** A smooth squiggle (quadratic-bezier wave) along a baseline, adapted from v2's
-*  tile: one `Q` hump then reflected `T` segments alternate up/down across the run. */
-function squigglePath(x, y, w, amp) {
+/** A smooth squiggle (quadratic-bezier wave) along an ARBITRARY baseline,
+*  generated in the (û, n̂) basis: one `Q` hump then reflected `T` segments
+*  alternate across the run. Reflection is affine-invariant, so an upright
+*  quad reproduces the old axis-aligned wave byte-for-byte. `n̂` points from
+*  the baseline toward the ascent side; humps rise toward the text. */
+function squigglePath(start, u, n, w, amp) {
 	const half = Math.max(2, amp * 1.5);
-	let d = `M ${num(x)} ${num(y)} Q ${num(x + half / 2)} ${num(y - amp)} ${num(x + half)} ${num(y)}`;
-	for (let px = x + half; px + half <= x + w + .5; px += half) d += ` T ${num(px + half)} ${num(y)}`;
+	const at = (t, off) => ({
+		x: start.x + u.x * t + n.x * off,
+		y: start.y + u.y * t + n.y * off
+	});
+	const p = (v) => `${num(v.x)} ${num(v.y)}`;
+	const hump = at(half / 2, amp);
+	let d = `M ${p(at(0, 0))} Q ${p(hump)} ${p(at(half, 0))}`;
+	for (let t = half; t + half <= w + .5; t += half) d += ` T ${p(at(t + half, 0))}`;
 	return d;
 }
-/** Per-subtype markup nodes. Quads are axis-aligned per-line rects (UL,UR,LL,LR);
-*  the colour is the markup `/C` (our model keeps stroke==fill). */
+/** Per-subtype markup nodes on the quads' own edges (corner-NAMED TextQuads:
+*  upper = ascent side, lower = baseline side, start → end along the frame).
+*  The colour is the markup `/C` (our model keeps stroke==fill). Rotated and
+*  sheared cells draw along their true baselines; upright output is identical
+*  to the old axis-aligned math. */
 function markupScene(subtype, quads, style) {
 	const color = style.color;
 	const opacity = style.opacity;
 	const nodes = [];
 	for (const q of quads) {
-		const x = q[0].x;
-		const y = q[0].y;
-		const w = q[1].x - q[0].x;
-		const h = q[2].y - q[0].y;
+		const down = {
+			x: q.lowerStart.x - q.upperStart.x,
+			y: q.lowerStart.y - q.upperStart.y
+		};
+		const h = Math.hypot(down.x, down.y);
+		const wVec = {
+			x: q.lowerEnd.x - q.lowerStart.x,
+			y: q.lowerEnd.y - q.lowerStart.y
+		};
+		const w = Math.hypot(wVec.x, wVec.y);
 		if (w <= 0 || h <= 0) continue;
+		const n = {
+			x: down.x / h,
+			y: down.y / h
+		};
 		const lw = Math.min(2.5, Math.max(.75, h * .06));
-		if (subtype === "underline") {
-			const yy = y + h - lw;
-			nodes.push({
-				kind: "line",
-				a: {
-					x,
-					y: yy
-				},
-				b: {
-					x: x + w,
-					y: yy
-				},
-				paint: {
-					stroke: color,
-					width: lw,
-					opacity,
-					blend: blendFor(style)
-				}
-			});
-		} else if (subtype === "strikeout") {
-			const yy = y + h / 2;
-			nodes.push({
-				kind: "line",
-				a: {
-					x,
-					y: yy
-				},
-				b: {
-					x: x + w,
-					y: yy
-				},
-				paint: {
-					stroke: color,
-					width: lw,
-					opacity,
-					blend: blendFor(style)
-				}
-			});
-		} else if (subtype === "squiggly") {
+		if (subtype === "underline") nodes.push({
+			kind: "line",
+			a: {
+				x: q.lowerStart.x - n.x * lw,
+				y: q.lowerStart.y - n.y * lw
+			},
+			b: {
+				x: q.lowerEnd.x - n.x * lw,
+				y: q.lowerEnd.y - n.y * lw
+			},
+			paint: {
+				stroke: color,
+				width: lw,
+				opacity,
+				blend: blendFor(style)
+			}
+		});
+		else if (subtype === "strikeout") nodes.push({
+			kind: "line",
+			a: {
+				x: (q.upperStart.x + q.lowerStart.x) / 2,
+				y: (q.upperStart.y + q.lowerStart.y) / 2
+			},
+			b: {
+				x: (q.upperEnd.x + q.lowerEnd.x) / 2,
+				y: (q.upperEnd.y + q.lowerEnd.y) / 2
+			},
+			paint: {
+				stroke: color,
+				width: lw,
+				opacity,
+				blend: blendFor(style)
+			}
+		});
+		else if (subtype === "squiggly") {
 			const amp = Math.min(2, Math.max(1, h * .08));
+			const u = {
+				x: wVec.x / w,
+				y: wVec.y / w
+			};
+			const start = {
+				x: q.lowerStart.x - n.x * amp,
+				y: q.lowerStart.y - n.y * amp
+			};
 			nodes.push({
 				kind: "path",
-				d: squigglePath(x, y + h - amp, w, amp),
+				d: squigglePath(start, u, {
+					x: -n.x,
+					y: -n.y
+				}, w, amp),
 				paint: {
 					stroke: color,
 					width: lw,
@@ -5044,13 +5131,9 @@ function markupScene(subtype, quads, style) {
 				}
 			});
 		} else nodes.push({
-			kind: "rect",
-			rect: {
-				x,
-				y,
-				width: w,
-				height: h
-			},
+			kind: "poly",
+			points: textQuadRing(q),
+			closed: true,
 			paint: {
 				fill: color,
 				opacity,
@@ -5060,23 +5143,40 @@ function markupScene(subtype, quads, style) {
 	}
 	return nodes;
 }
-/** A redact mark's regions: per-quad boxes (text marks) or the rect (area). */
+const rectRing = (r) => [
+	{
+		x: r.x,
+		y: r.y
+	},
+	{
+		x: r.x + r.width,
+		y: r.y
+	},
+	{
+		x: r.x + r.width,
+		y: r.y + r.height
+	},
+	{
+		x: r.x,
+		y: r.y + r.height
+	}
+];
 function redactRegions(geom) {
 	if (geom.t === "quads") {
 		const out = [];
 		for (const q of geom.quads) {
-			const w = q[1].x - q[0].x;
-			const h = q[2].y - q[0].y;
-			if (w > 0 && h > 0) out.push({
-				x: q[0].x,
-				y: q[0].y,
-				width: w,
-				height: h
+			const bounds = textQuadBounds(q);
+			if (bounds.width > 0 && bounds.height > 0) out.push({
+				ring: textQuadRing(q),
+				bounds
 			});
 		}
 		return out;
 	}
-	if (geom.t === "rect") return [geom.rect];
+	if (geom.t === "rect") return [{
+		ring: rectRing(geom.rect),
+		bounds: geom.rect
+	}];
 	return [];
 }
 /**
@@ -5142,9 +5242,10 @@ function redactScene(item) {
 			width: item.style.strokeWidth || 1.5,
 			opacity: item.style.opacity
 		};
-		return regions.map((rect) => ({
-			kind: "rect",
-			rect,
+		return regions.map((region) => ({
+			kind: "poly",
+			points: region.ring,
+			closed: true,
 			paint
 		}));
 	}
@@ -5154,13 +5255,14 @@ function redactScene(item) {
 			fill: item.style.interiorColor,
 			opacity: 1
 		};
-		for (const rect of regions) nodes.push({
-			kind: "rect",
-			rect,
+		for (const region of regions) nodes.push({
+			kind: "poly",
+			points: region.ring,
+			closed: true,
 			paint: fill
 		});
 	}
-	if (item.label) for (const region of regions) nodes.push(...layoutRedactLabel(region, item.label, item.text));
+	if (item.label) for (const region of regions) nodes.push(...layoutRedactLabel(region.bounds, item.label, item.text));
 	return nodes;
 }
 /** The full painted scene for one annotation. */
@@ -5584,7 +5686,7 @@ function chrome(m, pon, pageBox, knobOffset = 24, view) {
 		const style = effStyle(a, view);
 		const caps = capsFor(a.subtype);
 		const rot = geomRotation(g);
-		const obb = caps.rotatable ? obbFromGeom(g, style.strokeWidth, a.style.border) : null;
+		const obb = obbFromGeom(g, style.strokeWidth, a.style.border);
 		if (obb && rot !== 0) nodes.push({
 			kind: "obb",
 			corners: obb.corners,
@@ -5675,6 +5777,6 @@ function creationDraftAnchor(m) {
 	};
 }
 //#endregion
-export { DEFAULT_CHROME_GEOM, DRAWN_FLAGS, FLAG_KEYS, KINDS, MIN_DRAG, MITER_LIMIT, NO_ANNOTATION_FLAGS, RECT_HANDLES, ROTATE_KNOB_OFFSET, anchorModeOf, anchorOf, anchoredBox, anchoredGeom, anchoredStrokeWidth, annotContentsEditable, annotInteractive, annotTransformable, applyProps, calloutConnection, calloutLinePoints, canMove, capsFor, caretRectFromTextEnd, centroidOf, chrome, clampRectToBox, clickCreateGeom, cloudyBorderExtent, cloudyPath, computeMoveSnap, contentToPdfPoint, contentToPdfRect, creationDraftAnchor, cursorAt, defaultsFor, expandGroups, fitStampBox, flagsEqual, geomBounds, geomDragHandle, geomHandles, geomHit, geomPdfBounds, geomResetRotation, geomRotateAbout, geomRotation, geomScaleAbout, geomScene, geomTranslate, geomVisualBounds, groupCaps, groupKeyOf, groupMembers, groupResizeAnchor, groupResizeBox, groupResizeFactors, hitTest, initialModel, initialStyle, initialTextStyle, interactive, isRotatableGeom, isSelectable, mergeFlags, normalizeDeg, obbFromGeom, pageItems, pdfToContentPoint, pdfToContentRect, placeRotateKnob, pointInQuad, propsFor, quadIntersectsRect, readProp, rectFromPoints, resolveClickPlacement, rotateDraftDelta, rotateKnob, rotatedAabb, rotatedHandleCursor, scene, selectedItems, selectionAnchor, selectionBounds, selectionBoundsOnPage, selectionCenter, selectionKnob, selectionQuad, shapeRectFor, sharedProps, straightenInkStroke, styleFromProps, textBoxes, textStyleFromProps, transposedAboutCenter, unanchoredGeom, unionRect, update, uprightAnchoredRect, uprightRotation, viewable };
+export { DEFAULT_CHROME_GEOM, DRAWN_FLAGS, FLAG_KEYS, KINDS, MIN_DRAG, MITER_LIMIT, NO_ANNOTATION_FLAGS, RECT_HANDLES, ROTATE_KNOB_OFFSET, anchorModeOf, anchorOf, anchoredBox, anchoredGeom, anchoredStrokeWidth, annotContentsEditable, annotInteractive, annotTransformable, applyProps, calloutConnection, calloutLinePoints, canMove, capsFor, caretGeomFromAnchor, caretRectFromAnchor, caretRectFromTextEnd, centroidOf, chrome, clampRectToBox, clickCreateGeom, cloudyBorderExtent, cloudyPath, computeMoveSnap, contentToPdfPoint, contentToPdfRect, creationDraftAnchor, cursorAt, defaultsFor, expandGroups, fitStampBox, flagsEqual, geomBounds, geomDragHandle, geomHandles, geomHit, geomPdfBounds, geomResetRotation, geomRotateAbout, geomRotation, geomScaleAbout, geomScene, geomTranslate, geomVisualBounds, groupCaps, groupKeyOf, groupMembers, groupResizeAnchor, groupResizeBox, groupResizeFactors, hitTest, initialModel, initialStyle, initialTextStyle, interactive, isRotatableGeom, isSelectable, mergeFlags, normalizeDeg, obbFromGeom, pageItems, pdfToContentPoint, pdfToContentRect, placeRotateKnob, pointInQuad, propsFor, quadIntersectsRect, readProp, rectFromPoints, resolveClickPlacement, rotateDraftDelta, rotateKnob, rotatedAabb, rotatedHandleCursor, scene, selectedItems, selectionAnchor, selectionBounds, selectionBoundsOnPage, selectionCenter, selectionKnob, selectionQuad, shapeRectFor, sharedProps, straightenInkStroke, styleFromProps, textBoxes, textStyleFromProps, transposedAboutCenter, unanchoredGeom, unionRect, update, uprightAnchoredRect, uprightRotation, viewable };
 
 //# sourceMappingURL=index.js.map