gutterpress 0.11.20-alpha.2 → 0.11.20-alpha.4

package/dist/{cli-j802s31j.js → cli-61vd4ews.js}

@@ -567,14 +567,15 @@ function specificity(r) {
   return (r.name ? 2 : 0) + r.pseudos.length;
 }
 
-// src/engine/shared/flush.ts
-var FLUSH_EDGES = ["top", "right", "bottom", "left"];
-function flushKey(edges) {
-  return FLUSH_EDGES.filter((e) => edges.includes(e)).map((e) => e[0]).join("");
+// src/engine/shared/pin-edges.ts
+var PIN_EDGES = ["top", "right", "bottom", "left"];
+var EDGE_PIN_SELECTOR = PIN_EDGES.map((edge) => `.gp-pin.gp-${edge}`).join(", ");
+function pinKey(edges) {
+  return PIN_EDGES.filter((e) => edges.includes(e)).map((e) => e[0]).join("");
 }
-function flushPageName(authorPage, edges) {
+function pinPageName(authorPage, edges) {
   const safe = authorPage ? authorPage.replace(/[^A-Za-z0-9_-]/g, "_") : "";
-  return `gp--flush${safe ? `-${safe}` : ""}-${flushKey(edges)}`;
+  return `gp--pin${safe ? `-${safe}` : ""}-${pinKey(edges)}`;
 }
 function flushMargins(margin, edges) {
   return {
@@ -584,6 +585,23 @@ function flushMargins(margin, edges) {
     left: edges.includes("left") ? 0 : margin.left
   };
 }
+function pinInsets(area, side, edges) {
+  const binding = side === "recto" ? "left" : "right";
+  const inset = (edge) => !area || !edges.includes(edge) ? 0 : edge === binding ? area.safe : area.bleed + area.artSafe;
+  return { top: inset("top"), right: inset("right"), bottom: inset("bottom"), left: inset("left") };
+}
+var NO_PADDING = { top: 0, right: 0, bottom: 0, left: 0 };
+function pinRootStyle(margin, area, side, edges, padding = NO_PADDING) {
+  const px = (pt) => pt * 96 / 72;
+  const inset = pinInsets(area, side, edges);
+  const style = { "box-decoration-break": "clone" };
+  for (const edge of PIN_EDGES)
+    if (edges.includes(edge))
+      style[`padding-${edge}`] = `${px(margin[edge]) + padding[edge]}px`;
+  for (const edge of PIN_EDGES)
+    style[`--gp-pin-${edge}`] = `${px(inset[edge])}px`;
+  return style;
+}
 function marginBoxesOnEdges(edges) {
   const owners = {
     "top-left-corner": ["top", "left"],
@@ -1116,7 +1134,7 @@ import { fileURLToPath } from "node:url";
 var favicon_default = "./favicon-272ga6y0.ico";
 
 // src/assets/manifest.schema.json
-var manifest_schema_default = "./manifest.schema-74s1ykyv.json";
+var manifest_schema_default = "./manifest.schema-13dfax80.json";
 
 // src/assets/preview/scripts/preview-interface.js
 var preview_interface_default = "./preview-interface-nnmrxyqm.js";
@@ -1131,10 +1149,10 @@ var preview_shell_default = "./preview-shell-wk9k3gcd.js";
 var CGATS21_CRPC1_default = "./CGATS21_CRPC1-g0e3k7kr.icc";
 
 // src/assets/engine/gutterpress-viewer.js
-var gutterpress_viewer_default = "./gutterpress-viewer-retj6ym2.js";
+var gutterpress_viewer_default = "./gutterpress-viewer-jr30yw8t.js";
 
 // src/assets/engine/gutterpress-agent.js
-var gutterpress_agent_default = "./gutterpress-agent-cazqstr1.js";
+var gutterpress_agent_default = "./gutterpress-agent-mrdnwktc.js";
 
 // src/assets/templates/book/manifest.yaml
 var manifest_default = "./manifest-n1gh3qw5.yaml";
@@ -1652,25 +1670,31 @@ async function build(opts) {
     await page.send("Emulation.setDeviceMetricsOverride", sheetViewport);
     await page.send("Emulation.setEmulatedMedia", { media: "print" });
     log(`print media emulated for audits and measurement`);
-    const flushRoots = await page.evaluate(`window.__gp.flushRoots()`);
-    const flushGroups = new Map;
-    for (const root of flushRoots) {
-      if (flushGroups.has(root.key))
+    const pinRoots = await page.evaluate(`window.__gp.pinRoots()`);
+    const pinGroups = new Map;
+    for (const root of pinRoots) {
+      if (pinGroups.has(root.key))
         continue;
       const authorPage = root.page === "auto" ? undefined : root.page;
-      flushGroups.set(root.key, {
+      pinGroups.set(root.key, {
         authorPage,
         edges: root.edges,
-        genName: flushPageName(authorPage, root.edges),
+        padding: root.padding,
+        genName: pinPageName(authorPage, root.edges),
         key: root.key
       });
     }
-    if (flushGroups.size) {
+    const printArea = pinRoots.length ? await page.evaluate(`window.__gp.printArea()`) : null;
+    const pinStyle = (group, pseudos) => pinRootStyle(resolvePage(model, { name: group.authorPage, pseudos }).geometry.margin, printArea, pseudos.includes("left") ? "verso" : "recto", group.edges, group.padding);
+    if (pinGroups.size) {
       const lines = [];
-      for (const group of flushGroups.values()) {
+      const aliased = new Set;
+      for (const group of pinGroups.values()) {
+        const alias = !aliased.has(group.genName);
+        aliased.add(group.genName);
         const relocated = new Set(marginBoxesOnEdges(group.edges));
         const pseudoSets = [[]];
-        if (group.authorPage) {
+        if (alias && group.authorPage) {
           for (const rule of model.pageRules) {
             if (rule.name !== group.authorPage)
               continue;
@@ -1694,7 +1718,7 @@ ${body.join(`
 }`);
           }
         }
-        for (const pseudos of pseudoSets) {
+        for (const pseudos of alias ? pseudoSets : []) {
           const pseudo = pseudos.length ? `:${pseudos.join(":")}` : "";
           const body = [];
           for (const edge of group.edges)
@@ -1706,14 +1730,15 @@ ${body.join(`
 `)}
 }`);
         }
-        lines.push(`:where(.page, .spread)[data-gp-flush="${group.key}"][data-gp-flush][data-gp-flush][data-gp-flush] { page: ${group.genName}; }`);
+        const recto = Object.entries(pinStyle(group, ["right"])).map(([prop, value]) => ` ${prop}: ${value};`).join("");
+        lines.push(`:where(.page, .spread)[data-gp-pin="${group.key}"][data-gp-pin][data-gp-pin][data-gp-pin] { page: ${group.genName};${recto} }`);
       }
-      const flushCss = lines.join(`
+      const pinCss = lines.join(`
 `);
-      await page.evaluate(`window.__gp.addCss("gp-flush-css", ${JSON.stringify(flushCss)})`);
+      await page.evaluate(`window.__gp.addCss("gp-pin-css", ${JSON.stringify(pinCss)})`);
       model = extract(`${cssText}
-${flushCss}`);
-      log(`.gp-flush: ${flushRoots.length} pinned root(s) -> ${flushGroups.size} generated page context(s)`);
+${pinCss}`);
+      log(`pinned art: ${pinRoots.length} page root(s) -> ${pinGroups.size} generated page context(s)`);
     }
     const { tier3Reasons } = classify(model);
     const pseudoContexts = pagePseudoContexts(model);
@@ -1738,11 +1763,16 @@ ${flushCss}`);
         return !!c && c !== "none" && c !== "normal";
       });
     };
-    const furnitureRoots = flushRoots.filter((root) => {
-      const group = flushGroups.get(root.key);
+    const furnitureRoots = pinRoots.filter((root) => {
+      const group = pinGroups.get(root.key);
       return pseudoContexts.some((pseudos) => relocationBoxes(group, pseudos).length > 0);
     });
-    const flushDiagnosed = new Set;
+    const relocationDiagnosed = new Set;
+    const sideRoots = pinRoots.filter((root) => {
+      const group = pinGroups.get(root.key);
+      const recto = JSON.stringify(pinStyle(group, ["right"]));
+      return [["left"], ["right", "first"]].some((pseudos) => JSON.stringify(pinStyle(group, pseudos)) !== recto);
+    });
     const tier2 = synthesize({
       model,
       marks: opts.marks,
@@ -1786,7 +1816,7 @@ ${describe(widthOffenders.intrinsics)}`;
       log(`WARNING: ${msg}`);
     }
     const rectoDecls = model.breaks.filter(isRectoVersoBreak);
-    const needsMeasure = tier3Reasons.length > 0 || consumedStrings(model).size > 0 || rectoDecls.length > 0 || model.counterResets.length > 0 || furnitureRoots.length > 0;
+    const needsMeasure = tier3Reasons.length > 0 || consumedStrings(model).size > 0 || rectoDecls.length > 0 || model.counterResets.length > 0 || furnitureRoots.length > 0 || sideRoots.length > 0;
     let tier = tier2.geometry.bleed > 0 || tier2.geometry.slug > 0 ? 2 : 1;
     let passes = 1;
     let pageMap = {};
@@ -1814,7 +1844,7 @@ ${describe(widthOffenders.intrinsics)}`;
         targets.add(s.id);
       for (const s of resetSites)
         targets.add(s.id);
-      for (const r of furnitureRoots)
+      for (const r of [...furnitureRoots, ...sideRoots])
         targets.add(r.id);
       await page.evaluate(`window.__gp.instrument(${JSON.stringify([...targets])})`);
       const targetText = await page.evaluate(`window.__gp.targetTexts(${JSON.stringify([...targets])})`);
@@ -1900,8 +1930,12 @@ ${describe(widthOffenders.intrinsics)}`;
 /* Tier 3 */
 ${mapCss}`;
         }
+        const pageAt = (id) => map[id] ?? predictedForResult?.pageMap[id];
+        const pseudosAt = (physical) => [
+          physical % 2 === 1 ? "right" : "left",
+          ...physical === 1 ? ["first"] : []
+        ];
         if (furnitureRoots.length) {
-          const pageAt = (id) => map[id] ?? predictedForResult?.pageMap[id];
           const byName = new Map;
           for (const s of sources) {
             const p = pageAt(s.id);
@@ -1919,10 +1953,8 @@ ${mapCss}`;
             const physical = pageAt(root.id);
             if (!physical)
               continue;
-            const group = flushGroups.get(root.key);
-            const pseudos = [physical % 2 === 1 ? "right" : "left"];
-            if (physical === 1)
-              pseudos.push("first");
+            const group = pinGroups.get(root.key);
+            const pseudos = pseudosAt(physical);
             const ctx = resolvePage(model, { name: group.authorPage, pseudos });
             const g = ctx.geometry;
             const eff = flushMargins(g.margin, group.edges);
@@ -1938,9 +1970,9 @@ ${mapCss}`;
                 }
               });
               if (!text) {
-                if (!flushDiagnosed.has(name)) {
-                  flushDiagnosed.add(name);
-                  diagnose("engine.flush.margin-box", `@${name} sits on an edge a .gp-flush pin frees, and its content could not be ` + `re-homed into the page (unsupported content value: ${decls.content}). It will ` + `not print on that page — simplify the box's content, or drop .gp-flush there.`);
+                if (!relocationDiagnosed.has(name)) {
+                  relocationDiagnosed.add(name);
+                  diagnose("engine.pin.margin-box", `@${name} sits on an edge a pinned image frees, and its content could not be ` + `re-homed into the page (unsupported content value: ${decls.content}). It will ` + `not print on that page — simplify the box's content, or pin the image to another edge.`);
                 }
                 continue;
               }
@@ -1965,7 +1997,17 @@ ${mapCss}`;
             items.push({ id: root.id, boxes });
           }
           if (items.length)
-            await page.evaluate(`window.__gp.setFlushFurniture(${JSON.stringify(items)})`);
+            await page.evaluate(`window.__gp.setPinFurniture(${JSON.stringify(items)})`);
+        }
+        if (sideRoots.length) {
+          const items = sideRoots.flatMap((root) => {
+            const physical = pageAt(root.id);
+            if (!physical)
+              return [];
+            return [{ id: root.id, style: pinStyle(pinGroups.get(root.key), pseudosAt(physical)) }];
+          });
+          if (items.length)
+            await page.evaluate(`window.__gp.setPinGeometry(${JSON.stringify(items)})`);
         }
       };
       const predicted = await predictPageMap(browser, url, AGENT, VIEWER, {
@@ -2328,12 +2370,12 @@ function shrinkScale(boxes, limitPx) {
 async function findWidthOffenders(page, model, bleedSlugExtensionPt, restoreViewport) {
   const contexts = [
     resolvePage(model),
-    ...model.pageNames.filter((n) => !n.startsWith("gp-") || n.startsWith("gp--flush-")).map((n) => resolvePage(model, { name: n }))
+    ...model.pageNames.filter((n) => !n.startsWith("gp-") || n.startsWith("gp--pin-")).map((n) => resolvePage(model, { name: n }))
   ];
   const contentPxOf = (c) => (c.geometry.width - c.geometry.margin.left - c.geometry.margin.right + bleedSlugExtensionPt) * 96 / 72;
   const defaultLimitPx = contentPxOf(contexts[0]);
   const namedLimits = {};
-  model.pageNames.filter((n) => !n.startsWith("gp-") || n.startsWith("gp--flush-")).forEach((n) => {
+  model.pageNames.filter((n) => !n.startsWith("gp-") || n.startsWith("gp--pin-")).forEach((n) => {
     namedLimits[n] = contentPxOf(resolvePage(model, { name: n }));
   });
   const widths = [...new Set([defaultLimitPx, ...Object.values(namedLimits)])].sort((a, b) => a - b);
@@ -2520,7 +2562,7 @@ async function predictPageMap(browser, url, agentScript, viewerScript, args, she
     await page.waitForReady();
     await page.evaluate(`window.__GP_MANUAL__ = true;`);
     await page.evaluate(viewerScript);
-    await page.evaluate(`window.__gp.flushRoots()`);
+    await page.evaluate(`window.__gp.pinRoots()`);
     await page.evaluate(`window.__gp.stringSources(${JSON.stringify(args.stringSets)})`);
     if (args.rectoDecls.length)
       await page.evaluate(`window.__gp.forcedBreakSites(${JSON.stringify(args.rectoDecls)})`);

package/dist/{cli-7z29z4wz.js → cli-fmksazej.js}

@@ -4,7 +4,7 @@ import {
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.20-alpha.2",
+  version: "0.11.20-alpha.4",
   description: "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   author: "itlackey",
   license: "MPL-2.0",

package/dist/{cli-gh0ym80r.js → cli-h4tfmpg3.js}

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "./cli-7z29z4wz.js";
+} from "./cli-fmksazej.js";
 import {
   enhancedPath,
   execCapture,
@@ -132,8 +132,8 @@ async function resolveGhostscript(targetPlatform = process.platform, env = proce
   }
   return targetPlatform === "win32" ? findWindowsGhostscriptInstall(env) : undefined;
 }
-async function hasLiveTransparency(pdfBytes) {
-  const { PDFDocument, PDFDict, PDFName, PDFNumber, PDFRawStream, PDFRef } = await import("pdf-lib");
+async function transparentPages(pdfBytes) {
+  const { PDFDocument, PDFDict, PDFName, PDFNumber, PDFRawStream, PDFArray, PDFRef } = await import("pdf-lib");
   let doc;
   try {
     doc = await PDFDocument.load(pdfBytes, {
@@ -141,36 +141,64 @@ async function hasLiveTransparency(pdfBytes) {
       throwOnInvalidObject: false
     });
   } catch {
-    return false;
+    return [];
   }
   const ctx = doc.context;
-  const NONE = "/None";
-  for (const [, obj] of ctx.enumerateIndirectObjects()) {
-    const dict = obj instanceof PDFRawStream ? obj.dict : obj instanceof PDFDict ? obj : undefined;
-    if (!dict)
-      continue;
+  const SKIP = new Set(["Parent", "Font", "Annots"]);
+  const isSet = (v) => v !== undefined && String(v) !== "/None";
+  const dictHasTransparency = (dict) => {
     const smask = dict.get(PDFName.of("SMask"));
     const subtype = String(dict.get(PDFName.of("Subtype")) ?? "");
     const type = String(dict.get(PDFName.of("Type")) ?? "");
-    if (subtype === "/Image" && smask && String(smask) !== NONE)
+    if (subtype === "/Image" && isSet(smask))
       return true;
-    if (type === "/ExtGState") {
-      if (smask && String(smask) !== NONE)
+    if (type === "/ExtGState" || dict.has(PDFName.of("ca")) || dict.has(PDFName.of("BM"))) {
+      if (isSet(smask))
         return true;
       for (const key of ["ca", "CA"]) {
-        const alpha = dict.get(PDFName.of(key));
+        const alpha = ctx.lookup(dict.get(PDFName.of(key)));
         if (alpha instanceof PDFNumber && alpha.asNumber() < 1)
           return true;
       }
+      const bm = ctx.lookup(dict.get(PDFName.of("BM")));
+      const mode = bm instanceof PDFArray ? bm.get(0) : bm;
+      if (mode && !["/Normal", "/Compatible"].includes(String(mode)))
+        return true;
     }
-    const group = dict.get(PDFName.of("Group"));
-    if (group) {
-      const resolved = group instanceof PDFRef ? ctx.lookup(group) : group;
-      if (resolved instanceof PDFDict && String(resolved.get(PDFName.of("S"))) === "/Transparency")
+    const group = ctx.lookup(dict.get(PDFName.of("Group")));
+    return group instanceof PDFDict && String(group.get(PDFName.of("S"))) === "/Transparency";
+  };
+  const reaches = (root) => {
+    const seen = new Set;
+    const stack = [root];
+    while (stack.length) {
+      const node = stack.pop();
+      const obj = node instanceof PDFRef ? ctx.lookup(node) : node;
+      if (!obj || seen.has(obj))
+        continue;
+      seen.add(obj);
+      if (obj instanceof PDFArray) {
+        stack.push(...obj.asArray());
+        continue;
+      }
+      const dict = obj instanceof PDFRawStream ? obj.dict : obj instanceof PDFDict ? obj : undefined;
+      if (!dict)
+        continue;
+      if (dictHasTransparency(dict))
         return true;
+      for (const [key, value] of dict.entries()) {
+        if (!SKIP.has(key.asString().slice(1)))
+          stack.push(value);
+      }
     }
-  }
-  return false;
+    return false;
+  };
+  const pages = [];
+  doc.getPages().forEach((page, i) => {
+    if (reaches(page.node))
+      pages.push(i + 1);
+  });
+  return pages;
 }
 async function findPostScriptShadingPages(pdfBytes) {
   const { PDFDocument, PDFDict, PDFName, PDFNumber, PDFRawStream, PDFRef } = await import("pdf-lib");
@@ -241,6 +269,75 @@ async function stripAnnotations(pdfPath, stagingDir) {
   const out = await doc.save();
   await writeFile(pdfPath, out);
 }
+function planTransparentPages(transparent, reasons, flattenPages, gradientPages) {
+  const split = [];
+  const artOnly = [];
+  const kept = new Map;
+  for (const n of transparent) {
+    const reason = reasons.get(n);
+    if (reason === "no-text")
+      artOnly.push(n);
+    else if (flattenPages.includes(n))
+      kept.set(n, "listed");
+    else if (reason)
+      kept.set(n, reason);
+    else if (gradientPages.includes(n))
+      kept.set(n, "gradient");
+    else
+      split.push(n);
+  }
+  return { split, artOnly, kept };
+}
+async function flattenTransparentPages(pdfPath, pageNumbers, stagingDir, dpi = 300) {
+  const pages = [...new Set(pageNumbers)].sort((a, b) => a - b);
+  if (pages.length === 0)
+    return;
+  const ghostscript = await resolveGhostscript();
+  if (!ghostscript) {
+    throw new Error("Ghostscript executable not found. Install Ghostscript or set GHOSTSCRIPT_PATH to its command-line executable.");
+  }
+  const art = join(stagingDir, "flatten-art.pdf");
+  const text = join(stagingDir, "flatten-text.pdf");
+  const pageList = `-sPageList=${pages.join(",")}`;
+  const gs = (...args) => run(ghostscript, [
+    "-q",
+    "-dBATCH",
+    "-dNOPAUSE",
+    "-dSAFER",
+    "-dPreserveAnnots=false",
+    "-dNO_PDFMARK_OUTLINES",
+    ...args
+  ]);
+  try {
+    await gs(pageList, "-sDEVICE=pdfimage24", "-dFILTERTEXT", `-r${dpi}`, `-sOutputFile=${art}`, pdfPath);
+    await gs(pageList, "-sDEVICE=pdfwrite", "-dNOTRANSPARENCY", "-dFILTERIMAGE", "-dFILTERVECTOR", "-dCompatibilityLevel=1.3", `-sOutputFile=${text}`, pdfPath);
+    const { PDFDocument, PDFName } = await import("pdf-lib");
+    const doc = await PDFDocument.load(await readFile(pdfPath), { updateMetadata: false });
+    const artDoc = await PDFDocument.load(await readFile(art));
+    const textDoc = await PDFDocument.load(await readFile(text));
+    if (artDoc.getPageCount() !== pages.length || textDoc.getPageCount() !== pages.length) {
+      throw new Error(`Ghostscript returned ${artDoc.getPageCount()} artwork and ${textDoc.getPageCount()} text pages for ${pages.length} transparent pages.`);
+    }
+    const artPages = await doc.embedPages(artDoc.getPages());
+    const withText = textDoc.getPages().filter((p) => p.node.Contents());
+    const embeddedText = await doc.embedPages(withText);
+    const textPages = textDoc.getPages().map((p) => embeddedText[withText.indexOf(p)]);
+    pages.forEach((pageNumber, i) => {
+      const page = doc.getPage(pageNumber - 1);
+      const { x, y, width, height } = page.getMediaBox();
+      page.node.set(PDFName.of("Contents"), doc.context.obj([]));
+      page.node.set(PDFName.of("Resources"), doc.context.obj({}));
+      page.node.delete(PDFName.of("Group"));
+      page.drawPage(artPages[i], { x, y, width, height });
+      const textPage = textPages[i];
+      if (textPage)
+        page.drawPage(textPage, { x, y, width, height });
+    });
+    await writeFile(pdfPath, await doc.save());
+  } finally {
+    await Promise.all([art, text].map((f) => unlink(f).catch(() => {})));
+  }
+}
 function makePdfxDefPs(params) {
   const pdfxVersion = params.pdfx === "x3" ? "PDF/X-3:2002" : "PDF/X-1:2001";
   const pdfxConformance = params.pdfx === "x1a" ? "PDF/X-1a:2001" : null;
@@ -332,6 +429,10 @@ async function convertToPdfxCmyk(inputPdf, outPdf, config) {
     "-dDownsampleColorImages=false",
     "-dDownsampleGrayImages=false",
     "-dDownsampleMonoImages=false",
+    "-dAutoFilterColorImages=false",
+    "-dColorImageFilter=/FlateEncode",
+    "-dAutoFilterGrayImages=false",
+    "-dGrayImageFilter=/FlateEncode",
     ...config.rasterDpi ? [`-r${config.rasterDpi}`] : [],
     "-sProcessColorModel=DeviceCMYK",
     "-sColorConversionStrategy=CMYK",
@@ -584,4 +685,4 @@ async function getSystemDiagnostics() {
   };
 }
 
-export { setLogLevel, debug, info, warn, error, log, resolveGhostscript, hasLiveTransparency, findPostScriptShadingPages, stripAnnotations, stampCreator, convertToPdfxCmyk, PACKAGE_META, PACKAGE_VERSION, defaultConfigDir, FileTokenStore, getSystemDiagnostics };
+export { setLogLevel, debug, info, warn, error, log, PACKAGE_META, PACKAGE_VERSION, resolveGhostscript, transparentPages, findPostScriptShadingPages, stripAnnotations, planTransparentPages, flattenTransparentPages, stampCreator, convertToPdfxCmyk, defaultConfigDir, FileTokenStore, getSystemDiagnostics };