@openpresentation/opf 0.17.0 → 0.18.3

package/dist/{chunk-CW7GEAV3.js → chunk-MBU42S5Y.js}

@@ -425,6 +425,109 @@ function primaryOrganization(presentation) {
   return organizations.find((item) => item.role === "primary") ?? organizations[0];
 }
 
+// src/logos.ts
+var LOGO_SHAPES = ["full", "stacked", "icon", "wordmark"];
+function isLogoShape(value) {
+  return typeof value === "string" && LOGO_SHAPES.includes(value);
+}
+var NAME_PATTERN = /^(?:var:)?(organization(?:\.[A-Za-z0-9_-]+){1,3})$/;
+function parseLogoName(name, presentation) {
+  const match = NAME_PATTERN.exec(name);
+  if (!match) return null;
+  const parts = match[1].split(".");
+  const shapes = LOGO_SHAPES.map((shape) => `'${shape}'`).join(", ");
+  if (parts.length === 2) return parts[1] === "logo" ? {} : null;
+  if (parts.length === 3) {
+    if (parts[2] === "logo") return { organization: parts[1] };
+    if (parts[1] !== "logo") return null;
+    if (isLogoShape(parts[2])) return { shape: parts[2] };
+    if (organizationIndex(presentation, "logo") >= 0) return null;
+    return { error: `'${parts.join(".")}' is not a built-in variable: '${parts[2]}' is not a logo shape; the shapes are ${shapes}.` };
+  }
+  if (parts[2] !== "logo") return null;
+  if (isLogoShape(parts[3])) return { organization: parts[1], shape: parts[3] };
+  return { error: `'${parts.join(".")}' is not a built-in variable: '${parts[3]}' is not a logo shape; the shapes are ${shapes}.` };
+}
+function logoReferenceName(reference, shape = reference.shape) {
+  return `organization${reference.organization !== void 0 ? `.${reference.organization}` : ""}.logo${shape && shape !== "full" ? `.${shape}` : ""}`;
+}
+function organizationIndex(presentation, id) {
+  if (!isRecord(presentation)) return -1;
+  const raw = presentation.organization;
+  const list = Array.isArray(raw) ? raw : [raw];
+  if (id !== void 0) return list.findIndex((entry) => isRecord(entry) && entry.id === id);
+  const primary = list.findIndex((entry) => isRecord(entry) && entry.role === "primary");
+  return primary >= 0 ? primary : list.findIndex((entry) => isRecord(entry));
+}
+var usable = (value) => {
+  const source = typeof value === "string" ? value : isRecord(value) ? value.src : void 0;
+  return typeof source === "string" && source.trim().length > 0;
+};
+var isAsset = (value) => typeof value === "string" || isRecord(value) && "src" in value;
+function shapeChain(shape) {
+  const chain = [shape, "full", "wordmark", "stacked", "icon"];
+  return chain.filter((entry, index) => chain.indexOf(entry) === index);
+}
+function pickOrganizationLogo(logo, shape, onDark, root) {
+  if (logo === void 0 || logo === null) return null;
+  if (isAsset(logo)) return usable(logo) ? { source: logo, path: `${root}.logo`, variant: "default" } : null;
+  if (!isRecord(logo)) return null;
+  const tones = onDark ? ["onDark", "onLight"] : ["onLight", "onDark"];
+  for (const candidate of shapeChain(shape)) {
+    const entry = logo[candidate];
+    if (entry === void 0 || entry === null) continue;
+    if (isAsset(entry)) {
+      if (usable(entry)) return { source: entry, path: `${root}.logo.${candidate}`, variant: "default" };
+      continue;
+    }
+    if (!isRecord(entry)) continue;
+    for (const tone of tones) if (usable(entry[tone])) return { source: entry[tone], path: `${root}.logo.${candidate}.${tone}`, variant: tone };
+  }
+  return null;
+}
+function resolveOrganizationLogo(presentation, reference, options = {}) {
+  const shape = reference.shape ?? options.shape ?? "full";
+  const name = logoReferenceName(reference, shape);
+  const index = organizationIndex(presentation, reference.organization);
+  if (index < 0) {
+    if (reference.organization !== void 0) return { ok: false, reason: "unknown", message: `'${name}' names no organization with id '${reference.organization}'.` };
+    return { ok: false, reason: "missing", message: `'${name}' has no value: the deck has no organization with a logo.` };
+  }
+  const deck = presentation;
+  const root = Array.isArray(deck.organization) ? `organization.${index}` : "organization";
+  const organization = Array.isArray(deck.organization) ? deck.organization[index] : deck.organization;
+  const picked = pickOrganizationLogo(organization.logo, shape, options.onDark === true, root);
+  if (!picked) return { ok: false, reason: "missing", message: `'${name}' has no value: ${root} has no logo.` };
+  return { ok: true, logo: { ...picked, shape, reference: `var:${name}` } };
+}
+function resolveLogo(presentation, slide, options = {}) {
+  if (options.shape !== void 0 && !isLogoShape(options.shape)) throw new RangeError("Logo shape must be full, stacked, icon or wordmark.");
+  const onDark = options.onDark === true;
+  const resolve = (reference, designPath) => {
+    const result = resolveOrganizationLogo(presentation, reference, { ...options.shape ? { shape: options.shape } : {}, onDark });
+    if (!result.ok) return null;
+    return designPath ? { ...result.logo, designPath } : result.logo;
+  };
+  if (options.reference !== void 0) {
+    const parsed = typeof options.reference === "string" ? parseLogoName(options.reference, presentation) : null;
+    if (!parsed || "error" in parsed) throw new RangeError(`'${String(options.reference)}' is not a logo reference such as 'var:organization.logo.icon'.`);
+    return resolve(parsed);
+  }
+  const slideIndex = Number.isSafeInteger(options.slideIndex) && options.slideIndex >= 0 ? options.slideIndex : 0;
+  const levels = [
+    [isRecord(slide) && isRecord(slide.design) ? slide.design.logo : void 0, `slides.${slideIndex}.design.logo`],
+    [isRecord(presentation) && isRecord(presentation.design) ? presentation.design.logo : void 0, "design.logo"]
+  ];
+  for (const [value, path] of levels) {
+    if (value === false) return null;
+    if (typeof value !== "string") continue;
+    const parsed = parseLogoName(value, presentation);
+    if (!parsed || "error" in parsed || !value.startsWith("var:")) continue;
+    return resolve(parsed, path);
+  }
+  return resolve({});
+}
+
 // src/slide-variables.ts
 var SLIDE_SCOPED_BUILTINS = ["slide.number", "slide.section", "deck.slideCount"];
 function isSlideScopedBuiltin(name) {
@@ -476,18 +579,34 @@ function slideTokenSpans(text2) {
   return Array.from(text2.matchAll(slideTokenSpanPattern), (match) => [match.index, match.index + match[0].length]);
 }
 var skippedKeys = /* @__PURE__ */ new Set(["extensions"]);
-function substitute(value, values, root) {
+var logoReferencePattern = /^var:organization(?:.[A-Za-z0-9_-]+){1,3}$/;
+var OMIT = /* @__PURE__ */ Symbol("omit");
+function clone(value) {
+  return typeof value === "object" && value !== null ? structuredClone(value) : value;
+}
+function substituteLogo(value, logos) {
+  if (logos.presentation === void 0 || !logoReferencePattern.test(value)) return value;
+  const reference = parseLogoName(value, logos.presentation);
+  if (!reference || "error" in reference) return value;
+  const result = resolveOrganizationLogo(logos.presentation, reference, { onDark: logos.darkBackground === true });
+  if (result.ok) return clone(result.logo.source);
+  return result.reason === "missing" ? OMIT : value;
+}
+function substitute(value, values, root, logos = {}) {
   if (typeof value === "string") {
+    const logo = substituteLogo(value, logos);
+    if (logo !== value) return logo;
     const result = substituteSlideTokens(value, values);
     return result.changed ? result.text : value;
   }
   if (Array.isArray(value)) {
     let changed2 = false;
-    const out2 = value.map((entry) => {
-      const next = substitute(entry, values, false);
+    const out2 = [];
+    for (const entry of value) {
+      const next = substitute(entry, values, false, logos);
       if (next !== entry) changed2 = true;
-      return next;
-    });
+      if (next !== OMIT) out2.push(next);
+    }
     return changed2 ? out2 : value;
   }
   if (!isRecord(value)) return value;
@@ -500,14 +619,14 @@ function substitute(value, values, root) {
       const design = {};
       let designChanged = false;
       for (const [designKey, designEntry] of Object.entries(entry)) {
-        const designNext = designKey === "header" || designKey === "footer" ? designEntry : substitute(designEntry, values, false);
+        const designNext = designKey === "header" || designKey === "footer" || designKey === "logo" ? designEntry : substitute(designEntry, values, false, logos);
         if (designNext !== designEntry) designChanged = true;
-        design[designKey] = designNext;
+        if (designNext !== OMIT) design[designKey] = designNext;
       }
       next = designChanged ? design : entry;
-    } else next = substitute(entry, values, false);
+    } else next = substitute(entry, values, false, logos);
     if (next !== entry) changed = true;
-    out[key] = next;
+    if (next !== OMIT) out[key] = next;
   }
   return changed ? out : value;
 }
