@hirokisakabe/pom 1.4.0 → 3.0.0

package/dist/renderPptx/nodes/timeline.js

@@ -1,4 +1,6 @@
 import { pxToIn, pxToPt } from "../units.js";
+import { measureTimeline } from "../../calcYogaLayout/measureCompositeNodes.js";
+import { calcScaleFactor } from "../utils/scaleToFit.js";
 export function renderTimelineNode(node, ctx) {
     const direction = node.direction ?? "horizontal";
     const items = node.items;
@@ -6,16 +8,21 @@ export function renderTimelineNode(node, ctx) {
     if (itemCount === 0)
         return;
     const defaultColor = "1D4ED8"; // blue
-    const nodeRadius = 12; // px
-    const lineWidth = 4; // px
+    const baseNodeRadius = 12; // px
+    const baseLineWidth = 4; // px
+    // スケール係数を計算
+    const intrinsic = measureTimeline(node);
+    const scaleFactor = calcScaleFactor(node.w, node.h, intrinsic.width, intrinsic.height, "timeline");
+    const nodeRadius = baseNodeRadius * scaleFactor;
+    const lineWidth = baseLineWidth * scaleFactor;
     if (direction === "horizontal") {
-        renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth);
+        renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
     }
     else {
-        renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth);
+        renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor);
     }
 }
-function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth) {
+function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor) {
     const itemCount = items.length;
     const lineY = node.y + node.h / 2;
     const startX = node.x + nodeRadius;
@@ -29,6 +36,13 @@ function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, li
         h: 0,
         line: { color: "E2E8F0", width: pxToPt(lineWidth) },
     });
+    const labelW = 120 * scaleFactor;
+    const dateLabelH = 24 * scaleFactor;
+    const titleLabelH = 24 * scaleFactor;
+    const descLabelH = 32 * scaleFactor;
+    const dateOffset = 40 * scaleFactor;
+    const titleGap = 8 * scaleFactor;
+    const descOffset = 32 * scaleFactor;
     // 各アイテムを描画
     items.forEach((item, index) => {
         const progress = itemCount === 1 ? 0.5 : index / (itemCount - 1);
@@ -46,11 +60,11 @@ function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, li
         });
         // 日付を上に表示
         ctx.slide.addText(item.date, {
-            x: pxToIn(cx - 60),
-            y: pxToIn(cy - nodeRadius - 40),
-            w: pxToIn(120),
-            h: pxToIn(24),
-            fontSize: pxToPt(12),
+            x: pxToIn(cx - labelW / 2),
+            y: pxToIn(cy - nodeRadius - dateOffset),
+            w: pxToIn(labelW),
+            h: pxToIn(dateLabelH),
+            fontSize: pxToPt(12 * scaleFactor),
             fontFace: "Noto Sans JP",
             color: "64748B",
             align: "center",
@@ -58,11 +72,11 @@ function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, li
         });
         // タイトルを下に表示
         ctx.slide.addText(item.title, {
-            x: pxToIn(cx - 60),
-            y: pxToIn(cy + nodeRadius + 8),
-            w: pxToIn(120),
-            h: pxToIn(24),
-            fontSize: pxToPt(14),
+            x: pxToIn(cx - labelW / 2),
+            y: pxToIn(cy + nodeRadius + titleGap),
+            w: pxToIn(labelW),
+            h: pxToIn(titleLabelH),
+            fontSize: pxToPt(14 * scaleFactor),
             fontFace: "Noto Sans JP",
             color: "1E293B",
             bold: true,
@@ -72,11 +86,11 @@ function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, li
         // 説明を表示
         if (item.description) {
             ctx.slide.addText(item.description, {
-                x: pxToIn(cx - 60),
-                y: pxToIn(cy + nodeRadius + 32),
-                w: pxToIn(120),
-                h: pxToIn(32),
-                fontSize: pxToPt(11),
+                x: pxToIn(cx - labelW / 2),
+                y: pxToIn(cy + nodeRadius + descOffset),
+                w: pxToIn(labelW),
+                h: pxToIn(descLabelH),
+                fontSize: pxToPt(11 * scaleFactor),
                 fontFace: "Noto Sans JP",
                 color: "64748B",
                 align: "center",
@@ -85,9 +99,9 @@ function renderHorizontalTimeline(node, ctx, items, defaultColor, nodeRadius, li
         }
     });
 }
-function renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth) {
+function renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, lineWidth, scaleFactor) {
     const itemCount = items.length;
-    const lineX = node.x + 40;
+    const lineX = node.x + 40 * scaleFactor;
     const startY = node.y + nodeRadius;
     const endY = node.y + node.h - nodeRadius;
     const lineLength = endY - startY;
@@ -99,6 +113,13 @@ function renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, line
         h: pxToIn(lineLength),
         line: { color: "E2E8F0", width: pxToPt(lineWidth) },
     });
