partitura 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

partitura/io/importmidi.py

@@ -124,7 +124,6 @@ def load_performance_midi(
     else:
         tracks = [(i, u) for i, u in enumerate(mid.tracks)]
     for i, track in tracks:
-
         notes = []
         controls = []
         programs = []
@@ -135,18 +134,15 @@ def load_performance_midi(
         sounding_notes = {}
 
         for msg in track:
-
             # update time deltas when they arrive
             t = t + msg.time * time_conversion_factor
             ttick = ttick + msg.time
 
             if msg.type == "set_tempo":
-
                 mpq = msg.tempo
                 time_conversion_factor = mpq / (ppq * 10**6)
 
             elif msg.type == "control_change":
-
                 controls.append(
                     dict(
                         time=t,
@@ -159,7 +155,6 @@ def load_performance_midi(
                 )
 
             elif msg.type == "program_change":
-
                 programs.append(
                     dict(
                         time=t,
@@ -171,7 +166,6 @@ def load_performance_midi(
                 )
 
             else:
-
                 note_on = msg.type == "note_on"
                 note_off = msg.type == "note_off"
 
@@ -183,19 +177,16 @@ def load_performance_midi(
 
                 # start note if it's a 'note on' event with velocity > 0
                 if note_on and msg.velocity > 0:
-
                     # save the onset time and velocity
                     sounding_notes[note] = (t, ttick, msg.velocity)
 
                 # end note if it's a 'note off' event or 'note on' with velocity 0
                 elif note_off or (note_on and msg.velocity == 0):
-
                     if note not in sounding_notes:
-                        warnings.warn("ignoring MIDI message %s" % msg)
+                        warnings.warn(f"ignoring MIDI message {msg}")
                         continue
 
                     # append the note to the list associated with the channel
-
                     notes.append(
                         dict(
                             # id=f"n{len(notes)}",
@@ -364,7 +355,6 @@ or a list of these
         t_raw = 0
 
         for msg in track:
-
             t_raw = t_raw + msg.time
 
             if msg.type not in relevant:
@@ -393,13 +383,11 @@ or a list of these
 
                 # start note if it's a 'note on' event with velocity > 0
                 if note_on and msg.velocity > 0:
-
                     # save the onset time and velocity
                     sounding_notes[note] = (t, msg.velocity)
 
                 # end note if it's a 'note off' event or 'note on' with velocity 0
                 elif note_off or (note_on and msg.velocity == 0):
-
                     if note not in sounding_notes:
                         warnings.warn("ignoring MIDI message %s" % msg)
                         continue
@@ -428,7 +416,6 @@ or a list of these
             if len(ch_notes) > 0:
                 notes_by_track_ch[(track_nr, ch)] = ch_notes
 
-
     tr_ch_keys = sorted(notes_by_track_ch.keys())
     group_part_voice_keys, part_names, group_names = assign_group_part_voice(
         part_voice_assign_mode, tr_ch_keys, track_names_by_track
@@ -485,6 +472,28 @@ or a list of these
     else:
         note_ids = [None for i in range(len(note_array))]
 
+    ## sanitize time signature, when they are only present in one track, and no global is set
+    # find the number of ts per each track
+    number_of_time_sig_per_track = [
+        len(time_sigs_by_track[t]) for t in key_sigs_by_track.keys()
+    ]
+    # if one track has 0 ts, and another has !=0 ts, and no global_time_sigs is present, sanitize
+    # all key signatures are copied to global, and the track ts are removed
+    if (
+        len(global_time_sigs) == 0
+        and min(number_of_time_sig_per_track) == 0
+        and max(number_of_time_sig_per_track) != 0
+    ):
+        warnings.warn(
+            "Sanitizing time signatures. They will be shared across all tracks."
+        )
+        for ts in [
+            ts for ts_track in time_sigs_by_track.values() for ts in ts_track
+        ]:  # flattening all track time signatures to a list of ts
+            global_time_sigs.append(ts)
+        # now clear all track_ts
+        time_sigs_by_track.clear()
+
     time_sigs_by_part = defaultdict(set)
     for tr, ts_list in time_sigs_by_track.items():
         for ts in ts_list:

partitura/io/importmusic21.py

@@ -6,7 +6,6 @@ try:
     import music21 as m21
     from music21.stream import Score as M21Score
 except ImportError:
-
     m21 = None
 
     class M21Score(object):

partitura/io/importmusicxml.py

@@ -60,6 +60,22 @@ PEDAL_DIRECTIONS = {
     "sustain_pedal": score.SustainPedalDirection,
 }
 
+TEMPO_DIRECTIONS = {
+    "Adagio": score.ConstantTempoDirection,
+    "Andante": score.ConstantTempoDirection,
+    "Andante amoroso": score.ConstantTempoDirection,
+    "Andante cantabile": score.ConstantTempoDirection,
+    "Andante grazioso": score.ConstantTempoDirection,
+    "Menuetto": score.ConstantTempoDirection,
+    "Allegretto grazioso": score.ConstantTempoDirection,
+    "Allegro moderato": score.ConstantTempoDirection,
+    "Allegro assai": score.ConstantTempoDirection,
+    "Allegro": score.ConstantTempoDirection,
+    "Allegretto": score.ConstantTempoDirection,
+    "Molto allegro": score.ConstantTempoDirection,
+    "Presto": score.ConstantTempoDirection,
+}
+
 OCTAVE_SHIFTS = {8: 1, 15: 2, 22: 3}
 
 
@@ -114,11 +130,9 @@ def _parse_partlist(partlist):
     structure = []
     current_group = None
     part_dict = {}
-
     for e in partlist:
         if e.tag == "part-group":
             if e.get("type") == "start":
-
                 gr_name = get_value_from_tag(e, "group-name", str)
                 gr_symbol = get_value_from_tag(e, "group-symbol", str)
                 gr_number = get_value_from_attribute(e, "number", int)
@@ -147,7 +161,6 @@ def _parse_partlist(partlist):
             part.part_abbreviation = next(
                 iter(e.xpath("part-abbreviation/text()")), None
             )
-
             part_dict[part_id] = part
 
             if current_group is None:
@@ -240,6 +253,10 @@ def load_musicxml(
 
     composer = None
     scid = None
+    work_title = None
+    work_number = None
+    movement_title = None
+    movement_number = None
     title = None
     subtitle = None
     lyricist = None
@@ -255,14 +272,25 @@ def load_musicxml(
             tag="work-title",
             as_type=str,
         )
+        scidn = get_value_from_tag(
+            e=work_info_el,
+            tag="work-number",
+            as_type=str,
+        )
+        work_title = scid
+        work_number = scidn
 
-        title = scid
+    movement_title_el = document.find(".//movement-title")
+    movement_number_el = document.find(".//movement-number")
+    if movement_title_el is not None:
+        movement_title = movement_title_el.text
+    if movement_number_el is not None:
+        movement_number = movement_number_el.text
 
     score_identification_el = document.find("identification")
 
     # The identification tag has preference over credit
     if score_identification_el is not None:
-
         copyright = get_value_from_tag(score_identification_el, "rights", str)
 
         for cel in score_identification_el.findall("creator"):
@@ -272,7 +300,6 @@ def load_musicxml(
                 lyricist = str(cel.text)
 
     for cel in document.findall("credit"):
-
         credit_type = get_value_from_tag(cel, "credit-type", str)
         if credit_type == "title" and title is None:
             title = get_value_from_tag(cel, "credit-words", str)
@@ -292,6 +319,10 @@ def load_musicxml(
     scr = score.Score(
         id=scid,
         partlist=partlist,
+        work_number=work_number,
+        work_title=work_title,
+        movement_number=movement_number,
+        movement_title=movement_title,
         title=title,
         subtitle=subtitle,
         composer=composer,
@@ -317,7 +348,6 @@ def _parse_parts(document, part_dict):
     """
 
     for part_el in document.findall("part"):
-
         part_id = part_el.get("id", "P1")
         part = part_dict.get(part_id, score.Part(part_id))
 
@@ -415,7 +445,6 @@ def _parse_parts(document, part_dict):
         # check whether all grace notes have a main note
         for gn in part.iter_all(score.GraceNote):
             if gn.main_note is None:
-
                 for no in part.iter_all(
                     score.Note,
                     include_subclasses=False,
@@ -456,8 +485,8 @@ def _parse_parts(document, part_dict):
 
 
 def _handle_measure(measure_el, position, part, ongoing, doc_order, measure_counter):
-    """ Parse a <measure>...</measure> element, adding it and its contents to the part.
-    
+    """Parse a <measure>...</measure> element, adding it and its contents to the part.
+
     Parameters
     ----------
     measure_el : etree.Element
@@ -472,16 +501,16 @@ def _handle_measure(measure_el, position, part, ongoing, doc_order, measure_coun
         The index of the first note element in the current measure in the xml file.
     measure_counter : int
         The index of the <measure> tag in the xml file, starting from 1
-    
+
     Returns
     -------
     measure_maxtime : int
         The ending time of the measure
     doc_order : int
         The index of the first note element in the next measure in the xml file.
-        
+
     """
-    
+
     # make a measure object
     measure = make_measure(measure_el, measure_counter)
 
@@ -497,7 +526,6 @@ def _handle_measure(measure_el, position, part, ongoing, doc_order, measure_coun
     measure_maxtime = measure_start
     trailing_children = []
     for i, e in enumerate(measure_el):
-
         if e.tag == "backup":
             # <xs:documentation>The backup and forward elements are required
             # to coordinate multiple voices in one part, including music on
@@ -608,7 +636,7 @@ def _handle_measure(measure_el, position, part, ongoing, doc_order, measure_coun
 
     # add end time of measure
     part.add(measure, None, measure_maxtime)
-    
+
     return measure_maxtime, doc_order
 
 
@@ -635,13 +663,11 @@ def _handle_repeat(e, position, part, ongoing):
     key = "repeat"
 
     if e.get("direction") == "forward":
-
         o = score.Repeat()
         ongoing[key] = o
         part.add(o, position)
 
     elif e.get("direction") == "backward":
-
         o = ongoing.pop(key, None)
 
         if o is None:
@@ -660,17 +686,14 @@ def _handle_ending(e, position, part, ongoing):
     key = ("ending", getattr(e, "number", "0"))
 
     if e.get("type") == "start":
-
         o = score.Ending(e.get("number"))
         ongoing[key] = o
         part.add(o, position)
 
     elif e.get("type") in ("stop", "discontinue"):
-
         o = ongoing.pop(key, None)
 
         if o is None:
-
             warnings.warn(
                 "Found ending[stop] without a preceding ending[start]\n"
                 + "Single measure bracket is assumed"
@@ -679,7 +702,6 @@ def _handle_ending(e, position, part, ongoing):
             part.add(o, None, position)
 
         else:
-
             part.add(o, None, position)
 
 
@@ -701,7 +723,6 @@ def _handle_new_page(position, part, ongoing):
 
 def _handle_new_system(position, part, ongoing):
     if "system" in ongoing:
-
         if position == 0:
             # ignore non-informative new-system at start of score
             return
@@ -725,13 +746,13 @@ def make_measure(xml_measure, measure_counter):
         An etree Element instance with a <measure> tag
     measure_counter : int
         The index of the <measure> tag in the xml file, starting from 1
-    
+
     Returns
     -------
     measure : score.Measure
         A measure object with a number and optional name attribute
     """
-    
+
     measure = score.Measure()
 
     measure.number = measure_counter
@@ -772,17 +793,14 @@ def get_offset(e):
     offset = e.find("offset")
 
     if offset is None:
-
         return None
 
     else:
-
         sounding = offset.attrib.get("sound", "no")
         return int(offset.text) if sounding == "yes" else 0
 
 
 def _handle_direction(e, position, part, ongoing):
-
     # <!--
     #     A direction is a musical indication that is not attached
     #     to a specific note. Two or more may be combined to
@@ -857,8 +875,9 @@ def _handle_direction(e, position, part, ongoing):
             # first child of direction-type is dynamics, there may be subsequent
             # dynamics items, so we loop:
             for child in direction_type:
+                # check if child has no children, in which case continue
                 # interpret as score.Direction, fall back to score.Words
-                dyn_el = next(iter(child))
+                dyn_el = next(iter(child), None)
                 if dyn_el is not None:
                     direction = DYN_DIRECTIONS.get(dyn_el.tag, score.Words)(
                         dyn_el.tag, staff=staff
@@ -869,13 +888,11 @@ def _handle_direction(e, position, part, ongoing):
             # first child of direction-type is words, there may be subsequent
             # words items, so we loop:
             for child in direction_type:
-
                 # try to make a direction out of words
                 parse_result = parse_direction(child.text)
                 starting_directions.extend(parse_result)
 
         elif dt.tag == "wedge":
-
             number = get_value_from_attribute(dt, "number", int) or 1
             key = ("wedge", number)
             wedge_type = get_value_from_attribute(dt, "type", str)
@@ -889,7 +906,6 @@ def _handle_direction(e, position, part, ongoing):
                 ongoing[key] = o
 
             elif wedge_type == "stop":
-
                 o = ongoing.get(key)
                 if o is not None:
                     ending_directions.append(o)
@@ -898,7 +914,6 @@ def _handle_direction(e, position, part, ongoing):
                     warnings.warn("Did not find a wedge start element for wedge stop!")
 
         elif dt.tag == "dashes":
-
             # start/stop/continue
             dashes_type = get_value_from_attribute(dt, "type", str)
             number = get_value_from_attribute(dt, "number", int) or 1
@@ -929,7 +944,6 @@ def _handle_direction(e, position, part, ongoing):
                 ongoing[key] = o
 
             elif octave_shift_type == "stop":
-
                 o = ongoing.get(key)
                 if o is not None:
                     ending_directions.append(o)
@@ -941,7 +955,6 @@ def _handle_direction(e, position, part, ongoing):
                     )
 
         elif dt.tag == "pedal":
-
             # start/stop
             pedal_type = get_value_from_attribute(dt, "type", str)
             pedal_line = get_value_from_attribute(dt, "line", str) == "yes"
@@ -960,7 +973,6 @@ def _handle_direction(e, position, part, ongoing):
                 ongoing[key] = o
 
             elif pedal_type == "stop":
-
                 o = ongoing.get(key)
                 if o is not None:
                     ending_directions.append(o)
@@ -980,13 +992,10 @@ def _handle_direction(e, position, part, ongoing):
             warnings.warn("ignoring direction type: {} {}".format(dt.tag, dt.attrib))
 
     for dashes_key, dashes_type in dashes_keys.items():
-
         if dashes_type == "start":
-
             ongoing[dashes_key] = starting_directions
 
         elif dashes_type == "stop":
-
             oo = ongoing.get(dashes_key)
             if oo is None:
                 warnings.warn("Dashes end without dashes start")
@@ -1163,11 +1172,10 @@ def _handle_sound(e, position, part):
     if "tempo" in e.attrib:
         tempo = score.Tempo(int(e.attrib["tempo"]), "q")
         # part.add_starting_object(position, tempo)
-        _add_tempo_if_unique(position, part, tempo)
+        (position, part, tempo)
 
 
 def _handle_note(e, position, part, ongoing, prev_note, doc_order):
-
     # get some common features of element if available
     duration = get_value_from_tag(e, "duration", int) or 0
     # elements may have an explicit temporal offset
@@ -1221,7 +1229,6 @@ def _handle_note(e, position, part, ongoing, prev_note, doc_order):
     pitch = e.find("pitch")
     unpitch = e.find("unpitched")
     if pitch is not None:
-
         step = get_value_from_tag(pitch, "step", str)
         alter = get_value_from_tag(pitch, "alter", int)
         octave = get_value_from_tag(pitch, "octave", int)
@@ -1304,30 +1311,24 @@ def _handle_note(e, position, part, ongoing, prev_note, doc_order):
 
     ties = e.findall("tie")
     if len(ties) > 0:
-
         tie_key = ("tie", getattr(note, "midi_pitch", "rest"))
         tie_types = set(tie.attrib["type"] for tie in ties)
 
         if "stop" in tie_types:
-
             tie_prev = ongoing.get(tie_key, None)
 
             if tie_prev:
-
                 note.tie_prev = tie_prev
                 tie_prev.tie_next = note
                 del ongoing[tie_key]
 
         if "start" in tie_types:
-
             ongoing[tie_key] = note
 
     notations = e.find("notations")
 
     if notations is not None:
-
         if notations.find("fermata") is not None:
-
             fermata = score.Fermata(note)
             part.add(fermata, position)
             note.fermata = fermata
@@ -1337,21 +1338,17 @@ def _handle_note(e, position, part, ongoing, prev_note, doc_order):
         )
 
         for slur in starting_slurs:
-
             part.add(slur, position)
 
         for slur in stopping_slurs:
-
             part.add(slur, end=position + duration)
 
         starting_tups, stopping_tups = handle_tuplets(notations, ongoing, note)
 
         for tup in starting_tups:
-
             part.add(tup, position)
 
         for tup in stopping_tups:
-
             part.add(tup, end=position + duration)
 
     new_position = position + duration
@@ -1377,31 +1374,26 @@ def handle_tuplets(notations, ongoing, note):
     )
 
     for tuplet_e in tuplets:
-
         tuplet_number = get_value_from_attribute(tuplet_e, "number", int) or note.voice
         tuplet_type = get_value_from_attribute(tuplet_e, "type", str)
         start_tuplet_key = ("start_tuplet", tuplet_number)
         stop_tuplet_key = ("stop_tuplet", tuplet_number)
 
         if tuplet_type == "start":
-
             # check if we have a stopped_tuplet in ongoing that corresponds to
             # this start
             tuplet = ongoing.pop(stop_tuplet_key, None)
 
             if tuplet is None:
-
                 tuplet = score.Tuplet(note)
                 ongoing[start_tuplet_key] = tuplet
 
             else:
-
                 tuplet.start_note = note
 
             starting_tuplets.append(tuplet)
 
         elif tuplet_type == "stop":
-
             tuplet = ongoing.pop(start_tuplet_key, None)
             if tuplet is None:
                 # tuplet stop occurs before tuplet start in document order, that
@@ -1440,14 +1432,12 @@ def handle_slurs(notations, ongoing, note, position):
     )
 
     for slur_e in slurs:
-
         slur_number = get_value_from_attribute(slur_e, "number", int) or note.voice
         slur_type = get_value_from_attribute(slur_e, "type", str)
         start_slur_key = ("start_slur", slur_number)
         stop_slur_key = ("stop_slur", slur_number)
 
         if slur_type == "start":
-
             # check if we have a stopped_slur in ongoing that corresponds to
             # this stop
             slur = ongoing.pop(stop_slur_key, None)
@@ -1455,7 +1445,6 @@ def handle_slurs(notations, ongoing, note, position):
             # if slur.end_note.start.t < position then the slur stop is
             # rogue. We drop it and treat the slur start like a fresh start
             if slur is None or slur.end_note.start.t < position:
-
                 if slur and slur.end_note.start.t < position:
                     msg = (
                         "Dropping slur {} starting at {} ({}) and ending "
@@ -1477,17 +1466,14 @@ def handle_slurs(notations, ongoing, note, position):
                 ongoing[start_slur_key] = slur
 
             else:
-
                 slur.start_note = note
 
             starting_slurs.append(slur)
 
         elif slur_type == "stop":
-
             slur = ongoing.pop(start_slur_key, None)
 
             if slur is None or slur.start_note.start.t > position:
-
                 if slur and slur.start_note.start.t > position:
                     msg = (
                         "Dropping slur {} starting at {} ({}) and ending "
@@ -1511,7 +1497,6 @@ def handle_slurs(notations, ongoing, note, position):
                 ongoing[stop_slur_key] = slur
 
             else:
-
                 slur.end_note = note
 
             stopping_slurs.append(slur)

partitura/io/importparangonada.py

@@ -62,7 +62,6 @@ def _load_csv(filename: PathLike) -> np.ndarray:
 
     struct_array = np.empty(len(raw_array) - 1, dtype=dtypes)
     for i, (c, dt) in enumerate(zip(columns, dtypes)):
-
         if dt[-1] == "i4":
             # Weird behavior trying to cast 0.0 as an integer
             struct_array[c] = raw_array[1:, i].astype(float).astype(int)