@cardenelabs/cdl 0.106.0 → 0.108.0

package/CHANGELOG.md

@@ -5,6 +5,80 @@ CDL (Chainome Diagram Language) の主要変更履歴。
 
 ## [Unreleased]
 
+## [0.108.0] - 2026-09-30
+
+### Fixed
+
+- **絵の中に置く題が、読めない大きさまで縮むのを止めた** (#953)
+
+  絵の中に字を置く 34 種 (`shape-person` / `shape-bank` / `shape-file` 等) は、題が箱の幅に
+  収まらない時に字を小さくして収める。 **この縮めに下限が無かった**。
+  幅 300 の箱に 120 字の題を渡すと `shape-person` は 2.4px で描く = 点にしか見えない。
+
+  同じ engine でも箱の種別 (`actor` / `card` / `event` / `function` / `storage`) は
+  `kinds/compact-title.ts` の `fitTextSize` が 11px で縮めるのをやめる。 絵の中の字だけが
+  下限を持たなかった。 検査の側は 0.107.0 (#951) で挙げられるようになっていたが、
+  描く側には止める仕組みが無かった。
+
+  幅で縮める倍率を読める下限 (11px) で止め、**止めた行は入るところまでで切って `…` を付ける**。
+  切る形を採ったのは、箱の中に収める決まり (#433) を全種別の検査が見ているため。
+  横へ出す形も採れるが、120 字を 11px で描くと 1400px になり隣の箱まで覆う。
+  `kinds/box-lines.ts` の `幅に収める` が #534 で決めた形と同じになる。
+
+  2 つの場合は下限を当てない。
+
+  | 場合 | 理由 |
+  |---|---|
+  | 素の大きさが下限以下 | 当てると幅の縮めが 1 度も効かず、横へ大きく出る |
+  | `…` すら入らない幅 | 切ると名前が 1 字も残らない = 読めない大きさより悪い |
+
+  高さで決まる字の大きさ (`labelPlan` の下限 9) は変えていない。 縦にはみ出すと絵と重なり、
+  字も絵もどちらも読めなくなる。
+
+  焼き付けた見た目の記録は 1 件も動いていない。
+
+## [0.107.0] - 2026-09-30
+
+### Fixed
+
+- **収まっている題を「はみ出す」 と判定するのをやめた** (#951)
+
+  軸 3 (`text-readability`) の見積りが、実際に描く形と 2 点で違っていた。
+
+  第一に、字の幅の表が **組み方のための上振れ値** だった。 箱の大きさと線の置き場を決める
+  側は狭く見積もると字が枠から出るため、表は広い側へ寄せてある。 同じ値で「はみ出すか」 を
+  判定すると、収まっている題まで挙がる。
+
+  見本帳の題 407 か所を `getComputedTextLength()` で測ると、上振れは字種で分かれた。
+
+  | 字種 | 件数 | 見積り / 実描画 |
+  |---|---|---|
+  | 和文だけ | 247 | 1.080 倍 (例外なし) |
+  | 欧文だけ | 119 | 1.16 から 1.82 倍 (中央 1.27 倍) |
+  | 混在 | 41 | 1.09 から 1.35 倍 |
+
+  第二に、**描く側は箱に収まるまで字を小さくする**。 `actor` / `card` / `event` / `function` /
+  `storage` は読める下限 11px まで 1 ずつ落とし、絵の中に字を置く 34 種は下限なく縮める。
+  軸 3 は種別ごとの最大値で見積もっていたので、縮めて収めた題まで挙がっていた。
+
+  2 点を直した。
+
+  | 直した所 | 内容 |
+  |---|---|
+  | `measureTextWidth` | `bound: "drawn"` を足し、字種ごとに上振れを割り戻す。 既定 (`layout`) は変えない |
+  | 軸 3 | 縮める種別は「読める下限を割るか」、縮めない種別は「箱の幅を超えるか」 を見る |
+
+  **組み方の見積りは 1 つも変えていない**。 箱の大きさと線の置き場は従来どおりで、
+  焼き付けた見た目も動かない。
+
+  検知力は下げていない。 縮める種別では、下限 11px まで落としても収まらない題を挙げる
+  (`storage` の箱 400px に全角 40 字を書くと挙がる)。 絵の中に字を置く 34 種では、
+  下限を割る大きさまで縮む題を挙げる = 直す前は「はみ出す」 という当たらない理由で
+  挙げていたものを、実際に起きること (読めない大きさになる) に付け替えた。
+
+  引く側は cardene777/dragon#2701 で 9 枚が受け入れ一覧に載っていた。 本版でその 9 枚が
+  挙がらなくなる。
+
 ## [0.106.0] - 2026-09-30
 
 ### Fixed
@@ -4285,7 +4359,9 @@ Initial OSS release.
 使わない = annotated tag を push しても GitHub Release は作られず、 Release を作っていない版で
 行き止まりになる。
 
-[Unreleased]: https://github.com/cardene777/cdl/compare/v0.106.0...HEAD
+[Unreleased]: https://github.com/cardene777/cdl/compare/v0.108.0...HEAD
+[0.108.0]: https://github.com/cardene777/cdl/compare/v0.107.0...v0.108.0
+[0.107.0]: https://github.com/cardene777/cdl/compare/v0.106.0...v0.107.0
 [0.106.0]: https://github.com/cardene777/cdl/compare/v0.105.0...v0.106.0
 [0.105.0]: https://github.com/cardene777/cdl/compare/v0.104.0...v0.105.0
 [0.104.0]: https://github.com/cardene777/cdl/compare/v0.103.0...v0.104.0

package/dist/index.cjs

@@ -12241,6 +12241,11 @@ function isHalfwidthKana(code) {
 }
 var EMOJI_ADVANCE_EM = 1.05;
 var MONO_EMOJI_ADVANCE_EM = 1.16;
+var DRAWN_CJK_RATIO = 1.08;
+var DRAWN_ASCII_RATIO = 1.16;
+function isAscii(code) {
+  return code < 128;
+}
 var WIDE_SYMBOL_ADVANCE_EM = 0.95;
 function isEmoji(code) {
   return code >= 126976 && code <= 129791 || // 絵文字の主要面
@@ -12279,29 +12284,31 @@ function measureTextWidth(text, opts = {}) {
   const fontSize = opts.fontSize ?? 22;
   const letterSpacing = opts.letterSpacing ?? 0;
   const fontFamily = opts.fontFamily ?? "sans";
+  const bound = opts.bound ?? "layout";
   let advanceEmSum = 0;
   let charCount = 0;
   const \u6587\u5B57\u5217 = CLUSTER_JOINER_RE.test(text) ? segmentGraphemes(text) : [...text];
   for (const ch of \u6587\u5B57\u5217) {
     charCount++;
     const code = ch.codePointAt(0) ?? 0;
+    const \u5272\u308A\u623B\u3057 = bound === "drawn" && !isEmojiGrapheme(ch, code) ? isAscii(code) ? DRAWN_ASCII_RATIO : isCJK(code) ? DRAWN_CJK_RATIO : 1 : 1;
     if (isEmojiGrapheme(ch, code)) {
       advanceEmSum += fontFamily === "mono" ? MONO_EMOJI_ADVANCE_EM : EMOJI_ADVANCE_EM;
       continue;
     }
     if (fontFamily === "mono") {
-      advanceEmSum += isCJK(code) ? 1.08 : JETBRAINS_MONO_ADVANCE_EM;
+      advanceEmSum += (isCJK(code) ? 1.08 : JETBRAINS_MONO_ADVANCE_EM) / \u5272\u308A\u623B\u3057;
       continue;
     }
     if (isCJK(code)) {
-      advanceEmSum += 1.08;
+      advanceEmSum += 1.08 / \u5272\u308A\u623B\u3057;
       continue;
     }
     const table = ch.length === 1 ? INTER_BOLD_ADVANCE_EM[ch] : void 0;
-    advanceEmSum += table !== void 0 ? table : defaultAdvanceEm(ch, code);
+    advanceEmSum += (table !== void 0 ? table : defaultAdvanceEm(ch, code)) / \u5272\u308A\u623B\u3057;
   }
   const w = advanceEmSum * fontSize + letterSpacing * charCount;
-  return Math.max(w, fontSize * 1.2);
+  return bound === "drawn" ? w : Math.max(w, fontSize * 1.2);
 }
 function \u53CE\u3081\u308B\u500D\u7387(text, opts, \u5E45) {
   if (!(\u5E45 > 0) || !(opts.fontSize > 0)) return 1;
@@ -12442,6 +12449,51 @@ function titleFontSize(kind) {
   return TITLE_FONT_SIZE.get(kind ?? "") ?? TITLE_FONT_SIZE_DEFAULT;
 }
 var TITLE_BOX_PADDING = 52;
+var KINDS_SCALING_TITLE_WHEN_LOW = /* @__PURE__ */ new Set(["actor", "event", "function", "storage"]);
+var KINDS_SCALING_TITLE_ALWAYS = /* @__PURE__ */ new Set([
+  "card",
+  "shape-file",
+  "shape-folder",
+  "shape-cloud",
+  "shape-cylinder",
+  "shape-hexagon",
+  "shape-diamond",
+  "shape-stack",
+  "shape-person",
+  "shape-server-rack",
+  "shape-network-node",
+  "shape-mobile-device",
+  "shape-satellite",
+  "shape-smart-contract",
+  "shape-rpc-node",
+  "shape-wallet",
+  "shape-nft",
+  "shape-token",
+  "shape-blockchain",
+  "shape-bitcoin-chain",
+  "shape-ethereum-chain",
+  "shape-blockchain-node",
+  "shape-bank",
+  "shape-trust-bank",
+  "shape-payment-provider",
+  "shape-credit-card",
+  "shape-brokerage",
+  "shape-exchange",
+  "shape-atm",
+  "shape-website",
+  "shape-storefront",
+  "shape-warehouse",
+  "shape-online-shop",
+  "shape-cdn-edge",
+  "shape-api-gateway"
+]);
+var COMPACT_TITLE_MAX_H = 100;
+function titleScalesToFit(kind, h) {
+  const k = kind ?? "";
+  if (KINDS_SCALING_TITLE_ALWAYS.has(k)) return true;
+  return KINDS_SCALING_TITLE_WHEN_LOW.has(k) && h < COMPACT_TITLE_MAX_H;
+}
+var MIN_TITLE_FONT_SIZE = 11;
 var KINDS_DRAWN_BY_GENERIC = [
   "person",
   "user-group",
@@ -14649,6 +14701,14 @@ function \u5E45\u306E\u500D\u7387(text, size, letterSpacing, \u5E45) {
   const \u5B9F\u5E45 = textWidth(text, size, letterSpacing);
   return \u5B9F\u5E45 > \u5E45 ? \u5E45 / \u5B9F\u5E45 : 1;
 }
+function \u8AAD\u3081\u308B\u4E0B\u9650\u306E\u500D\u7387(\u5927\u304D\u3055) {
+  return \u5927\u304D\u3055 > MIN_TITLE_FONT_SIZE ? MIN_TITLE_FONT_SIZE / \u5927\u304D\u3055 : 0;
+}
+function \u5207\u3063\u3066\u53CE\u307E\u308B\u4E0B\u9650(\u984C, \u5927\u304D\u3055, \u5B57\u9593, \u5E45\u4E0A\u9650, \u6E2C\u308B) {
+  const \u4E0B\u9650 = \u8AAD\u3081\u308B\u4E0B\u9650\u306E\u500D\u7387(\u5927\u304D\u3055);
+  if (!(\u4E0B\u9650 > 0) || !(\u5E45\u4E0A\u9650 > 0)) return 0;
+  return \u5E45\u3067\u5207\u308B(\u984C, \u5927\u304D\u3055 * \u4E0B\u9650, \u5E45\u4E0A\u9650, (u, f) => \u6E2C\u308B(u, f, \u5B57\u9593 * \u4E0B\u9650)) === "" ? 0 : \u4E0B\u9650;
+}
 var TITLE_MAX = 18;
 var TITLE_MIN = 9;
 var TITLE_RATIO = 0.17;
@@ -14808,16 +14868,19 @@ function bodyBand(node, opt) {
   const h = Math.max(0, \u7BB1h - \u7E26\u4F59\u767D * ky);
   return { x, y, w, h, cx: x + w / 2, cy: y + h / 2, \u53F3: x + w, \u5E95: y + h };
 }
-function fitLabel(band, block, pos) {
+function fitLabel(band, block, pos, \u6A2A\u306E\u4E0B\u9650 = 0) {
   const \u7E26 = block.\u4E0A + block.\u4E0B;
   const \u6A2A = Math.max(0, block.\u5E45);
   if (!(\u7E26 > 0)) return { k: 1, x: pos.x, y: pos.y };
   if (!(band.h > 0) || !(band.w > 0)) return { k: 0, x: band.x + band.w / 2, y: band.y };
-  const k = Math.min(1, band.h / \u7E26, \u6A2A > 0 ? band.w / \u6A2A : 1);
+  const \u6A2A\u3067 = \u6A2A > 0 ? Math.max(band.w / \u6A2A, \u6A2A\u306E\u4E0B\u9650) : 1;
+  const k = Math.min(1, band.h / \u7E26, \u6A2A\u3067);
   const \u534A = \u6A2A * k / 2;
   return {
     k,
-    x: Math.max(band.x + \u534A, Math.min(pos.x, band.x + band.w - \u534A)),
+    // 下限で止めた塊は帯より広い。 その時は帯の中央に置いて左右へ均等に出す =
+    // 寄せの式をそのまま当てると片側だけに出る (`compact-title.ts` と同じ判断)
+    x: \u534A * 2 > band.w ? band.x + band.w / 2 : Math.max(band.x + \u534A, Math.min(pos.x, band.x + band.w - \u534A)),
     y: Math.max(band.y + block.\u4E0A * k, Math.min(pos.y, band.y + band.h - block.\u4E0B * k))
   };
 }
@@ -17225,12 +17288,23 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes, \u5
     if (!isRenderedNode(n)) continue;
     const titleTrimmed = n.title?.trim() ?? "";
     if (!titleTrimmed) continue;
-    const expectedW = measureTextWidth(titleTrimmed, { fontSize: titleFontSize(n.kind) }) + (drawsTitleOutsideBox(n.kind) ? 0 : TITLE_BOX_PADDING);
-    if (expectedW > n.w + 8) {
+    const \u4F59\u767D = drawsTitleOutsideBox(n.kind) ? 0 : TITLE_BOX_PADDING;
+    const \u4F7F\u3048\u308B\u5E452 = n.w - \u4F59\u767D;
+    const \u5B9F\u5E45 = measureTextWidth(titleTrimmed, { fontSize: titleFontSize(n.kind), bound: "drawn" });
+    if (titleScalesToFit(n.kind, n.h)) {
+      const \u7E2E\u3081\u305F\u5927\u304D\u3055 = \u5B9F\u5E45 > 0 ? titleFontSize(n.kind) * Math.min(1, \u4F7F\u3048\u308B\u5E452 / \u5B9F\u5E45) : titleFontSize(n.kind);
+      if (\u7E2E\u3081\u305F\u5927\u304D\u3055 < MIN_TITLE_FONT_SIZE) {
+        push(
+          "text-readability",
+          `node "${n.id}" title "${n.title}" \u304C node \u5E45 ${n.w}px \u306B\u53CE\u307E\u3089\u305A\u3001\u8AAD\u3081\u308B\u4E0B\u9650 ${MIN_TITLE_FONT_SIZE}px \u3092\u5272\u308B (\u7E2E\u3081\u3066 ${\u7E2E\u3081\u305F\u5927\u304D\u3055.toFixed(1)}px)`,
+          "warn"
+        );
+      }
+    } else if (\u5B9F\u5E45 > \u4F7F\u3048\u308B\u5E452 + 8) {
       push(
         "text-readability",
         // 字ごとの実幅は小数になるので、読む人に出す時だけ丸める (判定は丸めない)
-        `node "${n.id}" title "${n.title}" \u304C node \u5E45 ${n.w}px \u3092\u8D85\u904E\u3059\u308B\u53EF\u80FD\u6027 (\u671F\u5F85 ${Math.round(expectedW)}px)`,
+        `node "${n.id}" title "${n.title}" \u304C node \u5E45 ${n.w}px \u3092\u8D85\u904E\u3059\u308B\u53EF\u80FD\u6027 (\u671F\u5F85 ${Math.round(\u5B9F\u5E45 + \u4F59\u767D)}px)`,
         "warn"
       );
     }
@@ -28646,13 +28720,15 @@ function labelBlock(node, pos, size, band) {
     node.eyebrow ? textWidth(node.eyebrow, EYEBROW_SIZE2, EYEBROW_TRACKING) : 0,
     node.subtitle ? textWidth(node.subtitle, SUB_SIZE) : 0
   );
-  const { k, x, y: baseline } = fitLabel(band, { \u4E0A, \u4E0B, \u5E45 }, pos);
+  const \u4E0B\u9650 = \u5207\u3063\u3066\u53CE\u307E\u308B\u4E0B\u9650(node.title ?? "", size, 0, band.w, textWidth);
+  const { k, x, y: baseline } = fitLabel(band, { \u4E0A, \u4E0B, \u5E45 }, pos, \u4E0B\u9650);
   return { k, x, baseline, \u4E0A\u7AEF: baseline - \u4E0A * k, \u4E0B\u7AEF: baseline + \u4E0B * k };
 }
 function commonLabel(node, pos, size, band) {
   const \u584A = labelBlock(node, pos, size, band);
   const k = \u584A.k;
   const x = \u584A.x;
+  const \u5207\u308B = (t, \u5927\u304D\u3055, \u5B57\u9593 = 0) => \u5E45\u3067\u5207\u308B(t, \u5927\u304D\u3055 * k, band.w, (u, f) => textWidth(u, f, \u5B57\u9593 * k));
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     node.eyebrow && /* @__PURE__ */ jsxRuntime.jsx(
       "text",
@@ -28664,7 +28740,7 @@ function commonLabel(node, pos, size, band) {
         letterSpacing: EYEBROW_TRACKING * k,
         textAnchor: "middle",
         fill: "var(--cdl-tone-accent, #2d6a8f)",
-        children: node.eyebrow
+        children: \u5207\u308B(node.eyebrow, EYEBROW_SIZE2, EYEBROW_TRACKING)
       }
     ),
     /* @__PURE__ */ jsxRuntime.jsx(
@@ -28677,7 +28753,7 @@ function commonLabel(node, pos, size, band) {
         fontWeight: 700,
         textAnchor: "middle",
         fill: "var(--cdl-text, #1a1f2a)",
-        children: node.title
+        children: \u5207\u308B(node.title ?? "", size)
       }
     ),
     node.subtitle && /* @__PURE__ */ jsxRuntime.jsx(
@@ -28688,7 +28764,7 @@ function commonLabel(node, pos, size, band) {
         fontSize: SUB_SIZE * k,
         textAnchor: "middle",
         fill: "var(--cdl-text-dim, #5a6270)",
-        children: node.subtitle
+        children: \u5207\u308B(node.subtitle, SUB_SIZE)
       }
     )
   ] });
@@ -29023,7 +29099,9 @@ function planLabel(node, cx, \u5E45\u4E0A\u9650, plan) {
     node.eyebrow && plan.\u80A9\u66F8 ? textWidth(node.eyebrow, plan.\u80A9\u66F8.size, EYEBROW_TRACKING) : 0,
     node.subtitle && plan.\u8AAC\u660E ? textWidth(node.subtitle, plan.\u8AAC\u660E.size) : 0
   );
-  const k = \u5E45 > 0 && \u5E45\u4E0A\u9650 > 0 ? Math.min(1, \u5E45\u4E0A\u9650 / \u5E45) : 1;
+  const \u4E0B\u9650 = \u5207\u3063\u3066\u53CE\u307E\u308B\u4E0B\u9650(node.title ?? "", plan.\u540D\u524D.size, 0, \u5E45\u4E0A\u9650, textWidth);
+  const k = \u5E45 > 0 && \u5E45\u4E0A\u9650 > 0 ? Math.min(1, Math.max(\u5E45\u4E0A\u9650 / \u5E45, \u4E0B\u9650)) : 1;
+  const \u5207\u308B = (t, \u5927\u304D\u3055, \u5B57\u9593 = 0) => \u5E45\u3067\u5207\u308B(t, \u5927\u304D\u3055 * k, \u5E45\u4E0A\u9650, (u, f) => textWidth(u, f, \u5B57\u9593 * k));
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx(
       "text",
@@ -29035,7 +29113,7 @@ function planLabel(node, cx, \u5E45\u4E0A\u9650, plan) {
         letterSpacing: EYEBROW_TRACKING * k,
         textAnchor: "middle",
         fill: "var(--cdl-tone-accent, #2d6a8f)",
-        children: node.eyebrow
+        children: \u5207\u308B(node.eyebrow, plan.\u80A9\u66F8.size, EYEBROW_TRACKING)
       }
     ),
     /* @__PURE__ */ jsxRuntime.jsx(
@@ -29048,7 +29126,7 @@ function planLabel(node, cx, \u5E45\u4E0A\u9650, plan) {
         fontWeight: 700,
         textAnchor: "middle",
         fill: "var(--cdl-text, #1a1f2a)",
-        children: node.title
+        children: \u5207\u308B(node.title ?? "", plan.\u540D\u524D.size)
       }
     ),
     node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx(
@@ -29059,7 +29137,7 @@ function planLabel(node, cx, \u5E45\u4E0A\u9650, plan) {
         fontSize: plan.\u8AAC\u660E.size * k,
         textAnchor: "middle",
         fill: "var(--cdl-text-dim, #5a6270)",
-        children: node.subtitle
+        children: \u5207\u308B(node.subtitle, plan.\u8AAC\u660E.size)
       }
     )
   ] });
@@ -29982,17 +30060,19 @@ var externalLabel = (node, cx, bottomY) => /* @__PURE__ */ jsxRuntime.jsxs(jsxRu
 var LABEL_EYEBROW_SPACING = 2;
 function \u5E45\u306B\u53CE\u3081\u308B2(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593, \u7BB1\u5E45) {
   const \u5E45 = textWidth(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593);
-  const \u500D\u7387 = \u5E45 > 0 && \u7BB1\u5E45 > 0 ? Math.min(1, \u7BB1\u5E45 / \u5E45) : 1;
-  return { size: \u5927\u304D\u3055 * \u500D\u7387, spacing: \u5B57\u9593 * \u500D\u7387 };
+  const \u500D\u7387 = \u5E45 > 0 && \u7BB1\u5E45 > 0 ? Math.min(1, Math.max(\u7BB1\u5E45 / \u5E45, \u5207\u3063\u3066\u53CE\u307E\u308B\u4E0B\u9650(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593, \u7BB1\u5E45, textWidth))) : 1;
+  const size = \u5927\u304D\u3055 * \u500D\u7387;
+  const spacing = \u5B57\u9593 * \u500D\u7387;
+  return { size, spacing, text: \u5E45\u3067\u5207\u308B(\u6587\u5B57\u5217, size, \u7BB1\u5E45, (u, f) => textWidth(u, f, spacing)) };
 }
 function bottomLabel(node, cx, plan) {
   const \u80A9 = \u5E45\u306B\u53CE\u3081\u308B2(node.eyebrow ?? "", plan.\u80A9\u66F8?.size ?? 0, LABEL_EYEBROW_SPACING, node.w);
   const \u540D = \u5E45\u306B\u53CE\u3081\u308B2(node.title ?? "", plan.\u540D\u524D.size, 0, node.w);
   const \u8AAC = \u5E45\u306B\u53CE\u3081\u308B2(node.subtitle ?? "", plan.\u8AAC\u660E?.size ?? 0, 0, node.w);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u80A9\u66F8.y, fontSize: \u80A9.size, fontWeight: 700, letterSpacing: \u80A9.spacing, textAnchor: "middle", fill: "var(--cdl-tone-accent, #2d6a8f)", children: node.eyebrow }),
-    /* @__PURE__ */ jsxRuntime.jsx("text", { "data-cdl-role": "node-label", x: cx, y: plan.\u540D\u524D.y, fontSize: \u540D.size, fontWeight: 700, textAnchor: "middle", fill: "var(--cdl-text, #1a1f2a)", children: node.title }),
-    node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u8AAC\u660E.y, fontSize: \u8AAC.size, textAnchor: "middle", fill: "var(--cdl-text-dim, #5a6270)", children: node.subtitle })
+    node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u80A9\u66F8.y, fontSize: \u80A9.size, fontWeight: 700, letterSpacing: \u80A9.spacing, textAnchor: "middle", fill: "var(--cdl-tone-accent, #2d6a8f)", children: \u80A9.text }),
+    /* @__PURE__ */ jsxRuntime.jsx("text", { "data-cdl-role": "node-label", x: cx, y: plan.\u540D\u524D.y, fontSize: \u540D.size, fontWeight: 700, textAnchor: "middle", fill: "var(--cdl-text, #1a1f2a)", children: \u540D.text }),
+    node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u8AAC\u660E.y, fontSize: \u8AAC.size, textAnchor: "middle", fill: "var(--cdl-text-dim, #5a6270)", children: \u8AAC.text })
   ] });
 }
 var RACK_SLOT_TOP = 20;
