@diagrammo/dgmo 0.50.2 → 0.51.0

package/dist/{chunk-HLJVEAOF.js → chunk-DY7XLRHK.js}

@@ -20,10 +20,10 @@ import {
 } from "./chunk-YYVTBZZC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-OU7HLO7I.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-7UEMZREK.js";
+} from "./chunk-YAA6IID3.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -36,7 +36,7 @@ import {
   CHAR_WIDTH_RATIO,
   measureText,
   truncateText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   contrastText,
   mix,
@@ -47,7 +47,7 @@ import {
 } from "./chunk-P6T66CCZ.js";
 import {
   resolveTagColor
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   resolveColor
 } from "./chunk-TLVIHFRO.js";
@@ -74,7 +74,6 @@ var RAMP_FLOOR = 15;
 var VALUE_FONT_SIZE = 11;
 var lineGeneratorLR = d3Shape.line().x((d) => d.x).y((d) => d.y).curve(d3Shape.curveBasis);
 var lineGeneratorTB = d3Shape.line().x((d) => d.x).y((d) => d.y).curve(d3Shape.curveBasis);
-var lineGeneratorStraight = d3Shape.line().x((d) => d.x).y((d) => d.y).curve(d3Shape.curveLinear);
 function splitCamelCase(word) {
   const parts = [];
   let start = 0;
@@ -327,32 +326,8 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
   const scaleX = width / (contentW + sDiagramPadding * 2);
   const scaleY = height / (contentH + sDiagramPadding * 2);
   const scale = Math.min(scaleX, scaleY, 3);
-  let centerShiftX = 0;
-  let centerShiftY = 0;
-  if (parsed.nodePositions && parsed.nodePositions.size > 0) {
-    let bMinX = Infinity, bMinY = Infinity, bMaxX = -Infinity, bMaxY = -Infinity;
-    const accB = (x, y) => {
-      if (x < bMinX) bMinX = x;
-      if (x > bMaxX) bMaxX = x;
-      if (y < bMinY) bMinY = y;
-      if (y > bMaxY) bMaxY = y;
-    };
-    for (const n of layout.nodes) {
-      accB(n.x - n.width / 2, n.y - n.height / 2);
-      accB(n.x + n.width / 2, n.y + n.height / 2);
-    }
-    for (const g of layout.groups) {
-      accB(g.x - g.width / 2, g.y - g.height / 2);
-      accB(g.x + g.width / 2, g.y + g.height / 2);
-    }
-    for (const e of layout.edges) for (const p of e.points) accB(p.x, p.y);
-    if (Number.isFinite(bMinX)) {
-      centerShiftX = (layout.width - bMaxX - bMinX) / 2;
-      centerShiftY = (layout.height - bMaxY - bMinY) / 2;
-    }
-  }
-  const offsetX = (width - contentW * scale) / 2 + centerShiftX * scale;
-  const offsetY = sDiagramPadding + titleOffset + legendH + centerShiftY * scale;
+  const offsetX = (width - contentW * scale) / 2;
+  const offsetY = sDiagramPadding + titleOffset + legendH;
   const svg = d3Selection.select(container).append("svg").attr("width", width).attr("height", height).attr("viewBox", `0 0 ${width} ${height}`).attr("preserveAspectRatio", "xMidYMin meet").style("font-family", FONT_FAMILY).style("background", palette.bg);
   if (sctx.isBelowFloor) {
     svg.attr("width", "100%");
@@ -484,7 +459,7 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
     if (points.length < 2) continue;
     const edgeG = diagramG.append("g").attr("class", "bl-edge-group").attr("data-line-number", String(le.lineNumber)).attr("data-from", le.source).attr("data-to", le.target);
     const markerId = `bl-arrow-${color.replace("#", "")}`;
-    const gen = le.straight ? lineGeneratorStraight : parsed.direction === "TB" ? lineGeneratorTB : lineGeneratorLR;
+    const gen = parsed.direction === "TB" ? lineGeneratorTB : lineGeneratorLR;
     const path = edgeG.append("path").attr("class", "bl-edge").attr("d", gen(points) ?? "").attr("fill", "none").attr("stroke", color).attr("stroke-width", sEdgeStrokeWidth).attr("marker-end", `url(#${markerId})`);
     if (le.bidirectional) {
       const revId = `bl-arrow-rev-${color.replace("#", "")}`;
@@ -783,4 +758,4 @@ export {
   renderBoxesAndLines,
   renderBoxesAndLinesForExport
 };
-//# sourceMappingURL=chunk-HLJVEAOF.js.map
+//# sourceMappingURL=chunk-DY7XLRHK.js.map

package/dist/{chunk-OMNGQPEZ.js → chunk-E7Y3SYKW.js}

@@ -4,12 +4,12 @@ import {
   matchTagBlockHeading,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   extractColor,
   measureIndent,
   parseFirstLine
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-LV4BETUU.js";
 import {
   emit
 } from "./chunk-CXK4DZH3.js";
@@ -682,4 +682,4 @@ export {
   SWIMLANE_DIAGNOSTICS,
   parseSwimlane
 };
-//# sourceMappingURL=chunk-OMNGQPEZ.js.map
+//# sourceMappingURL=chunk-E7Y3SYKW.js.map

package/dist/{chunk-HTMN2Z6U.js → chunk-EDA6C7MV.js}

@@ -1,7 +1,12 @@
 import {
   extractDatePrefix,
   parseTimelineDate
-} from "./chunk-I7F2A35O.js";
+} from "./chunk-TMACGPW5.js";
+import {
+  makeYearContext,
+  parseDateToken,
+  resolveTokenYear
+} from "./chunk-RBDIYLA5.js";
 import {
   AUTO_TAG_COLOR_SENTINEL,
   finalizeAutoTagColors,
@@ -11,7 +16,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   EVENT_LINE_REGISTRY,
   extractColor,
@@ -21,7 +26,7 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-LV4BETUU.js";
 import {
   emit,
   formatDgmoError,
@@ -159,6 +164,40 @@ function parseEventLine(content, palette) {
   };
   if (!content?.trim()) return fail(0, "No content provided");
   const lines = content.split("\n");
+  let dateOrder = "mdy";
+  let noCurrentYear = false;
+  let directiveYear = null;
+  for (const raw of lines) {
+    const t = raw.trim().toLowerCase();
+    if (t === "no-current-year") noCurrentYear = true;
+    else if (t === "date-order dmy") dateOrder = "dmy";
+    else if (t === "date-order mdy") dateOrder = "mdy";
+    else {
+      const ym = t.match(/^year\s+(\d{1,4})$/);
+      if (ym) directiveYear = parseInt(ym[1], 10);
+    }
+  }
+  let prescan = null;
+  for (const raw of lines) {
+    const t = raw.trim();
+    if (!t) continue;
+    const p = parseDateToken(t, { dateOrder });
+    if (p?.token.year != null) {
+      prescan = p.token.sign * p.token.year;
+      break;
+    }
+  }
+  const yearCtx = makeYearContext({
+    order: dateOrder,
+    directiveYear,
+    prescanYear: prescan,
+    noCurrentYear
+  });
+  const dateCtx = {
+    order: dateOrder,
+    resolve: (tok) => resolveTokenYear(tok, yearCtx)
+  };
+  const isDateDirective = (t) => t === "no-current-year" || t === "date-order dmy" || t === "date-order mdy" || /^year\s+\d{1,4}$/.test(t);
   let contentStarted = false;
   let headerParsed = false;
   const sharedOptions = {};
@@ -277,6 +316,9 @@ function parseEventLine(content, palette) {
     }
     if (indent === 0) {
       currentTagGroup = null;
+      if (isDateDirective(trimmed.toLowerCase())) {
+        continue;
+      }
       if (trimmed.toLowerCase() === "no-scale") {
         options.scale = false;
         continue;
@@ -329,7 +371,8 @@ function parseEventLine(content, palette) {
       currentEra,
       aliasMap,
       result.diagnostics,
-      pushWarning
+      pushWarning,
+      dateCtx
     );
     result.events.push(event);
     currentEvent = event;
@@ -489,7 +532,7 @@ function validateEraDateOrder(events, eras, emitWarn) {
     }
   }
 }
-function parseEventHeader(trimmed, lineNumber, era, aliasMap, diagnostics, pushWarning) {
+function parseEventHeader(trimmed, lineNumber, era, aliasMap, diagnostics, pushWarning, dateCtx) {
   let date = null;
   let dateValue = null;
   let future = false;
@@ -500,7 +543,7 @@ function parseEventHeader(trimmed, lineNumber, era, aliasMap, diagnostics, pushW
     future = true;
     remainder = trimmed.slice(tbdMatch[0].length).trimStart();
   }
-  const prefix = future ? null : extractDatePrefix(trimmed);
+  const prefix = future ? null : extractDatePrefix(trimmed, dateCtx);
   if (prefix) {
     date = prefix.startDate;
     dateValue = parseTimelineDate(prefix.startDate);
@@ -555,4 +598,4 @@ export {
   EVENT_LINE_DIAGNOSTICS,
   parseEventLine
 };
-//# sourceMappingURL=chunk-HTMN2Z6U.js.map
+//# sourceMappingURL=chunk-EDA6C7MV.js.map

package/dist/{chunk-7L3R6I3U.js → chunk-ENRS56GC.js}

@@ -9,12 +9,12 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   extractColor,
   measureIndent,
   parseFirstLine
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-LV4BETUU.js";
 import {
   formatDgmoError,
   makeDgmoError,
@@ -335,4 +335,4 @@ function parseBlockTail(tail, aliasMap) {
 export {
   parseBlock
 };
-//# sourceMappingURL=chunk-7L3R6I3U.js.map
+//# sourceMappingURL=chunk-ENRS56GC.js.map

package/dist/{chunk-2KGXHFYK.js → chunk-EXOQP75F.js}

@@ -3,10 +3,10 @@ import {
   layoutJourneyMap,
   scoreToColor,
   scoreToCurveY
-} from "./chunk-F7BFXWNQ.js";
+} from "./chunk-3JLKYGBQ.js";
 import {
   wrapNoteBody
-} from "./chunk-BCYVE3N5.js";
+} from "./chunk-TYS6CSS5.js";
 import {
   NOTE_BULLET_INDENT
 } from "./chunk-5DH3KYFH.js";
@@ -21,7 +21,7 @@ import {
 } from "./chunk-YYVTBZZC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-OU7HLO7I.js";
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
@@ -29,10 +29,10 @@ import {
   measureText,
   truncateText,
   wrapTextToWidth
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   parseJourneyMap
-} from "./chunk-6HJBFVLO.js";
+} from "./chunk-4QZ43D7I.js";
 import {
   contrastText,
   mix,
@@ -41,7 +41,7 @@ import {
 import {
   resolveActiveTagGroup,
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 
 // src/journey-map/renderer.ts
 import * as d3 from "d3-selection";
@@ -848,4 +848,4 @@ export {
   renderJourneyMap,
   renderJourneyMapForExport
 };
-//# sourceMappingURL=chunk-2KGXHFYK.js.map
+//# sourceMappingURL=chunk-EXOQP75F.js.map

package/dist/{chunk-BBGDM4NQ.js → chunk-F3FYUFUH.js}

@@ -1,24 +1,24 @@
 import {
   renderCollapseBar,
   renderNodeCard
-} from "./chunk-AHGF2YYA.js";
+} from "./chunk-OTOHI4JO.js";
 import {
   CARD_RADIUS,
   CONTAINER_RADIUS
 } from "./chunk-3CIOJ5YJ.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-OU7HLO7I.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-7UEMZREK.js";
+} from "./chunk-YAA6IID3.js";
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
 import {
   measureText,
   wrapTextToWidth
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   contrastText,
   mix,
@@ -28,7 +28,7 @@ import {
   resolveActiveTagGroup,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 
 // src/sketch/renderer.ts
 import * as d3 from "d3-selection";
@@ -945,6 +945,24 @@ function sketchEdgeGeometry(layout, offsets) {
   }
   const W_NODE = 100;
   const W_EDGE = 8;
+  const W_PORT = 1.5;
+  const isBox = (id) => portsById.has(id);
+  const portClashCount = (self, s, t) => {
+    const e = layout.edges[self];
+    let n = 0;
+    for (let j = 0; j < layout.edges.length; j++) {
+      if (j === self) continue;
+      const ej = layout.edges[j];
+      const cj = chosen[j];
+      if (!isBox(e.sourceId) && ej.targetId === e.sourceId && ej.sourceId !== e.targetId && // not reciprocal
+      cj.t === s)
+        n++;
+      if (!isBox(e.targetId) && ej.sourceId === e.targetId && ej.targetId !== e.sourceId && // not reciprocal
+      cj.s === t)
+        n++;
+    }
+    return n;
+  };
   const scoreOf = (c, g, poly, self, polys2, s, t) => {
     let edgeCross = 0;
     for (let j = 0; j < polys2.length; j++) {
@@ -952,7 +970,7 @@ function sketchEdgeGeometry(layout, offsets) {
       const pj = polys2[j];
       if (pj) edgeCross += polyCrossings(poly, pj);
     }
-    return pathCrossings(g, c.obstacleRects) * W_NODE + edgeCross * W_EDGE + facingCost(c.source, c.target, s) + facingCost(c.target, c.source, t);
+    return pathCrossings(g, c.obstacleRects) * W_NODE + edgeCross * W_EDGE + portClashCount(self, s, t) * W_PORT + facingCost(c.source, c.target, s) + facingCost(c.target, c.source, t);
   };
   const chosen = layout.edges.map(
     (_, i) => sides[i] ?? { s: "R", t: "L" }
@@ -977,7 +995,7 @@ function sketchEdgeGeometry(layout, offsets) {
       if (!c || !g || !p) continue;
       const cur = chosen[i];
       const curScore = scoreOf(c, g, p, i, polys, cur.s, cur.t);
-      if (curScore < W_EDGE) continue;
+      if (curScore < W_EDGE && portClashCount(i, cur.s, cur.t) === 0) continue;
       let bestScore = curScore;
       let bestG = g;
       let bestP = p;
@@ -1040,4 +1058,4 @@ export {
   sketchEdgeGeometry,
   renderSketchForExport
 };
-//# sourceMappingURL=chunk-BBGDM4NQ.js.map
+//# sourceMappingURL=chunk-F3FYUFUH.js.map

package/dist/{chunk-GL5UZ6NY.js → chunk-FC5I2KXV.js}

@@ -1,6 +1,6 @@
 import {
   tryCollectNote
-} from "./chunk-SCHXJTZL.js";
+} from "./chunk-WQLMU7VG.js";
 import {
   resolveNotes
 } from "./chunk-FMDSF3OV.js";
@@ -16,7 +16,7 @@ import {
   measureIndent,
   parseFirstLine,
   tryParseSharedOption
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-LV4BETUU.js";
 import {
   resolveColorWithDiagnostic
 } from "./chunk-TLVIHFRO.js";
@@ -445,4 +445,4 @@ export {
   looksLikeClassDiagram,
   extractSymbols
 };
-//# sourceMappingURL=chunk-GL5UZ6NY.js.map
+//# sourceMappingURL=chunk-FC5I2KXV.js.map

package/dist/{chunk-VVW3F3MD.js → chunk-FTBZV6NE.js}

@@ -1,10 +1,10 @@
 import {
   analyzePert
-} from "./chunk-NX4EQS3U.js";
+} from "./chunk-J76PIKAT.js";
 import {
   computeNodeSizing,
   layoutPert
-} from "./chunk-F2L5GCQ4.js";
+} from "./chunk-GU46PPT3.js";
 import {
   COLLAPSE_BAR_HEIGHT,
   CONTAINER_HEADER_HEIGHT,
@@ -18,7 +18,7 @@ import {
 } from "./chunk-YYVTBZZC.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-OU7HLO7I.js";
 import {
   CAPTION_BOX_PADDING_X,
   CAPTION_BOX_PADDING_Y,
@@ -35,22 +35,22 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-HQCHYB5F.js";
+} from "./chunk-QOOUC2J5.js";
 import {
   measureText,
   truncateText,
   wrapTextToWidth
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   parsePert
-} from "./chunk-EAMEADTV.js";
+} from "./chunk-5PDTIBLV.js";
 import {
   addCalendarDays,
   formatDuration,
   formatScheduleValue,
   formatSlackValue,
   formatSprintCell
-} from "./chunk-L3UHP6TD.js";
+} from "./chunk-7L4UJOY6.js";
 import {
   contrastText,
   mix,
@@ -60,7 +60,7 @@ import {
 import {
   resolveActiveTagGroup,
   resolveTagColor
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 
 // src/pert/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -1815,4 +1815,4 @@ export {
   measurePertAnalysisBlock,
   renderPertAnalysisBlock
 };
-//# sourceMappingURL=chunk-VVW3F3MD.js.map
+//# sourceMappingURL=chunk-FTBZV6NE.js.map

package/dist/{chunk-7QKLIMRZ.js → chunk-G3PF3S7P.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-BMR4CIEO.js";
 import {
   renderNodeCard
-} from "./chunk-AHGF2YYA.js";
+} from "./chunk-OTOHI4JO.js";
 import {
   CARD_RADIUS,
   HEADER_HEIGHT,
@@ -16,10 +16,10 @@ import {
 } from "./chunk-3CIOJ5YJ.js";
 import {
   formatDateLabel
-} from "./chunk-66RUL3XF.js";
+} from "./chunk-B63YB7X3.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-OU7HLO7I.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -29,8 +29,9 @@ import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
 import {
-  CHAR_WIDTH_RATIO
-} from "./chunk-5LWQH6QV.js";
+  CHAR_WIDTH_RATIO,
+  wrapTextToWidth
+} from "./chunk-WCT3NYCV.js";
 import {
   contrastText,
   getSeriesColors,
@@ -41,7 +42,7 @@ import {
 import {
   resolveActiveTagGroup,
   resolveTagColor
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   resolveColor
 } from "./chunk-TLVIHFRO.js";
@@ -58,6 +59,8 @@ var DESC_FONT = 11.5;
 var DESC_LINE_H = 16;
 var CARD_PAD = 9;
 var CARD_BODY_TOP = HEADER_HEIGHT + SEPARATOR_GAP;
+var TITLE_LINE_H = 16;
+var TITLE_MAX_W = (CARD_W - CARD_PAD * 2) * 0.93;
 var DOT_R = 5.5;
 var MIN_SPACING = 96;
 var LANE_GAP = 16;
@@ -136,7 +139,14 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
     8,
     Math.floor((CARD_W - CARD_PAD * 2) / (DESC_FONT * CHAR_WIDTH_RATIO))
   );
-  const cardHeight = (lines, hasDate) => HEADER_HEIGHT + (hasDate ? DATE_SUBTITLE_H : 0) + (lines.length > 0 ? SEPARATOR_GAP + lines.length * DESC_LINE_H : 0) + (lines.length > 0 ? CARD_PAD : 6);
+  const titleLayout = (label) => {
+    const lines = wrapTextToWidth(label, LABEL_FONT_SIZE, TITLE_MAX_W, {
+      hardBreak: true
+    });
+    const headerH = Math.max(HEADER_HEIGHT, lines.length * TITLE_LINE_H + 12);
+    return { lines, headerH };
+  };
+  const cardHeight = (headerH, lines, hasDate) => headerH + (hasDate ? DATE_SUBTITLE_H : 0) + (lines.length > 0 ? SEPARATOR_GAP + lines.length * DESC_LINE_H : 0) + (lines.length > 0 ? CARD_PAD : 6);
   const eventColor = (ev) => {
     if (!activeGroup) return accent;
     const tc = resolveTagColor(
@@ -161,6 +171,7 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
         palette.textOnFillDark
       );
       const lines2 = wrapDescription(event.description, charsPerLine);
+      const title2 = titleLayout(event.label);
       return {
         kind: "event",
         event,
@@ -176,10 +187,12 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
         color: solid2,
         cardFill: cardFill2,
         titleColor: titleColor2,
+        titleLines: title2.lines,
+        headerH: title2.headerH,
         lines: lines2,
         bulletColors: [],
         bulletMeta: [],
-        cardH: cardHeight(lines2, !!event.date),
+        cardH: cardHeight(title2.headerH, lines2, !!event.date),
         x: 0,
         side,
         lane: 0,
@@ -214,6 +227,7 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
     const bulletColors = visibleMembers.map(eventColor);
     const bulletMeta = visibleMembers.map((m) => m.metadata);
     const lines = wrapDescription(memberStrs, charsPerLine);
+    const title = titleLayout(era.name);
     return {
       kind: "era",
       event: null,
@@ -229,10 +243,12 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
       color: solid,
       cardFill,
       titleColor,
+      titleLines: title.lines,
+      headerH: title.headerH,
       lines,
       bulletColors,
       bulletMeta,
-      cardH: cardHeight(lines, false),
+      cardH: cardHeight(title.headerH, lines, false),
       x: 0,
       side,
       lane: 0,
@@ -331,32 +347,6 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
         p.x = H_MARGIN + i * spacing;
       });
     }
-    if (scaled) {
-      const SPREAD = CARD_W + FAN_GAP;
-      for (let iter = 0; iter < 8; iter++) {
-        let moved = false;
-        for (const side of ["above", "below"]) {
-          const obs = placed.filter((p) => p.side === side).sort((a, b) => a.x - b.x);
-          for (let i = 1; i < obs.length; i++) {
-            const p = obs[i];
-            if (p.kind !== "event") continue;
-            const prev = obs[i - 1];
-            if (prev.kind === "event" && p.dateValue === prev.dateValue)
-              continue;
-            const need = prev.x + SPREAD;
-            if (need <= p.x) continue;
-            const nxt = obs[i + 1];
-            const cap = nxt?.kind === "era" ? nxt.x - SPREAD : Infinity;
-            const target = Math.min(need, cap);
-            if (target > p.x + 0.5) {
-              p.x = target;
-              moved = true;
-            }
-          }
-        }
-        if (!moved) break;
-      }
-    }
     for (const side of ["above", "below"]) {
       const arr = placed.filter((p) => p.side === side).sort((a, b) => a.x - b.x);
       const laneRight = [];
@@ -536,9 +526,9 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
     const dateH = dateStr ? DATE_SUBTITLE_H : 0;
     if (parsed.options.noBox) {
       const titleNearTop = p.side === "below";
-      const headBandTop = titleNearTop ? 0 : p.cardH - HEADER_HEIGHT;
-      const shelfTop = titleNearTop ? 0 : p.cardH - HEADER_HEIGHT - dateH;
-      const shelfH = HEADER_HEIGHT + dateH;
+      const headBandTop = titleNearTop ? 0 : p.cardH - p.headerH;
+      const shelfTop = titleNearTop ? 0 : p.cardH - p.headerH - dateH;
+      const shelfH = p.headerH + dateH;
       const clipId = `dgmo-evt-shelf-${shelfClipSeq++}`;
       cardG.append("clipPath").attr("id", clipId).append("rect").attr("x", 0).attr("y", shelfTop).attr("width", CARD_W).attr("height", shelfH).attr("rx", SHELF_EDGE);
       cardG.append("rect").attr("x", 0).attr("y", shelfTop).attr("width", CARD_W).attr("height", shelfH).attr("clip-path", `url(#${clipId})`).attr(
@@ -548,18 +538,22 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
       const edgeY = titleNearTop ? shelfTop : shelfTop + shelfH - SHELF_EDGE;
       cardG.append("rect").attr("x", 0).attr("y", edgeY).attr("width", CARD_W).attr("height", SHELF_EDGE).attr("clip-path", `url(#${clipId})`).attr("fill", p.color).attr("fill-opacity", p.future ? 0.4 : 1);
       const shelfText = parsed.options.solidFill ? contrastText(p.color, palette.textOnFillLight, palette.textOnFillDark) : p.color;
-      cardG.append("text").attr("x", CARD_PAD).attr("y", headBandTop + HEADER_HEIGHT / 2 + LABEL_FONT_SIZE / 2 - 2).attr("fill", shelfText).attr("font-family", FONT_FAMILY).attr("font-size", LABEL_FONT_SIZE).attr("font-weight", 700).text(p.label);
+      const titleMid = headBandTop + p.headerH / 2;
+      const titleTop = titleMid - (p.titleLines.length - 1) * TITLE_LINE_H / 2;
+      for (let ti = 0; ti < p.titleLines.length; ti++) {
+        cardG.append("text").attr("x", CARD_PAD).attr("y", titleTop + ti * TITLE_LINE_H + LABEL_FONT_SIZE / 2 - 2).attr("fill", shelfText).attr("font-family", FONT_FAMILY).attr("font-size", LABEL_FONT_SIZE).attr("font-weight", 700).text(p.titleLines[ti]);
+      }
       if (dateStr) {
         cardG.append("text").attr("x", CARD_PAD).attr(
           "y",
-          (titleNearTop ? HEADER_HEIGHT : headBandTop - dateH) + DATE_SUBTITLE_FONT + 2
+          (titleNearTop ? p.headerH : headBandTop - dateH) + DATE_SUBTITLE_FONT + 2
         ).attr(
           "fill",
           parsed.options.solidFill ? mix(shelfText, p.color, 25) : mix(palette.text, palette.bg, 55)
         ).attr("font-family", FONT_FAMILY).attr("font-size", DATE_SUBTITLE_FONT).attr("font-weight", 600).text(dateStr);
       }
       if (p.lines.length > 0) {
-        const startBaseline = titleNearTop ? CARD_BODY_TOP + dateH + DESC_FONT : CARD_PAD + DESC_FONT;
+        const startBaseline = titleNearTop ? p.headerH + SEPARATOR_GAP + dateH + DESC_FONT : CARD_PAD + DESC_FONT;
         renderBody(
           cardG,
           p.lines,
@@ -579,21 +573,22 @@ function renderEventLine(container, parsed, palette, isDark, onClickItem, export
         stroke: p.color,
         strokeWidth: NODE_STROKE_WIDTH,
         label: p.label,
+        labelLines: p.titleLines,
         labelColor: p.titleColor,
         labelFontSize: LABEL_FONT_SIZE,
-        headerHeight: HEADER_HEIGHT
+        headerHeight: p.headerH
       });
       if (dateStr) {
-        cardG.append("text").attr("x", CARD_W / 2).attr("y", HEADER_HEIGHT + DATE_SUBTITLE_FONT + 1).attr("text-anchor", "middle").attr("fill", mix(p.titleColor, p.cardFill, 60)).attr("font-family", FONT_FAMILY).attr("font-size", DATE_SUBTITLE_FONT).attr("font-weight", 600).text(dateStr);
+        cardG.append("text").attr("x", CARD_W / 2).attr("y", p.headerH + DATE_SUBTITLE_FONT + 1).attr("text-anchor", "middle").attr("fill", mix(p.titleColor, p.cardFill, 60)).attr("font-family", FONT_FAMILY).attr("font-size", DATE_SUBTITLE_FONT).attr("font-weight", 600).text(dateStr);
       }
       if (p.lines.length > 0) {
-        cardG.append("line").attr("x1", 0).attr("y1", HEADER_HEIGHT + dateH).attr("x2", CARD_W).attr("y2", HEADER_HEIGHT + dateH).attr("stroke", p.titleColor).attr("stroke-opacity", 0.3).attr("stroke-width", 1);
+        cardG.append("line").attr("x1", 0).attr("y1", p.headerH + dateH).attr("x2", CARD_W).attr("y2", p.headerH + dateH).attr("stroke", p.titleColor).attr("stroke-opacity", 0.3).attr("stroke-width", 1);
         renderBody(
           cardG,
           p.lines,
           p.titleColor,
           palette,
-          CARD_BODY_TOP + dateH + DESC_FONT,
+          p.headerH + SEPARATOR_GAP + dateH + DESC_FONT,
           p.bulletColors,
           p.bulletMeta
         );
@@ -987,4 +982,4 @@ export {
   focusEventLine,
   renderEventLineForExport
 };
-//# sourceMappingURL=chunk-7QKLIMRZ.js.map
+//# sourceMappingURL=chunk-G3PF3S7P.js.map