@quario/layout 0.3.0 → 0.5.0

package/lib/layout.js

@@ -21,14 +21,34 @@
  * document's bands claim before anything is placed, and where they are drawn
  * on each finished page once the count is known.
  */
-import { display, imageError, isReportBand, text } from "quario";
+import { display, isReportBand, text } from "quario";
 import { balance } from "./balance.js";
+/** `Measured` is the measured table's own type, and the flow passes one
+ * through: the region buffer measures early and the replay hands it back.
+ * @import { Measured, TableRow } from './measure.js' */
+
+/** One table being emitted: what `carryOver`, `sliced` and `put` all need. It
+ * holds the flow, so it is the band flow's own — the measured half never sees
+ * a cursor.
+ * @typedef {{ state: Flow, head: TableRow,
+ *   xOffsets: number[], widths: number[], x: number, avail: number }} Grid */
+import { gridOf, measureTable, sum, tableOf } from "./measure.js";
 import { adopt, measuring } from "./canvas.js";
 import { frame } from "./page.js";
-import { intrinsic } from "./image.js";
 import { CELL_PAD, NO_PAD, WHOLE, insetOf, isWhole, paintBox, sliceInset, unbox } from "./box.js";
-import { BAND, col, GUTTER, LEAD, merge, roled, shift, sizeOf, vshift } from "./style.js";
-import { atoms, dress, heightOf, wrap } from "./text.js";
+import {
+  BAND,
+  col,
+  GUTTER,
+  instanceGap,
+  merge,
+  roled,
+  rowHeight,
+  shift,
+  sizeOf,
+  vshift,
+} from "./style.js";
+import { atoms, heightOf, wrap } from "./text.js";
 
 /** @typedef {import('./balance.js').Unit} Unit */
 /** @typedef {import('./canvas.js').Canvas} Canvas */