@@ -30787,13 +30867,22 @@ function blockchainNodeExtent(strokeWidth) {
   return { \u4E0A: \u7E26, \u4E0B: \u7E26, \u5DE6: \u6A2A, \u53F3: \u6A2A };
 }
 function bottomLabel2(node, cx, plan) {
-  const \u80A9\u66F8\u500D\u7387 = node.eyebrow && plan.\u80A9\u66F8 ? \u5E45\u306E\u500D\u7387(node.eyebrow, plan.\u80A9\u66F8.size, 2, node.w) : 1;
-  const \u540D\u524D\u500D\u7387 = \u5E45\u306E\u500D\u7387(node.title, plan.\u540D\u524D.size, 0, node.w);
-  const \u8AAC\u660E\u500D\u7387 = node.subtitle && plan.\u8AAC\u660E ? \u5E45\u306E\u500D\u7387(node.subtitle, plan.\u8AAC\u660E.size, 0, node.w) : 1;
+  const \u53CE\u3081\u308B = (t, \u5927\u304D\u3055, \u5B57\u9593) => {
+    const \u6E2C\u308B = (u, f, ls) => \u5B57\u306E\u5E45(u, f) + ls * [...u].length;
+    const \u500D\u7387 = Math.max(\u5E45\u306E\u500D\u7387(t, \u5927\u304D\u3055, \u5B57\u9593, node.w), \u5207\u3063\u3066\u53CE\u307E\u308B\u4E0B\u9650(t, \u5927\u304D\u3055, \u5B57\u9593, node.w, \u6E2C\u308B));
+    const size = \u5927\u304D\u3055 * \u500D\u7387;
+    return { \u500D\u7387, text: \u5E45\u3067\u5207\u308B(t, size, node.w, (u, f) => \u5B57\u306E\u5E45(u, f) + \u5B57\u9593 * \u500D\u7387 * [...u].length) };
+  };
+  const \u80A9 = node.eyebrow && plan.\u80A9\u66F8 ? \u53CE\u3081\u308B(node.eyebrow, plan.\u80A9\u66F8.size, 2) : { \u500D\u7387: 1, text: node.eyebrow ?? "" };
+  const \u540D = \u53CE\u3081\u308B(node.title ?? "", plan.\u540D\u524D.size, 0);
+  const \u8AAC = node.subtitle && plan.\u8AAC\u660E ? \u53CE\u3081\u308B(node.subtitle, plan.\u8AAC\u660E.size, 0) : { \u500D\u7387: 1, text: node.subtitle ?? "" };
+  const \u80A9\u66F8\u500D\u7387 = \u80A9.\u500D\u7387;
+  const \u540D\u524D\u500D\u7387 = \u540D.\u500D\u7387;
+  const \u8AAC\u660E\u500D\u7387 = \u8AAC.\u500D\u7387;
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u80A9\u66F8.y, fontSize: plan.\u80A9\u66F8.size * \u80A9\u66F8\u500D\u7387, fontWeight: 700, letterSpacing: 2 * \u80A9\u66F8\u500D\u7387, textAnchor: "middle", fill: "var(--cdl-tone-accent, #2d6a8f)", children: node.eyebrow }),
-    /* @__PURE__ */ jsxRuntime.jsx("text", { "data-cdl-role": "node-label", x: cx, y: plan.\u540D\u524D.y, fontSize: plan.\u540D\u524D.size * \u540D\u524D\u500D\u7387, fontWeight: 700, textAnchor: "middle", fill: "var(--cdl-text, #1a1f2a)", children: node.title }),
-    node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u8AAC\u660E.y, fontSize: plan.\u8AAC\u660E.size * \u8AAC\u660E\u500D\u7387, textAnchor: "middle", fill: "var(--cdl-text-dim, #5a6270)", children: node.subtitle })
+    node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u80A9\u66F8.y, fontSize: plan.\u80A9\u66F8.size * \u80A9\u66F8\u500D\u7387, fontWeight: 700, letterSpacing: 2 * \u80A9\u66F8\u500D\u7387, textAnchor: "middle", fill: "var(--cdl-tone-accent, #2d6a8f)", children: \u80A9.text }),
+    /* @__PURE__ */ jsxRuntime.jsx("text", { "data-cdl-role": "node-label", x: cx, y: plan.\u540D\u524D.y, fontSize: plan.\u540D\u524D.size * \u540D\u524D\u500D\u7387, fontWeight: 700, textAnchor: "middle", fill: "var(--cdl-text, #1a1f2a)", children: \u540D.text }),
+    node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u8AAC\u660E.y, fontSize: plan.\u8AAC\u660E.size * \u8AAC\u660E\u500D\u7387, textAnchor: "middle", fill: "var(--cdl-text-dim, #5a6270)", children: \u8AAC.text })
   ] });
 }
 function EthereumDiamond({ cx, cy, h, colors }) {
@@ -31402,17 +31491,19 @@ function \u5B57\u5E45(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593) {
 }
 function \u5E45\u306B\u53CE\u3081\u308B3(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593, \u7BB1\u5E45) {
   const \u5E45 = \u5B57\u5E45(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593);
-  const \u500D\u7387 = \u5E45 > 0 && \u7BB1\u5E45 > 0 ? Math.min(1, \u7BB1\u5E45 / \u5E45) : 1;
-  return { size: \u5927\u304D\u3055 * \u500D\u7387, spacing: \u5B57\u9593 * \u500D\u7387 };
+  const \u500D\u7387 = \u5E45 > 0 && \u7BB1\u5E45 > 0 ? Math.min(1, Math.max(\u7BB1\u5E45 / \u5E45, \u5207\u3063\u3066\u53CE\u307E\u308B\u4E0B\u9650(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593, \u7BB1\u5E45, \u5B57\u5E45))) : 1;
+  const size = \u5927\u304D\u3055 * \u500D\u7387;
+  const spacing = \u5B57\u9593 * \u500D\u7387;
+  return { size, spacing, text: \u5E45\u3067\u5207\u308B(\u6587\u5B57\u5217, size, \u7BB1\u5E45, (u, f) => \u5B57\u5E45(u, f, spacing)) };
 }
 function bottomLabel3(node, cx, plan) {
   const \u80A9 = \u5E45\u306B\u53CE\u3081\u308B3(node.eyebrow ?? "", plan.\u80A9\u66F8?.size ?? 0, LABEL_EYEBROW_SPACING2, node.w);
   const \u540D = \u5E45\u306B\u53CE\u3081\u308B3(node.title ?? "", plan.\u540D\u524D.size, 0, node.w);
   const \u8AAC = \u5E45\u306B\u53CE\u3081\u308B3(node.subtitle ?? "", plan.\u8AAC\u660E?.size ?? 0, 0, node.w);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u80A9\u66F8.y, fontSize: \u80A9.size, fontWeight: 700, letterSpacing: \u80A9.spacing, textAnchor: "middle", fill: "var(--cdl-tone-accent, #2d6a8f)", children: node.eyebrow }),
