CPJKU · sildater · Apr 5, 2024 · Apr 9, 2024 · Apr 25, 2024 · Jul 19, 2024
diff --git a/docs/source/Tutorial/notebook.ipynb b/docs/source/Tutorial/notebook.ipynb
diff --git a/partitura/assets/score_example.mei b/partitura/assets/score_example.mei
@@ -1,52 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="https://music-encoding.org/schema/4.0.0/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
-<?xml-model href="https://music-encoding.org/schema/4.0.0/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="4.0.0">
-   <meiHead>
-      <fileDesc>
-         <titleStmt>
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="https://music-encoding.org/schema/5.0/mei-all.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="5.0">
+   <meiHead xml:id="m21agkk">
+      <fileDesc xml:id="f1x9ud6p">
+         <titleStmt xml:id="t1pe4slb">
             <title />
             <respStmt />
          </titleStmt>
-         <pubStmt></pubStmt>
+         <pubStmt xml:id="p1kxcrok">
+            <date isodate="2024-10-30" type="encoding-date">2024-10-30</date>
+         </pubStmt>
       </fileDesc>
-      <encodingDesc xml:id="encodingdesc-2o9bqo">
-         <appInfo xml:id="appinfo-j7rtco">
-            <application xml:id="application-hc9py4" isodate="2021-12-09T11:27:15" version="3.8.0-dev-45c3f2c">
-               <name xml:id="name-symba1">Verovio</name>
-               <p xml:id="p-roup2t">Transcoded from MusicXML</p>
+      <encodingDesc xml:id="e1xr2zpp">
+         <appInfo xml:id="a1wyxc5n">
+            <application xml:id="a1t43ge2" isodate="2024-10-30T10:56:32" version="4.3.1-3b8cc17">
+               <name xml:id="n1cp60l4">Verovio</name>
+               <p xml:id="p13nndma">Transcoded from MusicXML</p>
             </application>
          </appInfo>
       </encodingDesc>
    </meiHead>
    <music>
       <body>
-         <mdiv xml:id="mhblkrl">
-            <score xml:id="ssc72wy">
-               <scoreDef xml:id="s3uaoz5">
-                  <staffGrp xml:id="sjczhy0">
-                     <staffDef xml:id="P1" n="1" lines="5" ppq="12">
-                        <label xml:id="lezfcog">Piano</label>
-                        <meterSig xml:id="mhw0sp2" count="4" unit="4" />
-                     </staffDef>
+         <mdiv xml:id="muo97v6">
+            <score xml:id="suneqlv">
+               <scoreDef xml:id="sz00r05">
+                  <staffGrp xml:id="s1h35kps">
+                     <staffGrp xml:id="P1" bar.thru="true">
+                        <grpSym xml:id="g1eji31e" symbol="brace" />
+                        <label xml:id="l8lirjj">Piano</label>
+                        <instrDef xml:id="iggd40h" midi.channel="0" midi.instrnum="0" midi.volume="78.00%" />
+                        <staffDef xml:id="sbpks8p" n="1" lines="5" ppq="1">
+                           <clef xml:id="c1p7nrnw" shape="G" line="2" />
+                           <keySig xml:id="ki5anqv" sig="0" />
+                           <meterSig xml:id="m1vpw2w2" count="4" unit="4" />
+                        </staffDef>
+                        <staffDef xml:id="s1g416nz" n="2" lines="5" ppq="1">
+                           <clef xml:id="cezkswz" shape="G" line="2" />
+                           <keySig xml:id="kk41xfz" sig="0" />
+                           <meterSig xml:id="m7alo7s" count="4" unit="4" />
+                        </staffDef>
+                     </staffGrp>
                   </staffGrp>
                </scoreDef>
