@diagrammo/dgmo 0.51.0 → 0.53.0

package/dist/{chunk-Y6GBQTBK.js → chunk-QWIBT6DS.js}

@@ -3,10 +3,10 @@ import {
 } from "./chunk-3HDBAXF5.js";
 import {
   renderIntegratedLegend
-} from "./chunk-OU7HLO7I.js";
+} from "./chunk-W5KMNC5U.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-YAA6IID3.js";
+} from "./chunk-774C2FF3.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -16,27 +16,28 @@ import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
 import {
-  LEGEND_GROUP_GAP
-} from "./chunk-QOOUC2J5.js";
-import {
-  measureText
-} from "./chunk-WCT3NYCV.js";
-import {
+  contrastText,
   getSeriesColors,
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-JYDMBWRP.js";
+import {
+  LEGEND_GROUP_GAP
+} from "./chunk-4RGZFA7H.js";
+import {
+  measureText
+} from "./chunk-4ASYQ347.js";
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-467TVMQL.js";
+} from "./chunk-CMVZWP32.js";
 import {
   resolveColor
-} from "./chunk-TLVIHFRO.js";
+} from "./chunk-ZKPPI6BF.js";
 import {
   makeDgmoError
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/bracket/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -628,7 +629,7 @@ function clip(s, maxW, fs) {
   }
   return lo <= 0 ? "" : s.slice(0, lo) + "\u2026";
 }
