@hirokisakabe/pom 1.4.0 → 3.0.0

package/dist/renderPptx/nodes/flow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flow.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,KAAK,kBAAkB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAWpE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,aAAa,GACjB,IAAI,CA0GN"}
+{"version":3,"file":"flow.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,kBAAkB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAWpE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,aAAa,GACjB,IAAI,CA6HN"}

package/dist/renderPptx/nodes/flow.js

@@ -1,4 +1,6 @@
 import { pxToIn, pxToPt } from "../units.js";
+import { measureFlow } from "../../calcYogaLayout/measureCompositeNodes.js";
+import { calcScaleFactor } from "../utils/scaleToFit.js";
 export function renderFlowNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const nodeWidth = node.nodeWidth ?? 120;
@@ -6,14 +8,20 @@ export function renderFlowNode(node, ctx) {
     const nodeGap = node.nodeGap ?? 80;
     const connectorStyle = node.connectorStyle ?? {};
     const defaultColor = "1D4ED8";
+    // スケール係数を計算
+    const intrinsic = measureFlow(node);
+    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "flow");
+    const scaledNodeWidth = nodeWidth * scaleFactor;
+    const scaledNodeHeight = nodeHeight * scaleFactor;
+    const scaledNodeGap = nodeGap * scaleFactor;
     const layouts = new Map();
     const nodeCount = node.nodes.length;
     // ノードのレイアウトを計算
     if (direction === "horizontal") {
-        calculateHorizontalLayout(node, layouts, nodeCount, nodeWidth, nodeHeight, nodeGap);
+        calculateHorizontalLayout(node, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
     }
     else {
-        calculateVerticalLayout(node, layouts, nodeCount, nodeWidth, nodeHeight, nodeGap);
+        calculateVerticalLayout(node, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
     }
     // 接続線を描画（ノードより先に描画して背面に配置）
     for (const conn of node.connections) {
@@ -22,7 +30,7 @@ export function renderFlowNode(node, ctx) {
         if (!fromLayout || !toLayout)
             continue;
         const lineColor = conn.color ?? connectorStyle.color ?? "333333";
-        const lineWidth = connectorStyle.width ?? 2;
+        const lineWidth = (connectorStyle.width ?? 2) * scaleFactor;
         const arrowType = connectorStyle.arrowType ?? "triangle";
         drawConnection(ctx, direction, fromLayout, toLayout, lineColor, lineWidth, arrowType);
         // ラベルを描画
@@ -37,12 +45,14 @@ export function renderFlowNode(node, ctx) {
                 toLayout.y +
                 toLayout.height / 2) /
                 2;
+            const labelW = 60 * scaleFactor;
+            const labelH = 20 * scaleFactor;
             ctx.slide.addText(conn.label, {
-                x: pxToIn(labelX - 30),
-                y: pxToIn(labelY - 10),
-                w: pxToIn(60),
-                h: pxToIn(20),
-                fontSize: pxToPt(10),
+                x: pxToIn(labelX - labelW / 2),
+                y: pxToIn(labelY - labelH / 2),
+                w: pxToIn(labelW),
+                h: pxToIn(labelH),
+                fontSize: pxToPt(10 * scaleFactor),
                 fontFace: "Noto Sans JP",
                 color: "64748B",
                 align: "center",
@@ -65,8 +75,8 @@ export function renderFlowNode(node, ctx) {
             h: pxToIn(layout.height),
             shape: item.shape,
             fill: { color: fillColor },
-            line: { color: "333333", width: pxToPt(1) },
-            fontSize: pxToPt(14),
+            line: { color: "333333", width: pxToPt(1 * scaleFactor) },
+            fontSize: pxToPt(14 * scaleFactor),
             fontFace: "Noto Sans JP",
             color: textColor,
             align: "center",
@@ -74,13 +84,13 @@ export function renderFlowNode(node, ctx) {
         });
     }
 }
-function calculateHorizontalLayout(node, layouts, nodeCount, nodeWidth, nodeHeight, nodeGap) {
+function calculateHorizontalLayout(node, layouts, nodeCount, nodeWidth, nodeHeight, nodeGap, scaleFactor) {
     const totalWidth = nodeCount * nodeWidth + (nodeCount - 1) * nodeGap;
     const startX = node.x + (node.w - totalWidth) / 2;
     const centerY = node.y + node.h / 2;
     node.nodes.forEach((item, index) => {
-        const w = item.width ?? nodeWidth;
-        const h = item.height ?? nodeHeight;
+        const w = (item.width ?? nodeWidth / scaleFactor) * scaleFactor;
+        const h = (item.height ?? nodeHeight / scaleFactor) * scaleFactor;
         layouts.set(item.id, {
             id: item.id,
             x: startX + index * (nodeWidth + nodeGap) + (nodeWidth - w) / 2,
@@ -91,13 +101,13 @@ function calculateHorizontalLayout(node, layouts, nodeCount, nodeWidth, nodeHeig
         });
     });
 }
-function calculateVerticalLayout(node, layouts, nodeCount, nodeWidth, nodeHeight, nodeGap) {
+function calculateVerticalLayout(node, layouts, nodeCount, nodeWidth, nodeHeight, nodeGap, scaleFactor) {
     const totalHeight = nodeCount * nodeHeight + (nodeCount - 1) * nodeGap;
     const startY = node.y + (node.h - totalHeight) / 2;
     const centerX = node.x + node.w / 2;
     node.nodes.forEach((item, index) => {
-        const w = item.width ?? nodeWidth;
-        const h = item.height ?? nodeHeight;
+        const w = (item.width ?? nodeWidth / scaleFactor) * scaleFactor;
+        const h = (item.height ?? nodeHeight / scaleFactor) * scaleFactor;
         layouts.set(item.id, {
             id: item.id,
             x: centerX - w / 2,

package/dist/renderPptx/nodes/index.d.ts

@@ -9,4 +9,5 @@ export { renderTreeNode } from "./tree.ts";
 export { renderFlowNode } from "./flow.ts";
 export { renderProcessArrowNode } from "./processArrow.ts";
 export { renderLineNode } from "./line.ts";
+export { renderUlNode, renderOlNode } from "./list.ts";
 //# sourceMappingURL=index.d.ts.map

package/dist/renderPptx/nodes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC"}

package/dist/renderPptx/nodes/index.js

@@ -9,3 +9,4 @@ export { renderTreeNode } from "./tree.js";
 export { renderFlowNode } from "./flow.js";
 export { renderProcessArrowNode } from "./processArrow.js";
 export { renderLineNode } from "./line.js";
+export { renderUlNode, renderOlNode } from "./list.js";

package/dist/renderPptx/nodes/list.d.ts

@@ -0,0 +1,12 @@
+import type { PositionedNode } from "../../types.ts";
+import type { RenderContext } from "../types.ts";
+type UlPositionedNode = Extract<PositionedNode, {
+    type: "ul";
+}>;
+type OlPositionedNode = Extract<PositionedNode, {
+    type: "ol";
+}>;
+export declare function renderUlNode(node: UlPositionedNode, ctx: RenderContext): void;
+export declare function renderOlNode(node: OlPositionedNode, ctx: RenderContext): void;
+export {};
+//# sourceMappingURL=list.d.ts.map

package/dist/renderPptx/nodes/list.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/list.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAU,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AAChE,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AA6BhE,wBAAgB,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CA2D7E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAiE7E"}

package/dist/renderPptx/nodes/list.js

@@ -0,0 +1,145 @@
+import { pxToIn, pxToPt } from "../units.js";
+import { convertUnderline, convertStrike } from "../textOptions.js";
+function resolveStyle(li, parent) {
+    return {
+        fontPx: li.fontPx ?? parent.fontPx ?? 24,
+        color: li.color ?? parent.color,
+        bold: li.bold ?? parent.bold,
+        italic: li.italic ?? parent.italic,
+        underline: li.underline ?? parent.underline,
+        strike: li.strike ?? parent.strike,
+        highlight: li.highlight ?? parent.highlight,
+        fontFamily: li.fontFamily ?? parent.fontFamily ?? "Noto Sans JP",
+    };
+}
+function hasItemStyleOverride(items) {
+    return items.some((li) => li.fontPx !== undefined ||
+        li.color !== undefined ||
+        li.bold !== undefined ||
+        li.italic !== undefined ||
+        li.underline !== undefined ||
+        li.strike !== undefined ||
+        li.highlight !== undefined ||
+        li.fontFamily !== undefined);
+}
+export function renderUlNode(node, ctx) {
+    const fontSizePx = node.fontPx ?? 24;
+    const fontFamily = node.fontFamily ?? "Noto Sans JP";
+    const lineSpacingMultiple = node.lineSpacingMultiple ?? 1.3;
+    if (hasItemStyleOverride(node.items)) {
+        // Li に個別スタイルがある場合は配列形式を使用
+        const textItems = node.items.map((li, i) => {
+            const style = resolveStyle(li, node);
+            return {
+                text: i < node.items.length - 1 ? li.text + "\n" : li.text,
+                options: {
+                    fontSize: pxToPt(style.fontPx),
+                    fontFace: style.fontFamily,
+                    color: style.color,
+                    bold: style.bold,
+                    italic: style.italic,
+                    underline: convertUnderline(style.underline),
+                    strike: convertStrike(style.strike),
+                    highlight: style.highlight,
+                    bullet: true,
+                },
+            };
+        });
+        ctx.slide.addText(textItems, {
+            x: pxToIn(node.x),
+            y: pxToIn(node.y),
+            w: pxToIn(node.w),
+            h: pxToIn(node.h),
+            align: node.alignText ?? "left",
+            valign: "top",
+            margin: 0,
+            lineSpacingMultiple,
+        });
+    }
+    else {
+        // Li にスタイルオーバーライドがない場合は単一文字列形式を使用
+        const text = node.items.map((li) => li.text).join("\n");
+        ctx.slide.addText(text, {
+            x: pxToIn(node.x),
+            y: pxToIn(node.y),
+            w: pxToIn(node.w),
+            h: pxToIn(node.h),
+            fontSize: pxToPt(fontSizePx),
+            fontFace: fontFamily,
+            align: node.alignText ?? "left",
+            valign: "top",
+            margin: 0,
+            lineSpacingMultiple,
+            color: node.color,
+            bold: node.bold,
+            italic: node.italic,
+            underline: convertUnderline(node.underline),
+            strike: convertStrike(node.strike),
+            highlight: node.highlight,
+            bullet: true,
+        });
+    }
+}
+export function renderOlNode(node, ctx) {
+    const fontSizePx = node.fontPx ?? 24;
+    const fontFamily = node.fontFamily ?? "Noto Sans JP";
+    const lineSpacingMultiple = node.lineSpacingMultiple ?? 1.3;
+    const bulletOptions = { type: "number" };
+    if (node.numberType !== undefined) {
+        bulletOptions.numberType = node.numberType;
+    }
+    if (node.numberStartAt !== undefined) {
+        bulletOptions.numberStartAt = node.numberStartAt;
+    }
+    if (hasItemStyleOverride(node.items)) {
+        const textItems = node.items.map((li, i) => {
+            const style = resolveStyle(li, node);
+            return {
+                text: i < node.items.length - 1 ? li.text + "\n" : li.text,
+                options: {
+                    fontSize: pxToPt(style.fontPx),
+                    fontFace: style.fontFamily,
+                    color: style.color,
+                    bold: style.bold,
+                    italic: style.italic,
+                    underline: convertUnderline(style.underline),
+                    strike: convertStrike(style.strike),
+                    highlight: style.highlight,
+                    bullet: bulletOptions,
+                },
+            };
+        });
+        ctx.slide.addText(textItems, {
+            x: pxToIn(node.x),
+            y: pxToIn(node.y),
+            w: pxToIn(node.w),
+            h: pxToIn(node.h),
+            align: node.alignText ?? "left",
+            valign: "top",
+            margin: 0,
+            lineSpacingMultiple,
+        });
+    }
+    else {
+        const text = node.items.map((li) => li.text).join("\n");
+        ctx.slide.addText(text, {
+            x: pxToIn(node.x),
+            y: pxToIn(node.y),
+            w: pxToIn(node.w),
+            h: pxToIn(node.h),
+            fontSize: pxToPt(fontSizePx),
+            fontFace: fontFamily,
+            align: node.alignText ?? "left",
+            valign: "top",
+            margin: 0,
+            lineSpacingMultiple,
+            color: node.color,
+            bold: node.bold,
+            italic: node.italic,
+            underline: convertUnderline(node.underline),
+            strike: convertStrike(node.strike),
+            highlight: node.highlight,
+            bullet: bulletOptions,
+        });
+    }
+}

package/dist/renderPptx/nodes/matrix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,KAAK,oBAAoB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAExE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,oBAAoB,EAC1B,GAAG,EAAE,aAAa,GACjB,IAAI,CAkHN"}
+{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,oBAAoB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAExE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,oBAAoB,EAC1B,GAAG,EAAE,aAAa,GACjB,IAAI,CAsIN"}

package/dist/renderPptx/nodes/matrix.js

@@ -1,14 +1,21 @@
 import { pxToIn, pxToPt } from "../units.js";
+import { measureMatrix } from "../../calcYogaLayout/measureCompositeNodes.js";
+import { calcScaleFactor } from "../utils/scaleToFit.js";
 export function renderMatrixNode(node, ctx) {
     const items = node.items;
     const axes = node.axes;
     const quadrants = node.quadrants;
     const defaultItemColor = "1D4ED8"; // blue
-    const itemSize = 24; // px
-    const lineWidth = 2; // px
+    const baseItemSize = 24; // px
+    const baseLineWidth = 2; // px
     const axisColor = "E2E8F0";
+    // スケール係数を計算
+    const intrinsic = measureMatrix(node);
+    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "matrix");
+    const itemSize = baseItemSize * scaleFactor;
+    const lineWidth = baseLineWidth * scaleFactor;
     // マトリクスの描画領域（パディングを考慮）
-    const padding = 60; // 軸ラベル用の余白
+    const padding = 60 * scaleFactor; // 軸ラベル用の余白
     const areaX = node.x + padding;
     const areaY = node.y + padding;
     const areaW = node.w - padding * 2;
@@ -34,13 +41,15 @@ export function renderMatrixNode(node, ctx) {
         line: { color: axisColor, width: pxToPt(lineWidth) },
     });
     // === 2. 軸ラベルを描画 ===
+    const axisLabelW = 120 * scaleFactor;
+    const axisLabelH = 24 * scaleFactor;
     // X軸ラベル（下部中央）
     ctx.slide.addText(axes.x, {
-        x: pxToIn(centerX - 60),
-        y: pxToIn(areaY + areaH + 8),
-        w: pxToIn(120),
-        h: pxToIn(24),
-        fontSize: pxToPt(12),
+        x: pxToIn(centerX - axisLabelW / 2),
+        y: pxToIn(areaY + areaH + 8 * scaleFactor),
+        w: pxToIn(axisLabelW),
+        h: pxToIn(axisLabelH),
+        fontSize: pxToPt(12 * scaleFactor),
         fontFace: "Noto Sans JP",
         color: "64748B",
         align: "center",
@@ -48,11 +57,11 @@ export function renderMatrixNode(node, ctx) {
     });
     // Y軸ラベル（左部中央）
     ctx.slide.addText(axes.y, {
-        x: pxToIn(node.x + 4),
-        y: pxToIn(centerY - 12),
-        w: pxToIn(48),
-        h: pxToIn(24),
-        fontSize: pxToPt(12),
+        x: pxToIn(node.x + 4 * scaleFactor),
+        y: pxToIn(centerY - 12 * scaleFactor),
+        w: pxToIn(48 * scaleFactor),
+        h: pxToIn(axisLabelH),
+        fontSize: pxToPt(12 * scaleFactor),
         fontFace: "Noto Sans JP",
         color: "64748B",
         align: "center",
@@ -60,9 +69,11 @@ export function renderMatrixNode(node, ctx) {
     });
     // === 3. 象限ラベルを描画 ===
     if (quadrants) {
-        renderQuadrantLabels(ctx, quadrants, areaX, areaY, areaW, areaH, centerX, centerY);
+        renderQuadrantLabels(ctx, quadrants, areaX, areaY, areaW, areaH, centerX, centerY, scaleFactor);
     }
     // === 4. アイテムをプロット ===
+    const itemLabelW = 100 * scaleFactor;
+    const itemLabelH = 18 * scaleFactor;
     for (const item of items) {
         // 座標変換: (0,0)=左下, (1,1)=右上
         // x: 0 -> areaX, 1 -> areaX + areaW
@@ -81,11 +92,11 @@ export function renderMatrixNode(node, ctx) {
         });
         // ラベルを描画（円の上）
         ctx.slide.addText(item.label, {
-            x: pxToIn(itemX - 50),
-            y: pxToIn(itemY - itemSize / 2 - 20),
-            w: pxToIn(100),
-            h: pxToIn(18),
-            fontSize: pxToPt(11),
+            x: pxToIn(itemX - itemLabelW / 2),
+            y: pxToIn(itemY - itemSize / 2 - 20 * scaleFactor),
+            w: pxToIn(itemLabelW),
+            h: pxToIn(itemLabelH),
+            fontSize: pxToPt(11 * scaleFactor),
             fontFace: "Noto Sans JP",
             color: "1E293B",
             bold: true,
@@ -94,15 +105,16 @@ export function renderMatrixNode(node, ctx) {
         });
     }
 }
-function renderQuadrantLabels(ctx, quadrants, areaX, areaY, areaW, areaH, centerX, centerY) {
-    const quadrantFontSize = 11;
+function renderQuadrantLabels(ctx, quadrants, areaX, areaY, areaW, areaH, centerX, centerY, scaleFactor) {
+    const quadrantFontSize = 11 * scaleFactor;
     const quadrantColor = "94A3B8"; // slate-400
-    const quadrantW = areaW / 2 - 20;
-    const quadrantH = 48;
+    const quadrantInset = 10 * scaleFactor;
+    const quadrantW = areaW / 2 - 20 * scaleFactor;
+    const quadrantH = 48 * scaleFactor;
     // 左上
     ctx.slide.addText(quadrants.topLeft, {
-        x: pxToIn(areaX + 10),
-        y: pxToIn(areaY + 10),
+        x: pxToIn(areaX + quadrantInset),
+        y: pxToIn(areaY + quadrantInset),
         w: pxToIn(quadrantW),
         h: pxToIn(quadrantH),
         fontSize: pxToPt(quadrantFontSize),
@@ -113,8 +125,8 @@ function renderQuadrantLabels(ctx, quadrants, areaX, areaY, areaW, areaH, center
     });
     // 右上
     ctx.slide.addText(quadrants.topRight, {
-        x: pxToIn(centerX + 10),
-        y: pxToIn(areaY + 10),
+        x: pxToIn(centerX + quadrantInset),
+        y: pxToIn(areaY + quadrantInset),
         w: pxToIn(quadrantW),
         h: pxToIn(quadrantH),
         fontSize: pxToPt(quadrantFontSize),
@@ -125,8 +137,8 @@ function renderQuadrantLabels(ctx, quadrants, areaX, areaY, areaW, areaH, center
     });
     // 左下
     ctx.slide.addText(quadrants.bottomLeft, {
-        x: pxToIn(areaX + 10),
-        y: pxToIn(centerY + areaH / 2 - quadrantH - 10),
+        x: pxToIn(areaX + quadrantInset),
+        y: pxToIn(centerY + areaH / 2 - quadrantH - quadrantInset),
         w: pxToIn(quadrantW),
         h: pxToIn(quadrantH),
         fontSize: pxToPt(quadrantFontSize),
@@ -137,8 +149,8 @@ function renderQuadrantLabels(ctx, quadrants, areaX, areaY, areaW, areaH, center
     });
     // 右下
     ctx.slide.addText(quadrants.bottomRight, {
-        x: pxToIn(centerX + 10),
-        y: pxToIn(centerY + areaH / 2 - quadrantH - 10),
+        x: pxToIn(centerX + quadrantInset),
+        y: pxToIn(centerY + areaH / 2 - quadrantH - quadrantInset),
         w: pxToIn(quadrantW),
         h: pxToIn(quadrantH),
         fontSize: pxToPt(quadrantFontSize),

package/dist/renderPptx/nodes/processArrow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processArrow.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/processArrow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,KAAK,0BAA0B,GAAG,OAAO,CACvC,cAAc,EACd;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CACzB,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,0BAA0B,EAChC,GAAG,EAAE,aAAa,GACjB,IAAI,CAsCN"}
+{"version":3,"file":"processArrow.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/processArrow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,KAAK,0BAA0B,GAAG,OAAO,CACvC,cAAc,EACd;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CACzB,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,0BAA0B,EAChC,GAAG,EAAE,aAAa,GACjB,IAAI,CAsDN"}

package/dist/renderPptx/nodes/processArrow.js

@@ -1,5 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { convertUnderline, convertStrike } from "../textOptions.js";
+import { measureProcessArrow } from "../../calcYogaLayout/measureCompositeNodes.js";
+import { calcScaleFactor } from "../utils/scaleToFit.js";
 export function renderProcessArrowNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const steps = node.steps;
@@ -11,14 +13,20 @@ export function renderProcessArrowNode(node, ctx) {
     const itemWidth = node.itemWidth ?? 150;
     const itemHeight = node.itemHeight ?? 60;
     const gap = node.gap ?? -15; // 負の値でシェブロンを重ねる
+    // スケール係数を計算
+    const intrinsic = measureProcessArrow(node);
+    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "processArrow");
+    const scaledItemWidth = itemWidth * scaleFactor;
+    const scaledItemHeight = itemHeight * scaleFactor;
+    const scaledGap = gap * scaleFactor;
     if (direction === "horizontal") {
-        renderHorizontalProcessArrow(node, ctx, steps, stepCount, itemWidth, itemHeight, gap, defaultColor, defaultTextColor);
+        renderHorizontalProcessArrow(node, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, defaultColor, defaultTextColor, scaleFactor);
     }
     else {
-        renderVerticalProcessArrow(node, ctx, steps, stepCount, itemWidth, itemHeight, gap, defaultColor, defaultTextColor);
+        renderVerticalProcessArrow(node, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, defaultColor, defaultTextColor, scaleFactor);
     }
 }
-function renderHorizontalProcessArrow(node, ctx, steps, stepCount, itemWidth, itemHeight, gap, defaultColor, defaultTextColor) {
+function renderHorizontalProcessArrow(node, ctx, steps, stepCount, itemWidth, itemHeight, gap, defaultColor, defaultTextColor, scaleFactor) {
     const totalWidth = stepCount * itemWidth + (stepCount - 1) * gap;
     const startX = node.x + (node.w - totalWidth) / 2;
     const centerY = node.y + node.h / 2;
@@ -37,7 +45,7 @@ function renderHorizontalProcessArrow(node, ctx, steps, stepCount, itemWidth, it
             shape: shapeType,
             fill: { color: fillColor },
             line: { type: "none" },
-            fontSize: pxToPt(node.fontPx ?? 14),
+            fontSize: pxToPt((node.fontPx ?? 14) * scaleFactor),
             fontFace: "Noto Sans JP",
             color: textColor,
             bold: node.bold ?? false,
@@ -50,7 +58,7 @@ function renderHorizontalProcessArrow(node, ctx, steps, stepCount, itemWidth, it
         });
     });
 }
-function renderVerticalProcessArrow(node, ctx, steps, stepCount, itemWidth, itemHeight, gap, defaultColor, defaultTextColor) {
+function renderVerticalProcessArrow(node, ctx, steps, stepCount, itemWidth, itemHeight, gap, defaultColor, defaultTextColor, scaleFactor) {
     const totalHeight = stepCount * itemHeight + (stepCount - 1) * gap;
     const startY = node.y + (node.h - totalHeight) / 2;
     const centerX = node.x + node.w / 2;
@@ -69,7 +77,7 @@ function renderVerticalProcessArrow(node, ctx, steps, stepCount, itemWidth, item
             shape: shapeType,
             fill: { color: fillColor },
             line: { type: "none" },
-            fontSize: pxToPt(node.fontPx ?? 14),
+            fontSize: pxToPt((node.fontPx ?? 14) * scaleFactor),
             fontFace: "Noto Sans JP",
             color: textColor,
             bold: node.bold ?? false,

package/dist/renderPptx/nodes/shape.js

@@ -36,7 +36,7 @@ export function renderShapeNode(node, ctx) {
             ...shapeOptions,
             shape: node.shapeType,
             fontSize: pxToPt(node.fontPx ?? 24),
-            fontFace: "Noto Sans JP",
+            fontFace: node.fontFamily ?? "Noto Sans JP",
             color: node.color,
             bold: node.bold,
             italic: node.italic,
@@ -45,7 +45,7 @@ export function renderShapeNode(node, ctx) {
             highlight: node.highlight,
             align: node.alignText ?? "center",
             valign: "middle",
-            lineSpacingMultiple: 1.3,
+            lineSpacingMultiple: node.lineSpacingMultiple ?? 1.3,
         });
     }
     else {

package/dist/renderPptx/nodes/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAEtE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,GACjB,IAAI,CAmCN"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQjD,KAAK,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAEtE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,aAAa,GACjB,IAAI,CAmCN"}

package/dist/renderPptx/nodes/table.js

@@ -1,4 +1,4 @@
-import { resolveColumnWidths, resolveRowHeights } from "../../table/utils.js";
+import { resolveColumnWidths, resolveRowHeights, } from "../../shared/tableUtils.js";
 import { pxToIn, pxToPt } from "../units.js";
 import { convertUnderline, convertStrike } from "../textOptions.js";
 export function renderTableNode(node, ctx) {

package/dist/renderPptx/nodes/timeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeline.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/timeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,KAAK,sBAAsB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAAC;AAE5E,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,sBAAsB,EAC5B,GAAG,EAAE,aAAa,GACjB,IAAI,CA8BN"}
+{"version":3,"file":"timeline.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/timeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,sBAAsB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAAC;AAE5E,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,sBAAsB,EAC5B,GAAG,EAAE,aAAa,GACjB,IAAI,CA6CN"}