@@ -515,8 +634,10 @@ function resolveSlideVariables(slide, values) {
   if (!isRecord(slide)) return slide;
   const full = { slideNumber: values?.slideNumber, ...values?.slideCount !== void 0 ? { slideCount: values.slideCount } : {}, section: slide.section };
   checkValues(full);
-  if (!quickCheck.test(JSON.stringify(slide))) return slide;
-  return substitute(slide, full, true);
+  const logos = values.presentation !== void 0 ? { presentation: values.presentation, darkBackground: values.darkBackground === true } : {};
+  const text2 = JSON.stringify(slide);
+  if (!quickCheck.test(text2) && !(logos.presentation !== void 0 && text2.includes('"var:organization.'))) return slide;
+  return substitute(slide, full, true, logos);
 }
 function usesSlideBuiltin(value, name) {
   const pattern = new RegExp(String.raw`(?:^|[^\\])\{\{\s*${name.replace(".", String.raw`\.`)}\s*(?:\|[^{}]*)?\}\}`);
@@ -543,9 +664,9 @@ var OPFVariableError = class extends Error {
   }
 };
 var idPattern = /^[a-z][a-z0-9-]*$/;
-var nameSource = String.raw`[a-z][a-z0-9-]*|(?:deck|speaker|organization|slide)(?:\.[A-Za-z0-9_-]+){1,2}`;
+var nameSource = String.raw`[a-z][a-z0-9-]*|(?:deck|speaker|organization|slide)(?:\.[A-Za-z0-9_-]+){1,3}`;
 var referencePattern = new RegExp(String.raw`^var:(${nameSource})$`);