-function paintForAccent(palette, isDark, accent) {
+function paintForAccent(palette, isDark, accent, fillMode) {
   const base = themeBaseBg(palette, isDark);
   return {
     accent,
@@ -639,12 +640,14 @@ function paintForAccent(palette, isDark, accent) {
     hair: mix(palette.text, base, 34),
     wire: mix(palette.text, base, 30),
     track: mix(palette.border, base, 55),
-    tint: shapeFill(palette, accent, isDark)
+    // §1.9 fill family rides through shapeFill: solid ⇒ raw accent,
+    // outline ⇒ theme base bg (accent stays on the stroke), absent ⇒ 25% tint.
+    tint: shapeFill(palette, accent, isDark, { mode: fillMode })
   };
 }
-function paintFor(palette, isDark, sideColor) {
+function paintFor(palette, isDark, sideColor, fillMode) {
   const accent = sideColor && resolveColor(sideColor, palette) || sideColor || getSeriesColors(palette)[0];
-  return paintForAccent(palette, isDark, accent);
+  return paintForAccent(palette, isDark, accent, fillMode);
 }
 function resolveBracketLegend(parsed, palette) {
   const activeTag = parsed.activeTag;
@@ -740,7 +743,8 @@ function renderBracket(container, parsed, palette, isDark, exportDims) {
     });
   }
   const baseAccent = parsed.accentColor ?? resolveColor("blue", palette) ?? getSeriesColors(palette)[0];
-  const basePaint = paintForAccent(palette, isDark, baseAccent);
+  const fillMode = parsed.fillMode;
+  const basePaint = paintForAccent(palette, isDark, baseAccent, fillMode);
   const sideColorByLabel = /* @__PURE__ */ new Map();
   for (const s of parsed.sides) sideColorByLabel.set(s.label, s.color);
   const sideBarH = layout.sideLabels.length ? 30 : 0;
@@ -753,11 +757,20 @@ function renderBracket(container, parsed, palette, isDark, exportDims) {
     );
     const top = covered ? bandTop : 2;
     const c = resolveColor(col.color, palette) ?? col.color;
-    root.append("rect").attr("x", col.x - BOX_W / 2 - 10).attr("y", top).attr("width", BOX_W + 20).attr("height", Math.max(0, layout.height - top)).attr("rx", 10).attr("fill", mix(c, palette.bg, isDark ? 12 : 8));
+    root.append("rect").attr("x", col.x - BOX_W / 2 - 10).attr("y", top).attr("width", BOX_W + 20).attr("height", Math.max(0, layout.height - top)).attr("rx", 10).attr(
+      "fill",
+      fillMode === "outline" ? themeBaseBg(palette, isDark) : mix(c, palette.bg, isDark ? 12 : 8)
+    ).call((sel) => {
+      if (fillMode === "outline")
+        sel.attr("stroke", mix(c, palette.bg, 35)).attr("stroke-width", 1);
+    });
   }
   for (const s of layout.sideLabels) {
     const c = s.color ? resolveColor(s.color, palette) ?? s.color : basePaint.accent;
-    root.append("rect").attr("x", s.x0 - 8).attr("y", 2).attr("width", s.x1 - s.x0 + 16).attr("height", 24).attr("rx", 8).attr("fill", mix(c, palette.bg, isDark ? 20 : 14)).attr("stroke", mix(c, palette.bg, 55)).attr("stroke-width", 1);
+    root.append("rect").attr("x", s.x0 - 8).attr("y", 2).attr("width", s.x1 - s.x0 + 16).attr("height", 24).attr("rx", 8).attr(
+      "fill",
+      fillMode === "outline" ? themeBaseBg(palette, isDark) : mix(c, palette.bg, isDark ? 20 : 14)
+    ).attr("stroke", fillMode === "outline" ? c : mix(c, palette.bg, 55)).attr("stroke-width", 1);
     root.append("text").attr("x", (s.x0 + s.x1) / 2).attr("y", 18).attr("text-anchor", "middle").attr("font-size", 13).attr("font-weight", 800).attr("letter-spacing", 0.3).attr("fill", c).text(clip(s.label, s.x1 - s.x0, 13));
   }
   for (const col of layout.columns) {
@@ -772,7 +785,7 @@ function renderBracket(container, parsed, palette, isDark, exportDims) {
     drawConnector(root, m, m.botFrom, m.y + HALF_SPAN2, basePaint);
   }
   for (const m of layout.matches) {
-    const sidePaint = m.side && sideColorByLabel.get(m.side) ? paintFor(palette, isDark, sideColorByLabel.get(m.side)) : basePaint;
+    const sidePaint = m.side && sideColorByLabel.get(m.side) ? paintFor(palette, isDark, sideColorByLabel.get(m.side), fillMode) : basePaint;
     const topSeed = seedByName.get(m.top ?? "") ?? null;
     const botSeed = seedByName.get(m.bot ?? "") ?? null;
     let homeName = m.home;
@@ -810,7 +823,8 @@ function renderBracket(container, parsed, palette, isDark, exportDims) {
       palette,
       isDark,
       m,
-      activeKey
+      activeKey,
+      fillMode
     );
     drawBox(
       root,
@@ -822,7 +836,8 @@ function renderBracket(container, parsed, palette, isDark, exportDims) {
       palette,
       isDark,
       m,
-      activeKey
+      activeKey,
+      fillMode
     );
     if (isUpset) drawUpset(root, m, sidePaint);
     if (m.commentary.length) drawCommentary(root, m, palette);
@@ -841,10 +856,10 @@ function drawConnector(g, m, from, toCy, paint) {
   const d = from.yA !== from.yB ? `M ${childEdge} ${from.yA} H ${midX} M ${childEdge} ${from.yB} H ${midX} M ${midX} ${vLo} V ${vHi} M ${midX} ${toCy} H ${parentEdge}` : `M ${childEdge} ${from.y} H ${midX} V ${toCy} H ${parentEdge}`;
   g.append("path").attr("d", d).attr("fill", "none").attr("stroke", paint.wire).attr("stroke-width", 1.5);
 }
-function drawBox(g, cx, cy, name, info, sidePaint, palette, isDark, m, activeKey) {
+function drawBox(g, cx, cy, name, info, sidePaint, palette, isDark, m, activeKey, fillMode) {
   const x = cx - BOX_W / 2;
   const y = cy - BOX_H / 2;
-  const paint = info.tagColor ? paintForAccent(palette, isDark, info.tagColor) : sidePaint;
+  const paint = info.tagColor ? paintForAccent(palette, isDark, info.tagColor, fillMode) : sidePaint;
   const cell = g.append("g").attr("class", "dgmo-bracket-box");
   if (m.lineNumber !== null) cell.attr("data-line-number", m.lineNumber);
   if (activeKey && info.tagValue)
@@ -878,22 +893,29 @@ function drawBox(g, cx, cy, name, info, sidePaint, palette, isDark, m, activeKey
   } else if (info.pending) {
     stroke = mix(paint.accent, paint.hair, 50);
   }
+  const onSolid = fillMode === "solid" && (info.isChampion || info.isWinner) ? contrastText(
+    paint.tint,
+    palette.textOnFillLight,
+    palette.textOnFillDark
+  ) : null;
+  if (onSolid) textColor = onSolid;
+  const gutterColor = onSolid ?? paint.muted;
   const rect = cell.append("rect").attr("x", x).attr("y", y).attr("width", BOX_W).attr("height", BOX_H).attr("rx", 6).attr("fill", fill).attr("stroke", stroke).attr("stroke-width", sw);
   if (dash) rect.attr("stroke-dasharray", dash);
   let leftPad = 11;
   if (info.seed !== null) {
-    cell.append("text").attr("x", x + 9).attr("y", cy + 4).attr("text-anchor", "start").attr("font-size", 10).attr("font-weight", 700).attr("fill", paint.muted).text(info.seed);
+    cell.append("text").attr("x", x + 9).attr("y", cy + 4).attr("text-anchor", "start").attr("font-size", 10).attr("font-weight", 700).attr("fill", gutterColor).text(info.seed);
     leftPad = 9 + Math.max(12, measureText(String(info.seed), 10)) + 6;
   }
   let rightPad = 11;
   if (info.score) rightPad += 20;
   if (info.isHome) {
-    drawHome(cell, x + BOX_W - rightPad - 6, cy, paint.muted);
+    drawHome(cell, x + BOX_W - rightPad - 6, cy, gutterColor);
     rightPad += 16;
   }
   cell.append("text").attr("x", x + leftPad).attr("y", cy + 4).attr("text-anchor", "start").attr("font-size", 12.5).attr("font-weight", weight).attr("fill", textColor).text(clip(isTBD ? "TBD" : name, BOX_W - leftPad - rightPad, 12.5));
   if (info.score) {
-    cell.append("text").attr("x", x + BOX_W - 11).attr("y", cy + 4).attr("text-anchor", "end").attr("font-size", 12).attr("font-weight", info.isWinner ? 700 : 500).attr("fill", info.isWinner ? textColor : paint.muted).text(info.score);
+    cell.append("text").attr("x", x + BOX_W - 11).attr("y", cy + 4).attr("text-anchor", "end").attr("font-size", 12).attr("font-weight", info.isWinner ? 700 : 500).attr("fill", info.isWinner ? textColor : gutterColor).text(info.score);
   }
 }
 function drawHome(cell, hx, cy, color) {
@@ -937,4 +959,4 @@ export {
   renderBracket,
   renderBracketForExport
 };
-//# sourceMappingURL=chunk-Y6GBQTBK.js.map
+//# sourceMappingURL=chunk-QWIBT6DS.js.map

package/dist/{chunk-GU46PPT3.js → chunk-QXGACPS2.js}

@@ -1,12 +1,12 @@
-import {
-  measureText
-} from "./chunk-WCT3NYCV.js";
 import {
   formatDuration,
   formatScheduleValue,
   formatSlackValue,
   formatSprintCell
-} from "./chunk-7L4UJOY6.js";
+} from "./chunk-3TYUXC7D.js";
+import {
+  measureText
+} from "./chunk-4ASYQ347.js";
 
 // src/pert/layout.ts
 import dagre from "@dagrejs/dagre";
@@ -603,4 +603,4 @@ export {
   layoutPert,
   relayoutPert
 };
-//# sourceMappingURL=chunk-GU46PPT3.js.map
+//# sourceMappingURL=chunk-QXGACPS2.js.map

package/dist/{chunk-FMDSF3OV.js → chunk-QZAW5SFH.js}

@@ -4,7 +4,7 @@ import {
 import {
   makeDgmoError,
   suggest
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/utils/notes/resolve.ts
 function resolveNotes(notes, targets, diagnostics) {
@@ -65,4 +65,4 @@ function resolveNotes(notes, targets, diagnostics) {
 export {
   resolveNotes
 };
-//# sourceMappingURL=chunk-FMDSF3OV.js.map
+//# sourceMappingURL=chunk-QZAW5SFH.js.map

package/dist/{chunk-YGJZWZTY.js → chunk-R5NH5BZG.js}

@@ -15,18 +15,21 @@ import {
 import {
   FONT_FAMILY
 } from "./chunk-6KFWC4CO.js";
-import {
-  CHAR_WIDTH_RATIO,
-  measureText
-} from "./chunk-WCT3NYCV.js";
 import {
   contrastText,
   getSeriesColors,
   shapeFill
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-JYDMBWRP.js";
+import {
+  CHAR_WIDTH_RATIO,
+  measureText
+} from "./chunk-4ASYQ347.js";
+import {
+  fillModeFromOptions
+} from "./chunk-YJVA3QUU.js";
 import {
   resolveColor
-} from "./chunk-TLVIHFRO.js";
+} from "./chunk-ZKPPI6BF.js";
 
 // src/ring/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -102,10 +105,10 @@ function renderRing(container, parsed, palette, isDark, onClickItem, exportDims)
     }
     return seriesColors[i % seriesColors.length];
   };
-  const solid = parsed.options["solid-fill"] === "on";
+  const fillMode = fillModeFromOptions(parsed.options);
   const layerColors = parsed.layers.map((l, i) => resolveLayerColor(l, i));
   const layerFills = layerColors.map(
-    (c) => shapeFill(palette, c, isDark, { solid })
+    (c) => shapeFill(palette, c, isDark, { mode: fillMode })
   );
   const diagramG = svg.append("g").attr("class", "ring-body");
   const strokeColor = palette.text;
@@ -293,4 +296,4 @@ export {
   renderRing,
   renderRingForExport
 };
-//# sourceMappingURL=chunk-YGJZWZTY.js.map
+//# sourceMappingURL=chunk-R5NH5BZG.js.map

package/dist/{chunk-U5SI5NIM.js → chunk-RJ5LBZ5U.js}

@@ -1,6 +1,9 @@
 import {
   buildSwatches
-} from "./chunk-4XFBQT5O.js";
+} from "./chunk-B4XS2AF2.js";
+import {
+  FONT_FAMILY
+} from "./chunk-6KFWC4CO.js";
 import {
   fixedParts,
   formatTime,
@@ -11,15 +14,13 @@ import {
   zoneParts
 } from "./chunk-APKUAJ2L.js";
 import {
-  FONT_FAMILY
-} from "./chunk-6KFWC4CO.js";
-import {
+  contrastText,
   mix,
   themeBaseBg
-} from "./chunk-P6T66CCZ.js";
+} from "./chunk-JYDMBWRP.js";
 import {
   resolveColor
-} from "./chunk-TLVIHFRO.js";
+} from "./chunk-ZKPPI6BF.js";
 
 // src/clock/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -154,7 +155,7 @@ 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 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);
+  const card = svg.append("rect").attr("x", cardM).attr("y", cardM).attr("width", width - 2 * cardM).attr("rx", 14).attr("fill", parsed.fillMode === "outline" ? baseBg : cardFill).attr("stroke", mix(palette.text, palette.bg, 40)).attr("stroke-width", 1);
   clipSeq += 1;
   const clipId = `dgmo-clock-clip-${clipSeq}`;
   const clipRect = svg.append("clipPath").attr("id", clipId).append("rect").attr("x", cardM).attr("y", cardM).attr("width", width - 2 * cardM).attr("rx", 14);
@@ -182,6 +183,8 @@ function renderClock(container, parsed, palette, isDark, exportDims) {
     line2,
     tick: mix(palette.text, palette.bg, 35),
     cardFill,
+    baseBg,
+    fillMode: parsed.fillMode,
     sw,
     palette
   };
@@ -223,6 +226,9 @@ function renderClock(container, parsed, palette, isDark, exportDims) {
   bgRect.attr("height", bannerH);
   card.attr("height", bannerH - 2 * cardM);
 }
+function zoneFillMode(entry, parsed, col) {
+  return entry.color || parsed.colorBy === "place" ? col.fillMode : void 0;
+}
 function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
   const { padX } = geom;
   const { text, muted, line2, tick, sw, cardFill } = col;
@@ -250,9 +256,10 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
   });
   const rightBlockW = 178;
   const rightColLeft = geom.rightX - rightBlockW;
+  const fm = zoneFillMode(entry, parsed, col);
   const g = svg.append("g").attr("data-line-number", entry.lineNumber);
   if (auto) {
-    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.append("rect").attr("data-dgmo-clock-lane", "").attr("x", 9).attr("y", rowTop).attr("width", geom.width - 18).attr("height", rowH).attr("fill", fm === "outline" ? col.baseBg : 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);
@@ -267,12 +274,18 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
   }
   const contentLeft = padX + 4;
   const timeColor = auto?.solid ?? text;
-  const faceFill = auto ? mix(auto.solid, cardFill, 20) : stTint;
+  const faceFill = auto && fm === "outline" ? col.baseBg : auto && fm === "solid" ? auto.solid : auto ? mix(auto.solid, cardFill, 20) : stTint;
   const ringColor = auto?.solid ?? line2;
-  const accentColor = auto?.solid ?? stColor;
+  const handInk = auto && fm === "solid" ? contrastText(
+    auto.solid,
+    col.palette.textOnFillLight,
+    col.palette.textOnFillDark
+  ) : text;
+  const accentColor = auto && fm === "solid" ? handInk : auto?.solid ?? stColor;
   if (auto) {
     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 (fm) g.attr("data-dgmo-clock-fill-mode", fm);
   if (parsed.face === "analog") {
     const size = rowH - 20;
     const fx = contentLeft;
@@ -285,8 +298,8 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
       fg.append("line").attr("x1", 50 + 39 * Math.sin(a)).attr("y1", 50 - 39 * Math.cos(a)).attr("x2", 50 + 46 * Math.sin(a)).attr("y2", 50 - 46 * Math.cos(a)).attr("stroke", tick).attr("stroke-width", 1.8);
     }
     const ang = handAngles(parts.h, parts.m, parts.s);
-    fg.append("line").attr("data-dgmo-clock-hand", "h").attr("x1", 50).attr("y1", 50).attr("x2", 50).attr("y2", 28).attr("stroke", text).attr("stroke-width", 4).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.hour} 50 50)`);
-    fg.append("line").attr("data-dgmo-clock-hand", "m").attr("x1", 50).attr("y1", 50).attr("x2", 50).attr("y2", 17).attr("stroke", text).attr("stroke-width", 2.6).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.minute} 50 50)`);
+    fg.append("line").attr("data-dgmo-clock-hand", "h").attr("x1", 50).attr("y1", 50).attr("x2", 50).attr("y2", 28).attr("stroke", handInk).attr("stroke-width", 4).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.hour} 50 50)`);
+    fg.append("line").attr("data-dgmo-clock-hand", "m").attr("x1", 50).attr("y1", 50).attr("x2", 50).attr("y2", 17).attr("stroke", handInk).attr("stroke-width", 2.6).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.minute} 50 50)`);
     fg.append("line").attr("data-dgmo-clock-hand", "s").attr("x1", 50).attr("y1", 55).attr("x2", 50).attr("y2", 14).attr("stroke", accentColor).attr("stroke-width", 1.3).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.second} 50 50)`);
     fg.append("circle").attr("data-dgmo-clock-center", "").attr("cx", 50).attr("cy", 50).attr("r", 2.6).attr("fill", accentColor);
   } else {
@@ -346,10 +359,7 @@ function drawRow(svg, entry, index, parsed, now, rowTop, rowH, geom, col) {
       g.append("text").attr("x", textX).attr("y", yy).attr("fill", muted).attr("font-family", FONT_FAMILY).attr("font-size", 14).attr("font-weight", 500).text(ellipsize(entry.place, 14, textMax));
     } else if (ln.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 - 5).attr("r", 5);
-      if (status.cls === "off")
-        dot.attr("fill", "none").attr("stroke", stCol).attr("stroke-width", 1.6);
-      else dot.attr("fill", stCol).attr("stroke", "none");
+      drawStatusClock(g, iconX, yy - 5, 5, stCol);
       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", 14).attr("font-weight", 600).text(ellipsize(status.text, 14, textMax));
     } else if (ln.kind === "sun" && sun) {
       drawSunMoon(g, iconX, yy - 5, up, sw, 1.25);
@@ -367,6 +377,9 @@ function drawFixedGlyph(parent, cx, cy, color) {
     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 drawStatusClock(parent, cx, cy, r, color) {
+  parent.append("circle").attr("data-dgmo-clock-status-icon", "").attr("cx", cx).attr("cy", cy).attr("r", r).attr("fill", color);
+}
 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);
@@ -413,19 +426,26 @@ function drawColumns(body, parsed, now, top, geom, col) {
       palette: col.palette,
       cardFill
     });
+    const fm = zoneFillMode(entry, parsed, col);
     const timeColor = auto?.solid ?? text;
-    const faceFill = auto ? mix(auto.solid, cardFill, 20) : stTint;
+    const faceFill = auto && fm === "outline" ? col.baseBg : auto && fm === "solid" ? auto.solid : auto ? mix(auto.solid, cardFill, 20) : stTint;
     const ringColor = auto?.solid ?? line2;
-    const accentColor = auto?.solid ?? stColor;
+    const handInk = auto && fm === "solid" ? contrastText(
+      auto.solid,
+      col.palette.textOnFillLight,
+      col.palette.textOnFillDark
+    ) : text;
+    const accentColor = auto && fm === "solid" ? handInk : auto?.solid ?? stColor;
     const g = body.append("g").attr("data-line-number", entry.lineNumber);
     bakeAnchors(g, entry, parsed, sun, sw);
     if (auto)
       tints.push(
-        g.append("rect").attr("data-dgmo-clock-lane", "").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", fm === "outline" ? col.baseBg : auto.laneTint)
       );
     if (auto) {
       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 (fm) g.attr("data-dgmo-clock-fill-mode", fm);
     let cy = top + (parsed.face === "analog" ? 22 : 36);
     const innerW = colW - 16;
     if (parsed.face === "analog") {
@@ -441,8 +461,8 @@ function drawColumns(body, parsed, now, top, geom, col) {
         fg.append("line").attr("x1", 50 + 39 * Math.sin(a)).attr("y1", 50 - 39 * Math.cos(a)).attr("x2", 50 + 46 * Math.sin(a)).attr("y2", 50 - 46 * Math.cos(a)).attr("stroke", tick).attr("stroke-width", 1.8);
       }
       const ang = handAngles(parts.h, parts.m, parts.s);
-      fg.append("line").attr("data-dgmo-clock-hand", "h").attr("x1", 50).attr("y1", 50).attr("x2", 50).attr("y2", 28).attr("stroke", text).attr("stroke-width", 4).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.hour} 50 50)`);
-      fg.append("line").attr("data-dgmo-clock-hand", "m").attr("x1", 50).attr("y1", 50).attr("x2", 50).attr("y2", 17).attr("stroke", text).attr("stroke-width", 2.6).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.minute} 50 50)`);
+      fg.append("line").attr("data-dgmo-clock-hand", "h").attr("x1", 50).attr("y1", 50).attr("x2", 50).attr("y2", 28).attr("stroke", handInk).attr("stroke-width", 4).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.hour} 50 50)`);
+      fg.append("line").attr("data-dgmo-clock-hand", "m").attr("x1", 50).attr("y1", 50).attr("x2", 50).attr("y2", 17).attr("stroke", handInk).attr("stroke-width", 2.6).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.minute} 50 50)`);
       fg.append("line").attr("data-dgmo-clock-hand", "s").attr("x1", 50).attr("y1", 55).attr("x2", 50).attr("y2", 14).attr("stroke", accentColor).attr("stroke-width", 1.3).attr("stroke-linecap", "round").attr("transform", `rotate(${ang.second} 50 50)`);
       fg.append("circle").attr("data-dgmo-clock-center", "").attr("cx", 50).attr("cy", 50).attr("r", 2.6).attr("fill", accentColor);
       cy += size + 6;
@@ -502,10 +522,7 @@ function drawColumns(body, parsed, now, top, geom, col) {
             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");
+            drawStatusClock(g, iconX, yy - 4, 4, stCol);
             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);
@@ -541,4 +558,4 @@ export {
   renderClock,
   renderClockForExport
 };
-//# sourceMappingURL=chunk-U5SI5NIM.js.map
+//# sourceMappingURL=chunk-RJ5LBZ5U.js.map

package/dist/{chunk-XHVV4NVW.js → chunk-RT7ACF77.js}

@@ -3,7 +3,8 @@ var SKETCH_DIAGNOSTIC_CODES = {
   NESTED_BOX: "E_SKETCH_NESTED_BOX",
   AMBIGUOUS_TARGET: "E_SKETCH_AMBIGUOUS_TARGET",
   UNKNOWN_SHAPE: "W_SKETCH_UNKNOWN_SHAPE",
-  OVERLAP_RESOLVED: "W_SKETCH_OVERLAP_RESOLVED"
+  OVERLAP_RESOLVED: "W_SKETCH_OVERLAP_RESOLVED",
+  AT_OUT_OF_RANGE: "W_SKETCH_AT_OUT_OF_RANGE"
 };
 var SKETCH_DIAGNOSTICS = [
   {
@@ -41,6 +42,15 @@ var SKETCH_DIAGNOSTICS = [
     message: (p) => `Shape "${String(p.label ?? "?")}" overlapped another at its authored position \u2014 moved to the nearest free slot`,
     hint: "Keep shapes at least 2 half-slots apart on one axis, or omit at: to flow-place.",
     example: "sketch\nA at: 0 0\nB at: 0 0"
+  },
+  {
+    code: SKETCH_DIAGNOSTIC_CODES.AT_OUT_OF_RANGE,
+    severity: "warning",
+    chartType: "sketch",
+    title: "at: coordinate out of range",
+    message: (p) => `at: coordinate "${String(p.raw ?? "?")}" is out of range \u2014 half-slot coords must be whole numbers within \xB1${String(p.max ?? "?")}; shape will flow-place`,
+    hint: "Use small integer half-slot coordinates near the origin, or omit at: to flow-place.",
+    example: "sketch\nA at: 2 0"
   }
 ];
 
@@ -48,4 +58,4 @@ export {
   SKETCH_DIAGNOSTIC_CODES,
   SKETCH_DIAGNOSTICS
 };
-//# sourceMappingURL=chunk-XHVV4NVW.js.map
+//# sourceMappingURL=chunk-RT7ACF77.js.map

package/dist/{chunk-XEQXCIBC.js → chunk-RW5PEJ7D.js}

@@ -8,17 +8,18 @@ import {
   resolveActiveTagGroup,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-467TVMQL.js";
+} from "./chunk-CMVZWP32.js";
 import {
   extractColor,
+  fillModeFromToken,
   measureIndent,
   parseFirstLine,
   splitNameAndMeta
-} from "./chunk-LV4BETUU.js";
+} from "./chunk-YJVA3QUU.js";
 import {
   makeDgmoError,
   makeFail
-} from "./chunk-CXK4DZH3.js";
+} from "./chunk-4W2PE66Q.js";
 
 // src/bracket/parser.ts
 var BEATS_RE = /^(.+?)\s+beats\s+(.+)$/i;
@@ -100,6 +101,7 @@ function parseBracket(content, palette) {
   };
   const lines = content.split("\n");
   let headerParsed = false;
+  let accentFromTitle = false;
   let currentSide = null;
   let currentTagGroup = null;
   let commentaryTarget = null;
@@ -122,13 +124,17 @@ function parseBracket(content, palette) {
         return fail(lineNum, 'Expected "bracket [Title]" as the first line.');
       }
       if (first.title) {
-        const { label } = extractColor(
+        const { label, color } = extractColor(
           first.title,
           palette,
           result.diagnostics,
           lineNum
         );
         result.title = label || null;
+        if (color !== void 0) {
+          result.accentColor = color;
+          accentFromTitle = true;
+        }
       }
       result.titleLineNumber = lineNum;
       headerParsed = true;
@@ -216,6 +222,12 @@ function parseBracket(content, palette) {
       result.noRounds = true;
       continue;
     }
+    const fm = fillModeFromToken(lower);
+    if (fm !== null) {
+      if (fm === "tint") delete result.fillMode;
+      else result.fillMode = fm;
+      continue;
+    }
     const accentM = trimmed.match(/^accent\s+(.+)$/i);
     if (accentM) {
       const { color } = extractColor(
@@ -224,7 +236,7 @@ function parseBracket(content, palette) {
         result.diagnostics,
         lineNum
       );
-      if (color !== void 0) result.accentColor = color;
+      if (color !== void 0 && !accentFromTitle) result.accentColor = color;
       continue;
     }
     const sideM = trimmed.match(/^\[(.+?)\](.*)$/);
@@ -376,4 +388,4 @@ function parseBracket(content, palette) {
 export {
   parseBracket
 };
-//# sourceMappingURL=chunk-XEQXCIBC.js.map
+//# sourceMappingURL=chunk-RW5PEJ7D.js.map