gutterpress 0.11.17-alpha.4 → 0.11.17-alpha.6

package/dist/render.js

@@ -432,6 +432,16 @@ function resolveContainerShape(name, pluginName, decl) {
     ...check
   };
 }
+function presetVariantOf(name, pluginName, rawDecl) {
+  const preset = rawDecl.preset !== undefined ? rawDecl.preset : {};
+  if (typeof preset !== "object" || preset === null || Array.isArray(preset)) {
+    throw new Error(`Plugin "${pluginName}"'s marker "@${name}" has a \`preset\` that is not a plain object.`);
+  }
+  if (preset.variant !== undefined && typeof preset.variant !== "string") {
+    throw new Error(`Plugin "${pluginName}"'s marker "@${name}" has a \`preset.variant\` that is not a string.`);
+  }
+  return preset.variant;
+}
 function resolveMarkerDeclaration(name, rawDecl, rawRegistry, originOf) {
   const pluginName = originOf.get(name);
   if (typeof rawDecl !== "object" || rawDecl === null || Array.isArray(rawDecl)) {
@@ -460,22 +470,22 @@ function resolveMarkerDeclaration(name, rawDecl, rawRegistry, originOf) {
     if (targetRaw.alias !== undefined) {
       throw new Error(`Plugin "${pluginName}"'s marker "@${name}" aliases "@${rawDecl.alias}", which is itself an alias. ` + `Chained aliases are not supported — alias the base marker directly.`);
     }
-    const preset = rawDecl.preset !== undefined ? rawDecl.preset : {};
-    if (typeof preset !== "object" || preset === null || Array.isArray(preset)) {
-      throw new Error(`Plugin "${pluginName}"'s marker "@${name}" has a \`preset\` that is not a plain object.`);
-    }
-    if (preset.variant !== undefined && typeof preset.variant !== "string") {
-      throw new Error(`Plugin "${pluginName}"'s marker "@${name}" has a \`preset.variant\` that is not a string.`);
-    }
     const container = resolveContainerShape(rawDecl.alias, originOf.get(rawDecl.alias), targetRaw);
-    return { name, baseKind: rawDecl.alias, presetVariant: preset.variant, ...container };
+    return { name, baseKind: rawDecl.alias, presetVariant: presetVariantOf(name, pluginName, rawDecl), ...container };
   }
-  return { name, baseKind: name, ...resolveContainerShape(name, pluginName, rawDecl) };
+  const presetVariant = presetVariantOf(name, pluginName, rawDecl);
+  return {
+    name,
+    baseKind: name,
+    ...presetVariant !== undefined ? { presetVariant } : {},
+    ...resolveContainerShape(name, pluginName, rawDecl)
+  };
 }
 var CORE_MARKER_OWNER = "Gutterpress";
 var CORE_DECLARED_MARKERS = {
   columns: {
     class: "gp-columns",
+    preset: { variant: "2" },
     variants: { 1: "gp-columns-1", 2: "gp-columns-2", 3: "gp-columns-3", 4: "gp-columns-4", 5: "gp-columns-5" }
   }
 };
@@ -651,20 +661,35 @@ function plugin(md, pluginOptions = {}) {
       const at = declaredFrameIndex(kind);
       if (at === -1)
         return false;
-      while (declaredFrames.length > at) {
-        const frame = declaredFrames.pop();
-        out.push(new state.Token("layout_component_close", frame.tag, -1));
-      }
+      drainDeclaredFrames(at);
       return true;
     }
-    function drainDeclaredFrames() {
-      while (declaredFrames.length) {
+    function sectionAbove(length) {
+      const section = stack.get("section");
+      return !!section && section.inColumns && declaredFrameIndex("columns") === length - 1;
+    }
+    function sectionHostDepth() {
+      const section = stack.get("section");
+      if (section && !section.inColumns)
+        return 0;
+      return declaredFrameIndex("columns") + 1;
+    }
+    function drainDeclaredFrames(keep = 0) {
+      while (declaredFrames.length > keep) {
+        if (sectionAbove(declaredFrames.length)) {
+          stack.close("section");
+          continue;
+        }
         const frame = declaredFrames.pop();
         out.push(new state.Token("layout_component_close", frame.tag, -1));
       }
     }
     function drainDeclaredFramesAtEof() {
       while (declaredFrames.length) {
+        if (sectionAbove(declaredFrames.length)) {
+          stack.close("section");
+          continue;
+        }
         const frame = declaredFrames.pop();
         if (!frame.decl.autoCloseAtEof) {
           warn(state.env, frame.line || 0, "declared_marker_eof_close", `An open @${frame.kind} reached end-of-document; closing it automatically. Add ` + `@end-${frame.kind} to close it explicitly, or declare autoCloseAt: ["eof"] on this ` + `marker if running to end-of-document is expected.`, null);
@@ -808,7 +833,7 @@ function plugin(md, pluginOptions = {}) {
         __component: { component: meta.kind, kind: decl.baseKind, variant, attrs }
       };
     }
-    function openSection(meta) {
+    function openSection(meta, inColumns = false) {
       const t = new state.Token("layout_section_open", "div", 1);
       const component = meta.__component || null;
       addClasses(t, "section", meta.attrs && meta.attrs.class ? meta.attrs.class : "");
@@ -821,25 +846,11 @@ function plugin(md, pluginOptions = {}) {
         kind: "section",
         classes: meta.attrs && meta.attrs.class || "",
         sawContent: false,
+        ...inColumns ? { inColumns: true } : {},
         meta: { name: meta.name || null, attrs: { ...meta.attrs || {} }, component },
         openToken: t
       }, t);
     }
-    function breakHost() {
-      return stack.get("section") || stack.get("page") || stack.get("spread");
-    }
-    function gridClassOf(frame) {
-      if (!frame || !frame.classes)
-        return null;
-      return frame.classes.split(/\s+/).find((c) => c.startsWith("gp-grid-")) || null;
-    }
-    function warnBreakInsideGrid(kind, line, meta) {
-      const host = breakHost();
-      const gridClass = gridClassOf(host);
-      if (!gridClass)
-        return;
-      warn(state.env, line, "break_inside_grid", `@${kind} inside a grid container: the enclosing @${host.kind} carries .${gridClass}, so this break's <div> becomes a grid ITEM — it takes a cell of its own, corrupts the grid's placement, and print and the live preview then disagree about which page the content after it lands on. Move the break outside the grid @${host.kind}, or remove it — grid rows already flow and fragment across pages on their own.`, meta);
-    }
     function warnIfEmptyDecoratedSection(closingKind, closingLine) {
       const sec = stack.get("section");
       if (!sec || sec.sawContent)
@@ -904,14 +915,15 @@ function plugin(md, pluginOptions = {}) {
         continue;
       }
       if (kind === "section") {
-        drainDeclaredFrames();
+        const keep = sectionHostDepth();
+        drainDeclaredFrames(keep);
         warnIfEmptyDecoratedSection("section", line);
         stack.close("section");
         const spread = stack.get("spread");
         if (spread && spread.noPagesYet) {
           warn(state.env, line, "spread_without_pages", "@section inside a spread without an explicit @page. Allowed (adhoc spread), but explicit @page markers give stronger control.", meta);
         }
-        openSection(meta);
+        openSection(meta, keep > 0);
         continue;
       }
       if (kind === "continue") {
@@ -920,7 +932,8 @@ function plugin(md, pluginOptions = {}) {
           warn(state.env, line, "continue_without_section", "@continue used without an open @section; ignoring marker.", meta);
           continue;
         }
-        drainDeclaredFrames();
+        const keep = sectionHostDepth();
+        drainDeclaredFrames(keep);
         const contMeta = {
           name: section.meta.name,
           attrs: { ...section.meta.attrs || {} }
@@ -935,11 +948,10 @@ function plugin(md, pluginOptions = {}) {
           cls.push("gp-continued");
         contMeta.attrs.class = cls.join(" ");
         stack.close("section");
-        openSection(contMeta);
+        openSection(contMeta, keep > 0);
         continue;
       }
       if (kind === "page-break") {
-        warnBreakInsideGrid("page-break", line, meta);
         const t = new state.Token("layout_page_break", "div", 0);
         t.meta = { line };
         t.attrSet("class", "gp-page-break");
@@ -948,7 +960,6 @@ function plugin(md, pluginOptions = {}) {
         continue;
       }
       if (kind === "column-break") {
-        warnBreakInsideGrid("column-break", line, meta);
         const t = new state.Token("layout_column_break", "div", 0);
         t.meta = { line };
         t.attrSet("class", "gp-column-break");
@@ -957,7 +968,7 @@ function plugin(md, pluginOptions = {}) {
         continue;
       }
       if (kind === "end-section") {
-        drainDeclaredFrames();
+        drainDeclaredFrames(sectionHostDepth());
         warnIfEmptyDecoratedSection("end-section", line);
         stack.close("section");
         continue;
@@ -1055,11 +1066,20 @@ body { margin: 0; }
 .gp-column-break { break-after: column; height: 0; font-size: 0; line-height: 0; visibility: hidden; }
 
 :where(h1,h2,h3,h4,h5,h6) { break-after: avoid; }
+/* A lead-in paragraph ("**ROLL A DIE!**" above a roll table, "You will need:"
+   above a list) stays with the table or list it introduces, the way a heading
+   stays with what follows it -- otherwise the label can end a column or page
+   with its table starting on the next (#370). Standard break-after; the
+   :has() selector is Chromium's own. :where() keeps specificity at zero so an
+   author rule such as p { break-after: auto } wins. Deliberately table/ul/ol only,
+   also when a @section wraps it (the second rule): the lead-in then keeps with
+   the section that opens with the table or list. */
+:where(p):has(+ :where(table, ul, ol)) { break-after: avoid; }
+:where(p):has(+ :where(.section) > :where(table, ul, ol):first-child) { break-after: avoid; }
 :where(img, svg, video) { max-width: 100%; }
 :where(p > img:only-child, figure > img) { width: fit-content; max-width: 100%; height: auto; vertical-align: bottom; }
 :where(p) > :where(img:not([class])) { max-height: calc(var(--gp-content-h) - 4px); object-fit: contain; }
 :where(figure) { break-inside: avoid; }
-:where(.section, figure) > :where(:first-child) { break-before: avoid; }
 
 `;
 
@@ -1119,26 +1139,24 @@ var GUTTERPRESS_CSS = `
 .gp-tight { --gp-gap: 0.5em; }
 .gp-loose { --gp-gap: 2em; }
 
-/* column runs — plain CSS Multi-column, exposed as author vocabulary so
-   "put this in two columns" does not require borrowing a styled container
-   from the book's own component layer. That borrowing is what this exists
-   to prevent: a book whose theme paints .section chrome by default gives
-   every author who opens a section just to start a column run a panel they
-   did not ask for, and the book then needs a reset rule to take it back.
-   With a neutral primitive the author opts into columns and nothing else.
+/* column runs — plain CSS Multi-column, emitted by the core @columns marker
+   (markers.js): @columns [1-5] ... @end-columns is the ONE way to lay
+   content out in columns, and @column-break moves to the next column.
+   The classes below are the CSS that marker emits, not author vocabulary.
 
    Permanent vocabulary, not a shim: Chromium implements multicol natively
    and these rules are the standard properties verbatim, so there is no
    spec gap here to remove later. Deliberately minimal — column-fill is
-   NOT set, because the correct value depends on whether the run fragments
-   across pages (auto packs each page's columns; the CSS initial balance is
-   right for a run that fits on one page) and only the author knows which.
-   --gp-column-gap is author-settable.
-   .gp-columns is what the core @columns marker emits (markers.js); on its
-   own it is two columns, and @columns 1 to 5 add the matching count, which
-   wins because it comes later at the same specificity. */
-.gp-columns, .gp-columns-1, .gp-columns-2, .gp-columns-3, .gp-columns-4, .gp-columns-5 {
+   NOT set (the CSS initial balance applies).
+   Themes style a run through two tokens instead of writing column rules:
+     --gp-column-gap   default 1.5em
+     --gp-column-rule  default none (any column-rule shorthand value)
+   Both hooks sit at zero specificity (:where), so any author rule wins.
+   .gp-columns is two columns on its own; a count class (bare @columns
+   emits gp-columns-2) wins because it comes later at the same specificity. */
+:where(.gp-columns, .gp-columns-1, .gp-columns-2, .gp-columns-3, .gp-columns-4, .gp-columns-5) {
   column-gap: var(--gp-column-gap, 1.5em);
+  column-rule: var(--gp-column-rule, none);
 }
 .gp-columns { columns: 2; }
 .gp-columns-1 { columns: 1; }
@@ -1147,54 +1165,8 @@ var GUTTERPRESS_CSS = `
 .gp-columns-4 { columns: 4; }
 .gp-columns-5 { columns: 5; }
 
-/* the per-shape decisions the paragraph above deliberately leaves to the
-   author, named instead of left as raw CSS every book was reinventing
-   (CLAUDE.md §0: "behavior broadly useful to non-technical authors belongs
-   in core").
-   Permanent vocabulary, standard properties verbatim — same rationale as
-   the column/grid runs above. One name each, no aliases:
-     .gp-columns-all       column-span: all      a heading or block that
-                                                  spans every column in the
-                                                  run it sits inside.
-     .gp-columns-flow      column-fill: auto     a run that FRAGMENTS across
-                                                  pages — every page's
-                                                  columns fill instead of
-                                                  only the last one
-                                                  balancing (the dead-column
-                                                  collapse the build's
-                                                  engine.multicol.dead-column
-                                                  warning names this fix
-                                                  for).
-     .gp-columns-balanced  column-fill: balance  a run that fits on ONE
-                                                  page (the CSS initial
-                                                  value — ragged columns
-                                                  would be wrong here). */
-.gp-columns-all { column-span: all; }
-.gp-columns-flow { column-fill: auto; }
-.gp-columns-balanced { column-fill: balance; }
-
-/* grid runs — the SLOTTED counterpart to the column runs above. Grid places
-   each child into the next cell, across then down (deterministic slots: card
-   layouts, stat blocks, image-plus-caption pairs); columns FLOW one text run
-   down then across. Same neutral-primitive rationale as .gp-columns-*, and
-   permanent vocabulary for the same reason: standard CSS Grid verbatim, no
-   spec gap to remove later. MEASURED (Chromium 151, gp-grid evidence pack):
-   grid rows fragment across sheets with EXACT print/viewer parity — 2- and
-   3-col, unequal item heights, mid-row cuts, multi-sheet overflow,
-   break-inside:avoid, gap geometry — so a grid taller than the page is safe,
-   no fit-one-page constraint. Two things to know, not fix:
-     - on a min-height page root (MARKER_CSS), default align-content
-       stretches rows apart to fill the page — identically in both engines.
-       Authors wanting packed rows set align-content: start.
-     - a @page-break / @column-break marker DIRECTLY inside a grid container
-       becomes a grid item and corrupts placement (the one measured parity
-       break); markers.js diagnoses it (break_inside_grid).
-   --gp-grid-gap is author-settable. */
-.gp-grid-2 { display: grid; grid-template-columns: repeat(2, 1fr); gap: var(--gp-grid-gap, 1.5em); }
-.gp-grid-3 { display: grid; grid-template-columns: repeat(3, 1fr); gap: var(--gp-grid-gap, 1.5em); }
-
 /* fragmentation controls — generic pagination utilities for any element,
-   independent of the column/grid vocabulary above (a book reached for
+   independent of the column vocabulary above (a book reached for
    these just as often outside a multicol run: keeping a card whole,
    forcing a section to start a fresh page). Standard properties only —
    this project is Chromium-only (CLAUDE.md), so there are no legacy
@@ -1352,13 +1324,8 @@ var GP_CLASSES = new Set([
   "gp-columns-3",
   "gp-columns-4",
   "gp-columns-5",
-  "gp-columns-all",
-  "gp-columns-flow",
-  "gp-columns-balanced",
   "gp-no-break",
   "gp-break-before",
-  "gp-grid-2",
-  "gp-grid-3",
   "gp-shape",
   "gp-pin",
   "gp-top",

package/dist/{validate-3hjkgxrz.js → validate-9nszbckg.js}

@@ -1,16 +1,16 @@
 import {
   executeAndReport
-} from "./cli-2kc34kme.js";
+} from "./cli-an3pxzzk.js";
 import {
   log
-} from "./cli-8apk8571.js";
+} from "./cli-0wtnw98y.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-pqcb2nnb.js";
+} from "./cli-jjbeqx94.js";
 import"./cli-ht1bcqdd.js";
-import"./cli-jyy9pqf3.js";
+import"./cli-ycbg7mxk.js";
 import {
   BuildError,
   EXIT_CODES

package/package.json

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