@diagrammo/dgmo 0.50.2 → 0.51.0

package/dist/{chunk-I7F2A35O.js → chunk-TMACGPW5.js}

@@ -1,66 +1,44 @@
+import {
+  parseDateToken,
+  toInternal
+} from "./chunk-RBDIYLA5.js";
 import {
   TIMELINE_REGISTRY,
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-LV4BETUU.js";
 import {
   makeDgmoError
 } from "./chunk-CXK4DZH3.js";
 
 // src/timeline/parser.ts
 var TIMELINE_DURATION_RE = /^(\d+(?:\.\d{1,2})?)(min|[dwmyhs])(\?)?$/;
-var DATE_RE = /^(\d{4}(?:-\d{2}(?:-\d{2})?)?)/;
-var TIME_RE = /^\s+(\d{1,2}:\d{2}(?::\d{2})?)/;
 var ARROW_RE = /^\s*(?:->|–>)\s*/;
-var ERA_DATE_RE = /^(\d{1,4}(?:-\d{2}(?:-\d{2})?)?)\s+(BCE|BC|CE|AD)\b/i;
-function parseTime(timeStr) {
-  const [hStr, mStr, sStr] = timeStr.split(":");
-  const h = parseInt(hStr, 10);
-  const m = parseInt(mStr, 10);
-  const s = sStr !== void 0 ? parseInt(sStr, 10) : 0;
-  const valid = h >= 0 && h <= 23 && m >= 0 && m <= 59 && s >= 0 && s <= 59;
-  return { valid, h, m, s };
-}
-function parseDateWithOptionalTime(input) {
-  const eraMatch = input.match(ERA_DATE_RE);
-  if (eraMatch) {
-    const marker = eraMatch[2].toUpperCase();
-    const bce = marker === "BCE" || marker === "BC";
-    const date2 = (bce ? "-" : "") + eraMatch[1];
-    return {
-      date: date2,
-      rest: input.slice(eraMatch[0].length),
-      timeValid: true,
-      invalidTime: void 0
-    };
-  }
-  const dateMatch = input.match(DATE_RE);
-  if (!dateMatch) return null;
-  let date = dateMatch[1];
-  let rest = input.slice(date.length);
-  let timeValid = true;
-  let invalidTime;
-  const timeMatch = rest.match(TIME_RE);
-  if (timeMatch) {
-    const timeStr = timeMatch[1];
-    const { valid } = parseTime(timeStr);
-    timeValid = valid;
-    if (!valid) invalidTime = timeStr;
-    date = `${date} ${timeStr}`;
-    rest = rest.slice(timeMatch[0].length);
-  }
-  return { date, rest, timeValid, invalidTime };
+function parseDateWithOptionalTime(input, ctx) {
+  const res = parseDateToken(input, { dateOrder: ctx?.order });
+  if (!res) return null;
+  const { token, consumed } = res;
+  const internal = ctx?.resolve ? ctx.resolve(token).internal : toInternal(
+    token,
+    token.year ?? ctx?.currentYear ?? (/* @__PURE__ */ new Date()).getFullYear()
+  );
+  return {
+    date: internal,
+    rest: input.slice(consumed),
+    timeValid: !token.invalidTime,
+    invalidTime: token.invalidTime
+  };
 }
-function extractDatePrefix(line) {
-  const startResult = parseDateWithOptionalTime(line);
+function extractDatePrefix(line, ctx) {
+  const startResult = parseDateWithOptionalTime(line, ctx);
   if (!startResult) return null;
   const { date: startDate } = startResult;
   let { rest } = startResult;
   const arrowMatch = rest.match(ARROW_RE);
   if (arrowMatch) {
     rest = rest.slice(arrowMatch[0].length);
-    const endResult = parseDateWithOptionalTime(rest);
+    const endResult = parseDateWithOptionalTime(rest, ctx);
     if (endResult) {
       let uncertain = false;
       let afterEnd = endResult.rest;
@@ -209,9 +187,9 @@ function parseTimelineDate(s) {
   const yearBase = p.sign * p.year;
   return yearBase + (p.month - 1) / 12 + (p.day - 1) / 365 + p.hour / 8760 + p.minute / 525600 + p.second / 31536e3;
 }
-function parseTimelineEventLine(line, lineNumber, currentGroup, groupMetadata, aliasMap, registry) {
+function parseTimelineEventLine(line, lineNumber, currentGroup, groupMetadata, aliasMap, registry, dateCtx) {
   const diagnostics = [];
-  const prefix = extractDatePrefix(line);
+  const prefix = extractDatePrefix(line, dateCtx);
   if (!prefix) {
     if (/^\d/.test(line)) {
       const firstToken = line.split(/\s/)[0];
@@ -336,4 +314,4 @@ export {
   parseTimelineDate,
   parseTimelineEventLine
 };
-//# sourceMappingURL=chunk-I7F2A35O.js.map
+//# sourceMappingURL=chunk-TMACGPW5.js.map

package/dist/{chunk-5GJYGP5Z.js → chunk-TRM2J7ZN.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-A44USUV7.js";
 import {
   layoutInfra
-} from "./chunk-C63UWAKM.js";
+} from "./chunk-Y2ZE3MSG.js";
 import {
   renderInlineText
 } from "./chunk-3HDBAXF5.js";
@@ -18,10 +18,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,
@@ -41,15 +41,15 @@ import {
   LEGEND_PILL_FONT_SIZE,
   LEGEND_PILL_PAD,
   measureLegendText
-} from "./chunk-HQCHYB5F.js";
+} from "./chunk-QOOUC2J5.js";
 import {
   CHAR_WIDTH_RATIO,
   measureText,
   truncateText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   parseInfra
-} from "./chunk-VUJGMJE6.js";
+} from "./chunk-MVN25IF6.js";
 import {
   preprocessDescriptionLine
 } from "./chunk-IYULMRBE.js";
@@ -60,7 +60,7 @@ import {
 } from "./chunk-P6T66CCZ.js";
 import {
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   resolveColor
 } from "./chunk-TLVIHFRO.js";
@@ -1561,4 +1561,4 @@ export {
   renderInfra,
   parseAndLayoutInfra
 };
-//# sourceMappingURL=chunk-5GJYGP5Z.js.map
+//# sourceMappingURL=chunk-TRM2J7ZN.js.map

package/dist/{chunk-BCYVE3N5.js → chunk-TYS6CSS5.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-BMR4CIEO.js";
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 
 // src/utils/note-box/metrics.ts
 function normalizeBulletLine(line) {
@@ -49,4 +49,4 @@ export {
   wrapNoteBody,
   noteBoxSize
 };
-//# sourceMappingURL=chunk-BCYVE3N5.js.map
+//# sourceMappingURL=chunk-TYS6CSS5.js.map

package/dist/{chunk-5WFIYXQ6.js → chunk-U5SI5NIM.js}

@@ -1,3 +1,15 @@
+import {
+  buildSwatches
+} from "./chunk-4XFBQT5O.js";
+import {
+  fixedParts,
+  formatTime,
+  handAngles,
+  rampColor,
+  sunLine,
+  workStatus,
+  zoneParts
+} from "./chunk-APKUAJ2L.js";
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
@@ -11,167 +23,9 @@ import {
 
 // src/clock/renderer.ts
 import * as d3Selection from "d3-selection";
-
-// src/clock/resolve.ts
-var CLOCK_RAMP = [
-  [0, "#3d478f"],
-  [4, "#4a4d8c"],
-  [6, "#c98a6b"],
-  [8, "#d9a441"],
-  [11, "#e0b23c"],
-  [13, "#4f96c4"],
-  [16, "#cc7a33"],
-  [19, "#8a5aa0"],
-  [24, "#3d478f"]
-];
-function hexLerp(a, b, t) {
-  const pa = [1, 3, 5].map((i) => parseInt(a.slice(i, i + 2), 16));
-  const pb = [1, 3, 5].map((i) => parseInt(b.slice(i, i + 2), 16));
-  const c = pa.map(
-    (v, i) => Math.round(v + (pb[i] - v) * t).toString(16).padStart(2, "0")
-  );
-  return `#${c.join("")}`;
-}
-function rampColor(h) {
-  const hh = (h % 24 + 24) % 24;
-  for (let i = 0; i < CLOCK_RAMP.length - 1; i++) {
-    const [h0, c0] = CLOCK_RAMP[i];
-    const [h1, c1] = CLOCK_RAMP[i + 1];
-    if (hh >= h0 && hh <= h1) return hexLerp(c0, c1, (hh - h0) / (h1 - h0));
-  }
-  return CLOCK_RAMP[0][1];
-}
-var SOON_MIN = 60;
-var RAD = Math.PI / 180;
-var DAY_MS = 864e5;
-var J1970 = 2440588;
-var J2000 = 2451545;
-function zoneParts(zone, nowMs) {
-  const d = new Date(nowMs);
-  try {
-    const o = {};
-    new Intl.DateTimeFormat("en-US", {
-      timeZone: zone,
-      hour12: false,
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit",
-      weekday: "short"
-    }).formatToParts(d).forEach((x) => {
-      o[x.type] = x.value;
-    });
-    const off = new Intl.DateTimeFormat("en-US", {
-      timeZone: zone,
-      timeZoneName: "shortOffset"
-    }).formatToParts(d).find((x) => x.type === "timeZoneName");
-    return {
-      h: parseInt(o["hour"], 10) % 24,
-      m: parseInt(o["minute"], 10),
-      s: parseInt(o["second"], 10),
-      weekday: o["weekday"],
-      offsetLabel: off ? off.value.replace("GMT", "UTC") : ""
-    };
-  } catch {
-    return {
-      h: d.getUTCHours(),
-      m: d.getUTCMinutes(),
-      s: d.getUTCSeconds(),
-      weekday: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][d.getUTCDay()],
-      offsetLabel: "UTC"
-    };
-  }
-}
-function pad2(n) {
-  return n < 10 ? "0" + n : String(n);
-}
-function formatTime(h, m, s, hours12) {
-  const sec = pad2(s);
-  if (hours12) {
-    const ap = h < 12 ? "am" : "pm";
-    let hr = h % 12;
-    if (hr === 0) hr = 12;
-    return { main: `${hr}:${pad2(m)}`, sec, ap };
-  }
-  return { main: `${pad2(h)}:${pad2(m)}`, sec, ap: "" };
-}
-function fmtDelta(ms) {
-  const m = Math.max(0, Math.round(ms / 6e4));
-  if (m < 90) return `${m}m`;
-  return `${Math.floor(m / 60)}h ${m % 60}m`;
-}
-function workStatus(parts, work) {
-  if (!work) return null;
-  const min = parts.h * 60 + parts.m;
-  if (!work.days[parts.weekday]) return { cls: "off", text: "Weekend" };
-  if (min < work.startMin) {
-    const d = work.startMin - min;
-    return {
-      cls: d <= SOON_MIN ? "soon" : "off",
-      text: `starts in ${fmtDelta(d * 6e4)}`
-    };
-  }
-  if (min < work.endMin) {
-    return { cls: "ok", text: `${fmtDelta((work.endMin - min) * 6e4)} left` };
-  }
-  return {
-    cls: "off",
-    text: `ended ${fmtDelta((min - work.endMin) * 6e4)} ago`
-  };
-}
-function toJulian(ms) {
-  return ms / DAY_MS - 0.5 + J1970;
-}
-function fromJulian(j) {
-  return (j + 0.5 - J1970) * DAY_MS;
-}
-function sunTimes(nowMs, lat, lon) {
-  const lw = -lon * RAD;
-  const phi = lat * RAD;
-  const J = toJulian(nowMs);
-  const n = Math.round(J - J2000 - 9e-4 - lw / (2 * Math.PI));
-  const Jn = J2000 + 9e-4 + lw / (2 * Math.PI) + n;
-  const M = (357.5291 + 0.98560028 * (Jn - J2000)) * RAD;
-  const C = (1.9148 * Math.sin(M) + 0.02 * Math.sin(2 * M) + 3e-4 * Math.sin(3 * M)) * RAD;
-  const L = M + C + Math.PI + 102.9372 * RAD;
-  const Jt = Jn + 53e-4 * Math.sin(M) - 69e-4 * Math.sin(2 * L);
-  const dec = Math.asin(Math.sin(L) * Math.sin(23.44 * RAD));
-  const cw = (Math.sin(-0.833 * RAD) - Math.sin(phi) * Math.sin(dec)) / (Math.cos(phi) * Math.cos(dec));
-  if (cw > 1) return { polar: "night" };
-  if (cw < -1) return { polar: "day" };
-  const w = Math.acos(cw);
-  const Jset = J2000 + 9e-4 + (w + lw) / (2 * Math.PI) + n + 53e-4 * Math.sin(M) - 69e-4 * Math.sin(2 * L);
-  return {
-    sunriseMs: fromJulian(Jt - (Jset - Jt)),
-    sunsetMs: fromJulian(Jset)
-  };
+function partsFor(entry, now) {
+  return entry.kind === "fixed" ? fixedParts(entry.fixedOffsetMin ?? 0, now) : zoneParts(entry.zone, now);
 }
-function sunLine(nowMs, lat, lon) {
-  const t = sunTimes(nowMs, lat, lon);
-  if (t.polar) {
-    return {
-      up: t.polar === "day",
-      text: t.polar === "day" ? "midnight sun" : "polar night"
-    };
-  }
-  if (nowMs < t.sunriseMs) {
-    return { up: false, text: `sunrise in ${fmtDelta(t.sunriseMs - nowMs)}` };
-  }
-  if (nowMs < t.sunsetMs) {
-    return { up: true, text: `sunset in ${fmtDelta(t.sunsetMs - nowMs)}` };
-  }
-  const tm = sunTimes(nowMs + DAY_MS, lat, lon);
-  if (tm.polar) return { up: false, text: "sunrise in \u2014" };
-  return { up: false, text: `sunrise in ${fmtDelta(tm.sunriseMs - nowMs)}` };
-}
-function handAngles(h, m, s) {
-  return {
-    hour: (h % 12 + m / 60) * 30,
-    minute: (m + s / 60) * 6,
-    second: s * 6
-  };
-}
-
-// src/clock/renderer.ts
 var PLACE_ACCENTS = [
   "blue",
   "green",
@@ -275,34 +129,18 @@ function daysLabel(days) {
     return "Mon\u2013Fri";
   return on.join(", ");
 }
-function buildSwatches(palette, muted) {
-  const bg = palette.bg;
-  const day = resolveColor("orange", palette) ?? "#d98a1f";
-  const night = resolveColor("blue", palette) ?? "#4864b0";
-  const ok = resolveColor("green", palette) ?? "#3f9e59";
-  const soon = resolveColor("orange", palette) ?? "#c9761a";
-  return {
-    day,
-    night,
-    dayTint: mix(day, bg, 14),
-    nightTint: mix(night, bg, 14),
-    ok,
-    soon,
-    off: muted,
-    okSoft: mix(ok, bg, 14),
-    soonSoft: mix(soon, bg, 14),
-    offSoft: mix(muted, bg, 16),
-    // Sundown indicator: a yellow sun by day, a blue moon by night.
-    sunIcon: resolveColor("yellow", palette) ?? "#f4b400",
-    moonIcon: night
-  };
-}
 function renderClock(container, parsed, palette, isDark, exportDims) {
   d3Selection.select(container).selectAll(":not([data-d3-tooltip])").remove();
   const avail = exportDims?.width ?? container.clientWidth;
   const heightHint = exportDims?.height ?? container.clientHeight;
   if (avail <= 0) return;
-  const width = exportDims?.width ?? Math.min(720, Math.max(460, avail));
+  const cardM = 8;
+  const baseWidth = Math.min(720, Math.max(460, avail));
+  const COL_MIN_W = 190;
+  const width = exportDims?.width ?? (parsed.columns ? Math.max(
+    baseWidth,
+    COL_MIN_W * Math.max(1, parsed.entries.length) + 2 * cardM
+  ) : baseWidth);
   const now = Date.now();
   const baseBg = themeBaseBg(palette, isDark);
   const muted = mix(palette.text, baseBg, 55);
@@ -316,7 +154,6 @@ function renderClock(container, parsed, palette, isDark, exportDims) {
   const rowH = 84;
   const svg = d3Selection.select(container).append("svg").attr("width", width).attr("preserveAspectRatio", "xMidYMid meet").attr("xmlns", "http://www.w3.org/2000/svg").attr("role", "img").attr("aria-label", `${parsed.title ?? "Clock"} \u2014 world clocks`).style("font-family", FONT_FAMILY);
   const bgRect = svg.append("rect").attr("width", width).attr("fill", palette.bg);
-  const cardM = 8;
   const card = svg.append("rect").attr("x", cardM).attr("y", cardM).attr("width", width - 2 * cardM).attr("rx", 14).attr("fill", cardFill).attr("stroke", mix(palette.text, palette.bg, 40)).attr("stroke-width", 1);
   clipSeq += 1;
   const clipId = `dgmo-clock-clip-${clipSeq}`;
@@ -357,7 +194,7 @@ function renderClock(container, parsed, palette, isDark, exportDims) {
     if (parsed.face === "digital") {
       let secW = 0;
       for (const e of parsed.entries) {
-        const p = zoneParts(e.zone, now);
+        const p = partsFor(e, now);
         const t = formatTime(p.h, p.m, p.s, parsed.hours12);
         mainW = Math.max(mainW, estWidth(t.main, 48));
         secW = Math.max(secW, estWidth(`:${t.sec}`, 16), estWidth(t.ap, 16));
@@ -390,7 +227,7 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
   const { padX } = geom;
   const { text, muted, line2, tick, sw, cardFill } = col;
   const center = rowTop + rowH / 2;
-  const parts = zoneParts(entry.zone, now);
+  const parts = partsFor(entry, now);
   const hasCoords = entry.lat !== null && entry.lon !== null;
   const sun = parsed.sun && hasCoords ? sunLine(now, entry.lat, entry.lon) : null;
   const up = sun ? sun.up : parts.h >= 6 && parts.h < 18;
@@ -415,11 +252,13 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
   const rightColLeft = geom.rightX - rightBlockW;
   const g = svg.append("g").attr("data-line-number", entry.lineNumber);
   if (auto) {
-    g.append("rect").attr("x", 9).attr("y", rowTop).attr("width", geom.width - 18).attr("height", rowH).attr("fill", auto.laneTint);
+    g.append("rect").attr("data-dgmo-clock-lane", "").attr("x", 9).attr("y", rowTop).attr("width", geom.width - 18).attr("height", rowH).attr("fill", auto.laneTint);
   }
   g.attr("data-dgmo-clock", "").attr("data-dgmo-clock-zone", entry.zone).attr("data-dgmo-clock-face", parsed.face).attr("data-dgmo-clock-hours12", parsed.hours12 ? "1" : "0").attr("data-dgmo-clock-sun", sun ? "1" : "0").attr("data-dgmo-clock-c-day", sw.day).attr("data-dgmo-clock-c-night", sw.night).attr("data-dgmo-clock-c-day-soft", sw.dayTint).attr("data-dgmo-clock-c-night-soft", sw.nightTint).attr("data-dgmo-clock-c-ok", sw.ok).attr("data-dgmo-clock-c-soon", sw.soon).attr("data-dgmo-clock-c-off", sw.off).attr("data-dgmo-clock-c-ok-soft", sw.okSoft).attr("data-dgmo-clock-c-soon-soft", sw.soonSoft).attr("data-dgmo-clock-c-off-soft", sw.offSoft);
   if (entry.lat !== null) g.attr("data-dgmo-clock-lat", entry.lat);
   if (entry.lon !== null) g.attr("data-dgmo-clock-lon", entry.lon);
+  if (entry.kind === "fixed")
+    g.attr("data-dgmo-clock-fixed-offset", entry.fixedOffsetMin ?? 0);
   if (parsed.work) {
     g.attr("data-dgmo-clock-work-start", parsed.work.startMin).attr("data-dgmo-clock-work-end", parsed.work.endMin).attr(
       "data-dgmo-clock-work-days",
@@ -432,10 +271,7 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
   const ringColor = auto?.solid ?? line2;
   const accentColor = auto?.solid ?? stColor;
   if (auto) {
-    g.attr("data-dgmo-clock-auto-solid", auto.solid).attr(
-      "data-dgmo-clock-auto-face",
-      faceFill
-    );
+    g.attr("data-dgmo-clock-auto-solid", auto.solid).attr("data-dgmo-clock-auto-face", faceFill).attr("data-dgmo-clock-auto-mode", parsed.colorBy).attr("data-dgmo-clock-cardfill", cardFill);
   }
   if (parsed.face === "analog") {
     const size = rowH - 20;
@@ -497,7 +333,8 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
   const textX = rightColLeft + 20;
   const textMax = geom.rightX - textX;
   const lines = [];
-  if (entry.label !== entry.place) lines.push({ kind: "place" });
+  if (entry.kind === "fixed") lines.push({ kind: "fixed" });
+  else if (entry.label !== entry.place) lines.push({ kind: "place" });
   if (status) lines.push({ kind: "avail" });
   if (sun) lines.push({ kind: "sun" });
   const lh = 23;
@@ -517,13 +354,25 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
     } else if (ln.kind === "sun" && sun) {
       drawSunMoon(g, iconX, yy - 5, up, sw, 1.25);
       g.append("text").attr("data-dgmo-clock-sun-line", "").attr("x", textX).attr("y", yy).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", 13.5).text(ellipsize(sun.text, 13.5, textMax));
+    } else if (ln.kind === "fixed") {
+      drawFixedGlyph(g, iconX, yy - 5, muted);
+      g.append("text").attr("x", textX).attr("y", yy).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", 13.5).text(ellipsize(`${entry.place} \xB7 no DST`, 13.5, textMax));
     }
   });
 }
+function drawFixedGlyph(parent, cx, cy, color) {
+  const g = parent.append("g").attr("transform", `translate(${cx},${cy})`);
+  for (let k = 0; k < 3; k++) {
+    const a = k * 60 * Math.PI / 180;
+    g.append("line").attr("x1", -4 * Math.cos(a)).attr("y1", -4 * Math.sin(a)).attr("x2", 4 * Math.cos(a)).attr("y2", 4 * Math.sin(a)).attr("stroke", color).attr("stroke-width", 1.2).attr("stroke-linecap", "round");
+  }
+}
 function bakeAnchors(g, entry, parsed, sun, sw) {
   g.attr("data-dgmo-clock", "").attr("data-dgmo-clock-zone", entry.zone).attr("data-dgmo-clock-face", parsed.face).attr("data-dgmo-clock-hours12", parsed.hours12 ? "1" : "0").attr("data-dgmo-clock-sun", sun ? "1" : "0").attr("data-dgmo-clock-c-day", sw.day).attr("data-dgmo-clock-c-night", sw.night).attr("data-dgmo-clock-c-day-soft", sw.dayTint).attr("data-dgmo-clock-c-night-soft", sw.nightTint).attr("data-dgmo-clock-c-ok", sw.ok).attr("data-dgmo-clock-c-soon", sw.soon).attr("data-dgmo-clock-c-off", sw.off).attr("data-dgmo-clock-c-ok-soft", sw.okSoft).attr("data-dgmo-clock-c-soon-soft", sw.soonSoft).attr("data-dgmo-clock-c-off-soft", sw.offSoft);
   if (entry.lat !== null) g.attr("data-dgmo-clock-lat", entry.lat);
   if (entry.lon !== null) g.attr("data-dgmo-clock-lon", entry.lon);
+  if (entry.kind === "fixed")
+    g.attr("data-dgmo-clock-fixed-offset", entry.fixedOffsetMin ?? 0);
   if (parsed.work) {
     g.attr("data-dgmo-clock-work-start", parsed.work.startMin).attr("data-dgmo-clock-work-end", parsed.work.endMin).attr(
       "data-dgmo-clock-work-days",
@@ -538,10 +387,12 @@ function drawColumns(body, parsed, now, top, geom, col) {
   const colW = (width - 2 * cardM) / n;
   const tints = [];
   let maxBottom = top;
+  const deferred = [];
+  let detailTop = top;
   parsed.entries.forEach((entry, i) => {
     const x0 = cardM + i * colW;
     const cx = x0 + colW / 2;
-    const parts = zoneParts(entry.zone, now);
+    const parts = partsFor(entry, now);
     const hasCoords = entry.lat !== null && entry.lon !== null;
     const sun = parsed.sun && hasCoords ? sunLine(now, entry.lat, entry.lon) : null;
     const up = sun ? sun.up : parts.h >= 6 && parts.h < 18;
@@ -566,17 +417,14 @@ function drawColumns(body, parsed, now, top, geom, col) {
     const faceFill = auto ? mix(auto.solid, cardFill, 20) : stTint;
     const ringColor = auto?.solid ?? line2;
     const accentColor = auto?.solid ?? stColor;
+    const g = body.append("g").attr("data-line-number", entry.lineNumber);
+    bakeAnchors(g, entry, parsed, sun, sw);
     if (auto)
       tints.push(
-        body.append("rect").attr("x", x0).attr("y", top).attr("width", colW).attr("fill", auto.laneTint)
+        g.append("rect").attr("data-dgmo-clock-lane", "").attr("x", x0).attr("y", top).attr("width", colW).attr("fill", auto.laneTint)
       );
-    const g = body.append("g").attr("data-line-number", entry.lineNumber);
-    bakeAnchors(g, entry, parsed, sun, sw);
     if (auto) {
-      g.attr("data-dgmo-clock-auto-solid", auto.solid).attr(
-        "data-dgmo-clock-auto-face",
-        faceFill
-      );
+      g.attr("data-dgmo-clock-auto-solid", auto.solid).attr("data-dgmo-clock-auto-face", faceFill).attr("data-dgmo-clock-auto-mode", parsed.colorBy).attr("data-dgmo-clock-cardfill", cardFill);
     }
     let cy = top + (parsed.face === "analog" ? 22 : 36);
     const innerW = colW - 16;
@@ -599,18 +447,20 @@ function drawColumns(body, parsed, now, top, geom, col) {
       fg.append("circle").attr("data-dgmo-clock-center", "").attr("cx", 50).attr("cy", 50).attr("r", 2.6).attr("fill", accentColor);
       cy += size + 6;
     } else {
-      const sf = 13;
-      const tf = fitFont(ts.main, 44, innerW - 30, 20);
+      const sf = 22;
+      const gap = 11;
+      const cap = 0.7;
+      const tf = fitFont(ts.main, 54, innerW - 30 - gap, 20);
       const mainW = [...ts.main].reduce(
         (w, c) => w + tf * (c === ":" ? 0.334 : 0.6),
         0
       );
       const stackW = Math.max(estWidth(`:${ts.sec}`, sf), estWidth(ts.ap, sf));
-      const gLeft = cx - (mainW + 7 + stackW) / 2;
+      const gLeft = cx - (mainW + gap + stackW) / 2;
       const baseY = cy + tf * 0.34;
       g.append("text").attr("data-dgmo-clock-digital", "").attr("data-dgmo-clock-digital-part", "main").attr("x", gLeft).attr("y", baseY).attr("fill", timeColor).attr("font-family", FONT_FAMILY).attr("font-size", tf).attr("font-weight", 600).attr("textLength", mainW).attr("lengthAdjust", "spacing").style("font-variant-numeric", "tabular-nums").text(ts.main);
-      const stackX = gLeft + mainW + 7;
-      g.append("text").attr("data-dgmo-clock-digital-part", "sec").attr("x", stackX).attr("y", baseY - tf * 0.32).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", sf).attr("font-weight", 500).text(`:${ts.sec}`);
+      const stackX = gLeft + mainW + gap;
+      g.append("text").attr("data-dgmo-clock-digital-part", "sec").attr("x", stackX).attr("y", baseY - tf * cap + sf * cap).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", sf).attr("font-weight", 500).text(`:${ts.sec}`);
       if (ts.ap)
         g.append("text").attr("data-dgmo-clock-digital-part", "ap").attr("x", stackX).attr("y", baseY).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", sf).attr("font-weight", 500).text(ts.ap);
       cy += tf + 8;
@@ -635,34 +485,52 @@ function drawColumns(body, parsed, now, top, geom, col) {
     );
     cy += alines.length * alh + 12;
     const kinds = [];
-    if (entry.label !== entry.place) kinds.push("place");
+    if (entry.kind === "fixed") kinds.push("fixed");
+    else if (entry.label !== entry.place) kinds.push("place");
     if (status) kinds.push("avail");
     if (sun) kinds.push("sun");
     const iconX = x0 + 16;
     const textX = x0 + 28;
     const tmax = colW - 40;
-    kinds.forEach((kind, j) => {
-      const yy = cy + j * 20;
-      if (kind === "place") {
-        g.append("path").attr("transform", `translate(${iconX},${yy - 4})`).attr("d", "M0,4 L-2.3,-0.6 A2.6,2.6 0 1 1 2.3,-0.6 Z").attr("fill", muted);
-        g.append("text").attr("x", textX).attr("y", yy).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", 12).text(ellipsize(entry.place, 12, tmax));
-      } else if (kind === "avail" && status) {
-        const stCol = status.cls === "ok" ? sw.ok : status.cls === "soon" ? sw.soon : sw.off;
-        const dot = g.append("circle").attr("data-dgmo-clock-status-dot", "").attr("cx", iconX).attr("cy", yy - 4).attr("r", 4);
-        if (status.cls === "off")
-          dot.attr("fill", "none").attr("stroke", stCol).attr("stroke-width", 1.4);
-        else dot.attr("fill", stCol).attr("stroke", "none");
-        g.append("text").attr("data-dgmo-clock-status", "").attr("x", textX).attr("y", yy).attr("fill", stCol).attr("font-family", FONT_FAMILY).attr("font-size", 12).attr("font-weight", 600).text(ellipsize(status.text, 12, tmax));
-      } else if (kind === "sun" && sun) {
-        drawSunMoon(g, iconX, yy - 4, up, sw, 1);
-        g.append("text").attr("data-dgmo-clock-sun-line", "").attr("x", textX).attr("y", yy).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", 11.5).text(ellipsize(sun.text, 11.5, tmax));
+    deferred.push({
+      kinds: kinds.length,
+      draw: (startY) => {
+        kinds.forEach((kind, j) => {
+          const yy = startY + j * 20;
+          if (kind === "place") {
+            g.append("path").attr("transform", `translate(${iconX},${yy - 4})`).attr("d", "M0,4 L-2.3,-0.6 A2.6,2.6 0 1 1 2.3,-0.6 Z").attr("fill", muted);
+            g.append("text").attr("x", textX).attr("y", yy).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", 12).text(ellipsize(entry.place, 12, tmax));
+          } else if (kind === "avail" && status) {
+            const stCol = status.cls === "ok" ? sw.ok : status.cls === "soon" ? sw.soon : sw.off;
+            const dot = g.append("circle").attr("data-dgmo-clock-status-dot", "").attr("cx", iconX).attr("cy", yy - 4).attr("r", 4);
+            if (status.cls === "off")
+              dot.attr("fill", "none").attr("stroke", stCol).attr("stroke-width", 1.4);
+            else dot.attr("fill", stCol).attr("stroke", "none");
+            g.append("text").attr("data-dgmo-clock-status", "").attr("x", textX).attr("y", yy).attr("fill", stCol).attr("font-family", FONT_FAMILY).attr("font-size", 12).attr("font-weight", 600).text(ellipsize(status.text, 12, tmax));
+          } else if (kind === "sun" && sun) {
+            drawSunMoon(g, iconX, yy - 4, up, sw, 1);
+            g.append("text").attr("data-dgmo-clock-sun-line", "").attr("x", textX).attr("y", yy).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", 11.5).text(ellipsize(sun.text, 11.5, tmax));
+          } else if (kind === "fixed") {
+            drawFixedGlyph(g, iconX, yy - 4, muted);
+            g.append("text").attr("x", textX).attr("y", yy).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", 11.5).text(ellipsize(`${entry.place} \xB7 no DST`, 11.5, tmax));
+          }
+        });
       }
     });
-    const bottom = kinds.length ? cy + (kinds.length - 1) * 20 + 8 : cy;
+    if (cy > detailTop) detailTop = cy;
+  });
+  deferred.forEach((d) => {
+    d.draw(detailTop);
+    const bottom = d.kinds ? detailTop + (d.kinds - 1) * 20 + 8 : detailTop;
     if (bottom > maxBottom) maxBottom = bottom;
   });
   const colBodyH = maxBottom - top + 14;
   tints.forEach((r) => r.attr("height", colBodyH));
+  const dividerColor = mix(col.palette.text, col.palette.bg, 40);
+  for (let i = 1; i < n; i++) {
+    const x = cardM + i * colW;
+    body.append("line").attr("data-dgmo-clock-col-divider", "").attr("x1", x).attr("x2", x).attr("y1", top).attr("y2", top + colBodyH).attr("stroke", dividerColor).attr("stroke-width", 1);
+  }
   return top + colBodyH + cardM;
 }
 function renderClockForExport(container, parsed, palette, isDark, exportDims) {
@@ -670,12 +538,7 @@ function renderClockForExport(container, parsed, palette, isDark, exportDims) {
 }
 
 export {
-  zoneParts,
-  formatTime,
-  workStatus,
-  sunLine,
-  handAngles,
   renderClock,
   renderClockForExport
 };
-//# sourceMappingURL=chunk-5WFIYXQ6.js.map
+//# sourceMappingURL=chunk-U5SI5NIM.js.map

package/dist/{chunk-KHEYDLMT.js → chunk-VB4UJ3H2.js}

@@ -17,7 +17,7 @@ import {
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   CATEGORICAL_COLOR_ORDER,
   resolveColor
@@ -391,4 +391,4 @@ function drawCenteredLabel(g, label, cx, cy, fill, fontSize, tight = false, halo
 export {
   renderSwimlaneForExport
 };
-//# sourceMappingURL=chunk-KHEYDLMT.js.map
+//# sourceMappingURL=chunk-VB4UJ3H2.js.map