@openpresentation/opf 0.11.2 → 0.11.4

package/dist/{chunk-BVLWFMDX.js → chunk-3H2U7FDR.js}

@@ -35,6 +35,114 @@ function tableRowBoundaries(value) {
   return [...allowed];
 }
 
+// src/image-aspect.ts
+var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+function sourceOf(value) {
+  if (typeof value === "string") return value;
+  return isRecord(value) && typeof value.src === "string" ? value.src : void 0;
+}
+var PREFIX_BYTES = 64 * 1024;
+var JPEG_PREFIX_BYTES = 1024 * 1024;
+function dataBytes(uri, limit) {
+  const match = /^data:([^;,]*)((?:;[^;,]*)*),/i.exec(uri);
+  if (!match) return void 0;
+  const type = (match[1] ?? "").toLowerCase(), start = match[0].length;
+  try {
+    if (/;base64/i.test(match[2] ?? "")) {
+      const chars = Math.ceil(limit / 3) * 4, text = uri.slice(start, start + chars + chars / 8).replace(/\s+/g, "").slice(0, chars);
+      return { type, bytes: Uint8Array.from(atob(text.slice(0, text.length - text.length % 4)), (char) => char.charCodeAt(0)) };
+    }
+    const prefix = uri.slice(start, start + limit).replace(/%[0-9a-f]?$/i, "");
+    return { type, bytes: new TextEncoder().encode(decodeURIComponent(prefix)) };
+  } catch {
+    return void 0;
+  }
+}
+var at = (b, i) => b[i] ?? 0;
+var u16be = (b, i) => at(b, i) << 8 | at(b, i + 1);
+var u32be = (b, i) => (at(b, i) << 24 | at(b, i + 1) << 16 | at(b, i + 2) << 8 | at(b, i + 3)) >>> 0;
+var u16le = (b, i) => at(b, i) | at(b, i + 1) << 8;
+var u24le = (b, i) => at(b, i) | at(b, i + 1) << 8 | at(b, i + 2) << 16;
+var ascii = (b, i, n) => String.fromCharCode(...b.subarray(i, i + n));
+function rasterDimensions(b) {
+  if (b.length >= 24 && u32be(b, 0) === 2303741511 && ascii(b, 12, 4) === "IHDR") return { width: u32be(b, 16), height: u32be(b, 20) };
+  if (b.length >= 10 && (ascii(b, 0, 6) === "GIF87a" || ascii(b, 0, 6) === "GIF89a")) return { width: u16le(b, 6), height: u16le(b, 8) };
+  if (b.length >= 4 && b[0] === 255 && b[1] === 216) {
+    let i = 2;
+    while (i + 9 < b.length) {
+      if (at(b, i) !== 255) {
+        i++;
+        continue;
+      }
+      const marker = at(b, i + 1);
+      if (marker === 255) {
+        i++;
+        continue;
+      }
+      if (marker === 216 || marker === 1 || marker >= 208 && marker <= 215) {
+        i += 2;
+        continue;
+      }
+      if (marker >= 192 && marker <= 207 && marker !== 196 && marker !== 200 && marker !== 204) return { height: u16be(b, i + 5), width: u16be(b, i + 7) };
+      i += 2 + u16be(b, i + 2);
+    }
+    return void 0;
+  }
+  if (b.length >= 30 && ascii(b, 0, 4) === "RIFF" && ascii(b, 8, 4) === "WEBP") {
+    const chunk = ascii(b, 12, 4);
+    if (chunk === "VP8X") return { width: u24le(b, 24) + 1, height: u24le(b, 27) + 1 };
+    if (chunk === "VP8L" && at(b, 20) === 47) {
+      const bits = u16le(b, 21) | u16le(b, 23) << 16;
+      return { width: (bits & 16383) + 1, height: (bits >>> 14 & 16383) + 1 };
+    }
+    if (chunk === "VP8 ") return { width: u16le(b, 26) & 16383, height: u16le(b, 28) & 16383 };
+  }
+  return void 0;
+}
+function svgDimensions(text) {
+  const root = /<svg\b([^>]*)>/i.exec(text)?.[1];
+  if (root === void 0) return void 0;
+  const attribute = (name) => new RegExp(`\\s${name}\\s*=\\s*["']([^"']*)["']`, "i").exec(root)?.[1];
+  const length = (value) => {
+    const match = value && /^\s*([0-9]*\.?[0-9]+)\s*(px|pt|in|cm|mm|em)?\s*$/i.exec(value);
+    return match ? Number(match[1]) : void 0;
+  };
+  const width = length(attribute("width")), height = length(attribute("height"));
+  if (width && height) return { width, height };
+  const box = attribute("viewBox")?.trim().split(/[\s,]+/).map(Number);
+  if (box && box.length === 4 && box.every(Number.isFinite)) {
+    const [, , width2 = 0, height2 = 0] = box;
+    if (width2 > 0 && height2 > 0) return { width: width2, height: height2 };
+  }
+  return void 0;
+}
+var cache = /* @__PURE__ */ new Map();
+var CACHE_ENTRIES = 64;
+function readAspect(source) {
+  const first = dataBytes(source, PREFIX_BYTES);
+  if (!first) return void 0;
+  let dimensions;
+  if (first.type.startsWith("image/svg")) dimensions = svgDimensions(new TextDecoder().decode(first.bytes));
+  else {
+    dimensions = rasterDimensions(first.bytes);
+    if (!dimensions && first.bytes.length >= 2 && first.bytes[0] === 255 && first.bytes[1] === 216) {
+      const more = dataBytes(source, JPEG_PREFIX_BYTES);
+      if (more) dimensions = rasterDimensions(more.bytes);
+    }
+  }
+  return dimensions && dimensions.width > 0 && dimensions.height > 0 ? dimensions.width / dimensions.height : void 0;
+}
+function intrinsicImageAspect(value, assets) {
+  let source = sourceOf(value);
+  for (let hop = 0; source?.startsWith("asset:") && hop < 8; hop++) source = sourceOf(isRecord(assets) ? assets[source.slice(6)] : void 0);
+  if (!source?.startsWith("data:")) return void 0;
+  if (cache.has(source)) return cache.get(source);
+  const aspect = readAspect(source);
+  if (cache.size >= CACHE_ENTRIES) cache.delete(cache.keys().next().value);
+  cache.set(source, aspect);
+  return aspect;
+}
+
 // src/furniture-fields.ts
 var DEFAULT_FURNITURE_DATE_FORMAT = "M/d/yyyy";
 var DEFAULT_SLIDE_NUMBER_FORMAT = "{current}";