-    /* @__PURE__ */ jsxRuntime.jsx("text", { "data-cdl-role": "node-label", x: cx, y: plan.\u540D\u524D.y, fontSize: \u540D.size, fontWeight: 700, textAnchor: "middle", fill: "var(--cdl-text, #1a1f2a)", children: node.title }),
-    node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u8AAC\u660E.y, fontSize: \u8AAC.size, textAnchor: "middle", fill: "var(--cdl-text-dim, #5a6270)", children: node.subtitle })
+    node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u80A9\u66F8.y, fontSize: \u80A9.size, fontWeight: 700, letterSpacing: \u80A9.spacing, textAnchor: "middle", fill: "var(--cdl-tone-accent, #2d6a8f)", children: \u80A9.text }),
+    /* @__PURE__ */ jsxRuntime.jsx("text", { "data-cdl-role": "node-label", x: cx, y: plan.\u540D\u524D.y, fontSize: \u540D.size, fontWeight: 700, textAnchor: "middle", fill: "var(--cdl-text, #1a1f2a)", children: \u540D.text }),
+    node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u8AAC\u660E.y, fontSize: \u8AAC.size, textAnchor: "middle", fill: "var(--cdl-text-dim, #5a6270)", children: \u8AAC.text })
   ] });
 }
 var BANK_PEDIMENT_H = 44;
