@hirokisakabe/pom 9.1.1 → 9.1.2

package/dist/buildContext.js

@@ -1,7 +1,5 @@
-import { GradientFillRegistry } from "./renderPptx/gradientFills.js";
-import { DiagnosticCollector } from "./diagnostics.js";
-import { GlowEffectRegistry } from "./renderPptx/glowEffects.js";
 import { GlimpseTextBoxRegistry } from "./renderPptx/glimpseTextBoxes.js";
+import { DiagnosticCollector } from "./diagnostics.js";
 //#region src/buildContext.ts
 function createBuildContext(textMeasurementMode = "auto") {
 	return {
@@ -10,8 +8,6 @@ function createBuildContext(textMeasurementMode = "auto") {
 		imageDataCache: /* @__PURE__ */ new Map(),
 		iconRasterCache: /* @__PURE__ */ new Map(),
 		diagnostics: new DiagnosticCollector(),
-		gradientFills: new GradientFillRegistry(),
-		glowEffects: new GlowEffectRegistry(),
 		glimpseTextBoxes: new GlimpseTextBoxRegistry()
 	};
 }

package/dist/buildContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildContext.js","names":[],"sources":["../src/buildContext.ts"],"sourcesContent":["import type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport { DiagnosticCollector } from \"./diagnostics.ts\";\nimport { GlowEffectRegistry } from \"./renderPptx/glowEffects.ts\";\nimport { GradientFillRegistry } from \"./renderPptx/gradientFills.ts\";\nimport { GlimpseTextBoxRegistry } from \"./renderPptx/glimpseTextBoxes.ts\";\n\nexport interface BuildContext {\n  textMeasurementMode: TextMeasurementMode;\n  imageSizeCache: Map<string, { widthPx: number; heightPx: number }>;\n  imageDataCache: Map<string, string>;\n  iconRasterCache: Map<string, string>;\n  diagnostics: DiagnosticCollector;\n  gradientFills: GradientFillRegistry;\n  glowEffects: GlowEffectRegistry;\n  glimpseTextBoxes: GlimpseTextBoxRegistry;\n}\n\nexport function createBuildContext(\n  textMeasurementMode: TextMeasurementMode = \"auto\",\n): BuildContext {\n  return {\n    textMeasurementMode,\n    imageSizeCache: new Map(),\n    imageDataCache: new Map(),\n    iconRasterCache: new Map(),\n    diagnostics: new DiagnosticCollector(),\n    gradientFills: new GradientFillRegistry(),\n    glowEffects: new GlowEffectRegistry(),\n    glimpseTextBoxes: new GlimpseTextBoxRegistry(),\n  };\n}\n"],"mappings":";;;;;AAiBA,SAAgB,mBACd,sBAA2C,QAC7B;CACd,OAAO;EACL;EACA,gCAAgB,IAAI,IAAI;EACxB,gCAAgB,IAAI,IAAI;EACxB,iCAAiB,IAAI,IAAI;EACzB,aAAa,IAAI,oBAAoB;EACrC,eAAe,IAAI,qBAAqB;EACxC,aAAa,IAAI,mBAAmB;EACpC,kBAAkB,IAAI,uBAAuB;CAC/C;AACF"}
+{"version":3,"file":"buildContext.js","names":[],"sources":["../src/buildContext.ts"],"sourcesContent":["import type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport { DiagnosticCollector } from \"./diagnostics.ts\";\nimport { GlimpseTextBoxRegistry } from \"./renderPptx/glimpseTextBoxes.ts\";\n\nexport interface BuildContext {\n  textMeasurementMode: TextMeasurementMode;\n  imageSizeCache: Map<string, { widthPx: number; heightPx: number }>;\n  imageDataCache: Map<string, string>;\n  iconRasterCache: Map<string, string>;\n  diagnostics: DiagnosticCollector;\n  glimpseTextBoxes: GlimpseTextBoxRegistry;\n}\n\nexport function createBuildContext(\n  textMeasurementMode: TextMeasurementMode = \"auto\",\n): BuildContext {\n  return {\n    textMeasurementMode,\n    imageSizeCache: new Map(),\n    imageDataCache: new Map(),\n    iconRasterCache: new Map(),\n    diagnostics: new DiagnosticCollector(),\n    glimpseTextBoxes: new GlimpseTextBoxRegistry(),\n  };\n}\n"],"mappings":";;;AAaA,SAAgB,mBACd,sBAA2C,QAC7B;CACd,OAAO;EACL;EACA,gCAAgB,IAAI,IAAI;EACxB,gCAAgB,IAAI,IAAI;EACxB,iCAAiB,IAAI,IAAI;EACzB,aAAa,IAAI,oBAAoB;EACrC,kBAAkB,IAAI,uBAAuB;CAC/C;AACF"}

package/dist/buildPptx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPptx.d.ts","names":[],"sources":["../src/buildPptx.ts"],"mappings":";;;;;UAqBiB,eAAA;EACf,IAAA,sBAA0B,OAAA;EAC1B,WAAA,EAAa,UAAU;AAAA;AAAA,iBAGH,SAAA,CACpB,GAAA,UACA,SAAA;EAAa,CAAA;EAAW,CAAA;AAAA,GACxB,OAAA;EACE,MAAA,GAAS,kBAAA;EACT,UAAA,GAAa,WAAA,GAAc,UAAA;EAC3B,eAAA,GAAkB,mBAAA;EAClB,OAAA;EACA,MAAA;AAAA,IAED,OAAA,CAAQ,eAAA"}
+{"version":3,"file":"buildPptx.d.ts","names":[],"sources":["../src/buildPptx.ts"],"mappings":";;;;;UAmBiB,eAAA;EACf,IAAA,sBAA0B,OAAA;EAC1B,WAAA,EAAa,UAAU;AAAA;AAAA,iBAGH,SAAA,CACpB,GAAA,UACA,SAAA;EAAa,CAAA;EAAW,CAAA;AAAA,GACxB,OAAA;EACE,MAAA,GAAS,kBAAA;EACT,UAAA,GAAa,WAAA,GAAc,UAAA;EAC3B,eAAA,GAAkB,mBAAA;EAClB,OAAA;EACA,MAAA;AAAA,IAED,OAAA,CAAQ,eAAA"}

