Levi Neuwirth
4132a7ac05
Self-review of the inter-staff solve found a real bug: stroke->staff attribution reused component_glyph, whose fallback picks the nearest glyph by X ALONE. That is correct for a SLOT — both staves of a system share their x columns, hence their spring slots, so the horizontal delta is the same either way — but wrong for a STAFF: it handed a lower-staff stem to the UPPER staff's notehead. The stem then kept the wrong vertical shift and tore off its own head (measured worst stem->notehead distance 5.837 on the two-staff fixture vs 1.150, the stem x-inset, on the single-staff one), and it polluted the upper staff's content extent, inflating the computed gap. Fix: the staff attribution uses a 2-D nearest for that fallback (a ledger still resolves via owning_glyph's shared Pitch source; a staff line via its Staff source). component_glyph is unchanged and still serves the horizontal path. Also corrected: staff-attributed primitives now contribute their y ONLY through the shifted path (Extent::add_x for x, add_y for the shifted staff extent), so a lower staff's UNSHIFTED content can no longer inflate a system's max_y. Dead Extent::add removed. The corrected attribution yields a smaller, more accurate separation (two-staff view_box height 36.1 -> 31.1). Regression multi_staff_stems_stay_on_their_own_ staff (verified to fail at 5.837 without the fix). Only the two-staff engrave golden churned; single-staff goldens byte-stable. 948 tests, clippy 0, docs -D warnings, conformance 8/8. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| src | ||
| Cargo.toml | ||
| DECISIONS.md | ||
| README.md | ||
README.md
epiphany-engrave
Agent I's engraving constraint solver (spec Chapter 9): turns a
ConstrainedLayoutIR into a ResolvedLayoutIR with real geometry. It is the
production-side replacement for epiphany-layout-ir's interface-only
StubSolver; the two live in separate crates so the spec's core/product boundary
stays sharp.
Status: Minimal tier, with casting-off
Engraverruns a deterministic horizontal spacing pass (the first axis of the two-pass spring layout): each spring slot is placed left-to-right by a collision-aware advance derived from real glyph bearings.- A casting-off pass (Phase 3's layout track) then breaks the spaced line
into systems at measure boundaries (greedy first-fit against a
PageGeometry— default A4 portrait at an 8 mm staff), stacks systems vertically at the vertical-band model's inter-system gap, assigns pages by content height, and populates the realResolvedPage/ResolvedSystemtree. Every position is baked into a single y-up world frame (pages stacked vertically), so the SVG renderer and hit-testing consume the flat glyph/stroke lists unchanged. - The IR's declared constraints are evaluated — geometric families against
the pre-casting spaced frame, break constraints against the final break
structure (hard breaks are always honoured; a pathological soft break is
skipped and recorded as an
IrOverridedecision). Chosen breaks are recorded asEngravingDecisions withSynthesisKind::EngravedBreaktargets, attributed to the user override that requested them when one did. - It reports
SolverTier::Minimal: hard constraints (break family included) satisfied, no optimality claim — the quality-metric vector stays the honest all-worst placeholder until the Quality Metric Catalog lands.
Deferred: the vertical soft-spring solve, per-system justification/stretch,
optimal break search, widow/orphan control, and casting-off caching. See
DECISIONS.md.
use epiphany_engrave::Engraver;
use epiphany_layout_ir::{ConstraintSolver, SolverConfig};
let report = Engraver::default().solve(&constrained_ir, &SolverConfig::default());
assert!(report.satisfied_hard_constraints);
let resolved = report.layout; // real pages/systems; hand to epiphany-render-svg