gutterpress 0.11.23-alpha.2 → 0.11.23-alpha.3

package/README.md

@@ -363,7 +363,7 @@ List, add, remove, enable, or disable the project's extensions. Markdown-it
 plugins, looks (stylesheets) and component libraries are all extensions — one
 `extensions:` list in `manifest.yaml`, in load order (see
 [Extensions](#extensions) below). These are the same shared-lib functions the
-desktop app's Look and Features views call, so an extension added from the
+desktop app's Extensions tab calls, so an extension added from the
 terminal is the same entry the GUI shows.
 
 ```sh
@@ -460,7 +460,7 @@ never touched.
 
 ```sh
 gutterpress ext remove markdown-it-highlightjs ./my-book
-gutterpress ext remove ./extensions/zine ./my-book
+gutterpress ext remove zine ./my-book
 ```
 
 #### `gutterpress ext enable` / `gutterpress ext disable`
@@ -475,8 +475,8 @@ gutterpress ext enable markdown-it-mark ./my-book
 
 #### `gutterpress ext search`
 
-Search **npm** for extensions — the same list the desktop app's Features view
-shows under "Find more on npm." Not project-scoped (no `dir` argument): it
+Search **npm** for extensions — the same list the desktop app's Extensions tab
+shows under *Search*. Not project-scoped (no `dir` argument): it
 queries the registry for packages tagged `gutterpress` (Gutterpress
 extensions: plugins, looks, component libraries) or `markdown-it-plugin` (the
 markdown-it ecosystem's own tag — those work in Gutterpress unchanged), and
@@ -521,7 +521,7 @@ extensions:
   # a feature bundled with Gutterpress — nothing to install, works offline
   - markdown-it-mark
   # a folder or plugin file, relative to manifest.yaml — referenced in place
-  - ./extensions/clean-book
+  - ./extensions/house-look
   - ./plugins/my-custom-plugin.js
   # an npm package, pinned to the exact version `gutterpress ext add` installed
   - markdown-it-highlightjs@4.3.0
@@ -547,8 +547,7 @@ An extension folder (or npm package) describes itself in its **`package.json`**
   "gutterpress": {
     "styles": ["styles/plugin.css"],
     "snippets": "snippets",
-    "components": "components.yaml",
-    "tokensFile": "styles/tokens.css"
+    "components": "components.yaml"
   }
 }
 ```

package/dist/{README-8ef336pp.md → README-8db7btxb.md}

@@ -17,7 +17,7 @@ arrangement of the files is the part worth keeping.
     ├── base.css              element baseline. Bare p/h2/table/code.
     ├── components.css        named components + their public tokens.
     ├── page-templates.css    .page.* layouts — arrangement WITHIN a page.
-    ├── page-rules.css        @page geometry, margin boxes, running heads.
+    ├── page-rules.css        @page margin boxes, running heads, named pages.
     └── book.css              this book's overrides. Loads last.
 ```
 
@@ -64,7 +64,7 @@ instantly: **where does this rule go?**
 | what a plain paragraph or table looks like | `base.css` |
 | a named thing an author opts into | `components.css` |
 | how one page arranges its content | `page-templates.css` |
-| margins, folios, running heads | `page-rules.css` |
+| folios, running heads, named pages | `page-rules.css` |
 | one chapter of one book | `book.css` |
 
 If a rule seems to belong in two of them, it is usually two rules.
@@ -156,23 +156,17 @@ author retypes must be found and replaced across every chapter when it
 changes. A variant expressed as a component name plus a CSS rule changes in
 one place, and chapters written afterwards get it for free.
 
-### 4. `@page { size }` is not optional, and it must match the manifest
-
-`page-rules.css` opens by declaring the trim:
-
-```css
-@page { size: 6in 9in; }
-```
-
-That line is load-bearing in the most literal sense. With no `size:` anywhere
-in the book's CSS, Chromium falls back to US Letter and prints the whole book
-at the wrong trim, with no error — this is the one failure in the stack that
-costs money rather than time.
-
-The manifest's `preset:`/`page:` remains the source of truth: it is what
-`gutterpress validate` measures the produced PDF against, and what the publish
-targets check. The CSS line is the instruction that satisfies it. Change one,
-change the other — and let validate catch you when you forget.
+### 4. The page size and margins are the book's, not the look's
+
+A look never declares `@page { size }` or `@page { margin }`. The book's
+manifest records both (`preset:`, `page: width / height / margin`, which the
+app edits under Setup > Details), and the build writes them as the `@page`
+rule after every stylesheet, so a `size` in a look is ignored and reported by
+the print-safety check, and a `margin` holds only until the author sets
+margins in the app. `page-rules.css` owns what IS a look's: the margin boxes
+(folios, running heads) and the named pages. Design them to sit in whatever
+margin the book gives them — a folio at `@bottom-right` needs no particular
+margin to work.
 
 ### 5. Keep the catalog honest
 

package/dist/api/index.d.ts

@@ -52,7 +52,7 @@ export type { ProjectStyle } from "../lib/style-resolver.ts";
 export { readManifestFields, setManifestFields, setActiveStyles, } from "../lib/manifest-config.ts";
 export type { ProjectConfigFields } from "../lib/manifest-config.ts";
 export { readPageSetup, setPageSetup } from "../lib/page-size.ts";
-export type { PageSetup, PageSizeChoice, PageSizePoints } from "../lib/page-size.ts";
+export type { PageMargin, PageSetup, PageSetupChange, PageSizeChoice, PageSizePoints } from "../lib/page-size.ts";
 export { providerFor, restoreVersionWithBackup, isNoChangesError, countUnversionedChanges, whenGitIdle, AUTO_SNAPSHOT_MESSAGE, RESTORE_BACKUP_MESSAGE, HISTORY_PAGE_LIMIT, listLocalBranches, switchBranch, SWITCH_BRANCH_SNAPSHOT_MESSAGE, } from "../lib/source-provider.ts";
 export type { ListHistoryOptions, HistoryPage, UnversionedChanges, LocalBranches, SwitchBranchOptions, SwitchBranchResult, } from "../lib/source-provider.ts";
 export { describeVersions, listOnlineVersions, compareVersionFile, exportVersionTree, VERSION_CHANGES_SHOWN, } from "../lib/version-changes.ts";

package/dist/api/index.js

@@ -101,7 +101,7 @@ import {
   substituteVariables,
   syncProject,
   testRemoteAccess
-} from "../index-j5z86r4a.js";
+} from "../index-prqvz3xm.js";
 import {
   DEFAULT_NPM_REGISTRY,
   MANIFEST_FILENAMES,
@@ -130,7 +130,7 @@ import {
   setExtensionEnabled,
   updateExtensions,
   validateProjectExtensions
-} from "../index-x3ema2w3.js";
+} from "../index-7pck1q9c.js";
 import {
   BUNDLED_EXTENSIONS,
   EXTENSION_MANIFEST_FILENAME,
@@ -145,9 +145,9 @@ import {
   pathEscapesFolder,
   readExtensionMeta,
   resolveExtension
-} from "../index-2bjcghze.js";
+} from "../index-0wee4408.js";
 import"../index-ht1bcqdd.js";
-import"../index-0skhjx3e.js";
+import"../index-nedd07bk.js";
 import {
   BuildError
 } from "../index-46ycxe6r.js";

package/dist/{build-encgnv0c.js → build-m78jcpf7.js}

@@ -1,20 +1,20 @@
 import {
   runBuild,
   splitOutPath
-} from "./cli-xq6djqbj.js";
-import"./cli-evg8sbht.js";
+} from "./cli-1h17ktsg.js";
+import"./cli-n2tsxqpn.js";
 import"./cli-ht1bcqdd.js";
-import"./cli-pz4bn98t.js";
+import"./cli-xsrffqzt.js";
 import"./cli-2ppw6q9v.js";
 import"./cli-eyyggect.js";
 import"./cli-asap4t1z.js";
 import"./cli-a35w7wzg.js";
 import"./cli-v5mp7a6q.js";
-import"./cli-sdmv4bba.js";
-import"./cli-pwwfxdgb.js";
+import"./cli-h4x81x97.js";
+import"./cli-t8be9yeb.js";
 import {
   log
-} from "./cli-aqh6brew.js";
+} from "./cli-s6djx4ma.js";
 import {
   UsageError,
   parseFormat,
@@ -22,7 +22,7 @@ import {
   rejectExtraPositionals,
   rejectUnknownFlags
 } from "./cli-d8xjns66.js";
-import"./cli-kh8v4vvw.js";
+import"./cli-5jzyw06s.js";
 import {
   BuildError
 } from "./cli-46ycxe6r.js";

package/dist/{cli-xq6djqbj.js → cli-1h17ktsg.js}

@@ -8,17 +8,16 @@ import {
   stampCreator,
   stripAnnotations,
   transparentPages
-} from "./cli-evg8sbht.js";
+} from "./cli-n2tsxqpn.js";
 import {
   blackTextToGray
 } from "./cli-ht1bcqdd.js";
 import {
+  DEFAULT_PAGE_MARGIN_PT,
   MARGIN_BOX_IGNORED_PROPERTIES,
-  extract,
   getAssetPath,
-  lastPageMode,
-  resolvePage
-} from "./cli-pz4bn98t.js";
+  lastPageMode
+} from "./cli-xsrffqzt.js";
 import {
   countLinkAnnotations,
   getImageResolutions,
@@ -57,11 +56,17 @@ import {
   TARGET_IDS,
   addExtension,
   applyDefaultPdfStrictChecks,
+  cssLength,
   ensureProjectGitignore,
+  formatPageSize,
+  isPositivePoints,
+  judgeRect,
   loadManifest,
   loadManifestDoc,
   loadManifestWithPath,
   npmRegistryUrl,
+  pageBoxes,
+  printAreaMeta,
   publishTargetFor,
   resolveConfig,
   resolveConfigForTarget,
@@ -70,7 +75,7 @@ import {
   uniqueExtensionId,
   withFetchTimeout,
   writeManifestDoc
-} from "./cli-sdmv4bba.js";
+} from "./cli-h4x81x97.js";
 import {
   EXTENSION_MANIFEST_FILENAME,
   GUTTERPRESS_CSS,
@@ -91,7 +96,7 @@ import {
   readExtensionMeta,
   resolveDeclaredStyles,
   slugify
-} from "./cli-pwwfxdgb.js";
+} from "./cli-t8be9yeb.js";
 import {
   PACKAGE_META,
   PACKAGE_VERSION,
@@ -101,7 +106,7 @@ import {
   log,
   setLogLevel,
   warn
-} from "./cli-aqh6brew.js";
+} from "./cli-s6djx4ma.js";
 import {
   DEBOUNCE,
   UsageError,
@@ -281,84 +286,6 @@ var check2 = {
 };
 registerCheck(check2);
 
-// src/engine/shared/print-area.ts
-function isPositivePoints(value) {
-  return typeof value === "number" && Number.isFinite(value) && value > 0;
-}
-var round3 = (n) => Math.round(n * 1000) / 1000;
-function cssLength(pt) {
-  const inches = round3(pt / 72);
-  return Math.abs(inches * 72 - pt) < 0.000001 ? `${inches}in` : `${round3(pt)}pt`;
-}
-function formatPageSize(page) {
-  return `${cssLength(page.width)} ${cssLength(page.height)}`;
-}
-function printAreaMeta(page) {
-  const area = JSON.stringify({
-    width: page.width,
-    height: page.height,
-    bleed: page.bleed ?? 0,
-    safe: page.safe ?? 0,
-    artSafe: page.artSafe,
-    gutter: page.gutter,
-    preset: page.preset,
-    spec: page.spec
-  });
-  return `<meta name="gp-print-area" content='${area.replace(/&/g, "&amp;").replace(/'/g, "&#39;")}'>`;
-}
-function pageBoxes(area, side, scale = 1) {
-  const w = area.width * scale;
-  const h = area.height * scale;
-  const b = Math.max(0, area.bleed) * scale;
-  const s = Math.max(0, area.safe) * scale;
-  const a = Math.max(0, area.artSafe) * scale;
-  const g = Math.max(0, area.gutter) * scale;
-  const [textLeft, textRight] = side === "verso" ? [s, g] : [g, s];
-  const [artLeft, artRight] = side === "verso" ? [a, g] : [g, a];
-  const trim = { x: side === "verso" ? b : 0, y: b, w: Math.max(0, w - b), h: Math.max(0, h - 2 * b) };
-  return {
-    sheet: { x: 0, y: 0, w, h },
-    trim,
-    safe: {
-      x: trim.x + textLeft,
-      y: trim.y + s,
-      w: Math.max(0, trim.w - textLeft - textRight),
-      h: Math.max(0, trim.h - 2 * s)
-    },
-    safeArt: {
-      x: trim.x + artLeft,
-      y: trim.y + a,
-      w: Math.max(0, trim.w - artLeft - artRight),
-      h: Math.max(0, trim.h - 2 * a)
-    },
-    bleed: b
-  };
-}
-var SEVERITY = { inside: 0, unsafe: 1, bleed: 2, "off-page": 3 };
-function judgeRect(r, boxes, rule, tol = 0) {
-  const { sheet, trim } = boxes;
-  const safe = rule === "art" ? boxes.safeArt : boxes.safe;
-  const sides = [
-    ["left", -r.x, -safe.x, -trim.x, -sheet.x],
-    ["right", r.x + r.w, safe.x + safe.w, trim.x + trim.w, sheet.x + sheet.w],
-    ["top", -r.y, -safe.y, -trim.y, -sheet.y],
-    ["bottom", r.y + r.h, safe.y + safe.h, trim.y + trim.h, sheet.y + sheet.h]
-  ];
-  let worst = { kind: "inside", gap: 0, need: 0, edge: null };
-  let beyond = 0;
-  for (const [edge, ink, limit, trimEdge, sheetEdge] of sides) {
-    const past = ink - limit;
-    if (past <= tol || rule === "art" && ink >= sheetEdge - tol)
-      continue;
-    const kind = ink > sheetEdge + tol ? "off-page" : ink > trimEdge + tol ? "bleed" : "unsafe";
-    if (SEVERITY[kind] > SEVERITY[worst.kind] || kind === worst.kind && past > beyond) {
-      worst = { kind, gap: trimEdge - ink, need: trimEdge - limit, edge };
-      beyond = past;
-    }
-  }
-  return worst;
-}
-
 // src/checks/pdf/safe-margins.ts
 var TOLERANCE_PT = 0.5;
 var ABOVE_BASELINE = 0.8;
@@ -1388,6 +1315,7 @@ var ruleRiskyProps = "printsafe/no-risky-print-effects";
 var ruleSyntax = "printsafe/syntax-error";
 var rulePageContainment = "printsafe/page-containment";
 var rulePreviewCannotFollow = "printsafe/preview-cannot-follow";
+var rulePageSizeInStylesheet = "printsafe/page-size-in-stylesheet";
 function extractUrls(value) {
   const urls = [];
   const re = /url\(\s*(['"]?)(.*?)\1\s*\)/gi;
@@ -1436,6 +1364,12 @@ function isInPageBox(decl) {
   const page = decl.parent;
   return !!page && page.type === "atrule" && page.name.toLowerCase() === "page";
 }
+function isInBookPageRule(decl) {
+  if (!isInPageBox(decl))
+    return false;
+  const params = decl.parent.params.trim();
+  return params === "" || /^(:[a-z-]+\s*)+$/i.test(params);
+}
 function isDroppedPageGradient(decl) {
   const prop = decl.prop.toLowerCase();
   if (prop !== "background" && prop !== "background-image")
@@ -1675,6 +1609,15 @@ function checkCssRaw(css, from) {
   root.walkAtRules((at) => reportRemoteUrls(at.params || "", at));
   root.walkDecls((decl) => {
     const prop = decl.prop.toLowerCase();
+    if (prop === "size" && isInBookPageRule(decl)) {
+      warnings.push({
+        rule: rulePageSizeInStylesheet,
+        severity: "warning",
+        message: `"size" in a stylesheet's @page rule is ignored: the page size comes from the manifest (preset:, or page: width and height — Setup > Details in the app), which is written after every stylesheet. Remove this declaration; to print at another size, change the manifest.`,
+        ...nodeLoc(decl)
+      });
+      return;
+    }
     if (isInertValue(prop, decl.value))
       return;
     if (marginBoxIgnoredProperties.has(prop) && isInPageMarginBox(decl)) {
@@ -3995,16 +3938,25 @@ function canonicalChapterId(p) {
 }
 
 // src/lib/markdown/assemble.ts
-function defaultPageSizeCss(css, page) {
+function pageGeometryCss(page) {
   if (!page || !isPositivePoints(page.width) || !isPositivePoints(page.height))
     return null;
-  try {
-    if (resolvePage(extract(css)).decls.size !== undefined)
-      return null;
-  } catch {
+  const size2 = `size: ${formatPageSize(page)};`;
+  const m = page.margin;
+  if (!m)
+    return `@page { ${size2} }`;
+  const [top, bottom, inside, outside] = [m.top, m.bottom, m.inside, m.outside].map(cssLength);
+  const recto = `margin: ${top} ${outside} ${bottom} ${inside};`;
+  const verso = `margin: ${top} ${inside} ${bottom} ${outside};`;
+  return [`@page { ${size2} ${recto} }`, `@page :left { ${verso} }`, `@page :right { ${recto} }`].join(`
+`);
+}
+function defaultPageMarginCss(page) {
+  if (!page || page.margin)
     return null;
-  }
-  return `@page { size: ${formatPageSize(page)}; }`;
+  return `@layer gp.vocab {
+@page { margin: ${cssLength(DEFAULT_PAGE_MARGIN_PT)}; }
+}`;
 }
 async function assembleBookHtml(opts) {
   const title = opts.title ?? "Document";
@@ -4044,8 +3996,8 @@ async function assembleBookHtml(opts) {
       imageRefs.add(ref);
     opts.onImageRefs([...imageRefs]);
   }
-  const pageSize = defaultPageSizeCss(`${pluginCss}
-${projectCss}`, opts.printArea);
+  const pageGeometry = pageGeometryCss(opts.printArea);
+  const defaultMargin = defaultPageMarginCss(opts.printArea);
   const inlineCss = [
     "@layer gp.marker, gp.vocab;",
     `/* gutterpress markers */
@@ -4057,14 +4009,16 @@ ${TWO_VERSIONS_CSS.trim()}
 @layer gp.vocab {
 ${GUTTERPRESS_CSS.trim()}
 }`,
-    pageSize ? `/* page size (manifest) */
-${pageSize}` : null,
+    defaultMargin ? `/* page margins (default) */
+${defaultMargin}` : null,
     pluginCss ? `/* extension css */
 ${pluginCss.trim()}` : null,
     `/* column alignment */
 ${TABLE_ALIGN_CSS.trim()}`,
     projectCss ? `/* project css */
-${projectCss.trim()}` : null
+${projectCss.trim()}` : null,
+    pageGeometry ? `/* page geometry (manifest) */
+${pageGeometry}` : null
   ].filter(Boolean).join(`
 
 `);
@@ -5206,7 +5160,7 @@ class PdfOutput {
       const rawPdf = pdfxMode ? path7.join(stage, "raw.pdf") : path7.resolve(pdfFile);
       await fsp2.mkdir(path7.dirname(path7.resolve(pdfFile)), { recursive: true });
       log.info("Rendering HTML to PDF via the Gutterpress engine (native Chromium pagination)");
-      const { buildNativePdf } = await import("./engine-mc5br8g8.js");
+      const { buildNativePdf } = await import("./engine-m4y10shc.js");
       const engineDiagnostics = await buildNativePdf(htmlFile, rawPdf, {
         title: config.title,
         author: config.authors.length > 0 ? config.authors.join(", ") : undefined,
@@ -6501,17 +6455,30 @@ import { constants as FS, existsSync as existsSync7 } from "node:fs";
 import path12 from "node:path";
 
 // src/lib/page-size.ts
-import postcss5 from "postcss";
-import { isMap, Scalar } from "yaml";
+import { isMap } from "yaml";
 function writePageBounds(doc, page) {
   const tolerance = page.tolerance ?? numberAt(doc, ["page", "tolerance"]);
-  if (!isMap(doc.get("page", true)))
-    doc.set("page", doc.createNode({}));
+  ensurePageMap(doc);
   doc.setIn(["page", "width"], page.width);
   doc.setIn(["page", "height"], page.height);
   if (tolerance !== undefined)
     doc.setIn(["page", "tolerance"], tolerance);
 }
+function deletePageBounds(doc) {
+  const block = doc.get("page", true);
+  if (!isMap(block)) {
+    doc.delete("page");
+    return;
+  }
+  for (const key of ["width", "height", "tolerance"])
+    block.delete(key);
+  if (block.items.length === 0)
+    doc.delete("page");
+}
+function ensurePageMap(doc) {
+  if (!isMap(doc.get("page", true)))
+    doc.set("page", doc.createNode({}));
+}
 function numberAt(doc, keyPath) {
   const v = doc.getIn(keyPath);
   return isPositivePoints(v) ? v : undefined;
@@ -6520,13 +6487,15 @@ function numberAt(doc, keyPath) {
 // src/lib/project-scaffold.ts
 function starterOverridesCss() {
   return `/**
- * Your book's own styles.
+ * Your book's own styles. Rules here win over your look's.
  *
- * This file loads AFTER every extension, so any rule you add here overrides
- * a look's defaults. A new book has no look until its template or you add
- * one:
- *   gutterpress ext add academic <book>    (a built-in look)
- *   gutterpress ext add <package> <book>   (a look from npm)
+ * In the app you rarely need this file: Setup > Looks & features adds a
+ * look, Setup > Design changes its fonts, colors and sizes (those changes
+ * are saved here as :root custom properties), and Setup > Details sets the
+ * page size and margins (in the manifest).
+ *
+ * To change the look from the command line: gutterpress ext remove <old>
+ * <book>, then gutterpress ext add <look> <book>.
  */
 `;
 }
@@ -6649,6 +6618,8 @@ async function scaffoldProject(options) {
       if (preset) {
         doc.set("preset", preset);
         doc.set("targets", doc.createNode(targets ?? []));
+        if (preset !== "custom")
+          deletePageBounds(doc);
       }
       if (options.customPage)
         writePageBounds(doc, options.customPage);
@@ -9020,7 +8991,7 @@ async function resolvePublishProvider(id, book) {
   const ext = await bookExtensions(book);
   const npmEntry = ext.extensions.some((c) => !c.path && c.name === id);
   if (npmEntry) {
-    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-g8jnmmzq.js");
+    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-tmxtzkm0.js");
     await restoreForCommand2(book.projectDir, { manifestPath: book.manifestPath, failFast: true });
   }
   const publishers = await discover(ext);
@@ -9058,7 +9029,7 @@ function infoFor(p) {
 }
 function pluginProvider(p) {
   let loading;
-  const load = () => loading ??= import("./plugins-1sxe0dkz.js").then((m) => m.loadPublishFunction(p));
+  const load = () => loading ??= import("./plugins-4vaf27n9.js").then((m) => m.loadPublishFunction(p));
   return {
     info: infoFor(p),
     async authenticate() {
@@ -9332,10 +9303,10 @@ async function disconnectPublishCredential(key, deps, options = {}) {
   }
 }
 // src/lib/manifest-config.ts
-import { isSeq as isSeq2, isMap as isMap3, YAMLSeq, Scalar as Scalar2 } from "yaml";
+import { isSeq as isSeq2, isMap as isMap3, YAMLSeq, Scalar } from "yaml";
 // src/lib/version-changes.ts
 import git3 from "isomorphic-git";
-import postcss6 from "postcss";
+import postcss5 from "postcss";
 
 // src/lib/remote-auth/transport.ts
 import git2 from "isomorphic-git";

package/dist/{cli-kh8v4vvw.js → cli-5jzyw06s.js}

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