@@ -268,10 +376,12 @@ function resolveFontSchemeReference(reference, lookup, path = "design.fontScheme
 function resolveFontFamilies(input) {
   const scheme = record2(input);
   const family = (value) => typeof value === "string" ? value : record2(value).family;
+  const accent = family(scheme.accent);
   return {
     heading: family(scheme.heading) ?? scheme.major ?? scheme.minor ?? DEFAULT_FONT_FAMILIES.heading,
     body: family(scheme.body) ?? scheme.minor ?? scheme.major ?? DEFAULT_FONT_FAMILIES.body,
-    code: family(scheme.code) ?? FALLBACK_CODE_FAMILY
+    code: family(scheme.code) ?? FALLBACK_CODE_FAMILY,
+    ...typeof accent === "string" && accent ? { accent } : {}
   };
 }
 function resolveTextStyle(style, measurement) {
@@ -438,6 +548,45 @@ function resolveSlideImage(slide, layout, presentation, width, height, path, pad
   }
   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 record2(value)) {
+      return usable(value) ? { source: value, path, variant: "default", slot } : null;
+    }
+    const set = record2(value);
+    if (!Object.keys(set).some((key) => LOGO_SET_KEYS.has(key))) return null;
+    for (const key of chain) {
+      const variant = set[key];
+      if (variant !== void 0 && usable(variant)) return { source: variant, path: `${path}.${key}`, variant: key, slot };
+    }
+    return null;
+  };
+  const deck = record2(presentation), slideIndex = Number.isSafeInteger(options.slideIndex) && options.slideIndex >= 0 ? options.slideIndex : 0;
+  const own = pick(record2(record2(slide).design).logo, `slides.${slideIndex}.design.logo`);
+  if (own) return own;
+  const shared = pick(record2(deck.design).logo, "design.logo");
+  if (shared) return shared;
+  const organizations = Array.isArray(deck.organization) ? deck.organization : [deck.organization];
+  const primaryIndex = organizations.findIndex((item) => record2(item).role === "primary");
+  const index = primaryIndex >= 0 ? primaryIndex : organizations.findIndex(Boolean);
+  if (index < 0) return null;
+  return pick(record2(organizations[index]).logo, Array.isArray(deck.organization) ? `organization.${index}.logo` : "organization.logo");
+}
 var webUrl = /^https?:\/\/\S+$/i;
 function resolveSocialProfile(platform, value, records = [], owner = "organization") {
   const raw = String(value).trim().replace(/\s+/gu, " ");
@@ -516,8 +665,20 @@ function layoutFurniture(input, options = {}) {
         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 imageBox = (source) => {
+        const imageHeight = Math.max(32 * scale, Math.min(height * 0.05, 72 * scale)), imageWidth = Math.min(zoneWidth, imageHeight * (intrinsicImageAspect(source, record2(options.presentation).assets) ?? 1));
+        return { x: zone === "left" ? x : zone === "center" ? x + (zoneWidth - imageWidth) / 2 : x + zoneWidth - imageWidth, y, 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: zone });
+          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 = { x, y, width: zoneWidth, height: Math.max(32 * scale, Math.min(height * 0.05, 72 * scale)) };
+        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: zone });
         y += box.height;
       }
