@hirokisakabe/pom 5.4.0 → 5.5.0

package/dist/registry/definitions/layer.js

@@ -1,14 +1,14 @@
-import { toPositioned, omitYogaNode } from "../../toPositioned/toPositioned.js";
+import { toPositioned } from "../../toPositioned/toPositioned.js";
 export const layerNodeDef = {
     type: "layer",
     category: "absolute-child",
     // applyYogaStyle: layer は子を絶対配置するコンテナ。サイズは明示的に指定されることを期待
-    toPositioned(pom, absoluteX, absoluteY, layout, ctx) {
+    toPositioned(pom, absoluteX, absoluteY, layout, ctx, map) {
         const n = pom;
         // layer の子要素は layer 内の相対座標（child.x, child.y）を持つ
         // layer の絶対座標に加算してスライド上の絶対座標に変換
         return {
-            ...omitYogaNode(n),
+            ...n,
             x: absoluteX,
             y: absoluteY,
             w: layout.width,
@@ -26,7 +26,7 @@ export const layerNodeDef = {
                     const adjustedX2 = child.x2 + lineAbsoluteX;
                     const adjustedY2 = child.y2 + lineAbsoluteY;
                     return {
-                        ...omitYogaNode(child),
+                        ...child,
                         x1: adjustedX1,
                         y1: adjustedY1,
                         x2: adjustedX2,
@@ -38,10 +38,13 @@ export const layerNodeDef = {
                     };
                 }
                 // その他のノードは通常の処理
-                const childLayout = child.yogaNode.getComputedLayout();
+                const childLayout = map.get(child);
+                if (!childLayout) {
+                    throw new Error("Layout result not found in map for layer child");
+                }
                 const adjustedParentX = absoluteX + childX - childLayout.left;
                 const adjustedParentY = absoluteY + childY - childLayout.top;
-                return toPositioned(child, ctx, adjustedParentX, adjustedParentY);
+                return toPositioned(child, ctx, map, adjustedParentX, adjustedParentY);
             }),
         };
     },

package/dist/registry/definitions/line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/line.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,eAAO,MAAM,WAAW,EAAE,cAuBzB,CAAC"}
+{"version":3,"file":"line.d.ts","sourceRoot":"","sources":["../../../src/registry/definitions/line.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,eAAO,MAAM,WAAW,EAAE,cAuBzB,CAAC"}

package/dist/registry/definitions/line.js

@@ -1,5 +1,4 @@
 import { renderLineNode } from "../../renderPptx/nodes/line.js";
-import { omitYogaNode } from "../../toPositioned/toPositioned.js";
 export const lineNodeDef = {
     type: "line",
     category: "leaf",
@@ -13,7 +12,7 @@ export const lineNodeDef = {
         // line ノードは絶対座標（x1, y1, x2, y2）を持つため、
         // yogaNode の座標ではなく自身の座標からバウンディングボックスを計算
         return {
-            ...omitYogaNode(n),
+            ...n,
             x: Math.min(n.x1, n.x2),
             y: Math.min(n.y1, n.y2),
             w: Math.abs(n.x2 - n.x1),

package/dist/registry/types.d.ts

@@ -3,6 +3,7 @@ import type { Node as YogaNode } from "yoga-layout";
 import type { RenderContext } from "../renderPptx/types.ts";
 import type { loadYoga } from "yoga-layout/load";
 import type { BuildContext } from "../buildContext.ts";
+import type { LayoutResultMap } from "../calcYogaLayout/types.ts";
 export type Yoga = Awaited<ReturnType<typeof loadYoga>>;
 /** ノードのカテゴリ。子要素の扱い方を決定する */
 export type NodeCategory = "leaf" | "single-child" | "multi-child" | "absolute-child";
@@ -17,7 +18,7 @@ export interface NodeDefinition {
     toPositioned?: (pom: POMNode, absoluteX: number, absoluteY: number, layout: {
         width: number;
         height: number;
-    }, ctx: BuildContext) => PositionedNode;
+    }, ctx: BuildContext, map: LayoutResultMap) => PositionedNode;
     /** PositionedNode をスライドにレンダリングする（リーフノード用） */
     render?: (node: PositionedNode, ctx: RenderContext) => void;
     /** 画像ソース収集（prefetch 用） */

package/dist/registry/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/registry/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC;AAExD,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,cAAc,GACd,aAAa,GACb,gBAAgB,CAAC;AAErB,MAAM,WAAW,cAAc;IAC7B,cAAc;IACd,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtB,cAAc;IACd,QAAQ,EAAE,YAAY,CAAC;IAEvB,6CAA6C;IAC7C,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,OAAO,EACb,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,YAAY,KACd,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,kEAAkE;IAClE,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EACzC,GAAG,EAAE,YAAY,KACd,cAAc,CAAC;IAEpB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAE5D,0BAA0B;IAC1B,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,EAAE,CAAC;CACnD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/registry/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC;AAExD,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,cAAc,GACd,aAAa,GACb,gBAAgB,CAAC;AAErB,MAAM,WAAW,cAAc;IAC7B,cAAc;IACd,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtB,cAAc;IACd,QAAQ,EAAE,YAAY,CAAC;IAEvB,6CAA6C;IAC7C,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,OAAO,EACb,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,YAAY,KACd,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,kEAAkE;IAClE,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EACzC,GAAG,EAAE,YAAY,EACjB,GAAG,EAAE,eAAe,KACjB,cAAc,CAAC;IAEpB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAE5D,0BAA0B;IAC1B,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,EAAE,CAAC;CACnD"}

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

@@ -1 +1 @@
-{"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/chart.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,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,CAwBN"}
+{"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/chart.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,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,CAyBN"}

package/dist/renderPptx/nodes/chart.js

@@ -1,15 +1,17 @@
 import { pxToIn } from "../units.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderChartNode(node, ctx) {
     const chartData = node.data.map((d) => ({
         name: d.name,
         labels: d.labels,
         values: d.values,
     }));
+    const content = getContentArea(node);
     const chartOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
         showLegend: node.showLegend ?? false,
         showTitle: node.showTitle ?? false,
         title: node.title,

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;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"}
+{"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;AAMjD,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,CAwIN"}

package/dist/renderPptx/nodes/flow.js

@@ -1,6 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { measureFlow } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderFlowNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const nodeWidth = node.nodeWidth ?? 120;
@@ -8,20 +9,29 @@ export function renderFlowNode(node, ctx) {
     const nodeGap = node.nodeGap ?? 80;
     const connectorStyle = node.connectorStyle ?? {};
     const defaultColor = "1D4ED8";
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measureFlow(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "flow");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "flow", ctx.buildContext.diagnostics);
     const scaledNodeWidth = nodeWidth * scaleFactor;
     const scaledNodeHeight = nodeHeight * scaleFactor;
     const scaledNodeGap = nodeGap * scaleFactor;
     const layouts = new Map();
     const nodeCount = node.nodes.length;
+    // コンテンツ領域を使用するための仮想ノードを作成
+    const contentNode = {
+        ...node,
+        x: content.x,
+        y: content.y,
+        w: content.w,
+        h: content.h,
+    };
     // ノードのレイアウトを計算
     if (direction === "horizontal") {
-        calculateHorizontalLayout(node, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
+        calculateHorizontalLayout(contentNode, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
     }
     else {
-        calculateVerticalLayout(node, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
+        calculateVerticalLayout(contentNode, layouts, nodeCount, scaledNodeWidth, scaledNodeHeight, scaledNodeGap, scaleFactor);
     }
     // 接続線を描画（ノードより先に描画して背面に配置）
     for (const conn of node.connections) {

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

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/image.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,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":"image.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/image.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,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,CAoCN"}

package/dist/renderPptx/nodes/image.js

@@ -1,10 +1,12 @@
 import { pxToIn } from "../units.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderImageNode(node, ctx) {
+    const content = getContentArea(node);
     const imageOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
         shadow: node.shadow
             ? {
                 type: node.shadow.type,
@@ -19,8 +21,8 @@ export function renderImageNode(node, ctx) {
     if (node.sizing) {
         imageOptions.sizing = {
             type: node.sizing.type,
-            w: pxToIn(node.sizing.w ?? node.w),
-            h: pxToIn(node.sizing.h ?? node.h),
+            w: pxToIn(node.sizing.w ?? content.w),
+            h: pxToIn(node.sizing.h ?? content.h),
             ...(node.sizing.x !== undefined && { x: pxToIn(node.sizing.x) }),
             ...(node.sizing.y !== undefined && { y: pxToIn(node.sizing.y) }),
         };

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

@@ -1 +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"}
+{"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;AAKjD,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,CA4D7E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAkE7E"}

package/dist/renderPptx/nodes/list.js

@@ -1,5 +1,6 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { convertUnderline, convertStrike } from "../textOptions.js";
+import { getContentArea } from "../utils/contentArea.js";
 function resolveStyle(li, parent) {
     return {
         fontSize: li.fontSize ?? parent.fontSize ?? 24,
@@ -26,6 +27,7 @@ export function renderUlNode(node, ctx) {
     const fontSizePx = node.fontSize ?? 24;
     const fontFamily = node.fontFamily ?? "Noto Sans JP";
     const lineHeight = node.lineHeight ?? 1.3;
+    const content = getContentArea(node);
     if (hasItemStyleOverride(node.items)) {
         // Li に個別スタイルがある場合は配列形式を使用
         const textItems = node.items.map((li, i) => {
@@ -46,10 +48,10 @@ export function renderUlNode(node, ctx) {
             };
         });
         ctx.slide.addText(textItems, {
-            x: pxToIn(node.x),
-            y: pxToIn(node.y),
-            w: pxToIn(node.w),
-            h: pxToIn(node.h),
+            x: pxToIn(content.x),
+            y: pxToIn(content.y),
+            w: pxToIn(content.w),
+            h: pxToIn(content.h),
             align: node.textAlign ?? "left",
             valign: "top",
             margin: 0,
@@ -60,10 +62,10 @@ export function renderUlNode(node, ctx) {
         // 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),
+            x: pxToIn(content.x),
+            y: pxToIn(content.y),
+            w: pxToIn(content.w),
+            h: pxToIn(content.h),
             fontSize: pxToPt(fontSizePx),
             fontFace: fontFamily,
             align: node.textAlign ?? "left",
@@ -84,6 +86,7 @@ export function renderOlNode(node, ctx) {
     const fontSizePx = node.fontSize ?? 24;
     const fontFamily = node.fontFamily ?? "Noto Sans JP";
     const lineHeight = node.lineHeight ?? 1.3;
+    const content = getContentArea(node);
     const bulletOptions = { type: "number" };
     if (node.numberType !== undefined) {
         bulletOptions.numberType = node.numberType;
@@ -110,10 +113,10 @@ export function renderOlNode(node, ctx) {
             };
         });
         ctx.slide.addText(textItems, {
-            x: pxToIn(node.x),
-            y: pxToIn(node.y),
-            w: pxToIn(node.w),
-            h: pxToIn(node.h),
+            x: pxToIn(content.x),
+            y: pxToIn(content.y),
+            w: pxToIn(content.w),
+            h: pxToIn(content.h),
             align: node.textAlign ?? "left",
             valign: "top",
             margin: 0,
@@ -123,10 +126,10 @@ export function renderOlNode(node, ctx) {
     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),
+            x: pxToIn(content.x),
+            y: pxToIn(content.y),
+            w: pxToIn(content.w),
+            h: pxToIn(content.h),
             fontSize: pxToPt(fontSizePx),
             fontFace: fontFamily,
             align: node.textAlign ?? "left",

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;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"}
+{"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;AAMjD,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,CAwIN"}

package/dist/renderPptx/nodes/matrix.js

@@ -1,6 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { measureMatrix } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderMatrixNode(node, ctx) {
     const items = node.items;
     const axes = node.axes;
@@ -9,17 +10,18 @@ export function renderMatrixNode(node, ctx) {
     const baseItemSize = 24; // px
     const baseLineWidth = 2; // px
     const axisColor = "E2E8F0";
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measureMatrix(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "matrix");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "matrix", ctx.buildContext.diagnostics);
     const itemSize = baseItemSize * scaleFactor;
     const lineWidth = baseLineWidth * scaleFactor;
-    // マトリクスの描画領域（パディングを考慮）
-    const padding = 60 * scaleFactor; // 軸ラベル用の余白
-    const areaX = node.x + padding;
-    const areaY = node.y + padding;
-    const areaW = node.w - padding * 2;
-    const areaH = node.h - padding * 2;
+    // マトリクスの描画領域（軸ラベル用の余白を考慮）
+    const axisMargin = 60 * scaleFactor; // 軸ラベル用の余白
+    const areaX = content.x + axisMargin;
+    const areaY = content.y + axisMargin;
+    const areaW = content.w - axisMargin * 2;
+    const areaH = content.h - axisMargin * 2;
     // 中心座標
     const centerX = areaX + areaW / 2;
     const centerY = areaY + areaH / 2;
@@ -57,7 +59,7 @@ export function renderMatrixNode(node, ctx) {
     });
     // Y軸ラベル（左部中央）
     ctx.slide.addText(axes.y, {
-        x: pxToIn(node.x + 4 * scaleFactor),
+        x: pxToIn(content.x + 4 * scaleFactor),
         y: pxToIn(centerY - 12 * scaleFactor),
         w: pxToIn(48 * scaleFactor),
         h: pxToIn(axisLabelH),

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;AAWjD,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,CA0DN"}
+{"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;AAYjD,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,CAqEN"}

package/dist/renderPptx/nodes/processArrow.js

@@ -3,6 +3,7 @@ import { convertUnderline, convertStrike } from "../textOptions.js";
 import { measureProcessArrow } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
 import { ARROW_DEPTH_RATIO, DEFAULT_PROCESS_ARROW_ITEM_WIDTH, DEFAULT_PROCESS_ARROW_ITEM_HEIGHT, } from "../../shared/processArrowConstants.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderProcessArrowNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const steps = node.steps;
@@ -15,18 +16,27 @@ export function renderProcessArrowNode(node, ctx) {
     const itemHeight = node.itemHeight ?? DEFAULT_PROCESS_ARROW_ITEM_HEIGHT;
     const arrowDepth = itemHeight * ARROW_DEPTH_RATIO;
     const gap = node.gap ?? -arrowDepth;
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measureProcessArrow(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "processArrow");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "processArrow", ctx.buildContext.diagnostics);
     const scaledItemWidth = itemWidth * scaleFactor;
     const scaledItemHeight = itemHeight * scaleFactor;
     const scaledGap = gap * scaleFactor;
     const scaledArrowDepth = arrowDepth * scaleFactor;
+    // コンテンツ領域を使用するための仮想ノードを作成
+    const contentNode = {
+        ...node,
+        x: content.x,
+        y: content.y,
+        w: content.w,
+        h: content.h,
+    };
     if (direction === "horizontal") {
-        renderHorizontalProcessArrow(node, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, scaledArrowDepth, defaultColor, defaultTextColor, scaleFactor);
+        renderHorizontalProcessArrow(contentNode, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, scaledArrowDepth, defaultColor, defaultTextColor, scaleFactor);
     }
     else {
-        renderVerticalProcessArrow(node, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, scaledArrowDepth, defaultColor, defaultTextColor, scaleFactor);
+        renderVerticalProcessArrow(contentNode, ctx, steps, stepCount, scaledItemWidth, scaledItemHeight, scaledGap, scaledArrowDepth, defaultColor, defaultTextColor, scaleFactor);
     }
 }
 function renderHorizontalProcessArrow(node, ctx, steps, stepCount, itemWidth, itemHeight, gap, arrowDepth, defaultColor, defaultTextColor, scaleFactor) {

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

@@ -1 +1 @@
-{"version":3,"file":"pyramid.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/pyramid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,KAAK,qBAAqB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC;AAE1E,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,qBAAqB,EAC3B,GAAG,EAAE,aAAa,GACjB,IAAI,CAgGN"}
+{"version":3,"file":"pyramid.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/pyramid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,KAAK,qBAAqB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC;AAE1E,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,qBAAqB,EAC3B,GAAG,EAAE,aAAa,GACjB,IAAI,CAkGN"}

package/dist/renderPptx/nodes/pyramid.js

@@ -1,6 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { measurePyramid } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderPyramidNode(node, ctx) {
     const direction = node.direction ?? "up";
     const levels = node.levels;
@@ -9,15 +10,16 @@ export function renderPyramidNode(node, ctx) {
         return;
     const defaultColor = "4472C4";
     const defaultTextColor = "FFFFFF";
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measurePyramid(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "pyramid");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "pyramid", ctx.buildContext.diagnostics);
     const baseWidth = 400 * scaleFactor;
     const layerHeight = 50 * scaleFactor;
     const gap = 2 * scaleFactor;
     const totalHeight = levelCount * layerHeight + (levelCount - 1) * gap;
-    const startX = node.x + (node.w - baseWidth) / 2;
-    const startY = node.y + (node.h - totalHeight) / 2;
+    const startX = content.x + (content.w - baseWidth) / 2;
+    const startY = content.y + (content.h - totalHeight) / 2;
     for (let i = 0; i < levelCount; i++) {
         const level = levels[i];
         const fillColor = level.color?.replace("#", "") ?? defaultColor;

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

@@ -1 +1 @@
-{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/shape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,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,CAqDN"}
+{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/shape.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,CAsDN"}

package/dist/renderPptx/nodes/shape.js

@@ -1,11 +1,13 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { convertUnderline, convertStrike } from "../textOptions.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderShapeNode(node, ctx) {
+    const content = getContentArea(node);
     const shapeOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
         fill: node.fill
             ? {
                 color: node.fill.color,

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;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,CAqCN"}
+{"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;AASjD,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,CAsCN"}

package/dist/renderPptx/nodes/table.js

@@ -1,6 +1,7 @@
 import { resolveColumnWidths, resolveRowHeights, } from "../../shared/tableUtils.js";
 import { pxToIn, pxToPt } from "../units.js";
 import { convertUnderline, convertStrike } from "../textOptions.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderTableNode(node, ctx) {
     const tableRows = node.rows.map((row) => row.cells.map((cell) => {
         const cellOptions = {
@@ -23,12 +24,13 @@ export function renderTableNode(node, ctx) {
             options: cellOptions,
         };
     }));
+    const content = getContentArea(node);
     const tableOptions = {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
-        colW: resolveColumnWidths(node, node.w).map((width) => pxToIn(width)),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
+        colW: resolveColumnWidths(node, content.w).map((width) => pxToIn(width)),
         rowH: resolveRowHeights(node).map((height) => pxToIn(height)),
         margin: 0,
     };

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;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"}
+{"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;AAMjD,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,CAwDN"}

package/dist/renderPptx/nodes/timeline.js

@@ -1,6 +1,7 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { measureTimeline } from "../../calcYogaLayout/measureCompositeNodes.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderTimelineNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const items = node.items;
@@ -10,16 +11,25 @@ export function renderTimelineNode(node, ctx) {
     const defaultColor = "1D4ED8"; // blue
     const baseNodeRadius = 12; // px
     const baseLineWidth = 4; // px
-    // スケール係数を計算
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
     const intrinsic = measureTimeline(node);
-    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "timeline");
+    const scaleFactor = calcScaleFactor(content.w, content.h, intrinsic.width, intrinsic.height, "timeline", ctx.buildContext.diagnostics);
     const nodeRadius = baseNodeRadius * scaleFactor;
     const lineWidth = baseLineWidth * scaleFactor;
+    // コンテンツ領域を使用するための仮想ノードを作成
+    const contentNode = {
+        ...node,
+        x: content.x,
+        y: content.y,
+        w: content.w,
+        h: content.h,
+    };
     if (direction === "horizontal") {
-        renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
+        renderHorizontalTimeline(contentNode, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
     }
     else {
-        renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
+        renderVerticalTimeline(contentNode, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
     }
 }
 function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor) {

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

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/tree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAIf,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,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,CAwSN"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/nodes/tree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EAIf,MAAM,gBAAgB,CAAC;AACxB,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,CA0SN"}

package/dist/renderPptx/nodes/tree.js

@@ -1,5 +1,6 @@
 import { pxToIn, pxToPt } from "../units.js";
 import { calcScaleFactor } from "../utils/scaleToFit.js";
+import { getContentArea } from "../utils/contentArea.js";
 export function renderTreeNode(node, ctx) {
     const layout = node.layout ?? "vertical";
     const nodeShape = node.nodeShape ?? "rect";
@@ -217,13 +218,14 @@ export function renderTreeNode(node, ctx) {
     }
     // ツリーのサイズを計算
     const treeSize = calculateSubtreeSize(node.data);
-    // スケール係数を計算
-    const scaleFactor = calcScaleFactor(node.w, node.h, treeSize.width, treeSize.height, "tree");
+    // スケール係数を計算（コンテンツ領域基準）
+    const content = getContentArea(node);
+    const scaleFactor = calcScaleFactor(content.w, content.h, treeSize.width, treeSize.height, "tree", ctx.buildContext.diagnostics);
     // スケール後のサイズで中央配置オフセットを計算
     const scaledW = treeSize.width * scaleFactor;
     const scaledH = treeSize.height * scaleFactor;
-    const offsetX = node.x + (node.w - scaledW) / 2;
-    const offsetY = node.y + (node.h - scaledH) / 2;
+    const offsetX = content.x + (content.w - scaledW) / 2;
+    const offsetY = content.y + (content.h - scaledH) / 2;
     // レイアウト計算（原点(0,0)からの相対座標）
     const rootLayout = calculateTreeLayout(node.data, 0, 0);
     // 描画（接続線を先に、ノードを後に描画）

package/dist/renderPptx/textOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textOptions.d.ts","sourceRoot":"","sources":["../../src/renderPptx/textOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7E,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1D;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B;IAAE,KAAK,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAQxD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,OAAO,GAAG,SAAS,GAC1B,WAAW,GAAG,SAAS,CAGzB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;;;gBApBnC,cAAc;gBAAU,MAAM;;;;EA2C1C"}
+{"version":3,"file":"textOptions.d.ts","sourceRoot":"","sources":["../../src/renderPptx/textOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAI7E,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE1D;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B;IAAE,KAAK,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAQxD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,OAAO,GAAG,SAAS,GAC1B,WAAW,GAAG,SAAS,CAGzB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;;;gBApBnC,cAAc;gBAAU,MAAM;;;;EA4C1C"}

package/dist/renderPptx/textOptions.js

@@ -1,4 +1,5 @@
 import { pxToIn, pxToPt } from "./units.js";
+import { getContentArea } from "./utils/contentArea.js";
 /**
  * underline プロパティを pptxgenjs 形式に変換する
  */
@@ -26,11 +27,12 @@ export function createTextOptions(node) {
     const fontSizePx = node.fontSize ?? 24;
     const fontFamily = node.fontFamily ?? "Noto Sans JP";
     const lineHeight = node.lineHeight ?? 1.3;
+    const content = getContentArea(node);
     return {
-        x: pxToIn(node.x),
-        y: pxToIn(node.y),
-        w: pxToIn(node.w),
-        h: pxToIn(node.h),
+        x: pxToIn(content.x),
+        y: pxToIn(content.y),
+        w: pxToIn(content.w),
+        h: pxToIn(content.h),
         fontSize: pxToPt(fontSizePx),
         fontFace: fontFamily,
         align: node.textAlign ?? "left",

package/dist/renderPptx/utils/contentArea.d.ts

@@ -0,0 +1,26 @@
+type Padding = number | {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+};
+interface ContentArea {
+    x: number;
+    y: number;
+    w: number;
+    h: number;
+}
+/**
+ * ノードの padding を考慮したコンテンツ描画領域を計算する。
+ * background/border はノード全体の領域 (node.x/y/w/h) に描画し、
+ * コンテンツはこの関数で返される領域に描画する。
+ */
+export declare function getContentArea(node: {
+    x: number;
+    y: number;
+    w: number;
+    h: number;
+    padding?: Padding;
+}): ContentArea;
+export {};
+//# sourceMappingURL=contentArea.d.ts.map

package/dist/renderPptx/utils/contentArea.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contentArea.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/contentArea.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GACR,MAAM,GACN;IACE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,UAAU,WAAW;IACnB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE;IACnC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,WAAW,CAsBd"}