@segnavia/format 0.38.0 → 0.40.0

package/dist/font-signature.js

@@ -0,0 +1,13 @@
+//#region src/font-signature.ts
+const COLLECTION_TAG = "ttcf";
+function classifyFont(bytes, offset = 0) {
+	if (!Number.isSafeInteger(offset) || offset < 0 || offset > bytes.length - 4) return;
+	const tag = String.fromCharCode(bytes[offset] ?? 0, bytes[offset + 1] ?? 0, bytes[offset + 2] ?? 0, bytes[offset + 3] ?? 0);
+	if (tag === "wOF2") return "woff2";
+	if (tag === "wOFF") return "woff";
+	if (tag === "OTTO") return "opentype";
+	if (tag === "ttcf") return "collection";
+	if (tag === "true" || tag === "\0
\0\0") return "truetype";
+}
+//#endregion
+export { COLLECTION_TAG, classifyFont };

package/dist/fonts.d.ts

@@ -20,7 +20,7 @@ export declare function localFontReferences(references: readonly FontReference[]
   local: string;
   fallback: string;
 }>;
-export declare const FONT_FORMATS: readonly ["woff2", "woff", "truetype", "opentype"];
+export declare const FONT_FORMATS: readonly ["woff2", "woff", "truetype", "opentype", "collection"];
 export type FontFormat = (typeof FONT_FORMATS)[number];
 export declare const LocalFaceTransport: z.ZodObject<{
   family: z.ZodString;
@@ -29,12 +29,14 @@ export declare const LocalFaceTransport: z.ZodObject<{
     woff: "woff";
     truetype: "truetype";
     opentype: "opentype";
+    collection: "collection";
   }>;
   weight: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
   style: z.ZodOptional<z.ZodEnum<{
     normal: "normal";
     italic: "italic";
   }>>;
+  postscriptName: z.ZodOptional<z.ZodString>;
   data: z.ZodString;
 }, z.core.$strict>;
 export type LocalFaceTransport = z.infer<typeof LocalFaceTransport>;
@@ -45,12 +47,14 @@ export declare const LocalFacesTransport: z.ZodArray<z.ZodObject<{
     woff: "woff";
     truetype: "truetype";
     opentype: "opentype";
+    collection: "collection";
   }>;
   weight: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
   style: z.ZodOptional<z.ZodEnum<{
     normal: "normal";
     italic: "italic";
   }>>;
+  postscriptName: z.ZodOptional<z.ZodString>;
   data: z.ZodString;
 }, z.core.$strict>>;
 export type LocalFacesInput = LocalFaceTransport[];
