feat(api): support the full time-signature model#321
Merged
Conversation
Coverage reportCore-dev coverage
|
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 77.8% | 28513 / 36640 |
| Functions | 74.3% | 6352 / 8552 |
| Branches | 50.7% | 22678 / 44751 |
API coverage src/private/mx/{api,impl,utility}/
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 80.9% | 6448 / 7974 |
| Functions | 67.7% | 2224 / 3284 |
| Branches | 49.8% | 5542 / 11132 |
Core HTML report | API HTML report
Commit 302722164546a53f08e0194c3f6204a040bb3c5b.
gen-quality
|
webern
force-pushed
the
claude/eloquent-turing-us0rtv
branch
from
96c10f3 to
16274e6
Compare
Coverage reportCore-dev coverage
|
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 77.8% | 28513 / 36640 |
| Functions | 74.3% | 6352 / 8552 |
| Branches | 50.7% | 22678 / 44751 |
API coverage src/private/mx/{api,impl,utility}/
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 81.0% | 6481 / 8004 |
| Functions | 67.8% | 2228 / 3285 |
| Branches | 49.8% | 5570 / 11180 |
Core HTML report | API HTML report
Commit 156117869514f0a8463e5a473ccf4c0c7291398b.
gen-quality
|
webern
force-pushed
the
claude/eloquent-turing-us0rtv
branch
from
16274e6 to
1cd06bf
Compare
webern
commented
Jul 8, 2026
Coverage reportCore-dev coverage
|
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 77.8% | 28513 / 36640 |
| Functions | 74.3% | 6352 / 8552 |
| Branches | 50.7% | 22678 / 44751 |
API coverage src/private/mx/{api,impl,utility}/
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 80.9% | 6481 / 8009 |
| Functions | 67.8% | 2228 / 3285 |
| Branches | 49.8% | 5568 / 11186 |
Core HTML report | API HTML report
Commit d5a425752ce17d92fa004a46cd7bdbccc17179b4.
gen-quality
|
Redesign the time-signature api around a TimeChoice that switches
between the simple case (the ordinary N/D you want 99% of the time) and
a complex case that quarantines everything unusual. The simple type and
the complex machinery live in separate headers, so ordinary 4/4 work
never has to look at the complex surface.
Public shape (src/include/mx/api/):
- TimeSignatureData.h: TimeFraction (shared beats/beat-type leaf) and
TimeSignatureData { TimeSignatureSymbol symbol; TimeFraction fraction; }
where the symbol is the narrow {unspecified, common, cut}.
- ComplexTimeSignature.h: the full ComplexTimeSymbol vocabulary,
TimeSeparator, TimeRelation, InterchangeableTimeSignature,
MeteredTimeSignature, and ComplexTimeSignature -- itself a
{ metered, senzaMisura } choice mirroring the spec's one real fork.
- TimeChoice.h: the { simple, complex } switch, carrying the
whole-<time> attributes (isImplicit, display).
Guarantees:
- TimeChoice::complex auto-collapses a simple-equivalent meter (one
fraction, no interchangeable, no separator, a symbol the simple case
can express) back to simple, so a plain N/D can never hide in the
complex arena and there is one canonical representation.
- The two symbol enums do not overlap on the unusual values:
single-number/note/dotted-note exist only in the complex vocabulary,
so they cannot appear on the simple type.
Per-staff signatures move to std::map<int, TimeChoice>
staffTimeSignatures on MeasureData (keyed by staff index; no staff
index baked into the signature type).
Choice-type logic (factories, accessors, equality, auto-collapse) lives
in TUs under src/private/mx/api/, keeping the headers declaration-only.
impl: TimeReader translates each core::Time to a TimeChoice;
PropertiesWriter::writeTime regenerates all shapes and takes the staff
index separately; MeasureReader/MeasureWriter route by staff scope and
carry per-staff overrides forward; Converter gains narrow/full symbol,
separator, and relation tables.
Four corpus files newly pass the api round-trip and are pinned
(ly11d/e composite, ly11f symbols, ly11h senza-misura).
webern
force-pushed
the
claude/eloquent-turing-us0rtv
branch
from
1cd06bf to
0a3855c
Compare
Coverage reportCore-dev coverage
|
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 77.8% | 28513 / 36640 |
| Functions | 74.3% | 6352 / 8552 |
| Branches | 50.7% | 22678 / 44751 |
API coverage src/private/mx/{api,impl,utility}/
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 81.1% | 6565 / 8093 |
| Functions | 68.1% | 2250 / 3306 |
| Branches | 49.8% | 5637 / 11317 |
Core HTML report | API HTML report
Commit 52649b0a7f0c21fdcba3401fb3ba170b6c92396b.
gen-quality
|
webern
changed the title
webern
changed the title
Coverage reportCore-dev coverage
|
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 77.8% | 28513 / 36640 |
| Functions | 74.3% | 6352 / 8552 |
| Branches | 50.7% | 22678 / 44751 |
API coverage src/private/mx/{api,impl,utility}/
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 81.0% | 6557 / 8091 |
| Functions | 68.0% | 2249 / 3306 |
| Branches | 49.7% | 5626 / 11321 |
Core HTML report | API HTML report
Commit 70f0b898698bbc65d694318ef2c71f3f4ffe9001.
gen-quality
|
The simple()/complex()/metered()/senzaMisura() accessors return a default-constructed value on the wrong kind rather than throwing, so 'Precondition' was the wrong word (it implies undefined behavior when violated). Reword to point the reader at the isX() check instead.
…nd-trip allow list timesigs_composite-ref.musicxml is the repro rpatters1 attached to #268 before this PR's TimeSignatureData redesign began; it now round-trips losslessly alongside the other fixtures this PR unblocks.
The api always normalizes a font-family list's comma separator to ", " on write (core::FontFamily), so the fixture's single-space-free "Maestro,engraved" byte-diverged from the round-tripped output despite matching in substance. Match the writer's normalized spacing.
<score-part>/<group> (Finale's ensemble-grouping metadata) has no mx::api surface -- PartData carries no field for it and PartReader silently drops it, which is an unrelated pre-existing gap this fixture isn't meant to exercise. Trimmed so the fixture stays scoped to the composite time-signature round-trip it was added to pin.
Contributor
|
I quite like the approach you have taken. |
… instead Restores timesigs_composite-ref.musicxml byte-exact to the original rpatters1 attached to #268 -- it stays out of the round-trip allow list as-is, since it also exercises unrelated pre-existing mx::api gaps (score-part/group, music-font comma spacing, measure-numbering multiple-rest-* attributes). timesigs_composite-ref-modified.musicxml is a new sibling with just those three unrelated spots trimmed; it's the one pinned in roundtrip-baseline.txt, keeping the fixture scoped to what it's meant to exercise: the composite/additive time-signature round-trip. Bumped the corert pinned file count (833 -> 834) for the added file.
<sound>/<swing> is documented (SoundData.h) as intentionally out of mx::api's scope alongside midi-instrument/midi-device/play/offset. Another unrelated pre-existing gap this fixture wasn't meant to exercise; trimmed from the modified sibling like the other three.
Coverage reportCore-dev coverage
|
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 77.8% | 28514 / 36640 |
| Functions | 74.3% | 6352 / 8552 |
| Branches | 50.7% | 22680 / 44751 |
API coverage src/private/mx/{api,impl,utility}/
| Metric | Coverage | Covered / Total |
|---|---|---|
| Lines | 81.0% | 6557 / 8091 |
| Functions | 68.0% | 2249 / 3306 |
| Branches | 49.7% | 5626 / 11321 |
Core HTML report | API HTML report
Commit f98af336227c89db9cb098652a2162777ee5e78f.
gen-quality
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Human Summary
When @rpatters1 opened #268, my immediate thought was, oh no, we have to support all of the time signature model. My reasoning is that just adding the one case that is needed now will only last so long before a different semantic situation is encountered.
I wanted to preserve some sort of "simple" path, so I created a "choice" class where
TimeSignatureDataused to be. It can be eithersimpleorcomplexwhere simple basically meansnumerator/denominatorwith or without theCorCutsymbol.Anything beyond that is shuttled into
ComplexTimeSignaturewhere, I believe, we have modeled all of what MusicXML supports.!!Breaking!!
We use "breaking" somewhat loosely around here, since just about any
mx::apichange introduces some amount of change to the client code, but this one is bigger than the usual breakage. It requires edits anywhere time signatures are involved in client code. As such, I spent some extra time on it and I hope I have a stable design here.Summary
Redesigns the time-signature model in
mx::apito cover the full MusicXML<time>element instead of a single beats/beat-type pair with a narrow symbol set.TimeSignatureDatais now built around a sharedTimeFractionleaf (beats/beatType); itsTimeSignatureSymbolis narrowed tounspecified/common/cut.ComplexTimeSignature(ComplexTimeSignature.h) quarantines everything unusual: composite/additive multi-fraction meters, the full symbol vocabulary (singleNumber,note,dottedNote), separators, interchangeable (dual) meters, and senza-misura.TimeChoice(TimeChoice.h) is a{simple, complex}switch carrying the whole-<time>attributes (isImplicit,display). Building aTimeChoicefrom aComplexTimeSignaturethat turns out to be simple-equivalent auto-collapses it back tosimple, so there's always one canonical representation.MeasureData::timeSignatureis now aTimeChoice; a newMeasureData::staffTimeSignatures(std::map<int, TimeChoice>) holds per-staff<time number="N">overrides.TimeReadernow translates every<time>in a measure (not just the first) into aTimeChoice+ staff index;PropertiesWriter::writeTimeregenerates all shapes and writes per-staffnumber=;MeasureReader/MeasureWriter/Cursorcarry per-staff overrides forward measure-to-measure;Convertergains symbol/separator/relation enum tables.roundtrip-baseline.txt(ly11d/ly11ecomposite meters,ly11fsymbols,ly11hsenza-misura).This is a breaking change to
mx::api:beats/beatTypemove intofraction,isImplicit/displaymove fromTimeSignatureDataontoTimeChoice, andTimeSignatureSymbol::singleNumbermoves to the complex-onlyComplexTimeSymbol.Testing
TimeSignatureApiTest.cpp: new cases for default/auto-collapse/stays-complex/equality behavior, plus round-trip coverage for composite meters, senza-misura (with and without glyph), interchangeable pairs, widened symbol+separator, and per-staff overrides with carry-forwardroundtrip-baseline.txt:ly11d,ly11e,ly11f,ly11hunpinned (now pass the api round-trip)TimeChoiceconstruction (ApiK007a/c,ApiK009bSlur,ApiK014aFermatas,ApiK015aLayout,ApiLy43e,ApiMuAccidentals1,ChordApiTest)timesigs_composite-ref.musicxmlwhich was submitted by @rpatters1 to cover his use caseReferences