@@ -644,7 +805,7 @@ function layoutQuote(value, box, options = {}) {
     [source(bodyPath, quote.text, 1)],
     { x: box.x + 18, y: box.y + 18, width: box.width - 36, height: box.height - (footer ? 94 : 36) },
     28,
-    options.fonts?.heading ?? "sans-serif",
+    options.fonts?.accent ?? options.fonts?.heading ?? "sans-serif",
     600,
     bodyPath
   );
@@ -780,15 +941,15 @@ function layoutMetric(value, box, options = {}) {
     const width = Math.max(...lineInk(part, fit).map((line) => Math.max(line.width, line.outline ? line.outline.x + line.outline.width : 0) - Math.min(0, line.outline?.x ?? 0)));
     return width > 0 ? width + 2 * rasterPadding : 0;
   };
-  const cache = /* @__PURE__ */ new Map();
+  const cache2 = /* @__PURE__ */ new Map();
   const measure = (part, size, width) => {
     const key = JSON.stringify([part.role, size, width]);
-    let fit = cache.get(key);
+    let fit = cache2.get(key);
     if (!fit) {
       fit = fitCodeText(part.text, { ...box, width: hasOutlines ? Math.max(Number.MIN_VALUE, width - 2 * rasterPadding) : width }, size, size, scale, textWidthMeasurer(part.style, options.textMeasurement));
       fit = place(part, fit, width);
       if (!Number.isFinite(occupied(fit))) throw new RangeError("Metric text layout exceeds finite coordinates.");
-      cache.set(key, fit);
+      cache2.set(key, fit);
     }
     return fit;
   };
