dsh-figmark 1.0.1 → 1.1.1

package/lib/client.pdf.js

@@ -25856,7 +25856,7 @@ while (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan] &
 		* @param transform - `[a b c d e f]`, user space → page units.
 		* @returns the placed geometry.
 		*/
-		function place(mark, transform) {
+		function place(mark, transform, unit) {
 			const scale = unitScale(transform);
 			const radians = (mark.rotation ?? 0) * Math.PI / 180;
 			const box = pointsBox(mark.points);
@@ -25867,10 +25867,11 @@ while (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan] &
 			if (mark.kind === "rect" || mark.kind === "ellipse") {
 				if (turned) points = turnedRing(mark.kind, mark.points, centre, radians);
 			} else if (spins) points = mark.points.map((point) => turnAround(point, centre, radians));
+			const weight = (mark.weight ?? 1) * unit;
 			return {
 				points: points.map((point) => toUserSpace(transform, point)),
-				width: STROKE_WIDTH / scale,
-				head: ARROW_HEAD / scale,
+				width: STROKE_WIDTH * weight / scale,
+				head: ARROW_HEAD * weight / scale,
 				turned
 			};
 		}
@@ -25962,13 +25963,14 @@ while (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan] &
 		* @param rect - the box the appearance is drawn in.
 		* @returns the content stream operators.
 		*/
-		function pointContent(mark, placed, rect) {
+		function pointContent(mark, placed, rect, unit) {
 			const point = placed.points[0];
 			/* v8 ignore next -- a point mark carries exactly the one coordinate it was placed at. */
 			if (point === void 0) return "";
 			const [x, y] = [point[0] - rect.x, point[1] - rect.y];
-			const radius = POINT_RADIUS / Math.max(placed.width / STROKE_WIDTH, 1e-4);
-			const dot = POINT_DOT_RADIUS / Math.max(placed.width / STROKE_WIDTH, 1e-4);
+			const base = Math.max(placed.width / (STROKE_WIDTH * unit), 1e-4);
+			const radius = POINT_RADIUS / base;
+			const dot = POINT_DOT_RADIUS / base;
 			const ring = ellipsePath(x, y, radius, radius);
 			const centre = ellipsePath(x, y, dot, dot);
 			return `${colorOperators(mark.color, "RG")} ${num(placed.width)} w 1 J ${ring} S ${colorOperators(mark.color, "rg")} ${centre} f`;
@@ -26013,8 +26015,8 @@ while (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan] &
 		* @returns the appearance stream reference, or undefined when the mark draws
 		*   nothing a stream is needed for.
 		*/
-		function appearance(context, mark, placed, rect) {
-			const content = mark.kind === "point" ? pointContent(mark, placed, rect) : strokeContent(mark, placed, rect);
+		function appearance(context, mark, placed, rect, unit) {
+			const content = mark.kind === "point" ? pointContent(mark, placed, rect, unit) : strokeContent(mark, placed, rect);
 			if (content === "") return void 0;
 			const dictionary = import_cjs.PDFDict.withContext(context);
 			dictionary.set(import_cjs.PDFName.of("Type"), import_cjs.PDFName.of("XObject"));
@@ -26053,11 +26055,11 @@ while (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan] &
 		* @param transform - `[a b c d e f]`, user space → page units.
 		* @returns the annotation dictionary.
 		*/
-		function annotation(context, mark, transform) {
-			const placed = place(mark, transform);
+		function annotation(context, mark, transform, unit) {
+			const placed = place(mark, transform, unit);
 			if (mark.points[0] === void 0 || placed.points[0] === void 0) throw new Error("an annotation mark needs at least one coordinate pair");
 			const rect = boundsOf(drawnPoints(mark, placed), placed.width * 2);
-			const box = mark.kind === "point" ? boundsOf(placed.points, POINT_RADIUS * 2) : rect;
+			const box = mark.kind === "point" ? boundsOf(placed.points, POINT_RADIUS * unit * 2) : rect;
 			const dictionary = import_cjs.PDFDict.withContext(context);
 			dictionary.set(import_cjs.PDFName.of("Type"), import_cjs.PDFName.of("Annot"));
 			dictionary.set(import_cjs.PDFName.of("Subtype"), import_cjs.PDFName.of(annotationSubtype(mark)));
@@ -26101,7 +26103,7 @@ while (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan] &
 					dictionary.set(import_cjs.PDFName.of("LE"), endings);
 				}
 			}
-			const stream = appearance(context, mark, placed, box);
+			const stream = appearance(context, mark, placed, box, unit);
 			if (stream !== void 0) {
 				const streams = import_cjs.PDFDict.withContext(context);
 				streams.set(import_cjs.PDFName.of("N"), stream);
@@ -26149,7 +26151,10 @@ while (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan] &
 				const page = document.getPage(input.page - 1);
 				if (input.marks.length === 0) continue;
 				const annots = pageAnnots(document.context, page);
-				for (const mark of input.marks) annots.push(document.context.register(annotation(document.context, mark, input.transform)));
+				for (const mark of input.marks) {
+					const unit = input.unit ?? 1;
+					annots.push(document.context.register(annotation(document.context, mark, input.transform, unit)));
+				}
 			}
 			return await document.save();
 		}
@@ -50273,7 +50278,7 @@ fn fs_main(in : VertexOutput) -> @location(0) vec4<f32> {
 				});
 				try {
 					const pages = markedPages(marks);
-					const annotatedPdf = await annotatePdf(bytes, await annotateInputs(pdf, pages));
+					const annotatedPdf = await annotatePdf(bytes, await annotateInputs(pdf, pages, props.figureUnit));
 					const saved = await seats.save(address, input, annotatedPdf);
 					autosave.cancel();
 					writtenSignature.current = signature(input);
@@ -50455,14 +50460,15 @@ fn fs_main(in : VertexOutput) -> @location(0) vec4<f32> {
 		* @param pages - the marked pages.
 		* @returns one input per page, each with its marks and its user-space transform.
 		*/
-		async function annotateInputs(pdf, pages) {
+		async function annotateInputs(pdf, pages, unitOf) {
 			const inputs = [];
 			for (const entry of pages) {
 				const size = await pdf.size(entry.page);
 				inputs.push({
 					page: entry.page,
 					transform: size.transform,
-					marks: entry.marks
+					marks: entry.marks,
+					unit: unitOf(size.width, size.height)
 				});
 			}
 			return inputs;

package/lib/index.js

@@ -260,6 +260,19 @@ function annotationTargetsFigure(document, figurePath) {
 	return basename(document.figure.path).toLowerCase() === basename(figurePath).toLowerCase();
 }
 //#endregion
+//#region src/shared/annotation.ts
+/** Thinnest stroke a mark can be drawn at, as a multiple of the default width. */
+const WEIGHT_MIN = .5;
+/**
+* Hold a stroke weight inside the range the painter can draw.
+*
+* @param value - the weight to hold.
+* @returns the value, pulled to the nearest end of the range.
+*/
+function clampWeight(value) {
+	return Math.min(4, Math.max(WEIGHT_MIN, value));
+}
+//#endregion
 //#region src/host/store.ts
 /**
 * Reading and writing one figure's annotation sidecar.
@@ -332,6 +345,11 @@ function readAnchor(value) {
 * @returns the angle in degrees, or undefined when absent.
 * @throws {Error} when the field is present but is not a usable angle.
 */
+function readWeight(value) {
+	if (value === void 0) return void 0;
+	if (typeof value !== "number" || !Number.isFinite(value)) throw new Error("annotation mark weight must be a finite multiple of the default width");
+	return clampWeight(value);
+}
 function readRotation(value) {
 	if (value === void 0) return void 0;
 	if (typeof value !== "number" || !Number.isFinite(value)) throw new Error("annotation mark rotation must be a finite number of degrees");
@@ -377,6 +395,7 @@ function readMark(value, index, figure) {
 	if (page !== void 0 && figure.pageCount !== void 0 && page > figure.pageCount) throw new Error(`annotation mark ${index} is on page ${page} of a ${figure.pageCount}-page document`);
 	const anchor = readAnchor(raw["anchor"]);
 	const rotation = readRotation(raw["rotation"]);
+	const weight = readWeight(raw["weight"]);
 	return {
 		id: raw["id"],
 		kind,
@@ -385,6 +404,7 @@ function readMark(value, index, figure) {
 		...typeof raw["detail"] === "string" ? { detail: raw["detail"] } : {},
 		...page === void 0 ? {} : { page },
 		...rotation === void 0 ? {} : { rotation },
+		...weight === void 0 ? {} : { weight },
 		...anchor === void 0 ? {} : { anchor }
 	};
 }

package/market/index.json

@@ -93,8 +93,8 @@
       },
       "versions": [
         {
-          "version": "1.0.1",
-          "publishTimestamp": 1792640347,
+          "version": "1.1.1",
+          "publishTimestamp": 1792729486,
           "source": {
             "type": "npm",
             "registry": "https://registry.npmjs.org"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-figmark",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "private": false,
   "description": "DSH 插件：在右侧栏预览里对科研配图、SVG、PDF、HTML 直接圈画批注，标注写进侧车文件并可一键交给智能体改图源",
   "license": "MIT",