## Human Summary Take @rpatters1's suggested design from #297 and attempts to implement it with a spanner identifying object and a sort of spanner resource pool. ## AI Summary MusicXML pairs a spanner's start with its stop using a `number` attribute, and two spanners of the same type that are open at the same point in the serialized stream must carry different numbers. Which spanners are open at the same point depends on the order the writer emits notes (voice interleaving via `backup`), so a caller cannot reliably choose the number. This PR moves number assignment into the writer. The design differs from the shape proposed in #297 (a second `spannerId` field beside `numberLevel`): two mutually exclusive fields side by side is the recurring defect that design principle #3 and #249 exist to eliminate. Instead the two are unified into one value type. - New `SpannerNumber` value type (`SpannerNumber.h`/`SpannerNumber.cpp`, following the `TimeChoice.h`/`.cpp` declaration/implementation split) with exactly three states: unspecified (default, no number emitted for a lone spanner), explicit level 1..16 (emitted verbatim; what the reader produces), and identity (an author-only, never-serialized label; start/continue/stop sharing an id are the same logical spanner and the writer assigns the number). A contradictory state is unrepresentable by construction. Constructed directly (`SpannerNumber{3}`, `SpannerNumber{"my-id"}`), not via factory functions. Follows the `TimeChoice` "choice" pattern: nothing throws. An out-of-range level or an empty id collapses to unspecified at construction, and calling `level()`/`identity()` for the wrong kind returns a harmless default (`NUMBER_LEVEL_UNSPECIFIED`, or an empty string) instead of an exception. - Breaking: `int numberLevel` is replaced by `SpannerNumber number` in `CurveStart`, `CurveContinue`, `CurveStop`, `WedgeStart`, `WedgeStop`, `SpannerStart`, and `SpannerStop`. Tuplets are untouched and keep the legacy `int` + `NUMBER_LEVEL_UNSPECIFIED`. - New `SpannerNumberResolver` runs once per part before writing. It walks the part in true serialization order (measures, staves, voices ascending, notes in vector order with curve stops/continues/starts per note, directions in vector order) and assigns each identity spanner the lowest free number from a 1..16 pool per staff and per spanner class (slur, tied, wedge, octave-shift, bracket, and dashes pools are independent). While an explicit spanner is open its level is reserved, so explicit and identity spanners sharing a pool never collide. Pool exhaustion (more than 16 concurrently open) throws rather than emitting an illegal number. - The wedge and octave-shift writers now emit numbers at all; previously they dropped them on write even when the reader had captured them, so explicit wedge/ottava numbers now survive a round trip. - Readers only ever produce unspecified or explicit, keeping read-to-write fidelity for files that already carry numbers. ## Testing - [x] `SpannerNumberTest`: three-state semantics, out-of-range/empty-input construction collapsing to unspecified, wrong-kind accessors returning harmless defaults (never throwing), equality across all kind combinations - [x] `SpannerIdentityTest`: the #297 scenario — slurs disjoint in musical time that overlap in the stream once voice 1 serializes ahead of voice 2 get distinct numbers (1, 1-reused, 2); explicit + identity pool sharing; slur/tied pool independence; wedge number round-trip - [x] `data/rpatters1/slurs_overbars.musicxml`: the file rpatters1 attached to #297 (a genuine Finale export, confirmed provenance in review), pinned in `roundtrip-baseline.txt` alongside his other contributed fixtures in `data/rpatters1/` - [x] `make test`, `make test-api-roundtrip` (166/166 pinned), `make test-core-dev` (835 corert files), `make check-core-dev`, `make validate-cpp`, `make test-cpp-unit`, `make probe-cpp` - [x] Unity build (`CMAKE_UNITY_BUILD=ON`, batch size 0) compiles - [x] Rebased over main (through #333) and CI re-run on the rebased branch ## References - Closes #297 - Related to #249 (one fact, one field: motivates unifying level and identity into a single type instead of adding a parallel field)

Make Objects Copyable #3

Description

Metadata

Metadata

Assignees

Labels

Projects

Milestone

Relationships

Development

Issue actions