-               <sb xml:id="st1gphw" />
-               <section xml:id="swgpvx8">
-                  <pb xml:id="paw6v6b" />
-                  <measure xml:id="mz87quy" n="1">
-                     <staff xml:id="sxxu2aq" n="1">
-                        <layer xml:id="llktcv2" n="1">
-                           <note xml:id="n01" dur.ppq="48" dur="1" staff="2" oct="4" pname="a" />
-                        </layer>
-                        <layer xml:id="lgap59p" n="2">
-                           <rest xml:id="r01" dur.ppq="24" dur="2" />
-                           <chord xml:id="carc8ao" dur.ppq="24" dur="2">
-                              <note xml:id="n02" oct="5" pname="c" />
-                              <note xml:id="n03" oct="5" pname="e" />
+               <section xml:id="suu4o7p">
+                  <measure xml:id="m1e358qx" n="1">
+                     <staff xml:id="s1ufvigy" n="1">
+                        <layer xml:id="l1r7cvga" n="1">
+                           <rest xml:id="ro1o7cb" dur.ppq="2" dur="2" />
+                           <chord xml:id="c1c1r6b7" dur.ppq="2" dur="2" stem.dir="down">
+                              <note xml:id="n6dpu2p" oct="5" pname="c" />
+                              <note xml:id="njfgcwp" oct="5" pname="e" />
                            </chord>
                         </layer>
                      </staff>
+                     <staff xml:id="s710zw2" n="2">
+                        <layer xml:id="leffrs2" n="5">
+                           <note xml:id="n1txt37q" dur.ppq="4" dur="1" oct="4" pname="a" />
+                        </layer>
+                     </staff>
                   </measure>
                </section>
             </score>