@@ -904,10 +1065,10 @@ function layoutTimeline(value, box, options = {}) {
   const metadata = [], events = timeline.events.map(() => []);
   for (const part of source) if (part.eventIndex === void 0) metadata.push(part);
   else events[part.eventIndex].push(part);
-  const cache = /* @__PURE__ */ new Map();
+  const cache2 = /* @__PURE__ */ new Map();
   const measure = (part, size, width, alignment) => {
     const key = JSON.stringify([part.path, size, width, alignment]);
-    let measured = cache.get(key);
+    let measured = cache2.get(key);
     if (measured) return measured;
     const fit = fitText(part.text, { width: Math.max(Number.MIN_VALUE, width - (outlines ? 2 * padding : 0)), height: Number.MAX_VALUE }, size, size, textWidthMeasurer(part.style, options.textMeasurement));
     const ink = fit.sourceLines.map((line, index) => {
@@ -930,7 +1091,7 @@ function layoutTimeline(value, box, options = {}) {
     const height = placement?.height ?? fit.sourceLines.length * fit.lineHeight;
     if (!Number.isFinite(height)) throw new RangeError("Timeline text exceeds finite layout coordinates.");
     measured = { fit, ink, height };
-    cache.set(key, measured);
+    cache2.set(key, measured);
     return measured;
   };
   let selected, attempts = 0;
@@ -1267,6 +1428,7 @@ function richTextLayouter(input, box, requestedSize, options) {
   };
   return layout;
 }
+var PICTURE_BULLET_SCALE = 0.65;
 function fitList(input, box, requestedSize = 25, minFontSize = 16, options = { style: { fontFamily: "sans-serif", fontWeight: 400 } }) {
   if (!Array.isArray(input) || ![box.width, box.height, requestedSize, minFontSize].every((value) => Number.isFinite(value) && value > 0)) throw new RangeError("List content, dimensions and font sizes must be valid.");
   const source = input.map((value, index) => {
@@ -1300,6 +1462,7 @@ function fitList(input, box, requestedSize = 25, minFontSize = 16, options = { s
         y += description.height;
       }
       overflow ||= text.overflow || !!description?.overflow;
+      const marker = { text: ["\u2022", "\u25E6", "\u25AA"][item.level % 3], x: box.x + offset, y: textBox.y + (text.richLines[0]?.baseline ?? fontSize), fontSize, style: resolveTextStyle(style, options.textMeasurement), indent }, side = fontSize * PICTURE_BULLET_SCALE;
       entries.push({
         index: item.index,
         level: item.level,
@@ -1311,7 +1474,8 @@ function fitList(input, box, requestedSize = 25, minFontSize = 16, options = { s
         textBox,
         description,
         descriptionBox,
-        marker: { text: ["\u2022", "\u25E6", "\u25AA"][item.level % 3], x: box.x + offset, y: textBox.y + (text.richLines[0]?.baseline ?? fontSize), fontSize, style: resolveTextStyle(style, options.textMeasurement), indent }
+        marker,
+        ...options.bulletImage ? { bulletImage: options.bulletImage, bulletBox: { x: marker.x, y: marker.y - side, width: side, height: side } } : {}
       });
       if (item.index < source.length - 1) y += fontSize * 0.28;
     }
@@ -1465,12 +1629,20 @@ function composeSlide(input, options = {}) {
   const minSize = (composition.minFontSize ?? 16) * scale;
   const rasterPadding = (options.textRasterPadding ?? 1) * scale;
   if (!Number.isFinite(rasterPadding) || rasterPadding < 0) throw new RangeError("Text raster padding must be finite and nonnegative.");
-  const alignmentFor = (field) => (field === "title" ? record2(slide.design).titleAlignment ?? options.titleAlignment : record2(slide.design).contentAlignment ?? options.contentAlignment) ?? "left";
+  let coverGroup = false;
+  const alignmentFor = (field) => (field === "title" || coverGroup && (field === "tag" || field === "subtitle") && record2(slide.design).contentAlignment === void 0 ? record2(slide.design).titleAlignment ?? options.titleAlignment : record2(slide.design).contentAlignment ?? options.contentAlignment) ?? "left";
   const styleFor = (field, path2) => resolveTextStyle({
-    fontFamily: (field === "title" ? options.fonts?.heading : field === "code" ? options.fonts?.code : options.fonts?.body) ?? (field === "code" ? "monospace" : "sans-serif"),
+    fontFamily: (field === "title" ? options.fonts?.heading : field === "code" ? options.fonts?.code : field === "tag" ? options.fonts?.accent ?? options.fonts?.body : options.fonts?.body) ?? (field === "code" ? "monospace" : "sans-serif"),
     fontWeight: field === "title" ? 700 : 400,
     path: path2
   }, options.textMeasurement);
+  const slideDesign = record2(slide.design), deckDesign = record2(record2(options.presentation).design);
+  const designHint = (field) => slideDesign[field] !== void 0 ? { value: slideDesign[field], path: `slides.${options.slideIndex ?? 0}.design.${field}` } : deckDesign[field] !== void 0 ? { value: deckDesign[field], path: `design.${field}` } : void 0;
+  const listBullet = designHint("listBullet");
+  const bulletImage = listBullet?.value === "image" ? (() => {
+    const resolved = resolveLogo(options.presentation, slide, { slot: "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);
   const fitPlacedText = (field, value, text, box, size, minimum, path2) => {
     const style = styleFor(field, path2), rich = field === "text" && Array.isArray(value);
@@ -1522,7 +1694,7 @@ function composeSlide(input, options = {}) {
     }
     throw new Error("Text placement did not evaluate its bounded floor trial.");
   };
-  const fitContent = (field, value, text, box, size, minimum, path2) => field === "text" ? fitPlacedText(field, value, text, box, size, minimum, path2) : field === "items" || field === "bullets" ? fitList(value, box, size, minimum, { style: styleFor(field, path2), textMeasurement: options.textMeasurement }) : fitText(text, box, size, minimum, widthFor(field, path2));
+  const fitContent = (field, value, text, box, size, minimum, path2) => field === "text" ? fitPlacedText(field, value, text, box, size, minimum, path2) : field === "items" || field === "bullets" ? fitList(value, box, size, minimum, { style: styleFor(field, path2), textMeasurement: options.textMeasurement, ...bulletImage ? { bulletImage } : {} }) : fitText(text, box, size, minimum, widthFor(field, path2));
   const path = `slides.${options.slideIndex ?? 0}`;
   const slideImageDiagnostics = [];
   const slideImage = resolveSlideImage(slide, layout, options.presentation, width, height, path, padding, scale, slideImageDiagnostics);
@@ -1544,7 +1716,17 @@ function composeSlide(input, options = {}) {
   const emptyHost = (host) => emptyPayload(host.blocks) && fields.every((field) => emptyPayload(host[field]));
   const hasBodyPayload = regions.some((key) => !emptyHost(record2(slide[key]))) || !emptyPayload(slide.blocks) || fields.some((field) => !emptyPayload(slide[field]));
   const isCover = !hasBodyPayload && (headingOnlyLayout || !layout.id && !layoutPlaceholders.some((placeholder) => !headings.has(placeholder.type ?? "")));
-  let y = headingTop;
+  coverGroup = isCover;
+  let logo;
+  if (isCover) {
+    const resolved = resolveLogo(options.presentation, slide, { slot: "lockup", onDark: options.darkBackground, slideIndex: options.slideIndex });
+    if (resolved) {
+      const logoHeight = 56 * scale;
+      const box = { x: round(area.left + padding), y: round(headingTop), width: round(Math.max(scale, Math.min(4 * logoHeight, area.right - area.left - 2 * padding))), height: round(logoHeight) };
+      logo = { box, slot: "lockup", path: resolved.path, source: resolved.source, variant: resolved.variant, anchor: "left" };
+    }
+  }
+  let y = logo ? logo.box.y + logo.box.height + gap : headingTop;
   const headingItems = [];
   for (const field of ["tag", "title", "subtitle"]) {
     if (!slide[field]) continue;
@@ -1681,14 +1863,14 @@ function composeSlide(input, options = {}) {
     const boxes = gridBoxes(node.children.length, area2, cols, (own.gap ?? 1 / 30) * Math.min(box.width, box.height), own.weights ?? [], modeFor(own) === "column");
     return node.children.reduce((score, child, index) => score + scoreNode(child, boxes[index], own, penalties), 0);
   };
-  const arrange = (nodes, area2, settings, reserved = 0, gapOverride, containerPath = path) => {
+  const arrange = (nodes, area2, settings, reserved = 0, gapOverride, containerPath = path, recorded = true) => {
     const count = Math.max(nodes.length, reserved);
     if (!count) return;
     const mode = modeFor(settings), localGap = (settings.gap ?? 1 / 30) * Math.min(area2.width, area2.height);
     const actualGap = gapOverride ?? (settings === rootSettings ? gap : localGap);
     let cols = defaultColumns(count, area2, settings);
     const hasRegions = nodes.some((node) => node.region);
-    const candidates = decisions ? [] : void 0;
+    const candidates = decisions && recorded ? [] : void 0;
     if (mode === "auto" && !hasRegions) {
       let best = Infinity;
       for (let candidate = 1; candidate <= Math.min(count, settings.columns ?? 6); candidate++) {
@@ -1703,22 +1885,22 @@ function composeSlide(input, options = {}) {
         }
       }
     }
-    decisions?.push({
+    if (recorded) decisions?.push({
       path: containerPath,
       mode: hasRegions ? "regions" : mode,
-      reason: hasRegions ? "promoted-regions" : mode === "auto" ? "lowest-score" : "configured-mode",
+      reason: hasRegions ? "promoted-regions" : settings === rootSettings && chartPrimary ? "chart-primary" : mode === "auto" ? "lowest-score" : "configured-mode",
       ...hasRegions ? {} : { selectedColumns: cols },
       candidates: candidates ?? []
     });
     const grid = gridGeometry(count, area2, cols, actualGap, settings.weights ?? [], mode === "column");
     const boxes = grid.boxes;
-    if (!nodes.some((node) => node.region)) flows.push({ path: containerPath, box: { ...area2 }, composition: { ...settings }, columns: grid.columns, rows: grid.rows, gap: grid.gap, itemCount: nodes.length, slotCount: count });
+    if (recorded && !hasRegions) flows.push({ path: containerPath, box: { ...area2 }, composition: { ...settings }, columns: grid.columns, rows: grid.rows, gap: grid.gap, itemCount: nodes.length, slotCount: count });
     nodes.forEach((node, index) => {
       let box = node.region ? regionBox(node.region, area2, actualGap) : boxes[index];
       if (node.children) {
         const own = inheritedSettings(settings, node.composition), inner = inset(box, own);
-        groups.push({ path: node.path, box, contentBox: inner, composition: own });
-        arrange(node.children, inner, own, 0, (own.gap ?? 1 / 30) * Math.min(box.width, box.height), node.path);
+        if (!node.synthetic) groups.push({ path: node.path, box, contentBox: inner, composition: own });
+        arrange(node.children, inner, own, 0, (own.gap ?? 1 / 30) * Math.min(box.width, box.height), node.path, !node.synthetic);
       } else {
         const frameBox = hasCards ? acceptedBox(box) : void 0;
         box = payloadBox(box);
@@ -1744,7 +1926,8 @@ function composeSlide(input, options = {}) {
           ...quoteLayout ? { quoteLayout } : {},
           ...codeLayout ? { codeLayout } : {},
           ...metricLayout ? { metricLayout } : {},
-          ...timelineLayout ? { timelineLayout } : {}
+          ...timelineLayout ? { timelineLayout } : {},
+          ...bulletImage && (node.field === "items" || node.field === "bullets") ? { bulletImage } : {}
         });
         if (box.width < 100 * scale || box.height < 60 * scale) diagnostics.push({ code: "small-cell", path: node.path, message: "Content cell is too small for comfortable reading; use fewer blocks or a different composition." });
       }
@@ -1755,8 +1938,23 @@ function composeSlide(input, options = {}) {
     const picture = placeholders.findIndex((p) => p.type === "picture");
     if (picture >= 0) placeholders.splice(picture, 1);
   }
-  const rootSettings = { ...composition, mode: composition.mode ?? (layout.slideLayoutDirection === "Vertical" ? "column" : layout.slideLayoutDirection === "Horizontal" ? "row" : "auto") };
-  arrange(pending, contentBox, rootSettings, composition.mode ? 0 : placeholders.length);
+  const ownMode = record2(slide.composition).mode;
+  const direction = designHint("contentDirection")?.value;
+  const directionMode = direction === "vertical" ? "column" : direction === "horizontal" ? "row" : void 0;
+  const layoutDirectionMode = layout.slideLayoutDirection === "Vertical" ? "column" : layout.slideLayoutDirection === "Horizontal" ? "row" : "auto";
+  const chartHint = designHint("chartPrimary")?.value ?? (typeof layout.contentTypeChartPrimary === "string" ? layout.contentTypeChartPrimary.toLowerCase() : void 0);
+  const chartSide = chartHint === "left" || chartHint === "right" || chartHint === "top" || chartHint === "bottom" ? chartHint : void 0;
+  const chartIndex = pending.findIndex((node) => !node.children && node.field === "chart");
+  const chartPrimary = chartSide !== void 0 && !ownMode && !regions.length && chartIndex >= 0 && pending.some((node) => node.children || node.field !== "chart") ? chartSide : void 0;
+  const rootSettings = chartPrimary ? { ...composition, mode: chartPrimary === "left" || chartPrimary === "right" ? "row" : "column", columns: void 0, weights: chartPrimary === "left" || chartPrimary === "top" ? [3, 2] : [2, 3] } : { ...composition, mode: composition.mode ?? directionMode ?? layoutDirectionMode };
+  if (chartPrimary) {
+    const primary = pending[chartIndex], rest = pending.filter((_, index) => index !== chartIndex);
+    const container = { field: "blocks", type: "group", value: rest.map((node) => node.payload), path, payload: {}, children: rest, composition: {}, synthetic: true };
+    arrange(chartPrimary === "left" || chartPrimary === "top" ? [primary, container] : [container, primary], contentBox, rootSettings, 0);
+  } else arrange(pending, contentBox, rootSettings, composition.mode ? 0 : placeholders.length);
+  if (listBullet?.value === "image" && !bulletImage && items.some((item) => item.field === "items" || item.field === "bullets")) {
+    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." });
+  }
   for (const item of items) {
     for (const key of ["x", "y", "width", "height"]) item.box[key] = round(item.box[key]);
     if (item.field === "table" && tableOverflows(item.value, item.box, scale, item.composition, options, item.path)) diagnostics.push({ code: "text-overflow", path: item.path, message: "Table cells do not fit; use fewer rows, fewer columns, or split the table across slides." });
@@ -1789,7 +1987,7 @@ function composeSlide(input, options = {}) {
   } : void 0;
   if (failures.length) throw new OPFCompositionError(failures, explanation);
   diagnostics.push(...slideImageDiagnostics);
-  return { width, height, contentBox, items, groups, flows, diagnostics, composition, ...furniture ? { furniture } : {}, ...slideImage ? { slideImage } : {}, ...explanation ? { explanation } : {} };
+  return { width, height, contentBox, items, groups, flows, diagnostics, composition, ...furniture ? { furniture } : {}, ...slideImage ? { slideImage } : {}, ...logo ? { logo } : {}, ...explanation ? { explanation } : {} };
 }
 function resolveCanvasDimensions(input) {
   const presets = {
@@ -1809,4 +2007,4 @@ function resolveCanvasDimensions(input) {
   return { width, height };
 }
 
-export { DEFAULT_FONT_SCHEME, DEFAULT_FURNITURE_DATE_FORMAT, DEFAULT_SLIDE_NUMBER_FORMAT, MAX_COMPOSITION_DEPTH, OPFCompositionError, chartColorForFill, colorContrast, composeSlide, fitList, fitRichText, fitText, formatFurnitureDate, formatSlideNumber, layoutCode, layoutFurniture, layoutMetric, layoutQuote, layoutTable, layoutTimeline, measureText, measureTextOutline, normalizeHexColor, placeTextLines, resolveCanvasDimensions, resolveColorRef, resolveFontFamilies, resolveFontSchemeReference, resolveSocialProfile, resolveTextStyle, slideImageShape, tableGrid, tableRowBoundaries, textColorForFill, textWidthMeasurer, wrapText };
+export { DEFAULT_FONT_SCHEME, DEFAULT_FURNITURE_DATE_FORMAT, DEFAULT_SLIDE_NUMBER_FORMAT, MAX_COMPOSITION_DEPTH, OPFCompositionError, PICTURE_BULLET_SCALE, chartColorForFill, colorContrast, composeSlide, fitList, fitRichText, fitText, formatFurnitureDate, formatSlideNumber, layoutCode, layoutFurniture, layoutMetric, layoutQuote, layoutTable, layoutTimeline, measureText, measureTextOutline, normalizeHexColor, placeTextLines, resolveCanvasDimensions, resolveColorRef, resolveFontFamilies, resolveFontSchemeReference, resolveLogo, resolveSocialProfile, resolveTextStyle, slideImageShape, tableGrid, tableRowBoundaries, textColorForFill, textWidthMeasurer, wrapText };

package/dist/{chunk-K7IWYODS.js → chunk-3OJN7QAW.js}

@@ -1,6 +1,6 @@
-import { validatePresentation, validationDefinition, validateCatalogRecord } from './chunk-DJRZMGKY.js';
-import { schemas, schemaEntries } from './chunk-LTSDDBNW.js';
-import { catalogKinds, catalogEntries, catalogSchemaNames } from './chunk-7LF37SG3.js';
+import { validatePresentation, validationDefinition, validateCatalogRecord } from './chunk-FDCWQHWO.js';
+import { schemas, schemaEntries } from './chunk-KJKASEPE.js';
+import { catalogKinds, catalogEntries, catalogSchemaNames } from './chunk-AEUSVEUY.js';
 import { parseTree, printParseErrorCode, getNodePath } from 'jsonc-parser';
 
 var own = (value, key) => Object.hasOwn(value, key);
@@ -447,7 +447,20 @@ function lintPresentation(document, options = {}) {
     }
   }
   for (const issue of validation.warnings) {
-    const kind = issue.params.kind, id = issue.params.id;
+    const kind = issue.params.kind, id = issue.params.id, replacedBy = issue.params.replacedBy;
+    if (typeof replacedBy === "string" && typeof id === "string") {
+      const target = catalogs.get(kind)?.get(replacedBy);
+      diagnostics.push({
+        ...schemaDiagnostic(issue),
+        ruleId: "opf/deprecated-catalog-id",
+        severity: "warning",
+        message: `Deprecated ${kind} catalog id ${JSON.stringify(id)}; use ${JSON.stringify(replacedBy)} instead.`,
+        help: "The deprecated id still resolves to its original record, so nothing breaks. Switch to the replacement when you next edit this reference.",
+        lookup: ["opf", "catalog", kind],
+        ...target ? { suggestions: [target] } : {}
+      });
+      continue;
+    }
     if (seen.has(issue.path) || typeof id === "string" && catalogs.get(kind)?.has(id))
       continue;
     diagnostics.push({