@@ -31885,17 +31976,19 @@ function \u5B57\u5E452(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593) {
 }
 function \u5E45\u306B\u53CE\u3081\u308B4(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593, \u7BB1\u5E45) {
   const \u5E45 = \u5B57\u5E452(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593);
-  const \u500D\u7387 = \u5E45 > 0 && \u7BB1\u5E45 > 0 ? Math.min(1, \u7BB1\u5E45 / \u5E45) : 1;
-  return { size: \u5927\u304D\u3055 * \u500D\u7387, spacing: \u5B57\u9593 * \u500D\u7387 };
+  const \u500D\u7387 = \u5E45 > 0 && \u7BB1\u5E45 > 0 ? Math.min(1, Math.max(\u7BB1\u5E45 / \u5E45, \u5207\u3063\u3066\u53CE\u307E\u308B\u4E0B\u9650(\u6587\u5B57\u5217, \u5927\u304D\u3055, \u5B57\u9593, \u7BB1\u5E45, \u5B57\u5E452))) : 1;
+  const size = \u5927\u304D\u3055 * \u500D\u7387;
+  const spacing = \u5B57\u9593 * \u500D\u7387;
+  return { size, spacing, text: \u5E45\u3067\u5207\u308B(\u6587\u5B57\u5217, size, \u7BB1\u5E45, (u, f) => \u5B57\u5E452(u, f, spacing)) };
 }
 function bottomLabel4(node, cx, plan) {
   const \u80A9 = \u5E45\u306B\u53CE\u3081\u308B4(node.eyebrow ?? "", plan.\u80A9\u66F8?.size ?? 0, LABEL_EYEBROW_SPACING3, node.w);
   const \u540D = \u5E45\u306B\u53CE\u3081\u308B4(node.title ?? "", plan.\u540D\u524D.size, 0, node.w);
   const \u8AAC = \u5E45\u306B\u53CE\u3081\u308B4(node.subtitle ?? "", plan.\u8AAC\u660E?.size ?? 0, 0, node.w);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u80A9\u66F8.y, fontSize: \u80A9.size, fontWeight: 700, letterSpacing: \u80A9.spacing, textAnchor: "middle", fill: "var(--cdl-tone-accent, #2d6a8f)", children: node.eyebrow }),
