Skip to content

fix: preserve explicit staff on single-staff parts#323

Open
webern wants to merge 1 commit into
mainfrom
fix-note-staff-drop
Open

fix: preserve explicit staff on single-staff parts#323
webern wants to merge 1 commit into
mainfrom
fix-note-staff-drop

Conversation

@webern

@webern webern commented Jul 7, 2026

Copy link
Copy Markdown
Owner

Human Summary

I don't think I like this one. Hold. Possible revision needed.

Summary

NoteWriter::setStaffAndVoice only wrote <staff> when the part had more than one staff, since
staff number is otherwise redundant with containment (measure -> staves -> voices -> notes). But
<staff> is legal MusicXML on a single-staff part too, and many real-world exporters
(Finale/Sibelius/MuseScore) write it unconditionally -- so a source's explicit <staff> was
silently dropped on every single-staff-part note on round-trip. This was the single largest drop
signature in the api round-trip corpus (drop:staff, ~285 of 675 currently-failing files).

Added NoteData::isStaffValueSpecified (mirrors the existing
DirectionData::isStaffValueSpecified), set by NoteReader whenever the source note carried an
explicit <staff>. NoteWriter now emits <staff> whenever the part is multi-staff (unchanged,
structurally required there) or the source had it explicitly -- the same source-had-it-explicitly
convention already used for <voice> (NoteData::userRequestedVoiceNumber).

Testing

  • New explicitStaffOnSingleStaffPartRoundTrips / implicitStaffOnSingleStaffPartOmitsElement
    tests (NoteDataTest.cpp)
  • make test: all pass (4728 assertions in 380 test cases, plus the three examples)
  • make test-api-roundtrip: 159 passed, 0 failed (of 159 pinned; 1 newly unlocked)
  • make fmt / make check: clean

References

@webern webern added bug software defect non-breaking fixes or implementation that do not require breaking changes api Affects the mx::api layer impl Affects the mx::impl layer ai Issues opened by, or through, a coding agent. labels Jul 7, 2026 — with Claude
@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown

Coverage report

Core-dev coverage src/private/mx/core/

Metric Coverage Covered / Total
Lines 77.8% 28513 / 36640
Functions 74.3% 6352 / 8551
Branches 50.7% 22678 / 44751

API coverage src/private/mx/{api,impl,utility}/

Metric Coverage Covered / Total
Lines 80.8% 6396 / 7918
Functions 67.7% 2218 / 3276
Branches 49.6% 5478 / 11054

Core HTML report | API HTML report

Commit dfe9185c493f76563deb828adeb87f8dbac6a396.

@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown

gen-quality gen/

gen-quality: 84.5 / 100   (floor 84.5, +0.0)

  structure     86.5  x0.50   [fn 90.5 / file 82.6]
  cyclomatic    88.4  x0.25
  cognitive     76.6  x0.25

  409 functions across 31 files, 7702 lines (largest file 1044)
  max cc 56  max cognitive 44  max fn loc 152

Worst offenders (top 5 per axis; full lists in score.json):
  cyclomatic gen/xsd/analyze.py:311     report                             56
  cyclomatic gen/plates/build.py:956    _validate_config_against_ir        35
  cyclomatic gen/press/context.py:145   plate_context                      34
  cyclomatic gen/__main__.py:46         _ir                                23
  cyclomatic gen/tests/test_ir.py:102   _check_references                  20
  cognitive  gen/xsd/analyze.py:311     report                             44
  cognitive  gen/ir/resolve.py:119      flat_elements                      40
  cognitive  gen/tests/test_ir.py:102   _check_references                  38
  cognitive  gen/press/context.py:145   plate_context                      37
  cognitive  gen/xsd/analyze.py:207     _sccs                              37
  size       gen/xsd/analyze.py:311     report                             152
  size       gen/press/context.py:145   plate_context                      96
  size       gen/plates/build.py:533    _value_plate                       89
  size       gen/plates/build.py:956    _validate_config_against_ir        89
  size       gen/ir/resolve.py:119      flat_elements                      78

Commit dfe9185c493f76563deb828adeb87f8dbac6a396.

@webern webern changed the title fix: preserve explicit &lt;staff&gt; on single-staff parts fix: preserve explicit staff on single-staff parts Jul 7, 2026
NoteWriter::setStaffAndVoice only wrote <staff> when the part had more than
one staff, since staff number is otherwise redundant with containment
(measure -> staves -> voices -> notes). But <staff> is legal MusicXML on a
single-staff part too, and many real-world exporters write it unconditionally
-- so a source's explicit <staff> was silently dropped on round-trip on
every single-staff part, the single largest drop signature in the api
round-trip corpus.

Added NoteData::isStaffValueSpecified (mirrors the existing
DirectionData::isStaffValueSpecified), set by NoteReader whenever the
source note carried an explicit <staff>. NoteWriter now emits <staff>
whenever the part is multi-staff (unchanged, structurally required) or the
source had it explicitly, matching the same source-had-it-explicitly
convention already used for <voice> (NoteData::userRequestedVoiceNumber).

Closes #275
@webern webern force-pushed the fix-note-staff-drop branch from d08a608 to fa268e0 Compare July 7, 2026 09:23
@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown

Coverage report

Core-dev coverage src/private/mx/core/

Metric Coverage Covered / Total
Lines 77.8% 28513 / 36640
Functions 74.3% 6352 / 8551
Branches 50.7% 22678 / 44751

API coverage src/private/mx/{api,impl,utility}/

Metric Coverage Covered / Total
Lines 80.9% 6429 / 7948
Functions 67.8% 2222 / 3277
Branches 49.6% 5506 / 11102

Core HTML report | API HTML report

Commit 0a6fe0968dd76663538ff05cb0550d46a92a66c8.

@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown

gen-quality gen/

gen-quality: 84.5 / 100   (floor 84.5, +0.0)

  structure     86.5  x0.50   [fn 90.5 / file 82.6]
  cyclomatic    88.4  x0.25
  cognitive     76.6  x0.25

  409 functions across 31 files, 7702 lines (largest file 1044)
  max cc 56  max cognitive 44  max fn loc 152

Worst offenders (top 5 per axis; full lists in score.json):
  cyclomatic gen/xsd/analyze.py:311     report                             56
  cyclomatic gen/plates/build.py:956    _validate_config_against_ir        35
  cyclomatic gen/press/context.py:145   plate_context                      34
  cyclomatic gen/__main__.py:46         _ir                                23
  cyclomatic gen/tests/test_ir.py:102   _check_references                  20
  cognitive  gen/xsd/analyze.py:311     report                             44
  cognitive  gen/ir/resolve.py:119      flat_elements                      40
  cognitive  gen/tests/test_ir.py:102   _check_references                  38
  cognitive  gen/press/context.py:145   plate_context                      37
  cognitive  gen/xsd/analyze.py:207     _sccs                              37
  size       gen/xsd/analyze.py:311     report                             152
  size       gen/press/context.py:145   plate_context                      96
  size       gen/plates/build.py:533    _value_plate                       89
  size       gen/plates/build.py:956    _validate_config_against_ir        89
  size       gen/ir/resolve.py:119      flat_elements                      78

Commit 0a6fe0968dd76663538ff05cb0550d46a92a66c8.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai Issues opened by, or through, a coding agent. api Affects the mx::api layer bug software defect impl Affects the mx::impl layer non-breaking fixes or implementation that do not require breaking changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

api: round-trip drops staff

1 participant