@@ -63,6 +67,7 @@ export interface FontFace {
   weight?: number | string;
   style?: 'normal' | 'italic';
   unicodeRange?: string;
+  postscriptName?: string;
 }
 export interface AppFont {
   family: string;

package/dist/fonts.js

@@ -26,13 +26,15 @@ const FONT_FORMATS = [
 	"woff2",
 	"woff",
 	"truetype",
-	"opentype"
+	"opentype",
+	"collection"
 ];
 const LocalFaceTransportShape = {
 	family: z.string().min(1),
 	format: z.enum(FONT_FORMATS),
 	weight: z.union([z.number(), z.string()]).optional(),
 	style: z.enum(["normal", "italic"]).optional(),
+	postscriptName: z.string().min(1).optional(),
 	data: z.string()
 };
 const LocalFaceTransport = z.strictObject(LocalFaceTransportShape);

package/dist/geometry.d.ts

@@ -0,0 +1,20 @@
+import { z } from "zod";
+//#region src/geometry.d.ts
+export declare const Size: z.ZodObject<{
+  width: z.ZodNumber;
+  height: z.ZodNumber;
+}, z.core.$strip>;
+export type Size = z.infer<typeof Size>;
+export declare const Box: z.ZodObject<{
+  x: z.ZodNumber;
+  y: z.ZodNumber;
+  width: z.ZodNumber;
+  height: z.ZodNumber;
+}, z.core.$strip>;
+export type Box = z.infer<typeof Box>;
+export declare const Point: z.ZodObject<{
+  x: z.ZodNumber;
+  y: z.ZodNumber;
+}, z.core.$strip>;
+export type Point = z.infer<typeof Point>;
+//#endregion

package/dist/geometry.js

@@ -0,0 +1,18 @@
+import { z } from "zod";
+//#region src/geometry.ts
+const Size = z.object({
+	width: z.number().int().positive(),
+	height: z.number().int().positive()
+});
+const Box = z.object({
+	x: z.number(),
+	y: z.number(),
+	width: z.number(),
+	height: z.number()
+});
+const Point = z.object({
+	x: z.number(),
+	y: z.number()
+});
+//#endregion
+export { Box, Point, Size };

package/dist/image-fit.d.ts

@@ -0,0 +1,10 @@
+import { z } from "zod";
+//#region src/image-fit.d.ts
+export declare const ImageFit: z.ZodEnum<{
+  width: "width";
+  contain: "contain";
+  cover: "cover";
+  focus: "focus";
+}>;
+export type ImageFit = z.infer<typeof ImageFit>;
+//#endregion

package/dist/image-fit.js

@@ -0,0 +1,10 @@
+import { z } from "zod";
+//#region src/image-fit.ts
+const ImageFit = z.enum([
+	"contain",
+	"cover",
+	"width",
+	"focus"
+]);
+//#endregion
+export { ImageFit };

package/dist/imposition-marks.d.ts

@@ -1,5 +1,5 @@
 import { MarkSegment } from "./paper.js";
-import { Imposition } from "./index.js";
+import { Imposition } from "./imposition-schema.js";
 //#region src/imposition-marks.d.ts
 export declare const MIN_MARK_LENGTH_MM = 2;
 export type ImpositionMarkEdge = 'top' | 'right' | 'bottom' | 'left';

package/dist/imposition-schema.d.ts

@@ -0,0 +1,185 @@
+import { z } from "zod";
+//#region src/imposition-schema.d.ts
+export declare const MAX_IMPOSITION_CELLS = 10000;
+export declare const Imposition: z.ZodPipe<z.ZodObject<{
+  paper: z.ZodUnion<readonly [z.ZodEnum<{
+    letter: "letter";
+    legal: "legal";
+    tabloid: "tabloid";
+    a3: "a3";
+    a4: "a4";
+    a5: "a5";
+    "business-card-us": "business-card-us";
+    "business-card-eu": "business-card-eu";
+    "business-card-square-us": "business-card-square-us";
+    "business-card-slim-us": "business-card-slim-us";
+    "postcard-4x6": "postcard-4x6";
+    "postcard-5x7": "postcard-5x7";
+    "postcard-6x9": "postcard-6x9";
+    "postcard-6x11": "postcard-6x11";
+    "card-square-4in": "card-square-4in";
+    "half-letter": "half-letter";
+    a6: "a6";
+    dl: "dl";
+    "rack-card-4x9": "rack-card-4x9";
+    "rack-card-3.5x8.5": "rack-card-3.5x8.5";
+    "poster-12x18": "poster-12x18";
+    "poster-16x20": "poster-16x20";
+    "poster-18x24": "poster-18x24";
+    "poster-24x36": "poster-24x36";
+    a2: "a2";
+    a1: "a1";
+    a0: "a0";
+  }>, z.ZodObject<{
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+    unit: z.ZodEnum<{
+      in: "in";
+      mm: "mm";
+      pt: "pt";
+    }>;
+  }, z.core.$strip>]>;
+  orientation: z.ZodDefault<z.ZodEnum<{
+    portrait: "portrait";
+    landscape: "landscape";
+  }>>;
+  unit: z.ZodDefault<z.ZodEnum<{
+    in: "in";
+    mm: "mm";
+    pt: "pt";
+  }>>;
+  margin: z.ZodDefault<z.ZodObject<{
+    top: z.ZodDefault<z.ZodNumber>;
+    right: z.ZodDefault<z.ZodNumber>;
+    bottom: z.ZodDefault<z.ZodNumber>;
+    left: z.ZodDefault<z.ZodNumber>;
+  }, z.core.$strip>>;
+  columns: z.ZodOptional<z.ZodNumber>;
+  rows: z.ZodOptional<z.ZodNumber>;
+  cell: z.ZodObject<{
+    width: z.ZodOptional<z.ZodNumber>;
+    height: z.ZodNumber;
+  }, z.core.$strip>;
+  gap: z.ZodDefault<z.ZodObject<{
+    column: z.ZodDefault<z.ZodNumber>;
+    row: z.ZodDefault<z.ZodNumber>;
+  }, z.core.$strip>>;
+  bleed: z.ZodDefault<z.ZodNumber>;
+  safe: z.ZodDefault<z.ZodNumber>;
+  fit: z.ZodDefault<z.ZodEnum<{
+    contain: "contain";
+    cover: "cover";
+  }>>;
+  fill: z.ZodDefault<z.ZodEnum<{
+    sequence: "sequence";
+    repeat: "repeat";
+  }>>;
+  sides: z.ZodOptional<z.ZodEnum<{
+    one: "one";
+    two: "two";
+  }>>;
+  flip: z.ZodDefault<z.ZodEnum<{
+    long: "long";
+    short: "short";
+  }>>;
+  skip: z.ZodDefault<z.ZodNumber>;
+  dir: z.ZodDefault<z.ZodEnum<{
+    ltr: "ltr";
+    rtl: "rtl";
+  }>>;
+  marks: z.ZodDefault<z.ZodBoolean>;
+  markColor: z.ZodDefault<z.ZodEnum<{
+    black: "black";
+    registration: "registration";
+  }>>;
+  cornerMarks: z.ZodDefault<z.ZodBoolean>;
+  fold: z.ZodOptional<z.ZodEnum<{
+    custom: "custom";
+    letter: "letter";
+    half: "half";
+    z: "z";
+    gate: "gate";
+  }>>;
+  panels: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
+}, z.core.$strip>, z.ZodTransform<{
+  paper: "letter" | "legal" | "tabloid" | "a3" | "a4" | "a5" | "business-card-us" | "business-card-eu" | "business-card-square-us" | "business-card-slim-us" | "postcard-4x6" | "postcard-5x7" | "postcard-6x9" | "postcard-6x11" | "card-square-4in" | "half-letter" | "a6" | "dl" | "rack-card-4x9" | "rack-card-3.5x8.5" | "poster-12x18" | "poster-16x20" | "poster-18x24" | "poster-24x36" | "a2" | "a1" | "a0" | {
+    width: number;
+    height: number;
+    unit: "in" | "mm" | "pt";
+  };
+  orientation: "portrait" | "landscape";
+  unit: "in" | "mm" | "pt";
+  margin: {
+    top: number;
+    right: number;
+    bottom: number;
+    left: number;
+  };
+  cell: {
+    height: number;
+    width?: number | undefined;
+  };
+  gap: {
+    column: number;
+    row: number;
+  };
+  bleed: number;
+  safe: number;
+  fit: "contain" | "cover";
+  fill: "sequence" | "repeat";
+  flip: "long" | "short";
+  skip: number;
+  dir: "ltr" | "rtl";
+  marks: boolean;
+  markColor: "black" | "registration";
+  cornerMarks: boolean;
+  columns?: number | undefined;
+  rows?: number | undefined;
+  sides?: "one" | "two" | undefined;
+  fold?: "custom" | "letter" | "half" | "z" | "gate" | undefined;
+  panels?: number[] | undefined;
+} & {
+  columns: number;
+  rows: number;
+  sides: "one" | "two";
+}, {
+  paper: "letter" | "legal" | "tabloid" | "a3" | "a4" | "a5" | "business-card-us" | "business-card-eu" | "business-card-square-us" | "business-card-slim-us" | "postcard-4x6" | "postcard-5x7" | "postcard-6x9" | "postcard-6x11" | "card-square-4in" | "half-letter" | "a6" | "dl" | "rack-card-4x9" | "rack-card-3.5x8.5" | "poster-12x18" | "poster-16x20" | "poster-18x24" | "poster-24x36" | "a2" | "a1" | "a0" | {
+    width: number;
+    height: number;
+    unit: "in" | "mm" | "pt";
+  };
+  orientation: "portrait" | "landscape";
+  unit: "in" | "mm" | "pt";
+  margin: {
+    top: number;
+    right: number;
+    bottom: number;
+    left: number;
+  };
+  cell: {
+    height: number;
+    width?: number | undefined;
+  };
+  gap: {
+    column: number;
+    row: number;
+  };
+  bleed: number;
+  safe: number;
+  fit: "contain" | "cover";
+  fill: "sequence" | "repeat";
+  flip: "long" | "short";
+  skip: number;
+  dir: "ltr" | "rtl";
+  marks: boolean;
+  markColor: "black" | "registration";
+  cornerMarks: boolean;
+  columns?: number | undefined;
+  rows?: number | undefined;
+  sides?: "one" | "two" | undefined;
+  fold?: "custom" | "letter" | "half" | "z" | "gate" | undefined;
+  panels?: number[] | undefined;
+}>>;
+export type Imposition = z.infer<typeof Imposition>;
+export type ImpositionInput = z.input<typeof Imposition>;
+//#endregion

package/dist/imposition-schema.js

@@ -0,0 +1,122 @@
+import { Orientation, Paper, PaperUnit, sheetMm, toMillimeters } from "./paper.js";
+import { Margin, MarkColor } from "./print.js";
+import { refuseOverflow, refuseSafe } from "./imposition-fit.js";
+import { FOLD_KINDS, refineFold, resolveImposition } from "./fold.js";
+import { z } from "zod";
+//#region src/imposition-schema.ts
+const ImpositionGap = z.object({
+	column: z.number().nonnegative().default(0),
+	row: z.number().nonnegative().default(0)
+});
+const MAX_IMPOSITION_CELLS = 1e4;
+const Imposition = z.object({
+	paper: Paper,
+	orientation: Orientation.default("portrait"),
+	unit: PaperUnit.default("mm"),
+	margin: Margin.default({
+		top: 0,
+		right: 0,
+		bottom: 0,
+		left: 0
+	}),
+	columns: z.number().int().positive().optional(),
+	rows: z.number().int().positive().optional(),
+	cell: z.object({
+		width: z.number().positive().optional(),
+		height: z.number().positive()
+	}),
+	gap: ImpositionGap.default({
+		column: 0,
+		row: 0
+	}),
+	bleed: z.number().nonnegative().default(0),
+	safe: z.number().nonnegative().default(0),
+	fit: z.enum(["contain", "cover"]).default("contain"),
+	fill: z.enum(["sequence", "repeat"]).default("sequence"),
+	sides: z.enum(["one", "two"]).optional(),
+	flip: z.enum(["long", "short"]).default("long"),
+	skip: z.number().int().nonnegative().default(0),
+	dir: z.enum(["ltr", "rtl"]).default("ltr"),
+	marks: z.boolean().default(false),
+	markColor: MarkColor.default("black"),
+	cornerMarks: z.boolean().default(false),
+	fold: z.enum(FOLD_KINDS).optional(),
+	panels: z.array(z.number().positive()).optional()
+}).superRefine((imposition, ctx) => {
+	if (imposition.markColor === "registration" && !imposition.marks) ctx.addIssue({
+		code: "custom",
+		path: ["markColor"],
+		message: "markColor requires marks to be true"
+	});
+	if (imposition.cornerMarks && !imposition.marks) ctx.addIssue({
+		code: "custom",
+		path: ["cornerMarks"],
+		message: "cornerMarks requires marks to be true"
+	});
+	if (imposition.panels !== void 0 && !imposition.fold) ctx.addIssue({
+		code: "custom",
+		path: ["panels"],
+		message: "panels needs fold; set fold or remove panels"
+	});
+	if (imposition.fold) {
+		const panelCount = imposition.panels?.length ?? 0;
+		if (panelCount > 1e4) {
+			ctx.addIssue({
+				code: "custom",
+				path: ["panels"],
+				message: `the fold has ${panelCount} panels and the ceiling is ${MAX_IMPOSITION_CELLS}; fewer panels clears this refusal`
+			});
+			return;
+		}
+		refineFold(imposition, ctx);
+		return;
+	}
+	if (imposition.columns === void 0) ctx.addIssue({
+		code: "custom",
+		path: ["columns"],
+		message: "columns is required; give a column count to clear this refusal"
+	});
+	if (imposition.rows === void 0) ctx.addIssue({
+		code: "custom",
+		path: ["rows"],
+		message: "rows is required; give a row count to clear this refusal"
+	});
+	if (imposition.cell.width === void 0) ctx.addIssue({
+		code: "custom",
+		path: ["cell", "width"],
+		message: "cell.width is required; give a cell width to clear this refusal"
+	});
+	if (imposition.columns === void 0 || imposition.rows === void 0 || imposition.cell.width === void 0) return;
+	const cellCount = BigInt(imposition.columns) * BigInt(imposition.rows);
+	if (imposition.columns > 1e4 || imposition.rows > 1e4 || cellCount > BigInt(1e4)) {
+		ctx.addIssue({
+			code: "custom",
+			path: ["columns"],
+			message: `the grid has ${cellCount} cells and the ceiling is ${MAX_IMPOSITION_CELLS}; fewer columns or rows clears this refusal`
+		});
+		return;
+	}
+	const mm = (value) => toMillimeters(value, imposition.unit);
+	const paper = sheetMm({
+		paper: imposition.paper,
+		orientation: imposition.orientation
+	});
+	const gridWidth = mm(imposition.margin.left + imposition.columns * imposition.cell.width + (imposition.columns - 1) * imposition.gap.column + imposition.margin.right);
+	const gridHeight = mm(imposition.margin.top + imposition.rows * imposition.cell.height + (imposition.rows - 1) * imposition.gap.row + imposition.margin.bottom);
+	refuseOverflow(ctx, paper, {
+		width: gridWidth,
+		height: gridHeight
+	});
+	refuseSafe(ctx, mm(imposition.safe), {
+		width: mm(imposition.cell.width),
+		height: mm(imposition.cell.height)
+	});
+	const cells = imposition.columns * imposition.rows;
+	if (imposition.skip >= cells) ctx.addIssue({
+		code: "custom",
+		path: ["skip"],
+		message: `skip is ${imposition.skip}, but the grid has ${cells} cells; skip must be less than ${cells}`
+	});
+}).transform(resolveImposition);
+//#endregion
+export { Imposition, MAX_IMPOSITION_CELLS };

package/dist/imposition.d.ts

@@ -1,5 +1,7 @@
+import { Page, PageWidths } from "./page.js";
+import { Print } from "./print.js";
 import { PaperBox } from "./paper.js";
-import { Imposition, Page, Print } from "./index.js";
+import { Imposition } from "./imposition-schema.js";
 //#region src/imposition.d.ts
 export interface MillimeterEdges {
   top: number;
@@ -7,7 +9,7 @@ export interface MillimeterEdges {
   bottom: number;
   left: number;
 }
-export interface Placement {
+export interface ImpositionPlacement {
   page: number;
   paper: number;
   side: 'front' | 'back';
@@ -26,7 +28,7 @@ export interface Imposed {
   };
   papers: number;
   sides: 1 | 2;
-  placements: Placement[];
+  placements: ImpositionPlacement[];
 }
 export interface PageFit {
   flow: boolean;
@@ -52,11 +54,11 @@ export interface PagePlacementLayout {
   inset: boolean;
   paper: PaperBox;
 }
-export declare function mirrorPlacement(front: Placement, paper: Imposed['paper'], flip: Imposition['flip'], page?: number): Placement;
+export declare function mirrorPlacement(front: ImpositionPlacement, paper: Imposed['paper'], flip: Imposition['flip'], page?: number): ImpositionPlacement;
 export declare function impose(imposition: Imposition, pageCount: number): Imposed;
 export declare function fitPage(page: {
   size: Page['size'];
   print?: Print;
-}, placement: Placement, fit: 'contain' | 'cover'): PageFit;
-export declare function pagePlacementLayout(size: Page['size'], placement: Placement, fit: PageFit): PagePlacementLayout;
+}, placement: ImpositionPlacement, fit: 'contain' | 'cover', pageWidths?: PageWidths): PageFit;
+export declare function pagePlacementLayout(size: Page['size'], placement: ImpositionPlacement, fit: PageFit): PagePlacementLayout;
 //#endregion

package/dist/imposition.js

@@ -1,4 +1,5 @@
 import { PX_PER_MM, roundMillimeters, sheetMm, toMillimeters } from "./paper.js";
+import { resolvePageWidth } from "./page.js";
 import { foldCellPages, foldPageCountMessage } from "./fold.js";
 //#region src/imposition.ts
 const zeroCrop = () => ({
@@ -225,46 +226,56 @@ function trimDiffers(page, placement) {
 	const trim = sheetMm(page.print);
 	return Math.abs(trim.width - placement.trim.width) > .01 || Math.abs(trim.height - placement.trim.height) > .01;
 }
-function fitPage(page, placement, fit) {
+function fitPage(page, placement, fit, pageWidths) {
 	const differs = trimDiffers(page, placement);
-	if (page.size === "fluid") return {
-		flow: true,
-		width: placement.bleedBox.width * PX_PER_MM,
-		height: null,
-		scale: 1,
-		x: placement.bleedBox.x,
-		y: placement.bleedBox.y,
-		bands: {
-			inline: 0,
-			block: 0
-		},
-		crop: zeroCrop(),
-		differs
-	};
-	if (page.size.height === "auto") return {
-		flow: true,
-		width: page.size.width,
-		height: null,
-		scale: placement.trim.width * PX_PER_MM / page.size.width,
-		x: placement.trim.x,
-		y: placement.trim.y,
-		bands: {
-			inline: 0,
-			block: 0
-		},
-		crop: zeroCrop(),
-		differs
-	};
+	const size = page.size;
+	if (size.height === "auto") {
+		const resolved = resolvePageWidth(size, pageWidths);
+		if (size.width !== "full") {
+			const named = typeof size.width === "string";
+			const width = named ? Math.min(resolved.viewportWidth, placement.trim.width * PX_PER_MM) : resolved.viewportWidth;
+			const scale = named ? 1 : placement.trim.width * PX_PER_MM / width;
+			const inline = named ? (placement.trim.width - width / PX_PER_MM) / 2 : 0;
+			return {
+				flow: true,
+				width,
+				height: null,
+				scale,
+				x: roundMillimeters(placement.trim.x + inline),
+				y: placement.trim.y,
+				bands: {
+					inline: 0,
+					block: 0
+				},
+				crop: zeroCrop(),
+				differs
+			};
+		}
+		return {
+			flow: true,
+			width: placement.bleedBox.width * PX_PER_MM,
+			height: null,
+			scale: 1,
+			x: placement.bleedBox.x,
+			y: placement.bleedBox.y,
+			bands: {
+				inline: 0,
+				block: 0
+			},
+			crop: zeroCrop(),
+			differs
+		};
+	}
 	if (fit === "contain") {
-		const scale = Math.min(placement.trim.width * PX_PER_MM / page.size.width, placement.trim.height * PX_PER_MM / page.size.height);
-		const width = page.size.width * scale / PX_PER_MM;
-		const height = page.size.height * scale / PX_PER_MM;
+		const scale = Math.min(placement.trim.width * PX_PER_MM / size.width, placement.trim.height * PX_PER_MM / size.height);
+		const width = size.width * scale / PX_PER_MM;
+		const height = size.height * scale / PX_PER_MM;
 		const inline = (placement.trim.width - width) / 2;
 		const block = (placement.trim.height - height) / 2;
 		return {
 			flow: false,
-			width: page.size.width,
-			height: page.size.height,
+			width: size.width,
+			height: size.height,
 			scale,
 			x: roundMillimeters(placement.trim.x + inline),
 			y: roundMillimeters(placement.trim.y + block),
@@ -278,15 +289,15 @@ function fitPage(page, placement, fit) {
 	}
 	const horizontalBleed = Math.max(placement.bleed.left, placement.bleed.right);
 	const verticalBleed = Math.max(placement.bleed.top, placement.bleed.bottom);
-	const scale = Math.max((placement.trim.width + horizontalBleed * 2) * PX_PER_MM / page.size.width, (placement.trim.height + verticalBleed * 2) * PX_PER_MM / page.size.height);
-	const width = page.size.width * scale / PX_PER_MM;
-	const height = page.size.height * scale / PX_PER_MM;
+	const scale = Math.max((placement.trim.width + horizontalBleed * 2) * PX_PER_MM / size.width, (placement.trim.height + verticalBleed * 2) * PX_PER_MM / size.height);
+	const width = size.width * scale / PX_PER_MM;
+	const height = size.height * scale / PX_PER_MM;
 	const x = placement.trim.x + (placement.trim.width - width) / 2;
 	const y = placement.trim.y + (placement.trim.height - height) / 2;
 	return {
 		flow: false,
-		width: page.size.width,
-		height: page.size.height,
+		width: size.width,
+		height: size.height,
 		scale,
 		x: roundMillimeters(x),
 		y: roundMillimeters(y),
@@ -304,7 +315,7 @@ function fitPage(page, placement, fit) {
 	};
 }
 function pagePlacementLayout(size, placement, fit) {
-	if (size === "fluid") return {
+	if (size.width === "full") return {
 		kind: "fluid",
 		piece: {
 			width: placement.bleedBox.width * PX_PER_MM,
@@ -316,14 +327,14 @@ function pagePlacementLayout(size, placement, fit) {
 	if (size.height === "auto") return {
 		kind: "growing",
 		piece: {
-			width: size.width,
+			width: fit.width,
 			height: placement.trim.height * PX_PER_MM / fit.scale
 		},
 		inset: false,
 		paper: {
 			x: fit.x,
 			y: fit.y,
-			width: placement.trim.width,
+			width: fit.width * fit.scale / PX_PER_MM,
 			height: placement.trim.height
 		}
 	};