@quillmark/quillify 0.3.0 → 0.4.0

package/dist/xfa.js

@@ -44,8 +44,9 @@ export async function xfaToAcroForm(bytes, signal) {
             for (const span of laid.layer.querySelectorAll('.xfaPageCount'))
                 span.textContent = String(pdf.numPages);
             const list = displayList(laid, number);
-            for (const { image } of list.pictures)
-                pixels += image.naturalWidth * image.naturalHeight;
+            for (const item of list.drawn)
+                if ('image' in item)
+                    pixels += item.image.naturalWidth * item.image.naturalHeight;
             if (pixels > MAX_PICTURE_PIXELS)
                 throw new Refused({
                     code: 'unpaintable',
@@ -73,7 +74,36 @@ export async function xfaToAcroForm(bytes, signal) {
 /** PDF's origin is bottom-left; every primitive arrives top-left. */
 async function paint(page, pageNumber, list, font) {
     const H = list.height;
-    for (let box of list.boxes) {
+    for (const item of list.drawn) {
+        if ('text' in item) {
+            await drawRun(page, pageNumber, item, H, font);
+            continue;
+        }
+        if ('image' in item) {
+            const { x, y, w, h, image } = item;
+            // The pixels are read off a canvas of the host page's. The frame's policy
+            // governs what its document loads, and the picture is of the page's origin.
+            const canvas = document.createElement('canvas');
+            canvas.width = image.naturalWidth;
+            canvas.height = image.naturalHeight;
+            canvas.getContext('2d').drawImage(image, 0, 0);
+            const png = canvas.toDataURL('image/png');
+            // What a canvas with a side the browser will not make gives.
+            if (png === 'data:,')
+                throw new Refused({ code: 'unpaintable', page: pageNumber - 1, construct: 'image' });
+            page.drawImage(await page.doc.embedPng(png), { x, y: H - y - h, width: w, height: h });
+            continue;
+        }
+        if ('x1' in item) {
+            page.drawLine({
+                start: { x: item.x1, y: H - item.y1 },
+                end: { x: item.x2, y: H - item.y2 },
+                thickness: item.width,
+                color: rgb(...item.colour)
+            });
+            continue;
+        }
+        let box = item;
         if (box.radius) {
             // An SVG rect's outline runs along the middle of its stroke, and each
             // radius stops at half the side it lies along.
@@ -125,27 +155,6 @@ async function paint(page, pageNumber, list, font) {
         if (right)
             seg(box.x + box.w - right.width / 2, box.y, box.x + box.w - right.width / 2, box.y + box.h, right);
     }
-    for (const { x, y, w, h, image } of list.pictures) {
-        // The pixels are read off a canvas of the host page's. The frame's policy
-        // governs what its document loads, and the picture is of the page's origin.
-        const canvas = document.createElement('canvas');
-        canvas.width = image.naturalWidth;
-        canvas.height = image.naturalHeight;
-        canvas.getContext('2d').drawImage(image, 0, 0);
-        const png = canvas.toDataURL('image/png');
-        // What a canvas with a side the browser will not make gives.
-        if (png === 'data:,')
-            throw new Refused({ code: 'unpaintable', page: pageNumber - 1, construct: 'image' });
-        page.drawImage(await page.doc.embedPng(png), { x, y: H - y - h, width: w, height: h });
-    }
-    for (const line of list.lines)
-        page.drawLine({
-            start: { x: line.x1, y: H - line.y1 },
-            end: { x: line.x2, y: H - line.y2 },
-            thickness: line.width,
-            color: rgb(...line.colour)
-        });
-    return drawRuns(page, pageNumber, list.runs, H, font);
 }
 /**
  * The dash and the gap the browser paints along a dashed edge, or nothing for
@@ -168,53 +177,71 @@ function dashes(width, length) {
     const [wide, narrow] = [fit(count), fit(count + 1)];
     return [dash, narrow <= 0 || Math.abs(wide - gap) < Math.abs(narrow - gap) ? wide : narrow];
 }
-async function drawRuns(page, pageNumber, runs, H, get) {
-    for (const run of runs) {
-        const font = await get(standard14(run));
-        // The standard-14 fonts encode WinAnsi alone. Dropping the run would lose a
-        // line of the form without anything reporting it.
-        const encodable = font.getCharacterSet();
-        if ([...run.text].some((char) => !encodable.includes(char.codePointAt(0))))
+/** The standard fonts that hold what the text fonts lack, in the order a character is looked for. */
+const SYMBOLS = [StandardFonts.Symbol, StandardFonts.ZapfDingbats];
+async function drawRun(page, pageNumber, run, H, get) {
+    const font = await get(standard14(run));
+    // The standard-14 text fonts encode WinAnsi alone. U+2010 and U+2011 are
+    // drawn as its hyphen, and any other character outside it in the first of
+    // SYMBOLS that holds it. A soft hyphen is left out: WinAnsi has it as a
+    // hyphen, and the browser lays it out at no width and shows nothing. The
+    // one it breaks a line at is a hyphen in the run already.
+    // Dropping the run would lose a line of the form without anything
+    // reporting it.
+    // pdf-lib kerns the width it measures and writes no kerning, so the width
+    // it draws a run at is the sum of the widths of its characters.
+    const parts = [];
+    let natural = 0;
+    for (const char of run.text.replaceAll('\u00ad', '').replace(/[\u2010\u2011]/g, '-')) {
+        const code = char.codePointAt(0);
+        let face = font;
+        for (const name of SYMBOLS)
+            if (!face.getCharacterSet().includes(code))
+                face = await get(name);
+        if (!face.getCharacterSet().includes(code))
             throw new Refused({
                 code: 'unpaintable',
                 page: pageNumber - 1,
                 construct: 'glyph',
                 detail: run.text.slice(0, 40)
             });
-        // The standard-14 substitute's advances differ from the embedded face's.
-        // Letter spacing goes in first, since it is a real property of the run;
-        // horizontal scaling then pins the whole run to the width the browser
-        // measured, so the error stays inside the run instead of drifting across
-        // the line.
-        // pdf-lib kerns the width it measures and writes no kerning, so the width
-        // it draws a run at is the sum of the widths of its characters.
-        let natural = 0;
-        for (const char of run.text)
-            natural += font.widthOfTextAtSize(char, run.size);
-        const spaced = natural + run.letterSpacing * Math.max(0, run.text.length - 1);
-        const scale = spaced > 0 && run.width > 0 ? Math.max(50, Math.min(200, (100 * run.width) / spaced)) : 100;
-        const scaled = Math.abs(scale - 100) > 3;
-        // Both are text-state parameters, so they persist across drawText's own
-        // BT/ET and have to be put back.
-        if (run.letterSpacing)
-            page.pushOperators(PDFOperator.of(PDFOperatorNames.SetCharacterSpacing, [
-                String(+run.letterSpacing.toFixed(4))
-            ]));
-        if (scaled)
-            page.pushOperators(PDFOperator.of(PDFOperatorNames.SetTextHorizontalScaling, [String(+scale.toFixed(3))]));
-        page.drawText(run.text, {
-            x: run.x,
-            y: H - run.baseline,
+        const last = parts.at(-1);
+        if (last?.font === face)
+            last.text += char;
+        else
+            parts.push({ font: face, text: char, at: natural });
+        natural += face.widthOfTextAtSize(char, run.size) + run.letterSpacing;
+    }
+    // The standard-14 substitute's advances differ from the embedded face's.
+    // Letter spacing goes in first, since it is a real property of the run;
+    // horizontal scaling then pins the whole run to the width the browser
+    // measured, so the error stays inside the run instead of drifting across
+    // the line.
+    const spaced = natural - run.letterSpacing;
+    const scale = spaced > 0 && run.width > 0 ? Math.max(50, Math.min(200, (100 * run.width) / spaced)) : 100;
+    const scaled = Math.abs(scale - 100) > 3;
+    // Both are text-state parameters, so they persist across drawText's own
+    // BT/ET and have to be put back.
+    if (run.letterSpacing)
+        page.pushOperators(PDFOperator.of(PDFOperatorNames.SetCharacterSpacing, [String(+run.letterSpacing.toFixed(4))]));
+    if (scaled)
+        page.pushOperators(PDFOperator.of(PDFOperatorNames.SetTextHorizontalScaling, [String(+scale.toFixed(3))]));
+    const angle = (Math.PI / 2) * (run.turn ?? 0);
+    for (const part of parts) {
+        const along = scaled ? (part.at * scale) / 100 : part.at;
+        page.drawText(part.text, {
+            x: run.x + along * Math.cos(angle),
+            y: H - run.baseline + along * Math.sin(angle),
             size: run.size,
-            font,
+            font: part.font,
             color: rgb(...run.colour),
             rotate: degrees(90 * (run.turn ?? 0))
         });
-        if (scaled)
-            page.pushOperators(PDFOperator.of(PDFOperatorNames.SetTextHorizontalScaling, ['100']));
-        if (run.letterSpacing)
-            page.pushOperators(PDFOperator.of(PDFOperatorNames.SetCharacterSpacing, ['0']));
     }
+    if (scaled)
+        page.pushOperators(PDFOperator.of(PDFOperatorNames.SetTextHorizontalScaling, ['100']));
+    if (run.letterSpacing)
+        page.pushOperators(PDFOperator.of(PDFOperatorNames.SetCharacterSpacing, ['0']));
 }
 function standard14(run) {
     const family = run.family.toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@quillmark/quillify",
-	"version": "0.3.0",
+	"version": "0.4.0",
 	"description": "Turn a published PDF form (AcroForm or XFA) into a Quillmark quill, in the browser.",
 	"type": "module",
 	"license": "Apache-2.0",
@@ -48,9 +48,10 @@
 	},
 	"devDependencies": {
 		"@neslinesli93/qpdf-wasm": "0.3.0",
-		"@quillmark/wasm": "0.124.0",
+		"@quillmark/wasm": "0.125.0",
 		"@types/node": "24.19.0",
 		"@vitest/browser-playwright": "5.0.2",
+		"fast-check": "4.10.2",
 		"playwright": "1.63.0",
 		"prettier": "3.9.9",
 		"typescript": "6.0.3",