@@ -45,7 +65,7 @@ import { atoms, dress, heightOf, wrap } from "./text.js";
 // indexes where a `reset: "page"` sequence begins (the document itself is the
 // sequence that starts at page 0).
 /**
- * @typedef {{ held: any[], blocks: Block[], gap: number, skip: boolean }} Group
+ * @typedef {{ pending: any[], blocks: Block[], gap: number, skip: boolean, titled: boolean }} Group
  */
 /**
  * @typedef {{ canvas: Canvas, open: Group[], gap: number, marks: any[],
@@ -101,19 +121,22 @@ let unsliceable = (block) => Boolean(block.picture || block.parts);
 // image's own size in points, never wider than the content box; `width`
 // scales to the content box either way. The ratio is kept in both, so a
 // height is never anything but the width's consequence.
+// An image pixel as a page point, at the conventional 96 dpi the schema names
+// for `fit: "natural"`. Deliberately not `PX_PER_POINT`, which is the same
+// number answering a different question -- how a point becomes a length on
+// screen, where a zoom is a factor on top of it. An image's resolution and a
+// viewer's scale share a convention today and are free to stop.
+let PER_PX = 72 / 96;
+
 /** @type {(event: any, avail: number) => Picture} */
 let pictureOf = (event, avail) => {
-  // Located here rather than in `image.js`, which is handed bytes and a
-  // format and has never heard of a schema: this is the innermost place that
-  // knows both what went wrong and which item asked for it. SCHEMA.md calls
-  // this failure a render error, and a render error names its node.
-  let sized;
-  try {
-    sized = intrinsic(event.bytes, event.format);
-  } catch (cause) {
-    throw imageError(event.path, /** @type {Error} */ (cause).message, cause);
-  }
-  let { w, h } = sized;
+  // The event states the size in pixels; a page is measured in points. The
+  // conversion is the first step of the same calculation the rest of this
+  // function is, at the conventional 96 dpi the schema names, and there is no
+  // header to read: the engine read it once, for every target, and a file too
+  // short to state a size never reached a target at all (`docs/adr/0067`).
+  let w = event.width * PER_PX;
+  let h = event.height * PER_PX;
   let width = event.fit === "width" ? avail : Math.min(w, avail);
   return {
     bytes: event.bytes,
@@ -149,7 +172,7 @@ let blockOf = (canvas, event, avail, under = null) => {
     };
   }
   let size = sizeOf(text, canvas.settings.base);
-  let lines = dress(wrap(atoms(canvas.settings, event.tokens, text), inner, size), text);
+  let lines = wrap(atoms(canvas.settings, event.tokens, text), inner, size);
   return {
     lines,
     bg,
@@ -174,23 +197,24 @@ let shrink = (block, room) => {
   block.h = inner + block.inset.t + block.inset.b;
 };
 
-// Draw one block whole at the cursor. A picture's background fills the
-// image's own box rather than the width of the flow -- there is no line for
-// it to sit behind. Text is placed line by line as each is drawn; a picture
-// is one box, so where it sits in the width it was given is worked out once.
+// Draw one block whole at the cursor. The box is the width the block was
+// given, exactly as `drawLines` paints one: an image's background and border
+// span the content width, or the slot's share inside a split, and never the
+// picture's own width. `fit` sizes the picture and `align` places it in the
+// inner box; neither moves an edge. Text is placed line by line as each is
+// drawn; a picture is one box, so where it sits is worked out once.
 /** @type {(canvas: Canvas, block: Block, x: number, avail: number) => void} */
 let drawPicture = (canvas, block, x, avail) => {
   let inset = block.inset;
   let { bytes, format, w, h } = /** @type {Picture} */ (block.picture);
-  let outer = w + inset.l + inset.r;
-  let at = x + shift(block.align, avail - outer);
-  paintBox(canvas, at, canvas.y, outer, block.h, block.style, block.bg);
-  canvas.box(block.path, at, canvas.y, outer, block.h);
+  paintBox(canvas, x, canvas.y, avail, block.h, block.style, block.bg);
+  canvas.box(block.path, x, canvas.y, avail, block.h);
+  let inner = Math.max(avail - inset.l - inset.r, 1);
   canvas.picture(
     block.path,
     bytes,
     format,
-    at + inset.l,
+    x + inset.l + shift(block.align, inner - w),
     canvas.y - inset.t - block.drop - h,
     w,
     h,
@@ -686,7 +710,7 @@ let stripWidth = (state, count) => (state.canvas.content - GUTTER * (count - 1))
 //
 // It opens buffering: what the strips do with the content depends on how much
 // of it there is, and that is not known until the region ends or outgrows a
-// page. `held` is that buffer; `null` means the region has committed.
+// page. `held` is that buffer; `null` means the region has decided.
 /** @type {(state: Flow) => void} */
 let openRegion = (state) => {
   let owed = state.pending;
@@ -808,13 +832,15 @@ let stripHeight = (state, region, own) =>
     ? null
     : balance(unitsOf(state, own), region.count, roomOf(state, region), rowHeight(state.canvas));
 
-// Commit the region: decide the strip height, stop holding, and hand the held
+// Decide the region: settle the strip height, stop holding, and hand the held
 // entries back in the order they arrived, for `flow`'s `replay` to walk.
+// Not `commit`: the editor's session already spends that word on a gesture
+// ending, and git spends it on a commit.
 //
 // Marking the spans is also what picks out the region's own children, and the
 // height is decided from those — so it runs before the replay, not with it.
 /** @type {(state: Flow) => any[]} */
-let commit = (state) => {
+let decide = (state) => {
   let region = /** @type {Region} */ (state.region);
   let held = /** @type {any[]} */ (region.held);
   region.height = stripHeight(state, region, spans(held));
@@ -1031,7 +1057,7 @@ let anchor = (state) => {
 };
 
 /** @type {(state: Flow) => Group[]} */
-let pending = (state) => state.open.filter((group) => group.held.length);
+let pending = (state) => state.open.filter((group) => group.pending.length);
 
 /** @type {(state: Flow, extra: number, runs: Block[][]) => number} */
 let needed = (state, extra, runs) =>
@@ -1042,12 +1068,12 @@ let needed = (state, extra, runs) =>
 // for good: every other path drew its headers inside the room a page still
 // had, so a run always leaves space for the content it introduces.
 /** @type {(state: Flow, holding: Group[]) => void} */
-let dropHeld = (state, holding) => {
-  let held = holding.flatMap((group) => group.held);
-  for (let group of holding) group.held = [];
+let dropPending = (state, holding) => {
+  let waiting = holding.flatMap((group) => group.pending);
+  for (let group of holding) group.pending = [];
   state.gap = 0;
   anchor(state);
-  for (let entry of held) item(state, entry.event, entry.block);
+  for (let entry of waiting) item(state, entry.event, entry.block);
 };
 
 /** @type {(state: Flow, need: number) => void} */
@@ -1065,12 +1091,12 @@ let settle = (state, need) => {
 // — the turn above already did — so an instance taking its blocks the moment
 // they are drawn can never have them replayed on top of themselves.
 /** @type {(state: Flow, holding: Group[], runs: Block[][], avail: number) => void} */
-let drawHeld = (state, holding, runs, avail) => {
+let drawPending = (state, holding, runs, avail) => {
   let x = originOf(state);
   for (let [i, group] of holding.entries()) {
     for (let block of runs[i]) drawBlock(state.canvas, block, x, avail);
     group.blocks.push(...runs[i]);
-    group.held = [];
+    group.pending = [];
   }
 };
 
@@ -1086,14 +1112,14 @@ let flush = (state, extra) => {
   // at this same width, so a replayed run reuses those rather than wrapping
   // the same text a second time (ADR 0027).
   let runs = runsFor.map((group) =>
-    group.held.map((entry) => entry.block || blockOf(canvas, entry.event, avail)),
+    group.pending.map((entry) => entry.block || blockOf(canvas, entry.event, avail)),
   );
   let need = needed(state, extra, runs);
   // Against what a fresh column has left once the page has replayed what it
   // carries. Inside a region that is a strip, and the replay sits above it.
-  if (need > ceilOf(state) - carried(state) - floorOf(state)) return dropHeld(state, runsFor);
+  if (need > ceilOf(state) - carried(state) - floorOf(state)) return dropPending(state, runsFor);
   settle(state, need);
-  drawHeld(state, runsFor, runs, avail);
+  drawPending(state, runsFor, runs, avail);
 };
 
 // Enough of an item that its group header is never left introducing nothing.
@@ -1126,7 +1152,7 @@ let keepBlock = (state, event, width) =>
 // Is anything waiting on this item's arrival — a header run, or the gap an
 // instance opens with?
 /** @type {(state: Flow) => boolean} */
-let holding = (state) => state.open.some((group) => group.held.length) || state.gap > 0;
+let holding = (state) => state.open.some((group) => group.pending.length) || state.gap > 0;
 
 // A half-line gap before each instance (dropped at a page top by `flush`)
 // keeps groups reading as blocks. Every instance becomes an outline entry.
@@ -1159,7 +1185,7 @@ let openGroup = (state, event) => {
   let skip = state.skipGap;
   state.gap = skip ? 0 : Math.max(state.gap, instanceGap(state.canvas));
   state.skipGap = false;
-  state.open.push({ held: [], blocks: [], gap, skip });
+  state.open.push({ pending: [], blocks: [], gap, skip, titled: false });
   state.marks.push(markFor(event));
 };
 
@@ -1195,7 +1221,6 @@ let markFor = (event) => ({
   // display(), not String(): a Date group key must title its outline bookmark
   // with the same ISO 8601 UTC text its cells render, on every machine.
   title: event.name + ": " + display(event.key),
-  titled: false,
   depth: event.depth,
   page: -1,
   y: 0,
@@ -1205,24 +1230,24 @@ let markFor = (event) => ({
 // page bottom. The instance's first header titles its outline entry.
 /** @type {(state: Flow, event: any, title: string | null, block?: Block | null) => void} */
 let holdHeader = (state, event, title, block = null) => {
+  let group = state.open[state.open.length - 1];
   let mark = state.marks[state.marks.length - 1];
+  // Whether a header has claimed this entry is the open instance's own fact,
+  // not the outline entry's: a Mark is what a consumer receives, and it
+  // carries only what `index.d.ts` declares. The two records correspond here
+  // because `openGroup` pushes them together and this only ever runs inside
+  // that instance's own header band, before any nested group opens -- groups
+  // pop from `open` while their marks stay, so nowhere else may assume it.
+  //
   // A picture has no words to title an outline entry with, so it holds its
   // place in the run and leaves the title to the next header that has some.
-  if (mark && !mark.titled && title != null) {
-    mark.titled = true;
+  if (mark && !group.titled && title != null) {
+    group.titled = true;
     mark.title = title;
   }
-  state.open[state.open.length - 1].held.push({ event, block });
+  group.pending.push({ event, block });
 };
 
-// A table row's floor height and the gap a group instance opens with: named
-// because the region's estimator reads both, and a constant with two readers
-// and no name drifts between them.
-/** @type {(canvas: Canvas) => number} */
-let rowHeight = (canvas) => LEAD * canvas.settings.base;
-/** @type {(canvas: Canvas) => number} */
-let instanceGap = (canvas) => 0.5 * LEAD * canvas.settings.base;
-
 // What a fresh strip has to hold to take an instance: the span less the
 // opening gap, which `settle` drops at a strip head. This is the one fact the
 // balance model and the placement rule have to agree on, so both read it here
@@ -1232,60 +1257,6 @@ let headOf = (canvas, span) => span - instanceGap(canvas);
 
 // --- tables -----------------------------------------------------------------
 
-// Pre-measure one cell: wrapped lines per column width come later; natural
-// width first (no wrapping except hard breaks). `mt`/`mb` go unread: SCHEMA.md
-// gives flow spacing no meaning inside a table row, in either target.
-/** @type {(canvas: Canvas, cell: any, rowStyle: any) => any} */
-let cellOf = (canvas, cell, rowStyle) => {
-  // A row's block reaches its cells with no box in it: the engine resolved
-  // that half onto the cells themselves before the event was emitted
-  // (SCHEMA.md, "Style declarations"), which is why the inset and the ink
-  // both read the cell and a row is never asked for a box it cannot have.
-  let style = merge(rowStyle, unbox(cell.style));
-  let inset = insetOf(cell.style, CELL_PAD);
-  let list = atoms(canvas.settings, cell.tokens, style);
-  let natural = wrap(list, Infinity, sizeOf(style, canvas.settings.base)).reduce(
-    (widest, line) => Math.max(widest, line.w),
-    0,
-  );
-  return {
-    list,
-    natural: natural + inset.l + inset.r,
-    align: style.align,
-    valign: style.valign,
-    bg: col(style.background),
-    underline: !!style.underline,
-    strikethrough: !!style.strikethrough,
-    inset,
-    style: cell.style,
-    path: cell.path,
-  };
-};
-
-/** @type {(canvas: Canvas, cells: any[], widths: number[]) => { cells: any[], h: number }} */
-let rowOf = (canvas, cells, widths) => {
-  let h = rowHeight(canvas);
-  /** @type {number[]} */
-  let owns = [];
-  let out = cells.map((cell, i) => {
-    let inner = Math.max(widths[i] - cell.inset.l - cell.inset.r, 1);
-    // A glyph or a hard break occupies; spaces alone are an empty cell.
-    let lines = cell.list.some(
-      (/** @type {{ hard: boolean, space: boolean }} */ atom) => atom.hard || !atom.space,
-    )
-      ? dress(wrap(cell.list, inner, cell.list[0].size), cell)
-      : [];
-    let own = heightOf(lines) + cell.inset.t + cell.inset.b;
-    if (own > h) h = own;
-    owns.push(own);
-    return { ...cell, lines };
-  });
-  // The row's height is known only now, so the slack each cell's `valign`
-  // reads is measured here, as `splitBlock` measures a slot's.
-  for (let [i, cell] of out.entries()) cell.drop = vshift(cell.valign, h - owns[i]);
-  return { cells: out, h };
-};
-
 /** @type {(canvas: Canvas, cell: any, bg: any, x: number, y: number, w: number, h: number) => void} */
 let fillCell = (canvas, cell, bg, x, y, w, h) => {
   if (cell.bg && cell.bg !== bg) canvas.rect(cell.bg, x, y, w, h);
@@ -1345,107 +1316,7 @@ let drawRow = (canvas, row, xOffsets, widths, bg) => {
   );
 };
 
-// The column geometry one row sees. A cell covering several columns starts
-// where the first of them starts and is as wide as all of them together; a row
-// that spans nothing sees the columns themselves, and pays nothing for the
-// feature. `null` spans is that row -- every data row, and every total row
-// whose cells each cover one column.
-/** @type {(cells: any[]) => number[] | null} */
-let spansOf = (cells) =>
-  cells.some((cell) => cell.span > 1) ? cells.map((cell) => cell.span || 1) : null;
-// One value per cell, walking the columns each of them covers. Reached only
-// for a row that spans, so the closure it takes costs nothing per data row.
-/** @type {(spans: number[], pick: (at: number, span: number) => number) => number[]} */
-let overSpans = (spans, pick) => {
-  /** @type {number[]} */
-  let out = [];
-  let at = 0;
-  for (let span of spans) {
-    out.push(pick(at, span));
-    at += span;
-  }
-  return out;
-};
-/** @type {(widths: number[], spans: number[] | null) => number[]} */
-let spanWidths = (widths, spans) =>
-  spans ? overSpans(spans, (at, span) => sum(widths.slice(at, at + span))) : widths;
 /** @type {(xOffsets: number[], spans: number[] | null) => number[]} */
-let spanOffsets = (xOffsets, spans) => (spans ? overSpans(spans, (at) => xOffsets[at]) : xOffsets);
-
-// The widest of each column's header, rows and totals, padding included.
-//
-// A cell covering more than one column has no say in their widths (SCHEMA.md):
-// what a span states is which columns a cell reaches across, never how wide
-// they are. So a column can end up with no voter at all -- every cell above it
-// spans over it -- which only an empty table reaches, since a data row never
-// spans. It opens at the padding floor rather than at nothing, so an empty
-// table still shows the geometry it promises.
-/**
- * @typedef {{ cells: any[], spans: number[] | null }} Voting
- */
-/** @type {(cols: any[], header: Voting, rows: Voting[], totals: Voting[]) => number[]} */
-let naturalWidths = (cols, header, rows, totals) => {
-  /** @type {(number | null)[]} */
-  let widest = cols.map(() => null);
-  /** @type {(at: number, natural: number) => void} */
-  let widen = (at, natural) => {
-    let held = widest[at];
-    if (held === null || natural > held) widest[at] = natural;
-  };
-  /** @type {(row: Voting) => void} */
-  let vote = (row) => {
-    let at = 0;
-    for (let [i, cell] of row.cells.entries()) {
-      let span = row.spans ? row.spans[i] : 1;
-      if (span === 1) widen(at, cell.natural);
-      at += span;
-    }
-  };
-  vote(header);
-  for (let row of rows) vote(row);
-  for (let row of totals) vote(row);
-  return widest.map((width) => (width === null ? CELL_PAD.l + CELL_PAD.r : width));
-};
-
-/** @type {(values: number[]) => number} */
-let sum = (values) => values.reduce((total, value) => total + value, 0);
-
-// An authored `width` percentage fixes its column; the rest share what is left
-// in proportion to their natural widths. Three cases, one return each — the
-// fall-through is all-authored within budget, honoured exactly.
-//
-// There is no over-commitment case: the engine rejects a document whose fixed
-// shares leave the width-less columns nothing, so `left` is positive whenever
-// an auto column exists and the fixed shares never exceed the content width.
-// That invariant is asserted rather than trusted — falling through with auto
-// columns unplaced would draw them at zero width, an invisible failure — the
-// same fail-loud posture as the measuring canvas's `newPage`.
-/** @type {(cols: any[], natural: number[], avail: number) => number[]} */
-let columnWidths = (cols, natural, avail) => {
-  let fixed = cols.map((column) => Number.isFinite(column.width));
-  if (!fixed.some(Boolean)) {
-    // Natural widths always carry the cell padding, so the sum is never zero.
-    let wanted = sum(natural);
-    return natural.map((width) => (width * avail) / wanted);
-  }
-  let widths = cols.map((col, i) => (fixed[i] ? (col.width / 100) * avail : 0));
-  let auto = natural.map((width, i) => (fixed[i] ? 0 : width));
-  let left = avail - sum(widths);
-  let wanted = sum(auto);
-  // Room for the auto columns: they share what the fixed ones left.
-  if (wanted > 0) {
-    if (left <= 0) throw new Error("over-committed column widths reached the layout");
-    return widths.map((width, i) => (fixed[i] ? width : (auto[i] * left) / wanted));
-  }
-  return widths;
-};
-
-// One table being emitted: what `carryOver`, `sliced` and `put` all need.
-/**
- * @typedef {{ cells: any[], h: number, style?: any, spans?: number[] | null }} TableRow
- * @typedef {{ state: Flow, head: TableRow,
- *   xOffsets: number[], widths: number[], x: number, avail: number }} Grid
- */
 
 // Continue in a fresh column: a table that spans columns or pages restates its
 // headings, under whatever headers the open groups replay above them. Both
@@ -1458,18 +1329,6 @@ let columnWidths = (cols, natural, avail) => {
 /** @type {(row: { style?: any }) => any} */
 let rowFill = (row) => col((row.style || {}).background);
 
-// What this row draws against: the grid's own columns, or the merged geometry
-// a spanning row sees. Read at draw time rather than kept on the row, because
-// `rebase` moves the offsets under it every time the table crosses a strip.
-/** @type {(grid: Grid, row: TableRow) => { xOffsets: number[], widths: number[] }} */
-let gridOf = (grid, row) =>
-  row.spans
-    ? {
-        xOffsets: spanOffsets(grid.xOffsets, row.spans),
-        widths: spanWidths(grid.widths, row.spans),
-      }
-    : grid;
-
 /** @type {(grid: Grid) => void} */
 let carryOver = (grid) => {
   advance(grid.state);
@@ -1611,70 +1470,6 @@ let emitRows = (grid, laid, totalRows) => {
   for (let row of totalRows) put(grid, row, rowFill(row), 0);
 };
 
-// A buffered table, in the one shape `table` lays out: its columns come from
-// the opening event, its rows are the row events themselves, and its total is
-// the total row's cells. Both readers build it here — the replay, collecting
-// events as they arrive, and the region buffer, reading them back off what it
-// held — so a new table event kind cannot reach one and miss the other.
-/** @type {(events: any[]) => any} */
-let tableOf = (events) => {
-  let opening = events[0];
-  return {
-    columns: opening.columns.map((/** @type {any} */ col) => ({ ...col })),
-    // The header row arrives whole (docs/adr/0053), so both readers -- the
-    // replay and the region buffer -- take the same list rather than each
-    // rebuilding it from the columns.
-    header: opening.header.cells,
-    headerStyle: opening.header.style,
-    rows: events.filter((event) => event.type === "row"),
-    // The events themselves, as `rows` are: a total row is a row, and the
-    // buffer files each corrected height under the event it was measured from.
-    totals: events.filter((event) => event.type === "total-row"),
-  };
-};
-
-/**
- * @typedef {{ widths: number[], head: any, laid: any[], totalRows: any[] }} Measured
- */
-// Measure a buffered table at a given width: the column widths every cell has
-// a say in, then each row laid out against them. Everything here is
-// arithmetic over the cells, so the region's buffer can ask for it before
-// anything is drawn — which is the only way a row's real height is known
-// early enough to balance on (bead `quario-cgk`).
-/** @type {(canvas: Canvas, buffered: any, avail: number) => Measured} */
-let measureTable = (canvas, buffered, avail) => {
-  let cols = /** @type {any[]} */ (buffered.columns);
-  /** @type {(cells: any[], style: any, spans: number[] | null) => Voting & { style: any }} */
-  let measured = (cells, style, spans) => ({
-    cells: cells.map((/** @type {any} */ cell) => cellOf(canvas, cell, style)),
-    spans,
-    style,
-  });
-  let header = measured(buffered.header, buffered.headerStyle, spansOf(buffered.header));
-  // A data row's cells are the columns' own, so nothing in one can span
-  // (SCHEMA.md, "Span"). Asking each row anyway would scan every cell of the
-  // table to rediscover what the schema already guarantees.
-  let rows = buffered.rows.map((/** @type {any} */ row) => measured(row.cells, row.style, null));
-  let totals = buffered.totals.map((/** @type {any} */ row) =>
-    measured(row.cells, row.style, spansOf(row.cells)),
-  );
-  let widths = columnWidths(cols, naturalWidths(cols, header, rows, totals), avail);
-  // Each row wraps against the geometry it sees, which is the columns' own
-  // unless one of its cells spans.
-  /** @type {(row: Voting & { style: any }) => any} */
-  let laidOut = (row) => ({
-    ...rowOf(canvas, row.cells, spanWidths(widths, row.spans)),
-    spans: row.spans,
-    style: row.style,
-  });
-  return {
-    widths,
-    head: laidOut(header),
-    laid: rows.map(laidOut),
-    totalRows: totals.map(laidOut),
-  };
-};
-
 // Lay out one table from the events it arrived as: measure every cell,
 // allocate the columns, then emit the header, the rows and the total,
 // breaking pages as needed.
@@ -1943,7 +1738,7 @@ let flow = (canvas) => {
   // The nesting the router is at. While the buffer holds, routing runs ahead of
   // placement: nothing has been placed, so `state.open` is frozen at the depth
   // the region opened at and only the buffer knows where the walk really is.
-  // Once `commit` nulls `held`, the replay *is* the placement timeline and the
+  // Once `decide` nulls `held`, the replay *is* the placement timeline and the
   // open stack is exact again.
   let nesting = () =>
     state.region && state.region.held ? state.region.nesting : state.open.length - 1;
@@ -1993,14 +1788,14 @@ let flow = (canvas) => {
     if (buffer(state, event, payload, hollows.has(event))) replay();
   };
 
-  // Lay the buffer out: `commit` decides the strip height and hands the held
+  // Lay the buffer out: `decide` settles the strip height and hands the held
   // entries back in order, and this walks them through `route`. The walk lives
   // here rather than under the region section marker for the reason everything
   // there is module-level — that section is reachable without the router, and
   // a walk through `route` is not.
   let replay = () => {
     let region = /** @type {Region} */ (state.region);
-    for (let entry of commit(state)) {
+    for (let entry of decide(state)) {
       if (breaksFor(state, region, entry.span)) advance(state);
       route(entry.event, entry.payload);
     }