gutterpress 0.11.18-alpha.2 → 0.11.18-alpha.4

package/dist/cli.js

@@ -6,7 +6,7 @@ import {
   UsageError,
   package_default,
   rejectUnknownFlags
-} from "./cli-yqpnksaa.js";
+} from "./cli-88hddvbz.js";
 import {
   EXIT_CODES
 } from "./cli-46ycxe6r.js";
@@ -18,14 +18,14 @@ import {
 import { defineCommand, parseArgs, runMain } from "citty";
 import { statSync } from "node:fs";
 var SUBCOMMANDS = {
-  new: () => import("./new-w7q0n21v.js").then((m) => m.default),
-  preview: () => import("./preview-bg3wxqxc.js").then((m) => m.default),
-  build: () => import("./build-se062swz.js").then((m) => m.default),
-  publish: () => import("./publish-waps63wf.js").then((m) => m.default),
-  validate: () => import("./validate-c9d8d656.js").then((m) => m.default),
-  preflight: () => import("./preflight-m54qsjs7.js").then((m) => m.default),
-  doctor: () => import("./doctor-tkbdx8c1.js").then((m) => m.default),
-  ext: () => import("./ext-kg8m8vda.js").then((m) => m.default)
+  new: () => import("./new-ede0f1nm.js").then((m) => m.default),
+  preview: () => import("./preview-y2dxxbrk.js").then((m) => m.default),
+  build: () => import("./build-63nwjhzf.js").then((m) => m.default),
+  publish: () => import("./publish-n60n0hm1.js").then((m) => m.default),
+  validate: () => import("./validate-2c7sfyxn.js").then((m) => m.default),
+  preflight: () => import("./preflight-b6c3k3qt.js").then((m) => m.default),
+  doctor: () => import("./doctor-n1cwrwx2.js").then((m) => m.default),
+  ext: () => import("./ext-ddfjfcg4.js").then((m) => m.default)
 };
 var VERSION = package_default.version;
 var main = defineCommand({
@@ -50,7 +50,7 @@ async function preflightRequiredInvocations(rawArgs) {
   const [command, ...commandArgs] = rawArgs;
   try {
     if (command === "new") {
-      const { newArgs } = await import("./new-w7q0n21v.js");
+      const { newArgs } = await import("./new-ede0f1nm.js");
       rejectUnknownFlags(commandArgs, newArgs, "new");
       const parsed = parseArgs(commandArgs, {
         ...newArgs,
@@ -62,7 +62,7 @@ async function preflightRequiredInvocations(rawArgs) {
       return;
     }
     if (command === "preflight") {
-      const { preflightArgs } = await import("./preflight-m54qsjs7.js");
+      const { preflightArgs } = await import("./preflight-b6c3k3qt.js");
       rejectUnknownFlags(commandArgs, preflightArgs, "preflight");
       const parsed = parseArgs(commandArgs, {
         ...preflightArgs,
@@ -82,7 +82,7 @@ async function preflightRequiredInvocations(rawArgs) {
       }
       if (subcommand.startsWith("-"))
         return;
-      const { EXT_SUBCOMMANDS, extAddArgs, extRemoveArgs, extEnableArgs, extDisableArgs } = await import("./ext-kg8m8vda.js");
+      const { EXT_SUBCOMMANDS, extAddArgs, extRemoveArgs, extEnableArgs, extDisableArgs } = await import("./ext-ddfjfcg4.js");
       if (!EXT_SUBCOMMANDS.includes(subcommand)) {
         throw new UsageError(`gutterpress ext: unknown command "${subcommand}"`);
       }

package/dist/{doctor-tkbdx8c1.js → doctor-n1cwrwx2.js}

@@ -1,12 +1,12 @@
 import {
   getSystemDiagnostics,
   log
-} from "./cli-qp6dtsh3.js";
+} from "./cli-36v78t6w.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-yqpnksaa.js";
+} from "./cli-88hddvbz.js";
 import"./cli-46ycxe6r.js";
 import"./cli-7fkhgtfn.js";
 import"./cli-37x76zdn.js";

package/dist/{engine-jkf4pxz9.js → engine-6zfj0jte.js}

@@ -1,6 +1,6 @@
 import {
   build
-} from "./cli-161z4n0s.js";
+} from "./cli-5x7s8bap.js";
 import {
   BuildError
 } from "./cli-46ycxe6r.js";

package/dist/{engine-7gfr16t8.js → engine-zw8626be.js}

@@ -1,9 +1,9 @@
 import {
   build
-} from "./index-3x23by5j.js";
+} from "./index-qbd874dh.js";
 import {
   BuildError
-} from "./index-t3zxy69d.js";
+} from "./index-jt552wtf.js";
 import"./index-rzm1phg0.js";
 import"./index-37x76zdn.js";
 

package/dist/{ext-kg8m8vda.js → ext-ddfjfcg4.js}

@@ -12,17 +12,17 @@ import {
   searchNpmExtensions,
   setExtensionEnabled,
   updateExtensions
-} from "./cli-0w3961p5.js";
-import"./cli-qp6dtsh3.js";
+} from "./cli-dmcy8kay.js";
+import"./cli-36v78t6w.js";
 import {
   UsageError,
   exitForUsage,
   rejectExtraPositionals,
   rejectUnknownFlags,
   resolveProjectDir
-} from "./cli-yqpnksaa.js";
+} from "./cli-88hddvbz.js";
 import"./cli-ht1bcqdd.js";
-import"./cli-161z4n0s.js";
+import"./cli-5x7s8bap.js";
 import {
   EXIT_CODES
 } from "./cli-46ycxe6r.js";

package/dist/{gutterpress-viewer-spq1ge52.js → gutterpress-viewer-k4mpqjh0.js}

@@ -19,6 +19,7 @@
   __export(exports_fragment, {
     wrapGeometry: () => wrapGeometry,
     waitForLayoutReady: () => waitForLayoutReady,
+    versoShiftPt: () => versoShiftPt,
     synthesizeColumnBreaks: () => synthesizeColumnBreaks,
     stripMetrics: () => stripMetrics,
     strideOf: () => strideOf,
@@ -108,13 +109,20 @@
    below is already sized to the run's full width and owns the actual
    clipping/visibility, so the strip does not need to. */
 .gp-strip {
+  /* Column pitch less the content width. \`--gp-verso-shift\` is set only on a
+     book with mirrored margins: decorate.ts slides each verso's sheet by it,
+     and growing the pitch by the same amount keeps the gap between a verso and
+     the recto it faces at the sheet gap (the gap across the page turn gets
+     twice the shift instead). Without it, it is 0px and nothing changes. */
+  --gp-col-gap: calc(
+    var(--gp-margin-right) + var(--gp-margin-left) + var(--gp-sheet-gap) +
+      var(--gp-verso-shift, 0px)
+  );
   position: relative;
   width: var(--gp-content-w);
   height: var(--gp-content-h);
   column-width: var(--gp-content-w);
-  column-gap: calc(
-    var(--gp-margin-right) + var(--gp-margin-left) + var(--gp-sheet-gap)
-  );
+  column-gap: var(--gp-col-gap);
   column-fill: auto;
   overflow: visible;
   margin: 0;
@@ -176,9 +184,7 @@
   );
   width: calc(
     var(--gp-content-w) * var(--gp-wrap-cols, 2) +
-      (
-        var(--gp-margin-right) + var(--gp-margin-left) + var(--gp-sheet-gap)
-      ) * (var(--gp-wrap-cols, 2) - 1)
+      var(--gp-col-gap) * (var(--gp-wrap-cols, 2) - 1)
   );
 }
 
@@ -334,15 +340,6 @@
   border: var(--gp-ov-w) var(--gp-ov-style) var(--gp-ov-color);
 }
 
-/* the PDF's own margins for this page, where they differ from where the
-   preview lays the text (mirrored :left/:right, .gp-flush): fainter, dotted */
-.gp-ov-print {
-  position: absolute;
-  box-sizing: border-box;
-  border: var(--gp-ov-w) dotted var(--gp-ov-color);
-  opacity: 0.6;
-}
-
 /* bleed: a translucent band OUTSIDE the trim (its width is the border) */
 .gp-ov-bleed {
   position: absolute;
@@ -1475,6 +1472,13 @@
     }
   }
   function runPageBox(model, name, warnings = []) {
+    const { right, agree, r, l } = pageSides(model, name);
+    if (agree)
+      return right;
+    warnings.push(`@page :left and @page :right give ${name ? `the "${name}" page` : "this book"} ` + `different content areas (${l.w.toFixed(1)}×${l.h.toFixed(1)}pt vs ` + `${r.w.toFixed(1)}×${r.h.toFixed(1)}pt). Print alternates between them; the preview can ` + `only show one, so page breaks here may not match the PDF. Mirror the margins instead: ` + `swap which edge is wide and keep the total the same.`);
+    return resolvePage(model, { name }).geometry;
+  }
+  function pageSides(model, name) {
     const right = resolvePage(model, { name, pseudos: ["right"] }).geometry;
     const left = resolvePage(model, { name, pseudos: ["left"] }).geometry;
     const box = (g) => ({
@@ -1483,10 +1487,23 @@
     });
     const r = box(right);
     const l = box(left);
-    if (Math.abs(r.w - l.w) < 0.01 && Math.abs(r.h - l.h) < 0.01)
-      return right;
-    warnings.push(`@page :left and @page :right give ${name ? `the "${name}" page` : "this book"} ` + `different content areas (${l.w.toFixed(1)}×${l.h.toFixed(1)}pt vs ` + `${r.w.toFixed(1)}×${r.h.toFixed(1)}pt). Print alternates between them; the preview can ` + `only show one, so page breaks here may not match the PDF. Mirror the margins instead: ` + `swap which edge is wide and keep the total the same.`);
-    return resolvePage(model, { name }).geometry;
+    return {
+      right,
+      left,
+      r,
+      l,
+      agree: Math.abs(r.w - l.w) < 0.01 && Math.abs(r.h - l.h) < 0.01
+    };
+  }
+  function versoShiftPt(model, name, flushEdges = []) {
+    const { right, left, agree } = pageSides(model, name);
+    if (!agree)
+      return 0;
+    const r = flushMargins(right.margin, flushEdges);
+    const l = flushMargins(left.margin, flushEdges);
+    if (Math.abs(r.left + r.right - (l.left + l.right)) >= 0.01)
+      return 0;
+    return r.left - l.left;
   }
   function buildStrips(model, opts = {}, warnings = []) {
     const doc = document;
@@ -1512,6 +1529,10 @@
       strip.style.setProperty("--gp-margin-right", `${pt(margin.right)}px`);
       strip.style.setProperty("--gp-margin-bottom", `${pt(margin.bottom)}px`);
       strip.style.setProperty("--gp-margin-left", `${pt(margin.left)}px`);
+      const rawShift = versoShiftPt(model, run.page, run.flushEdges);
+      const versoShift = Math.abs(rawShift) >= 0.01 ? rawShift : 0;
+      if (versoShift)
+        strip.style.setProperty("--gp-verso-shift", `${pt(versoShift)}px`);
       run.nodes[0].before(strip);
       for (const n of run.nodes)
         strip.appendChild(n);
@@ -1520,6 +1541,7 @@
         page: run.page,
         geometry,
         flushEdges: run.flushEdges,
+        versoShift,
         pages: 0,
         offset: 0
       });
@@ -2259,8 +2281,10 @@
     return out;
   }
   var OVERLAY_OFF = { on: false, issues: 0, intended: 0, bleedPt: 0 };
-  function marginsDiffer(a, b) {
-    return ["top", "right", "bottom", "left"].some((k) => Math.abs(a[k] - b[k]) > 0.5);
+  function pageFrameMargin(margin, versoShift, side) {
+    if (side === "recto" || !versoShift)
+      return margin;
+    return { ...margin, left: margin.left - versoShift, right: margin.right + versoShift };
   }
   function configInsetBleedPt() {
     const v = parseFloat(document.querySelector('meta[name="gp-inset-bleed"]')?.getAttribute("content") ?? "");
@@ -2328,9 +2352,6 @@
       }
       host.appendChild(marginTint(boxes));
       host.appendChild(div("gp-ov-margin", boxes.content));
-      if (marginsDiffer(p.printMargin, p.margin)) {
-        host.appendChild(div("gp-ov-print", pageBoxes(p.geometry, p.printMargin, 0, PX_PER_PT).content));
-      }
       layer.appendChild(host);
       painted.set(p.index, { host, boxes, sheet: p.sheet });
     }
@@ -2619,6 +2640,8 @@
       buildMaps();
       fillXrefs();
       let prevPageH = 0;
+      let prevVersoShift = 0;
+      let prevRunX = 0;
       let first = true;
       for (const strip of layout.strips) {
         const run = ensureRun(strip);
@@ -2635,12 +2658,13 @@
           const slot = i + shift;
           const row = Math.floor(slot / perRow);
           const colVisual = slot % perRow;
-          const sheetLeft = colVisual * stride;
+          const side = bookIndex % 2 === 0 ? "recto" : "verso";
+          const sheetLeft = colVisual * stride + (side === "verso" ? strip.versoShift * PX_PER_PT : 0);
           const sheetTop = row * rowStride;
           const sheet = document.createElement("div");
           sheet.className = "gp-sheet";
           sheet.dataset.page = String(bookIndex + 1);
-          sheet.dataset.side = bookIndex % 2 === 0 ? "recto" : "verso";
+          sheet.dataset.side = side;
           sheet.style.left = `${sheetLeft}px`;
           sheet.style.top = `${sheetTop}px`;
           sheet.style.setProperty("--gp-page-w", px(ctx.geometry.width));
@@ -2659,15 +2683,19 @@
             sheet,
             strip,
             geometry: ctx.geometry,
-            printMargin: ctx.geometry.margin,
-            margin: ctx.padded || blankPages.has(bookIndex) ? ctx.geometry.margin : strip.flushEdges?.length ? flushMargins(g.margin, strip.flushEdges) : g.margin
+            margin: ctx.padded || blankPages.has(bookIndex) ? ctx.geometry.margin : pageFrameMargin(flushMargins(g.margin, strip.flushEdges ?? []), strip.versoShift, side)
           });
         }
         const rows = Math.max(1, Math.ceil((strip.pages + shift) / perRow));
         run.style.height = `${rowStride * (rows - 1) + PX_PER_PT * g.height}px`;
         run.style.width = `${stride * perRow}px`;
-        run.style.marginTop = strip.wrapCols && shift === 1 && !first ? `${-(prevPageH + sheetGap)}px` : "";
+        const composed = !!strip.wrapCols && shift === 1 && !first;
+        run.style.marginTop = composed ? `${-(prevPageH + sheetGap)}px` : "";
+        const runX = composed ? prevRunX + (prevVersoShift - strip.versoShift) * PX_PER_PT : 0;
+        run.style.marginLeft = runX ? `${runX}px` : "";
         prevPageH = PX_PER_PT * g.height;
+        prevVersoShift = strip.versoShift;
+        prevRunX = runX;
         first = false;
         if (opts.designer)
           checkOverflow(strip, warnings);