-    /* @__PURE__ */ jsxRuntime.jsx("text", { "data-cdl-role": "node-label", x: cx, y: plan.\u540D\u524D.y, fontSize: \u540D.size, fontWeight: 700, textAnchor: "middle", fill: "var(--cdl-text, #1a1f2a)", children: node.title }),
-    node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u8AAC\u660E.y, fontSize: \u8AAC.size, textAnchor: "middle", fill: "var(--cdl-text-dim, #5a6270)", children: node.subtitle })
+    node.eyebrow && plan.\u80A9\u66F8 && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u80A9\u66F8.y, fontSize: \u80A9.size, fontWeight: 700, letterSpacing: \u80A9.spacing, textAnchor: "middle", fill: "var(--cdl-tone-accent, #2d6a8f)", children: \u80A9.text }),
+    /* @__PURE__ */ jsxRuntime.jsx("text", { "data-cdl-role": "node-label", x: cx, y: plan.\u540D\u524D.y, fontSize: \u540D.size, fontWeight: 700, textAnchor: "middle", fill: "var(--cdl-text, #1a1f2a)", children: \u540D.text }),
+    node.subtitle && plan.\u8AAC\u660E && /* @__PURE__ */ jsxRuntime.jsx("text", { x: cx, y: plan.\u8AAC\u660E.y, fontSize: \u8AAC.size, textAnchor: "middle", fill: "var(--cdl-text-dim, #5a6270)", children: \u8AAC.text })
   ] });
 }
 var DROP_SHADOW_D = 4;