kviewer 0.2.1 → 0.2.3

package/dist/runtime/annotation/engine/store.js

@@ -15,6 +15,9 @@ export class Store {
     if (isOriginal) {
       this.originalAnnotationStore.set(store.id, store);
     }
+    if (this.originalAnnotationStore.has(store.id)) {
+      this.deletedOriginalIds.delete(store.id);
+    }
     return store;
   }
   update(id, updates) {

package/dist/runtime/annotation/engine/tools/arrow.js

@@ -30,7 +30,6 @@ export class EditorArrow extends Editor {
       // Set the hit detection width
       lineCap: "round",
       lineJoin: "round",
-      strokeScaleEnabled: false,
       visible: false,
       opacity: this.currentAnnotation.style.opacity
     });

package/dist/runtime/annotation/engine/tools/circle.js

@@ -34,8 +34,6 @@ export class EditorCircle extends Editor {
       radiusY: 0,
       x: pos.x,
       y: pos.y,
-      // do not scale strokes
-      strokeScaleEnabled: false,
       visible: false,
       // Start hidden
       stroke: this.currentAnnotation.style.color,

package/dist/runtime/annotation/engine/tools/free-highlight.js

@@ -22,8 +22,6 @@ export class EditorFreeHighlight extends Editor {
     this.getBgLayer().add(this.currentShapeGroup.konvaGroup);
     const pos = this.konvaStage.getRelativePointerPosition();
     this.line = new Konva.Line({
-      // do not scale strokes
-      strokeScaleEnabled: false,
       stroke: this.currentAnnotation.style.color,
       strokeWidth: this.currentAnnotation.style.strokeWidth,
       opacity: this.currentAnnotation.style.opacity,

package/dist/runtime/annotation/engine/tools/freehand.js

@@ -29,8 +29,6 @@ export class EditorFreeHand extends Editor {
     }
     const pos = this.konvaStage.getRelativePointerPosition();
     this.line = new Konva.Line({
-      // do not scale strokes
-      strokeScaleEnabled: false,
       stroke: this.currentAnnotation.style.color,
       // Set the line color
       strokeWidth: this.currentAnnotation.style.strokeWidth,

package/dist/runtime/annotation/engine/tools/rectangle.js

@@ -34,8 +34,6 @@ export class EditorRectangle extends Editor {
       y: pos.y,
       width: 0,
       height: 0,
-      // do not scale strokes
-      strokeScaleEnabled: false,
       visible: false,
       stroke: this.currentAnnotation.style.color,
       strokeWidth: this.currentAnnotation.style.strokeWidth || 2,

package/dist/runtime/annotation/engine/types.d.ts

@@ -84,7 +84,8 @@ export interface IAnnotationStyle {
 }
 export interface IAnnotationComment {
     id: string;
-    title: string;
+    /** Author name. Undefined when the host app didn't supply a `userName`. */
+    title?: string;
     date: string;
     content: string;
     status?: CommentStatus;
@@ -124,7 +125,8 @@ export interface IAnnotationStore {
     pageNumber: number;
     konvaString: string;
     konvaClientRect: IRect;
-    title: string;
+    /** Author name. Undefined when the host app didn't supply a `userName`. */
+    title?: string;
     type: AnnotationType;
     color?: string | null;
     subtype: PdfjsAnnotationSubtype;
@@ -192,6 +194,11 @@ export interface FormFieldDefinition {
     /** Signature-only: placeholder text shown on the unsigned widget.
      *  Defaults to 'Click to sign' when unset. */
     promptText?: string;
+    /** Signature-only: the source PDF already carries a digital signature
+     *  (`/V` is a `/Sig` dict) on this widget. The widget's appearance
+     *  stream is rasterized after parse and seeded as the field value so
+     *  the existing stamp is shown instead of the sign prompt. */
+    signedInSource?: boolean;
     /** Signature-only: when this signature is filled, lock other fields in
      *  the form so they can no longer be edited. Mirrors PDF spec
      *  /Lock /Action: 'all' locks every other field; 'include' locks only

package/dist/runtime/annotation/font-style.d.ts

@@ -20,4 +20,19 @@ export interface DecodedFontStyle {
     fontWeight: 'normal' | 'bold';
     fontStyle: 'normal' | 'italic';
 }
+export declare const FONT_BORDER_SIZE = 2;
+export declare const LINE_HEIGHT_FACTOR = 1.35;
+export declare const DEFAULT_FIELD_FONT_SIZE = 9;
+/**
+ * Compute the rendered font size (in PDF points) for a form field, matching
+ * pdf.js's `_setTextStyle` so text never gets clipped at the top/bottom of a
+ * short field. A declared size of 0 / undefined means the widget's `/DA` had
+ * no explicit size ("auto") — we fall back to 9pt before fitting, exactly
+ * like pdf.js. Single-line fields shrink the font to fit the field height;
+ * multi-line fields fit N lines of the declared size and shrink only if the
+ * per-line height is smaller than declared.
+ */
+export declare function computeFieldFontSize(declaredSize: number | undefined, rectHeightPts: number, opts?: {
+    multiLine?: boolean;
+}): number;
 export declare function decodeFontName(fontName: string | undefined): DecodedFontStyle;

package/dist/runtime/annotation/font-style.js

@@ -32,6 +32,25 @@ const DEFAULT_STYLE = {
   fontWeight: "normal",
   fontStyle: "normal"
 };
+export const FONT_BORDER_SIZE = 2;
+export const LINE_HEIGHT_FACTOR = 1.35;
+export const DEFAULT_FIELD_FONT_SIZE = 9;
+export function computeFieldFontSize(declaredSize, rectHeightPts, opts) {
+  const declared = declaredSize && declaredSize > 0 ? declaredSize : DEFAULT_FIELD_FONT_SIZE;
+  const rectHeight = Math.abs(rectHeightPts - FONT_BORDER_SIZE);
+  let size;
+  if (opts?.multiLine) {
+    const numberOfLines = Math.max(
+      1,
+      Math.round(rectHeight / (LINE_HEIGHT_FACTOR * declared))
+    );
+    const lineHeight = rectHeight / numberOfLines;
+    size = Math.min(declared, lineHeight / LINE_HEIGHT_FACTOR);
+  } else {
+    size = Math.min(declared, rectHeight / LINE_HEIGHT_FACTOR);
+  }
+  return Math.round(10 * size) / 10;
+}
 export function decodeFontName(fontName) {
   if (!fontName) return DEFAULT_STYLE;
   const name = fontName.startsWith("/") ? fontName.slice(1) : fontName;

package/dist/runtime/annotation/parsers/extractCheckboxStyles.d.ts

@@ -10,6 +10,14 @@ import type { CheckboxStyle } from '../engine/types.js';
  * wins.
  */
 export declare function extractCheckboxStyles(pdfBytes: Uint8Array | ArrayBuffer): Promise<Map<string, CheckboxStyle>>;
+/**
+ * Walk the AcroForm and collect the fully qualified names of signature
+ * fields that are already digitally signed (`/V` holds a `/Sig` dict).
+ * pdf.js deliberately nulls a signature widget's fieldValue before
+ * shipping it to the main thread (the `/Sig` dict is non-serializable),
+ * so the signed state is only reachable through this side-channel parse.
+ */
+export declare function extractSignedSignatureNames(pdfBytes: Uint8Array | ArrayBuffer): Promise<Set<string>>;
 /**
  * Walk the AcroForm and extract push-button captions from `/MK /CA`.
  * pdf.js exposes neither the caption nor a button label, so without this

package/dist/runtime/annotation/parsers/extractCheckboxStyles.js

@@ -1,4 +1,4 @@
-import { PDFButton, PDFCheckBox, PDFDocument, PDFDict, PDFHexString, PDFName, PDFString } from "pdf-lib";
+import { PDFButton, PDFCheckBox, PDFDocument, PDFDict, PDFHexString, PDFName, PDFSignature, PDFString } from "pdf-lib";
 import { captionToStyle } from "../checkbox-styles.js";
 export async function extractCheckboxStyles(pdfBytes) {
   const out = /* @__PURE__ */ new Map();
@@ -38,6 +38,29 @@ export async function extractCheckboxStyles(pdfBytes) {
   }
   return out;
 }
+export async function extractSignedSignatureNames(pdfBytes) {
+  const out = /* @__PURE__ */ new Set();
+  let doc;
+  try {
+    doc = await PDFDocument.load(pdfBytes, { ignoreEncryption: true });
+  } catch {
+    return out;
+  }
+  let form;
+  try {
+    form = doc.getForm();
+  } catch {
+    return out;
+  }
+  for (const field of form.getFields()) {
+    if (!(field instanceof PDFSignature)) continue;
+    const name = field.getName();
+    if (!name) continue;
+    const value = field.acroField.getInheritableAttribute(PDFName.of("V"));
+    if (value != null) out.add(name);
+  }
+  return out;
+}
 export async function extractButtonCaptions(pdfBytes) {
   const out = /* @__PURE__ */ new Map();
   let doc;

package/dist/runtime/annotation/pdf-export/annotation-flags.d.ts

@@ -0,0 +1,8 @@
+import { PDFNumber } from 'pdf-lib';
+/** /F entry for exported annotations: visible AND printed (PDF 32000-1 §12.5.3).
+ *  Annotations without the Print bit are silently dropped from print output,
+ *  so every exporter must set this on each annotation dict it creates. */
+export declare const PRINT_FLAG: PDFNumber;
+/** Print + Locked — stamps stay printable but can't be moved/deleted in
+ *  other viewers, matching the previous Locked-only behavior. */
+export declare const PRINT_LOCKED_FLAG: PDFNumber;

package/dist/runtime/annotation/pdf-export/annotation-flags.js

@@ -0,0 +1,5 @@
+import { AnnotationFlags, PDFNumber } from "pdf-lib";
+export const PRINT_FLAG = PDFNumber.of(AnnotationFlags.Print);
+export const PRINT_LOCKED_FLAG = PDFNumber.of(
+  AnnotationFlags.Print | AnnotationFlags.Locked
+);

package/dist/runtime/annotation/pdf-export/export-form-fields.js

@@ -272,7 +272,9 @@ async function createSignatureField(pdfDoc, page, def, fv) {
     Rect: [x1, y1, x2, y2],
     P: page.ref,
     Parent: fieldRef,
-    F: 1 << AnnotationFlags.Print,
+    // AnnotationFlags.Print is already the bit value (4) — shifting it
+    // again would yield 16 = NoZoom.
+    F: AnnotationFlags.Print,
     AP: { N: appearanceRef }
   });
   const widgetRef = context.register(widgetDict);

package/dist/runtime/annotation/pdf-export/export.js

@@ -2,6 +2,7 @@ import { degrees, PDFArray, PDFDict, PDFDocument, PDFName, PDFRef, PDFString } f
 import { PdfjsAnnotationType } from "../engine/types.js";
 import { pageTransformFromPdfLibPage } from "../pdf-import/transform.js";
 import { writeFormFieldsToPdf } from "./export-form-fields.js";
+import { getUnicodeFont } from "./unicode-font.js";
 import { CircleParser } from "./parse_circle.js";
 import { FreeTextParser } from "./parse_freetext.js";
 import { HighlightParser } from "./parse_highlight.js";
@@ -124,13 +125,13 @@ function removeOwnedAnnotations(pdfDoc, ownedIds, deletedIds) {
     page.node.set(annotsKey, context.obj(kept));
   }
 }
-async function parseAnnotationToPdf(annotation, page, pdfDoc) {
+async function parseAnnotationToPdf(annotation, page, pdfDoc, isModifiedOriginal) {
   const ParserClass = parserMap[annotation.pdfjsType];
   if (!ParserClass) {
     console.warn(`Unsupported annotation type for PDF export: ${annotation.pdfjsType}`);
     return;
   }
-  const parser = new ParserClass(pdfDoc, page, annotation);
+  const parser = new ParserClass(pdfDoc, page, annotation, isModifiedOriginal);
   await parser.parse();
 }
 async function embedDataUrlImage(pdfDoc, dataUrl) {
@@ -296,8 +297,20 @@ export async function exportAnnotationsToPdf({
         console.warn(`Skipping annotation ${annotation.id}; page ${annotation.pageNumber} missing`);
         continue;
       }
-      await parseAnnotationToPdf(annotation, page, pdfDoc);
+      const isModifiedOriginal = originalAnnotationIds?.has(annotation.id) ?? false;
+      await parseAnnotationToPdf(annotation, page, pdfDoc, isModifiedOriginal);
     }
   }
-  return pdfDoc.save();
+  return savePdf(pdfDoc);
+}
+async function savePdf(pdfDoc) {
+  try {
+    return await pdfDoc.save();
+  } catch (err) {
+    const message = err instanceof Error ? err.message : "";
+    if (!/cannot encode/i.test(message)) throw err;
+    const font = await getUnicodeFont(pdfDoc);
+    pdfDoc.getForm().updateFieldAppearances(font);
+    return pdfDoc.save({ updateFieldAppearances: false });
+  }
 }

package/dist/runtime/annotation/pdf-export/parse.d.ts

@@ -4,7 +4,28 @@ export declare abstract class AnnotationParser {
     protected annotation: IAnnotationStore;
     protected page: PDFPage;
     protected pdfDoc: PDFDocument;
-    constructor(pdfDoc: PDFDocument, page: PDFPage, annotation: IAnnotationStore);
+    /**
+     * Whether this annotation already existed in the source PDF and is being
+     * rewritten because the user edited it. Drives the date key, mirroring
+     * pdf.js: `CreationDate` for newly authored annotations, `M` (modification
+     * date) for edits to pre-existing ones.
+     */
+    protected isModifiedOriginal: boolean;
+    constructor(pdfDoc: PDFDocument, page: PDFPage, annotation: IAnnotationStore, isModifiedOriginal?: boolean);
+    /**
+     * Owner (`/T`) and date entries shared by every markup annotation and its
+     * reply comments. We align with pdf.js / Firefox here:
+     *
+     * - `/T` (author) is written ONLY when a real author name is present. When
+     *   the host app doesn't supply a `userName`, no `/T` is emitted — so
+     *   archiving systems have no author to burn into the rendered preview.
+     *   (kviewer previously always wrote `/T`, defaulting to "User".)
+     * - The date goes to `/CreationDate` for newly authored annotations and to
+     *   `/M` when an existing annotation was edited.
+     *
+     * Spread the result into the annotation's dict literal before `context.obj`.
+     */
+    protected ownerDateEntries(title: string | undefined, date: string | undefined): Record<string, unknown>;
     protected addAnnotationToPage(page: PDFPage, annotRef: PDFRef): void;
     abstract parse(): Promise<void>;
 }

package/dist/runtime/annotation/pdf-export/parse.js

@@ -1,12 +1,42 @@
-import { PDFName } from "pdf-lib";
+import { PDFName, PDFString } from "pdf-lib";
+import { stringToPDFHexString } from "../engine/utils.js";
 export class AnnotationParser {
   annotation;
   page;
   pdfDoc;
-  constructor(pdfDoc, page, annotation) {
+  /**
+   * Whether this annotation already existed in the source PDF and is being
+   * rewritten because the user edited it. Drives the date key, mirroring
+   * pdf.js: `CreationDate` for newly authored annotations, `M` (modification
+   * date) for edits to pre-existing ones.
+   */
+  isModifiedOriginal;
+  constructor(pdfDoc, page, annotation, isModifiedOriginal = false) {
     this.pdfDoc = pdfDoc;
     this.page = page;
     this.annotation = annotation;
+    this.isModifiedOriginal = isModifiedOriginal;
+  }
+  /**
+   * Owner (`/T`) and date entries shared by every markup annotation and its
+   * reply comments. We align with pdf.js / Firefox here:
+   *
+   * - `/T` (author) is written ONLY when a real author name is present. When
+   *   the host app doesn't supply a `userName`, no `/T` is emitted — so
+   *   archiving systems have no author to burn into the rendered preview.
+   *   (kviewer previously always wrote `/T`, defaulting to "User".)
+   * - The date goes to `/CreationDate` for newly authored annotations and to
+   *   `/M` when an existing annotation was edited.
+   *
+   * Spread the result into the annotation's dict literal before `context.obj`.
+   */
+  ownerDateEntries(title, date) {
+    const entries = {};
+    if (title) entries.T = stringToPDFHexString(title);
+    if (date) {
+      entries[this.isModifiedOriginal ? "M" : "CreationDate"] = PDFString.of(date);
+    }
+    return entries;
   }
   addAnnotationToPage(page, annotRef) {
     const annots = page.node.lookup(PDFName.of("Annots"));

package/dist/runtime/annotation/pdf-export/parse_circle.js

@@ -3,7 +3,7 @@ import { convertKonvaRectToPdfRect, rgbToPdfColor, stringToPDFHexString } from "
 import { pageTransformFromPdfLibPage } from "../pdf-import/transform.js";
 import { AnnotationParser } from "./parse.js";
 import { computeBoundsFromKonvaString } from "./parse_utils.js";
-const UNKNOWN_USER = "Unknown user";
+import { PRINT_FLAG } from "./annotation-flags.js";
 export class CircleParser extends AnnotationParser {
   async parse() {
     const { annotation, page, pdfDoc } = this;
@@ -14,11 +14,11 @@ export class CircleParser extends AnnotationParser {
     const mainAnn = context.obj({
       Type: PDFName.of("Annot"),
       Subtype: PDFName.of("Circle"),
+      F: PRINT_FLAG,
       Rect: rect,
       C: rgbToPdfColor(annotation.color || void 0),
-      T: stringToPDFHexString(annotation.title || UNKNOWN_USER),
+      ...this.ownerDateEntries(annotation.title, annotation.date),
       Contents: stringToPDFHexString(annotation.contentsObj?.text || ""),
-      M: PDFString.of(annotation.date || ""),
       NM: PDFString.of(annotation.id),
       Border: [0, 0, 1]
     });
@@ -28,10 +28,10 @@ export class CircleParser extends AnnotationParser {
       const replyAnn = context.obj({
         Type: PDFName.of("Annot"),
         Subtype: PDFName.of("Text"),
+        F: PRINT_FLAG,
         Rect: rect,
         Contents: stringToPDFHexString(comment.content),
-        T: stringToPDFHexString(comment.title || UNKNOWN_USER),
-        M: PDFString.of(comment.date || ""),
+        ...this.ownerDateEntries(comment.title, comment.date),
         C: rgbToPdfColor(annotation.color || void 0),
         IRT: mainAnnRef,
         RT: PDFName.of("R"),

package/dist/runtime/annotation/pdf-export/parse_freetext.js

@@ -3,7 +3,9 @@ import { convertKonvaRectToPdfRect, rgbToPdfColor, stringToPDFHexString } from "
 import { convertCanvasRectToPdf, pageTransformFromPdfLibPage } from "../pdf-import/transform.js";
 import { AnnotationParser } from "./parse.js";
 import { formAppearanceMatrix } from "./parse_utils.js";
-const UNKNOWN_USER = "Unknown user";
+import { encodeWinAnsi, isWinAnsiEncodable } from "./winansi.js";
+import { getUnicodeFont } from "./unicode-font.js";
+import { PRINT_FLAG } from "./annotation-flags.js";
 function formatPdfNumber(value) {
   if (!Number.isFinite(value)) return "0";
   return Number(value.toFixed(3)).toString();
@@ -63,41 +65,50 @@ export class FreeTextParser extends AnnotationParser {
     ];
     const appearanceWidth = Math.max(1, textWidth);
     const appearanceHeight = Math.max(1, textHeight);
+    const useUnicodeFont = !isWinAnsiEncodable(text);
+    let unicodeFont = null;
+    if (useUnicodeFont) {
+      unicodeFont = await getUnicodeFont(pdfDoc);
+    }
+    const fontResourceName = useUnicodeFont ? "FUni" : "Helvetica";
     const commands = ["q"];
     for (let i = 0; i < lines.length; i++) {
       const line = lines[i] ?? "";
       if (line.length === 0 && i < lines.length - 1) continue;
       const lineY = appearanceHeight - (i + 0.8) * lineHeight;
       let lineX = 0;
-      if (quadding === 1) {
-        const lineWidth = line.length * estimatedCharWidth;
-        lineX = Math.max(0, (appearanceWidth - lineWidth) / 2);
-      } else if (quadding === 2) {
-        const lineWidth = line.length * estimatedCharWidth;
-        lineX = Math.max(0, appearanceWidth - lineWidth);
+      if (quadding === 1 || quadding === 2) {
+        const lineWidth = unicodeFont ? unicodeFont.widthOfTextAtSize(line, fontSize) : line.length * estimatedCharWidth;
+        lineX = quadding === 1 ? Math.max(0, (appearanceWidth - lineWidth) / 2) : Math.max(0, appearanceWidth - lineWidth);
       }
+      const showText = unicodeFont ? `${unicodeFont.encodeText(line).toString()} Tj` : `(${escapePdfString(line)}) Tj`;
       commands.push(
         "BT",
-        `/Helvetica ${formatPdfNumber(fontSize)} Tf`,
+        `/${fontResourceName} ${formatPdfNumber(fontSize)} Tf`,
         `${formatPdfNumber(r)} ${formatPdfNumber(g)} ${formatPdfNumber(b)} rg`,
         `${formatPdfNumber(lineX)} ${formatPdfNumber(lineY)} Td`,
-        `(${escapePdfString(line)}) Tj`,
+        showText,
         "ET"
       );
     }
     commands.push("Q");
-    const fontDict = context.obj({
-      Type: PDFName.of("Font"),
-      Subtype: PDFName.of("Type1"),
-      BaseFont: PDFName.of("Helvetica"),
-      Encoding: PDFName.of("WinAnsiEncoding")
-    });
-    const fontRef = context.register(fontDict);
+    let fontResourceRef;
+    if (unicodeFont) {
+      fontResourceRef = unicodeFont.ref;
+    } else {
+      fontResourceRef = context.register(context.obj({
+        Type: PDFName.of("Font"),
+        Subtype: PDFName.of("Type1"),
+        BaseFont: PDFName.of("Helvetica"),
+        Encoding: PDFName.of("WinAnsiEncoding")
+      }));
+    }
     const appearanceMatrix = formAppearanceMatrix(
       pageTransform.rotation,
       appearanceWidth,
       appearanceHeight
     );
+    const streamBytes = unicodeFont ? new TextEncoder().encode(commands.join("\n")) : encodeWinAnsi(commands.join("\n"));
     const appearanceStream = PDFRawStream.of(
       context.obj({
         Type: PDFName.of("XObject"),
@@ -105,10 +116,10 @@ export class FreeTextParser extends AnnotationParser {
         BBox: context.obj([0, 0, appearanceWidth, appearanceHeight]),
         Matrix: context.obj(appearanceMatrix.map((n) => PDFNumber.of(n))),
         Resources: context.obj({
-          Font: context.obj({ Helvetica: fontRef })
+          Font: context.obj({ [fontResourceName]: fontResourceRef })
         })
       }),
-      new TextEncoder().encode(commands.join("\n"))
+      streamBytes
     );
     const appearanceRef = context.register(appearanceStream);
     const ap = context.obj({ N: appearanceRef });
@@ -116,17 +127,15 @@ export class FreeTextParser extends AnnotationParser {
     const mainAnn = context.obj({
       Type: PDFName.of("Annot"),
       Subtype: PDFName.of("FreeText"),
+      F: PRINT_FLAG,
       Rect: rect,
       NM: PDFString.of(annotation.id),
       Contents: stringToPDFHexString(text),
       DA: PDFString.of(da),
       Q: PDFNumber.of(quadding),
-      T: stringToPDFHexString(annotation.title || UNKNOWN_USER),
-      M: PDFString.of(annotation.date || ""),
+      ...this.ownerDateEntries(annotation.title, annotation.date),
       C: context.obj(rgbToPdfColor(annotation.color || void 0)),
       Border: context.obj([0, 0, 0]),
-      F: PDFNumber.of(4),
-      // Print flag
       AP: ap
     });
     const mainAnnRef = context.register(mainAnn);
@@ -135,10 +144,10 @@ export class FreeTextParser extends AnnotationParser {
       const replyAnn = context.obj({
         Type: PDFName.of("Annot"),
         Subtype: PDFName.of("Text"),
+        F: PRINT_FLAG,
         Rect: convertKonvaRectToPdfRect(annotation.konvaClientRect, pageTransform),
         Contents: stringToPDFHexString(comment.content),
-        T: stringToPDFHexString(comment.title || UNKNOWN_USER),
-        M: PDFString.of(comment.date || ""),
+        ...this.ownerDateEntries(comment.title, comment.date),
         C: context.obj(rgbToPdfColor(annotation.color || void 0)),
         IRT: mainAnnRef,
         RT: PDFName.of("R"),

package/dist/runtime/annotation/pdf-export/parse_highlight.js

@@ -6,7 +6,7 @@ import {
   pageTransformFromPdfLibPage
 } from "../pdf-import/transform.js";
 import { AnnotationParser } from "./parse.js";
-const UNKNOWN_USER = "Unknown user";
+import { PRINT_FLAG } from "./annotation-flags.js";
 function formatPdfNumber(value) {
   if (!Number.isFinite(value)) return "0";
   return Number(value.toFixed(3)).toString();
@@ -115,12 +115,12 @@ export class HighlightParser extends AnnotationParser {
     const mainAnn = context.obj({
       Type: PDFName.of("Annot"),
       Subtype: PDFName.of("Highlight"),
+      F: PRINT_FLAG,
       Rect: rect,
       QuadPoints: context.obj(quadPoints),
       C: context.obj(color),
-      T: stringToPDFHexString(annotation.title || UNKNOWN_USER),
+      ...this.ownerDateEntries(annotation.title, annotation.date),
       Contents: stringToPDFHexString(annotation.contentsObj?.text || ""),
-      M: PDFString.of(annotation.date || ""),
       NM: PDFString.of(annotation.id),
       CA: PDFNumber.of(0.5),
       AP: ap
@@ -131,10 +131,10 @@ export class HighlightParser extends AnnotationParser {
       const replyAnn = context.obj({
         Type: PDFName.of("Annot"),
         Subtype: PDFName.of("Text"),
+        F: PRINT_FLAG,
         Rect: convertKonvaRectToPdfRect(annotation.konvaClientRect, pageTransform),
         Contents: stringToPDFHexString(comment.content),
-        T: stringToPDFHexString(comment.title || UNKNOWN_USER),
-        M: PDFString.of(comment.date || ""),
+        ...this.ownerDateEntries(comment.title, comment.date),
         C: rgbToPdfColor(annotation.color || void 0),
         IRT: mainAnnRef,
         RT: PDFName.of("R"),

package/dist/runtime/annotation/pdf-export/parse_ink.js

@@ -2,7 +2,7 @@ import { PDFName, PDFNumber, PDFRawStream, PDFString } from "pdf-lib";
 import { convertKonvaRectToPdfRect, rgbToPdfColor, stringToPDFHexString } from "../engine/utils.js";
 import { convertCanvasPointToPdf, pageTransformFromPdfLibPage } from "../pdf-import/transform.js";
 import { AnnotationParser } from "./parse.js";
-const UNKNOWN_USER = "Unknown user";
+import { PRINT_FLAG } from "./annotation-flags.js";
 function formatPdfNumber(value) {
   if (!Number.isFinite(value)) return "0";
   return Number(value.toFixed(3)).toString();
@@ -45,7 +45,8 @@ export class InkParser extends AnnotationParser {
       transformedPaths.map((path) => context.obj(path))
     );
     const firstLine = lines[0]?.attrs || {};
-    const strokeWidth = firstLine.strokeWidth ?? 1;
+    const strokeScale = (Math.abs(scaleX) + Math.abs(scaleY)) / 2;
+    const strokeWidth = (firstLine.strokeWidth ?? 1) * strokeScale;
     const opacity = firstLine.opacity ?? 1;
     const color = firstLine.stroke ?? annotation.color ?? "rgb(255, 0, 0)";
     const [r, g, b] = rgbToPdfColor(color);
@@ -120,12 +121,12 @@ export class InkParser extends AnnotationParser {
     const mainAnn = context.obj({
       Type: PDFName.of("Annot"),
       Subtype: PDFName.of("Ink"),
+      F: PRINT_FLAG,
       Rect: rect,
       InkList: inkList,
       C: context.obj([PDFNumber.of(r), PDFNumber.of(g), PDFNumber.of(b)]),
-      T: stringToPDFHexString(annotation.title || UNKNOWN_USER),
+      ...this.ownerDateEntries(annotation.title, annotation.date),
       Contents: stringToPDFHexString(annotation.contentsObj?.text || ""),
-      M: PDFString.of(annotation.date || ""),
       NM: PDFString.of(annotation.id),
       Border: context.obj([0, 0, 0]),
       BS: bs,
@@ -138,10 +139,10 @@ export class InkParser extends AnnotationParser {
       const replyAnn = context.obj({
         Type: PDFName.of("Annot"),
         Subtype: PDFName.of("Text"),
+        F: PRINT_FLAG,
         Rect: convertKonvaRectToPdfRect(annotation.konvaClientRect, pageTransform),
         Contents: stringToPDFHexString(comment.content),
-        T: stringToPDFHexString(comment.title || UNKNOWN_USER),
-        M: PDFString.of(comment.date || ""),
+        ...this.ownerDateEntries(comment.title, comment.date),
         C: context.obj([PDFNumber.of(r), PDFNumber.of(g), PDFNumber.of(b)]),
         IRT: mainAnnRef,
         RT: PDFName.of("R"),

package/dist/runtime/annotation/pdf-export/parse_line.js

@@ -2,7 +2,7 @@ import { PDFName, PDFNumber, PDFRawStream, PDFString } from "pdf-lib";
 import { convertKonvaRectToPdfRect, rgbToPdfColor, stringToPDFHexString } from "../engine/utils.js";
 import { convertCanvasPointToPdf, pageTransformFromPdfLibPage } from "../pdf-import/transform.js";
 import { AnnotationParser } from "./parse.js";
-const UNKNOWN_USER = "Unknown user";
+import { PRINT_FLAG } from "./annotation-flags.js";
 function formatPdfNumber(value) {
   if (!Number.isFinite(value)) return "0";
   return Number(value.toFixed(3)).toString();
@@ -39,7 +39,8 @@ export class LineParser extends AnnotationParser {
       transformedPaths.map((path) => context.obj(path))
     );
     const firstLine = lines[0]?.attrs || {};
-    const strokeWidth = firstLine.strokeWidth ?? 1;
+    const strokeScale = (Math.abs(scaleX) + Math.abs(scaleY)) / 2;
+    const strokeWidth = (firstLine.strokeWidth ?? 1) * strokeScale;
     const opacity = firstLine.opacity ?? 1;
     const color = firstLine.stroke ?? annotation.color ?? "rgb(255, 0, 0)";
     const [r, g, b] = rgbToPdfColor(color);
@@ -158,12 +159,12 @@ export class LineParser extends AnnotationParser {
     const mainAnn = context.obj({
       Type: PDFName.of("Annot"),
       Subtype: PDFName.of("Ink"),
+      F: PRINT_FLAG,
       Rect: rect,
       InkList: inkList,
       C: context.obj([PDFNumber.of(r), PDFNumber.of(g), PDFNumber.of(b)]),
-      T: stringToPDFHexString(annotation.title || UNKNOWN_USER),
+      ...this.ownerDateEntries(annotation.title, annotation.date),
       Contents: stringToPDFHexString(annotation.contentsObj?.text || ""),
-      M: PDFString.of(annotation.date || ""),
       NM: PDFString.of(annotation.id),
       Border: context.obj([0, 0, 0]),
       BS: bs,
@@ -176,10 +177,10 @@ export class LineParser extends AnnotationParser {
       const replyAnn = context.obj({
         Type: PDFName.of("Annot"),
         Subtype: PDFName.of("Text"),
+        F: PRINT_FLAG,
         Rect: convertKonvaRectToPdfRect(annotation.konvaClientRect, pageTransform),
         Contents: stringToPDFHexString(comment.content),
-        T: stringToPDFHexString(comment.title || UNKNOWN_USER),
-        M: PDFString.of(comment.date || ""),
+        ...this.ownerDateEntries(comment.title, comment.date),
         C: context.obj([PDFNumber.of(r), PDFNumber.of(g), PDFNumber.of(b)]),
         IRT: mainAnnRef,
         RT: PDFName.of("R"),