@dloizides/poster-render 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.2.5
+
+- Own-key checks: the schema validator and the asset lookup use `Object.hasOwn`, so a `__proto__` key is rejected and an imageId such as `constructor` is reported missing.
+- `placeContain(image, region, { anchor, alignX, scale })` takes an options object (was 5 positional parameters).
+- Named size and gap constants; ESLint now lints tests and `src/testing`.
+- README: install, usage, canvas injection, fonts, type floor, schema version policy.
+
 ## 0.2.4
 
 - Type floor: every text run is at least 30px at a 1080 short edge (scaled per format by short edge). When a layout cannot fit its text at the floor, the picture yields space to the body (and a header stacked above it) in 2.5% steps.

package/README.md

@@ -7,7 +7,46 @@ One JSON document (`FlierDoc`) in, one poster out. Used by Flier Studio (FLIER-1
 - `render(doc, assets, canvas)`: validates first (throws `FlierDocError` before touching the canvas), resizes the canvas to the format, draws, returns a `RenderReport` (picture rect, text and card boxes).
 - `exportPng(canvas)`: PNG `Blob` of the canvas size.
 - Formats: story 1080x1920, post 1080x1350, square 1080x1080, phone 1170x2532, desktop 2560x1440.
-- Layouts: `picture-right` (E-A), `picture-left` (E-B), `arch` (E-C), `picture-bottom`, `list`, `phone-clock-safe` (P-A, top kept clear for the lock-screen clock), `phone-arch` (P-B), `desktop-safe` (D-A, text clear of desktop icons and the taskbar), `desktop-arch` (D-B). `LAYOUT_CATALOGUE` lists id, design id, label, description and designed formats (for the app picker and the LLM prompt); `defaultLayoutFor(format)` gives E-A / P-A / D-A.
+- Layouts: `picture-right` (E-A "Picture right"), `picture-left` (E-B "Picture left"), `arch` (E-C "Arch"), `picture-bottom`, `list`, `phone-clock-safe` (P-A "Phone, clock clear": top kept clear for the lock-screen clock), `phone-arch` (P-B "Phone arch"), `desktop-safe` (D-A "Desktop, icons clear": text clear of desktop icons and the taskbar), `desktop-arch` (D-B "Desktop arch"). `LAYOUT_CATALOGUE` lists id, design id, label, description and designed formats (for the app picker and the LLM prompt); `defaultLayoutFor(format)` gives E-A "Picture right" / P-A "Phone, clock clear" / D-A "Desktop, icons clear" (D4 "Layouts: keep all").
 - Arch layouts paint a soft arch (palette `arch`, about 4% off the ground) behind the picture only, inside the picture region; prices sit large on either side. The includes block is set at one size for every line. Palettes: `sand`, `night`, `sea`, `rose`. Font sets: `classic`, `modern`, `elegant` (the app loads the web fonts).
 - The picture is placed contain + anchor in its own region: never cropped, never faded, drawn last, and no text or card is laid out in its region. Text shrinks to fit, never overflows.
 - Example: `kizombaWorkshopDocs` (3 workshops + list flier), `kizombaWorkshop` (the list flier).
+
+## Install
+
+```bash
+npm install @dloizides/poster-render
+```
+
+## Usage
+
+```ts
+import { exportPng, kizombaWorkshop, render, validateFlierDoc } from '@dloizides/poster-render';
+
+const checked = validateFlierDoc(kizombaWorkshop);
+if (!checked.ok) {
+  throw new Error(checked.errors.join('\n'));
+}
+const canvas = document.createElement('canvas');
+const report = render(checked.doc, { dancers: pictureImage, logo: logoImage }, canvas);
+const png = await exportPng(canvas);
+```
+
+## Canvas injection
+
+`render` takes any canvas with a 2d context; the package has no canvas dependency.
+
+- Browser: an `HTMLCanvasElement` (or `OffscreenCanvas`); assets are loaded `HTMLImageElement` / `ImageBitmap`.
+- Node: `@napi-rs/canvas` (`createCanvas(1, 1)`, `loadImage(path)`); `render` resizes the canvas to the format.
+
+## Fonts
+
+The font sets name CSS families (`FONT_SETS`). The host loads them before `render`: in a browser with `document.fonts.load(...)` / `@font-face`, in Node with `GlobalFonts.registerFromPath` from `@napi-rs/canvas`. A missing font falls back to the default family and the text still fits.
+
+## Type floor
+
+Every text run is at least 30px at a 1080 short edge (40px on desktop 2560x1440). When a layout cannot fit its text at the floor, the picture gives space to the text.
+
+## Schema version policy
+
+`FlierDoc.version` is `1`. A field added as optional keeps version 1; a removed, renamed or retyped field raises the version and `validateFlierDoc` rejects the other version with `version: must be 1 (got N)`. A package major release goes with a new doc version.

package/dist/index.d.mts

@@ -217,7 +217,7 @@ interface LayoutCatalogueEntry {
     formats: readonly FormatId[];
 }
 declare const LAYOUT_CATALOGUE: readonly LayoutCatalogueEntry[];
-/** The default layout for a format (D4: E-A for posters, P-A for phone, D-A for desktop). */
+/** The default layout for a format (D4 "Layouts: keep all"): E-A "Picture right" for posters, P-A "Phone, clock clear", D-A "Desktop, icons clear". */
 declare function defaultLayoutFor(format: FormatId): LayoutId;
 
 declare const kizombaWorkshop: FlierDoc;

package/dist/index.d.ts

@@ -217,7 +217,7 @@ interface LayoutCatalogueEntry {
     formats: readonly FormatId[];
 }
 declare const LAYOUT_CATALOGUE: readonly LayoutCatalogueEntry[];
-/** The default layout for a format (D4: E-A for posters, P-A for phone, D-A for desktop). */
+/** The default layout for a format (D4 "Layouts: keep all"): E-A "Picture right" for posters, P-A "Phone, clock clear", D-A "Desktop, icons clear". */
 declare function defaultLayoutFor(format: FormatId): LayoutId;
 
 declare const kizombaWorkshop: FlierDoc;

package/dist/index.js

@@ -226,7 +226,7 @@ function checkObject(schema, value, path, errors) {
     }
   }
   for (const [key, child] of Object.entries(value)) {
-    const childSchema = props[key];
+    const childSchema = Object.hasOwn(props, key) ? props[key] : void 0;
     if (childSchema === void 0) {
       if (schema.additionalProperties === false) {
         errors.push(`${join(path, key)}: is not allowed`);
@@ -284,10 +284,10 @@ function validateFlierDoc(input) {
 }
 function missingAssets(doc, assets) {
   const errors = [];
-  if (doc.picture && assets[doc.picture.imageId] === void 0) {
+  if (doc.picture && !Object.hasOwn(assets, doc.picture.imageId)) {
     errors.push(`picture.imageId: no asset named "${doc.picture.imageId}"`);
   }
-  if (doc.logo && assets[doc.logo.imageId] === void 0) {
+  if (doc.logo && !Object.hasOwn(assets, doc.logo.imageId)) {
     errors.push(`logo.imageId: no asset named "${doc.logo.imageId}"`);
   }
   return errors;
@@ -347,11 +347,15 @@ var BOTTOM_MIN_TOP = 0.25;
 var BOTTOM_HEADER_SHARE = 0.3;
 var BOTTOM_GAP = 40 / 1080;
 var BOTTOM_ASPECT = 0.57;
+var DEFAULT_SIDE = [0.6, 0.42];
 var PICTURE_SIDE = {
-  ["picture-right" /* PictureRight */]: [0.6, 0.42],
-  ["picture-left" /* PictureLeft */]: [0.6, 0.42],
+  ["picture-right" /* PictureRight */]: DEFAULT_SIDE,
+  ["picture-left" /* PictureLeft */]: DEFAULT_SIDE,
   ["list" /* List */]: [0.5, 0.36]
 };
+var SHORT_PORTRAIT = 1.5;
+var SHORT_PICTURE_W = 0.5;
+var SHORT_PICTURE_H = 0.75;
 var ANCHOR_Y = { ["top" /* Top */]: 0, ["center" /* Center */]: 0.5, ["bottom" /* Bottom */]: 1 };
 var r2 = Math.round;
 function side(w, h, fraction) {
@@ -375,6 +379,20 @@ function side(w, h, fraction) {
     alignX: 1
   };
 }
+function shortSide(w, h) {
+  const m = r2(Math.min(w, h) * MARGIN);
+  const picW = r2(w * SHORT_PICTURE_W);
+  const picH = r2(h * SHORT_PICTURE_H);
+  const top = r2(h * HEADER_PORTRAIT);
+  const textW = w - picW - 2 * m;
+  return {
+    header: { x: m, y: m, w: textW, h: top - 2 * m },
+    body: { x: m, y: top, w: textW, h: h - top - m },
+    picture: { x: w - picW, y: h - picH, w: picW, h: picH },
+    logo: { x: w - picW + m, y: m, w: picW - 2 * m, h: h - picH - 2 * m },
+    alignX: 1
+  };
+}
 function bottom(w, h, share) {
   const m = r2(Math.min(w, h) * MARGIN);
   const gap = r2(Math.min(w, h) * BOTTOM_GAP);
@@ -409,13 +427,15 @@ function geometry(layout, w, h, give = 0) {
   if (layout === "picture-bottom" /* PictureBottom */) {
     return bottom(w, h, BOTTOM_PICTURE_W - give);
   }
-  const g = side(w, h, PICTURE_SIDE[layout] ?? [0.6, 0.42]);
+  const isSide = layout === "picture-right" /* PictureRight */ || layout === "picture-left" /* PictureLeft */;
+  const g = isSide && h >= w && h < w * SHORT_PORTRAIT ? shortSide(w, h) : side(w, h, PICTURE_SIDE[layout] ?? DEFAULT_SIDE);
   if (layout !== "picture-left" /* PictureLeft */) {
     return g;
   }
-  return { header: mirror(g.header, w), body: mirror(g.body, w), picture: mirror(g.picture, w), alignX: 1 - g.alignX };
+  return { header: mirror(g.header, w), body: mirror(g.body, w), picture: mirror(g.picture, w), logo: g.logo ? mirror(g.logo, w) : void 0, alignX: 1 - g.alignX };
 }
-function placeContain(image, region, anchor, alignX, scale) {
+function placeContain(image, region, fit) {
+  const { anchor, alignX, scale } = fit;
   const s = Math.min(region.w / image.width, region.h / image.height) * scale;
   const w = Math.floor(image.width * s);
   const h = Math.floor(image.height * s);
@@ -432,6 +452,29 @@ var BOLD = 700;
 var SEMI = 600;
 var MEDIUM = 500;
 var SCRIPT = 400;
+var SIZE = {
+  title: 250,
+  headerScript: 120,
+  itemDate: 67,
+  itemRow: 42,
+  scheduleLabel: 66,
+  scheduleTime: 60,
+  priceAmount: 66,
+  priceLabel: 52,
+  listPrice: 58,
+  flankAmount: 110,
+  flankLabel: 48,
+  venue: 58,
+  listVenue: 48,
+  small: 38
+};
+var GAP = {
+  item: 48,
+  row: 30,
+  venue: 40,
+  includes: 24,
+  rule: 8
+};
 var makers = (p, u) => ({
   display: (text2, size) => ({ text: text2, role: "display", weight: BOLD, size: size * u, color: p.title }),
   venue: (text2, size) => ({ text: text2, role: "display", weight: MEDIUM, size: size * u, color: p.ink }),
@@ -444,52 +487,75 @@ var makers = (p, u) => ({
 function headerGroups(doc, p, u) {
   const l = makers(p, u);
   const b = doc.blocks;
-  const lines = [l.display?.(b.title, 250), b.script ? l.script?.(b.script, 120) : void 0, b.titleBottom ? l.display?.(b.titleBottom, 250) : void 0];
+  const lines = [l.display(b.title, SIZE.title), b.script ? l.script(b.script, SIZE.headerScript) : void 0, b.titleBottom ? l.display(b.titleBottom, SIZE.title) : void 0];
   return [{ lines: lines.filter((x) => x !== void 0), gapAfter: 0 }];
 }
 function itemGroup(item, l, u) {
-  const lines = [l.script?.(item.date, 67)];
-  item.schedule.forEach((row) => lines.push(l.strong?.(`${row.label}  ${row.time}`, 42)));
+  const lines = [l.script(item.date, SIZE.itemDate)];
+  item.schedule.forEach((row) => lines.push(l.strong(`${row.label}  ${row.time}`, SIZE.itemRow)));
   if (item.price) {
-    lines.push(l.accent?.(item.price, 42));
+    lines.push(l.accent(item.price, SIZE.itemRow));
+  }
+  return { lines, gapAfter: GAP.item * u };
+}
+var WRAP_FROM = 14;
+function halves(text2) {
+  const mid = text2.length / 2;
+  const spaces = [...text2].flatMap((c, i) => c === " " ? [i] : []);
+  if (text2.length < WRAP_FROM || spaces.length === 0) {
+    return [text2];
   }
-  return { lines, gapAfter: 48 * u };
+  const cut = spaces.reduce((best, i) => Math.abs(i - mid) < Math.abs(best - mid) ? i : best);
+  return [text2.slice(0, cut), text2.slice(cut + 1)];
 }
-function eventGroups(doc, l, u, withPrices) {
+function wrapped(line, wrap) {
+  const parts = wrap ? halves(line.text) : [line.text];
+  return parts.map((text2, i) => i === 0 ? { ...line, text: text2 } : { ...line, text: text2, bullet: void 0, hang: line.bullet !== void 0 });
+}
+function eventGroups(doc, l, u, options) {
   const b = doc.blocks;
   const groups = [];
-  b.schedule?.forEach((row) => groups.push({ lines: [l.strong?.(row.label, 66), l.accent?.(row.time, 60)], gapAfter: 30 * u }));
-  const prices = (withPrices ? b.prices : void 0) ?? [];
-  prices.forEach((row, i) => groups.push({ lines: [l.strong?.(row.amount, 66), l.accent?.(row.label, 52)], gapAfter: 30 * u, keepWithNext: i < prices.length - 1 }));
+  const schedule2 = b.schedule ?? [];
+  schedule2.forEach((row, i) => {
+    const lines = options.compact ? [l.strong(`${row.label}  ${row.time}`, SIZE.scheduleLabel)] : [l.strong(row.label, SIZE.scheduleLabel), l.accent(row.time, SIZE.scheduleTime)];
+    groups.push({ lines, gapAfter: GAP.row * u, keepWithNext: i < schedule2.length - 1 });
+  });
+  const prices = (options.withPrices === false ? void 0 : b.prices) ?? [];
+  prices.forEach((row, i) => {
+    const lines = options.compact ? [l.strong(`${row.amount} ${row.label}`, SIZE.priceAmount)] : [l.strong(row.amount, SIZE.priceAmount), l.accent(row.label, SIZE.priceLabel)];
+    groups.push({ lines, gapAfter: GAP.row * u, keepWithNext: i < prices.length - 1 });
+  });
   return groups;
 }
 function listGroups(doc, l, u) {
   const groups = (doc.items ?? []).map((item) => itemGroup(item, l, u));
-  const prices = doc.blocks.prices?.map((row) => l.strong?.(`${row.amount} ${row.label}`, 58)) ?? [];
+  const prices = doc.blocks.prices?.map((row) => l.strong(`${row.amount} ${row.label}`, SIZE.listPrice)) ?? [];
   if (prices.length > 0) {
-    groups.push({ lines: prices, gapAfter: 30 * u });
+    groups.push({ lines: prices, gapAfter: GAP.row * u });
   }
   return groups;
 }
 function flankPriceGroups(doc, p, u) {
   const l = makers(p, u);
-  return (doc.blocks.prices ?? []).map((row) => ({ lines: [l.strong?.(row.amount, 110), l.accent?.(row.label, 48)], gapAfter: 30 * u }));
+  return (doc.blocks.prices ?? []).map((row) => ({ lines: [l.strong(row.amount, SIZE.flankAmount), l.accent(row.label, SIZE.flankLabel)], gapAfter: GAP.row * u }));
 }
-function bodyGroups(doc, p, u, withPrices = true) {
+function bodyGroups(doc, p, u, options = {}) {
   const l = makers(p, u);
   const b = doc.blocks;
   const groups = [];
   const isList = doc.layout === "list" /* List */;
   if (b.venue) {
-    groups.push({ lines: b.venue.map((v) => l.venue?.(v, isList ? 48 : 58)), gapAfter: 40 * u, rule: { color: p.accent, height: 8 * u }, ruleBelow: true, icon: { color: p.accent, glyph: p.background } });
+    const size = isList ? SIZE.listVenue : SIZE.venue;
+    const keepWithNext = !isList && (b.schedule?.length ?? 0) > 0;
+    groups.push({ lines: b.venue.map((v) => l.venue(v, size)), gapAfter: GAP.venue * u, rule: { color: p.accent, height: GAP.rule * u }, ruleBelow: true, icon: { color: p.accent, glyph: p.background }, keepWithNext });
   }
-  groups.push(...isList ? listGroups(doc, l, u) : eventGroups(doc, l, u, withPrices));
+  groups.push(...isList ? listGroups(doc, l, u) : eventGroups(doc, l, u, options));
   if (b.includes) {
-    const lines = [l.accent?.(b.includes.heading, 38), ...b.includes.items.map((i) => l.item?.(i, 38))];
-    groups.push({ lines, gapAfter: 24 * u, uniform: true });
+    const lines = [l.accent(b.includes.heading, SIZE.small), ...b.includes.items.map((i) => l.item(i, SIZE.small))].flatMap((line) => wrapped(line, options.wrap));
+    groups.push({ lines, gapAfter: GAP.includes * u, uniform: true });
   }
   if (b.footer) {
-    groups.push({ lines: [l.soft?.(b.footer, 38)], gapAfter: 0 });
+    groups.push({ lines: wrapped(l.soft(b.footer, SIZE.small), options.wrap), gapAfter: 0 });
   }
   return groups;
 }
@@ -501,6 +567,7 @@ var BULLET_RADIUS = 0.2;
 var RULE_GAP = 2.5;
 var RULE_WIDTH = 0.9;
 var WIDE = 1.6;
+var COLUMN_GAP = 0.04;
 var TWO_COLUMN_MIN = 0.75;
 var TWO_COLUMN_GAIN = 1.15;
 var MIN_K = 0.02;
@@ -509,12 +576,13 @@ var ICON_SCALE = 1.6;
 var ICON_GAP = 0.35;
 var fontOf = (line, size, fonts) => `${line.weight} ${size}px ${fonts[line.role]}`;
 var emptyFlow = () => ({ texts: [], cards: [], rules: [], bullets: [], icons: [] });
+var indented = (line) => line.bullet !== void 0 || line.hang === true;
 var iconSize = (group, k) => {
   const first = group.lines[0];
   return group.icon && first ? first.size * k * LINE_HEIGHT * ICON_SCALE : 0;
 };
 function lineSize(line, width, k, avail) {
-  const indent = line.bullet ? line.size * k * BULLET_INDENT : 0;
+  const indent = indented(line) ? line.size * k * BULLET_INDENT : 0;
   return Math.max(0, Math.min(line.size * k, line.size * (avail - indent) / Math.max(width, 1)));
 }
 function groupRatio(m, k, avail) {
@@ -523,15 +591,17 @@ function groupRatio(m, k, avail) {
   }
   return Math.min(...m.group.lines.map((line, i) => lineSize(line, m.widths[i] ?? 1, k, avail) / line.size));
 }
-function placeIcon(group, d, x, textTop, textBottom, out) {
+function placeIcon(group, box, out) {
+  const { d, x, top, bottom: bottom2 } = box;
   if (!group.icon || d <= 0) {
-    return textBottom;
+    return bottom2;
   }
-  const textH = textBottom - textTop;
-  out?.icons.push({ rect: { x, y: textTop + Math.max(0, (textH - d) / 2), w: d, h: d }, color: group.icon.color, glyph: group.icon.glyph });
-  return textTop + Math.max(textH, d);
+  const textH = bottom2 - top;
+  out?.icons.push({ rect: { x, y: top + Math.max(0, (textH - d) / 2), w: d, h: d }, color: group.icon.color, glyph: group.icon.glyph });
+  return top + Math.max(textH, d);
 }
-function placeGroup(m, k, col, y0, out) {
+function placeGroup(m, at, out) {
+  const { k, col, y0 } = at;
   const { group } = m;
   let y = y0;
   if (group.rule) {
@@ -547,7 +617,7 @@ function placeGroup(m, k, col, y0, out) {
   const ratio = groupRatio(m, k, avail);
   group.lines.forEach((line, i) => {
     const size = ratio === null ? lineSize(line, m.widths[i] ?? 1, k, avail) : line.size * ratio;
-    const indent = (line.bullet ? line.size * k * BULLET_INDENT : 0) + iconIndent;
+    const indent = (indented(line) ? line.size * k * BULLET_INDENT : 0) + iconIndent;
     const w = (m.widths[i] ?? 0) * size / line.size;
     const x = col.right ? col.x + col.w - pad - w : col.x + pad + indent;
     out?.texts.push({ text: line.text, font: "", color: line.color, box: { x, y, w, h: size * LINE_HEIGHT } });
@@ -556,7 +626,7 @@ function placeGroup(m, k, col, y0, out) {
     }
     y += size * LINE_HEIGHT;
   });
-  y = placeIcon(group, d, col.x + pad, top + pad, y, out);
+  y = placeIcon(group, { d, x: col.x + pad, top: top + pad, bottom: y }, out);
   y += pad;
   if (group.rule && group.ruleBelow) {
     y += group.rule.height * k * (RULE_GAP - 1);
@@ -568,10 +638,11 @@ function placeGroup(m, k, col, y0, out) {
   }
   return y + group.gapAfter * k - y0;
 }
-function placeColumn(groups, k, col, out, spread = 0) {
+function placeColumn(groups, at, out) {
+  const { k, col, spread = 0 } = at;
   let h = 0;
   for (const g of groups) {
-    h += placeGroup(g, k, col, col.y + h, out) + spread;
+    h += placeGroup(g, { k, col, y0: col.y + h }, out) + spread;
   }
   return h - spread;
 }
@@ -598,9 +669,9 @@ function keepTogether(groups, heights, cut) {
   return candidates.reduce((best, c) => tallest(heights, c) < tallest(heights, best) ? c : best);
 }
 function splitColumns(groups, zone) {
-  const gap = Math.round(zone.w * 0.04);
+  const gap = Math.round(zone.w * COLUMN_GAP);
   const w = (zone.w - gap) / 2;
-  const heights = groups.map((g) => placeGroup(g, 1, { ...zone, w }, 0, null));
+  const heights = groups.map((g) => placeGroup(g, { k: 1, col: { ...zone, w }, y0: 0 }, null));
   const total = columnSum(heights, 0, heights.length);
   let cut = 1;
   for (let c = 2; c < groups.length; c++) {
@@ -615,7 +686,7 @@ function splitColumns(groups, zone) {
   ];
 }
 function largestK(columns, zoneH) {
-  const fits = (k) => columns.every((c) => placeColumn(c.groups, k, c.col, null) <= zoneH);
+  const fits = (k) => columns.every((c) => placeColumn(c.groups, { k, col: c.col }, null) <= zoneH);
   let lo = MIN_K;
   let hi = 1;
   if (fits(1)) {
@@ -652,9 +723,9 @@ function flow(ctx, groups, zone, fonts) {
   }));
   const { columns, k: lo } = bestColumns(measured, zone);
   const out = emptyFlow();
-  const heights = columns.map((c) => placeColumn(c.groups, lo, c.col, null));
+  const heights = columns.map((c) => placeColumn(c.groups, { k: lo, col: c.col }, null));
   const end = Math.max(...heights);
-  columns.forEach((c, i) => placeColumn(c.groups, lo, c.col, out, c.groups.length > 1 && columns.length > 1 ? (end - (heights[i] ?? end)) / (c.groups.length - 1) : 0));
+  columns.forEach((c, i) => placeColumn(c.groups, { k: lo, col: c.col, spread: c.groups.length > 1 && columns.length > 1 ? (end - (heights[i] ?? end)) / (c.groups.length - 1) : 0 }, out));
   const lines = groups.flatMap((g) => g.lines);
   out.texts.forEach((t, i) => {
     const line = lines[i];
@@ -691,43 +762,14 @@ function measuredEnd(f, fallback) {
   const bottoms = [...f.texts.map((t) => t.box), ...f.rules.map((r3) => r3.rect), ...f.icons.map((i) => i.rect)].map((r3) => r3.y + r3.h);
   return bottoms.length > 0 ? Math.max(...bottoms) : fallback;
 }
-function pictureRegion(layout, geo, body, u, frame) {
+function pictureRegion(layout, geo, body, frame) {
   if (layout !== "picture-bottom" /* PictureBottom */) {
     return geo.picture;
   }
-  const y = Math.min(geo.picture.y, Math.ceil(measuredEnd(body, geo.body.y) + BODY_GAP * u));
+  const y = Math.min(geo.picture.y, Math.ceil(measuredEnd(body, geo.body.y) + BODY_GAP * frame.u));
   return { x: geo.picture.x, y, w: geo.picture.w, h: frame.height - y };
 }
 
-// src/render/yieldToText.ts
-function yieldToText(geo, give) {
-  const { picture: p, body: b } = geo;
-  if (give <= 0) {
-    return geo;
-  }
-  if (p.x >= b.x + b.w) {
-    const d = Math.round(p.w * give);
-    return { ...geo, picture: { ...p, x: p.x + d, w: p.w - d }, body: { ...b, w: b.w + d } };
-  }
-  if (p.x + p.w <= b.x) {
-    const d = Math.round(p.w * give);
-    return { ...geo, picture: { ...p, w: p.w - d }, body: { ...b, x: b.x - d, w: b.w + d } };
-  }
-  if (p.y >= b.y + b.h) {
-    const d = Math.round(p.h * give);
-    const stacked = geo.header.y + geo.header.h <= b.y;
-    const toHeader = stacked ? Math.round(d / 2) : 0;
-    return {
-      ...geo,
-      header: { ...geo.header, h: geo.header.h + toHeader },
-      picture: { ...p, y: p.y + d, h: p.h - d },
-      body: { ...b, y: b.y + toHeader, h: b.h + d - toHeader },
-      flanks: geo.flanks?.map((f) => ({ ...f, y: f.y + d, h: f.h - d }))
-    };
-  }
-  return geo;
-}
-
 // src/render/fitToFloor.ts
 var FLOOR_PX = 30;
 var BASE = 1080;
@@ -735,33 +777,88 @@ var LINE_HEIGHT3 = 1.2;
 var LOGO_SHARE = 0.26;
 var GIVE_STEP = 0.025;
 var GIVE_STEPS = 32;
+var SHIFT_STEP = 0.06;
+var SHIFT_STEPS = 8;
+var MARGIN2 = 0.045;
 function splitHeader(header, hasLogo) {
   const logoW = hasLogo ? Math.round(header.w * LOGO_SHARE) : 0;
   return { text: { ...header, w: header.w - logoW * 1.1 }, logo: { ...header, x: header.x + header.w - logoW, w: logoW } };
 }
-function flowAll(ctx, input, geo, u) {
+function flowAll(ctx, input, geo, reflow) {
   const { doc, palette, fonts } = input;
+  const u = Math.min(input.width, input.height) / BASE;
   const zones = geo.logo ? { text: geo.header, logo: geo.logo } : splitHeader(geo.header, doc.logo !== void 0);
   const head = flow(ctx, headerGroups(doc, palette, u), zones.text, fonts);
   const flanks = geo.flanks ?? [];
-  const body = flow(ctx, bodyGroups(doc, palette, u, flanks.length === 0), geo.body, fonts);
+  const body = flow(ctx, bodyGroups(doc, palette, u, { withPrices: flanks.length === 0, compact: reflow.compact, wrap: reflow.wrap }), geo.body, fonts);
   const sides = flanks.length > 0 ? equalFlanks(ctx, flankPriceGroups(doc, palette, u), flanks, fonts) : [emptyFlow()];
   return { geo, zones, head, body, sides };
 }
 var smallest = (t) => Math.min(Infinity, ...[t.head, t.body, ...t.sides].flatMap((f) => f.texts.map((x) => x.box.h / LINE_HEIGHT3)));
-function geometryWithGive(layout, width, height, give) {
-  return layout === "picture-bottom" /* PictureBottom */ ? geometry(layout, width, height, give) : yieldToText(geometry(layout, width, height), give);
+function shiftHeader(geo, shift) {
+  const { header, body } = geo;
+  const stacked = header.y + header.h <= body.y && header.x < body.x + body.w && body.x < header.x + header.w;
+  const d = Math.round(header.h * shift);
+  if (!stacked || d === 0 || body.h - d <= 0) {
+    return geo;
+  }
+  return { ...geo, header: { ...header, h: header.h - d }, body: { ...body, y: body.y - d, h: body.h + d } };
 }
-function fitToFloor(ctx, input) {
-  const { doc, width, height } = input;
-  const u = Math.min(width, height) / BASE;
-  const floor = FLOOR_PX * u;
-  let fitted = flowAll(ctx, input, geometryWithGive(doc.layout, width, height, 0), u);
+function liftHeader(geo, top) {
+  const { header } = geo;
+  return header.y > top ? { ...geo, header: { ...header, y: top, h: header.h + header.y - top } } : geo;
+}
+function fitBottom(ctx, input, floor) {
+  const { width, height } = input;
+  const none = { compact: false, wrap: false};
+  let fitted = flowAll(ctx, input, geometry("picture-bottom" /* PictureBottom */, width, height), none);
+  for (let step = 1; step <= GIVE_STEPS && smallest(fitted) < floor; step++) {
+    fitted = flowAll(ctx, input, geometry("picture-bottom" /* PictureBottom */, width, height, step * GIVE_STEP), none);
+  }
+  return fitted;
+}
+function yieldPicture(geo, give) {
+  const { picture: p, body: b } = geo;
+  const d = Math.round(p.w * give);
+  return { ...geo, picture: { ...p, x: p.x + d, w: p.w - d }, body: { ...b, w: b.w + d } };
+}
+function fitList(ctx, input, floor, base2) {
+  const last = { compact: true, wrap: true};
+  let fitted = flowAll(ctx, input, base2, last);
   for (let step = 1; step <= GIVE_STEPS && smallest(fitted) < floor; step++) {
-    fitted = flowAll(ctx, input, geometryWithGive(doc.layout, width, height, step * GIVE_STEP), u);
+    fitted = flowAll(ctx, input, yieldPicture(base2, step * GIVE_STEP), last);
   }
   return fitted;
 }
+var SHIFTS = [0, ...Array.from({ length: SHIFT_STEPS }, (_v, i) => [(i + 1) * SHIFT_STEP, -(i + 1) * SHIFT_STEP]).flat()];
+var TIERS = [
+  { compact: false, wrap: false, lift: false },
+  { compact: true, wrap: false, lift: false },
+  { compact: true, wrap: true, lift: false },
+  { compact: true, wrap: true, lift: true }
+];
+var REFLOWS = TIERS.flatMap((tier) => SHIFTS.map((shift) => ({ ...tier, shift })));
+function fitToFloor(ctx, input) {
+  const { doc, width, height } = input;
+  const floor = FLOOR_PX * Math.min(width, height) / BASE;
+  if (doc.layout === "picture-bottom" /* PictureBottom */) {
+    return fitBottom(ctx, input, floor);
+  }
+  const base2 = geometry(doc.layout, width, height);
+  const top = Math.round(Math.min(width, height) * MARGIN2);
+  let best = null;
+  for (const reflow of REFLOWS) {
+    const fitted = flowAll(ctx, input, shiftHeader(reflow.lift ? liftHeader(base2, top) : base2, reflow.shift), reflow);
+    if (smallest(fitted) >= floor) {
+      return fitted;
+    }
+    best = best === null || smallest(fitted) > smallest(best) ? fitted : best;
+  }
+  if (doc.layout === "list" /* List */) {
+    return fitList(ctx, input, floor, base2);
+  }
+  return best ?? flowAll(ctx, input, base2, { compact: false, wrap: false});
+}
 
 // src/render/render.ts
 var BASE2 = 1080;
@@ -882,7 +979,7 @@ function render(input, assets, canvas) {
   const radius = Math.min(width, height) * CARD_RADIUS;
   [head, body, ...sides].forEach((f) => drawFlow(ctx, f, radius));
   const logoImage = doc.logo ? assets[doc.logo.imageId] : void 0;
-  const logo = logoImage ? placeContain(logoImage, geo.logo ? zones.logo : capAligned(zones.logo, head), "top" /* Top */, 1, 1) : null;
+  const logo = logoImage ? placeContain(logoImage, geo.logo ? zones.logo : capAligned(zones.logo, head), { anchor: "top" /* Top */, alignX: 1, scale: 1 }) : null;
   if (logoImage && logo) {
     ctx.drawImage(logoImage, logo.x, logo.y, logo.w, logo.h);
   }
@@ -891,8 +988,8 @@ function render(input, assets, canvas) {
   if (backdrop) {
     drawArch(ctx, backdrop, palette.arch);
   }
-  const region = pictureRegion(doc.layout, geo, body, u, { height });
-  const picture = image && doc.picture ? placeContain(image, region, doc.picture.anchor, geo.alignX, doc.picture.scale) : null;
+  const region = pictureRegion(doc.layout, geo, body, { height, u });
+  const picture = image && doc.picture ? placeContain(image, region, { anchor: doc.picture.anchor, alignX: geo.alignX, scale: doc.picture.scale }) : null;
   if (image && picture) {
     ctx.drawImage(image, picture.x, picture.y, picture.w, picture.h);
   }