diff --git a/partitura/io/exportmatch.py b/partitura/io/exportmatch.py
@@ -21,7 +21,6 @@
 from partitura.io.matchlines_v1 import (
     make_info,
     make_scoreprop,
-    make_section,
     MatchSnote,
     MatchNote,
     MatchSnoteNote,

diff --git a/partitura/io/exportmei.py b/partitura/io/exportmei.py
@@ -277,6 +277,9 @@ def _handle_note(self, note, xml_voice_el):
         elif note.tie_prev is not None:
             note_el.set("tie", "t")
 
+        if note.stem_direction in ["up", "down"]:
+            note_el.set("stem.dir", note.stem_direction)
+
         if note.alter is not None:
             if (
                 note.step.lower() + ALTER_TO_MEI[note.alter]

diff --git a/partitura/io/exportmusicxml.py b/partitura/io/exportmusicxml.py
@@ -137,6 +137,10 @@ def make_note_el(note, dur, voice, counter, n_of_staves):
     if voice not in (None, 0):
         etree.SubElement(note_e, "voice").text = "{}".format(voice)
 
+    if note.stem_direction is not None:
+        stem_e = etree.SubElement(note_e, "stem")
+        stem_e.text = note.stem_direction
+
     if note.fermata is not None:
         notations.append(etree.Element("fermata"))
 
@@ -634,12 +638,20 @@ def merge_measure_contents(notes, other, measure_start):
         merged[0] = []
         cost[0] = 0
 
+    # CHANGE: disabled cost-based merging of non-note elements into stream
+    # because this led to attributes not being in the beginning of the measure,
+    # which in turn led to problems with musescore
+    # fix: add atributes first, then the notes.
+    # problem: unclear whether this cost-based merging will break anything or
+    # was just cosmetic to avoid too many forwards and backwards.
+    # related issue: https://github.com/CPJKU/partitura/issues/390
+
     # get the voice for which merging notes and other has lowest cost
-    merge_voice = sorted(cost.items(), key=itemgetter(1))[0][0]
+    # merge_voice = sorted(cost.items(), key=itemgetter(1))[0][0]
     result = []
     pos = measure_start
     for i, voice in enumerate(sorted(notes.keys())):
-        if voice == merge_voice:
+        if i == 0:  # voice == merge_voice:
             elements = merged[voice]
 
         else:
@@ -658,7 +670,7 @@ def merge_measure_contents(notes, other, measure_start):
             elif gap > 0:
                 e = etree.Element("forward")
                 ee = etree.SubElement(e, "duration")
-                ee.text = "{:d}".format(gap)
+                ee.text = "{:d}".format(int(gap))
                 result.append(e)
 
         result.extend([e for _, _, e in elements])
@@ -1053,8 +1065,8 @@ def handle_parents(part):
             part_e.append(etree.Comment(MEASURE_SEP_COMMENT))
             attrib = {}
 
-            if measure.number is not None:
-                attrib["number"] = str(measure.number)
+            if measure.name is not None:
+                attrib["number"] = str(measure.name)
 
             measure_e = etree.SubElement(part_e, "measure", **attrib)
             contents = linearize_measure_contents(

diff --git a/partitura/io/importkern.py b/partitura/io/importkern.py
@@ -70,6 +70,15 @@
 }
 
 
+class KernElement(object):
+    def __init__(self, element):
+        self.editorial_start = True if "ossia" in element else False
+        self.editorial_end = True if "Xstrophe" in element else False
+        self.voice_end = True if "*v" in element else False
+        self.voice_start = True if "*^" in element else False
+        self.element = element.replace("*", "")
+
+
 def add_durations(a, b):
     return a * b / (a + b)
 
@@ -102,8 +111,10 @@ def parse_by_voice(file: list, dtype=np.object_):
         data[line, voice] = file[line][voice]
     data = data.T
     if num_voices > 1:
-        # Copy global lines from the first voice to all other voices
+        # Copy global lines from the first voice to all other voices unless they are the string "*S/ossia"
         cp_idx = np.char.startswith(data[0], "*")
+        un_idx = np.char.startswith(data[0], "*S/ossia")
+        cp_idx = np.logical_and(cp_idx, ~un_idx)
         for i in range(1, num_voices):
             data[i][cp_idx] = data[0][cp_idx]
         # Copy Measure Lines from the first voice to all other voices
@@ -171,10 +182,16 @@ def element_parsing(
 ):
     divs_pq = part._quarter_durations[0]
     current_tl_pos = 0
+    editorial = False
     measure_mapping = {m.number: m.start.t for m in part.iter_all(spt.Measure)}
     for i in range(elements.shape[0]):
         element = elements[i]
-        if element is None:
+        if isinstance(element, KernElement):
+            if element.editorial_start:
+                editorial = True
+            if element.editorial_end:
+                editorial = False
+        if element is None or editorial:
             continue
         if isinstance(element, spt.GenericNote):
             if total_duration_values[i] == 0:
@@ -250,9 +267,6 @@ def load_kern(
     )
     # Get Splines
     splines = file[1:].T[note_parts]
-    # Inverse Order
-    splines = splines[::-1]
-    parsing_idxs = parsing_idxs[::-1]
     prev_staff = 1
     has_instrument = np.char.startswith(splines, "*I")
     # if all parts have the same instrument, then they are the same part.
@@ -351,7 +365,8 @@ def load_kern(
     )
 
     doc_name = get_document_name(filename)
-    score = spt.Score(partlist=partlist, id=doc_name)
+    # inversing the partlist results to correct part order and visualization for exporting musicxml files
+    score = spt.Score(partlist=partlist[::-1], id=doc_name)
     return score
 
 
@@ -430,17 +445,15 @@ def parse(self, spline: np.array):
         self.tie_prev = np.zeros(note_num, dtype=bool)
         notes = np.vectorize(self.meta_note_line, otypes=[object])(spline[note_mask])
         self.total_duration_values[note_mask] = self.note_duration_values
-        # shift tie_next by one to the right
+        # Notes should appear in order within stream so shift tie_next by one to the right
+        # and tie next and inversingly tie_prev also
+        # Case of note to chord tie or chord to note tie is not handled yet
         for note, to_tie in np.c_[
             notes[self.tie_next], notes[np.roll(self.tie_next, -1)]
         ]:
             to_tie.tie_next = note
-            # note.tie_prev = to_tie
-        for note, to_tie in np.c_[
-            notes[self.tie_prev], notes[np.roll(self.tie_prev, 1)]
-        ]:
             note.tie_prev = to_tie
-            # to_tie.tie_next = note
+
         elements[note_mask] = notes
 
         # Find Slur indices, i.e. where spline cells contain "(" or ")"
@@ -505,6 +518,8 @@ def meta_tandem_line(self, line: str):
             return self.process_key_line(rest)
         elif line.startswith("*-"):
             return self.process_fine()
+        else:
+            return KernElement(element=line)
 
     def process_tempo_line(self, line: str):
         return spt.Tempo(float(line))
@@ -561,7 +576,7 @@ def process_clef_line(self, line: str):
             else:
                 raise ValueError("Unrecognized clef line: {}".format(line))
         else:
-            clef_line = has_line.group(0)
+            clef_line = int(has_line.group(0))
         if octave_change and clef_line == 2 and clef == "G":
             octave = -1
         elif octave_change: