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

package/dist/{publish-qgsngy8s.js → publish-fez14ad4.js}

@@ -10,12 +10,12 @@ import {
   resolvePublishFormat,
   resolvePublishProvider,
   runPublish
-} from "./cli-xq6djqbj.js";
+} from "./cli-1h17ktsg.js";
 import {
   FileTokenStore
-} from "./cli-evg8sbht.js";
+} from "./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";
@@ -23,17 +23,17 @@ import"./cli-a35w7wzg.js";
 import"./cli-v5mp7a6q.js";
 import {
   loadManifestWithPath
-} from "./cli-sdmv4bba.js";
-import"./cli-pwwfxdgb.js";
+} from "./cli-h4x81x97.js";
+import"./cli-t8be9yeb.js";
 import {
   log
-} from "./cli-aqh6brew.js";
+} from "./cli-s6djx4ma.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
 } from "./cli-d8xjns66.js";
-import"./cli-kh8v4vvw.js";
+import"./cli-5jzyw06s.js";
 import {
   BuildError,
   EXIT_CODES

package/dist/render.js

@@ -2991,458 +2991,6 @@ function printAreaMeta(page) {
 }
 
 // src/engine/shared/gcpm-extract.ts
-var NESTED_AT_RULES = /^@(media|supports|layer|scope|container|document)\b/i;
-function scanRules(css) {
-  const out = [];
-  let i = 0;
-  let start = 0;
-  let depth = 0;
-  let bodyStart = -1;
-  while (i < css.length) {
-    const c = css[i];
-    if (c === "/" && css[i + 1] === "*") {
-      const end = css.indexOf("*/", i + 2);
-      i = end === -1 ? css.length : end + 2;
-      continue;
-    }
-    if (c === '"' || c === "'") {
-      i = skipString(css, i);
-      continue;
-    }
-    if (c === "{") {
-      if (depth === 0)
-        bodyStart = i;
-      depth++;
-      i++;
-      continue;
-    }
-    if (c === "}") {
-      depth--;
-      if (depth === 0) {
-        out.push({
-          prelude: stripComments(css.slice(start, bodyStart)).trim(),
-          body: css.slice(bodyStart + 1, i)
-        });
-        start = i + 1;
-      }
-      i++;
-      continue;
-    }
-    if (c === ";" && depth === 0) {
-      const stmt = stripComments(css.slice(start, i)).trim();
-      if (stmt)
-        out.push({ statement: stmt });
-      start = i + 1;
-      i++;
-      continue;
-    }
-    i++;
-  }
-  return out;
-}
-function stripComments(s) {
-  let out = "";
-  let i = 0;
-  while (i < s.length) {
-    if (s[i] === "/" && s[i + 1] === "*") {
-      const end = s.indexOf("*/", i + 2);
-      i = end === -1 ? s.length : end + 2;
-      continue;
-    }
-    if (s[i] === '"' || s[i] === "'") {
-      const end = skipString(s, i);
-      out += s.slice(i, end);
-      i = end;
-      continue;
-    }
-    out += s[i++];
-  }
-  return out;
-}
-function skipString(css, i) {
-  const quote = css[i];
-  i++;
-  while (i < css.length) {
-    if (css[i] === "\\")
-      i += 2;
-    else if (css[i] === quote)
-      return i + 1;
-    else
-      i++;
-  }
-  return i;
-}
-function parseDeclarations(body) {
-  const decls = {};
-  let i = 0;
-  let start = 0;
-  let depth = 0;
-  const push = (chunk) => {
-    const s = stripComments(chunk).trim();
-    if (!s)
-      return;
-    const colon = indexOfTopLevel(s, ":");
-    if (colon <= 0)
-      return;
-    const rawProp = s.slice(0, colon).trim();
-    const prop = rawProp.startsWith("--") ? rawProp : rawProp.toLowerCase();
-    const value = s.slice(colon + 1).trim().replace(/\s*!important$/i, "");
-    if (prop)
-      decls[prop] = value;
-  };
-  while (i < body.length) {
-    const c = body[i];
-    if (c === "/" && body[i + 1] === "*") {
-      const end = body.indexOf("*/", i + 2);
-      i = end === -1 ? body.length : end + 2;
-      continue;
-    }
-    if (c === '"' || c === "'") {
-      i = skipString(body, i);
-      continue;
-    }
-    if (c === "(" || c === "{" || c === "[")
-      depth++;
-    else if (c === ")" || c === "}" || c === "]")
-      depth--;
-    else if (c === ";" && depth === 0) {
-      push(body.slice(start, i));
-      start = i + 1;
-    }
-    i++;
-  }
-  push(body.slice(start));
-  return decls;
-}
-function indexOfTopLevel(s, ch) {
-  let depth = 0;
-  for (let i = 0;i < s.length; i++) {
-    const c = s[i];
-    if (c === '"' || c === "'") {
-      i = skipString(s, i) - 1;
-      continue;
-    }
-    if (c === "(")
-      depth++;
-    else if (c === ")")
-      depth--;
-    else if (c === ch && depth === 0)
-      return i;
-  }
-  return -1;
-}
-function extract(css) {
-  const model = {
-    pageRules: [],
-    stringSets: [],
-    pageAssignments: [],
-    breaks: [],
-    xrefs: [],
-    counterResets: [],
-    pageNames: [],
-    warnings: []
-  };
-  walk(css, model);
-  resolveGeometryVars(model, collectRootCustomProperties(css));
-  const names = new Set;
-  for (const r of model.pageRules)
-    if (r.name)
-      names.add(r.name);
-  for (const a of model.pageAssignments)
-    names.add(a.page);
-  model.pageNames = [...names];
-  return model;
-}
-var GEOMETRY_PROPS = [
-  "size",
-  "margin",
-  "margin-top",
-  "margin-right",
-  "margin-bottom",
-  "margin-left",
-  "bleed",
-  "marks"
-];
-function collectRootCustomProperties(css) {
-  const props = new Map;
-  const walkForRoot = (body) => {
-    for (const rule of scanRules(body)) {
-      if ("statement" in rule)
-        continue;
-      const { prelude, body: ruleBody } = rule;
-      if (NESTED_AT_RULES.test(prelude)) {
-        walkForRoot(ruleBody);
-        continue;
-      }
-      if (!prelude.startsWith("@")) {
-        const selectors = splitTopLevel(prelude, ",");
-        if (selectors.some((s) => s.trim() === ":root")) {
-          const decls = parseDeclarations(ruleBody);
-          for (const [k, v] of Object.entries(decls)) {
-            if (k.startsWith("--"))
-              props.set(k, v);
-          }
-        }
-      }
-    }
-  };
-  walkForRoot(css);
-  return props;
-}
-function matchParen(s, open) {
-  let depth = 0;
-  let i = open;
-  while (i < s.length) {
-    const c = s[i];
-    if (c === '"' || c === "'") {
-      i = skipString(s, i);
-      continue;
-    }
-    if (c === "(")
-      depth++;
-    else if (c === ")") {
-      depth--;
-      if (depth === 0)
-        return i;
-    }
-    i++;
-  }
-  return -1;
-}
-function resolveVarsInValue(value, customProps, stack = new Set) {
-  let out = "";
-  let i = 0;
-  while (i < value.length) {
-    const isVarStart = /^var\(/i.test(value.slice(i, i + 4)) && (i === 0 || !/[\w-]/.test(value[i - 1]));
-    if (!isVarStart) {
-      out += value[i];
-      i++;
-      continue;
-    }
-    const open = i + 3;
-    const close = matchParen(value, open);
-    if (close === -1) {
-      out += value.slice(i);
-      break;
-    }
-    const inner = value.slice(open + 1, close);
-    const commaIdx = indexOfTopLevel(inner, ",");
-    const name = (commaIdx === -1 ? inner : inner.slice(0, commaIdx)).trim();
-    const fallback = commaIdx === -1 ? undefined : inner.slice(commaIdx + 1).trim();
-    if (!/^--[\w-]+$/.test(name)) {
-      return { text: out, unresolved: `var(${inner}) is not a valid custom property reference` };
-    }
-    if (stack.has(name)) {
-      return { text: out, unresolved: `var(${name}) is circular` };
-    }
-    const rootValue = customProps.get(name);
-    if (rootValue !== undefined) {
-      const nested = resolveVarsInValue(rootValue, customProps, new Set(stack).add(name));
-      if (nested.unresolved)
-        return { text: out, unresolved: nested.unresolved };
-      out += nested.text;
-    } else if (fallback !== undefined) {
-      if (/\bvar\(/i.test(fallback)) {
-        return {
-          text: out,
-          unresolved: `var(${name}, ${fallback}) — a fallback containing another var() is not resolved`
-        };
-      }
-      out += fallback;
-    } else {
-      return {
-        text: out,
-        unresolved: `${name} is not defined at :root and var() has no fallback`
-      };
-    }
-    i = close + 1;
-  }
-  return { text: out };
-}
-function resolveGeometryVars(model, customProps) {
-  for (const rule of model.pageRules) {
-    for (const prop of GEOMETRY_PROPS) {
-      const value = rule.decls[prop];
-      if (!value || !/\bvar\(/i.test(value))
-        continue;
-      const { text, unresolved } = resolveVarsInValue(value, customProps);
-      if (unresolved) {
-        throw new Error(`${rule.raw} { ${prop}: ${value} } — cannot resolve ${unresolved}. ` + `Define the custom property at :root, add a literal var(--x, fallback) fallback, or use a literal value.`);
-      }
-      const unparsable = unparsableGeometry(prop, text);
-      if (unparsable) {
-        throw new Error(`${rule.raw} { ${prop}: ${value} } — resolves to \`${text.trim()}\`, ${unparsable}. ` + `Use a value this engine can read (a length like 0.75in/12pt/10mm, or a named page size for \`size\`).`);
-      }
-      rule.decls[prop] = text;
-    }
-  }
-}
-function unparsableGeometry(prop, text) {
-  const t = text.trim();
-  if (prop === "size") {
-    if (!t)
-      return "which is empty";
-    return parseSize(t) ? undefined : "which is not a page size";
-  }
-  if (prop === "margin" || prop.startsWith("margin-")) {
-    if (!t)
-      return "which is empty";
-    const parts = t.split(/\s+/);
-    if (prop !== "margin" && parts.length !== 1)
-      return "which is not a single length";
-    if (parts.length > 4)
-      return "which is not a valid margin";
-    const bad = parts.filter((p) => toPt(p) === undefined);
-    if (bad.length)
-      return `which this engine cannot read as a length (\`${bad[0]}\`)`;
-    return;
-  }
-  if (prop === "bleed") {
-    if (!t)
-      return "which is empty";
-    if (/^(auto|none)$/i.test(t))
-      return;
-    return toPt(t) === undefined ? "which this engine cannot read as a length" : undefined;
-  }
-  return;
-}
-function walk(css, model) {
-  for (const rule of scanRules(css)) {
-    if ("statement" in rule)
-      continue;
-    const { prelude, body } = rule;
-    if (NESTED_AT_RULES.test(prelude)) {
-      walk(body, model);
-      continue;
-    }
-    if (/^@page\b/i.test(prelude)) {
-      model.pageRules.push(parsePageRule(prelude, body));
-      continue;
-    }
-    if (prelude.startsWith("@"))
-      continue;
-    parseQualifiedRule(prelude, body, model);
-  }
-}
-function parsePageRule(prelude, body) {
-  const sel = prelude.replace(/^@page\s*/i, "").trim();
-  const nameMatch = /^([A-Za-z_][\w-]*)/.exec(sel);
-  const pseudos = [...sel.matchAll(/:([A-Za-z-]+)(\([^)]*\))?/g)].map((m) => m[1] + (m[2] ?? ""));
-  const rule = {
-    name: nameMatch?.[1],
-    pseudos,
-    decls: {},
-    marginBoxes: {},
-    raw: `@page ${sel}`.trim()
-  };
-  let rest = "";
-  let i = 0;
-  while (i < body.length) {
-    const at = findNextAtRule(body, i);
-    if (at === -1) {
-      rest += body.slice(i);
-      break;
-    }
-    rest += body.slice(i, at);
-    const open = body.indexOf("{", at);
-    if (open === -1) {
-      rest += body.slice(at);
-      break;
-    }
-    const name = body.slice(at + 1, open).trim().toLowerCase();
-    let depth = 1;
-    let j = open + 1;
-    while (j < body.length && depth > 0) {
-      const c = body[j];
-      if (c === "/" && body[j + 1] === "*") {
-        const end = body.indexOf("*/", j + 2);
-        j = end === -1 ? body.length : end + 2;
-        continue;
-      }
-      if (c === '"' || c === "'") {
-        j = skipString(body, j);
-        continue;
-      }
-      if (c === "{")
-        depth++;
-      else if (c === "}")
-        depth--;
-      j++;
-    }
-    rule.marginBoxes[`@${name}`] = parseDeclarations(body.slice(open + 1, j - 1));
-    i = j;
-  }
-  rule.decls = parseDeclarations(rest);
-  return rule;
-}
-function findNextAtRule(body, start) {
-  let i = start;
-  while (i < body.length) {
-    const c = body[i];
-    if (c === "/" && body[i + 1] === "*") {
-      const end = body.indexOf("*/", i + 2);
-      i = end === -1 ? body.length : end + 2;
-      continue;
-    }
-    if (c === '"' || c === "'") {
-      i = skipString(body, i);
-      continue;
-    }
-    if (c === "@")
-      return i;
-    i++;
-  }
-  return -1;
-}
-function parseQualifiedRule(selector, body, model) {
-  const decls = parseDeclarations(body);
-  for (const [prop, value] of Object.entries(decls)) {
-    if (prop === "string-set") {
-      for (const entry of splitTopLevel(value, ",")) {
-        const m = /^\s*([A-Za-z_][\w-]*)\s+(.+)$/.exec(entry);
-        if (m && m[1] !== undefined && m[2] !== undefined)
-          model.stringSets.push({ selector, name: m[1], value: m[2].trim() });
-      }
-    } else if (prop === "page") {
-      if (value && value !== "auto")
-        model.pageAssignments.push({ selector, page: value.trim() });
-    } else if (prop === "break-before" || prop === "break-after" || prop === "break-inside") {
-      model.breaks.push({ selector, prop, value });
-    } else if (prop === "counter-reset") {
-      const m = /\bpage\s+(-?\d+)/.exec(value);
-      if (m)
-        model.counterResets.push({ selector, start: Number(m[1]) });
-    } else if (prop === "content") {
-      for (const fn of ["target-counter", "target-text", "leader", "string"]) {
-        if (new RegExp(`\\b${fn}\\s*\\(`).test(value)) {
-          model.xrefs.push({ selector, content: value, fn });
-        }
-      }
-    }
-  }
-}
-function splitTopLevel(s, sep) {
-  const out = [];
-  let depth = 0;
-  let start = 0;
-  for (let i = 0;i < s.length; i++) {
-    const c = s[i];
-    if (c === '"' || c === "'") {
-      i = skipString(s, i) - 1;
-      continue;
-    }
-    if (c === "(")
-      depth++;
-    else if (c === ")")
-      depth--;
-    else if (c === sep && depth === 0) {
-      out.push(s.slice(start, i));
-      start = i + 1;
-    }
-  }
-  out.push(s.slice(start));
-  return out.map((x) => x.trim()).filter(Boolean);
-}
 var UNITS_PER_PT = {
   pt: 1,
   px: 0.75,
@@ -3452,115 +3000,28 @@ var UNITS_PER_PT = {
   mm: 72 / 25.4,
   q: 72 / 101.6
 };
-function toPt(value) {
-  const m = /^(-?[\d.]+)([a-z%]*)$/i.exec(value.trim());
-  if (!m)
-    return;
-  const n = Number(m[1]);
-  const unit = (m[2] || "px").toLowerCase();
-  const factor = UNITS_PER_PT[unit];
-  return factor === undefined ? undefined : n * factor;
-}
-var PAGE_SIZES = {
-  a5: [419.53, 595.28],
-  a4: [595.28, 841.89],
-  a3: [841.89, 1190.55],
-  b5: [498.9, 708.66],
-  b4: [708.66, 1000.63],
-  "jis-b5": [515.91, 728.5],
-  "jis-b4": [728.5, 1031.81],
-  letter: [612, 792],
-  legal: [612, 1008],
-  ledger: [1224, 792]
-};
-function parseSize(value) {
-  const parts = value.trim().split(/\s+/);
-  let landscape = false;
-  const lens = [];
-  let named;
-  for (const p of parts) {
-    const key = p.toLowerCase();
-    if (key === "landscape")
-      landscape = true;
-    else if (key === "portrait")
-      continue;
-    else if (PAGE_SIZES[key])
-      named = PAGE_SIZES[key];
-    else {
-      const pt = toPt(p);
-      if (pt !== undefined)
-        lens.push(pt);
-    }
-  }
-  let w, h;
-  if (named)
-    [w, h] = named;
-  else if (lens.length === 1)
-    [w, h] = [lens[0], lens[0]];
-  else if (lens.length >= 2)
-    [w, h] = [lens[0], lens[1]];
-  else
-    return;
-  if (landscape && h > w)
-    [w, h] = [h, w];
-  return { width: w, height: h };
-}
-function parseMargin(value) {
-  const parts = value.trim().split(/\s+/).map((p) => toPt(p) ?? 0);
-  const a = parts[0] ?? 0;
-  const b = parts[1] ?? a;
-  const c = parts[2] ?? a;
-  const d = parts[3] ?? b;
-  return { top: a, right: b, bottom: c, left: d };
-}
-function resolvePage(model, ctx = {}) {
-  const wanted = new Set(ctx.pseudos ?? []);
-  const applicable = model.pageRules.filter((r) => r.name ? r.name === ctx.name : true).filter((r) => r.pseudos.every((p) => wanted.has(p))).sort((a, b) => specificity(a) - specificity(b));
-  const decls = {};
-  const marginBoxes = {};
-  const margin = { top: 72, right: 72, bottom: 72, left: 72 };
-  for (const rule of applicable) {
-    for (const [prop, value] of Object.entries(rule.decls)) {
-      if (prop === "margin")
-        Object.assign(margin, parseMargin(value));
-      else if (prop === "margin-top" || prop === "margin-right" || prop === "margin-bottom" || prop === "margin-left") {
-        const side = prop.slice(7);
-        margin[side] = toPt(value) ?? margin[side];
-      }
-    }
-    Object.assign(decls, rule.decls);
-    for (const [box, d] of Object.entries(rule.marginBoxes)) {
-      marginBoxes[box] = { ...marginBoxes[box] ?? {}, ...d };
-    }
-  }
-  const size = parseSize(decls.size ?? "letter") ?? { width: 612, height: 792 };
-  return {
-    decls,
-    marginBoxes,
-    geometry: {
-      width: size.width,
-      height: size.height,
-      margin,
-      bleed: decls.bleed ? toPt(decls.bleed) ?? 0 : 0,
-      marks: (decls.marks ?? "none").split(/\s+/).filter((m) => m && m !== "none")
-    }
-  };
-}
-function specificity(r) {
-  return (r.name ? 2 : 0) + r.pseudos.length;
-}
+var DEFAULT_PAGE_MARGIN_PT = 72;
 
 // 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 size = `size: ${formatPageSize(page)};`;
+  const m = page.margin;
+  if (!m)
+    return `@page { ${size} }`;
+  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 { ${size} ${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";
@@ -3600,8 +3061,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 */
@@ -3613,14 +3074,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(`
 
 `);

package/dist/schema/manifest.types.d.ts

@@ -88,6 +88,17 @@ interface PublishSettings {
         format?: "pdf" | "html";
     };
 }
+/**
+ * Page margins in points: the space between the trim and the text on each
+ * edge. `inside` is the binding edge (the left of a right-hand page, the
+ * right of a left-hand one), `outside` the other. All four together.
+ */
+export interface PageMargin {
+    top: number;
+    bottom: number;
+    inside: number;
+    outside: number;
+}
 export interface GutterpressManifest {
     title?: string;
     authors?: string[];
@@ -217,6 +228,15 @@ export interface GutterpressManifest {
          * and `custom` none.
          */
         gutter?: number;
+        /**
+         * Page margins (pt), the space between the trim and the text on each
+         * edge — `inside` is the binding edge, `outside` the other. Setup >
+         * Details in the app writes it. When set, the book prints with these
+         * margins and any `@page` margin in a stylesheet is overridden; left
+         * out, the stylesheets' `@page` margins apply (a look's design), else
+         * 1in. All four edges are required together.
+         */
+        margin?: PageMargin;
     };
     ink?: {
         maxTac?: number;
@@ -364,6 +384,8 @@ export interface ResolvedConfig {
         artSafe?: number;
         /** The binding edge's inset from the trim in pt, text and art alike (see the manifest field); absent = same as `safe`. */
         gutter?: number;
+        /** The margins the book prints with, in pt (see the manifest field); absent = the stylesheets' `@page` margins, else 1in. */
+        margin?: PageMargin;
     };
     ink: {
         maxTac: number;