+    const labelGap = 16 * scaleFactor;
+    const dateLabelW = 100 * scaleFactor;
+    const dateLabelH = 20 * scaleFactor;
+    const titleLabelH = 24 * scaleFactor;
+    const descLabelH = 32 * scaleFactor;
+    const titleLabelW = node.w - 80 * scaleFactor;
+    const descLabelW = node.w - 80 * scaleFactor;
     // 各アイテムを描画
     items.forEach((item, index) => {
         const progress = itemCount === 1 ? 0.5 : index / (itemCount - 1);
@@ -116,11 +137,11 @@ function renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, line
         });
         // 日付を左上に表示
         ctx.slide.addText(item.date, {
-            x: pxToIn(cx + nodeRadius + 16),
-            y: pxToIn(cy - nodeRadius - 4),
-            w: pxToIn(100),
-            h: pxToIn(20),
-            fontSize: pxToPt(12),
+            x: pxToIn(cx + nodeRadius + labelGap),
+            y: pxToIn(cy - nodeRadius - 4 * scaleFactor),
+            w: pxToIn(dateLabelW),
+            h: pxToIn(dateLabelH),
+            fontSize: pxToPt(12 * scaleFactor),
             fontFace: "Noto Sans JP",
             color: "64748B",
             align: "left",
@@ -128,11 +149,11 @@ function renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, line
         });
         // タイトルを右に表示
         ctx.slide.addText(item.title, {
-            x: pxToIn(cx + nodeRadius + 16),
-            y: pxToIn(cy - 4),
-            w: pxToIn(node.w - 80),
-            h: pxToIn(24),
-            fontSize: pxToPt(14),
+            x: pxToIn(cx + nodeRadius + labelGap),
+            y: pxToIn(cy - 4 * scaleFactor),
+            w: pxToIn(titleLabelW),
+            h: pxToIn(titleLabelH),
+            fontSize: pxToPt(14 * scaleFactor),
             fontFace: "Noto Sans JP",
             color: "1E293B",
             bold: true,
@@ -142,11 +163,11 @@ function renderVerticalTimeline(node, ctx, items, defaultColor, nodeRadius, line
         // 説明を表示
         if (item.description) {
             ctx.slide.addText(item.description, {
-                x: pxToIn(cx + nodeRadius + 16),
-                y: pxToIn(cy + 20),
-                w: pxToIn(node.w - 80),
-                h: pxToIn(32),
-                fontSize: pxToPt(11),
+                x: pxToIn(cx + nodeRadius + labelGap),
+                y: pxToIn(cy + 20 * scaleFactor),
+                w: pxToIn(descLabelW),
+                h: pxToIn(descLabelH),
+                fontSize: pxToPt(11 * scaleFactor),
                 fontFace: "Noto Sans JP",
                 color: "64748B",
                 align: "left",

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

package/dist/renderPptx/nodes/tree.js

@@ -1,4 +1,5 @@
 import { pxToIn, pxToPt } from "../units.js";
+import { calcScaleFactor } from "../utils/scaleToFit.js";
 export function renderTreeNode(node, ctx) {
     const layout = node.layout ?? "vertical";
     const nodeShape = node.nodeShape ?? "rect";
@@ -33,7 +34,7 @@ export function renderTreeNode(node, ctx) {
             };
         }
     }
-    // ツリーレイアウトを計算
+    // ツリーレイアウトを計算（原点(0,0)からの相対座標）
     function calculateTreeLayout(item, x, y) {
         const subtreeSize = calculateSubtreeSize(item);
         const layoutNode = {
@@ -85,15 +86,15 @@ export function renderTreeNode(node, ctx) {
         return layoutNode;
     }
     // 接続線を描画
-    function drawConnector(parent, child, style) {
+    function drawConnector(parent, child, style, sf, ox, oy) {
         const lineColor = style.color ?? "333333";
         const lineWidth = style.width ?? 2;
         if (layout === "vertical") {
             // 親の下端中央から子の上端中央へ
-            const parentCenterX = parent.x + parent.width / 2;
-            const parentBottomY = parent.y + parent.height;
-            const childCenterX = child.x + child.width / 2;
-            const childTopY = child.y;
+            const parentCenterX = ox + (parent.x + parent.width / 2) * sf;
+            const parentBottomY = oy + (parent.y + parent.height) * sf;
+            const childCenterX = ox + (child.x + child.width / 2) * sf;
+            const childTopY = oy + child.y * sf;
             const midY = (parentBottomY + childTopY) / 2;
             // 垂直線（親から中間点まで）
             ctx.slide.addShape(ctx.pptx.ShapeType.line, {
@@ -101,7 +102,7 @@ export function renderTreeNode(node, ctx) {
                 y: pxToIn(parentBottomY),
                 w: 0,
                 h: pxToIn(midY - parentBottomY),
-                line: { color: lineColor, width: pxToPt(lineWidth) },
+                line: { color: lineColor, width: pxToPt(lineWidth * sf) },
             });
             // 水平線（中間点で）
             const minX = Math.min(parentCenterX, childCenterX);
@@ -112,7 +113,7 @@ export function renderTreeNode(node, ctx) {
                     y: pxToIn(midY),
                     w: pxToIn(maxX - minX),
                     h: 0,
-                    line: { color: lineColor, width: pxToPt(lineWidth) },
+                    line: { color: lineColor, width: pxToPt(lineWidth * sf) },
                 });
             }
             // 垂直線（中間点から子まで）
@@ -121,15 +122,15 @@ export function renderTreeNode(node, ctx) {
                 y: pxToIn(midY),
                 w: 0,
                 h: pxToIn(childTopY - midY),
-                line: { color: lineColor, width: pxToPt(lineWidth) },
+                line: { color: lineColor, width: pxToPt(lineWidth * sf) },
             });
         }
         else {
             // 親の右端中央から子の左端中央へ
-            const parentRightX = parent.x + parent.width;
-            const parentCenterY = parent.y + parent.height / 2;
-            const childLeftX = child.x;
-            const childCenterY = child.y + child.height / 2;
+            const parentRightX = ox + (parent.x + parent.width) * sf;
+            const parentCenterY = oy + (parent.y + parent.height / 2) * sf;
+            const childLeftX = ox + child.x * sf;
+            const childCenterY = oy + (child.y + child.height / 2) * sf;
             const midX = (parentRightX + childLeftX) / 2;
             // 水平線（親から中間点まで）
             ctx.slide.addShape(ctx.pptx.ShapeType.line, {
@@ -137,7 +138,7 @@ export function renderTreeNode(node, ctx) {
                 y: pxToIn(parentCenterY),
                 w: pxToIn(midX - parentRightX),
                 h: 0,
-                line: { color: lineColor, width: pxToPt(lineWidth) },
+                line: { color: lineColor, width: pxToPt(lineWidth * sf) },
             });
             // 垂直線（中間点で）
             const minY = Math.min(parentCenterY, childCenterY);
@@ -148,7 +149,7 @@ export function renderTreeNode(node, ctx) {
                     y: pxToIn(minY),
                     w: 0,
                     h: pxToIn(maxY - minY),
-                    line: { color: lineColor, width: pxToPt(lineWidth) },
+                    line: { color: lineColor, width: pxToPt(lineWidth * sf) },
                 });
             }
             // 水平線（中間点から子まで）
@@ -157,12 +158,12 @@ export function renderTreeNode(node, ctx) {
                 y: pxToIn(childCenterY),
                 w: pxToIn(childLeftX - midX),
                 h: 0,
-                line: { color: lineColor, width: pxToPt(lineWidth) },
+                line: { color: lineColor, width: pxToPt(lineWidth * sf) },
             });
         }
     }
     // ノードを描画
-    function drawTreeNode(layoutNode, shape, defaultNodeColor) {
+    function drawTreeNode(layoutNode, shape, defaultNodeColor, sf, ox, oy) {
         const color = layoutNode.item.color ?? defaultNodeColor;
         const shapeType = (() => {
             switch (shape) {
@@ -174,22 +175,26 @@ export function renderTreeNode(node, ctx) {
                     return ctx.pptx.ShapeType.ellipse;
             }
         })();
+        const drawX = ox + layoutNode.x * sf;
+        const drawY = oy + layoutNode.y * sf;
+        const drawW = layoutNode.width * sf;
+        const drawH = layoutNode.height * sf;
         // ノードの背景
         ctx.slide.addShape(shapeType, {
-            x: pxToIn(layoutNode.x),
-            y: pxToIn(layoutNode.y),
-            w: pxToIn(layoutNode.width),
-            h: pxToIn(layoutNode.height),
+            x: pxToIn(drawX),
+            y: pxToIn(drawY),
+            w: pxToIn(drawW),
+            h: pxToIn(drawH),
             fill: { color },
-            line: { color: "333333", width: pxToPt(1) },
+            line: { color: "333333", width: pxToPt(1 * sf) },
         });
         // ノードのラベル
         ctx.slide.addText(layoutNode.item.label, {
-            x: pxToIn(layoutNode.x),
-            y: pxToIn(layoutNode.y),
-            w: pxToIn(layoutNode.width),
-            h: pxToIn(layoutNode.height),
-            fontSize: pxToPt(12),
+            x: pxToIn(drawX),
+            y: pxToIn(drawY),
+            w: pxToIn(drawW),
+            h: pxToIn(drawH),
+            fontSize: pxToPt(12 * sf),
             fontFace: "Noto Sans JP",
             color: "FFFFFF",
             align: "center",
@@ -197,27 +202,31 @@ export function renderTreeNode(node, ctx) {
         });
     }
     // すべての接続線を再帰的に描画
-    function drawAllConnectors(layoutNode) {
+    function drawAllConnectors(layoutNode, sf, ox, oy) {
         for (const child of layoutNode.children) {
-            drawConnector(layoutNode, child, connectorStyle);
-            drawAllConnectors(child);
+            drawConnector(layoutNode, child, connectorStyle, sf, ox, oy);
+            drawAllConnectors(child, sf, ox, oy);
         }
     }
     // すべてのノードを再帰的に描画
-    function drawAllNodes(layoutNode) {
-        drawTreeNode(layoutNode, nodeShape, defaultColor);
+    function drawAllNodes(layoutNode, sf, ox, oy) {
+        drawTreeNode(layoutNode, nodeShape, defaultColor, sf, ox, oy);
         for (const child of layoutNode.children) {
-            drawAllNodes(child);
+            drawAllNodes(child, sf, ox, oy);
         }
     }
     // ツリーのサイズを計算
     const treeSize = calculateSubtreeSize(node.data);
-    // 描画領域内の中央に配置
-    const offsetX = node.x + (node.w - treeSize.width) / 2;
-    const offsetY = node.y + (node.h - treeSize.height) / 2;
-    // レイアウト計算
-    const rootLayout = calculateTreeLayout(node.data, offsetX, offsetY);
+    // スケール係数を計算
+    const scaleFactor = calcScaleFactor(node.w, node.h, treeSize.width, treeSize.height, "tree");
+    // スケール後のサイズで中央配置オフセットを計算
+    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;
+    // レイアウト計算（原点(0,0)からの相対座標）
+    const rootLayout = calculateTreeLayout(node.data, 0, 0);
     // 描画（接続線を先に、ノードを後に描画）
-    drawAllConnectors(rootLayout);
-    drawAllNodes(rootLayout);
+    drawAllConnectors(rootLayout, scaleFactor, offsetX, offsetY);
+    drawAllNodes(rootLayout, scaleFactor, offsetX, offsetY);
 }

package/dist/renderPptx/renderPptx.d.ts

@@ -3,8 +3,6 @@ type SlidePx = {
     w: number;
     h: number;
 };
-export { createTextOptions, convertUnderline, convertStrike, } from "./textOptions.ts";
-export { PX_PER_IN, pxToIn, pxToPt } from "./units.ts";
 /**
  * PositionedNode ツリーを PptxGenJS スライドに変換する
  * @param pages PositionedNode ツリーの配列（各要素が1ページ）
@@ -13,4 +11,5 @@ export { PX_PER_IN, pxToIn, pxToPt } from "./units.ts";
  * @returns PptxGenJS インスタンス
  */
 export declare function renderPptx(pages: PositionedNode[], slidePx: SlidePx, master?: SlideMasterOptions): import("pptxgenjs").default;
+export {};
 //# sourceMappingURL=renderPptx.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"renderPptx.d.ts","sourceRoot":"","sources":["../../src/renderPptx/renderPptx.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAEnB,MAAM,aAAa,CAAC;AAoBrB,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACxC,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAqJvD;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,kBAAkB,+BAqK5B"}
+{"version":3,"file":"renderPptx.d.ts","sourceRoot":"","sources":["../../src/renderPptx/renderPptx.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAEnB,MAAM,aAAa,CAAC;AAsBrB,KAAK,OAAO,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAqJxC;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,cAAc,EAAE,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,kBAAkB,+BA6K5B"}

package/dist/renderPptx/renderPptx.js

@@ -7,11 +7,9 @@ const pptxModule = require("pptxgenjs");
 const PptxGenJS = pptxModule.default ?? pptxModule;
 import { pxToIn, pxToPt } from "./units.js";
 import { convertUnderline, convertStrike } from "./textOptions.js";
-import { getImageData } from "../calcYogaLayout/measureImage.js";
+import { getImageData } from "../shared/measureImage.js";
 import { renderBackgroundAndBorder } from "./utils/backgroundBorder.js";
-import { renderTextNode, renderImageNode, renderTableNode, renderShapeNode, renderChartNode, renderTimelineNode, renderMatrixNode, renderTreeNode, renderFlowNode, renderProcessArrowNode, renderLineNode, } from "./nodes/index.js";
-export { createTextOptions, convertUnderline, convertStrike, } from "./textOptions.js";
-export { PX_PER_IN, pxToIn, pxToPt } from "./units.js";
+import { renderTextNode, renderImageNode, renderTableNode, renderShapeNode, renderChartNode, renderTimelineNode, renderMatrixNode, renderTreeNode, renderFlowNode, renderProcessArrowNode, renderLineNode, renderUlNode, renderOlNode, } from "./nodes/index.js";
 const DEFAULT_MASTER_NAME = "POM_MASTER";
 /**
  * MasterObject を pptxgenjs の objects 形式に変換する
@@ -240,6 +238,12 @@ export function renderPptx(pages, slidePx, master) {
                 case "text":
                     renderTextNode(node, ctx);
                     break;
+                case "ul":
+                    renderUlNode(node, ctx);
+                    break;
+                case "ol":
+                    renderOlNode(node, ctx);
+                    break;
                 case "image":
                     renderImageNode(node, ctx);
                     break;

package/dist/renderPptx/textOptions.d.ts

@@ -1,4 +1,4 @@
-import type { PositionedNode, BulletOptions, Underline, UnderlineStyle } from "../types.ts";
+import type { PositionedNode, Underline, UnderlineStyle } from "../types.ts";
 type TextNode = Extract<PositionedNode, {
     type: "text";
 }>;
@@ -13,13 +13,6 @@ export declare function convertUnderline(underline: Underline | undefined): {
  * strike プロパティを pptxgenjs 形式に変換する
  */
 export declare function convertStrike(strike: boolean | undefined): "sngStrike" | undefined;
-type PptxBulletOptions = {
-    type?: "bullet" | "number";
-    indent?: number;
-    numberType?: BulletOptions["numberType"];
-    numberStartAt?: number;
-};
-export declare function createBulletOptions(bullet: boolean | BulletOptions): PptxBulletOptions | boolean;
 export declare function createTextOptions(node: TextNode): {
     x: number;
     y: number;
@@ -40,27 +33,6 @@ export declare function createTextOptions(node: TextNode): {
     };
     strike: "sngStrike";
     highlight: string;
-} | {
-    bullet: boolean | PptxBulletOptions;
-    x: number;
-    y: number;
-    w: number;
-    h: number;
-    fontSize: number;
-    fontFace: string;
-    align: "right" | "left" | "center";
-    valign: "top";
-    margin: number;
-    lineSpacingMultiple: number;
-    color: string;
-    bold: boolean;
-    italic: boolean;
-    underline: {
-        style?: UnderlineStyle;
-        color?: string;
-    };
-    strike: "sngStrike";
-    highlight: string;
 };
 export {};
 //# sourceMappingURL=textOptions.d.ts.map

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,EACV,cAAc,EACd,aAAa,EACb,SAAS,EACT,cAAc,EACf,MAAM,aAAa,CAAC;AAGrB,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,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,GAAG,aAAa,GAC9B,iBAAiB,GAAG,OAAO,CAqB7B;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ;;;;;;;;;;;;;;;gBApDnC,cAAc;gBAAU,MAAM;;;;;;;;;;;;;;;;;;;;gBAA9B,cAAc;gBAAU,MAAM;;;;EAoF1C"}
+{"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"}

package/dist/renderPptx/textOptions.js

@@ -22,30 +22,11 @@ export function convertStrike(strike) {
         return "sngStrike";
     return undefined;
 }
-export function createBulletOptions(bullet) {
-    if (typeof bullet === "boolean") {
-        return bullet;
-    }
-    const options = {};
-    if (bullet.type !== undefined) {
-        options.type = bullet.type;
-    }
-    if (bullet.indent !== undefined) {
-        options.indent = bullet.indent;
-    }
-    if (bullet.numberType !== undefined) {
-        options.numberType = bullet.numberType;
-    }
-    if (bullet.numberStartAt !== undefined) {
-        options.numberStartAt = bullet.numberStartAt;
-    }
-    return options;
-}
 export function createTextOptions(node) {
     const fontSizePx = node.fontPx ?? 24;
     const fontFamily = node.fontFamily ?? "Noto Sans JP";
     const lineSpacingMultiple = node.lineSpacingMultiple ?? 1.3;
-    const baseOptions = {
+    return {
         x: pxToIn(node.x),
         y: pxToIn(node.y),
         w: pxToIn(node.w),
@@ -63,11 +44,4 @@ export function createTextOptions(node) {
         strike: convertStrike(node.strike),
         highlight: node.highlight,
     };
-    if (node.bullet !== undefined) {
-        return {
-            ...baseOptions,
-            bullet: createBulletOptions(node.bullet),
-        };
-    }
-    return baseOptions;
 }

package/dist/renderPptx/types.d.ts

@@ -1,4 +1,3 @@
-import type { PositionedNode } from "../types.ts";
 type PptxGenJSClass = import("pptxgenjs").default;
 export type SlideInstance = ReturnType<PptxGenJSClass["addSlide"]>;
 export type PptxInstance = PptxGenJSClass;
@@ -6,6 +5,5 @@ export type RenderContext = {
     slide: SlideInstance;
     pptx: PptxInstance;
 };
-export type NodeRenderer<T extends PositionedNode> = (node: T, ctx: RenderContext) => void;
 export {};
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/renderPptx/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,KAAK,cAAc,GAAG,OAAO,WAAW,EAAE,OAAO,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;AACnE,MAAM,MAAM,YAAY,GAAG,cAAc,CAAC;AAE1C,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,cAAc,IAAI,CACnD,IAAI,EAAE,CAAC,EACP,GAAG,EAAE,aAAa,KACf,IAAI,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/renderPptx/types.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG,OAAO,WAAW,EAAE,OAAO,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;AACnE,MAAM,MAAM,YAAY,GAAG,cAAc,CAAC;AAE1C,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC"}

package/dist/renderPptx/utils/backgroundBorder.js

@@ -1,4 +1,4 @@
-import { getImageData } from "../../calcYogaLayout/measureImage.js";
+import { getImageData } from "../../shared/measureImage.js";
 import { pxToIn, pxToPt } from "../units.js";
 function convertShadow(shadow) {
     return {

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

@@ -0,0 +1,8 @@
+/**
+ * 割り当てサイズと固有サイズからスケール係数を計算する。
+ *
+ * - scaleFactor = min(allocatedW / intrinsicW, allocatedH / intrinsicH, 1.0)
+ * - scaleFactor < MIN_SCALE_THRESHOLD の場合、閾値でクランプして console.warn
+ */
+export declare function calcScaleFactor(allocatedW: number, allocatedH: number, intrinsicW: number, intrinsicH: number, nodeType: string): number;
+//# sourceMappingURL=scaleToFit.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"scaleToFit.d.ts","sourceRoot":"","sources":["../../../src/renderPptx/utils/scaleToFit.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAeR"}

package/dist/renderPptx/utils/scaleToFit.js

@@ -0,0 +1,19 @@
+const MIN_SCALE_THRESHOLD = 0.5;
+/**
+ * 割り当てサイズと固有サイズからスケール係数を計算する。
+ *
+ * - scaleFactor = min(allocatedW / intrinsicW, allocatedH / intrinsicH, 1.0)
+ * - scaleFactor < MIN_SCALE_THRESHOLD の場合、閾値でクランプして console.warn
+ */
+export function calcScaleFactor(allocatedW, allocatedH, intrinsicW, intrinsicH, nodeType) {
+    if (intrinsicW <= 0 || intrinsicH <= 0)
+        return 1.0;
+    const scaleX = allocatedW / intrinsicW;
+    const scaleY = allocatedH / intrinsicH;
+    let scaleFactor = Math.min(scaleX, scaleY, 1.0);
+    if (scaleFactor < MIN_SCALE_THRESHOLD) {
+        console.warn(`[pom] ${nodeType} node: scale factor ${scaleFactor.toFixed(2)} is below threshold ${MIN_SCALE_THRESHOLD}. Content may overflow.`);
+        scaleFactor = MIN_SCALE_THRESHOLD;
+    }
+    return scaleFactor;
+}

package/dist/shared/measureImage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"measureImage.d.ts","sourceRoot":"","sources":["../../src/shared/measureImage.ts"],"names":[],"mappings":"AAsBA;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE5D;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5D,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CA0DD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAqDA"}

package/dist/{table/utils.d.ts → shared/tableUtils.d.ts}

@@ -1,6 +1,4 @@
 import type { TableNode } from "../types.ts";
-export declare const DEFAULT_TABLE_ROW_HEIGHT = 32;
-export declare const DEFAULT_TABLE_COLUMN_WIDTH = 100;
 export declare function calcTableIntrinsicSize(node: TableNode): {
     width: number;
     height: number;
@@ -15,4 +13,4 @@ export declare function resolveRowHeights(node: TableNode): number[];
  * @param tableWidth テーブル全体の幅（レイアウト計算後の確定値）
  */
 export declare function resolveColumnWidths(node: TableNode, tableWidth: number): number[];
-//# sourceMappingURL=utils.d.ts.map
+//# sourceMappingURL=tableUtils.d.ts.map

package/dist/shared/tableUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tableUtils.d.ts","sourceRoot":"","sources":["../../src/shared/tableUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAK7C,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,SAAS;;;EAQrD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,YAGhD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,MAAM,GACjB,MAAM,EAAE,CAeV"}

package/dist/{table/utils.js → shared/tableUtils.js}

@@ -1,5 +1,5 @@
-export const DEFAULT_TABLE_ROW_HEIGHT = 32;
-export const DEFAULT_TABLE_COLUMN_WIDTH = 100;
+const DEFAULT_TABLE_ROW_HEIGHT = 32;
+const DEFAULT_TABLE_COLUMN_WIDTH = 100;
 export function calcTableIntrinsicSize(node) {
     const width = node.columns.reduce((sum, column) => sum + (column.width ?? DEFAULT_TABLE_COLUMN_WIDTH), 0);
     const height = resolveRowHeights(node).reduce((sum, h) => sum + h, 0);

package/dist/toPositioned/toPositioned.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toPositioned.d.ts","sourceRoot":"","sources":["../../src/toPositioned/toPositioned.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG3D;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,SAAI,EACX,OAAO,SAAI,GACV,cAAc,CAyMhB"}
+{"version":3,"file":"toPositioned.d.ts","sourceRoot":"","sources":["../../src/toPositioned/toPositioned.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG3D;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,OAAO,SAAI,EACX,OAAO,SAAI,GACV,cAAc,CA2MhB"}

package/dist/toPositioned/toPositioned.js

@@ -1,4 +1,4 @@
-import { getImageData } from "../calcYogaLayout/measureImage.js";
+import { getImageData } from "../shared/measureImage.js";
 /**
  * POMNode ツリーを絶対座標付きの PositionedNode ツリーに変換する
  * @param pom 入力 POMNode
@@ -14,7 +14,9 @@ export function toPositioned(pom, parentX = 0, parentY = 0) {
     const absoluteX = parentX + layout.left;
     const absoluteY = parentY + layout.top;
     switch (pom.type) {
-        case "text": {
+        case "text":
+        case "ul":
+        case "ol": {
             return {
                 ...pom,
                 x: absoluteX,