-var builtinNamePattern = /^(?:speakers|(?:deck|speaker|organization|slide)(?:\.[A-Za-z0-9_-]+){1,2})$/;
+var builtinNamePattern = /^(?:speakers|(?:deck|speaker|organization|slide)(?:\.[A-Za-z0-9_-]+){1,3})$/;
 var builtinUsePattern = /\{\{\s*(?:speakers\b|(?:deck|speaker|organization|slide)\.)|^var:(?:speakers$|(?:deck|speaker|organization|slide)\.)/;
 var hexPattern = /^#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/;
 var urlPattern = /^(?:https?:\/\/|mailto:|tel:)\S+$/;
@@ -562,7 +683,7 @@ var SAMPLES = {
   list: ["Sample item"]
 };
 var hasOwn = (value, key) => Object.hasOwn(value, key);
-var clone = (value) => value === void 0 ? value : JSON.parse(JSON.stringify(value));
+var clone2 = (value) => value === void 0 ? value : JSON.parse(JSON.stringify(value));
 function isTemplate(presentation) {
   return isRecord(presentation) && presentation.template === true;
 }
@@ -578,7 +699,7 @@ function coerceVariableValue(kind2, raw) {
       if (typeof raw === "string") return { ok: true, value: raw };
       if (typeof raw === "number" && Number.isFinite(raw)) return { ok: true, value: String(raw) };
       if (typeof raw === "boolean") return { ok: true, value: String(raw) };
-      if (Array.isArray(raw) && raw.every((run) => typeof run === "string" || isRecord(run) && typeof run.text === "string")) return { ok: true, value: clone(raw) };
+      if (Array.isArray(raw) && raw.every((run) => typeof run === "string" || isRecord(run) && typeof run.text === "string")) return { ok: true, value: clone2(raw) };
       return fail("expected text: a string or an array of text runs");
     }
     case "number": {
@@ -598,7 +719,7 @@ function coerceVariableValue(kind2, raw) {
     }
     case "image": {
       if (typeof raw === "string" && raw.trim()) return { ok: true, value: raw.trim() };
-      if (isRecord(raw) && typeof raw.src === "string" && raw.src.trim()) return { ok: true, value: clone(raw) };
+      if (isRecord(raw) && typeof raw.src === "string" && raw.src.trim()) return { ok: true, value: clone2(raw) };
       return fail("expected an image source: a string or an object with src");
     }
     case "url":
@@ -744,7 +865,7 @@ function inlineText(effective, format, path, context) {
 }
 var DECK_FIELDS = { name: "text", description: "text", author: "text" };
 var SPEAKER_FIELDS = { name: "text", title: "text", email: "text", phone: "text", bio: "text", photo: "image" };
-var ORGANIZATION_FIELDS = { name: "text", legalName: "text", tagline: "text", domain: "text", email: "text", phone: "text", logo: "image" };
+var ORGANIZATION_FIELDS = { name: "text", legalName: "text", tagline: "text", domain: "text", email: "text", phone: "text" };
 function isBuiltinName(name) {
   return builtinNamePattern.test(name);
 }
@@ -768,6 +889,11 @@ function builtinSource(name, doc) {
   }
   const parts = name.split(".");
   const root = parts[0];
+  if (root === "organization") {
+    const logo = parseLogoName(name, doc);
+    if (logo && "error" in logo) return { ok: false, message: logo.error };
+    if (logo) return { ok: false, message: `'{{${name}}}' is not supported: '${name}' is an image, used only as a whole field, 'var:${name}', which resolves for each slide's background.` };
+  }
   const fields2 = builtinFields(root);
   if (root === "deck") {
     const field2 = parts[1];
@@ -780,6 +906,7 @@ function builtinSource(name, doc) {
     return { ok: false, message: `'${name}' is not a built-in variable: '${field}' is not a ${root} field; the fields are ${list(Object.keys(fields2))}.` };
   }
   let entity;
+  if (parts.length > 3) return { ok: false, message: `'${name}' is not a built-in variable.` };
   if (parts.length === 2) entity = root === "speaker" ? primarySpeaker(doc) : primaryOrganization(doc);
   else {
     const id = parts[1];
@@ -864,7 +991,7 @@ function interpolate(text2, path, context) {
   });
   return { value, changed };
 }
-var OMIT = /* @__PURE__ */ Symbol("omit");
+var OMIT2 = /* @__PURE__ */ Symbol("omit");
 var Splice = class {
   constructor(values) {
     this.values = values;
@@ -875,6 +1002,8 @@ function reduceString(text2, path, parentIsArray, context) {
   const reference = referencePattern.exec(text2);
   if (reference) {
     const id = reference[1];
+    const logo = id.startsWith("organization.") ? parseLogoName(id, context.doc) : null;
+    if (logo) return reduceLogo(id, logo, path, context);
     const effective = lookupVariable(id, path, context);
     if (effective && effective.declaration.kind !== "color") {
       context.uses.push({ id, path, form: "reference" });
@@ -883,9 +1012,9 @@ function reduceString(text2, path, parentIsArray, context) {
       }
       const value = effective.status === "unfilled" ? sampleValue(effective.declaration) : effective.value;
       if (effective.declaration.kind === "list" && parentIsArray) {
-        return context.shape ? { kind: "replace", value: value[0] ?? "" } : { kind: "splice", values: clone(value) };
+        return context.shape ? { kind: "replace", value: value[0] ?? "" } : { kind: "splice", values: clone2(value) };
       }
-      return { kind: "replace", value: clone(value) };
+      return { kind: "replace", value: clone2(value) };
     }
     if (effective) {
       context.uses.push({ id, path, form: "reference" });
@@ -897,13 +1026,31 @@ function reduceString(text2, path, parentIsArray, context) {
   const result = interpolate(text2, path, context);
   return result.changed ? { kind: "replace", value: result.value } : { kind: "keep" };
 }
+function slideReachable(path) {
+  return path.startsWith("/slides/") || path.startsWith("/design/header/") || path.startsWith("/design/footer/") || path === "/design/logo";
+}
+function reduceLogo(id, logo, path, context) {
+  context.uses.push({ id, path, form: "reference" });
+  if ("error" in logo) {
+    diag(context, { code: "variable-unknown-builtin", severity: "error", path, id, message: logo.error }, `ubi:${id}:${path}`);
+    return { kind: "keep" };
+  }
+  const result = resolveOrganizationLogo(context.doc, logo);
+  if (!result.ok) {
+    if (result.reason === "unknown") diag(context, { code: "variable-unknown-builtin", severity: "error", path, id, message: result.message }, `ubi:${id}:${path}`);
+    else diag(context, missingBuiltin(id, path), `bim:${id}:${path}`);
+  }
+  if (slideReachable(path)) return { kind: "keep" };
+  if (result.ok) return { kind: "replace", value: clone2(result.logo.source) };
+  return context.shape ? { kind: "keep" } : { kind: "omit" };
+}
 var skippedKeys2 = /* @__PURE__ */ new Set(["extensions"]);
 var skippedRootKeys = /* @__PURE__ */ new Set(["variables", "catalogs", "$schema", "template"]);
 function walk(value, path, parentIsArray, context) {
   if (typeof value === "string") {
     const reduced = reduceString(value, path, parentIsArray, context);
     if (reduced.kind === "keep") return value;
-    if (reduced.kind === "omit") return OMIT;
+    if (reduced.kind === "omit") return OMIT2;
     if (reduced.kind === "splice") return new Splice(reduced.values);
     return reduced.value;
   }
@@ -912,7 +1059,7 @@ function walk(value, path, parentIsArray, context) {
     const out = [];
     value.forEach((entry, index) => {
       const next = walk(entry, `${path}/${index}`, true, context);
-      if (next === OMIT) {
+      if (next === OMIT2) {
         changed = true;
         return;
       }
@@ -935,7 +1082,7 @@ function walk(value, path, parentIsArray, context) {
         continue;
       }
       const next = walk(entry, pathFor(path || "/", key), false, context);
-      if (next === OMIT) {
+      if (next === OMIT2) {
         changed = true;
         continue;
       }
@@ -1131,6 +1278,15 @@ function listBuiltinVariables(presentation) {
     const available = name !== "slide.section" || slides.some((slide) => isRecord(slide) && typeof slide.section === "string" && slide.section !== "");
     out.push({ name, kind: "text", label: SLIDE_SCOPED_LABELS[name], scope: "slide", available, uses: built.context.uses.filter((use) => use.id === name) });
   }
+  const logoReferences = [{ reference: {}, label: "Organization" }];
+  for (const entry of organizationsOf(presentation)) if (typeof entry.id === "string" && entry.id !== "") logoReferences.push({ reference: { organization: entry.id }, label: `Organization ${entry.id}` });
+  for (const { reference, label } of logoReferences) {
+    for (const shape of LOGO_SHAPES) {
+      const name = logoReferenceName(reference, shape);
+      const available = resolveOrganizationLogo(presentation, reference, { shape }).ok;
+      out.push({ name, kind: "image", label: `${label} logo${shape === "full" ? "" : ` (${shape})`}`, scope: "slide", available, uses: built.context.uses.filter((use) => use.id === name || shape === "full" && use.id === `${name}.full`) });
+    }
+  }
   return out;
 }
 
@@ -4108,7 +4264,6 @@ var imagePayload = (host) => {
   for (const key of IMAGE_OPTION_KEYS) if (host[key] !== void 0) payload[key] = host[key];
   return payload;
 };
-var assetSource = (value) => typeof value === "string" ? value : record6(value).src;
 var finite = (value, min, max) => typeof value === "number" && Number.isFinite(value) && value >= min && value <= max ? value : void 0;
 var pathNumber = (value) => String(round2(value));
 var IMAGE_SHAPES = { rectangle: "rect", rounded: "roundRect", circle: "ellipse", hexagon: "hexagon" };
@@ -4228,45 +4383,6 @@ function resolveBackgroundImage(slide, presentation, themeBackground, width, hei
   if (aspect) result.picture = fitImage(box, background.fit, aspect, background.focus);
   return result;
 }
-var LOGO_LOCKUP_CHAINS = {
-  dark: ["light", "default", "stackedLight", "stacked", "wordmarkLight", "wordmark", "iconLight", "icon", "dark", "stackedDark", "wordmarkDark", "iconDark"],
-  light: ["dark", "default", "stackedDark", "stacked", "wordmarkDark", "wordmark", "iconDark", "icon", "light", "stackedLight", "wordmarkLight", "iconLight"]
-};
-var LOGO_SET_KEYS = new Set(LOGO_LOCKUP_CHAINS.dark);
-function resolveLogo(presentation, slide, options = {}) {
-  const slot = options.slot === "icon" || options.slot === "stacked" ? options.slot : "lockup";
-  if (options.slot !== void 0 && slot !== options.slot) throw new RangeError("Logo slot must be lockup, icon or stacked.");
-  const tone = options.onDark === true ? "dark" : "light";
-  const lockup = LOGO_LOCKUP_CHAINS[tone];
-  const chain = slot === "icon" ? [tone === "dark" ? "iconLight" : "iconDark", "icon", ...lockup] : slot === "stacked" ? [tone === "dark" ? "stackedLight" : "stackedDark", "stacked", ...lockup] : lockup;
-  const usable = (value) => {
-    const source = assetSource(value);
-    return typeof source === "string" && source.length > 0;
-  };
-  const pick = (value, path) => {
-    if (value === void 0 || value === null || value === false) return null;
-    if (typeof value === "string" || typeof value === "object" && !Array.isArray(value) && "src" in record6(value)) {
-      return usable(value) ? { source: value, path, variant: "default", slot } : null;
-    }
-    const set2 = record6(value);
-    if (!Object.keys(set2).some((key) => LOGO_SET_KEYS.has(key))) return null;
-    for (const key of chain) {
-      const variant = set2[key];
-      if (variant !== void 0 && usable(variant)) return { source: variant, path: `${path}.${key}`, variant: key, slot };
-    }
-    return null;
-  };
-  const deck = record6(presentation), slideIndex = Number.isSafeInteger(options.slideIndex) && options.slideIndex >= 0 ? options.slideIndex : 0;
-  const own2 = pick(record6(record6(slide).design).logo, `slides.${slideIndex}.design.logo`);
-  if (own2) return own2;
-  const shared = pick(record6(deck.design).logo, "design.logo");
-  if (shared) return shared;
-  const organizations = Array.isArray(deck.organization) ? deck.organization : [deck.organization];
-  const primaryIndex = organizations.findIndex((item) => record6(item).role === "primary");
-  const index = primaryIndex >= 0 ? primaryIndex : organizations.findIndex(Boolean);
-  if (index < 0) return null;
-  return pick(record6(organizations[index]).logo, Array.isArray(deck.organization) ? `organization.${index}.logo` : "organization.logo");
-}
 var webUrl = /^https?:\/\/\S+$/i;
 function resolveSocialProfile(platform, value, owner = "organization") {
   const raw = String(value).trim().replace(/\s+/gu, " ");
@@ -4282,6 +4398,17 @@ function resolveSocialProfile(platform, value, owner = "organization") {
   if (!webUrl.test(url)) return { text: raw, resolved: false };
   return { text: display(url), href: encodeURI(url), resolved: true };
 }
+var FURNITURE_GAP = 12;
+var FURNITURE_IMAGE_SHARE = 0.4;
+var SPACED_WORD_CHARACTER = /^[\p{L}\p{N}\p{M}]$/u;
+var UNSPACED_SCRIPT = /[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Thai}\p{Script=Lao}\p{Script=Khmer}\p{Script=Myanmar}\p{Script=Tibetan}]/u;
+function breaksInsideWord(text2, fit) {
+  return fit.sourceLines.some((line) => {
+    if (line.boundary !== "soft" || line.nextStart <= 0 || line.nextStart >= text2.length) return false;
+    const before = [...text2.slice(0, line.nextStart)].at(-1) ?? "", after = [...text2.slice(line.nextStart, line.nextStart + 2)][0] ?? "";
+    return SPACED_WORD_CHARACTER.test(before) && SPACED_WORD_CHARACTER.test(after) && !UNSPACED_SCRIPT.test(before) && !UNSPACED_SCRIPT.test(after);
+  });
+}
 function layoutFurniture(input, options = {}) {
   const slide = record6(input), width = options.width ?? 1280, height = options.height ?? 720, scale = Math.min(width, height) / 720;
   const settings = { ...record6(record6(options.layout).composition), ...record6(slide.composition) };
@@ -4296,8 +4423,8 @@ function layoutFurniture(input, options = {}) {
   if (options.date !== void 0 && (typeof options.date !== "string" || !parseIsoDate(options.date))) throw new RangeError("The furniture date option must be an ISO YYYY-MM-DD calendar date.");
   const outlines = options.textMeasurement?.outlineBounds !== void 0, parts = [], diagnostics = [];
   const sourceRoot = `slides.${options.slideIndex ?? 0}`, organizations = Array.isArray(options.presentation?.organization) ? options.presentation.organization : [options.presentation?.organization];
-  const primaryIndex = organizations.findIndex((item) => record6(item).role === "primary"), organizationIndex = primaryIndex >= 0 ? primaryIndex : organizations.findIndex(Boolean);
-  const organization = record6(organizations[organizationIndex]), organizationRoot = Array.isArray(options.presentation?.organization) ? `organization.${organizationIndex}` : "organization";
+  const primaryIndex = organizations.findIndex((item) => record6(item).role === "primary"), organizationIndex2 = primaryIndex >= 0 ? primaryIndex : organizations.findIndex(Boolean);
+  const organization = record6(organizations[organizationIndex2]), organizationRoot = Array.isArray(options.presentation?.organization) ? `organization.${organizationIndex2}` : "organization";
   const fontFamily = options.fontFamilies?.body ?? "sans-serif";
   let headerBottom = 0, footerTop = height, configured = false;
   const error = (path, message, code = "text-overflow") => diagnostics.push({ code, path, message });
@@ -4310,58 +4437,27 @@ function layoutFurniture(input, options = {}) {
     const zones = [];
     for (const [index, zone] of ["left", "center", "right"].entries()) {
       const side = furnitureRtl && zone !== "center" ? zone === "left" ? "right" : "left" : zone;
-      const content = record6(record6(value)[zone]), path = `${root}.${zone}`, x = width * (0.07 + (furnitureRtl ? 2 - index : index) * 0.3), zoneWidth = width * 0.26, zoneParts = [];
-      let y = 0;
+      const content = record6(record6(value)[zone]), path = `${root}.${zone}`, x = width * (0.07 + (furnitureRtl ? 2 - index : index) * 0.3), zoneWidth = width * 0.26;
+      const pending = [];
       const add = (field, text2, generated = false, sourcePath, extras = {}) => {
         if (text2 === void 0) return;
         if (typeof text2 !== "string") throw new TypeError(`Furniture field ${path}.${field} requires string content.`);
-        const partPath = `${path}.${field}`, style = resolveTextStyle({ fontFamily, fontWeight: 400, italic: false, path: partPath }, options.textMeasurement);
-        const fit = fitText(text2, { width: Math.max(Number.MIN_VALUE, zoneWidth - (outlines ? 2 * padding : 0)), height: Number.MAX_VALUE }, size, size, textWidthMeasurer(style, options.textMeasurement));
-        const ink = fit.sourceLines.map((line, index2) => {
-          let outline = null;
-          if (outlines) {
-            for (const segment2 of line.segments) if (segment2.kind === "text") {
-              const bounds = measureTextOutline(text2.slice(segment2.start, segment2.end), size, style, options.textMeasurement);
-              if (bounds) {
-                const next = { ...bounds, x: bounds.x + segment2.x };
-                if (!outline) outline = next;
-                else {
-                  const right = Math.max(outline.x + outline.width, next.x + next.width), bottom = Math.max(outline.y + outline.height, next.y + next.height);
-                  outline.x = Math.min(outline.x, next.x);
-                  outline.y = Math.min(outline.y, next.y);
-                  outline.width = right - outline.x;
-                  outline.height = bottom - outline.y;
-                }
-              }
-            }
-          }
-          return { width: line.width, y: index2 * fit.lineHeight, baseline: size + index2 * fit.lineHeight, height: fit.lineHeight, outline };
-        });
-        const natural = outlines ? placeTextLines(ink, { x, y, width: zoneWidth, height: Number.MAX_VALUE }, side, padding) : void 0;
-        const partHeight = natural?.height ?? fit.sourceLines.length * fit.lineHeight;
-        if (!Number.isFinite(partHeight)) throw new RangeError("Furniture exceeds finite layout coordinates.");
-        const box = { x, y, width: zoneWidth, height: Math.max(scale, partHeight) }, placement = outlines ? placeTextLines(ink, box, side, padding) : void 0;
-        const accepted = { ...fit, ...placement ? { placement } : {}, overflow: fit.overflow || !!placement?.overflow };
-        zoneParts.push({ type: "text", kind: kind2, zone, field, path: partPath, sourcePath: sourcePath ?? (!generated ? partPath : void 0), generated, text: text2, style, requestedFontSize: size, minFontSize: minimum, box, alignment: side, fit: accepted, ...extras.fields?.length ? { fields: extras.fields } : {}, ...extras.links?.length ? { links: extras.links } : {} });
-        if (accepted.overflow) error(partPath, "Repeated text exceeds its zone at the selected readability floor; change the furniture or slide design.");
-        y += box.height;
+        const partPath = `${path}.${field}`;
+        pending.push({ type: "text", field, text: text2, generated, sourcePath: sourcePath ?? (!generated ? partPath : void 0), extras, partPath, style: resolveTextStyle({ fontFamily, fontWeight: 400, italic: false, path: partPath }, options.textMeasurement) });
       };
-      const imageBox = (source) => {
+      const addImage = (source, sourcePath, reference) => {
         const imageHeight = Math.max(32 * scale, Math.min(height * 0.05, 72 * scale)), imageWidth = Math.min(zoneWidth, imageHeight * (intrinsicImageAspect(source, record6(options.presentation).assets) ?? 1));
-        return { x: side === "left" ? x : side === "center" ? x + (zoneWidth - imageWidth) / 2 : x + zoneWidth - imageWidth, y, width: imageWidth, height: imageHeight };
+        pending.push({ type: "image", sourcePath, image: source, ...reference !== void 0 ? { reference } : {}, width: imageWidth, height: imageHeight });
       };
-      if (content.logo === true) {
-        const resolved = resolveLogo(options.presentation, slide, { slot: "icon", onDark: options.darkBackground, slideIndex: options.slideIndex });
-        if (resolved) {
-          const box = imageBox(resolved.source);
-          zoneParts.push({ type: "image", kind: kind2, zone, field: "logo", path: `${path}.logo`, sourcePath: resolved.path, generated: true, image: resolved.source, box, alignment: side });
-          y += box.height;
-        } else error(`${path}.logo`, "Generated logo needs design.logo or a primary organization logo.", "unresolved-content");
-      }
       if (content.image !== void 0) {
-        const box = imageBox(content.image);
-        zoneParts.push({ type: "image", kind: kind2, zone, field: "image", path: `${path}.image`, sourcePath: `${path}.image`, generated: false, image: content.image, box, alignment: side });
-        y += box.height;
+        const logo = typeof content.image === "string" && content.image.startsWith("var:organization.") ? parseLogoName(content.image, options.presentation) : null;
+        if (!logo) addImage(content.image, `${path}.image`);
+        else if ("error" in logo) error(`${path}.image`, logo.error, "unresolved-content");
+        else {
+          const resolved = resolveOrganizationLogo(options.presentation, logo, { onDark: options.darkBackground === true });
+          if (resolved.ok) addImage(resolved.logo.source, resolved.logo.path, content.image);
+          else error(`${path}.image`, `${resolved.message} Give the organization a logo, or change the zone image.`, "unresolved-content");
+        }
       }
       if (typeof content.text === "string") {
         const resolved = substituteSlideTokens(content.text, { slideNumber: number, ...slideCount !== void 0 ? { slideCount } : {}, section: slide.section });
@@ -4390,9 +4486,71 @@ function layoutFurniture(input, options = {}) {
           else add("date", resolved.text, true, `${path}.date`);
         }
       }
+      const fitPart = (part, boxWidth) => {
+        const fit = fitText(part.text, { width: Math.max(Number.MIN_VALUE, boxWidth - (outlines ? 2 * padding : 0)), height: Number.MAX_VALUE }, size, size, textWidthMeasurer(part.style, options.textMeasurement));
+        const ink = fit.sourceLines.map((line, index2) => {
+          let outline = null;
+          if (outlines) {
+            for (const segment2 of line.segments) if (segment2.kind === "text") {
+              const bounds = measureTextOutline(part.text.slice(segment2.start, segment2.end), size, part.style, options.textMeasurement);
+              if (bounds) {
+                const next = { ...bounds, x: bounds.x + segment2.x };
+                if (!outline) outline = next;
+                else {
+                  const right = Math.max(outline.x + outline.width, next.x + next.width), bottom = Math.max(outline.y + outline.height, next.y + next.height);
+                  outline.x = Math.min(outline.x, next.x);
+                  outline.y = Math.min(outline.y, next.y);
+                  outline.width = right - outline.x;
+                  outline.height = bottom - outline.y;
+                }
+              }
+            }
+          }
+          return { width: line.width, y: index2 * fit.lineHeight, baseline: size + index2 * fit.lineHeight, height: fit.lineHeight, outline };
+        });
+        const natural = outlines ? placeTextLines(ink, { x: 0, y: 0, width: boxWidth, height: Number.MAX_VALUE }, side, padding) : void 0;
+        const partHeight = natural?.height ?? fit.sourceLines.length * fit.lineHeight;
+        if (!Number.isFinite(partHeight)) throw new RangeError("Furniture exceeds finite layout coordinates.");
+        return { fit, ink, height: Math.max(scale, partHeight) };
+      };
+      const gap = FURNITURE_GAP * scale, gaps = gap * Math.max(0, pending.length - 1);
+      const widths = pending.map((part) => part.type === "image" ? pending.length > 1 ? Math.min(part.width, zoneWidth * FURNITURE_IMAGE_SHARE) : part.width : pending.length === 1 ? zoneWidth : Math.max(scale, ...fitPart(part, 1e7).ink.map((line) => Math.max(line.width + (outlines ? 2 * padding : 0), line.outline ? line.outline.width + 2 * padding : 0))));
+      if (pending.length > 1 && widths.reduce((sum, entry) => sum + entry, 0) + gaps > zoneWidth + 0.01) {
+        const texts = pending.map((_, index2) => index2).filter((index2) => pending[index2].type === "text").sort((a, b) => widths[a] - widths[b]);
+        let remaining = zoneWidth - gaps - pending.reduce((sum, part, index2) => sum + (part.type === "image" ? widths[index2] : 0), 0), count = texts.length;
+        if (remaining < scale * Math.max(1, count)) error(path, `The parts of this zone (${pending.map((part) => part.type === "image" ? "image" : part.field).join(", ")}) are wider side by side than the zone; remove a part or move one to another zone.`);
+        for (const index2 of texts) {
+          const share = Math.max(scale, remaining / count);
+          widths[index2] = Math.min(widths[index2], share);
+          remaining -= widths[index2];
+          count--;
+        }
+      }
+      const measured = pending.map((part, index2) => part.type === "image" ? { part, width: widths[index2], height: part.height } : { part, width: widths[index2], ...fitPart(part, widths[index2]) });
+      const row = Math.max(0, ...measured.map((entry) => entry.height));
+      const total = measured.reduce((sum, entry) => sum + entry.width, 0) + gaps;
+      let cursor = side === "left" || total > zoneWidth + 0.01 ? x : side === "center" ? x + (zoneWidth - total) / 2 : x + zoneWidth - total;
+      const placed = /* @__PURE__ */ new Map();
+      for (const index2 of furnitureRtl ? [...measured.keys()].reverse() : [...measured.keys()]) {
+        placed.set(index2, cursor);
+        cursor += measured[index2].width + gap;
+      }
+      const zoneParts = measured.map((entry, index2) => {
+        const box = { x: placed.get(index2), y: (row - entry.height) / 2, width: entry.width, height: entry.height };
+        if (entry.part.type === "image") {
+          const part2 = entry.part;
+          return { type: "image", kind: kind2, zone, field: "image", path: `${path}.image`, sourcePath: part2.sourcePath, generated: false, image: part2.image, ...part2.reference !== void 0 ? { reference: part2.reference } : {}, box, alignment: side };
+        }
+        const part = entry.part, { fit, ink } = entry;
+        const placement = outlines ? placeTextLines(ink, box, side, padding) : void 0;
+        const accepted = { ...fit, ...placement ? { placement } : {}, overflow: fit.overflow || !!placement?.overflow };
+        if (accepted.overflow) error(part.partPath, "Repeated text exceeds its zone at the selected readability floor; change the furniture or slide design.");
+        else if (pending.length > 1 && breaksInsideWord(part.text, fit)) error(part.partPath, "A word of this repeated text is wider than its share of the zone row at the selected readability floor and would break inside the word; shorten the text, move a part to another zone, or widen the canvas.");
+        return { type: "text", kind: kind2, zone, field: part.field, path: part.partPath, ...part.sourcePath !== void 0 ? { sourcePath: part.sourcePath } : {}, generated: part.generated, text: part.text, style: part.style, requestedFontSize: size, minFontSize: minimum, box, alignment: side, fit: accepted, ...part.extras.fields?.length ? { fields: part.extras.fields } : {}, ...part.extras.links?.length ? { links: part.extras.links } : {} };
+      });
       zones.push(zoneParts);
     }
-    const tallest = Math.max(0, ...zones.map((zone) => zone.reduce((sum, part) => sum + part.box.height, 0)));
+    const tallest = Math.max(0, ...zones.flat().map((part) => part.box.y + part.box.height));
     if (!tallest) continue;
     const top = kind2 === "header" ? height * 0.025 : Math.max(height * 0.025, height - height * 0.04 - tallest);
     if (kind2 === "header") headerBottom = top + tallest;
@@ -4522,13 +4680,13 @@ function layoutQuote(value, box, options = {}) {
     path
   ) : void 0;
   const footerRequested = attribution?.requestedFontSize ?? gridFontSize(17 * scale, minimum);
-  const usable = (area) => [area.x, area.y, area.width, area.height].every(Number.isFinite) && area.width > 0 && area.height > 0;
-  const fit = (part, area, size = part.requestedFontSize, floor = minimum) => !usable(area) ? void 0 : part.runs ? fitRichText(part.runs, area, size, floor, { style: part.style, textMeasurement: options.textMeasurement, ...options.citationMarker ? { citationMarker: options.citationMarker } : {}, ...options.direction ? { direction: options.direction } : {} }) : fitText(part.text, area, size, floor, textWidthMeasurer(part.style, options.textMeasurement), options.direction);
+  const usable2 = (area) => [area.x, area.y, area.width, area.height].every(Number.isFinite) && area.width > 0 && area.height > 0;
+  const fit = (part, area, size = part.requestedFontSize, floor = minimum) => !usable2(area) ? void 0 : part.runs ? fitRichText(part.runs, area, size, floor, { style: part.style, textMeasurement: options.textMeasurement, ...options.citationMarker ? { citationMarker: options.citationMarker } : {}, ...options.direction ? { direction: options.direction } : {} }) : fitText(part.text, area, size, floor, textWidthMeasurer(part.style, options.textMeasurement), options.direction);
   const heightOf = (fit2) => "richLines" in fit2 ? fit2.height : fit2.lines.length * fit2.lineHeight;
   const inner = { x: box.x + 18, y: box.y + 18, width: box.width - 36, height: box.height - 36 };
   let photo, photoFits = true;
   if (!hasBlock) body.fit = fit(body, body.box);
-  else if (usable(inner) && inner.height > 18) {
+  else if (usable2(inner) && inner.height > 18) {
     const available = inner.height - 18;
     const preferredBody = fit(body, inner, body.requestedFontSize, body.requestedFontSize);
     const minimumBody = body.requestedFontSize === minimum ? preferredBody : fit(body, inner, minimum, minimum);
@@ -4550,8 +4708,8 @@ function layoutQuote(value, box, options = {}) {
       const bodyFit = fit(body, bodyBox);
       const photoBox = hasPhoto ? { x: rtl ? inner.x + inner.width - diameter : inner.x, y: footerBox.y + (footerHeight - diameter) / 2, width: diameter, height: diameter } : void 0;
       const textBox = attribution ? hasPhoto ? { ...textArea, y: footerBox.y + Math.max(0, footerHeight - naturalHeight) / 2, height: Math.min(naturalHeight, footerHeight) } : footerBox : void 0;
-      const footerFit = attribution && natural && usable(footerBox) ? { ...natural, overflow: natural.overflow || naturalHeight > footerHeight + 0.01 } : void 0;
-      const fitsPhoto = !hasPhoto || diameter <= footerHeight + 0.01 && (!attribution || usable(textArea));
+      const footerFit = attribution && natural && usable2(footerBox) ? { ...natural, overflow: natural.overflow || naturalHeight > footerHeight + 0.01 } : void 0;
+      const fitsPhoto = !hasPhoto || diameter <= footerHeight + 0.01 && (!attribution || usable2(textArea));
       const overflow = !bodyFit || bodyFit.overflow || (attribution ? !footerFit || footerFit.overflow : false) || !fitsPhoto;
       const score = (body.requestedFontSize - (bodyFit?.fontSize ?? minimum) + footerRequested - size) / scale;
       if (!selected || !overflow && (selected.overflow || score < selected.score) || overflow && selected.overflow) {
@@ -4577,7 +4735,7 @@ function layoutQuote(value, box, options = {}) {
     } else if (part.fit.overflow) {
       report("text-fit", part.path, [part.role], `Quote ${part.role} exceeds its available space at the readability floor; increase its space or change the arrangement.`);
     }
-    if (usable(area) && (area.x < box.x || area.y < box.y || area.x + area.width > box.x + box.width + 0.01 || area.y + area.height > box.y + box.height + 0.01)) {
+    if (usable2(area) && (area.x < box.x || area.y < box.y || area.x + area.width > box.x + box.width + 0.01 || area.y + area.height > box.y + box.height + 0.01)) {
       report("part-outside-cell", part.path, [part.role], `Quote ${part.role} extends outside its cell; increase the cell size or change the arrangement.`);
     }
   }
@@ -4632,7 +4790,7 @@ function layoutMetric(value, box, options = {}) {
   const primary = parts[0], metadata = parts.filter((part) => part !== primary && part.visible), unit = metadata.find((part) => part.role === "unit");
   const metricDirection = options.direction === "rtl" ? paragraphDirection(["label", "description", "unit"].map((role) => parts.find((part) => part.role === role)?.text).find(Boolean) ?? primary.text, "rtl") : void 0;
   const alignment = physicalAlignment(requestedAlignment, metricDirection);
-  const usable = (area) => [area.x, area.y, area.width, area.height, area.x + area.width, area.y + area.height].every(Number.isFinite) && area.width > 0 && area.height > 0;
+  const usable2 = (area) => [area.x, area.y, area.width, area.height, area.x + area.width, area.y + area.height].every(Number.isFinite) && area.width > 0 && area.height > 0;
   const occupied = (fit) => fit.placement?.height ?? fit.lines.length * fit.lineHeight;
   const gap = 8 * scale, primaryGap = 12 * scale;
   const lineInk = (part, fit) => fit.sourceLines.map((line, index) => {
@@ -4676,7 +4834,7 @@ function layoutMetric(value, box, options = {}) {
     return fit;
   };
   const fitValue = (area, singleLine) => {
-    if (!usable(area)) return void 0;
+    if (!usable2(area)) return void 0;
     for (let step = 0; step <= 76; step++) {
       const size = gridFontSize(primary.requestedFontSize - step * scale, minimum);
       const natural = measure(primary, size, area.width);
@@ -4717,7 +4875,7 @@ function layoutMetric(value, box, options = {}) {
         allocations.push({ part, box: { ...box, y, height }, fit: { ...natural, overflow: !!natural.placement?.overflow || natural.sourceLines.some((line) => line.width > box.width + 0.01) } });
         y += height + gap;
       }
-      const overflow = !valueFit || valueFit.overflow || arrangement === "inline-unit" && valueFit.lines.length !== 1 || primaryHeight > area.height + 0.01 || allocations.some(({ box: area2, fit }) => !fit || fit.overflow || !usable(area2) || area2.y + area2.height > box.y + box.height + 0.01);
+      const overflow = !valueFit || valueFit.overflow || arrangement === "inline-unit" && valueFit.lines.length !== 1 || primaryHeight > area.height + 0.01 || allocations.some(({ box: area2, fit }) => !fit || fit.overflow || !usable2(area2) || area2.y + area2.height > box.y + box.height + 0.01);
       const score = allocations.reduce((sum, { part, fit }) => sum + (part.requestedFontSize - (fit?.fontSize ?? minimum)) / scale, 0);
       const candidate = { arrangement, allocations, score, overflow };
       if (!selected || !overflow && (selected.overflow || score < selected.score) || overflow && selected.overflow) selected = candidate;
@@ -4745,9 +4903,9 @@ function layoutMetric(value, box, options = {}) {
   }
   const report = (reason, part, roles, message) => diagnostics.push({ code: "text-overflow", reason, path: part.path, parts: roles, message });
   for (const part of parts.filter((part2) => part2.visible)) {
-    if (!part.fit || !usable(part.box)) report("invalid-part-box", part, [part.role], `Metric ${part.role} has no usable space after metadata; increase the cell or change the arrangement.`);
+    if (!part.fit || !usable2(part.box)) report("invalid-part-box", part, [part.role], `Metric ${part.role} has no usable space after metadata; increase the cell or change the arrangement.`);
     else if (part.fit.overflow) report("text-fit", part, [part.role], `Metric ${part.role} exceeds its space at the readability floor; increase the cell or change the arrangement.`);
-    if (usable(part.box) && (part.box.x < box.x || part.box.y < box.y || part.box.x + part.box.width > box.x + box.width + 0.01 || part.box.y + part.box.height > box.y + box.height + 0.01)) {
+    if (usable2(part.box) && (part.box.x < box.x || part.box.y < box.y || part.box.x + part.box.width > box.x + box.width + 0.01 || part.box.y + part.box.height > box.y + box.height + 0.01)) {
       report("part-outside-cell", part, [part.role], `Metric ${part.role} extends outside its cell; increase the cell or change the arrangement.`);
     }
   }
@@ -5019,9 +5177,9 @@ function layoutCode(value, box, options = {}) {
   if (code.language) add("language", code.language, `${path}.language`);
   if (!parts.length) add("language", "code", path, true);
   const body = add("body", code.source, shorthand ? path : `${path}.source`), headers = parts.filter((part) => part !== body);
-  const usable = (area) => [area.x, area.y, area.width, area.height].every(Number.isFinite) && area.width > 0 && area.height > 0;
-  const fit = (part, area, size = part.requestedFontSize, floor = minimum) => usable(area) ? fitCodeText(part.text, area, size, floor, scale, textWidthMeasurer(part.style, options.textMeasurement)) : void 0;
-  if (usable(inner)) {
+  const usable2 = (area) => [area.x, area.y, area.width, area.height].every(Number.isFinite) && area.width > 0 && area.height > 0;
+  const fit = (part, area, size = part.requestedFontSize, floor = minimum) => usable2(area) ? fitCodeText(part.text, area, size, floor, scale, textWidthMeasurer(part.style, options.textMeasurement)) : void 0;
+  if (usable2(inner)) {
     const combinations = headers.reduce((choices, part) => choices.flatMap((choice) => [.../* @__PURE__ */ new Set([part.requestedFontSize, minimum])].map((size) => [...choice, { part, size }])), [[]]);
     let selected;
     for (const combination of combinations) {
@@ -5030,12 +5188,12 @@ function layoutCode(value, box, options = {}) {
       for (const [index, { part, size }] of combination.entries()) {
         const measured = fitCodeText(part.text, inner, size, size, scale, textWidthMeasurer(part.style, options.textMeasurement));
         const area2 = { ...inner, y, height: measured.lines.length * measured.lineHeight };
-        allocations.push({ part, box: area2, fit: usable(area2) ? { ...measured, overflow: measured.sourceLines.some((line) => line.width > area2.width + 0.01) } : void 0 });
+        allocations.push({ part, box: area2, fit: usable2(area2) ? { ...measured, overflow: measured.sourceLines.some((line) => line.width > area2.width + 0.01) } : void 0 });
         y += area2.height + (index < headers.length - 1 ? 8 : 12);
       }
       const area = { ...inner, y, height: inner.y + inner.height - y };
       allocations.push({ part: body, box: area, fit: fit(body, area) });
-      const overflow = allocations.some(({ box: box2, fit: fit2 }) => !fit2 || fit2.overflow || !usable(box2) || box2.y + box2.height > inner.y + inner.height + 0.01);
+      const overflow = allocations.some(({ box: box2, fit: fit2 }) => !fit2 || fit2.overflow || !usable2(box2) || box2.y + box2.height > inner.y + inner.height + 0.01);
       const score = allocations.reduce((sum, { part, fit: fit2 }) => sum + (part.requestedFontSize - (fit2?.fontSize ?? minimum)) / scale, 0);
       if (!selected || !overflow && (selected.overflow || score < selected.score) || overflow && selected.overflow) selected = { allocations, score, overflow };
     }
@@ -5049,7 +5207,7 @@ function layoutCode(value, box, options = {}) {
     if (!part.fit) report("invalid-part-box", part, [part.role], `Code ${part.role} has no usable space after metadata and insets; increase the cell or change the arrangement.`);
     else if (part.fit.overflow) report("text-fit", part, [part.role], `Code ${part.role} exceeds its space at the readability floor; increase its space or change the arrangement.`);
     const area = part.box;
-    if (usable(area) && (area.x < box.x || area.y < box.y || area.x + area.width > box.x + box.width + 0.01 || area.y + area.height > box.y + box.height + 0.01)) {
+    if (usable2(area) && (area.x < box.x || area.y < box.y || area.x + area.width > box.x + box.width + 0.01 || area.y + area.height > box.y + box.height + 0.01)) {
       report("part-outside-cell", part, [part.role], `Code ${part.role} extends outside its cell; increase the cell or change the arrangement.`);
     }
   }
@@ -5434,7 +5592,7 @@ function composeSlide(input, options = {}) {
   }, options.textMeasurement);
   const listBullet = hints.listBullet !== void 0 ? { value: hints.listBullet, path: hints.paths.listBullet } : void 0;
   const bulletImage = listBullet?.value === "image" ? (() => {
-    const resolved = resolveLogo(options.presentation, slide, { slot: "icon", onDark: options.darkBackground, slideIndex: options.slideIndex });
+    const resolved = resolveLogo(options.presentation, slide, { shape: "icon", onDark: options.darkBackground, slideIndex: options.slideIndex });
     return resolved ? { source: resolved.source, path: resolved.path } : void 0;
   })() : void 0;
   const widthFor = (field, path2) => textWidthMeasurer(styleFor(field, path2), options.textMeasurement);
@@ -5549,12 +5707,12 @@ function composeSlide(input, options = {}) {
   coverGroup = isCover;
   let logo;
   if (isCover) {
-    const resolved = resolveLogo(options.presentation, slide, { slot: "lockup", onDark: options.darkBackground, slideIndex: options.slideIndex });
+    const resolved = resolveLogo(options.presentation, slide, { shape: "full", onDark: options.darkBackground, slideIndex: options.slideIndex });
     if (resolved) {
       const logoHeight = 56 * scale;
       const logoWidth = Math.max(scale, Math.min(4 * logoHeight, area.right - area.left - 2 * padding));
       const box = { x: round2(rtl ? area.right - padding - logoWidth : area.left + padding), y: round2(headingTop), width: round2(logoWidth), height: round2(logoHeight) };
-      logo = { box, slot: "lockup", path: resolved.path, source: resolved.source, variant: resolved.variant, anchor: rtl ? "right" : "left" };
+      logo = { box, shape: resolved.shape, path: resolved.path, source: resolved.source, variant: resolved.variant, reference: resolved.reference, anchor: rtl ? "right" : "left" };
     }
   }
   let y = logo ? logo.box.y + logo.box.height + gap : headingTop;
@@ -5891,7 +6049,7 @@ function composeSlide(input, options = {}) {
     slots.sort((a, b) => order.get(a.path) - order.get(b.path));
   } else arrange(pending, contentBox, rootSettings, composition.mode ? 0 : placeholders.length);
   if (listBullet?.value === "image" && !bulletImage && items.some((item) => (item.field === "items" || item.field === "bullets") && item.payload.numbering === void 0)) {
-    diagnostics.push({ code: "unresolved-content", path: listBullet.path, message: "Picture bullets (listBullet: image) need design.logo or a primary organization logo; the marker glyph is drawn instead." });
+    diagnostics.push({ code: "unresolved-content", path: listBullet.path, message: "Picture bullets (listBullet: image) need an organization logo (the primary organization, or the one design.logo names); the marker glyph is drawn instead." });
   }
   const numberingDiagnostics = [];
   for (const item of items) {
@@ -5953,4 +6111,4 @@ function resolveCanvasDimensions(input) {
   return { width, height };
 }
 
-export { CAPTIONABLE_FIELDS, CAPTION_FONT_RATIO, CAPTION_MAX_RATIO, CHART_HIGHLIGHT_MUTED_MIN_CONTRAST, CHART_HIGHLIGHT_MUTED_MIX, CHART_SERIES_MIN_DIFFERENCE, CHART_SERIES_MIN_LIGHTNESS_STEP, CHART_TYPES, CITATION_MARKER_RAISE, CITATION_MARKER_SCALE, CODE_HIGHLIGHT_LANGUAGES, CODE_HIGHLIGHT_MAX_LENGTH, CODE_PANEL_BACKGROUND, CODE_PANEL_FOREGROUND, CODE_SYNTAX_MIN_CONTRAST, DARK_BACKGROUND_LUMINANCE, DEFAULT_CHART_LABEL_SEPARATOR, DEFAULT_FURNITURE_DATE_FORMAT, DEFAULT_VARIABLE_DATE_FORMAT, DESIGN_HINT_KEYS, ENGINE_DEFAULT_CHART_TYPES, ENGINE_DEFAULT_COLOR_SCHEME, ENGINE_DEFAULT_FONT_SCHEME, ENGINE_DEFAULT_THEME, FONT_SIZE_GRID_PER_PX, FOOTNOTE_MAX_RATIO, LANGUAGES, LAYOUT_BODY_KINDS, MAX_COMPOSITION_DEPTH, MAX_NUMBERING_LEVELS, MAX_NUMBERING_VALUE, MAX_PLACEHOLDER_GROUP_DEPTH, MAX_ROMAN_VALUE, METRIC_TREND_MIN_CONTRAST, METRIC_TREND_SHAPES, NUMBERING_STYLES, NUMBERING_SUFFIXES, OPFCompositionError, OPFVariableError, PATTERN_PRESETS, PATTERN_PRESET_ALIASES, PATTERN_TILE_SIZE, PICTURE_BULLET_SCALE, SLIDE_SCOPED_BUILTINS, SOCIAL_PLATFORMS, SURFACE_ALT_MIN_CONTRAST, SURFACE_ALT_MIX, TIMELINE_OUTLINE_MIN_CONTRAST, TIMELINE_STATUSES, TIMELINE_TEXT_MIN_CONTRAST, VARIABLE_KINDS, annotationText, captionSettings, chartColorForFill, chartHighlightColors, chartHighlightMarks, chartLabelText, chartNumber, chartNumberFixesByCell, chartOptionSupport, chartOptionTarget, chartPaletteForFill, chartPrimaryLayout, citationMarkerText, codeHighlightBands, codeHighlightColors, codeHighlightLines, codeHighlightSlice, codeLineNumbers, codeLineRuns, codeSyntaxPalette, codeSyntaxPaletteForScheme, coerceVariableValue, collectCitations, colorContrast, composeSlide, datasetDiagnostics, defaultSlideBackground, fitImage, fitList, fitRichText, fitText, formatChartLabelNumber, formatChartLabelPercent, formatDataNumber, formatFurnitureDate, formatListNumber, formatVariableNumber, fromExcelNumberFormat, hasContentVariables, hasPlaceholderGroups, imageBackground, imageShape, inlineChartData, inlineDatasets, inlineTableData, instantiateForValidation, intrinsicImageAspect, intrinsicImageSize, isDarkColor, isDatasetRef, isPlaceholderGroup, isRecord, isTemplate, isXYChartType, layoutCaption, layoutCode, layoutContent, layoutFootnotes, layoutFurniture, layoutLeaves, layoutMetric, layoutQuote, layoutSlots, layoutStructure, layoutTable, layoutTimeline, layoutWatermark, listBuiltinVariables, listNumbers, listVariables, measureText, measureTextOutline, metricTrendColor, metricTrendMark, metricTrendPoints, normalizeHexColor, normalizeLanguageFamily, numberFormatError, numberingAtLevel, numberingFindings, numberingStyleDraws, paragraphDirection, paragraphDirectionAt, pathFor, patternBitmap, patternRuns, physicalAlignment, placeTextLines, promotedRegionKeys, readingRows, referencesSlide, resolveCanvasDimensions, resolveChartData, resolveChartOptions, resolveCodeLanguage, resolveColorRef, resolveColorRoles, resolveDesignHints, resolveDesignRecords, resolveFontFamilies, resolveFontScheme, resolveLogo, resolveNumbering, resolvePatternPreset, resolveScriptFonts, resolveSlideDirection, resolveSlideVariables, resolveSocialProfile, resolveTableData, resolveTextStyle, resolveVariables, scriptFontRole, sliceNumberedItems, slideCitations, slideTokenSpans, snapFontSizeDown, snapFontSizeUp, suggestChartNumberFix, surfaceAltColor, tableCellDisplayValue, tableGrid, tableRowBoundaries, textColorForFill, textWidthMeasurer, timelineMarkerShapes, timelineTextColor, toExcelNumberFormat, tokenizeCode, unusedDatasets, usesSlideBuiltin, variableDeclarations, visitContentPayloads, visualReadingOrder, walkCitationRuns, wrapText };
+export { CAPTIONABLE_FIELDS, CAPTION_FONT_RATIO, CAPTION_MAX_RATIO, CHART_HIGHLIGHT_MUTED_MIN_CONTRAST, CHART_HIGHLIGHT_MUTED_MIX, CHART_SERIES_MIN_DIFFERENCE, CHART_SERIES_MIN_LIGHTNESS_STEP, CHART_TYPES, CITATION_MARKER_RAISE, CITATION_MARKER_SCALE, CODE_HIGHLIGHT_LANGUAGES, CODE_HIGHLIGHT_MAX_LENGTH, CODE_PANEL_BACKGROUND, CODE_PANEL_FOREGROUND, CODE_SYNTAX_MIN_CONTRAST, DARK_BACKGROUND_LUMINANCE, DEFAULT_CHART_LABEL_SEPARATOR, DEFAULT_FURNITURE_DATE_FORMAT, DEFAULT_VARIABLE_DATE_FORMAT, DESIGN_HINT_KEYS, ENGINE_DEFAULT_CHART_TYPES, ENGINE_DEFAULT_COLOR_SCHEME, ENGINE_DEFAULT_FONT_SCHEME, ENGINE_DEFAULT_THEME, FONT_SIZE_GRID_PER_PX, FOOTNOTE_MAX_RATIO, FURNITURE_GAP, FURNITURE_IMAGE_SHARE, LANGUAGES, LAYOUT_BODY_KINDS, LOGO_SHAPES, MAX_COMPOSITION_DEPTH, MAX_NUMBERING_LEVELS, MAX_NUMBERING_VALUE, MAX_PLACEHOLDER_GROUP_DEPTH, MAX_ROMAN_VALUE, METRIC_TREND_MIN_CONTRAST, METRIC_TREND_SHAPES, NUMBERING_STYLES, NUMBERING_SUFFIXES, OPFCompositionError, OPFVariableError, PATTERN_PRESETS, PATTERN_PRESET_ALIASES, PATTERN_TILE_SIZE, PICTURE_BULLET_SCALE, SLIDE_SCOPED_BUILTINS, SOCIAL_PLATFORMS, SURFACE_ALT_MIN_CONTRAST, SURFACE_ALT_MIX, TIMELINE_OUTLINE_MIN_CONTRAST, TIMELINE_STATUSES, TIMELINE_TEXT_MIN_CONTRAST, VARIABLE_KINDS, annotationText, captionSettings, chartColorForFill, chartHighlightColors, chartHighlightMarks, chartLabelText, chartNumber, chartNumberFixesByCell, chartOptionSupport, chartOptionTarget, chartPaletteForFill, chartPrimaryLayout, citationMarkerText, codeHighlightBands, codeHighlightColors, codeHighlightLines, codeHighlightSlice, codeLineNumbers, codeLineRuns, codeSyntaxPalette, codeSyntaxPaletteForScheme, coerceVariableValue, collectCitations, colorContrast, composeSlide, datasetDiagnostics, defaultSlideBackground, fitImage, fitList, fitRichText, fitText, formatChartLabelNumber, formatChartLabelPercent, formatDataNumber, formatFurnitureDate, formatListNumber, formatVariableNumber, fromExcelNumberFormat, hasContentVariables, hasPlaceholderGroups, imageBackground, imageShape, inlineChartData, inlineDatasets, inlineTableData, instantiateForValidation, intrinsicImageAspect, intrinsicImageSize, isDarkColor, isDatasetRef, isPlaceholderGroup, isRecord, isTemplate, isXYChartType, layoutCaption, layoutCode, layoutContent, layoutFootnotes, layoutFurniture, layoutLeaves, layoutMetric, layoutQuote, layoutSlots, layoutStructure, layoutTable, layoutTimeline, layoutWatermark, listBuiltinVariables, listNumbers, listVariables, measureText, measureTextOutline, metricTrendColor, metricTrendMark, metricTrendPoints, normalizeHexColor, normalizeLanguageFamily, numberFormatError, numberingAtLevel, numberingFindings, numberingStyleDraws, paragraphDirection, paragraphDirectionAt, pathFor, patternBitmap, patternRuns, physicalAlignment, placeTextLines, promotedRegionKeys, readingRows, referencesSlide, resolveCanvasDimensions, resolveChartData, resolveChartOptions, resolveCodeLanguage, resolveColorRef, resolveColorRoles, resolveDesignHints, resolveDesignRecords, resolveFontFamilies, resolveFontScheme, resolveLogo, resolveNumbering, resolvePatternPreset, resolveScriptFonts, resolveSlideDirection, resolveSlideVariables, resolveSocialProfile, resolveTableData, resolveTextStyle, resolveVariables, scriptFontRole, sliceNumberedItems, slideCitations, slideTokenSpans, snapFontSizeDown, snapFontSizeUp, suggestChartNumberFix, surfaceAltColor, tableCellDisplayValue, tableGrid, tableRowBoundaries, textColorForFill, textWidthMeasurer, timelineMarkerShapes, timelineTextColor, toExcelNumberFormat, tokenizeCode, unusedDatasets, usesSlideBuiltin, variableDeclarations, visitContentPayloads, visualReadingOrder, walkCitationRuns, wrapText };