gutterpress 0.11.17 → 0.11.18-alpha.10

package/dist/render.js

@@ -86,10 +86,11 @@ function parseMarkerLine(line, declaredWords) {
   const kind = head.slice(1);
   if (!KNOWN_KINDS.includes(kind) && !(declaredWords && declaredWords.has(kind)))
     return null;
-  if (kind === "page-break" || kind === "column-break" || kind === "continue" || kind.startsWith("end-")) {
+  if (kind === "continue" || kind.startsWith("end-")) {
     return { kind, name: null, attrs: {} };
   }
-  const body = tokens.slice(1);
+  const isBreak = kind === "page-break" || kind === "column-break";
+  const body = isBreak ? tokens.slice(1).filter((token) => !isBareToken(token)) : tokens.slice(1);
   const hasExplicitAttrsOrShorthand = body.some((token) => token.includes("=") || token.startsWith(".") || token.startsWith("#"));
   const bareTokens = body.filter(isBareToken);
   let name = null;
@@ -157,6 +158,8 @@ function parseMarkerLine(line, declaredWords) {
   }
   if (classes.length)
     attrs.class = classes.join(" ");
+  if (isBreak)
+    return { kind, name: null, attrs };
   const marker = { kind, name, attrs };
   if (hasAmbiguousBareToken)
     marker.__ambiguousBareToken = true;
@@ -339,6 +342,11 @@ function attachDataAttrs(token, kind, name, attrs) {
     token.attrSet(k.startsWith("data-") ? k : `data-${k}`, v);
   }
 }
+function attachBreak(token, baseClass, attrs = {}) {
+  addClasses(token, baseClass, attrs.class);
+  token.attrSet("aria-hidden", "true");
+  attachDataAttrs(token, "break", null, attrs);
+}
 var DECLARED_NAME_RE = /^[a-z][a-z0-9-]*$/;
 function validateDeclaredMarkerName(name, pluginName) {
   if (!DECLARED_NAME_RE.test(name)) {
@@ -895,7 +903,11 @@ function plugin(md, pluginOptions = {}) {
         attachDataAttrs(t, component.kind, component.variant, meta.attrs || {});
       else
         attachDataAttrs(t, "section", meta.name, meta.attrs || {});
-      t.meta = component ? { line: meta.__line, ...component, ...meta.__continued ? { continued: true } : {} } : { line: meta.__line };
+      t.meta = {
+        line: meta.__line,
+        ...component || {},
+        ...meta.__continued ? { continued: true } : {}
+      };
       stack.open({
         kind: "section",
         classes: meta.attrs && meta.attrs.class || "",
@@ -993,12 +1005,12 @@ function plugin(md, pluginOptions = {}) {
         drainDeclaredFrames(keep);
         const contMeta = {
           name: section.meta.name,
-          attrs: { ...section.meta.attrs || {} }
+          attrs: { ...section.meta.attrs || {} },
+          __continued: true
         };
-        if (section.meta.component) {
+        delete contMeta.attrs.id;
+        if (section.meta.component)
           contMeta.__component = section.meta.component;
-          contMeta.__continued = true;
-        }
         contMeta.__line = line;
         const cls = (contMeta.attrs.class || "").split(/\s+/).filter(Boolean);
         if (!cls.includes("gp-continued"))
@@ -1011,16 +1023,14 @@ function plugin(md, pluginOptions = {}) {
       if (kind === "page-break") {
         const t = new state.Token("layout_page_break", "div", 0);
         t.meta = { line };
-        t.attrSet("class", "gp-page-break");
-        t.attrSet("aria-hidden", "true");
+        attachBreak(t, "gp-page-break", meta.attrs);
         out.push(t);
         continue;
       }
       if (kind === "column-break") {
         const t = new state.Token("layout_column_break", "div", 0);
         t.meta = { line };
-        t.attrSet("class", "gp-column-break");
-        t.attrSet("aria-hidden", "true");
+        attachBreak(t, "gp-column-break", meta.attrs);
         out.push(t);
         continue;
       }
@@ -1084,24 +1094,10 @@ function plugin(md, pluginOptions = {}) {
       }
     });
   }
-  md.renderer.rules.layout_page_break = (tokens, idx) => {
-    const cls = tokens[idx].attrGet("class") || "gp-page-break";
-    const rangeAttr = tokens[idx].attrGet("data-source-range");
-    const rangeHtml = rangeAttr ? ` data-source-range="${escapeAttr(rangeAttr)}"` : "";
-    const chapterAttr = tokens[idx].attrGet("data-chapter-src");
-    const chapterHtml = chapterAttr ? ` data-chapter-src="${escapeAttr(chapterAttr)}"` : "";
-    return `<div class="${escapeAttr(cls)}" aria-hidden="true"${rangeHtml}${chapterHtml}></div>
-`;
-  };
-  md.renderer.rules.layout_column_break = (tokens, idx) => {
-    const cls = tokens[idx].attrGet("class") || "gp-column-break";
-    const rangeAttr = tokens[idx].attrGet("data-source-range");
-    const rangeHtml = rangeAttr ? ` data-source-range="${escapeAttr(rangeAttr)}"` : "";
-    const chapterAttr = tokens[idx].attrGet("data-chapter-src");
-    const chapterHtml = chapterAttr ? ` data-chapter-src="${escapeAttr(chapterAttr)}"` : "";
-    return `<div class="${escapeAttr(cls)}" aria-hidden="true"${rangeHtml}${chapterHtml}></div>
+  const renderBreak = (tokens, idx, options2, env, self) => `<div${self.renderAttrs(tokens[idx])}></div>
 `;
-  };
+  md.renderer.rules.layout_page_break = renderBreak;
+  md.renderer.rules.layout_column_break = renderBreak;
   md.renderer.rules.layout_marker = () => "";
 }
 var NO_MARGIN_BOXES = [
@@ -1453,6 +1449,27 @@ var GP_CLASSES = new Set([
   "gp-flush"
 ]);
 
+// src/lib/markdown/table-align.ts
+var ALIGN = /^text-align:(left|center|right)$/;
+function gpTableAlign(md) {
+  md.core.ruler.after("block", "gp_table_align", (state) => {
+    for (const token of state.tokens) {
+      if (token.type !== "th_open" && token.type !== "td_open")
+        continue;
+      const match = ALIGN.exec(token.attrGet("style") ?? "");
+      if (!match)
+        continue;
+      token.attrs = (token.attrs ?? []).filter(([key]) => key !== "style");
+      token.attrSet("data-align", match[1]);
+    }
+  });
+}
+var TABLE_ALIGN_CSS = `
+th[data-align="left"], td[data-align="left"] { text-align: left; }
+th[data-align="center"], td[data-align="center"] { text-align: center; }
+th[data-align="right"], td[data-align="right"] { text-align: right; }
+`;
+
 // src/lib/markdown/chapter-id.ts
 function canonicalChapterId(p) {
   let s = String(p).replace(/\\/g, "/");
@@ -1598,6 +1615,152 @@ function gpPinScope(md) {
   });
 }
 
+// src/lib/slug.ts
+function slugify(name, fallback = "") {
+  return name.normalize("NFKD").replace(/[̀-ͯ]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || fallback;
+}
+
+// src/lib/markdown/block-names.ts
+var BLOCK_OPEN = /^layout_(chapter|spread|page|section|component)_open$/;
+var BLOCK_CLOSE = /^layout_(chapter|spread|page|section|component)_close$/;
+var FOLDED = {
+  ß: "ss",
+  æ: "ae",
+  œ: "oe",
+  ø: "o",
+  đ: "d",
+  ð: "d",
+  þ: "th",
+  ł: "l",
+  ı: "i"
+};
+function nameSlug(text) {
+  return slugify(text.replace(/['’]/g, "").replace(/[ßæœøđðþłı]/gi, (c) => FOLDED[c.toLowerCase()] ?? c));
+}
+function nameFromSrc(src) {
+  if (/^data:/i.test(src))
+    return "";
+  const path = src.split(/[?#]/, 1)[0] ?? "";
+  const base = path.split(/[\\/]/).pop() ?? "";
+  let decoded = base;
+  try {
+    decoded = decodeURIComponent(base);
+  } catch {}
+  return nameSlug(decoded.replace(/\.[^.]*$/, ""));
+}
+function takeExplicitName(token) {
+  const data = token.attrGet("data-name");
+  const plain = token.attrGet("name");
+  if (plain !== null && token.attrs)
+    token.attrs = token.attrs.filter(([k]) => k !== "name");
+  if (data)
+    return data;
+  if (plain) {
+    token.attrSet("data-name", plain);
+    return plain;
+  }
+  return "";
+}
+function inlineText2(inline) {
+  if (!inline || inline.type !== "inline")
+    return "";
+  const parts = [];
+  for (const child of inline.children ?? []) {
+    if (child.type === "text" || child.type === "text_special" || child.type === "code_inline" || child.type === "image") {
+      parts.push(child.content);
+    } else if (child.type === "softbreak" || child.type === "hardbreak") {
+      parts.push(" ");
+    }
+  }
+  return parts.join("");
+}
+function claim(used, slug) {
+  let name = slug;
+  for (let n = 2;used.has(name); n++)
+    name = `${slug}-${n}`;
+  used.add(name);
+  return name;
+}
+function nameBlocksAndHeadings(tokens) {
+  const blocks = [];
+  const open = [];
+  const headings = [];
+  const headingSlugs = new Map;
+  for (let i = 0;i < tokens.length; i++) {
+    const tok = tokens[i];
+    const opened = BLOCK_OPEN.exec(tok.type);
+    if (opened) {
+      const block = { token: tok, type: opened[1], heading: "" };
+      blocks.push(block);
+      open.push(block);
+      continue;
+    }
+    const closed = BLOCK_CLOSE.exec(tok.type);
+    if (closed) {
+      for (let j = open.length - 1;j >= 0; j--) {
+        if (open[j].type === closed[1]) {
+          open.splice(j, 1);
+          break;
+        }
+      }
+      continue;
+    }
+    if (tok.type === "heading_open") {
+      const slug = nameSlug(inlineText2(tokens[i + 1]));
+      headings.push(tok);
+      headingSlugs.set(tok, slug);
+      const owner = open[open.length - 1];
+      if (owner && !owner.heading)
+        owner.heading = slug;
+    }
+  }
+  const usedBlocks = new Set;
+  const usedHeadings = new Set;
+  const unnamedBlocks = new Set;
+  for (const block of blocks) {
+    const explicit = block.token.attrGet("data-name");
+    if (explicit)
+      usedBlocks.add(explicit);
+    else
+      unnamedBlocks.add(block);
+  }
+  const unnamedHeadings = [];
+  for (const heading of headings) {
+    const explicit = takeExplicitName(heading);
+    if (explicit)
+      usedHeadings.add(explicit);
+    else
+      unnamedHeadings.push(heading);
+  }
+  let previousSection = null;
+  for (const block of blocks) {
+    const { token } = block;
+    if (block.type === "section") {
+      if (token.meta?.continued && previousSection) {
+        const inherited = previousSection.token.attrGet("data-name");
+        if (inherited)
+          token.attrSet("data-name", inherited);
+        previousSection = block;
+        continue;
+      }
+      previousSection = block;
+    }
+    if (!unnamedBlocks.has(block))
+      continue;
+    const slug = nameSlug(token.attrGet("data-label") ?? "") || block.heading;
+    if (slug)
+      token.attrSet("data-name", claim(usedBlocks, slug));
+  }
+  for (const heading of unnamedHeadings) {
+    const slug = headingSlugs.get(heading);
+    if (slug)
+      heading.attrSet("data-name", claim(usedHeadings, slug));
+  }
+}
+function gpBlockNames(md) {
+  md.core.ruler.push("gp_block_names", (state) => nameBlocksAndHeadings(state.tokens));
+}
+
 // src/lib/markdown/renderer.ts
 import markdownItSourceMap from "markdown-it-source-map";
 import markdownItDeflist from "markdown-it-deflist";
@@ -1764,6 +1927,10 @@ function registerImageRule(md) {
     if (srcIdx >= 0 && token.attrs) {
       const src = token.attrs[srcIdx][1];
       if (src) {
+        const explicit = takeExplicitName(token);
+        const named = explicit || nameFromSrc(src);
+        if (named)
+          token.attrSet("data-name", named);
         const bucket = env ?? {};
         (bucket.imageRefs ??= []).push(src);
         const cls = token.attrGet("class");
@@ -2139,6 +2306,8 @@ function createMarkdownRenderer(customPlugins) {
   const declaredMarkers = buildDeclaredMarkerRegistry(declaredMarkerSources);
   md.use(plugin, { declaredMarkers });
   md.use(gpPinScope);
+  md.use(gpBlockNames);
+  md.use(gpTableAlign);
   registerImageRule(md);
   if (customPlugins && customPlugins.length > 0) {
     applyPlugins(md, customPlugins);
@@ -2224,6 +2393,8 @@ ${GUTTERPRESS_CSS.trim()}
 }`,
     pluginCss ? `/* extension css */
 ${pluginCss.trim()}` : null,
+    `/* column alignment */
+${TABLE_ALIGN_CSS.trim()}`,
     projectCss ? `/* project css */
 ${projectCss.trim()}` : null
   ].filter(Boolean).join(`

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

@@ -146,6 +146,15 @@ export interface GutterpressManifest {
         width?: number;
         height?: number;
         tolerance?: number;
+        /**
+         * A bleed (pt) the page `width` x `height` ALREADY CONTAINS, on the top,
+         * bottom and OUTER edges only (the binding edge has none) — how
+         * DriveThruRPG's interior file is cut (8.625 x 11.25in for an 8.5 x 11in
+         * book). It changes nothing in the PDF: it only tells the preview's margin
+         * & bleed overlay where the trim is. CSS `@page { bleed }` (symmetric,
+         * grows the page) wins when the stylesheet declares one.
+         */
+        bleed?: number;
     };
     ink?: {
         maxTac?: number;
@@ -261,6 +270,8 @@ export interface ResolvedConfig {
         width: number;
         height: number;
         tolerance: number;
+        /** In-sheet bleed in pt (top, bottom, outer edge; see the manifest field); absent = none. */
+        bleed?: number;
     };
     ink: {
         maxTac: number;

package/dist/{validate-x1ha1gqj.js → validate-q1xj2qxn.js}

@@ -1,16 +1,16 @@
 import {
   executeAndReport
-} from "./cli-a4qtctrw.js";
+} from "./cli-gf1ywzeg.js";
 import {
   log
-} from "./cli-zfgvssqz.js";
+} from "./cli-d0cq87s5.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-8nw6d915.js";
+} from "./cli-ytck518d.js";
 import"./cli-ht1bcqdd.js";
-import"./cli-ycbg7mxk.js";
+import"./cli-ptez7zcc.js";
 import {
   BuildError,
   EXIT_CODES

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutterpress",
-  "version": "0.11.17",
+  "version": "0.11.18-alpha.10",
   "description": "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   "author": "itlackey",
   "license": "MPL-2.0",