package/dist/buildPptx.js

@@ -1,10 +1,8 @@
 import { freeYogaTree } from "./shared/freeYogaTree.js";
-import { patchPptxWriteForGradientFills } from "./renderPptx/gradientFills.js";
+import { patchPptxWriteForGlimpseTextBoxes } from "./renderPptx/glimpseTextBoxes.js";
 import { calcYogaLayout } from "./calcYogaLayout/calcYogaLayout.js";
 import { autoFitSlide } from "./autoFit/autoFit.js";
 import { DiagnosticsError } from "./diagnostics.js";
-import { patchPptxWriteForGlowEffects } from "./renderPptx/glowEffects.js";
-import { patchPptxWriteForGlimpseTextBoxes } from "./renderPptx/glimpseTextBoxes.js";
 import { createBuildContext } from "./buildContext.js";
 import { extractLayoutResults } from "./calcYogaLayout/types.js";
 import { parseMasterPptx } from "./parseMasterPptx.js";
@@ -15,8 +13,6 @@ import { validatePositioned } from "./validatePositioned/validatePositioned.js";
 //#region src/buildPptx.ts
 async function buildPptx(xml, slideSize, options) {
 	const ctx = createBuildContext(options?.textMeasurement ?? "auto");
-	ctx.gradientFills.reserveColors(xml);
-	if (options?.master) ctx.gradientFills.reserveColors(JSON.stringify(options.master));
 	const nodes = parseXml(xml);
 	const positionedPages = [];
 	for (const [slideIndex, node] of nodes.entries()) {
@@ -45,9 +41,7 @@ async function buildPptx(xml, slideSize, options) {
 		ctx.diagnostics.add("MASTER_PPTX_PARSE_FAILED", message);
 	}
 	const pptx = await renderPptx(positionedPages, slideSize, ctx, master);
-	patchPptxWriteForGradientFills(pptx, ctx.gradientFills);
 	patchPptxWriteForGlimpseTextBoxes(pptx, ctx.glimpseTextBoxes);
-	patchPptxWriteForGlowEffects(pptx, ctx.glowEffects);
 	const diagnostics = ctx.diagnostics.items;
 	if (options?.strict && diagnostics.length > 0) throw new DiagnosticsError(diagnostics);
 	return {

package/dist/buildPptx.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildPptx.js","names":[],"sources":["../src/buildPptx.ts"],"sourcesContent":["import { autoFitSlide } from \"./autoFit/autoFit.ts\";\nimport { createBuildContext } from \"./buildContext.ts\";\nimport { calcYogaLayout } from \"./calcYogaLayout/calcYogaLayout.ts\";\nimport type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport type { YogaNodeMap } from \"./calcYogaLayout/types.ts\";\nimport { extractLayoutResults } from \"./calcYogaLayout/types.ts\";\nimport type { Diagnostic } from \"./diagnostics.ts\";\nimport { DiagnosticsError } from \"./diagnostics.ts\";\nimport { parseMasterPptx } from \"./parseMasterPptx.ts\";\nimport { parseXml } from \"./parseXml/parseXml.ts\";\nimport { patchPptxWriteForGlowEffects } from \"./renderPptx/glowEffects.ts\";\nimport { patchPptxWriteForGlimpseTextBoxes } from \"./renderPptx/glimpseTextBoxes.ts\";\nimport { patchPptxWriteForGradientFills } from \"./renderPptx/gradientFills.ts\";\nimport { renderPptx } from \"./renderPptx/renderPptx.ts\";\nimport { freeYogaTree } from \"./shared/freeYogaTree.ts\";\nimport { toPositioned } from \"./toPositioned/toPositioned.ts\";\nimport { PositionedNode, SlideMasterOptions } from \"./types.ts\";\nimport { validatePositioned } from \"./validatePositioned/validatePositioned.ts\";\n\nexport type { TextMeasurementMode };\n\nexport interface BuildPptxResult {\n  pptx: import(\"pptxgenjs\").default;\n  diagnostics: Diagnostic[];\n}\n\nexport async function buildPptx(\n  xml: string,\n  slideSize: { w: number; h: number },\n  options?: {\n    master?: SlideMasterOptions;\n    masterPptx?: ArrayBuffer | Uint8Array;\n    textMeasurement?: TextMeasurementMode;\n    autoFit?: boolean;\n    strict?: boolean;\n  },\n): Promise<BuildPptxResult> {\n  const ctx = createBuildContext(options?.textMeasurement ?? \"auto\");\n\n  // グラデーション後処理のマーカー色がユーザー指定色と衝突しないよう、\n  // 入力 XML / master オプション中に現れる色を予約しておく\n  ctx.gradientFills.reserveColors(xml);\n  if (options?.master) {\n    ctx.gradientFills.reserveColors(JSON.stringify(options.master));\n  }\n\n  const nodes = parseXml(xml);\n  const positionedPages: PositionedNode[] = [];\n\n  for (const [slideIndex, node] of nodes.entries()) {\n    let map: YogaNodeMap | undefined;\n    try {\n      if (options?.autoFit !== false) {\n        map = await autoFitSlide(node, slideSize, ctx);\n      } else {\n        map = await calcYogaLayout(node, slideSize, ctx);\n      }\n      const layoutMap = extractLayoutResults(map);\n      const positioned = await toPositioned(node, ctx, layoutMap);\n      validatePositioned(positioned, slideSize, ctx, slideIndex);\n      positionedPages.push(positioned);\n    } finally {\n      if (map) freeYogaTree(map);\n    }\n  }\n\n  // masterPptx から背景を抽出し、master オプションにマージ\n  let master = options?.master;\n  if (options?.masterPptx) {\n    try {\n      const bg = await parseMasterPptx(options.masterPptx);\n      if (bg) {\n        if (master) {\n          // 明示的に background が指定されていない場合のみ、masterPptx の背景を使用\n          if (!master.background) {\n            master = { ...master, background: bg };\n          }\n        } else {\n          master = { background: bg };\n        }\n      }\n    } catch (e) {\n      const message =\n        e instanceof Error ? e.message : \"Unknown error parsing masterPptx\";\n      ctx.diagnostics.add(\"MASTER_PPTX_PARSE_FAILED\", message);\n    }\n  }\n\n  const pptx = await renderPptx(positionedPages, slideSize, ctx, master);\n\n  // backgroundGradient 使用時は write/writeFile に gradFill 置換の後処理を仕込む\n  patchPptxWriteForGradientFills(pptx, ctx.gradientFills);\n\n  // Text primitive は glimpse writer の text box XML で marker shape を置換する\n  patchPptxWriteForGlimpseTextBoxes(pptx, ctx.glimpseTextBoxes);\n\n  // Shape / Icon の glow 指定がある場合は write/writeFile に effectLst 挿入の\n  // 後処理を仕込む (gradientFills の patch 後にチェーンする)\n  patchPptxWriteForGlowEffects(pptx, ctx.glowEffects);\n\n  const diagnostics = ctx.diagnostics.items;\n\n  if (options?.strict && diagnostics.length > 0) {\n    throw new DiagnosticsError(diagnostics);\n  }\n\n  return { pptx, diagnostics };\n}\n"],"mappings":";;;;;;;;;;;;;;;AA0BA,eAAsB,UACpB,KACA,WACA,SAO0B;CAC1B,MAAM,MAAM,mBAAmB,SAAS,mBAAmB,MAAM;CAIjE,IAAI,cAAc,cAAc,GAAG;CACnC,IAAI,SAAS,QACX,IAAI,cAAc,cAAc,KAAK,UAAU,QAAQ,MAAM,CAAC;CAGhE,MAAM,QAAQ,SAAS,GAAG;CAC1B,MAAM,kBAAoC,CAAC;CAE3C,KAAK,MAAM,CAAC,YAAY,SAAS,MAAM,QAAQ,GAAG;EAChD,IAAI;EACJ,IAAI;GACF,IAAI,SAAS,YAAY,OACvB,MAAM,MAAM,aAAa,MAAM,WAAW,GAAG;QAE7C,MAAM,MAAM,eAAe,MAAM,WAAW,GAAG;GAGjD,MAAM,aAAa,MAAM,aAAa,MAAM,KAD1B,qBAAqB,GACkB,CAAC;GAC1D,mBAAmB,YAAY,WAAW,KAAK,UAAU;GACzD,gBAAgB,KAAK,UAAU;EACjC,UAAU;GACR,IAAI,KAAK,aAAa,GAAG;EAC3B;CACF;CAGA,IAAI,SAAS,SAAS;CACtB,IAAI,SAAS,YACX,IAAI;EACF,MAAM,KAAK,MAAM,gBAAgB,QAAQ,UAAU;EACnD,IAAI,IACF,IAAI;OAEE,CAAC,OAAO,YACV,SAAS;IAAE,GAAG;IAAQ,YAAY;GAAG;EAAA,OAGvC,SAAS,EAAE,YAAY,GAAG;CAGhC,SAAS,GAAG;EACV,MAAM,UACJ,aAAa,QAAQ,EAAE,UAAU;EACnC,IAAI,YAAY,IAAI,4BAA4B,OAAO;CACzD;CAGF,MAAM,OAAO,MAAM,WAAW,iBAAiB,WAAW,KAAK,MAAM;CAGrE,+BAA+B,MAAM,IAAI,aAAa;CAGtD,kCAAkC,MAAM,IAAI,gBAAgB;CAI5D,6BAA6B,MAAM,IAAI,WAAW;CAElD,MAAM,cAAc,IAAI,YAAY;CAEpC,IAAI,SAAS,UAAU,YAAY,SAAS,GAC1C,MAAM,IAAI,iBAAiB,WAAW;CAGxC,OAAO;EAAE;EAAM;CAAY;AAC7B"}
+{"version":3,"file":"buildPptx.js","names":[],"sources":["../src/buildPptx.ts"],"sourcesContent":["import { autoFitSlide } from \"./autoFit/autoFit.ts\";\nimport { createBuildContext } from \"./buildContext.ts\";\nimport { calcYogaLayout } from \"./calcYogaLayout/calcYogaLayout.ts\";\nimport type { TextMeasurementMode } from \"./calcYogaLayout/measureText.ts\";\nimport type { YogaNodeMap } from \"./calcYogaLayout/types.ts\";\nimport { extractLayoutResults } from \"./calcYogaLayout/types.ts\";\nimport type { Diagnostic } from \"./diagnostics.ts\";\nimport { DiagnosticsError } from \"./diagnostics.ts\";\nimport { parseMasterPptx } from \"./parseMasterPptx.ts\";\nimport { parseXml } from \"./parseXml/parseXml.ts\";\nimport { patchPptxWriteForGlimpseTextBoxes } from \"./renderPptx/glimpseTextBoxes.ts\";\nimport { renderPptx } from \"./renderPptx/renderPptx.ts\";\nimport { freeYogaTree } from \"./shared/freeYogaTree.ts\";\nimport { toPositioned } from \"./toPositioned/toPositioned.ts\";\nimport { PositionedNode, SlideMasterOptions } from \"./types.ts\";\nimport { validatePositioned } from \"./validatePositioned/validatePositioned.ts\";\n\nexport type { TextMeasurementMode };\n\nexport interface BuildPptxResult {\n  pptx: import(\"pptxgenjs\").default;\n  diagnostics: Diagnostic[];\n}\n\nexport async function buildPptx(\n  xml: string,\n  slideSize: { w: number; h: number },\n  options?: {\n    master?: SlideMasterOptions;\n    masterPptx?: ArrayBuffer | Uint8Array;\n    textMeasurement?: TextMeasurementMode;\n    autoFit?: boolean;\n    strict?: boolean;\n  },\n): Promise<BuildPptxResult> {\n  const ctx = createBuildContext(options?.textMeasurement ?? \"auto\");\n\n  const nodes = parseXml(xml);\n  const positionedPages: PositionedNode[] = [];\n\n  for (const [slideIndex, node] of nodes.entries()) {\n    let map: YogaNodeMap | undefined;\n    try {\n      if (options?.autoFit !== false) {\n        map = await autoFitSlide(node, slideSize, ctx);\n      } else {\n        map = await calcYogaLayout(node, slideSize, ctx);\n      }\n      const layoutMap = extractLayoutResults(map);\n      const positioned = await toPositioned(node, ctx, layoutMap);\n      validatePositioned(positioned, slideSize, ctx, slideIndex);\n      positionedPages.push(positioned);\n    } finally {\n      if (map) freeYogaTree(map);\n    }\n  }\n\n  // masterPptx から背景を抽出し、master オプションにマージ\n  let master = options?.master;\n  if (options?.masterPptx) {\n    try {\n      const bg = await parseMasterPptx(options.masterPptx);\n      if (bg) {\n        if (master) {\n          // 明示的に background が指定されていない場合のみ、masterPptx の背景を使用\n          if (!master.background) {\n            master = { ...master, background: bg };\n          }\n        } else {\n          master = { background: bg };\n        }\n      }\n    } catch (e) {\n      const message =\n        e instanceof Error ? e.message : \"Unknown error parsing masterPptx\";\n      ctx.diagnostics.add(\"MASTER_PPTX_PARSE_FAILED\", message);\n    }\n  }\n\n  const pptx = await renderPptx(positionedPages, slideSize, ctx, master);\n\n  // glimpse writer で生成した Text / Shape / Picture XML で marker shape を置換する\n  patchPptxWriteForGlimpseTextBoxes(pptx, ctx.glimpseTextBoxes);\n\n  const diagnostics = ctx.diagnostics.items;\n\n  if (options?.strict && diagnostics.length > 0) {\n    throw new DiagnosticsError(diagnostics);\n  }\n\n  return { pptx, diagnostics };\n}\n"],"mappings":";;;;;;;;;;;;;AAwBA,eAAsB,UACpB,KACA,WACA,SAO0B;CAC1B,MAAM,MAAM,mBAAmB,SAAS,mBAAmB,MAAM;CAEjE,MAAM,QAAQ,SAAS,GAAG;CAC1B,MAAM,kBAAoC,CAAC;CAE3C,KAAK,MAAM,CAAC,YAAY,SAAS,MAAM,QAAQ,GAAG;EAChD,IAAI;EACJ,IAAI;GACF,IAAI,SAAS,YAAY,OACvB,MAAM,MAAM,aAAa,MAAM,WAAW,GAAG;QAE7C,MAAM,MAAM,eAAe,MAAM,WAAW,GAAG;GAGjD,MAAM,aAAa,MAAM,aAAa,MAAM,KAD1B,qBAAqB,GACkB,CAAC;GAC1D,mBAAmB,YAAY,WAAW,KAAK,UAAU;GACzD,gBAAgB,KAAK,UAAU;EACjC,UAAU;GACR,IAAI,KAAK,aAAa,GAAG;EAC3B;CACF;CAGA,IAAI,SAAS,SAAS;CACtB,IAAI,SAAS,YACX,IAAI;EACF,MAAM,KAAK,MAAM,gBAAgB,QAAQ,UAAU;EACnD,IAAI,IACF,IAAI;OAEE,CAAC,OAAO,YACV,SAAS;IAAE,GAAG;IAAQ,YAAY;GAAG;EAAA,OAGvC,SAAS,EAAE,YAAY,GAAG;CAGhC,SAAS,GAAG;EACV,MAAM,UACJ,aAAa,QAAQ,EAAE,UAAU;EACnC,IAAI,YAAY,IAAI,4BAA4B,OAAO;CACzD;CAGF,MAAM,OAAO,MAAM,WAAW,iBAAiB,WAAW,KAAK,MAAM;CAGrE,kCAAkC,MAAM,IAAI,gBAAgB;CAE5D,MAAM,cAAc,IAAI,YAAY;CAEpC,IAAI,SAAS,UAAU,YAAY,SAAS,GAC1C,MAAM,IAAI,iBAAiB,WAAW;CAGxC,OAAO;EAAE;EAAM;CAAY;AAC7B"}

package/dist/renderPptx/glimpseTextBoxes.js

@@ -1,7 +1,7 @@
 import { EMU_PER_IN, pxToEmu, pxToPt } from "./units.js";
 import { createTextOptions, resolveSubSup } from "./textOptions.js";
-import { parseLinearGradient } from "../shared/gradient.js";
-import { addTextBox, asEmu, asHundredthPt, asOoxmlAngle, asOoxmlPercent, asPt, createPptx } from "@pptx-glimpse/document";
+import { parseGradient, parseLinearGradient } from "../shared/gradient.js";
+import { addPicture, addShape, addTextBox, asEmu, asHundredthPt, asOoxmlAngle, asOoxmlPercent, asPt, createPptx, readPptx } from "@pptx-glimpse/document";
 //#region src/renderPptx/glimpseTextBoxes.ts
 /**
 * Text primitive の @pptx-glimpse/document writer への段階的 swap。
@@ -21,7 +21,11 @@ import { addTextBox, asEmu, asHundredthPt, asOoxmlAngle, asOoxmlPercent, asPt, c
 * を経由しない。
 */
 const MARKER_PREFIX = "pom-text:";
+const SHAPE_MARKER_PREFIX = "pom-shape:";
+const PICTURE_MARKER_PREFIX = "pom-picture:";
+const SLIDE_BACKGROUND_MARKER_BASE = 1014333;
 const HYPERLINK_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
+const IMAGE_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
 async function loadJSZip() {
 	const mod = await import("jszip");
 	return mod.default ?? mod;
@@ -151,6 +155,89 @@ function withGlowAlpha(xml, node) {
 	const replacement = `<a:glow rad="${Math.round(pxToEmu(glow.size ?? 8))}"><a:srgbClr val="${color}"><a:alpha val="${alpha}"/></a:srgbClr></a:glow>`;
 	return xml.replaceAll(target, replacement);
 }
+function withShapeGlowAlpha(xml, glow) {
+	if (!glow) return xml;
+	const alpha = Math.round((glow.opacity ?? .75) * 1e5);
+	const color = cleanHex(glow.color ?? "FFFFFF");
+	const target = `<a:glow rad="${Math.round(pxToEmu(glow.size ?? 8))}"><a:srgbClr val="${color}"/></a:glow>`;
+	const replacement = `<a:glow rad="${Math.round(pxToEmu(glow.size ?? 8))}"><a:srgbClr val="${color}"><a:alpha val="${alpha}"/></a:srgbClr></a:glow>`;
+	return xml.replaceAll(target, replacement);
+}
+function colorWithOptionalAlphaXml(color, opacity) {
+	const clean = cleanHex(color) ?? color;
+	if (opacity === void 0) return `<a:srgbClr val="${clean}"/>`;
+	return `<a:srgbClr val="${clean}"><a:alpha val="${Math.round(opacity * 1e5)}"/></a:srgbClr>`;
+}
+function buildGradFillXml(value, opacity) {
+	const gradient = parseGradient(value);
+	if (!gradient) return void 0;
+	const gsXml = gradient.value.stops.map((stop) => `<a:gs pos="${Math.round(stop.position * 1e3)}">${colorWithOptionalAlphaXml(stop.color, opacity)}</a:gs>`).join("");
+	if (gradient.kind === "linear") {
+		const dmlAngle = ((gradient.value.angle - 90) % 360 + 360) % 360;
+		return `<a:gradFill flip="none" rotWithShape="1"><a:gsLst>${gsXml}</a:gsLst><a:lin ang="${Math.round(dmlAngle * 6e4)}" scaled="0"/></a:gradFill>`;
+	}
+	const { centerX, centerY } = gradient.value;
+	return `<a:gradFill flip="none" rotWithShape="1"><a:gsLst>${gsXml}</a:gsLst><a:path path="circle"><a:fillToRect l="${Math.round(centerX * 1e3)}" t="${Math.round(centerY * 1e3)}" r="${Math.round((100 - centerX) * 1e3)}" b="${Math.round((100 - centerY) * 1e3)}"/></a:path></a:gradFill>`;
+}
+function withSolidFillAlpha(xml, color, opacity) {
+	if (color === void 0 || opacity === void 0) return xml;
+	const clean = cleanHex(color);
+	return xml.replaceAll(`<a:solidFill><a:srgbClr val="${clean}"/></a:solidFill>`, `<a:solidFill>${colorWithOptionalAlphaXml(clean ?? color, opacity)}</a:solidFill>`);
+}
+function withGradientFill(xml, backgroundGradient, opacity, preset) {
+	if (!backgroundGradient) return xml;
+	const gradFill = buildGradFillXml(backgroundGradient, opacity);
+	if (!gradFill) return xml;
+	if (preset === "line") return xml.replace(/<a:ln\b([^>]*)>([\s\S]*?)<\/a:ln>/, (match, attrs, body) => {
+		const nextBody = body.replace(/<a:(?:solidFill|gradFill)\b[\s\S]*?<\/a:(?:solidFill|gradFill)>|<a:noFill\/>/, gradFill);
+		return nextBody === body ? match : `<a:ln${attrs}>${nextBody}</a:ln>`;
+	});
+	return xml.replace(/<a:(?:solidFill|gradFill)\b[\s\S]*?<\/a:(?:solidFill|gradFill)>|<a:noFill\/>/, gradFill);
+}
+function withRoundRectAdjust(xml, input, rectRadius) {
+	if (input.preset !== "roundRect" || rectRadius === void 0) return xml;
+	const adj = Math.round(rectRadius * EMU_PER_IN * 1e5 / Math.min(input.width, input.height));
+	return xml.replace(/<a:prstGeom prst="roundRect"><a:avLst\/><\/a:prstGeom>/, `<a:prstGeom prst="roundRect"><a:avLst><a:gd name="adj" fmla="val ${adj}"/></a:avLst></a:prstGeom>`);
+}
+function shadowXml(shadow) {
+	if (!shadow) return void 0;
+	const blur = Math.round((shadow.blur ?? 3) * 12700);
+	const dist = Math.round((shadow.offset ?? 23e3 / 12700) * 12700);
+	const dir = Math.round((shadow.angle ?? 90) * 6e4);
+	const color = cleanHex(shadow.color ?? "000000") ?? "000000";
+	const alpha = Math.round((shadow.opacity ?? .35) * 1e5);
+	const type = shadow.type ?? "outer";
+	return `<a:${type}Shdw sx="100000" sy="100000" kx="0" ky="0" algn="bl" blurRad="${blur}" rotWithShape="1" dist="${dist}" dir="${dir}"><a:srgbClr val="${color}"><a:alpha val="${alpha}"/></a:srgbClr></a:${type}Shdw>`;
+}
+function withShadow(xml, shadow) {
+	const effect = shadowXml(shadow);
+	if (!effect) return xml;
+	if (xml.includes("<a:effectLst>")) return xml.replace("</a:effectLst>", `${effect}</a:effectLst>`);
+	return xml.replace("</p:spPr>", `<a:effectLst>${effect}</a:effectLst></p:spPr>`);
+}
+function withLineFlip(xml, flipH, flipV) {
+	if (!flipH && !flipV) return xml;
+	return xml.replace("<a:xfrm", `<a:xfrm${flipH ? " flipH=\"1\"" : ""}${flipV ? " flipV=\"1\"" : ""}`);
+}
+function withLineZeroExtent(xml, preset, zeroWidth, zeroHeight) {
+	if (preset !== "line" || !zeroWidth && !zeroHeight) return xml;
+	return xml.replace(/<a:ext cx="(\d+)" cy="(\d+)"\/>/, (_match, cx, cy) => `<a:ext cx="${zeroWidth ? "0" : cx}" cy="${zeroHeight ? "0" : cy}"/>`);
+}
+function withPrstDash(xml, dashType) {
+	return xml.replace(/<a:ln\b([^>]*)>([\s\S]*?)<\/a:ln>/g, (match, attrs, body) => {
+		const bodyText = body;
+		if (bodyText.includes("<a:prstDash")) return match;
+		return `<a:ln${attrs}>${bodyText.replace(/(<a:(?:solidFill|noFill\/)>[\s\S]*?<\/a:solidFill>|<a:noFill\/>)/, `$1<a:prstDash val="${dashType}"/>`)}</a:ln>`;
+	});
+}
+function withUnsupportedDashStyle(xml, dashType) {
+	if (dashType !== "lgDashDotDot") return xml;
+	return withPrstDash(xml, dashType);
+}
+function withPptxGenLineArrowDefaults(xml, preset) {
+	if (preset !== "line") return xml;
+	return withPrstDash(xml.replace(/<a:(headEnd|tailEnd) type="([^"]+)" w="med" len="med"\/>/g, "<a:$1 type=\"$2\"/>"), "solid");
+}
 function withPptxGenParagraphDefaults(xml) {
 	let result = xml.replaceAll("baseline=\"-25000\"", "baseline=\"-40000\"");
 	result = result.replace(/<a:bodyPr\b([^>]*)\/>/g, (_match, attrs) => {
@@ -168,40 +255,101 @@ function withPptxGenParagraphDefaults(xml) {
 	return result;
 }
 function createTextBoxXml(node, name) {
-	const source = createPptx();
-	const slideHandle = source.slides[0]?.handle;
-	if (!slideHandle) throw new Error("createPptx did not create an editable slide");
 	const textOptions = createTextOptions(node);
 	const { paragraphs, hyperlinks } = buildParagraphs(node);
-	const edit = addTextBox(source, slideHandle, {
-		offsetX: asEmu(Math.round(textOptions.x * EMU_PER_IN)),
-		offsetY: asEmu(Math.round(textOptions.y * EMU_PER_IN)),
-		width: asEmu(Math.round(textOptions.w * EMU_PER_IN)),
-		height: asEmu(Math.round(textOptions.h * EMU_PER_IN)),
-		rotation: node.rotate !== void 0 ? asOoxmlAngle(Math.round(node.rotate * 6e4)) : void 0,
-		name,
-		body: {
-			marginLeft: asEmu(0),
-			marginRight: asEmu(0),
-			marginTop: asEmu(0),
-			marginBottom: asEmu(0)
-		},
-		paragraphs
-	}).edits?.at(-1);
-	if (edit?.kind !== "addTextBox") throw new Error("addTextBox did not produce an addTextBox edit");
 	return {
-		xml: withPptxGenParagraphDefaults(withGlowAlpha(edit.xml, node)),
+		xml: createTextBoxXmlFromInput({
+			offsetX: asEmu(Math.round(textOptions.x * EMU_PER_IN)),
+			offsetY: asEmu(Math.round(textOptions.y * EMU_PER_IN)),
+			width: asEmu(Math.round(textOptions.w * EMU_PER_IN)),
+			height: asEmu(Math.round(textOptions.h * EMU_PER_IN)),
+			rotation: node.rotate !== void 0 ? asOoxmlAngle(Math.round(node.rotate * 6e4)) : void 0,
+			name,
+			body: {
+				marginLeft: asEmu(0),
+				marginRight: asEmu(0),
+				marginTop: asEmu(0),
+				marginBottom: asEmu(0)
+			},
+			paragraphs
+		}, { xmlTransform: (xml) => withGlowAlpha(xml, node) }),
 		hyperlinks
 	};
 }
+function createTextBoxXmlFromInput(input, options) {
+	const source = createPptx();
+	const slideHandle = source.slides[0]?.handle;
+	if (!slideHandle) throw new Error("createPptx did not create an editable slide");
+	const edit = addTextBox(source, slideHandle, input).edits?.at(-1);
+	if (edit?.kind !== "addTextBox") throw new Error("addTextBox did not produce an addTextBox edit");
+	const xml = withPptxGenParagraphDefaults(edit.xml);
+	return options?.xmlTransform ? options.xmlTransform(xml) : xml;
+}
+function geometryPointXml(point) {
+	return `<a:pt x="${Math.round(point.x * EMU_PER_IN)}" y="${Math.round(point.y * EMU_PER_IN)}"/>`;
+}
+function buildCustomGeometryXml(geometry) {
+	if (!geometry.points.find((point) => "x" in point)) return void 0;
+	let hasMoveTo = false;
+	const commands = geometry.points.map((point) => {
+		if ("close" in point) return hasMoveTo ? "<a:close/>" : "";
+		if (!hasMoveTo) {
+			hasMoveTo = true;
+			return `<a:moveTo>${geometryPointXml(point)}</a:moveTo>`;
+		}
+		return `<a:lnTo>${geometryPointXml(point)}</a:lnTo>`;
+	}).join("");
+	return `<a:custGeom><a:avLst/><a:gdLst/><a:ahLst/><a:cxnLst/><a:rect l="l" t="t" r="r" b="b"/><a:pathLst><a:path w="${Math.round(geometry.width * EMU_PER_IN)}" h="${Math.round(geometry.height * EMU_PER_IN)}">${commands}</a:path></a:pathLst></a:custGeom>`;
+}
+function withCustomGeometry(xml, geometry) {
+	if (!geometry) return xml;
+	const customGeometry = buildCustomGeometryXml(geometry);
+	if (!customGeometry) return xml;
+	return xml.replace(/<a:prstGeom\b[\s\S]*?<\/a:prstGeom>/, customGeometry);
+}
+function withOutlineGradientFill(xml, outlineGradient, opacity) {
+	if (!outlineGradient) return xml;
+	const gradFill = buildGradFillXml(outlineGradient, opacity);
+	if (!gradFill) return xml;
+	const lineFillPattern = /<a:(?:solidFill|gradFill)\b[\s\S]*?<\/a:(?:solidFill|gradFill)>|<a:noFill\/>/;
+	if (/<a:ln\b[^>]*\/>/.test(xml)) return xml.replace(/<a:ln\b([^>]*)\/>/, (_match, attrs) => `<a:ln${attrs}>${gradFill}</a:ln>`);
+	return xml.replace(/(<a:ln\b[^>]*>)([\s\S]*?)(<\/a:ln>)/, (_match, open, body, close) => {
+		return `${open}${lineFillPattern.test(body) ? body.replace(lineFillPattern, gradFill) : `${gradFill}${body}`}${close}`;
+	});
+}
+function createShapeXml(input, options) {
+	const source = createPptx();
+	const slideHandle = source.slides[0]?.handle;
+	if (!slideHandle) throw new Error("createPptx did not create an editable slide");
+	const edit = addShape(source, slideHandle, input).edits?.at(-1);
+	if (edit?.kind !== "addShape") throw new Error("addShape did not produce an addShape edit");
+	let xml = edit.xml;
+	xml = withShapeGlowAlpha(xml, options?.glow);
+	xml = withSolidFillAlpha(xml, options?.fillColor, options?.fillOpacity);
+	xml = withGradientFill(xml, options?.backgroundGradient, options?.fillOpacity, input.preset);
+	xml = withOutlineGradientFill(xml, options?.outlineGradient, options?.outlineOpacity ?? options?.fillOpacity);
+	xml = withRoundRectAdjust(xml, input, options?.rectRadius);
+	xml = withShadow(xml, options?.shadow);
+	xml = withUnsupportedDashStyle(xml, options?.dashType);
+	xml = withLineFlip(xml, options?.flipH, options?.flipV);
+	xml = withLineZeroExtent(xml, input.preset, options?.zeroWidth, options?.zeroHeight);
+	xml = withPptxGenLineArrowDefaults(xml, input.preset);
+	xml = withCustomGeometry(xml, options?.customGeometry);
+	return xml;
+}
 var GlimpseTextBoxRegistry = class {
 	registered = [];
+	textCount = 0;
+	shapeCount = 0;
+	pictureCount = 0;
+	slideBackgroundCount = 0;
 	register(node) {
-		const index = this.registered.length;
+		const index = this.textCount++;
 		const marker = `${MARKER_PREFIX}${index}`;
 		const name = `Text ${index + 1}`;
 		const { xml, hyperlinks } = createTextBoxXml(node, name);
 		this.registered.push({
+			kind: "shape",
 			marker,
 			name,
 			xml,
@@ -209,6 +357,68 @@ var GlimpseTextBoxRegistry = class {
 		});
 		return marker;
 	}
+	registerTextBox(input, options) {
+		const index = this.textCount++;
+		const marker = `${MARKER_PREFIX}${index}`;
+		const name = options?.name ?? `Text ${index + 1}`;
+		const xml = createTextBoxXmlFromInput({
+			...input,
+			name
+		}, options);
+		this.registered.push({
+			kind: "shape",
+			marker,
+			name,
+			xml,
+			hyperlinks: options?.hyperlinks ?? []
+		});
+		return marker;
+	}
+	registerShape(input, options) {
+		const index = this.shapeCount++;
+		const marker = `${SHAPE_MARKER_PREFIX}${index}`;
+		const name = options?.name ?? `Shape ${index + 1}`;
+		const xml = createShapeXml({
+			...input,
+			name
+		}, options);
+		this.registered.push({
+			kind: "shape",
+			marker,
+			name,
+			xml,
+			hyperlinks: []
+		});
+		return marker;
+	}
+	registerPicture(input, options) {
+		const index = this.pictureCount++;
+		const marker = `${PICTURE_MARKER_PREFIX}${index}`;
+		const name = options?.name ?? `Picture ${index + 1}`;
+		this.registered.push({
+			kind: "picture",
+			marker,
+			name,
+			input: {
+				...input,
+				name
+			},
+			shadow: options?.shadow
+		});
+		return marker;
+	}
+	registerSlideBackgroundGradient(backgroundGradient, slideNumber, opacity) {
+		const xml = buildGradFillXml(backgroundGradient, opacity);
+		if (!xml) return void 0;
+		const marker = (SLIDE_BACKGROUND_MARKER_BASE + this.slideBackgroundCount++).toString(16).toUpperCase().padStart(6, "0");
+		this.registered.push({
+			kind: "slideBackground",
+			marker,
+			slideNumber,
+			xml
+		});
+		return marker;
+	}
 	get isEmpty() {
 		return this.registered.length === 0;
 	}
@@ -220,7 +430,7 @@ function escapeRegExp(value) {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function replaceShapeId(xml, id, name) {
-	return xml.replace(/<p:cNvPr id="[^"]+" name="[^"]*"/, `<p:cNvPr id="${id}" name="${name}"`);
+	return xml.replace(/<p:cNvPr id="[^"]+" name="[^"]*"/, `<p:cNvPr id="${xmlAttr(id)}" name="${xmlAttr(name)}"`);
 }
 function xmlAttr(value) {
 	return value.replaceAll("&", "&amp;").replaceAll("\"", "&quot;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
@@ -244,6 +454,14 @@ var SlideRelationshipEditor = class {
 		this.changed = true;
 		return id;
 	}
+	addImageRelationship(id, target) {
+		if (new RegExp(`\\bId="${escapeRegExp(id)}"`).test(this.xml)) return;
+		const rel = `<Relationship Id="${xmlAttr(id)}" Type="${IMAGE_REL_TYPE}" Target="${xmlAttr(target)}"/>`;
+		this.xml = this.xml.replace("</Relationships>", `${rel}</Relationships>`);
+		const numeric = id.match(/^rId(\d+)$/)?.[1];
+		if (numeric) this.nextId = Math.max(this.nextId, Number(numeric) + 1);
+		this.changed = true;
+	}
 	get result() {
 		return {
 			xml: this.xml,
@@ -263,9 +481,23 @@ function withHyperlinkRelationships(xml, hyperlinks, addRelationship) {
 		return `<a:rPr${attrs}>${body}<a:hlinkClick r:id="${addRelationship(href)}"/></a:rPr>`;
 	});
 }
+function findSlideHandle(source, slidePath) {
+	return source.slides.find((slide) => slide.partPath === slidePath)?.handle;
+}
+function findMediaPart(source, partPath) {
+	const media = source.packageGraph.media.find((part) => part.partPath === partPath);
+	if (!media) throw new Error(`addPicture media part was not found: ${partPath}`);
+	return media;
+}
+function findSlideImageTarget(source, slidePath, relationshipId) {
+	const relationship = source.packageGraph.relationships.find((group) => group.sourcePartPath === slidePath)?.relationships.find((candidate) => candidate.id === relationshipId);
+	if (!relationship) throw new Error(`addPicture relationship was not found: ${relationshipId}`);
+	return relationship.target;
+}
 function applyGlimpseTextBoxesToXml(xml, registry, addRelationship) {
 	let result = xml;
 	for (const entry of registry.entries) {
+		if (entry.kind !== "shape") continue;
 		const re = new RegExp(`<p:sp><p:nvSpPr><p:cNvPr id="([^"]+)" name="${escapeRegExp(entry.marker)}"[\\s\\S]*?</p:sp>`, "g");
 		result = result.replace(re, (_match, id) => {
 			return withHyperlinkRelationships(replaceShapeId(entry.xml, id, entry.name), entry.hyperlinks, addRelationship);
@@ -273,8 +505,66 @@ function applyGlimpseTextBoxesToXml(xml, registry, addRelationship) {
 	}
 	return result;
 }
+function applySlideBackgroundGradientsToXml(xml, registry, slidePath) {
+	let result = xml;
+	const slideNumber = Number(slidePath.match(/slide(\d+)\.xml$/)?.[1]);
+	for (const entry of registry.entries) {
+		if (entry.kind !== "slideBackground") continue;
+		if (entry.slideNumber !== slideNumber) continue;
+		const target = `<p:bgPr><a:solidFill><a:srgbClr val="${entry.marker}"/></a:solidFill></p:bgPr>`;
+		result = result.replace(target, `<p:bgPr>${entry.xml}</p:bgPr>`);
+	}
+	return result;
+}
+function withPptxGenPictureSizingXml(xml, hasSizing) {
+	if (!hasSizing) return xml;
+	return xml.replace("<a:stretch><a:fillRect/></a:stretch>", "<a:stretch/>");
+}
+function applyGlimpsePicturesToXml(xml, registry, source, slidePath, relationshipEditor, addMedia) {
+	let result = xml;
+	let editedSource = source;
+	for (const entry of registry.entries) {
+		if (entry.kind !== "picture") continue;
+		const re = new RegExp(`<p:sp><p:nvSpPr><p:cNvPr id="([^"]+)" name="${escapeRegExp(entry.marker)}"[\\s\\S]*?</p:sp>`, "g");
+		result = result.replace(re, (_match, id) => {
+			const slideHandle = findSlideHandle(editedSource, slidePath);
+			if (!slideHandle) throw new Error(`slide handle was not found: ${slidePath}`);
+			editedSource = addPicture(editedSource, slideHandle, entry.input);
+			const edit = editedSource.edits?.at(-1);
+			if (edit?.kind !== "addPicture") throw new Error("addPicture did not produce an addPicture edit");
+			addMedia(findMediaPart(editedSource, edit.mediaPartPath));
+			relationshipEditor.addImageRelationship(edit.relationshipId, findSlideImageTarget(editedSource, slidePath, edit.relationshipId));
+			return withShadow(withPptxGenPictureSizingXml(replaceShapeId(edit.xml, id, entry.name), entry.input.crop !== void 0), entry.shadow);
+		});
+	}
+	return {
+		xml: result,
+		source: editedSource
+	};
+}
+function ensureContentTypeDefault(xml, extension, contentType) {
+	if (new RegExp(`<Default\\s+[^>]*Extension="${escapeRegExp(extension)}"[^>]*/>`).test(xml)) return xml;
+	const entry = `<Default Extension="${xmlAttr(extension)}" ContentType="${xmlAttr(contentType)}"/>`;
+	return xml.replace("</Types>", `${entry}</Types>`);
+}
+async function applyGlimpseMediaParts(zip, mediaParts) {
+	const mediaList = Array.from(mediaParts);
+	if (mediaList.length === 0) return;
+	const contentTypesFile = zip.file("[Content_Types].xml");
+	if (!contentTypesFile) throw new Error("[Content_Types].xml was not found in pptx output");
+	let contentTypesXml = await contentTypesFile.async("text");
+	for (const media of mediaList) {
+		zip.file(media.partPath, media.bytes);
+		const extension = media.partPath.split(".").at(-1);
+		if (!extension) continue;
+		contentTypesXml = ensureContentTypeDefault(contentTypesXml, extension, media.contentType);
+	}
+	zip.file("[Content_Types].xml", contentTypesXml);
+}
 async function applyGlimpseTextBoxes(data, registry) {
 	const zip = await (await loadJSZip()).loadAsync(data);
+	let source = registry.entries.some((entry) => entry.kind === "picture") ? readPptx(data instanceof Uint8Array ? data : new Uint8Array(data)) : void 0;
+	const addedMedia = /* @__PURE__ */ new Map();
 	const slidePaths = Object.keys(zip.files).filter((path) => /^ppt\/slides\/slide\d+\.xml$/.test(path));
 	for (const path of slidePaths) {
 		const file = zip.file(path);
@@ -283,11 +573,20 @@ async function applyGlimpseTextBoxes(data, registry) {
 		const relsPath = slideRelsPath(path);
 		const relsFile = zip.file(relsPath);
 		const relationshipEditor = createRelationshipEditor(relsFile ? await relsFile.async("text") : void 0);
-		const replaced = applyGlimpseTextBoxesToXml(original, registry, (href) => relationshipEditor.addHyperlink(href));
+		const withSlideBackground = applySlideBackgroundGradientsToXml(original, registry, path);
+		const pictureResult = source ? applyGlimpsePicturesToXml(withSlideBackground, registry, source, path, relationshipEditor, (media) => {
+			addedMedia.set(media.partPath, media);
+		}) : {
+			xml: withSlideBackground,
+			source
+		};
+		source = pictureResult.source;
+		const replaced = applyGlimpseTextBoxesToXml(pictureResult.xml, registry, (href) => relationshipEditor.addHyperlink(href));
 		if (replaced !== original) zip.file(path, replaced);
 		const relationships = relationshipEditor.result;
 		if (relationships.changed) zip.file(relsPath, relationships.xml);
 	}
+	await applyGlimpseMediaParts(zip, addedMedia.values());
 	return zip;
 }
 function patchPptxWriteForGlimpseTextBoxes(pptx, registry) {
@@ -342,6 +641,6 @@ function patchPptxWriteForGlimpseTextBoxes(pptx, registry) {
 	pptx.writeFile = patchedWriteFile;
 }
 //#endregion
-export { GlimpseTextBoxRegistry, patchPptxWriteForGlimpseTextBoxes };
+export { GlimpseTextBoxRegistry, cleanHex, patchPptxWriteForGlimpseTextBoxes, toColorInput };
 
 //# sourceMappingURL=glimpseTextBoxes.js.map