@bendyline/squisq-formats 2.3.4 → 2.3.6

package/dist/{chunk-C22NYDN2.js → chunk-TBB4PAX5.js}

@@ -4,19 +4,20 @@ import {
   inlineNodesToRuns,
   sanitizeOfficeHyperlink,
   toOoxmlHex
-} from "./chunk-GX7RAUME.js";
+} from "./chunk-DWNNYO5H.js";
 import {
   extractPlainText,
   stripHtmlTags
-} from "./chunk-SBUW7NHR.js";
+} from "./chunk-6X5XN3CZ.js";
 import {
   createPackage
-} from "./chunk-4V3KCHAP.js";
+} from "./chunk-ILCJ3WFD.js";
 import {
   escapeXml,
   xmlDeclaration
 } from "./chunk-JU2RHXUB.js";
 import {
+  CONTENT_TYPE_PPTX_FONT,
   CONTENT_TYPE_PPTX_PRESENTATION,
   CONTENT_TYPE_PPTX_SLIDE,
   CONTENT_TYPE_PPTX_SLIDE_LAYOUT,
@@ -27,6 +28,7 @@ import {
   NS_PML,
   NS_PML_2010,
   NS_R,
+  REL_FONT,
   REL_HYPERLINK,
   REL_IMAGE,
   REL_OFFICE_DOCUMENT,
@@ -42,10 +44,15 @@ import {
   openPackage,
   requireMainPartPath,
   resolveTarget
-} from "./chunk-X2DEAXNK.js";
+} from "./chunk-S5PCVMKU.js";
 import {
   buildContainer
 } from "./chunk-IIQYS2YH.js";
+import {
+  fontAwesomeFace,
+  fontAwesomeFaces,
+  fontAwesomeGlyph
+} from "./chunk-USU6HTKB.js";
 import {
   inferMimeType
 } from "./chunk-6RQOV3B3.js";
@@ -65,7 +72,7 @@ import {
   resolvePersistentLayers,
   resolveThemeForDoc
 } from "@bendyline/squisq/doc";
-import { stripIconMarkers } from "@bendyline/squisq/icon-marker";
+import { splitIconMarkers } from "@bendyline/squisq/icon-marker";
 import { readFrontmatterThemeId } from "@bendyline/squisq/markdown";
 
 // src/pptx/styles.ts
@@ -87,12 +94,15 @@ var DEFAULT_CODE_SIZE = 1400;
 var HYPERLINK_COLOR = "0563C1";
 
 // src/pptx/templates.ts
-function buildPresentationXml(slideCount, slideRelIds, slideMasterRelId, _themeRelId) {
+function buildPresentationXml(slideCount, slideRelIds, slideMasterRelId, _themeRelId, embeddedFonts = []) {
   const sldIdList = [];
   for (let i = 0; i < slideCount; i++) {
     sldIdList.push(`<p:sldId id="${256 + i}" r:id="${slideRelIds[i]}"/>`);
   }
-  return xmlDeclaration() + `<p:presentation xmlns:a="${NS_DRAWINGML}" xmlns:r="${NS_R}" xmlns:p="${NS_PML}" saveSubsetFonts="1"><p:sldMasterIdLst><p:sldMasterId id="2147483648" r:id="${slideMasterRelId}"/></p:sldMasterIdLst><p:sldIdLst>${sldIdList.join("")}</p:sldIdLst><p:sldSz cx="${SLIDE_WIDTH}" cy="${SLIDE_HEIGHT}" type="screen16x9"/><p:notesSz cx="${SLIDE_HEIGHT}" cy="${SLIDE_WIDTH}"/></p:presentation>`;
+  const embeddedFontList = embeddedFonts.length > 0 ? `<p:embeddedFontLst>${embeddedFonts.map(
+    ({ typeface, relId }) => `<p:embeddedFont><p:font typeface="${escapeXml(typeface)}" charset="0" pitchFamily="34"/><p:regular r:id="${escapeXml(relId)}"/></p:embeddedFont>`
+  ).join("")}</p:embeddedFontLst>` : "";
+  return xmlDeclaration() + `<p:presentation xmlns:a="${NS_DRAWINGML}" xmlns:r="${NS_R}" xmlns:p="${NS_PML}" saveSubsetFonts="1"><p:sldMasterIdLst><p:sldMasterId id="2147483648" r:id="${slideMasterRelId}"/></p:sldMasterIdLst><p:sldIdLst>${sldIdList.join("")}</p:sldIdLst><p:sldSz cx="${SLIDE_WIDTH}" cy="${SLIDE_HEIGHT}" type="screen16x9"/><p:notesSz cx="${SLIDE_HEIGHT}" cy="${SLIDE_WIDTH}"/>` + embeddedFontList + `</p:presentation>`;
 }
 function buildSlideMasterXml(layoutRelId) {
   return xmlDeclaration() + `<p:sldMaster xmlns:a="${NS_DRAWINGML}" xmlns:r="${NS_R}" xmlns:p="${NS_PML}"><p:cSld><p:bg><p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef></p:bg><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr/></p:spTree></p:cSld><p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/><p:sldLayoutIdLst><p:sldLayoutId id="2147483649" r:id="${layoutRelId}"/></p:sldLayoutIdLst></p:sldMaster>`;
@@ -152,7 +162,11 @@ async function docToPptx(doc, options = {}) {
     viewport: VIEWPORT_PRESETS.landscape,
     persistentLayers,
     theme,
-    customTemplates: doc.customTemplates
+    customTemplates: doc.customTemplates,
+    // A .pptx is a discrete deck: the >20s pacing split would emit N identical
+    // copies of one authored slide (a long single block became 18 duplicates).
+    // Keep one authored slide as one slide, matching the slideshow.
+    splitLongBlocks: false
   });
   const slideBlocks = [];
   if (shouldIncludeCoverSlide(doc, effectiveOptions) && doc.startBlock) {
@@ -249,7 +263,7 @@ function segmentIntoSlides(children, slideBreak) {
     if (node.type === "heading" && node.depth <= maxDepth) {
       if (current) slides.push(current);
       current = {
-        title: extractPlainText(node.children),
+        title: node.children,
         titleDepth: node.depth,
         transition: node.attributes?.blockMeta?.transition,
         bodyNodes: []
@@ -276,6 +290,8 @@ var SlideContext = class {
     this.relationships = [];
     this.embeddedImages = [];
     this.nextShapeId = 4;
+    /** Font Awesome families referenced by semantic or materialized text runs. */
+    this.iconFamilies = /* @__PURE__ */ new Set();
     this.style = style;
     this.images = images;
     this.slideIndex = slideIndex;
@@ -328,8 +344,8 @@ function buildSlideXml(slide, ctx) {
   shapes.push(
     `<p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr/>`
   );
-  if (slide.title) {
-    shapes.push(buildTitleShape(slide.title, ctx.style));
+  if (slide.title?.length) {
+    shapes.push(buildTitleShape(slide.title, ctx));
   }
   const bodyParas = convertBodyBlocks(slide.bodyNodes, ctx);
   const hasImages = ctx.embeddedImages.length > 0;
@@ -392,6 +408,12 @@ function buildLayerSlideXml(block, ctx) {
     `<p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr/>`
   ];
   const textLayerY = (block.layers ?? []).filter((layer) => layer.type === "text").map((layer) => resolvePositionValue(layer.position.y, 1080));
+  for (const layer of block.layers ?? []) {
+    if (layer.type !== "text") continue;
+    for (const run of splitIconMarkers(layer.content.text ?? "")) {
+      if (run.type === "icon") ctx.iconFamilies.add(run.family);
+    }
+  }
   for (let index = 0; index < (block.layers?.length ?? 0); index++) {
     if ((index & 31) === 0) ctx.signal?.throwIfAborted();
     const layer = block.layers[index];
@@ -560,7 +582,8 @@ function toEmuRect(rect) {
   };
 }
 function buildLayerTextShape(layer, shapeId, maxBottom) {
-  const text = stripIconMarkers(layer.content.text ?? "");
+  const sourceText = layer.content.text ?? "";
+  const text = splitIconMarkers(sourceText).map((run) => run.type === "text" ? run.text : "M").join("");
   const style = layer.content.style;
   const padding = style.padding ?? 0;
   const rawLines = text.split("\n");
@@ -595,14 +618,14 @@ function buildLayerTextShape(layer, shapeId, maxBottom) {
   const vertical = style.verticalAlign === "bottom" ? "b" : style.verticalAlign === "middle" ? "ctr" : "t";
   const inset = Math.max(0, Math.round(padding / 1920 * SLIDE_WIDTH));
   const bodyPr = `<a:bodyPr wrap="square" anchor="${vertical}" vertOverflow="clip" horzOverflow="clip" lIns="${inset}" rIns="${inset}" tIns="${inset}" bIns="${inset}"><a:noAutofit/></a:bodyPr>`;
-  const paragraphs = text.split("\n").map((line) => buildLayerTextParagraph(line, renderedStyle, align)).join("");
+  const paragraphs = sourceText.split("\n").map((line) => buildLayerTextParagraph(line, renderedStyle, align)).join("");
   return `<p:sp><p:nvSpPr><p:cNvPr id="${shapeId}" name="${escapeXml(layer.id)}"/><p:cNvSpPr txBox="1"/><p:nvPr/></p:nvSpPr><p:spPr><a:xfrm><a:off x="${rect.x}" y="${rect.y}"/><a:ext cx="${rect.width}" cy="${rect.height}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom>` + fillXml(style.background, style.backgroundOpacity, style.backgroundGradient) + lineXml(style.borderColor, style.borderWidth, style.borderStyle) + `</p:spPr><p:txBody>${bodyPr}<a:lstStyle/>${paragraphs}</p:txBody></p:sp>`;
 }
 function buildLayerTextParagraph(text, style, align) {
   const size = Math.max(100, Math.round(style.fontSize * 75));
   const color = parseCssColor(style.color, "000000");
   const typeface = officeTypeface(style.fontFamily, DEFAULT_FONT);
-  const runProperties = [
+  const textRunProperties = [
     `lang="en-US"`,
     `dirty="0"`,
     `sz="${size}"`,
@@ -610,7 +633,17 @@ function buildLayerTextParagraph(text, style, align) {
     ...style.fontStyle === "italic" ? ['i="1"'] : []
   ].join(" ");
   const lineSpacing = Math.max(1e4, Math.round((style.lineHeight ?? 1.4) * 1e5));
-  return `<a:p><a:pPr algn="${align}"><a:lnSpc><a:spcPct val="${lineSpacing}"/></a:lnSpc></a:pPr><a:r><a:rPr ${runProperties}>${solidColorXml(color)}<a:latin typeface="${escapeXml(typeface)}"/></a:rPr><a:t>${escapeXml(text || " ")}</a:t></a:r></a:p>`;
+  const runs = splitIconMarkers(text).map((run) => {
+    if (run.type === "text") {
+      if (!run.text) return "";
+      return `<a:r><a:rPr ${textRunProperties}>${solidColorXml(color)}<a:latin typeface="${escapeXml(typeface)}"/></a:rPr><a:t>${escapeXml(run.text)}</a:t></a:r>`;
+    }
+    const glyph = fontAwesomeGlyph(run.family, run.name);
+    if (!glyph) return "";
+    const iconTypeface = fontAwesomeFace(run.family).typeface;
+    return `<a:r><a:rPr lang="en-US" dirty="0" sz="${size}">${solidColorXml(color)}<a:latin typeface="${escapeXml(iconTypeface)}"/></a:rPr><a:t>${escapeXml(glyph)}</a:t></a:r>`;
+  }).join("");
+  return `<a:p><a:pPr algn="${align}"><a:lnSpc><a:spcPct val="${lineSpacing}"/></a:lnSpc></a:pPr>` + (runs || `<a:r><a:rPr ${textRunProperties}>${solidColorXml(color)}<a:latin typeface="${escapeXml(typeface)}"/></a:rPr><a:t> </a:t></a:r>`) + `</a:p>`;
 }
 function buildLayerShape(layer, shapeId) {
   const rect = toEmuRect(resolveLayerRect(layer.position, 100, 100));
@@ -985,8 +1018,37 @@ function orientation(direction) {
 function inOutDir(direction, fallback) {
   return direction === "out" ? "out" : direction === "in" ? "in" : fallback;
 }
-function buildTitleShape(title, style) {
-  return `<p:sp><p:nvSpPr><p:cNvPr id="2" name="Title"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="${TITLE_LEFT}" y="${TITLE_TOP}"/><a:ext cx="${TITLE_WIDTH}" cy="${TITLE_HEIGHT}"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" sz="${DEFAULT_TITLE_SIZE}" dirty="0"><a:solidFill><a:srgbClr val="${style.titleColor}"/></a:solidFill><a:latin typeface="${escapeXml(style.titleFont)}"/></a:rPr><a:t>${escapeXml(title)}</a:t></a:r></a:p></p:txBody></p:sp>`;
+function buildTitleShape(title, ctx) {
+  const runs = inlineNodesToRuns(title, titleRunHandlers(ctx));
+  return `<p:sp><p:nvSpPr><p:cNvPr id="2" name="Title"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="${TITLE_LEFT}" y="${TITLE_TOP}"/><a:ext cx="${TITLE_WIDTH}" cy="${TITLE_HEIGHT}"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle/><a:p>` + runs + `</a:p></p:txBody></p:sp>`;
+}
+function titleRunHandlers(ctx) {
+  const handlers = {
+    run: (text, format) => makeTitleRun(text, format, ctx.style),
+    link: (node, format) => inlineNodesToRuns(node.children, handlers, format),
+    image: (node, format) => makeTitleRun(node.alt ?? "", format, ctx.style),
+    icon: (node, format) => makeTitleIconRun(node, format, ctx),
+    lineBreak: () => `<a:br/>`
+  };
+  return handlers;
+}
+function makeTitleRun(text, format, style) {
+  if (!text) return "";
+  const attrs = [`lang="en-US"`, `dirty="0"`, `sz="${DEFAULT_TITLE_SIZE}"`];
+  if (format.bold) attrs.push(`b="1"`);
+  if (format.italic) attrs.push(`i="1"`);
+  if (format.strike) attrs.push(`strike="sngStrike"`);
+  const typeface = format.code ? style.codeFont : style.titleFont;
+  return `<a:r><a:rPr ${attrs.join(" ")}><a:solidFill><a:srgbClr val="${style.titleColor}"/></a:solidFill><a:latin typeface="${escapeXml(typeface)}"/></a:rPr><a:t>${escapeXml(text)}</a:t></a:r>`;
+}
+function makeTitleIconRun(node, format, ctx) {
+  const glyph = fontAwesomeGlyph(node.family, node.name);
+  if (!glyph) return makeTitleRun(`{[${node.token}]}`, format, ctx.style);
+  const face = fontAwesomeFace(node.family);
+  ctx.iconFamilies.add(node.family);
+  const attrs = [`lang="en-US"`, `dirty="0"`, `sz="${DEFAULT_TITLE_SIZE}"`];
+  if (format.strike) attrs.push(`strike="sngStrike"`);
+  return `<a:r><a:rPr ${attrs.join(" ")}><a:solidFill><a:srgbClr val="${ctx.style.titleColor}"/></a:solidFill><a:latin typeface="${escapeXml(face.typeface)}"/></a:rPr><a:t>${escapeXml(glyph)}</a:t></a:r>`;
 }
 function buildBodyShapeCustom(bodyContent, top, height, style) {
   const defRPr = style.hasTheme ? `<a:defRPr><a:solidFill><a:srgbClr val="${style.text}"/></a:solidFill><a:latin typeface="${escapeXml(style.bodyFont)}"/></a:defRPr>` : "";
@@ -1135,6 +1197,7 @@ function pptxRunHandlers(ctx) {
     run: (text, format) => makeRun(text, format, ctx.style),
     link: (node, format) => convertLink(node, ctx, format),
     image: (node, format) => convertImage(node, format, ctx),
+    icon: (node, format) => makeIconRun(node, format, ctx),
     lineBreak: () => `<a:br/>`
   };
 }
@@ -1160,6 +1223,16 @@ function makeRun(text, format, style) {
   }
   return `<a:r><a:rPr ${rPrParts.join(" ")}>${innerParts}</a:rPr><a:t>${escapeXml(text)}</a:t></a:r>`;
 }
+function makeIconRun(node, format, ctx) {
+  const glyph = fontAwesomeGlyph(node.family, node.name);
+  if (!glyph) return makeRun(`{[${node.token}]}`, format, ctx.style);
+  const face = fontAwesomeFace(node.family);
+  ctx.iconFamilies.add(node.family);
+  const attrs = [`lang="en-US"`, `dirty="0"`];
+  if (format.strike) attrs.push(`strike="sngStrike"`);
+  const fill = ctx.style.hasTheme ? `<a:solidFill><a:srgbClr val="${ctx.style.text}"/></a:solidFill>` : "";
+  return `<a:r><a:rPr ${attrs.join(" ")}>` + fill + `<a:latin typeface="${escapeXml(face.typeface)}"/></a:rPr><a:t>${escapeXml(glyph)}</a:t></a:r>`;
+}
 function convertLink(node, ctx, format) {
   const rId = ctx.addHyperlink(node.url);
   if (!rId) return convertInlines(node.children, ctx, format);
@@ -1204,11 +1277,20 @@ async function buildPptxPackage(slideXmls, slideContexts, options) {
   }
   const slideMasterRelId = relIds.alloc(PRESENTATION_PART);
   const themeRelId = relIds.alloc(PRESENTATION_PART);
+  const usedIconFamilies = /* @__PURE__ */ new Set();
+  for (const ctx of slideContexts) {
+    for (const family of ctx.iconFamilies) usedIconFamilies.add(family);
+  }
+  const embeddedIconFonts = fontAwesomeFaces(usedIconFamilies).map((face) => ({
+    face,
+    relId: relIds.alloc(PRESENTATION_PART)
+  }));
   const presentationXml = buildPresentationXml(
     slideCount,
     slideRelIds,
     slideMasterRelId,
-    themeRelId
+    themeRelId,
+    embeddedIconFonts.map(({ face, relId }) => ({ typeface: face.typeface, relId }))
   );
   pkg.addPart("ppt/presentation.xml", presentationXml, CONTENT_TYPE_PPTX_PRESENTATION);
   for (let i = 0; i < slideCount; i++) {
@@ -1273,6 +1355,15 @@ async function buildPptxPackage(slideXmls, slideContexts, options) {
     type: REL_THEME,
     target: "theme/theme1.xml"
   });
+  for (const { face, relId } of embeddedIconFonts) {
+    const filename = `${face.fileStem}.fntdata`;
+    pkg.addBinaryPart(`ppt/fonts/${filename}`, face.data, CONTENT_TYPE_PPTX_FONT);
+    pkg.addRelationship("ppt/presentation.xml", {
+      id: relId,
+      type: REL_FONT,
+      target: `fonts/${filename}`
+    });
+  }
   if (options.title || options.author || options.description) {
     pkg.setCoreProperties({
       title: options.title,
@@ -1503,7 +1594,7 @@ async function importDocument(pkg, options) {
   let extraction = null;
   if (inferTheme || inferLayouts) {
     try {
-      const { extractPptxTheme } = await import("./extract-MN7LA3NL.js");
+      const { extractPptxTheme } = await import("./extract-UTAOG7LV.js");
       extraction = await extractPptxTheme(pkg);
     } catch (err) {
       warnInferenceFailure("theme extraction", err);
@@ -1520,7 +1611,7 @@ async function importDocument(pkg, options) {
   }
   if (inferLayouts) {
     try {
-      const { analyzePptxLayouts: analyzePptxLayouts2 } = await import("./layouts-DRWZGSPD.js");
+      const { analyzePptxLayouts: analyzePptxLayouts2 } = await import("./layouts-2A7QNF6Y.js");
       const { colorHintsFromExtraction } = await import("./mapTheme-4TWH25FT.js");
       ctx.inference = await analyzePptxLayouts2(pkg, {
         colors: extraction ? colorHintsFromExtraction(extraction) : {}

package/dist/{chunk-OGS5VCGJ.js → chunk-UIBTXX4L.js}

@@ -1,9 +1,9 @@
 import {
   extractPlainText
-} from "./chunk-SBUW7NHR.js";
+} from "./chunk-6X5XN3CZ.js";
 import {
   createPackage
-} from "./chunk-4V3KCHAP.js";
+} from "./chunk-ILCJ3WFD.js";
 import {
   escapeXml,
   xmlDeclaration
@@ -22,7 +22,7 @@ import {
   getPartXml,
   openPackage,
   requireMainPartPath
-} from "./chunk-X2DEAXNK.js";
+} from "./chunk-S5PCVMKU.js";
 
 // src/xlsx/index.ts
 import { markdownToDoc } from "@bendyline/squisq/doc";