@dloizides/poster-render 0.2.6 → 0.2.7

package/dist/index.mjs

@@ -297,7 +297,7 @@ var flanksBeside = (pic, top, bottom2, m) => [
   [pic[0] + pic[2] + m, top, 1 - pic[0] - pic[2] - 2 * m, bottom2 - top]
 ];
 var ARCH_PIC = [0.22, 0.42, 0.56, 0.58];
-var PHONE_ARCH_PIC = [0.2, 0.6, 0.6, 0.4];
+var PHONE_ARCH_PIC = [0.2, 0.47, 0.6, 0.53];
 var DESK_ARCH_PIC = [0.355, 0.07, 0.32, 0.93];
 var ARCH_LANDSCAPE = {
   header: [0.04, 0.06, 0.3, 0.5],
@@ -317,7 +317,7 @@ var LAYOUT_SPECS = {
     landscape: { header: [0.04, 0.2, 0.52, 0.3], body: [0.04, 0.52, 0.52, 0.42], picture: [0.6, 0.12, 0.4, 0.88], alignX: 1 }
   },
   ["phone-arch" /* PhoneArch */]: {
-    portrait: { header: [0.045, 0.3, 0.91, 0.13], body: [0.045, 0.44, 0.91, 0.14], picture: PHONE_ARCH_PIC, alignX: 0.5, flanks: flanksBeside(PHONE_ARCH_PIC, 0.63, 0.94, 0.03), arch: 0.08 },
+    portrait: { header: [0.045, 0.05, 0.91, 0.16], body: [0.045, 0.22, 0.91, 0.21], picture: PHONE_ARCH_PIC, alignX: 0.5, flanks: flanksBeside(PHONE_ARCH_PIC, 0.5, 0.94, 0.03), arch: 0.08 },
     landscape: { ...ARCH_LANDSCAPE, header: [0.04, 0.16, 0.3, 0.42], picture: [0.36, 0.16, 0.3, 0.84] }
   },
   ["desktop-safe" /* DesktopSafe */]: {
@@ -550,7 +550,7 @@ function bodyGroups(doc, p, u, options = {}) {
   groups.push(...isList ? listGroups(doc, l, u) : eventGroups(doc, l, u, options));
   if (b.includes) {
     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 });
+    groups.push({ lines, gapAfter: GAP.includes * u, uniform: true, keepWithNext: b.footer !== void 0, attachNext: b.footer !== void 0 });
   }
   if (b.footer) {
     groups.push({ lines: wrapped(l.soft(b.footer, SIZE.small), options.wrap), gapAfter: 0 });
@@ -639,11 +639,15 @@ function placeGroup(m, at, out) {
 function placeColumn(groups, at, out) {
   const { k, col, spread = 0 } = at;
   let h = 0;
-  for (const g of groups) {
-    h += placeGroup(g, { k, col, y0: col.y + h }, out) + spread;
-  }
-  return h - spread;
+  groups.forEach((g, i) => {
+    h += placeGroup(g, { k, col, y0: col.y + h }, out);
+    if (i < groups.length - 1 && g.group.attachNext !== true) {
+      h += spread;
+    }
+  });
+  return h;
 }
+var spreadGaps = (groups) => groups.slice(0, -1).filter((g) => g.group.attachNext !== true).length;
 var columnSum = (heights, from, to) => heights.slice(from, to).reduce((a, b) => a + b, 0);
 var tallest = (heights, cut) => {
   const left = heights.slice(0, cut).reduce((a, b) => a + b, 0);
@@ -723,7 +727,10 @@ function flow(ctx, groups, zone, fonts) {
   const out = emptyFlow();
   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, { k: lo, col: c.col, spread: c.groups.length > 1 && columns.length > 1 ? (end - (heights[i] ?? end)) / (c.groups.length - 1) : 0 }, out));
+  columns.forEach((c, i) => {
+    const gaps = spreadGaps(c.groups);
+    placeColumn(c.groups, { k: lo, col: c.col, spread: gaps > 0 && columns.length > 1 ? (end - (heights[i] ?? end)) / gaps : 0 }, out);
+  });
   const lines = groups.flatMap((g) => g.lines);
   out.texts.forEach((t, i) => {
     const line = lines[i];
@@ -1028,7 +1035,7 @@ var LAYOUT_CATALOGUE = [
   { id: "picture-bottom" /* PictureBottom */, designId: "picture-bottom", label: "Picture bottom", description: "Titles and details on top, the picture across the bottom half.", formats: POSTERS },
   { id: "list" /* List */, designId: "list", label: "Upcoming list", description: "Several dated events as a list beside the picture.", formats: POSTERS },
   { id: "phone-clock-safe" /* PhoneClockSafe */, designId: "P-A", label: "Phone, clock clear", description: "Lock-screen wallpaper: top kept clear for the clock, details on the left, picture on the right.", formats: ["phone" /* Phone */] },
-  { id: "phone-arch" /* PhoneArch */, designId: "P-B", label: "Phone arch", description: "Lock-screen wallpaper: top kept clear for the clock, details in the middle, the picture in an arch at the bottom.", formats: ["phone" /* Phone */] },
+  { id: "phone-arch" /* PhoneArch */, designId: "P-B", label: "Phone arch", description: "Lock-screen wallpaper: titles at the top, details under them, the picture in an arch at the bottom.", formats: ["phone" /* Phone */] },
   { id: "desktop-safe" /* DesktopSafe */, designId: "D-A", label: "Desktop, icons clear", description: "Desktop wallpaper: text on the left clear of desktop icons and the taskbar, the picture on the right.", formats: ["desktop" /* Desktop */] },
   { id: "desktop-arch" /* DesktopArch */, designId: "D-B", label: "Desktop arch", description: "Desktop wallpaper: titles left, the picture in a centred arch, details right.", formats: ["desktop" /* Desktop */] }
 ];