@hirokisakabe/pom 9.1.2 → 10.0.0

package/dist/renderPptx/renderPptx.js

@@ -1,16 +1,16 @@
 import { getImageData } from "../shared/measureImage.js";
 import { resolveBoxSpacing } from "../shared/boxSpacing.js";
 import { getNodeDef } from "../registry/nodeRegistry.js";
-import { pxToIn, pxToPt } from "./units.js";
-import { convertStrike, convertUnderline } from "./textOptions.js";
+import { pxToEmu, pxToPt } from "./units.js";
+import { toColorInput } from "./pptxAuthoring.js";
+import { createGlimpseRunProperties } from "./utils/glimpseTextBox.js";
+import { imageBytesFromSource } from "./utils/glimpsePicture.js";
+import { createShapeBoundsInput, noneShapeFill, shapeOutline, solidShapeFill } from "./utils/glimpseShape.js";
 import "../registry/index.js";
 import { renderBackgroundAndBorder, renderBorderOnly } from "./utils/backgroundBorder.js";
+import { createWritablePptx } from "./writablePptx.js";
+import { addEmptySlideFromLayout, addSlideNumber, asEmu, asPt, createPptx } from "@pptx-glimpse/document";
 //#region src/renderPptx/renderPptx.ts
-async function loadPptxGenJS() {
-	const mod = await import("pptxgenjs");
-	return mod.default?.default ?? mod.default ?? mod;
-}
-const DEFAULT_MASTER_NAME = "POM_MASTER";
 function buildIdPositionMap(node, diagnostics) {
 	const map = /* @__PURE__ */ new Map();
 	function traverse(n) {
@@ -34,130 +34,163 @@ function sortByZIndex(children) {
 	if (children.every((c) => c.zIndex === void 0)) return children;
 	return [...children].sort((a, b) => (a.zIndex ?? 0) - (b.zIndex ?? 0));
 }
-/**
-* MasterObject を pptxgenjs の objects 形式に変換する
-*/
-function convertMasterObject(obj) {
-	switch (obj.type) {
-		case "text": return { text: {
-			text: obj.text,
-			options: {
-				x: pxToIn(obj.x),
-				y: pxToIn(obj.y),
-				w: pxToIn(obj.w),
-				h: pxToIn(obj.h),
-				fontSize: obj.fontSize ? pxToPt(obj.fontSize) : void 0,
-				fontFace: obj.fontFamily,
-				color: obj.color,
-				bold: obj.bold,
-				italic: obj.italic,
-				underline: convertUnderline(obj.underline),
-				strike: convertStrike(obj.strike),
-				highlight: obj.highlight,
-				align: obj.textAlign
-			}
-		} };
-		case "image": {
-			const imageProps = {
-				x: pxToIn(obj.x),
-				y: pxToIn(obj.y),
-				w: pxToIn(obj.w),
-				h: pxToIn(obj.h)
-			};
-			if (obj.src.startsWith("data:")) imageProps.data = obj.src;
-			else imageProps.path = obj.src;
-			return { image: imageProps };
-		}
-		case "rect": return { rect: {
-			x: pxToIn(obj.x),
-			y: pxToIn(obj.y),
-			w: pxToIn(obj.w),
-			h: pxToIn(obj.h),
-			fill: obj.fill ? {
-				color: obj.fill.color,
-				transparency: obj.fill.transparency
-			} : void 0,
-			line: obj.border ? {
-				color: obj.border.color,
-				width: obj.border.width,
-				dashType: obj.border.dashType
-			} : void 0
-		} };
-		case "line": return { line: {
-			x: pxToIn(obj.x),
-			y: pxToIn(obj.y),
-			w: pxToIn(obj.w),
-			h: pxToIn(obj.h),
-			line: obj.line ? {
-				color: obj.line.color,
-				width: obj.line.width,
-				dashType: obj.line.dashType
-			} : {
-				color: "000000",
-				width: 1
-			}
-		} };
-	}
+function masterBackground(master, buildContext) {
+	const background = master?.background;
+	if (!background) return void 0;
+	if ("color" in background) return {
+		kind: "solid",
+		color: toColorInput(background.color)
+	};
+	if ("data" in background) return {
+		kind: "image",
+		bytes: imageBytesFromSource("", background.data)
+	};
+	const src = "path" in background ? background.path : background.image;
+	return {
+		kind: "image",
+		bytes: imageBytesFromSource(src, getImageData(src, buildContext.imageDataCache))
+	};
 }
-/**
-* SlideMasterOptions から pptxgenjs の defineSlideMaster を呼び出す
-*/
-function defineSlideMasterFromOptions(pptx, master) {
-	const masterName = master.title || DEFAULT_MASTER_NAME;
-	const masterProps = { title: masterName };
-	if (master.background) {
-		if ("color" in master.background) masterProps.background = { color: master.background.color };
-		else if ("path" in master.background) masterProps.background = { path: master.background.path };
-		else if ("data" in master.background) masterProps.background = { data: master.background.data };
-		else if ("image" in master.background) masterProps.background = { path: master.background.image };
+function masterBounds(obj) {
+	return createShapeBoundsInput(obj);
+}
+function masterTextRunProperties(obj) {
+	const properties = createGlimpseRunProperties({
+		fontSize: obj.fontSize,
+		fontFace: obj.fontFamily,
+		color: obj.color,
+		bold: obj.bold,
+		italic: obj.italic,
+		underline: obj.underline,
+		strike: obj.strike,
+		highlight: obj.highlight
+	});
+	return {
+		...properties,
+		fontFace: obj.fontFamily === void 0 ? void 0 : properties.fontFace,
+		fontSize: obj.fontSize === void 0 ? void 0 : properties.fontSize
+	};
+}
+function addMasterContent(buildContext, master) {
+	const target = buildContext.pptxAuthoring.source.slideMasters[0]?.handle;
+	if (!target) throw new Error("createPptx did not create a slide master handle");
+	buildContext.pptxAuthoring.selectSlide(target);
+	for (const obj of master.objects ?? []) switch (obj.type) {
+		case "text":
+			buildContext.pptxAuthoring.registerTextBox({
+				...masterBounds(obj),
+				body: {
+					anchor: "middle",
+					marginLeft: asEmu(91440),
+					marginRight: asEmu(91440),
+					marginTop: asEmu(91440),
+					marginBottom: asEmu(91440)
+				},
+				paragraphs: [{
+					properties: {
+						align: obj.textAlign,
+						marginLeft: asEmu(0),
+						indent: asEmu(0),
+						bullet: { type: "none" }
+					},
+					runs: [{
+						text: obj.text,
+						properties: masterTextRunProperties(obj)
+					}]
+				}]
+			});
+			break;
+		case "image":
+			buildContext.pptxAuthoring.registerPicture({
+				...masterBounds(obj),
+				bytes: imageBytesFromSource(obj.src, getImageData(obj.src, buildContext.imageDataCache))
+			});
+			break;
+		case "rect":
+			buildContext.pptxAuthoring.registerShape({
+				...masterBounds(obj),
+				geometry: {
+					kind: "preset",
+					preset: "rect"
+				},
+				fill: obj.fill ? solidShapeFill(obj.fill.color ?? "FFFFFF") : noneShapeFill(),
+				outline: obj.border ? shapeOutline(obj.border) : void 0
+			}, {
+				fillColor: obj.fill?.color,
+				fillOpacity: obj.fill?.transparency === void 0 ? void 0 : 1 - obj.fill.transparency / 100
+			});
+			break;
+		case "line":
+			buildContext.pptxAuthoring.registerShape({
+				...masterBounds(obj),
+				geometry: {
+					kind: "preset",
+					preset: "line"
+				},
+				fill: noneShapeFill(),
+				outline: shapeOutline(obj.line ?? {
+					color: "000000",
+					width: 1
+				})
+			});
+			break;
 	}
-	if (master.margin !== void 0) {
-		const margin = resolveBoxSpacing(master.margin);
-		masterProps.margin = [
-			pxToIn(margin.top),
-			pxToIn(margin.right),
-			pxToIn(margin.bottom),
-			pxToIn(margin.left)
-		];
+	if (master.slideNumber) {
+		const value = master.slideNumber;
+		buildContext.pptxAuthoring.replaceSource(addSlideNumber(buildContext.pptxAuthoring.source, target, {
+			offsetX: asEmu(Math.round(pxToEmu(value.x))),
+			offsetY: asEmu(Math.round(pxToEmu(value.y))),
+			width: value.w === void 0 ? asEmu(8e5) : asEmu(Math.round(pxToEmu(value.w))),
+			height: value.h === void 0 ? asEmu(3e5) : asEmu(Math.round(pxToEmu(value.h))),
+			properties: {
+				fontFace: value.fontFamily,
+				fontSize: value.fontSize ? asPt(pxToPt(value.fontSize)) : void 0,
+				color: toColorInput(value.color)
+			}
+		}));
 	}
-	if (master.objects && master.objects.length > 0) masterProps.objects = master.objects.map((obj) => convertMasterObject(obj));
-	if (master.slideNumber) masterProps.slideNumber = {
-		x: pxToIn(master.slideNumber.x),
-		y: pxToIn(master.slideNumber.y),
-		w: master.slideNumber.w ? pxToIn(master.slideNumber.w) : void 0,
-		h: master.slideNumber.h ? pxToIn(master.slideNumber.h) : void 0,
-		fontSize: master.slideNumber.fontSize ? pxToPt(master.slideNumber.fontSize) : void 0,
-		fontFace: master.slideNumber.fontFamily,
-		color: master.slideNumber.color
-	};
-	pptx.defineSlideMaster(masterProps);
-	return masterName;
 }
 /**
-* PositionedNode ツリーを PptxGenJS スライドに変換する
+* PositionedNode ツリーを glimpse の PPTX source model に変換する
 * @param pages PositionedNode ツリーの配列（各要素が1ページ）
 * @param slidePx スライド全体のサイズ（px）
 * @param master スライドマスターオプション（省略可能）
-* @returns PptxGenJS インスタンス
+* @returns PPTX の write / writeFile / stream 互換 facade
 */
-async function renderPptx(pages, slidePx, buildContext, master) {
-	const slideIn = {
-		w: pxToIn(slidePx.w),
-		h: pxToIn(slidePx.h)
-	};
-	const pptx = new (await (loadPptxGenJS()))();
-	pptx.defineLayout({
-		name: "custom",
-		width: slideIn.w,
-		height: slideIn.h
+function renderPptx(pages, slidePx, buildContext, master) {
+	const margin = master?.margin === void 0 ? void 0 : resolveBoxSpacing(master.margin);
+	let source = createPptx({
+		slideSize: {
+			width: asEmu(Math.round(pxToEmu(slidePx.w))),
+			height: asEmu(Math.round(pxToEmu(slidePx.h)))
+		},
+		slideMaster: {
+			name: master?.title ?? "POM_MASTER",
+			background: masterBackground(master, buildContext)
+		},
+		slideLayout: {
+			name: "POM_LAYOUT",
+			margin: margin ? {
+				top: asEmu(Math.round(pxToEmu(margin.top))),
+				right: asEmu(Math.round(pxToEmu(margin.right))),
+				bottom: asEmu(Math.round(pxToEmu(margin.bottom))),
+				left: asEmu(Math.round(pxToEmu(margin.left)))
+			} : void 0
+		}
 	});
-	pptx.layout = "custom";
-	const masterName = master ? defineSlideMasterFromOptions(pptx, master) : void 0;
+	buildContext.pptxAuthoring.initialize(source, margin !== void 0);
+	if (master) addMasterContent(buildContext, master);
 	for (const [pageIndex, data] of pages.entries()) {
-		const slide = masterName ? pptx.addSlide({ masterName }) : pptx.addSlide();
+		if (pageIndex > 0) {
+			const layoutPartPath = buildContext.pptxAuthoring.source.slideLayouts[0]?.partPath;
+			if (!layoutPartPath) throw new Error("createPptx did not create a slide layout");
+			source = addEmptySlideFromLayout(buildContext.pptxAuthoring.source, { layoutPartPath });
+			buildContext.pptxAuthoring.replaceSource(source);
+		}
+		const slideHandle = buildContext.pptxAuthoring.source.slides[pageIndex]?.handle;
+		if (!slideHandle) throw new Error(`slide handle was not found: ${pageIndex + 1}`);
+		buildContext.pptxAuthoring.selectSlide(slideHandle);
 		const ctx = {
-			slide,
-			pptx,
 			buildContext,
 			idPositionMap: buildIdPositionMap(data, buildContext.diagnostics)
 		};
@@ -165,21 +198,19 @@ async function renderPptx(pages, slidePx, buildContext, master) {
 		const rootBackgroundColor = !isLinelike ? data.backgroundColor : void 0;
 		const rootBackgroundGradient = !isLinelike ? data.backgroundGradient : void 0;
 		const rootHasOpacity = !isLinelike && "opacity" in data && data.opacity !== void 0;
-		const rootGradientMarker = rootBackgroundGradient && !rootHasOpacity ? buildContext.glimpseTextBoxes.registerSlideBackgroundGradient(rootBackgroundGradient, pageIndex + 1) : void 0;
-		if (rootGradientMarker) slide.background = { color: rootGradientMarker };
-		else if (rootBackgroundColor && !rootBackgroundGradient && !rootHasOpacity) slide.background = { color: rootBackgroundColor };
+		const rootGradientApplied = rootBackgroundGradient && !rootHasOpacity ? buildContext.pptxAuthoring.setSlideBackgroundGradient(rootBackgroundGradient) : false;
+		if (!rootGradientApplied && rootBackgroundColor && !rootBackgroundGradient && !rootHasOpacity) buildContext.pptxAuthoring.setSlideBackgroundSolid(rootBackgroundColor);
 		const rootBackgroundImage = !isLinelike ? data.backgroundImage : void 0;
 		if (rootBackgroundImage) {
 			const cachedData = getImageData(rootBackgroundImage.src, buildContext.imageDataCache);
-			if (cachedData) slide.background = { data: cachedData };
-			else slide.background = { path: rootBackgroundImage.src };
+			buildContext.pptxAuthoring.setSlideBackgroundImage(imageBytesFromSource(rootBackgroundImage.src, cachedData));
 		}
 		/**
 		* node をスライドにレンダリングする
 		* @param isRoot ルートノードかどうか（ルートノードの background は slide.background で処理済み）
 		*/
 		function renderNode(node, isRoot = false) {
-			if (node.type !== "line" && node.type !== "arrow") if (isRoot && (rootBackgroundImage || (rootBackgroundColor || rootGradientMarker) && !rootHasOpacity)) renderBorderOnly(node, ctx);
+			if (node.type !== "line" && node.type !== "arrow") if (isRoot && (rootBackgroundImage || (rootBackgroundColor || rootGradientApplied) && !rootHasOpacity)) renderBorderOnly(node, ctx);
 			else renderBackgroundAndBorder(node, ctx);
 			const def = getNodeDef(node.type);
 			switch (def.category) {
@@ -197,7 +228,7 @@ async function renderPptx(pages, slidePx, buildContext, master) {
 		}
 		renderNode(data, true);
 	}
-	return pptx;
+	return createWritablePptx(() => buildContext.pptxAuthoring.source);
 }
 //#endregion
 export { renderPptx };

package/dist/renderPptx/renderPptx.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderPptx.js","names":[],"sources":["../../src/renderPptx/renderPptx.ts"],"sourcesContent":["// pptxgenjs の型定義\ntype PptxGenJSInstance = import(\"pptxgenjs\").default;\n\n// pptxgenjs は CJS パッケージのため動的 import で読み込む\nasync function loadPptxGenJS(): Promise<new () => PptxGenJSInstance> {\n  const pptxModule = await import(\"pptxgenjs\");\n  // CJS default export の解決: module.default.default (ESM wrapper) または module.default\n  /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return */\n  const mod = pptxModule as any;\n  return mod.default?.default ?? mod.default ?? mod;\n  /* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return */\n}\ntype SlideMasterProps = Parameters<PptxGenJSInstance[\"defineSlideMaster\"]>[0];\ntype ImageProps = {\n  x: number;\n  y: number;\n  w: number;\n  h: number;\n  path?: string;\n  data?: string;\n};\nimport type {\n  PositionedNode,\n  SlideMasterOptions,\n  MasterObject,\n} from \"../types.ts\";\nimport type { BuildContext } from \"../buildContext.ts\";\nimport type { RenderContext, NodeBounds } from \"./types.ts\";\nimport { pxToIn, pxToPt } from \"./units.ts\";\nimport { convertUnderline, convertStrike } from \"./textOptions.ts\";\nimport { getImageData } from \"../shared/measureImage.ts\";\nimport { resolveBoxSpacing } from \"../shared/boxSpacing.ts\";\nimport {\n  renderBackgroundAndBorder,\n  renderBorderOnly,\n} from \"./utils/backgroundBorder.ts\";\nimport { getNodeDef } from \"../registry/index.ts\";\n\ntype SlidePx = { w: number; h: number };\n\nconst DEFAULT_MASTER_NAME = \"POM_MASTER\";\n\nfunction buildIdPositionMap(\n  node: PositionedNode,\n  diagnostics: import(\"../buildContext.ts\").BuildContext[\"diagnostics\"],\n): Map<string, NodeBounds> {\n  const map = new Map<string, NodeBounds>();\n\n  function traverse(n: PositionedNode) {\n    if (n.id) {\n      if (map.has(n.id)) {\n        diagnostics.add(\n          \"DUPLICATE_NODE_ID\",\n          `Duplicate node id \"${n.id}\" — only the first occurrence will be used for Arrow references`,\n        );\n      } else {\n        map.set(n.id, { x: n.x, y: n.y, w: n.w, h: n.h });\n      }\n    }\n    if (n.type === \"vstack\" || n.type === \"hstack\" || n.type === \"layer\") {\n      for (const child of n.children) {\n        traverse(child);\n      }\n    }\n  }\n\n  traverse(node);\n  return map;\n}\n\n/**\n * zIndex でソートして描画順を制御する（安定ソート）\n * zIndex が小さいノードが先に描画される（PowerPoint は追加順に重ねるため）\n */\nfunction sortByZIndex<T extends { zIndex?: number }>(children: T[]): T[] {\n  // すべての子要素に zIndex が未設定の場合はそのまま返す\n  if (children.every((c) => c.zIndex === undefined)) return children;\n  return [...children].sort((a, b) => (a.zIndex ?? 0) - (b.zIndex ?? 0));\n}\n\n/**\n * MasterObject を pptxgenjs の objects 形式に変換する\n */\nfunction convertMasterObject(\n  obj: MasterObject,\n): SlideMasterProps[\"objects\"] extends (infer T)[] | undefined ? T : never {\n  switch (obj.type) {\n    case \"text\":\n      return {\n        text: {\n          text: obj.text,\n          options: {\n            x: pxToIn(obj.x),\n            y: pxToIn(obj.y),\n            w: pxToIn(obj.w),\n            h: pxToIn(obj.h),\n            fontSize: obj.fontSize ? pxToPt(obj.fontSize) : undefined,\n            fontFace: obj.fontFamily,\n            color: obj.color,\n            bold: obj.bold,\n            italic: obj.italic,\n            underline: convertUnderline(obj.underline),\n            strike: convertStrike(obj.strike),\n            highlight: obj.highlight,\n            align: obj.textAlign,\n          },\n        },\n      };\n    case \"image\": {\n      const imageProps: ImageProps = {\n        x: pxToIn(obj.x),\n        y: pxToIn(obj.y),\n        w: pxToIn(obj.w),\n        h: pxToIn(obj.h),\n      };\n      // src が data URI かパスかを判定\n      if (obj.src.startsWith(\"data:\")) {\n        imageProps.data = obj.src;\n      } else {\n        imageProps.path = obj.src;\n      }\n      return { image: imageProps };\n    }\n    case \"rect\":\n      return {\n        rect: {\n          x: pxToIn(obj.x),\n          y: pxToIn(obj.y),\n          w: pxToIn(obj.w),\n          h: pxToIn(obj.h),\n          fill: obj.fill\n            ? { color: obj.fill.color, transparency: obj.fill.transparency }\n            : undefined,\n          line: obj.border\n            ? {\n                color: obj.border.color,\n                width: obj.border.width,\n                dashType: obj.border.dashType,\n              }\n            : undefined,\n        },\n      };\n    case \"line\":\n      return {\n        line: {\n          x: pxToIn(obj.x),\n          y: pxToIn(obj.y),\n          w: pxToIn(obj.w),\n          h: pxToIn(obj.h),\n          line: obj.line\n            ? {\n                color: obj.line.color,\n                width: obj.line.width,\n                dashType: obj.line.dashType,\n              }\n            : { color: \"000000\", width: 1 },\n        },\n      };\n  }\n}\n\n/**\n * SlideMasterOptions から pptxgenjs の defineSlideMaster を呼び出す\n */\nfunction defineSlideMasterFromOptions(\n  pptx: PptxGenJSInstance,\n  master: SlideMasterOptions,\n): string {\n  const masterName = master.title || DEFAULT_MASTER_NAME;\n\n  const masterProps: SlideMasterProps = {\n    title: masterName,\n  };\n\n  // background の変換\n  if (master.background) {\n    if (\"color\" in master.background) {\n      masterProps.background = { color: master.background.color };\n    } else if (\"path\" in master.background) {\n      masterProps.background = { path: master.background.path };\n    } else if (\"data\" in master.background) {\n      masterProps.background = { data: master.background.data };\n    } else if (\"image\" in master.background) {\n      masterProps.background = { path: master.background.image };\n    }\n  }\n\n  // margin の変換 (px -> inches)\n  if (master.margin !== undefined) {\n    const margin = resolveBoxSpacing(master.margin);\n    masterProps.margin = [\n      pxToIn(margin.top),\n      pxToIn(margin.right),\n      pxToIn(margin.bottom),\n      pxToIn(margin.left),\n    ];\n  }\n\n  // objects の変換\n  if (master.objects && master.objects.length > 0) {\n    masterProps.objects = master.objects.map((obj) => convertMasterObject(obj));\n  }\n\n  // slideNumber の変換\n  if (master.slideNumber) {\n    masterProps.slideNumber = {\n      x: pxToIn(master.slideNumber.x),\n      y: pxToIn(master.slideNumber.y),\n      w: master.slideNumber.w ? pxToIn(master.slideNumber.w) : undefined,\n      h: master.slideNumber.h ? pxToIn(master.slideNumber.h) : undefined,\n      fontSize: master.slideNumber.fontSize\n        ? pxToPt(master.slideNumber.fontSize)\n        : undefined,\n      fontFace: master.slideNumber.fontFamily,\n      color: master.slideNumber.color,\n    };\n  }\n\n  pptx.defineSlideMaster(masterProps);\n  return masterName;\n}\n\n/**\n * PositionedNode ツリーを PptxGenJS スライドに変換する\n * @param pages PositionedNode ツリーの配列（各要素が1ページ）\n * @param slidePx スライド全体のサイズ（px）\n * @param master スライドマスターオプション（省略可能）\n * @returns PptxGenJS インスタンス\n */\nexport async function renderPptx(\n  pages: PositionedNode[],\n  slidePx: SlidePx,\n  buildContext: BuildContext,\n  master?: SlideMasterOptions,\n) {\n  const slideIn = { w: pxToIn(slidePx.w), h: pxToIn(slidePx.h) }; // layout(=px) → PptxGenJS(=inch) への最終変換\n\n  const PptxGenJS = await loadPptxGenJS();\n  const pptx = new PptxGenJS();\n\n  pptx.defineLayout({ name: \"custom\", width: slideIn.w, height: slideIn.h });\n  pptx.layout = \"custom\";\n\n  // マスターが指定されている場合、defineSlideMaster を呼び出す\n  const masterName = master\n    ? defineSlideMasterFromOptions(pptx, master)\n    : undefined;\n\n  for (const [pageIndex, data] of pages.entries()) {\n    // マスターが指定されている場合は masterName を使用\n    const slide = masterName ? pptx.addSlide({ masterName }) : pptx.addSlide();\n    const idPositionMap = buildIdPositionMap(data, buildContext.diagnostics);\n    const ctx: RenderContext = { slide, pptx, buildContext, idPositionMap };\n\n    // ルートノードの backgroundColor はスライドの background プロパティとして適用\n    // これにより、マスタースライドのオブジェクトを覆い隠さない\n    // line/arrow ノードは backgroundColor を持たないためスキップ\n    // ただし opacity が指定されている場合は slide.background では透過を表現できないため、\n    // renderBackgroundAndBorder で描画する\n    const isLinelike = data.type === \"line\" || data.type === \"arrow\";\n    const rootBackgroundColor = !isLinelike ? data.backgroundColor : undefined;\n    const rootBackgroundGradient = !isLinelike\n      ? data.backgroundGradient\n      : undefined;\n    const rootHasOpacity =\n      !isLinelike && \"opacity\" in data && data.opacity !== undefined;\n    const rootGradientMarker =\n      rootBackgroundGradient && !rootHasOpacity\n        ? buildContext.glimpseTextBoxes.registerSlideBackgroundGradient(\n            rootBackgroundGradient,\n            pageIndex + 1,\n          )\n        : undefined;\n    if (rootGradientMarker) {\n      slide.background = { color: rootGradientMarker };\n    } else if (\n      rootBackgroundColor &&\n      !rootBackgroundGradient &&\n      !rootHasOpacity\n    ) {\n      slide.background = { color: rootBackgroundColor };\n    }\n\n    // ルートノードの backgroundImage はスライドの background プロパティとして適用\n    // backgroundColor と backgroundImage の両方がある場合、backgroundImage が優先\n    const rootBackgroundImage = !isLinelike ? data.backgroundImage : undefined;\n    if (rootBackgroundImage) {\n      const cachedData = getImageData(\n        rootBackgroundImage.src,\n        buildContext.imageDataCache,\n      );\n      if (cachedData) {\n        slide.background = { data: cachedData };\n      } else {\n        slide.background = { path: rootBackgroundImage.src };\n      }\n    }\n\n    /**\n     * node をスライドにレンダリングする\n     * @param isRoot ルートノードかどうか（ルートノードの background は slide.background で処理済み）\n     */\n    function renderNode(node: PositionedNode, isRoot = false) {\n      // line/arrow ノードは backgroundColor/border を持たないため、background/border の描画をスキップ\n      if (node.type !== \"line\" && node.type !== \"arrow\") {\n        // ルートノードの backgroundColor/backgroundImage は既に slide.background に適用済みなのでスキップ\n        // ただし opacity がある場合は slide.background では透過を表現できないため通常描画\n        if (\n          isRoot &&\n          (rootBackgroundImage ||\n            ((rootBackgroundColor || rootGradientMarker) && !rootHasOpacity))\n        ) {\n          // border のみ描画（backgroundColor/backgroundImage はスキップ）\n          renderBorderOnly(node, ctx);\n        } else {\n          renderBackgroundAndBorder(node, ctx);\n        }\n      }\n\n      const def = getNodeDef(node.type);\n\n      switch (def.category) {\n        case \"leaf\":\n          if (!def.render) {\n            throw new Error(\n              `No render function registered for leaf node: ${node.type}`,\n            );\n          }\n          def.render(node, ctx);\n          break;\n\n        case \"multi-child\":\n        case \"absolute-child\": {\n          const containerNode = node as Extract<\n            PositionedNode,\n            { type: \"vstack\" | \"hstack\" | \"layer\" }\n          >;\n          // zIndex でソートして描画順を制御（値が小さいものが先に描画される）\n          for (const child of sortByZIndex(containerNode.children)) {\n            renderNode(child);\n          }\n          break;\n        }\n      }\n    }\n\n    renderNode(data, true); // ルートノードとして処理\n  }\n\n  return pptx;\n}\n"],"mappings":"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"}
+{"version":3,"file":"renderPptx.js","names":[],"sources":["../../src/renderPptx/renderPptx.ts"],"sourcesContent":["import {\n  addEmptySlideFromLayout,\n  addSlideNumber,\n  asEmu,\n  asPt,\n  createPptx,\n  type AddTextBoxRunPropertiesInput,\n  type CreatePptxBackground,\n} from \"@pptx-glimpse/document\";\nimport type { PositionedNode, SlideMasterOptions } from \"../types.ts\";\nimport type { BuildContext } from \"../buildContext.ts\";\nimport type { RenderContext, NodeBounds } from \"./types.ts\";\nimport { pxToEmu, pxToPt } from \"./units.ts\";\nimport { getImageData } from \"../shared/measureImage.ts\";\nimport { resolveBoxSpacing } from \"../shared/boxSpacing.ts\";\nimport {\n  renderBackgroundAndBorder,\n  renderBorderOnly,\n} from \"./utils/backgroundBorder.ts\";\nimport { getNodeDef } from \"../registry/index.ts\";\nimport { toColorInput } from \"./pptxAuthoring.ts\";\nimport { createGlimpseRunProperties } from \"./utils/glimpseTextBox.ts\";\nimport {\n  createShapeBoundsInput,\n  noneShapeFill,\n  shapeOutline,\n  solidShapeFill,\n} from \"./utils/glimpseShape.ts\";\nimport { imageBytesFromSource } from \"./utils/glimpsePicture.ts\";\nimport { createWritablePptx } from \"./writablePptx.ts\";\n\ntype SlidePx = { w: number; h: number };\n\nfunction buildIdPositionMap(\n  node: PositionedNode,\n  diagnostics: import(\"../buildContext.ts\").BuildContext[\"diagnostics\"],\n): Map<string, NodeBounds> {\n  const map = new Map<string, NodeBounds>();\n\n  function traverse(n: PositionedNode) {\n    if (n.id) {\n      if (map.has(n.id)) {\n        diagnostics.add(\n          \"DUPLICATE_NODE_ID\",\n          `Duplicate node id \"${n.id}\" — only the first occurrence will be used for Arrow references`,\n        );\n      } else {\n        map.set(n.id, { x: n.x, y: n.y, w: n.w, h: n.h });\n      }\n    }\n    if (n.type === \"vstack\" || n.type === \"hstack\" || n.type === \"layer\") {\n      for (const child of n.children) {\n        traverse(child);\n      }\n    }\n  }\n\n  traverse(node);\n  return map;\n}\n\n/**\n * zIndex でソートして描画順を制御する（安定ソート）\n * zIndex が小さいノードが先に描画される（PowerPoint は追加順に重ねるため）\n */\nfunction sortByZIndex<T extends { zIndex?: number }>(children: T[]): T[] {\n  // すべての子要素に zIndex が未設定の場合はそのまま返す\n  if (children.every((c) => c.zIndex === undefined)) return children;\n  return [...children].sort((a, b) => (a.zIndex ?? 0) - (b.zIndex ?? 0));\n}\n\nfunction masterBackground(\n  master: SlideMasterOptions | undefined,\n  buildContext: BuildContext,\n): CreatePptxBackground | undefined {\n  const background = master?.background;\n  if (!background) return undefined;\n  if (\"color\" in background) {\n    return { kind: \"solid\", color: toColorInput(background.color)! };\n  }\n  if (\"data\" in background) {\n    return { kind: \"image\", bytes: imageBytesFromSource(\"\", background.data) };\n  }\n  const src = \"path\" in background ? background.path : background.image;\n  return {\n    kind: \"image\",\n    bytes: imageBytesFromSource(\n      src,\n      getImageData(src, buildContext.imageDataCache),\n    ),\n  };\n}\n\nfunction masterBounds(obj: { x: number; y: number; w: number; h: number }) {\n  return createShapeBoundsInput(obj);\n}\n\nfunction masterTextRunProperties(\n  obj: Extract<\n    NonNullable<SlideMasterOptions[\"objects\"]>[number],\n    { type: \"text\" }\n  >,\n): AddTextBoxRunPropertiesInput {\n  const properties = createGlimpseRunProperties({\n    fontSize: obj.fontSize,\n    fontFace: obj.fontFamily,\n    color: obj.color,\n    bold: obj.bold,\n    italic: obj.italic,\n    underline: obj.underline,\n    strike: obj.strike,\n    highlight: obj.highlight,\n  });\n  return {\n    ...properties,\n    fontFace: obj.fontFamily === undefined ? undefined : properties.fontFace,\n    fontSize: obj.fontSize === undefined ? undefined : properties.fontSize,\n  };\n}\n\nfunction addMasterContent(\n  buildContext: BuildContext,\n  master: SlideMasterOptions,\n): void {\n  const target = buildContext.pptxAuthoring.source.slideMasters[0]?.handle;\n  if (!target)\n    throw new Error(\"createPptx did not create a slide master handle\");\n  buildContext.pptxAuthoring.selectSlide(target);\n  for (const obj of master.objects ?? []) {\n    switch (obj.type) {\n      case \"text\":\n        buildContext.pptxAuthoring.registerTextBox({\n          ...masterBounds(obj),\n          body: {\n            anchor: \"middle\",\n            marginLeft: asEmu(91440),\n            marginRight: asEmu(91440),\n            marginTop: asEmu(91440),\n            marginBottom: asEmu(91440),\n          },\n          paragraphs: [\n            {\n              properties: {\n                align: obj.textAlign,\n                marginLeft: asEmu(0),\n                indent: asEmu(0),\n                bullet: { type: \"none\" },\n              },\n              runs: [\n                {\n                  text: obj.text,\n                  properties: masterTextRunProperties(obj),\n                },\n              ],\n            },\n          ],\n        });\n        break;\n      case \"image\":\n        buildContext.pptxAuthoring.registerPicture({\n          ...masterBounds(obj),\n          bytes: imageBytesFromSource(\n            obj.src,\n            getImageData(obj.src, buildContext.imageDataCache),\n          ),\n        });\n        break;\n      case \"rect\":\n        buildContext.pptxAuthoring.registerShape(\n          {\n            ...masterBounds(obj),\n            geometry: { kind: \"preset\", preset: \"rect\" },\n            fill: obj.fill\n              ? solidShapeFill(obj.fill.color ?? \"FFFFFF\")\n              : noneShapeFill(),\n            outline: obj.border ? shapeOutline(obj.border) : undefined,\n          },\n          {\n            fillColor: obj.fill?.color,\n            fillOpacity:\n              obj.fill?.transparency === undefined\n                ? undefined\n                : 1 - obj.fill.transparency / 100,\n          },\n        );\n        break;\n      case \"line\":\n        buildContext.pptxAuthoring.registerShape({\n          ...masterBounds(obj),\n          geometry: { kind: \"preset\", preset: \"line\" },\n          fill: noneShapeFill(),\n          outline: shapeOutline(obj.line ?? { color: \"000000\", width: 1 }),\n        });\n        break;\n    }\n  }\n  if (master.slideNumber) {\n    const value = master.slideNumber;\n    buildContext.pptxAuthoring.replaceSource(\n      addSlideNumber(buildContext.pptxAuthoring.source, target, {\n        offsetX: asEmu(Math.round(pxToEmu(value.x))),\n        offsetY: asEmu(Math.round(pxToEmu(value.y))),\n        width:\n          value.w === undefined\n            ? asEmu(800000)\n            : asEmu(Math.round(pxToEmu(value.w))),\n        height:\n          value.h === undefined\n            ? asEmu(300000)\n            : asEmu(Math.round(pxToEmu(value.h))),\n        properties: {\n          fontFace: value.fontFamily,\n          fontSize: value.fontSize ? asPt(pxToPt(value.fontSize)) : undefined,\n          color: toColorInput(value.color),\n        },\n      }),\n    );\n  }\n}\n\n/**\n * PositionedNode ツリーを glimpse の PPTX source model に変換する\n * @param pages PositionedNode ツリーの配列（各要素が1ページ）\n * @param slidePx スライド全体のサイズ（px）\n * @param master スライドマスターオプション（省略可能）\n * @returns PPTX の write / writeFile / stream 互換 facade\n */\nexport function renderPptx(\n  pages: PositionedNode[],\n  slidePx: SlidePx,\n  buildContext: BuildContext,\n  master?: SlideMasterOptions,\n) {\n  const margin =\n    master?.margin === undefined ? undefined : resolveBoxSpacing(master.margin);\n  let source = createPptx({\n    slideSize: {\n      width: asEmu(Math.round(pxToEmu(slidePx.w))),\n      height: asEmu(Math.round(pxToEmu(slidePx.h))),\n    },\n    slideMaster: {\n      name: master?.title ?? \"POM_MASTER\",\n      background: masterBackground(master, buildContext),\n    },\n    slideLayout: {\n      name: \"POM_LAYOUT\",\n      margin: margin\n        ? {\n            top: asEmu(Math.round(pxToEmu(margin.top))),\n            right: asEmu(Math.round(pxToEmu(margin.right))),\n            bottom: asEmu(Math.round(pxToEmu(margin.bottom))),\n            left: asEmu(Math.round(pxToEmu(margin.left))),\n          }\n        : undefined,\n    },\n  });\n  buildContext.pptxAuthoring.initialize(source, margin !== undefined);\n  if (master) addMasterContent(buildContext, master);\n\n  for (const [pageIndex, data] of pages.entries()) {\n    if (pageIndex > 0) {\n      const layoutPartPath =\n        buildContext.pptxAuthoring.source.slideLayouts[0]?.partPath;\n      if (!layoutPartPath)\n        throw new Error(\"createPptx did not create a slide layout\");\n      source = addEmptySlideFromLayout(buildContext.pptxAuthoring.source, {\n        layoutPartPath,\n      });\n      buildContext.pptxAuthoring.replaceSource(source);\n    }\n    const slideHandle =\n      buildContext.pptxAuthoring.source.slides[pageIndex]?.handle;\n    if (!slideHandle)\n      throw new Error(`slide handle was not found: ${pageIndex + 1}`);\n    buildContext.pptxAuthoring.selectSlide(slideHandle);\n    const idPositionMap = buildIdPositionMap(data, buildContext.diagnostics);\n    const ctx: RenderContext = { buildContext, idPositionMap };\n\n    // ルートノードの backgroundColor はスライドの background プロパティとして適用\n    // これにより、マスタースライドのオブジェクトを覆い隠さない\n    // line/arrow ノードは backgroundColor を持たないためスキップ\n    // ただし opacity が指定されている場合は slide.background では透過を表現できないため、\n    // renderBackgroundAndBorder で描画する\n    const isLinelike = data.type === \"line\" || data.type === \"arrow\";\n    const rootBackgroundColor = !isLinelike ? data.backgroundColor : undefined;\n    const rootBackgroundGradient = !isLinelike\n      ? data.backgroundGradient\n      : undefined;\n    const rootHasOpacity =\n      !isLinelike && \"opacity\" in data && data.opacity !== undefined;\n    const rootGradientApplied =\n      rootBackgroundGradient && !rootHasOpacity\n        ? buildContext.pptxAuthoring.setSlideBackgroundGradient(\n            rootBackgroundGradient,\n          )\n        : false;\n    if (\n      !rootGradientApplied &&\n      rootBackgroundColor &&\n      !rootBackgroundGradient &&\n      !rootHasOpacity\n    ) {\n      buildContext.pptxAuthoring.setSlideBackgroundSolid(rootBackgroundColor);\n    }\n\n    // ルートノードの backgroundImage はスライドの background プロパティとして適用\n    // backgroundColor と backgroundImage の両方がある場合、backgroundImage が優先\n    const rootBackgroundImage = !isLinelike ? data.backgroundImage : undefined;\n    if (rootBackgroundImage) {\n      const cachedData = getImageData(\n        rootBackgroundImage.src,\n        buildContext.imageDataCache,\n      );\n      buildContext.pptxAuthoring.setSlideBackgroundImage(\n        imageBytesFromSource(rootBackgroundImage.src, cachedData),\n      );\n    }\n\n    /**\n     * node をスライドにレンダリングする\n     * @param isRoot ルートノードかどうか（ルートノードの background は slide.background で処理済み）\n     */\n    function renderNode(node: PositionedNode, isRoot = false) {\n      // line/arrow ノードは backgroundColor/border を持たないため、background/border の描画をスキップ\n      if (node.type !== \"line\" && node.type !== \"arrow\") {\n        // ルートノードの backgroundColor/backgroundImage は既に slide.background に適用済みなのでスキップ\n        // ただし opacity がある場合は slide.background では透過を表現できないため通常描画\n        if (\n          isRoot &&\n          (rootBackgroundImage ||\n            ((rootBackgroundColor || rootGradientApplied) && !rootHasOpacity))\n        ) {\n          // border のみ描画（backgroundColor/backgroundImage はスキップ）\n          renderBorderOnly(node, ctx);\n        } else {\n          renderBackgroundAndBorder(node, ctx);\n        }\n      }\n\n      const def = getNodeDef(node.type);\n\n      switch (def.category) {\n        case \"leaf\":\n          if (!def.render) {\n            throw new Error(\n              `No render function registered for leaf node: ${node.type}`,\n            );\n          }\n          def.render(node, ctx);\n          break;\n\n        case \"multi-child\":\n        case \"absolute-child\": {\n          const containerNode = node as Extract<\n            PositionedNode,\n            { type: \"vstack\" | \"hstack\" | \"layer\" }\n          >;\n          // zIndex でソートして描画順を制御（値が小さいものが先に描画される）\n          for (const child of sortByZIndex(containerNode.children)) {\n            renderNode(child);\n          }\n          break;\n        }\n      }\n    }\n\n    renderNode(data, true); // ルートノードとして処理\n  }\n\n  return createWritablePptx(() => buildContext.pptxAuthoring.source);\n}\n"],"mappings":"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"}

package/dist/renderPptx/textOptions.js

@@ -3,7 +3,7 @@ import { pxToIn, pxToPt } from "./units.js";
 import { getContentAreaIn } from "./utils/contentArea.js";
 //#region src/renderPptx/textOptions.ts
 /**
-* underline プロパティを pptxgenjs 形式に変換する
+* underline プロパティを描画用の形式に変換する
 */
 function convertUnderline(underline) {
 	if (underline === void 0) return void 0;
@@ -15,7 +15,7 @@ function convertUnderline(underline) {
 	};
 }
 /**
-* strike プロパティを pptxgenjs 形式に変換する
+* strike プロパティを描画用の形式に変換する
 */
 function convertStrike(strike) {
 	if (strike) return "sngStrike";
@@ -37,10 +37,9 @@ function resolveSubSup(run, parent) {
 	};
 }
 /**
-* glow プロパティを pptxgenjs 形式に変換する
-* size はユーザー入力 px、pptxgenjs の glow.size は pt。
-* pptxgenjs は省略時デフォルトを Object.assign で合成するため undefined を
-* 渡すとデフォルトが消える。ここで pom 側のデフォルトを確定させる。
+* glow プロパティを描画用の形式に変換する。
+* size はユーザー入力 px、描画用の glow.size は pt。
+* ここで既存の出力互換性を保つデフォルトを確定させる。
 */
 function convertGlow(glow) {
 	if (glow === void 0) return void 0;
@@ -51,8 +50,8 @@ function convertGlow(glow) {
 	};
 }
 /**
-* outline プロパティを pptxgenjs 形式に変換する
-* size はユーザー入力 px、pptxgenjs の outline.size は pt
+* outline プロパティを描画用の形式に変換する
+* size はユーザー入力 px、描画用の outline.size は pt
 */
 function convertOutline(outline) {
 	if (outline === void 0) return void 0;

package/dist/renderPptx/textOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"textOptions.js","names":[],"sources":["../../src/renderPptx/textOptions.ts"],"sourcesContent":["import type {\n  PositionedNode,\n  TextGlow,\n  TextOutline,\n  Underline,\n  UnderlineStyle,\n} from \"../types.ts\";\nimport { pxToIn, pxToPt } from \"./units.ts\";\nimport { getContentAreaIn } from \"./utils/contentArea.ts\";\nimport { measureFontVerticalMetricsRatio } from \"../calcYogaLayout/fontLoader.ts\";\n\ntype TextNode = Extract<PositionedNode, { type: \"text\" }>;\n\n/**\n * underline プロパティを pptxgenjs 形式に変換する\n */\nexport function convertUnderline(\n  underline: Underline | undefined,\n): { style?: UnderlineStyle; color?: string } | undefined {\n  if (underline === undefined) return undefined;\n  if (underline === false) return undefined;\n  if (underline === true) return { style: \"sng\" };\n  return {\n    style: underline.style,\n    color: underline.color,\n  };\n}\n\n/**\n * strike プロパティを pptxgenjs 形式に変換する\n */\nexport function convertStrike(\n  strike: boolean | undefined,\n): \"sngStrike\" | undefined {\n  if (strike) return \"sngStrike\";\n  return undefined;\n}\n\n/**\n * run と親 (node / cell / li) の subscript / superscript を相互排他に解決する。\n * OOXML の baseline 値で表現される性質上、両方 true は意味を持たないため、\n * run 側で sub/sup のいずれかが指定された場合は親の指定をまるごと無効化する\n * (片方だけ指定して反対側を親から漏らさない)。\n */\nexport function resolveSubSup(\n  run: { subscript?: boolean; superscript?: boolean },\n  parent: { subscript?: boolean; superscript?: boolean },\n): { subscript: boolean | undefined; superscript: boolean | undefined } {\n  if (run.subscript !== undefined || run.superscript !== undefined) {\n    return { subscript: run.subscript, superscript: run.superscript };\n  }\n  return { subscript: parent.subscript, superscript: parent.superscript };\n}\n\n/**\n * glow プロパティを pptxgenjs 形式に変換する\n * size はユーザー入力 px、pptxgenjs の glow.size は pt。\n * pptxgenjs は省略時デフォルトを Object.assign で合成するため undefined を\n * 渡すとデフォルトが消える。ここで pom 側のデフォルトを確定させる。\n */\nexport function convertGlow(\n  glow: TextGlow | undefined,\n): { size: number; opacity: number; color: string } | undefined {\n  if (glow === undefined) return undefined;\n  return {\n    size: pxToPt(glow.size ?? 8),\n    opacity: glow.opacity ?? 0.75,\n    color: glow.color ?? \"FFFFFF\",\n  };\n}\n\n/**\n * outline プロパティを pptxgenjs 形式に変換する\n * size はユーザー入力 px、pptxgenjs の outline.size は pt\n */\nexport function convertOutline(\n  outline: TextOutline | undefined,\n): { size: number; color: string } | undefined {\n  if (outline === undefined) return undefined;\n  return {\n    size: pxToPt(outline.size ?? 1),\n    color: outline.color ?? \"FFFFFF\",\n  };\n}\n\n/**\n * 行内でグリフ ink が上下中央に来るようにするための描画 y 補正量 (px)\n *\n * レンダラ (LibreOffice / PowerPoint) は固定行送り (spcPts) のとき\n * baseline を「行下端 − winDescent × fontSize」に置くため、グリフ ink\n * (typoAscender + typoDescender) は行内で下寄りになり、同じ gap でも\n * テキスト上側の視覚余白が広く下側が狭く見える (#846)。\n * baseline の実位置と「ink を行内中央に置いたときの baseline 位置」の\n * 差分を返し、呼び出し側でテキストフレームをその分だけ上へずらす。\n */\nexport function calcGlyphCenteringShiftPx(\n  fontSizePx: number,\n  lineHeight: number,\n  fontWeight: \"normal\" | \"bold\",\n): number {\n  const lineHeightPx = fontSizePx * lineHeight;\n  const metrics = measureFontVerticalMetricsRatio(fontWeight);\n  const baselineFromTopPx = lineHeightPx - metrics.winDescent * fontSizePx;\n  const inkHeightPx =\n    (metrics.typoAscender + metrics.typoDescender) * fontSizePx;\n  const centeredBaselineFromTopPx =\n    (lineHeightPx - inkHeightPx) / 2 + metrics.typoAscender * fontSizePx;\n  return baselineFromTopPx - centeredBaselineFromTopPx;\n}\n\nexport function createTextOptions(node: TextNode) {\n  const fontSizePx = node.fontSize ?? 24;\n  const fontFamily = node.fontFamily ?? \"Noto Sans JP\";\n  const lineHeight = node.lineHeight ?? 1.3;\n\n  const area = getContentAreaIn(node);\n  const glyphShiftPx = calcGlyphCenteringShiftPx(\n    fontSizePx,\n    lineHeight,\n    node.bold ? \"bold\" : \"normal\",\n  );\n\n  return {\n    ...area,\n    y: area.y - pxToIn(glyphShiftPx),\n    fontSize: pxToPt(fontSizePx),\n    fontFace: fontFamily,\n    align: node.textAlign ?? \"left\",\n    valign: \"top\" as const,\n    margin: 0,\n    // 行送りを固定値 (spcPts) で指定する。倍率指定 (spcPct) はレンダラがフォント\n    // メトリクスに対する倍率として解釈するため、計測高さ (行数 × fontSize ×\n    // lineHeight) と実描画の行高さが一致せず、グリフがボックスからはみ出して\n    // 上下余白が非対称になる (#846)\n    lineSpacing: pxToPt(fontSizePx * lineHeight),\n    rotate: node.rotate,\n    color: node.color,\n    bold: node.bold,\n    italic: node.italic,\n    underline: convertUnderline(node.underline),\n    strike: convertStrike(node.strike),\n    subscript: node.subscript,\n    superscript: node.superscript,\n    highlight: node.highlight,\n    glow: convertGlow(node.glow),\n    outline: convertOutline(node.outline),\n    // letterSpacing はユーザー入力 px、pptxgenjs の charSpacing は pt\n    charSpacing:\n      node.letterSpacing !== undefined ? pxToPt(node.letterSpacing) : undefined,\n  };\n}\n"],"mappings":";;;;;;;AAgBA,SAAgB,iBACd,WACwD;CACxD,IAAI,cAAc,KAAA,GAAW,OAAO,KAAA;CACpC,IAAI,cAAc,OAAO,OAAO,KAAA;CAChC,IAAI,cAAc,MAAM,OAAO,EAAE,OAAO,MAAM;CAC9C,OAAO;EACL,OAAO,UAAU;EACjB,OAAO,UAAU;CACnB;AACF;;;;AAKA,SAAgB,cACd,QACyB;CACzB,IAAI,QAAQ,OAAO;AAErB;;;;;;;AAQA,SAAgB,cACd,KACA,QACsE;CACtE,IAAI,IAAI,cAAc,KAAA,KAAa,IAAI,gBAAgB,KAAA,GACrD,OAAO;EAAE,WAAW,IAAI;EAAW,aAAa,IAAI;CAAY;CAElE,OAAO;EAAE,WAAW,OAAO;EAAW,aAAa,OAAO;CAAY;AACxE;;;;;;;AAQA,SAAgB,YACd,MAC8D;CAC9D,IAAI,SAAS,KAAA,GAAW,OAAO,KAAA;CAC/B,OAAO;EACL,MAAM,OAAO,KAAK,QAAQ,CAAC;EAC3B,SAAS,KAAK,WAAW;EACzB,OAAO,KAAK,SAAS;CACvB;AACF;;;;;AAMA,SAAgB,eACd,SAC6C;CAC7C,IAAI,YAAY,KAAA,GAAW,OAAO,KAAA;CAClC,OAAO;EACL,MAAM,OAAO,QAAQ,QAAQ,CAAC;EAC9B,OAAO,QAAQ,SAAS;CAC1B;AACF;;;;;;;;;;;AAYA,SAAgB,0BACd,YACA,YACA,YACQ;CACR,MAAM,eAAe,aAAa;CAClC,MAAM,UAAU,gCAAgC,UAAU;CAM1D,OAL0B,eAAe,QAAQ,aAAa,eAI3D,gBAFA,QAAQ,eAAe,QAAQ,iBAAiB,cAElB,IAAI,QAAQ,eAAe;AAE9D;AAEA,SAAgB,kBAAkB,MAAgB;CAChD,MAAM,aAAa,KAAK,YAAY;CACpC,MAAM,aAAa,KAAK,cAAc;CACtC,MAAM,aAAa,KAAK,cAAc;CAEtC,MAAM,OAAO,iBAAiB,IAAI;CAClC,MAAM,eAAe,0BACnB,YACA,YACA,KAAK,OAAO,SAAS,QACvB;CAEA,OAAO;EACL,GAAG;EACH,GAAG,KAAK,IAAI,OAAO,YAAY;EAC/B,UAAU,OAAO,UAAU;EAC3B,UAAU;EACV,OAAO,KAAK,aAAa;EACzB,QAAQ;EACR,QAAQ;EAKR,aAAa,OAAO,aAAa,UAAU;EAC3C,QAAQ,KAAK;EACb,OAAO,KAAK;EACZ,MAAM,KAAK;EACX,QAAQ,KAAK;EACb,WAAW,iBAAiB,KAAK,SAAS;EAC1C,QAAQ,cAAc,KAAK,MAAM;EACjC,WAAW,KAAK;EAChB,aAAa,KAAK;EAClB,WAAW,KAAK;EAChB,MAAM,YAAY,KAAK,IAAI;EAC3B,SAAS,eAAe,KAAK,OAAO;EAEpC,aACE,KAAK,kBAAkB,KAAA,IAAY,OAAO,KAAK,aAAa,IAAI,KAAA;CACpE;AACF"}
+{"version":3,"file":"textOptions.js","names":[],"sources":["../../src/renderPptx/textOptions.ts"],"sourcesContent":["import type {\n  PositionedNode,\n  TextGlow,\n  TextOutline,\n  Underline,\n  UnderlineStyle,\n} from \"../types.ts\";\nimport { pxToIn, pxToPt } from \"./units.ts\";\nimport { getContentAreaIn } from \"./utils/contentArea.ts\";\nimport { measureFontVerticalMetricsRatio } from \"../calcYogaLayout/fontLoader.ts\";\n\ntype TextNode = Extract<PositionedNode, { type: \"text\" }>;\n\n/**\n * underline プロパティを描画用の形式に変換する\n */\nexport function convertUnderline(\n  underline: Underline | undefined,\n): { style?: UnderlineStyle; color?: string } | undefined {\n  if (underline === undefined) return undefined;\n  if (underline === false) return undefined;\n  if (underline === true) return { style: \"sng\" };\n  return {\n    style: underline.style,\n    color: underline.color,\n  };\n}\n\n/**\n * strike プロパティを描画用の形式に変換する\n */\nexport function convertStrike(\n  strike: boolean | undefined,\n): \"sngStrike\" | undefined {\n  if (strike) return \"sngStrike\";\n  return undefined;\n}\n\n/**\n * run と親 (node / cell / li) の subscript / superscript を相互排他に解決する。\n * OOXML の baseline 値で表現される性質上、両方 true は意味を持たないため、\n * run 側で sub/sup のいずれかが指定された場合は親の指定をまるごと無効化する\n * (片方だけ指定して反対側を親から漏らさない)。\n */\nexport function resolveSubSup(\n  run: { subscript?: boolean; superscript?: boolean },\n  parent: { subscript?: boolean; superscript?: boolean },\n): { subscript: boolean | undefined; superscript: boolean | undefined } {\n  if (run.subscript !== undefined || run.superscript !== undefined) {\n    return { subscript: run.subscript, superscript: run.superscript };\n  }\n  return { subscript: parent.subscript, superscript: parent.superscript };\n}\n\n/**\n * glow プロパティを描画用の形式に変換する。\n * size はユーザー入力 px、描画用の glow.size は pt。\n * ここで既存の出力互換性を保つデフォルトを確定させる。\n */\nexport function convertGlow(\n  glow: TextGlow | undefined,\n): { size: number; opacity: number; color: string } | undefined {\n  if (glow === undefined) return undefined;\n  return {\n    size: pxToPt(glow.size ?? 8),\n    opacity: glow.opacity ?? 0.75,\n    color: glow.color ?? \"FFFFFF\",\n  };\n}\n\n/**\n * outline プロパティを描画用の形式に変換する\n * size はユーザー入力 px、描画用の outline.size は pt\n */\nexport function convertOutline(\n  outline: TextOutline | undefined,\n): { size: number; color: string } | undefined {\n  if (outline === undefined) return undefined;\n  return {\n    size: pxToPt(outline.size ?? 1),\n    color: outline.color ?? \"FFFFFF\",\n  };\n}\n\n/**\n * 行内でグリフ ink が上下中央に来るようにするための描画 y 補正量 (px)\n *\n * レンダラ (LibreOffice / PowerPoint) は固定行送り (spcPts) のとき\n * baseline を「行下端 − winDescent × fontSize」に置くため、グリフ ink\n * (typoAscender + typoDescender) は行内で下寄りになり、同じ gap でも\n * テキスト上側の視覚余白が広く下側が狭く見える (#846)。\n * baseline の実位置と「ink を行内中央に置いたときの baseline 位置」の\n * 差分を返し、呼び出し側でテキストフレームをその分だけ上へずらす。\n */\nexport function calcGlyphCenteringShiftPx(\n  fontSizePx: number,\n  lineHeight: number,\n  fontWeight: \"normal\" | \"bold\",\n): number {\n  const lineHeightPx = fontSizePx * lineHeight;\n  const metrics = measureFontVerticalMetricsRatio(fontWeight);\n  const baselineFromTopPx = lineHeightPx - metrics.winDescent * fontSizePx;\n  const inkHeightPx =\n    (metrics.typoAscender + metrics.typoDescender) * fontSizePx;\n  const centeredBaselineFromTopPx =\n    (lineHeightPx - inkHeightPx) / 2 + metrics.typoAscender * fontSizePx;\n  return baselineFromTopPx - centeredBaselineFromTopPx;\n}\n\nexport function createTextOptions(node: TextNode) {\n  const fontSizePx = node.fontSize ?? 24;\n  const fontFamily = node.fontFamily ?? \"Noto Sans JP\";\n  const lineHeight = node.lineHeight ?? 1.3;\n\n  const area = getContentAreaIn(node);\n  const glyphShiftPx = calcGlyphCenteringShiftPx(\n    fontSizePx,\n    lineHeight,\n    node.bold ? \"bold\" : \"normal\",\n  );\n\n  return {\n    ...area,\n    y: area.y - pxToIn(glyphShiftPx),\n    fontSize: pxToPt(fontSizePx),\n    fontFace: fontFamily,\n    align: node.textAlign ?? \"left\",\n    valign: \"top\" as const,\n    margin: 0,\n    // 行送りを固定値 (spcPts) で指定する。倍率指定 (spcPct) はレンダラがフォント\n    // メトリクスに対する倍率として解釈するため、計測高さ (行数 × fontSize ×\n    // lineHeight) と実描画の行高さが一致せず、グリフがボックスからはみ出して\n    // 上下余白が非対称になる (#846)\n    lineSpacing: pxToPt(fontSizePx * lineHeight),\n    rotate: node.rotate,\n    color: node.color,\n    bold: node.bold,\n    italic: node.italic,\n    underline: convertUnderline(node.underline),\n    strike: convertStrike(node.strike),\n    subscript: node.subscript,\n    superscript: node.superscript,\n    highlight: node.highlight,\n    glow: convertGlow(node.glow),\n    outline: convertOutline(node.outline),\n    // letterSpacing はユーザー入力 px、描画用の charSpacing は pt\n    charSpacing:\n      node.letterSpacing !== undefined ? pxToPt(node.letterSpacing) : undefined,\n  };\n}\n"],"mappings":";;;;;;;AAgBA,SAAgB,iBACd,WACwD;CACxD,IAAI,cAAc,KAAA,GAAW,OAAO,KAAA;CACpC,IAAI,cAAc,OAAO,OAAO,KAAA;CAChC,IAAI,cAAc,MAAM,OAAO,EAAE,OAAO,MAAM;CAC9C,OAAO;EACL,OAAO,UAAU;EACjB,OAAO,UAAU;CACnB;AACF;;;;AAKA,SAAgB,cACd,QACyB;CACzB,IAAI,QAAQ,OAAO;AAErB;;;;;;;AAQA,SAAgB,cACd,KACA,QACsE;CACtE,IAAI,IAAI,cAAc,KAAA,KAAa,IAAI,gBAAgB,KAAA,GACrD,OAAO;EAAE,WAAW,IAAI;EAAW,aAAa,IAAI;CAAY;CAElE,OAAO;EAAE,WAAW,OAAO;EAAW,aAAa,OAAO;CAAY;AACxE;;;;;;AAOA,SAAgB,YACd,MAC8D;CAC9D,IAAI,SAAS,KAAA,GAAW,OAAO,KAAA;CAC/B,OAAO;EACL,MAAM,OAAO,KAAK,QAAQ,CAAC;EAC3B,SAAS,KAAK,WAAW;EACzB,OAAO,KAAK,SAAS;CACvB;AACF;;;;;AAMA,SAAgB,eACd,SAC6C;CAC7C,IAAI,YAAY,KAAA,GAAW,OAAO,KAAA;CAClC,OAAO;EACL,MAAM,OAAO,QAAQ,QAAQ,CAAC;EAC9B,OAAO,QAAQ,SAAS;CAC1B;AACF;;;;;;;;;;;AAYA,SAAgB,0BACd,YACA,YACA,YACQ;CACR,MAAM,eAAe,aAAa;CAClC,MAAM,UAAU,gCAAgC,UAAU;CAM1D,OAL0B,eAAe,QAAQ,aAAa,eAI3D,gBAFA,QAAQ,eAAe,QAAQ,iBAAiB,cAElB,IAAI,QAAQ,eAAe;AAE9D;AAEA,SAAgB,kBAAkB,MAAgB;CAChD,MAAM,aAAa,KAAK,YAAY;CACpC,MAAM,aAAa,KAAK,cAAc;CACtC,MAAM,aAAa,KAAK,cAAc;CAEtC,MAAM,OAAO,iBAAiB,IAAI;CAClC,MAAM,eAAe,0BACnB,YACA,YACA,KAAK,OAAO,SAAS,QACvB;CAEA,OAAO;EACL,GAAG;EACH,GAAG,KAAK,IAAI,OAAO,YAAY;EAC/B,UAAU,OAAO,UAAU;EAC3B,UAAU;EACV,OAAO,KAAK,aAAa;EACzB,QAAQ;EACR,QAAQ;EAKR,aAAa,OAAO,aAAa,UAAU;EAC3C,QAAQ,KAAK;EACb,OAAO,KAAK;EACZ,MAAM,KAAK;EACX,QAAQ,KAAK;EACb,WAAW,iBAAiB,KAAK,SAAS;EAC1C,QAAQ,cAAc,KAAK,MAAM;EACjC,WAAW,KAAK;EAChB,aAAa,KAAK;EAClB,WAAW,KAAK;EAChB,MAAM,YAAY,KAAK,IAAI;EAC3B,SAAS,eAAe,KAAK,OAAO;EAEpC,aACE,KAAK,kBAAkB,KAAA,IAAY,OAAO,KAAK,aAAa,IAAI,KAAA;CACpE;AACF"}

package/dist/renderPptx/units.js

@@ -4,12 +4,12 @@ const pxToPt = (px) => px * 72 / 96;
 /**
 * px を DrawingML の EMU (English Metric Unit) に変換する。
 * 1 inch = 914400 EMU、96 DPI 基準で 1 px = 9525 EMU。
-* `<a:glow rad="...">` など EMU を直接埋め込む XML 後処理で使う。
+* DrawingML の位置・サイズ指定で使う。
 */
 const pxToEmu = (px) => px * EMU_PER_IN / 96;
 /**
-* px 単位の矩形を pptxgenjs の位置オプション (inch 単位の x/y/w/h) に
-* まとめて変換する。addShape / addText 等のオプションへ spread して使う。
+* px 単位の矩形を互換用の位置オプション (inch 単位の x/y/w/h) に
+* まとめて変換する。
 */
 const rectPxToIn = (rect) => ({
 	x: pxToIn(rect.x),

package/dist/renderPptx/units.js.map

@@ -1 +1 @@
-{"version":3,"file":"units.js","names":[],"sources":["../../src/renderPptx/units.ts"],"sourcesContent":["export const PX_PER_IN = 96;\nexport const EMU_PER_IN = 914400;\n\nexport const pxToIn = (px: number) => px / PX_PER_IN;\n\nexport const pxToPt = (px: number) => (px * 72) / PX_PER_IN;\n\n/**\n * px を DrawingML の EMU (English Metric Unit) に変換する。\n * 1 inch = 914400 EMU、96 DPI 基準で 1 px = 9525 EMU。\n * `<a:glow rad=\"...\">` など EMU を直接埋め込む XML 後処理で使う。\n */\nexport const pxToEmu = (px: number) => (px * EMU_PER_IN) / PX_PER_IN;\n\n/**\n * px 単位の矩形を pptxgenjs の位置オプション (inch 単位の x/y/w/h) に\n * まとめて変換する。addShape / addText 等のオプションへ spread して使う。\n */\nexport const rectPxToIn = (rect: {\n  x: number;\n  y: number;\n  w: number;\n  h: number;\n}) => ({\n  x: pxToIn(rect.x),\n  y: pxToIn(rect.y),\n  w: pxToIn(rect.w),\n  h: pxToIn(rect.h),\n});\n"],"mappings":"AACA,MAAa,aAAa;AAE1B,MAAa,UAAU,OAAe,KAAA;AAEtC,MAAa,UAAU,OAAgB,KAAK,KAAA;;;;;;AAO5C,MAAa,WAAW,OAAgB,KAAK,aAAA;;;;;AAM7C,MAAa,cAAc,UAKpB;CACL,GAAG,OAAO,KAAK,CAAC;CAChB,GAAG,OAAO,KAAK,CAAC;CAChB,GAAG,OAAO,KAAK,CAAC;CAChB,GAAG,OAAO,KAAK,CAAC;AAClB"}
+{"version":3,"file":"units.js","names":[],"sources":["../../src/renderPptx/units.ts"],"sourcesContent":["export const PX_PER_IN = 96;\nexport const EMU_PER_IN = 914400;\n\nexport const pxToIn = (px: number) => px / PX_PER_IN;\n\nexport const pxToPt = (px: number) => (px * 72) / PX_PER_IN;\n\n/**\n * px を DrawingML の EMU (English Metric Unit) に変換する。\n * 1 inch = 914400 EMU、96 DPI 基準で 1 px = 9525 EMU。\n * DrawingML の位置・サイズ指定で使う。\n */\nexport const pxToEmu = (px: number) => (px * EMU_PER_IN) / PX_PER_IN;\n\n/**\n * px 単位の矩形を互換用の位置オプション (inch 単位の x/y/w/h) に\n * まとめて変換する。\n */\nexport const rectPxToIn = (rect: {\n  x: number;\n  y: number;\n  w: number;\n  h: number;\n}) => ({\n  x: pxToIn(rect.x),\n  y: pxToIn(rect.y),\n  w: pxToIn(rect.w),\n  h: pxToIn(rect.h),\n});\n"],"mappings":"AACA,MAAa,aAAa;AAE1B,MAAa,UAAU,OAAe,KAAA;AAEtC,MAAa,UAAU,OAAgB,KAAK,KAAA;;;;;;AAO5C,MAAa,WAAW,OAAgB,KAAK,aAAA;;;;;AAM7C,MAAa,cAAc,UAKpB;CACL,GAAG,OAAO,KAAK,CAAC;CAChB,GAAG,OAAO,KAAK,CAAC;CAChB,GAAG,OAAO,KAAK,CAAC;CAChB,GAAG,OAAO,KAAK,CAAC;AAClB"}

package/dist/renderPptx/utils/backgroundBorder.js

@@ -1,8 +1,7 @@
 import { getImageData } from "../../shared/measureImage.js";
-import { rectPxToIn } from "../units.js";
 import { addGlimpsePicture, imageBytesFromSource } from "./glimpsePicture.js";
 import { addGlimpseShape, backgroundShapeFill, createShapeBoundsInput, noShapeOutline, noneShapeFill, shapeOutline } from "./glimpseShape.js";
-import { BORDER_SIDES, convertBorderLine, convertShadow, hasVisibleBorder, resolvePerSideBorders, resolveRectRadius } from "./visualStyle.js";
+import { BORDER_SIDES, hasVisibleBorder, resolvePerSideBorders, resolveRectRadius } from "./visualStyle.js";
 //#region src/renderPptx/utils/backgroundBorder.ts
 /**
 * ノードの背景色・背景画像・ボーダー・影を描画する
@@ -19,28 +18,16 @@ function renderBackgroundAndBorder(node, ctx) {
 	const hasShadow = Boolean(shadow);
 	if (!hasBackground && !hasBackgroundImage && !hasUniformBorder && !perSideBorders && !hasShadow) return;
 	const shapeType = borderRadius ? "roundRect" : "rect";
-	const legacyShapeType = borderRadius ? ctx.pptx.ShapeType.roundRect : ctx.pptx.ShapeType.rect;
 	const rectRadius = resolveRectRadius(borderRadius, node.w, node.h);
 	if (!hasBackgroundImage) {
 		if (hasBackground || hasUniformBorder || hasShadow) {
-			if (hasShadow && !backgroundGradient) {
-				ctx.slide.addShape(legacyShapeType, {
-					...rectPxToIn(node),
-					fill: hasBackground ? {
-						color: backgroundColor,
-						transparency: node.opacity !== void 0 ? (1 - node.opacity) * 100 : void 0
-					} : { type: "none" },
-					line: hasUniformBorder ? convertBorderLine(border, "000000") : { type: "none" },
-					rectRadius,
-					shadow: convertShadow(shadow)
-				});
-				renderPerSideBorderLines(node, perSideBorders, ctx);
-				return;
-			}
 			const fill = hasBackground ? backgroundShapeFill(backgroundColor, backgroundGradient) : noneShapeFill();
 			const line = hasUniformBorder ? shapeOutline(border, "000000") : noShapeOutline();
 			addGlimpseShape(ctx, {
-				preset: shapeType,
+				geometry: {
+					kind: "preset",
+					preset: shapeType
+				},
 				...createShapeBoundsInput(node),
 				fill,
 				outline: line
@@ -57,7 +44,10 @@ function renderBackgroundAndBorder(node, ctx) {
 		return;
 	}
 	if (hasBackground) addGlimpseShape(ctx, {
-		preset: shapeType,
+		geometry: {
+			kind: "preset",
+			preset: shapeType
+		},
 		...createShapeBoundsInput(node),
 		fill: backgroundShapeFill(backgroundColor, backgroundGradient),
 		outline: noShapeOutline()
@@ -77,29 +67,19 @@ function renderBackgroundAndBorder(node, ctx) {
 			h: node.h
 		} });
 	}
-	if (hasUniformBorder || hasShadow) {
-		if (hasShadow) {
-			ctx.slide.addShape(legacyShapeType, {
-				...rectPxToIn(node),
-				fill: { type: "none" },
-				line: hasUniformBorder ? convertBorderLine(border, "000000") : { type: "none" },
-				rectRadius,
-				shadow: convertShadow(shadow)
-			});
-			renderPerSideBorderLines(node, perSideBorders, ctx);
-			return;
-		}
-		addGlimpseShape(ctx, {
-			preset: shapeType,
-			...createShapeBoundsInput(node),
-			fill: noneShapeFill(),
-			outline: hasUniformBorder ? shapeOutline(border, "000000") : noShapeOutline()
-		}, node, {
-			shadow,
-			rectRadius,
-			dashType: border?.dashType
-		});
-	}
+	if (hasUniformBorder || hasShadow) addGlimpseShape(ctx, {
+		geometry: {
+			kind: "preset",
+			preset: shapeType
+		},
+		...createShapeBoundsInput(node),
+		fill: noneShapeFill(),
+		outline: hasUniformBorder ? shapeOutline(border, "000000") : noShapeOutline()
+	}, node, {
+		shadow,
+		rectRadius,
+		dashType: border?.dashType
+	});
 	renderPerSideBorderLines(node, perSideBorders, ctx);
 }
 /**
@@ -129,7 +109,10 @@ function renderBorderOnly(node, ctx) {
 	}
 	if (!hasVisibleBorder(border)) return;
 	addGlimpseShape(ctx, {
-		preset: borderRadius ? "roundRect" : "rect",
+		geometry: {
+			kind: "preset",
+			preset: borderRadius ? "roundRect" : "rect"
+		},
 		...createShapeBoundsInput(node),
 		fill: noneShapeFill(),
 		outline: shapeOutline(border, "000000")
@@ -175,7 +158,10 @@ function renderPerSideBorderLines(node, perSideBorders, ctx) {
 		const style = perSideBorders[side];
 		if (!style) continue;
 		addGlimpseShape(ctx, {
-			preset: "line",
+			geometry: {
+				kind: "preset",
+				preset: "line"
+			},
 			...createShapeBoundsInput(edges[side]),
 			fill: noneShapeFill(),
 			outline: shapeOutline(style, "000000")