@hirokisakabe/pom 9.1.0 → 9.1.2

package/dist/renderPptx/nodes/list.js

@@ -1,6 +1,6 @@
-import { pxToPt } from "../units.js";
-import { getContentAreaIn } from "../utils/contentArea.js";
-import { convertStrike, convertUnderline, resolveSubSup } from "../textOptions.js";
+import { getContentArea } from "../utils/contentArea.js";
+import { resolveSubSup } from "../textOptions.js";
+import { addGlimpseTextBox, createGlimpseRunProperties, listBulletXmlTransform } from "../utils/glimpseTextBox.js";
 //#region src/renderPptx/nodes/list.ts
 function resolveStyle(li, parent) {
 	const subSup = resolveSubSup(li, parent);
@@ -17,136 +17,121 @@ function resolveStyle(li, parent) {
 		fontFamily: li.fontFamily ?? parent.fontFamily ?? "Noto Sans JP"
 	};
 }
-function buildListTextItems(items, parent, bullet) {
-	const textItems = [];
+function paragraphProperties(parent) {
+	return { align: parent.textAlign ?? "left" };
+}
+function toRunStyle(style) {
+	return {
+		fontSize: style.fontSize,
+		fontFace: style.fontFamily,
+		color: style.color,
+		bold: style.bold,
+		italic: style.italic,
+		underline: style.underline,
+		strike: style.strike,
+		subscript: style.subscript,
+		superscript: style.superscript,
+		highlight: style.highlight
+	};
+}
+function buildListParagraphs(items, parent) {
+	const paragraphs = [];
+	const hyperlinks = [];
 	for (let i = 0; i < items.length; i++) {
 		const li = items[i];
 		const style = resolveStyle(li, parent);
-		const isLast = i === items.length - 1;
-		const baseOptions = {
-			fontSize: pxToPt(style.fontSize),
-			fontFace: style.fontFamily,
-			color: style.color,
-			underline: convertUnderline(style.underline),
-			strike: convertStrike(style.strike),
-			subscript: style.subscript,
-			superscript: style.superscript,
-			highlight: style.highlight
-		};
-		if (li.runs && li.runs.length > 0) for (let j = 0; j < li.runs.length; j++) {
-			const run = li.runs[j];
-			const isLastRun = j === li.runs.length - 1;
-			let text = run.text;
-			if (isLastRun && !isLast) text += "\n";
+		const runs = [];
+		if (li.runs && li.runs.length > 0) for (const run of li.runs) {
 			const runSubSup = resolveSubSup(run, style);
-			textItems.push({
-				text,
-				options: {
-					...baseOptions,
-					fontSize: pxToPt(run.fontSize ?? style.fontSize),
+			runs.push({
+				text: run.text,
+				properties: createGlimpseRunProperties({
+					fontSize: run.fontSize ?? style.fontSize,
 					fontFace: run.fontFamily ?? style.fontFamily,
 					color: run.color ?? style.color,
 					bold: run.bold ?? style.bold,
 					italic: run.italic ?? style.italic,
-					underline: convertUnderline(run.underline ?? style.underline),
-					strike: convertStrike(run.strike ?? style.strike),
+					underline: run.underline ?? style.underline,
+					strike: run.strike ?? style.strike,
 					subscript: runSubSup.subscript,
 					superscript: runSubSup.superscript,
-					highlight: run.highlight ?? style.highlight,
-					bullet: j === 0 ? bullet : false,
-					...run.href ? { hyperlink: { url: run.href } } : {}
-				}
+					highlight: run.highlight ?? style.highlight
+				})
 			});
+			hyperlinks.push(run.text ? run.href : void 0);
 		}
-		else textItems.push({
-			text: isLast ? li.text : li.text + "\n",
-			options: {
-				...baseOptions,
-				bold: style.bold,
-				italic: style.italic,
-				bullet
-			}
+		else {
+			runs.push({
+				text: li.text,
+				properties: createGlimpseRunProperties(toRunStyle(style))
+			});
+			hyperlinks.push(void 0);
+		}
+		paragraphs.push({
+			properties: paragraphProperties(parent),
+			runs
 		});
 	}
-	return textItems;
-}
-function hasItemStyleOverride(items) {
-	return items.some((li) => li.fontSize !== void 0 || li.color !== void 0 || li.bold !== void 0 || li.italic !== void 0 || li.underline !== void 0 || li.strike !== void 0 || li.subscript !== void 0 || li.superscript !== void 0 || li.highlight !== void 0 || li.fontFamily !== void 0 || li.runs !== void 0);
+	return {
+		paragraphs,
+		hyperlinks
+	};
 }
 function renderUlNode(node, ctx) {
 	const fontSizePx = node.fontSize ?? 24;
 	const fontFamily = node.fontFamily ?? "Noto Sans JP";
-	const lineHeight = node.lineHeight ?? 1.3;
-	const contentIn = getContentAreaIn(node);
-	if (hasItemStyleOverride(node.items)) {
-		const textItems = buildListTextItems(node.items, node, true);
-		ctx.slide.addText(textItems, {
-			...contentIn,
-			align: node.textAlign ?? "left",
-			valign: "top",
-			margin: 0,
-			lineSpacingMultiple: lineHeight
-		});
-	} else {
-		const text = node.items.map((li) => li.text).join("\n");
-		ctx.slide.addText(text, {
-			...contentIn,
-			fontSize: pxToPt(fontSizePx),
-			fontFace: fontFamily,
-			align: node.textAlign ?? "left",
-			valign: "top",
-			margin: 0,
-			lineSpacingMultiple: lineHeight,
-			color: node.color,
-			bold: node.bold,
-			italic: node.italic,
-			underline: convertUnderline(node.underline),
-			strike: convertStrike(node.strike),
-			subscript: node.subscript,
-			superscript: node.superscript,
-			highlight: node.highlight,
-			bullet: true
-		});
-	}
+	const content = getContentArea(node);
+	const { paragraphs, hyperlinks } = buildListParagraphs(node.items, node);
+	addGlimpseTextBox(ctx, content, {
+		fontSize: fontSizePx,
+		fontFace: fontFamily,
+		align: node.textAlign ?? "left",
+		valign: "top",
+		margin: 0,
+		color: node.color,
+		bold: node.bold,
+		italic: node.italic,
+		underline: node.underline,
+		strike: node.strike,
+		subscript: node.subscript,
+		superscript: node.superscript,
+		highlight: node.highlight,
+		paragraphs,
+		hyperlinks,
+		xmlTransform: listBulletXmlTransform({
+			kind: "bullet",
+			lineHeight: node.lineHeight
+		})
+	});
 }
 function renderOlNode(node, ctx) {
 	const fontSizePx = node.fontSize ?? 24;
 	const fontFamily = node.fontFamily ?? "Noto Sans JP";
-	const lineHeight = node.lineHeight ?? 1.3;
-	const contentIn = getContentAreaIn(node);
-	const bulletOptions = { type: "number" };
-	if (node.numberType !== void 0) bulletOptions.numberType = node.numberType;
-	if (node.numberStartAt !== void 0) bulletOptions.numberStartAt = node.numberStartAt;
-	if (hasItemStyleOverride(node.items)) {
-		const textItems = buildListTextItems(node.items, node, bulletOptions);
-		ctx.slide.addText(textItems, {
-			...contentIn,
-			align: node.textAlign ?? "left",
-			valign: "top",
-			margin: 0,
-			lineSpacingMultiple: lineHeight
-		});
-	} else {
-		const text = node.items.map((li) => li.text).join("\n");
-		ctx.slide.addText(text, {
-			...contentIn,
-			fontSize: pxToPt(fontSizePx),
-			fontFace: fontFamily,
-			align: node.textAlign ?? "left",
-			valign: "top",
-			margin: 0,
-			lineSpacingMultiple: lineHeight,
-			color: node.color,
-			bold: node.bold,
-			italic: node.italic,
-			underline: convertUnderline(node.underline),
-			strike: convertStrike(node.strike),
-			subscript: node.subscript,
-			superscript: node.superscript,
-			highlight: node.highlight,
-			bullet: bulletOptions
-		});
-	}
+	const content = getContentArea(node);
+	const { paragraphs, hyperlinks } = buildListParagraphs(node.items, node);
+	addGlimpseTextBox(ctx, content, {
+		fontSize: fontSizePx,
+		fontFace: fontFamily,
+		align: node.textAlign ?? "left",
+		valign: "top",
+		margin: 0,
+		color: node.color,
+		bold: node.bold,
+		italic: node.italic,
+		underline: node.underline,
+		strike: node.strike,
+		subscript: node.subscript,
+		superscript: node.superscript,
+		highlight: node.highlight,
+		paragraphs,
+		hyperlinks,
+		xmlTransform: listBulletXmlTransform({
+			kind: "number",
+			scheme: node.numberType,
+			startAt: node.numberStartAt,
+			lineHeight: node.lineHeight
+		})
+	});
 }
 //#endregion
 export { renderOlNode, renderUlNode };

package/dist/renderPptx/nodes/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","names":[],"sources":["../../../src/renderPptx/nodes/list.ts"],"sourcesContent":["import type { PositionedNode, LiNode } from \"../../types.ts\";\nimport type { RenderContext } from \"../types.ts\";\nimport { pxToPt } from \"../units.ts\";\nimport {\n  convertUnderline,\n  convertStrike,\n  resolveSubSup,\n} from \"../textOptions.ts\";\nimport { getContentAreaIn } from \"../utils/contentArea.ts\";\n\ntype UlPositionedNode = Extract<PositionedNode, { type: \"ul\" }>;\ntype OlPositionedNode = Extract<PositionedNode, { type: \"ol\" }>;\n\nfunction resolveStyle(li: LiNode, parent: UlPositionedNode | OlPositionedNode) {\n  const subSup = resolveSubSup(li, parent);\n  return {\n    fontSize: li.fontSize ?? parent.fontSize ?? 24,\n    color: li.color ?? parent.color,\n    bold: li.bold ?? parent.bold,\n    italic: li.italic ?? parent.italic,\n    underline: li.underline ?? parent.underline,\n    strike: li.strike ?? parent.strike,\n    subscript: subSup.subscript,\n    superscript: subSup.superscript,\n    highlight: li.highlight ?? parent.highlight,\n    fontFamily: li.fontFamily ?? parent.fontFamily ?? \"Noto Sans JP\",\n  };\n}\n\nfunction buildListTextItems(\n  items: LiNode[],\n  parent: UlPositionedNode | OlPositionedNode,\n  bullet: boolean | Record<string, unknown>,\n) {\n  const textItems: { text: string; options: Record<string, unknown> }[] = [];\n  for (let i = 0; i < items.length; i++) {\n    const li = items[i];\n    const style = resolveStyle(li, parent);\n    const isLast = i === items.length - 1;\n    const baseOptions = {\n      fontSize: pxToPt(style.fontSize),\n      fontFace: style.fontFamily,\n      color: style.color,\n      underline: convertUnderline(style.underline),\n      strike: convertStrike(style.strike),\n      subscript: style.subscript,\n      superscript: style.superscript,\n      highlight: style.highlight,\n    };\n\n    if (li.runs && li.runs.length > 0) {\n      for (let j = 0; j < li.runs.length; j++) {\n        const run = li.runs[j];\n        const isLastRun = j === li.runs.length - 1;\n        let text = run.text;\n        if (isLastRun && !isLast) text += \"\\n\";\n        const runSubSup = resolveSubSup(run, style);\n        textItems.push({\n          text,\n          options: {\n            ...baseOptions,\n            fontSize: pxToPt(run.fontSize ?? style.fontSize),\n            fontFace: run.fontFamily ?? style.fontFamily,\n            color: run.color ?? style.color,\n            bold: run.bold ?? style.bold,\n            italic: run.italic ?? style.italic,\n            underline: convertUnderline(run.underline ?? style.underline),\n            strike: convertStrike(run.strike ?? style.strike),\n            subscript: runSubSup.subscript,\n            superscript: runSubSup.superscript,\n            highlight: run.highlight ?? style.highlight,\n            bullet: j === 0 ? bullet : false,\n            ...(run.href ? { hyperlink: { url: run.href } } : {}),\n          },\n        });\n      }\n    } else {\n      textItems.push({\n        text: isLast ? li.text : li.text + \"\\n\",\n        options: {\n          ...baseOptions,\n          bold: style.bold,\n          italic: style.italic,\n          bullet,\n        },\n      });\n    }\n  }\n  return textItems;\n}\n\nfunction hasItemStyleOverride(items: LiNode[]): boolean {\n  return items.some(\n    (li) =>\n      li.fontSize !== undefined ||\n      li.color !== undefined ||\n      li.bold !== undefined ||\n      li.italic !== undefined ||\n      li.underline !== undefined ||\n      li.strike !== undefined ||\n      li.subscript !== undefined ||\n      li.superscript !== undefined ||\n      li.highlight !== undefined ||\n      li.fontFamily !== undefined ||\n      li.runs !== undefined,\n  );\n}\n\nexport function renderUlNode(node: UlPositionedNode, ctx: RenderContext): void {\n  const fontSizePx = node.fontSize ?? 24;\n  const fontFamily = node.fontFamily ?? \"Noto Sans JP\";\n  const lineHeight = node.lineHeight ?? 1.3;\n  const contentIn = getContentAreaIn(node);\n\n  if (hasItemStyleOverride(node.items)) {\n    // Li に個別スタイルがある場合は配列形式を使用\n    const textItems = buildListTextItems(node.items, node, true);\n\n    ctx.slide.addText(textItems, {\n      ...contentIn,\n      align: node.textAlign ?? \"left\",\n      valign: \"top\" as const,\n      margin: 0,\n      lineSpacingMultiple: lineHeight,\n    });\n  } else {\n    // Li にスタイルオーバーライドがない場合は単一文字列形式を使用\n    const text = node.items.map((li) => li.text).join(\"\\n\");\n\n    ctx.slide.addText(text, {\n      ...contentIn,\n      fontSize: pxToPt(fontSizePx),\n      fontFace: fontFamily,\n      align: node.textAlign ?? \"left\",\n      valign: \"top\" as const,\n      margin: 0,\n      lineSpacingMultiple: lineHeight,\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      bullet: true,\n    });\n  }\n}\n\nexport function renderOlNode(node: OlPositionedNode, ctx: RenderContext): void {\n  const fontSizePx = node.fontSize ?? 24;\n  const fontFamily = node.fontFamily ?? \"Noto Sans JP\";\n  const lineHeight = node.lineHeight ?? 1.3;\n  const contentIn = getContentAreaIn(node);\n\n  const bulletOptions: Record<string, unknown> = { type: \"number\" };\n  if (node.numberType !== undefined) {\n    bulletOptions.numberType = node.numberType;\n  }\n  if (node.numberStartAt !== undefined) {\n    bulletOptions.numberStartAt = node.numberStartAt;\n  }\n\n  if (hasItemStyleOverride(node.items)) {\n    const textItems = buildListTextItems(node.items, node, bulletOptions);\n\n    ctx.slide.addText(textItems, {\n      ...contentIn,\n      align: node.textAlign ?? \"left\",\n      valign: \"top\" as const,\n      margin: 0,\n      lineSpacingMultiple: lineHeight,\n    });\n  } else {\n    const text = node.items.map((li) => li.text).join(\"\\n\");\n\n    ctx.slide.addText(text, {\n      ...contentIn,\n      fontSize: pxToPt(fontSizePx),\n      fontFace: fontFamily,\n      align: node.textAlign ?? \"left\",\n      valign: \"top\" as const,\n      margin: 0,\n      lineSpacingMultiple: lineHeight,\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      bullet: bulletOptions,\n    });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"list.js","names":[],"sources":["../../../src/renderPptx/nodes/list.ts"],"sourcesContent":["import type { PositionedNode, LiNode } from \"../../types.ts\";\nimport type { RenderContext } from \"../types.ts\";\nimport { resolveSubSup } from \"../textOptions.ts\";\nimport { getContentArea } from \"../utils/contentArea.ts\";\nimport {\n  addGlimpseTextBox,\n  createGlimpseRunProperties,\n  listBulletXmlTransform,\n  type GlimpseTextRunStyle,\n} from \"../utils/glimpseTextBox.ts\";\nimport {\n  type AddTextBoxParagraphInput,\n  type AddTextBoxRunInput,\n} from \"@pptx-glimpse/document\";\n\ntype UlPositionedNode = Extract<PositionedNode, { type: \"ul\" }>;\ntype OlPositionedNode = Extract<PositionedNode, { type: \"ol\" }>;\n\nfunction resolveStyle(li: LiNode, parent: UlPositionedNode | OlPositionedNode) {\n  const subSup = resolveSubSup(li, parent);\n  return {\n    fontSize: li.fontSize ?? parent.fontSize ?? 24,\n    color: li.color ?? parent.color,\n    bold: li.bold ?? parent.bold,\n    italic: li.italic ?? parent.italic,\n    underline: li.underline ?? parent.underline,\n    strike: li.strike ?? parent.strike,\n    subscript: subSup.subscript,\n    superscript: subSup.superscript,\n    highlight: li.highlight ?? parent.highlight,\n    fontFamily: li.fontFamily ?? parent.fontFamily ?? \"Noto Sans JP\",\n  };\n}\n\nfunction paragraphProperties(parent: UlPositionedNode | OlPositionedNode) {\n  return {\n    align: parent.textAlign ?? \"left\",\n  };\n}\n\nfunction toRunStyle(\n  style: ReturnType<typeof resolveStyle>,\n): GlimpseTextRunStyle {\n  return {\n    fontSize: style.fontSize,\n    fontFace: style.fontFamily,\n    color: style.color,\n    bold: style.bold,\n    italic: style.italic,\n    underline: style.underline,\n    strike: style.strike,\n    subscript: style.subscript,\n    superscript: style.superscript,\n    highlight: style.highlight,\n  };\n}\n\nfunction buildListParagraphs(\n  items: LiNode[],\n  parent: UlPositionedNode | OlPositionedNode,\n): {\n  paragraphs: AddTextBoxParagraphInput[];\n  hyperlinks: (string | undefined)[];\n} {\n  const paragraphs: AddTextBoxParagraphInput[] = [];\n  const hyperlinks: (string | undefined)[] = [];\n  for (let i = 0; i < items.length; i++) {\n    const li = items[i];\n    const style = resolveStyle(li, parent);\n    const runs: AddTextBoxRunInput[] = [];\n    if (li.runs && li.runs.length > 0) {\n      for (const run of li.runs) {\n        const runSubSup = resolveSubSup(run, style);\n        runs.push({\n          text: run.text,\n          properties: createGlimpseRunProperties({\n            fontSize: run.fontSize ?? style.fontSize,\n            fontFace: run.fontFamily ?? style.fontFamily,\n            color: run.color ?? style.color,\n            bold: run.bold ?? style.bold,\n            italic: run.italic ?? style.italic,\n            underline: run.underline ?? style.underline,\n            strike: run.strike ?? style.strike,\n            subscript: runSubSup.subscript,\n            superscript: runSubSup.superscript,\n            highlight: run.highlight ?? style.highlight,\n          }),\n        });\n        hyperlinks.push(run.text ? run.href : undefined);\n      }\n    } else {\n      runs.push({\n        text: li.text,\n        properties: createGlimpseRunProperties(toRunStyle(style)),\n      });\n      hyperlinks.push(undefined);\n    }\n    paragraphs.push({\n      properties: paragraphProperties(parent),\n      runs,\n    });\n  }\n  return { paragraphs, hyperlinks };\n}\n\nexport function renderUlNode(node: UlPositionedNode, ctx: RenderContext): void {\n  const fontSizePx = node.fontSize ?? 24;\n  const fontFamily = node.fontFamily ?? \"Noto Sans JP\";\n  const content = getContentArea(node);\n\n  const { paragraphs, hyperlinks } = buildListParagraphs(node.items, node);\n  addGlimpseTextBox(ctx, content, {\n    fontSize: fontSizePx,\n    fontFace: fontFamily,\n    align: node.textAlign ?? \"left\",\n    valign: \"top\",\n    margin: 0,\n    color: node.color,\n    bold: node.bold,\n    italic: node.italic,\n    underline: node.underline,\n    strike: node.strike,\n    subscript: node.subscript,\n    superscript: node.superscript,\n    highlight: node.highlight,\n    paragraphs,\n    hyperlinks,\n    xmlTransform: listBulletXmlTransform({\n      kind: \"bullet\",\n      lineHeight: node.lineHeight,\n    }),\n  });\n}\n\nexport function renderOlNode(node: OlPositionedNode, ctx: RenderContext): void {\n  const fontSizePx = node.fontSize ?? 24;\n  const fontFamily = node.fontFamily ?? \"Noto Sans JP\";\n  const content = getContentArea(node);\n\n  const { paragraphs, hyperlinks } = buildListParagraphs(node.items, node);\n  addGlimpseTextBox(ctx, content, {\n    fontSize: fontSizePx,\n    fontFace: fontFamily,\n    align: node.textAlign ?? \"left\",\n    valign: \"top\",\n    margin: 0,\n    color: node.color,\n    bold: node.bold,\n    italic: node.italic,\n    underline: node.underline,\n    strike: node.strike,\n    subscript: node.subscript,\n    superscript: node.superscript,\n    highlight: node.highlight,\n    paragraphs,\n    hyperlinks,\n    xmlTransform: listBulletXmlTransform({\n      kind: \"number\",\n      scheme: node.numberType,\n      startAt: node.numberStartAt,\n      lineHeight: node.lineHeight,\n    }),\n  });\n}\n"],"mappings":"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"}

package/dist/renderPptx/nodes/matrix.js

@@ -1,6 +1,8 @@
-import { pxToIn, pxToPt } from "../units.js";
-import { stripHash } from "../utils/visualStyle.js";
+import { addGlimpseTextBox } from "../utils/glimpseTextBox.js";
+import { addGlimpseShape, createShapeBoundsInput, noShapeOutline, solidShapeFill } from "../utils/glimpseShape.js";
+import { addStraightLine } from "../utils/straightLine.js";
 import { measureMatrix } from "../../calcYogaLayout/measureCompositeNodes.js";
+import { stripHash } from "../utils/visualStyle.js";
 import { resolveScaledContentArea } from "../utils/scaleToFit.js";
 //#region src/renderPptx/nodes/matrix.ts
 function renderMatrixNode(node, ctx) {
@@ -23,34 +25,34 @@ function renderMatrixNode(node, ctx) {
 	const areaH = content.h - axisMargin * 2;
 	const centerX = areaX + areaW / 2;
 	const centerY = areaY + areaH / 2;
-	ctx.slide.addShape(ctx.pptx.ShapeType.line, {
-		x: pxToIn(areaX),
-		y: pxToIn(centerY),
-		w: pxToIn(areaW),
-		h: 0,
-		line: {
-			color: axisColor,
-			width: pxToPt(lineWidth)
-		}
+	addStraightLine(ctx, {
+		x1: areaX,
+		y1: centerY,
+		x2: areaX + areaW,
+		y2: centerY
+	}, {
+		color: axisColor,
+		lineWidth
 	});
-	ctx.slide.addShape(ctx.pptx.ShapeType.line, {
-		x: pxToIn(centerX),
-		y: pxToIn(areaY),
-		w: 0,
-		h: pxToIn(areaH),
-		line: {
-			color: axisColor,
-			width: pxToPt(lineWidth)
-		}
+	addStraightLine(ctx, {
+		x1: centerX,
+		y1: areaY,
+		x2: centerX,
+		y2: areaY + areaH
+	}, {
+		color: axisColor,
+		lineWidth
 	});
 	const axisLabelW = 120 * scaleFactor;
 	const axisLabelH = 24 * scaleFactor;
-	ctx.slide.addText(axes.x, {
-		x: pxToIn(centerX - axisLabelW / 2),
-		y: pxToIn(areaY + areaH + 8 * scaleFactor),
-		w: pxToIn(axisLabelW),
-		h: pxToIn(axisLabelH),
-		fontSize: pxToPt(12 * scaleFactor),
+	addGlimpseTextBox(ctx, {
+		x: centerX - axisLabelW / 2,
+		y: areaY + areaH + 8 * scaleFactor,
+		w: axisLabelW,
+		h: axisLabelH
+	}, {
+		text: axes.x,
+		fontSize: 12 * scaleFactor,
 		fontFace: "Noto Sans JP",
 		color: axisLabelColor,
 		align: "center",
@@ -58,12 +60,14 @@ function renderMatrixNode(node, ctx) {
 	});
 	const yLabelW = 100 * scaleFactor;
 	const yLabelH = 20 * scaleFactor;
-	ctx.slide.addText(axes.y, {
-		x: pxToIn(content.x + axisMargin / 2 - yLabelW / 2),
-		y: pxToIn(centerY - yLabelH / 2),
-		w: pxToIn(yLabelW),
-		h: pxToIn(yLabelH),
-		fontSize: pxToPt(12 * scaleFactor),
+	addGlimpseTextBox(ctx, {
+		x: content.x + axisMargin / 2 - yLabelW / 2,
+		y: centerY - yLabelH / 2,
+		w: yLabelW,
+		h: yLabelH
+	}, {
+		text: axes.y,
+		fontSize: 12 * scaleFactor,
 		fontFace: "Noto Sans JP",
 		color: axisLabelColor,
 		align: "center",
@@ -77,20 +81,30 @@ function renderMatrixNode(node, ctx) {
 		const itemX = areaX + item.x * areaW;
 		const itemY = areaY + (1 - item.y) * areaH;
 		const itemColor = item.color ?? defaultItemColor;
-		ctx.slide.addShape(ctx.pptx.ShapeType.ellipse, {
-			x: pxToIn(itemX - itemSize / 2),
-			y: pxToIn(itemY - itemSize / 2),
-			w: pxToIn(itemSize),
-			h: pxToIn(itemSize),
-			fill: { color: itemColor },
-			line: { type: "none" }
-		});
-		ctx.slide.addText(item.label, {
-			x: pxToIn(itemX - itemLabelW / 2),
-			y: pxToIn(itemY - itemSize / 2 - 20 * scaleFactor),
-			w: pxToIn(itemLabelW),
-			h: pxToIn(itemLabelH),
-			fontSize: pxToPt(11 * scaleFactor),
+		addGlimpseShape(ctx, {
+			preset: "ellipse",
+			...createShapeBoundsInput({
+				x: itemX - itemSize / 2,
+				y: itemY - itemSize / 2,
+				w: itemSize,
+				h: itemSize
+			}),
+			fill: solidShapeFill(itemColor),
+			outline: noShapeOutline()
+		}, {
+			x: itemX - itemSize / 2,
+			y: itemY - itemSize / 2,
+			w: itemSize,
+			h: itemSize
+		}, { fillColor: itemColor });
+		addGlimpseTextBox(ctx, {
+			x: itemX - itemLabelW / 2,
+			y: itemY - itemSize / 2 - 20 * scaleFactor,
+			w: itemLabelW,
+			h: itemLabelH
+		}, {
+			text: item.label,
+			fontSize: 11 * scaleFactor,
 			fontFace: "Noto Sans JP",
 			color: stripHash(item.textColor) ?? itemLabelColor,
 			bold: true,
@@ -104,45 +118,53 @@ function renderQuadrantLabels(ctx, quadrants, areaX, areaY, areaW, areaH, center
 	const quadrantInset = 10 * scaleFactor;
 	const quadrantW = areaW / 2 - 20 * scaleFactor;
 	const quadrantH = 48 * scaleFactor;
-	ctx.slide.addText(quadrants.topLeft, {
-		x: pxToIn(areaX + quadrantInset),
-		y: pxToIn(areaY + quadrantInset),
-		w: pxToIn(quadrantW),
-		h: pxToIn(quadrantH),
-		fontSize: pxToPt(quadrantFontSize),
+	addGlimpseTextBox(ctx, {
+		x: areaX + quadrantInset,
+		y: areaY + quadrantInset,
+		w: quadrantW,
+		h: quadrantH
+	}, {
+		text: quadrants.topLeft,
+		fontSize: quadrantFontSize,
 		fontFace: "Noto Sans JP",
 		color: quadrantColor,
 		align: "left",
 		valign: "top"
 	});
-	ctx.slide.addText(quadrants.topRight, {
-		x: pxToIn(centerX + quadrantInset),
-		y: pxToIn(areaY + quadrantInset),
-		w: pxToIn(quadrantW),
-		h: pxToIn(quadrantH),
-		fontSize: pxToPt(quadrantFontSize),
+	addGlimpseTextBox(ctx, {
+		x: centerX + quadrantInset,
+		y: areaY + quadrantInset,
+		w: quadrantW,
+		h: quadrantH
+	}, {
+		text: quadrants.topRight,
+		fontSize: quadrantFontSize,
 		fontFace: "Noto Sans JP",
 		color: quadrantColor,
 		align: "right",
 		valign: "top"
 	});
-	ctx.slide.addText(quadrants.bottomLeft, {
-		x: pxToIn(areaX + quadrantInset),
-		y: pxToIn(centerY + areaH / 2 - quadrantH - quadrantInset),
-		w: pxToIn(quadrantW),
-		h: pxToIn(quadrantH),
-		fontSize: pxToPt(quadrantFontSize),
+	addGlimpseTextBox(ctx, {
+		x: areaX + quadrantInset,
+		y: centerY + areaH / 2 - quadrantH - quadrantInset,
+		w: quadrantW,
+		h: quadrantH
+	}, {
+		text: quadrants.bottomLeft,
+		fontSize: quadrantFontSize,
 		fontFace: "Noto Sans JP",
 		color: quadrantColor,
 		align: "left",
 		valign: "bottom"
 	});
-	ctx.slide.addText(quadrants.bottomRight, {
-		x: pxToIn(centerX + quadrantInset),
-		y: pxToIn(centerY + areaH / 2 - quadrantH - quadrantInset),
-		w: pxToIn(quadrantW),
-		h: pxToIn(quadrantH),
-		fontSize: pxToPt(quadrantFontSize),
+	addGlimpseTextBox(ctx, {
+		x: centerX + quadrantInset,
+		y: centerY + areaH / 2 - quadrantH - quadrantInset,
+		w: quadrantW,
+		h: quadrantH
+	}, {
+		text: quadrants.bottomRight,
+		fontSize: quadrantFontSize,
 		fontFace: "Noto Sans JP",
 		color: quadrantColor,
 		align: "right",

package/dist/renderPptx/nodes/matrix.js.map

@@ -1 +1 @@
-{"version":3,"file":"matrix.js","names":[],"sources":["../../../src/renderPptx/nodes/matrix.ts"],"sourcesContent":["import type { PositionedNode } from \"../../types.ts\";\nimport type { RenderContext } from \"../types.ts\";\nimport { stripHash } from \"../utils/visualStyle.ts\";\nimport { pxToIn, pxToPt } from \"../units.ts\";\nimport { measureMatrix } from \"../../calcYogaLayout/measureCompositeNodes.ts\";\nimport { resolveScaledContentArea } from \"../utils/scaleToFit.ts\";\n\ntype MatrixPositionedNode = Extract<PositionedNode, { type: \"matrix\" }>;\n\nexport function renderMatrixNode(\n  node: MatrixPositionedNode,\n  ctx: RenderContext,\n): void {\n  const items = node.items;\n  const axes = node.axes;\n  const quadrants = node.quadrants;\n\n  const defaultItemColor = \"1D4ED8\"; // blue\n  const baseItemSize = 24; // px\n  const baseLineWidth = 2; // px\n  const axisColor = \"E2E8F0\";\n  const axisLabelColor = stripHash(node.axisLabelColor) ?? \"64748B\";\n  const itemLabelColor = stripHash(node.itemLabelColor) ?? \"1E293B\";\n\n  // スケール係数を計算（コンテンツ領域基準）\n  const { content, scaleFactor } = resolveScaledContentArea(\n    node,\n    measureMatrix(node),\n    ctx,\n  );\n\n  const itemSize = baseItemSize * scaleFactor;\n  const lineWidth = baseLineWidth * scaleFactor;\n\n  // マトリクスの描画領域（軸ラベル用の余白を考慮）\n  const axisMargin = 60 * scaleFactor; // 軸ラベル用の余白\n  const areaX = content.x + axisMargin;\n  const areaY = content.y + axisMargin;\n  const areaW = content.w - axisMargin * 2;\n  const areaH = content.h - axisMargin * 2;\n\n  // 中心座標\n  const centerX = areaX + areaW / 2;\n  const centerY = areaY + areaH / 2;\n\n  // === 1. 十字線（軸線）を描画 ===\n  // 横線（X軸）\n  ctx.slide.addShape(ctx.pptx.ShapeType.line, {\n    x: pxToIn(areaX),\n    y: pxToIn(centerY),\n    w: pxToIn(areaW),\n    h: 0,\n    line: { color: axisColor, width: pxToPt(lineWidth) },\n  });\n\n  // 縦線（Y軸）\n  ctx.slide.addShape(ctx.pptx.ShapeType.line, {\n    x: pxToIn(centerX),\n    y: pxToIn(areaY),\n    w: 0,\n    h: pxToIn(areaH),\n    line: { color: axisColor, width: pxToPt(lineWidth) },\n  });\n\n  // === 2. 軸ラベルを描画 ===\n  const axisLabelW = 120 * scaleFactor;\n  const axisLabelH = 24 * scaleFactor;\n\n  // X軸ラベル（下部中央）\n  ctx.slide.addText(axes.x, {\n    x: pxToIn(centerX - axisLabelW / 2),\n    y: pxToIn(areaY + areaH + 8 * scaleFactor),\n    w: pxToIn(axisLabelW),\n    h: pxToIn(axisLabelH),\n    fontSize: pxToPt(12 * scaleFactor),\n    fontFace: \"Noto Sans JP\",\n    color: axisLabelColor,\n    align: \"center\",\n    valign: \"top\",\n  });\n\n  // Y軸ラベル（左部中央）270° 回転で下から上読み。w が視覚的な高さになるため CJK 5 文字以上も収まる幅を確保\n  const yLabelW = 100 * scaleFactor;\n  const yLabelH = 20 * scaleFactor;\n  ctx.slide.addText(axes.y, {\n    x: pxToIn(content.x + axisMargin / 2 - yLabelW / 2),\n    y: pxToIn(centerY - yLabelH / 2),\n    w: pxToIn(yLabelW),\n    h: pxToIn(yLabelH),\n    fontSize: pxToPt(12 * scaleFactor),\n    fontFace: \"Noto Sans JP\",\n    color: axisLabelColor,\n    align: \"center\",\n    valign: \"middle\",\n    rotate: 270,\n  });\n\n  // === 3. 象限ラベルを描画 ===\n  if (quadrants) {\n    renderQuadrantLabels(\n      ctx,\n      quadrants,\n      areaX,\n      areaY,\n      areaW,\n      areaH,\n      centerX,\n      centerY,\n      scaleFactor,\n      stripHash(node.quadrantLabelColor) ?? \"94A3B8\",\n    );\n  }\n\n  // === 4. アイテムをプロット ===\n  const itemLabelW = 100 * scaleFactor;\n  const itemLabelH = 18 * scaleFactor;\n\n  for (const item of items) {\n    // 座標変換: (0,0)=左下, (1,1)=右上\n    // x: 0 -> areaX, 1 -> areaX + areaW\n    // y: 0 -> areaY + areaH, 1 -> areaY (反転)\n    const itemX = areaX + item.x * areaW;\n    const itemY = areaY + (1 - item.y) * areaH; // Y軸反転\n    const itemColor = item.color ?? defaultItemColor;\n\n    // 円を描画\n    ctx.slide.addShape(ctx.pptx.ShapeType.ellipse, {\n      x: pxToIn(itemX - itemSize / 2),\n      y: pxToIn(itemY - itemSize / 2),\n      w: pxToIn(itemSize),\n      h: pxToIn(itemSize),\n      fill: { color: itemColor },\n      line: { type: \"none\" as const },\n    });\n\n    // ラベルを描画（円の上）\n    ctx.slide.addText(item.label, {\n      x: pxToIn(itemX - itemLabelW / 2),\n      y: pxToIn(itemY - itemSize / 2 - 20 * scaleFactor),\n      w: pxToIn(itemLabelW),\n      h: pxToIn(itemLabelH),\n      fontSize: pxToPt(11 * scaleFactor),\n      fontFace: \"Noto Sans JP\",\n      color: stripHash(item.textColor) ?? itemLabelColor,\n      bold: true,\n      align: \"center\",\n      valign: \"bottom\",\n    });\n  }\n}\n\nfunction renderQuadrantLabels(\n  ctx: RenderContext,\n  quadrants: NonNullable<MatrixPositionedNode[\"quadrants\"]>,\n  areaX: number,\n  areaY: number,\n  areaW: number,\n  areaH: number,\n  centerX: number,\n  centerY: number,\n  scaleFactor: number,\n  quadrantColor: string,\n): void {\n  const quadrantFontSize = 11 * scaleFactor;\n  const quadrantInset = 10 * scaleFactor;\n  const quadrantW = areaW / 2 - 20 * scaleFactor;\n  const quadrantH = 48 * scaleFactor;\n\n  // 左上\n  ctx.slide.addText(quadrants.topLeft, {\n    x: pxToIn(areaX + quadrantInset),\n    y: pxToIn(areaY + quadrantInset),\n    w: pxToIn(quadrantW),\n    h: pxToIn(quadrantH),\n    fontSize: pxToPt(quadrantFontSize),\n    fontFace: \"Noto Sans JP\",\n    color: quadrantColor,\n    align: \"left\",\n    valign: \"top\",\n  });\n\n  // 右上\n  ctx.slide.addText(quadrants.topRight, {\n    x: pxToIn(centerX + quadrantInset),\n    y: pxToIn(areaY + quadrantInset),\n    w: pxToIn(quadrantW),\n    h: pxToIn(quadrantH),\n    fontSize: pxToPt(quadrantFontSize),\n    fontFace: \"Noto Sans JP\",\n    color: quadrantColor,\n    align: \"right\",\n    valign: \"top\",\n  });\n\n  // 左下\n  ctx.slide.addText(quadrants.bottomLeft, {\n    x: pxToIn(areaX + quadrantInset),\n    y: pxToIn(centerY + areaH / 2 - quadrantH - quadrantInset),\n    w: pxToIn(quadrantW),\n    h: pxToIn(quadrantH),\n    fontSize: pxToPt(quadrantFontSize),\n    fontFace: \"Noto Sans JP\",\n    color: quadrantColor,\n    align: \"left\",\n    valign: \"bottom\",\n  });\n\n  // 右下\n  ctx.slide.addText(quadrants.bottomRight, {\n    x: pxToIn(centerX + quadrantInset),\n    y: pxToIn(centerY + areaH / 2 - quadrantH - quadrantInset),\n    w: pxToIn(quadrantW),\n    h: pxToIn(quadrantH),\n    fontSize: pxToPt(quadrantFontSize),\n    fontFace: \"Noto Sans JP\",\n    color: quadrantColor,\n    align: \"right\",\n    valign: \"bottom\",\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"matrix.js","names":[],"sources":["../../../src/renderPptx/nodes/matrix.ts"],"sourcesContent":["import type { PositionedNode } from \"../../types.ts\";\nimport type { RenderContext } from \"../types.ts\";\nimport { stripHash } from \"../utils/visualStyle.ts\";\nimport { measureMatrix } from \"../../calcYogaLayout/measureCompositeNodes.ts\";\nimport { resolveScaledContentArea } from \"../utils/scaleToFit.ts\";\nimport { addStraightLine } from \"../utils/straightLine.ts\";\nimport {\n  addGlimpseShape,\n  createShapeBoundsInput,\n  noShapeOutline,\n  solidShapeFill,\n} from \"../utils/glimpseShape.ts\";\nimport { addGlimpseTextBox } from \"../utils/glimpseTextBox.ts\";\n\ntype MatrixPositionedNode = Extract<PositionedNode, { type: \"matrix\" }>;\n\nexport function renderMatrixNode(\n  node: MatrixPositionedNode,\n  ctx: RenderContext,\n): void {\n  const items = node.items;\n  const axes = node.axes;\n  const quadrants = node.quadrants;\n\n  const defaultItemColor = \"1D4ED8\"; // blue\n  const baseItemSize = 24; // px\n  const baseLineWidth = 2; // px\n  const axisColor = \"E2E8F0\";\n  const axisLabelColor = stripHash(node.axisLabelColor) ?? \"64748B\";\n  const itemLabelColor = stripHash(node.itemLabelColor) ?? \"1E293B\";\n\n  // スケール係数を計算（コンテンツ領域基準）\n  const { content, scaleFactor } = resolveScaledContentArea(\n    node,\n    measureMatrix(node),\n    ctx,\n  );\n\n  const itemSize = baseItemSize * scaleFactor;\n  const lineWidth = baseLineWidth * scaleFactor;\n\n  // マトリクスの描画領域（軸ラベル用の余白を考慮）\n  const axisMargin = 60 * scaleFactor; // 軸ラベル用の余白\n  const areaX = content.x + axisMargin;\n  const areaY = content.y + axisMargin;\n  const areaW = content.w - axisMargin * 2;\n  const areaH = content.h - axisMargin * 2;\n\n  // 中心座標\n  const centerX = areaX + areaW / 2;\n  const centerY = areaY + areaH / 2;\n\n  // === 1. 十字線（軸線）を描画 ===\n  // 横線（X軸）\n  addStraightLine(\n    ctx,\n    { x1: areaX, y1: centerY, x2: areaX + areaW, y2: centerY },\n    { color: axisColor, lineWidth },\n  );\n\n  // 縦線（Y軸）\n  addStraightLine(\n    ctx,\n    { x1: centerX, y1: areaY, x2: centerX, y2: areaY + areaH },\n    { color: axisColor, lineWidth },\n  );\n\n  // === 2. 軸ラベルを描画 ===\n  const axisLabelW = 120 * scaleFactor;\n  const axisLabelH = 24 * scaleFactor;\n\n  // X軸ラベル（下部中央）\n  addGlimpseTextBox(\n    ctx,\n    {\n      x: centerX - axisLabelW / 2,\n      y: areaY + areaH + 8 * scaleFactor,\n      w: axisLabelW,\n      h: axisLabelH,\n    },\n    {\n      text: axes.x,\n      fontSize: 12 * scaleFactor,\n      fontFace: \"Noto Sans JP\",\n      color: axisLabelColor,\n      align: \"center\",\n      valign: \"top\",\n    },\n  );\n\n  // Y軸ラベル（左部中央）270° 回転で下から上読み。w が視覚的な高さになるため CJK 5 文字以上も収まる幅を確保\n  const yLabelW = 100 * scaleFactor;\n  const yLabelH = 20 * scaleFactor;\n  addGlimpseTextBox(\n    ctx,\n    {\n      x: content.x + axisMargin / 2 - yLabelW / 2,\n      y: centerY - yLabelH / 2,\n      w: yLabelW,\n      h: yLabelH,\n    },\n    {\n      text: axes.y,\n      fontSize: 12 * scaleFactor,\n      fontFace: \"Noto Sans JP\",\n      color: axisLabelColor,\n      align: \"center\",\n      valign: \"middle\",\n      rotate: 270,\n    },\n  );\n\n  // === 3. 象限ラベルを描画 ===\n  if (quadrants) {\n    renderQuadrantLabels(\n      ctx,\n      quadrants,\n      areaX,\n      areaY,\n      areaW,\n      areaH,\n      centerX,\n      centerY,\n      scaleFactor,\n      stripHash(node.quadrantLabelColor) ?? \"94A3B8\",\n    );\n  }\n\n  // === 4. アイテムをプロット ===\n  const itemLabelW = 100 * scaleFactor;\n  const itemLabelH = 18 * scaleFactor;\n\n  for (const item of items) {\n    // 座標変換: (0,0)=左下, (1,1)=右上\n    // x: 0 -> areaX, 1 -> areaX + areaW\n    // y: 0 -> areaY + areaH, 1 -> areaY (反転)\n    const itemX = areaX + item.x * areaW;\n    const itemY = areaY + (1 - item.y) * areaH; // Y軸反転\n    const itemColor = item.color ?? defaultItemColor;\n\n    // 円を描画\n    addGlimpseShape(\n      ctx,\n      {\n        preset: \"ellipse\",\n        ...createShapeBoundsInput({\n          x: itemX - itemSize / 2,\n          y: itemY - itemSize / 2,\n          w: itemSize,\n          h: itemSize,\n        }),\n        fill: solidShapeFill(itemColor),\n        outline: noShapeOutline(),\n      },\n      {\n        x: itemX - itemSize / 2,\n        y: itemY - itemSize / 2,\n        w: itemSize,\n        h: itemSize,\n      },\n      { fillColor: itemColor },\n    );\n\n    // ラベルを描画（円の上）\n    addGlimpseTextBox(\n      ctx,\n      {\n        x: itemX - itemLabelW / 2,\n        y: itemY - itemSize / 2 - 20 * scaleFactor,\n        w: itemLabelW,\n        h: itemLabelH,\n      },\n      {\n        text: item.label,\n        fontSize: 11 * scaleFactor,\n        fontFace: \"Noto Sans JP\",\n        color: stripHash(item.textColor) ?? itemLabelColor,\n        bold: true,\n        align: \"center\",\n        valign: \"bottom\",\n      },\n    );\n  }\n}\n\nfunction renderQuadrantLabels(\n  ctx: RenderContext,\n  quadrants: NonNullable<MatrixPositionedNode[\"quadrants\"]>,\n  areaX: number,\n  areaY: number,\n  areaW: number,\n  areaH: number,\n  centerX: number,\n  centerY: number,\n  scaleFactor: number,\n  quadrantColor: string,\n): void {\n  const quadrantFontSize = 11 * scaleFactor;\n  const quadrantInset = 10 * scaleFactor;\n  const quadrantW = areaW / 2 - 20 * scaleFactor;\n  const quadrantH = 48 * scaleFactor;\n\n  // 左上\n  addGlimpseTextBox(\n    ctx,\n    {\n      x: areaX + quadrantInset,\n      y: areaY + quadrantInset,\n      w: quadrantW,\n      h: quadrantH,\n    },\n    {\n      text: quadrants.topLeft,\n      fontSize: quadrantFontSize,\n      fontFace: \"Noto Sans JP\",\n      color: quadrantColor,\n      align: \"left\",\n      valign: \"top\",\n    },\n  );\n\n  // 右上\n  addGlimpseTextBox(\n    ctx,\n    {\n      x: centerX + quadrantInset,\n      y: areaY + quadrantInset,\n      w: quadrantW,\n      h: quadrantH,\n    },\n    {\n      text: quadrants.topRight,\n      fontSize: quadrantFontSize,\n      fontFace: \"Noto Sans JP\",\n      color: quadrantColor,\n      align: \"right\",\n      valign: \"top\",\n    },\n  );\n\n  // 左下\n  addGlimpseTextBox(\n    ctx,\n    {\n      x: areaX + quadrantInset,\n      y: centerY + areaH / 2 - quadrantH - quadrantInset,\n      w: quadrantW,\n      h: quadrantH,\n    },\n    {\n      text: quadrants.bottomLeft,\n      fontSize: quadrantFontSize,\n      fontFace: \"Noto Sans JP\",\n      color: quadrantColor,\n      align: \"left\",\n      valign: \"bottom\",\n    },\n  );\n\n  // 右下\n  addGlimpseTextBox(\n    ctx,\n    {\n      x: centerX + quadrantInset,\n      y: centerY + areaH / 2 - quadrantH - quadrantInset,\n      w: quadrantW,\n      h: quadrantH,\n    },\n    {\n      text: quadrants.bottomRight,\n      fontSize: quadrantFontSize,\n      fontFace: \"Noto Sans JP\",\n      color: quadrantColor,\n      align: \"right\",\n      valign: \"bottom\",\n    },\n  );\n}\n"],"mappings":"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"}