Skip to content

Stream.measures(): collect MetronomeMark by default #1895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mscuthbert merged 5 commits into from
May 16, 2026
Merged

Stream.measures(): collect MetronomeMark by default #1895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8959d55
measures(): collect MetronomeMark by default
oxygen-dioxide May 16, 2026
3194051
fix line too long
oxygen-dioxide May 16, 2026
ac34fb9
fix tests
oxygen-dioxide May 16, 2026
d814b3f
formatting
oxygen-dioxide May 16, 2026
9af0384
fix tests
oxygen-dioxide May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions music21/midi/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,9 +1316,9 @@ def procCompare(mf_inner, match_inner):
# part.show('midi')

mf = streamToMidiFile(part)
match = [(0, 'KEY_SIGNATURE', None), # Conductor track
match = [(0, 'SET_TEMPO', None),
(0, 'KEY_SIGNATURE', None), # Conductor track
(0, 'TIME_SIGNATURE', None),
(0, 'SET_TEMPO', None),
(10080, 'END_OF_TRACK', None),
(0, 'SEQUENCE_TRACK_NAME', None), # Music track
(0, 'PITCH_BEND', None),
Expand Down
16 changes: 12 additions & 4 deletions music21/stream/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4422,7 +4422,7 @@ def measures(
numberStart,
numberEnd,
*,
collect=('Clef', 'TimeSignature', 'Instrument', 'KeySignature'),
collect=('Clef', 'TimeSignature', 'Instrument', 'KeySignature', 'MetronomeMark'),
gatherSpanners=GatherSpanners.ALL,
indicesNotNumbers=False
) -> Stream[Measure]:
Expand Down Expand Up @@ -4509,6 +4509,7 @@ def measures(
... print(thing)
P1: Soprano: Instrument 1
<music21.clef.TrebleClef>
<music21.tempo.MetronomeMark Quarter=96 (playback only)>
f# minor
<music21.meter.TimeSignature 4/4>
<music21.stream.Measure 7 offset=0.0>
Expand All @@ -4523,6 +4524,7 @@ def measures(
... print(thing)
P1: Soprano: Instrument 1
<music21.clef.TrebleClef>
<music21.tempo.MetronomeMark Quarter=96 (playback only)>
D- major
...

Expand Down Expand Up @@ -4652,7 +4654,7 @@ def measures(
def measure(self,
measureNumber,
*,
collect=('Clef', 'TimeSignature', 'Instrument', 'KeySignature'),
collect=('Clef', 'TimeSignature', 'Instrument', 'KeySignature', 'MetronomeMark'),
indicesNotNumbers=False) -> Measure|None:
'''
Given a measure number, return a single
Expand Down Expand Up @@ -13881,7 +13883,7 @@ def parts(self) -> iterator.StreamIterator[Part]:
def measures(self,
numberStart,
numberEnd,
collect=('Clef', 'TimeSignature', 'Instrument', 'KeySignature'),
collect=('Clef', 'TimeSignature', 'Instrument', 'KeySignature', 'MetronomeMark'),
gatherSpanners=GatherSpanners.ALL,
indicesNotNumbers=False):
# noinspection PyShadowingNames
Expand Down Expand Up @@ -13929,7 +13931,13 @@ def measures(self,
# this is Score.measure
def measure(self,
measureNumber,
collect=(clef.Clef, meter.TimeSignature, instrument.Instrument, key.KeySignature),
collect=(
clef.Clef,
meter.TimeSignature,
instrument.Instrument,
key.KeySignature,
tempo.MetronomeMark,
),
gatherSpanners=GatherSpanners.ALL,
indicesNotNumbers=False):
'''
Expand Down
Loading