partitura 1.6.0__tar.gz → 1.8.0__tar.gz

{partitura-1.6.0 → partitura-1.8.0}/PKG-INFO

@@ -1,18 +1,21 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: partitura
-Version: 1.6.0
+Version: 1.8.0
 Summary: A package for handling symbolic musical information
-Home-page: https://github.com/CPJKU/partitura
 Author: Maarten Grachten, Carlos Cancino-Chacón, Silvan Peter, Emmanouil Karystinaios, Francesco Foscarin, Thassilo Gadermaier, Patricia Hu
-Author-email: partitura-users@googlegroups.com
+Maintainer-email: partitura-users@googlegroups.com
 License: Apache 2.0
-Keywords: music notation musicxml midi
-Classifier: License :: OSI Approved :: MIT License
+Project-URL: Homepage, https://github.com/CPJKU/partitura
+Keywords: music,notation,musicxml,midi
+Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.7
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy
@@ -21,18 +24,30 @@ Requires-Dist: lxml
 Requires-Dist: lark-parser
 Requires-Dist: xmlschema
 Requires-Dist: mido
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
+Requires-Dist: typing-extensions
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: nbsphinx; extra == "dev"
+Requires-Dist: music21; extra == "dev"
+Requires-Dist: Pillow; extra == "dev"
+Requires-Dist: musescore; extra == "dev"
+Requires-Dist: miditok; extra == "dev"
+Requires-Dist: tokenizers; extra == "dev"
+Requires-Dist: pandas; extra == "dev"
+Provides-Extra: all
+Requires-Dist: nbsphinx; extra == "all"
+Requires-Dist: torch; extra == "all"
+Requires-Dist: pyfluidsynth; extra == "all"
+Requires-Dist: pytest; extra == "all"
+Requires-Dist: black; extra == "all"
+Requires-Dist: music21; extra == "all"
+Requires-Dist: Pillow; extra == "all"
+Requires-Dist: musescore; extra == "all"
+Requires-Dist: miditok; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Dynamic: license-file
 
 [//]: # (<p align="center"> )
 

partitura-1.8.0/docs/source/conf.py

@@ -0,0 +1,120 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import os
+import sys
+
+sys.path.insert(0, os.path.abspath("../../partitura"))
+# The master toctree document.
+master_doc = "index"
+
+# -- Project information -----------------------------------------------------
+
+project = "partitura"
+# copyright = '2019, Maarten Grachten'
+author = "Maarten Grachten, Carlos Cancino-Chacón, Silvan Peter, Emmanouil Karystinaios, Francesco Foscarin, Thassilo Gadermaier"
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = "1.8.0"
+# The full version, including alpha/beta/rc tags.
+release = "1.8.0"
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = "python"
+
+
+# -- General configuration ---------------------------------------------------
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ["_build"]
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = "sphinx"
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.autosummary",
+    "sphinx.ext.doctest",
+    "sphinx.ext.todo",
+    "sphinx.ext.coverage",
+    "sphinx.ext.mathjax",
+    "sphinx.ext.viewcode",
+    # 'sphinxcontrib.napoleon',
+    "sphinx.ext.napoleon",
+    "nbsphinx",
+    # 'sphinxcontrib.bibtex',  # for bibliographic references
+    # 'sphinxcontrib.rsvgconverter',  # for SVG->PDF conversion in LaTeX output
+    # 'sphinx_gallery.load_style',  # load CSS for gallery (needs SG >= 0.6)
+    # 'sphinx_last_updated_by_git',  #? get "last updated" from Git
+    # 'sphinx_codeautolink',  # automatic links from code to documentation
+    # 'sphinx.ext.intersphinx',  # links to other Sphinx projects (e.g. NumPy)
+]
+
+# These projects are also used for the sphinx_codeautolink extension:
+intersphinx_mapping = {
+    "IPython": ("https://ipython.readthedocs.io/en/stable/", None),
+    "matplotlib": ("https://matplotlib.org/", None),
+    "numpy": ("https://docs.scipy.org/doc/numpy/", None),
+    "pandas": ("https://pandas.pydata.org/docs/", None),
+    "python": ("https://docs.python.org/3/", None),
+}
+
+# see http://stackoverflow.com/q/12206334/562769
+numpydoc_show_class_members = False
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ["_templates"]
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = ".rst"
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+# only import and set the theme if we're building docs locally
+if os.environ.get("READTHEDOCS") != "True":
+    import sphinx_rtd_theme
+
+    html_theme = "sphinx_rtd_theme"
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+else:
+    html_theme = "default"
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+# html_static_path = ['_static']
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = "partituradoc"

{partitura-1.6.0 → partitura-1.8.0}/partitura/__init__.py

@@ -6,7 +6,9 @@ data, display rendered scores, and functions to estimate pitch
 spelling, voice assignment, and key signature.
 """
 
-import pkg_resources
+import sys
+from importlib.metadata import version
+from importlib.resources import files
 
 from .io import load_score, load_performance, load_score_as_part, lp
 from .io.musescore import load_via_musescore
@@ -29,18 +31,15 @@ from .display import render
 from . import musicanalysis
 from .musicanalysis import make_note_features, compute_note_array, full_note_array
 
-
 # define a version variable
-__version__ = pkg_resources.get_distribution("partitura").version
+__version__ = version("partitura")
 
 #: An example MusicXML file for didactic purposes
-EXAMPLE_MUSICXML = pkg_resources.resource_filename(
-    "partitura", "assets/score_example.musicxml"
-)
+EXAMPLE_MUSICXML = str(files("partitura") / "assets" / "score_example.musicxml")
 
-EXAMPLE_MIDI = pkg_resources.resource_filename("partitura", "assets/score_example.mid")
-EXAMPLE_MEI = pkg_resources.resource_filename("partitura", "assets/score_example.mei")
-EXAMPLE_KERN = pkg_resources.resource_filename("partitura", "assets/score_example.krn")
+EXAMPLE_MIDI = str(files("partitura") / "assets" / "score_example.mid")
+EXAMPLE_MEI = str(files("partitura") / "assets" / "score_example.mei")
+EXAMPLE_KERN = str(files("partitura") / "assets" / "score_example.krn")
 
 __all__ = [
     "load_score",

{partitura-1.6.0 → partitura-1.8.0}/partitura/assets/score_example.musicxml

@@ -13,6 +13,9 @@
     <measure number="1">
       <attributes>
         <divisions>12</divisions>
+        <key>
+           <fifths>0</fifths>
+        </key>
         <time>
           <beats>4</beats>
           <beat-type>4</beat-type>

{partitura-1.6.0 → partitura-1.8.0}/partitura/directions.py

@@ -327,6 +327,12 @@ def regularize_form(children):
     return " ".join(unabbreviate(ch.lower()) for ch in children)
 
 
+def check_tree(tree, col_name="column"):
+    meta = getattr(tree, "meta", None)
+    col = getattr(meta, col_name, None)
+    return col
+
+
 def create_directions(tree, string, start=None, end=None):
     """
     Recursively walk the parse tree of `string` to create a `score.Direction`
@@ -334,9 +340,13 @@ def create_directions(tree, string, start=None, end=None):
 
     """
     if start is None:
-        start = tree.column - 1
+        col = check_tree(tree, "column")
+        if col is not None:
+            start = col - 1
     if end is None:
-        end = tree.end_column - 1
+        col = check_tree(tree, "end_column")
+        if col is not None:
+            end = col - 1
 
     if tree.data == "conj":
         return create_directions(tree.children[0], string) + create_directions(

{partitura-1.6.0 → partitura-1.8.0}/partitura/display.py

@@ -20,7 +20,6 @@ from partitura.score import ScoreLike
 
 from partitura.utils.misc import PathLike, deprecated_alias
 
-
 __all__ = ["render"]
 
 # def ly_install_msg():
@@ -117,9 +116,10 @@ def render_lilypond(
 
     prvw_sfx = ".preview.{}".format(fmt)
 
-    with TemporaryFile() as xml_fh, NamedTemporaryFile(
-        suffix=prvw_sfx, delete=False
-    ) as img_fh:
+    with (
+        TemporaryFile() as xml_fh,
+        NamedTemporaryFile(suffix=prvw_sfx, delete=False) as img_fh,
+    ):
         # save part to musicxml in file handle xml_fh
         save_musicxml(score_data, xml_fh)
         # rewind read pointer of file handle before we pass it to musicxml2ly

{partitura-1.6.0 → partitura-1.8.0}/partitura/io/__init__.py

@@ -3,6 +3,7 @@
 """
 This module contains methods for importing and exporting symbolic music formats.
 """
+
 from typing import Union
 import os
 import urllib.request

{partitura-1.6.0 → partitura-1.8.0}/partitura/io/exportaudio.py

@@ -3,6 +3,7 @@
 """
 This module contains methods to synthesize a Partitura ScoreLike object to wav.
 """
+
 from typing import Union, Optional, Callable, Dict, Any
 import numpy as np
 from scipy.io import wavfile

{partitura-1.6.0 → partitura-1.8.0}/partitura/io/exportkern.py

@@ -3,8 +3,10 @@
 """
 This module contains methods for exporting Kern files.
 """
+
 import math
 from collections import defaultdict
+from importlib.metadata import version
 
 import numpy
 
@@ -19,6 +21,9 @@ from partitura.utils.misc import deprecated_alias, PathLike
 __all__ = ["save_kern"]
 
 
+VERSION = version("partitura")
+
+
 ACC_TO_SIGN = {
     0: "n",
     -1: "-",
@@ -327,7 +332,7 @@ def save_kern(
     out_data = exporter.parse()
     out_data = exporter.trim(out_data)
     # Use numpy savetxt to save the file
-    footer = "Encoded using the Partitura Python package, version 1.6.0"
+    footer = f"Encoded using the Partitura Python package, version {VERSION}"
     if out is not None:
         np.savetxt(
             fname=out,

{partitura-1.6.0 → partitura-1.8.0}/partitura/io/exportmatch.py

@@ -7,6 +7,7 @@ Notes
 -----
 * The methods only export matchfiles version 1.0.0.
 """
+
 import numpy as np
 
 from typing import List, Optional, Iterable
@@ -70,7 +71,7 @@ def matchfile_from_alignment(
     piece: Optional[str] = None,
     score_filename: Optional[PathLike] = None,
     performance_filename: Optional[PathLike] = None,
-    assume_part_unfolded: bool = False,
+    assume_part_unfolded: bool = True,
     tempo_indication: Optional[str] = None,
     diff_score_version_notes: Optional[list] = None,
     version: Version = LATEST_VERSION,
@@ -107,7 +108,7 @@ def matchfile_from_alignment(
         Whether to assume that the part has been unfolded according to the
         repetitions in the alignment. If False, the part will be automatically
         unfolded to have maximal coverage of the notes in the alignment.
-        See `partitura.score.unfold_part_alignment`.
+        See `partitura.score.unfold_part_alignment`, defaults to True.
     tempo_indication : str or None
         The tempo direction indicated in the beginning of the score
     diff_score_version_notes : list or None
@@ -210,18 +211,28 @@ def matchfile_from_alignment(
     # Info for sorting lines
     snote_sort_info = dict()
     for (mnum, msd, msb), m in zip(measure_starts, measures):
+        if mnum == 0:
+            # handle offsets in anacrusis measure
+            ts_num, ts_den, _ = spart.time_signature_map(0)
+            dpq = int(spart.quarter_duration_map(0))
+            measure_dur_in_divs = m.end.t - m.start.t
+            expected_measure_dur = ts_num * 4 / ts_den * dpq
+            if measure_dur_in_divs < expected_measure_dur:
+                msd -= expected_measure_dur - measure_dur_in_divs
+                msb -= (expected_measure_dur - measure_dur_in_divs) / dpq * ts_den / 4
+
         time_signatures = spart.iter_all(score.TimeSignature, m.start, m.end)
 
         for tsig in time_signatures:
             time_divs = int(tsig.start.t)
             time_beats = float(beat_map(time_divs))
+            ts_num, ts_den, _ = spart.time_signature_map(tsig.start.t)
             dpq = int(spart.quarter_duration_map(time_divs))
+            divs_per_beat = 4 / ts_den * dpq
             beat = int((time_beats - msb) // 1)
 
-            ts_num, ts_den, _ = spart.time_signature_map(tsig.start.t)
-
             moffset_divs = Fraction(
-                int(time_divs - msd - beat * dpq), (int(ts_den) * dpq)
+                int(time_divs - msd - beat * divs_per_beat), int(ts_den * divs_per_beat)
             )
 
             scoreprop_lines["time_signatures"].append(
@@ -247,15 +258,15 @@ def matchfile_from_alignment(
         key_signatures = spart.iter_all(score.KeySignature, m.start, m.end)
 
         for ksig in key_signatures:
-            time_divs = int(tsig.start.t)
+            time_divs = int(ksig.start.t)
             time_beats = float(beat_map(time_divs))
+            ts_num, ts_den, _ = spart.time_signature_map(ksig.start.t)
             dpq = int(spart.quarter_duration_map(time_divs))
+            divs_per_beat = 4 / ts_den * dpq
             beat = int((time_beats - msb) // 1)
 
-            ts_num, ts_den, _ = spart.time_signature_map(tsig.start.t)
-
             moffset_divs = Fraction(
-                int(time_divs - msd - beat * dpq), (int(ts_den) * dpq)
+                int(time_divs - msd - beat * divs_per_beat), int(ts_den * divs_per_beat)
             )
 
             scoreprop_lines["key_signatures"].append(
@@ -282,27 +293,28 @@ def matchfile_from_alignment(
         snotes = spart.iter_all(score.Note, m.start, m.end, include_subclasses=True)
         # Beginning of each measure
         for snote in snotes:
-            onset_divs, offset_divs = snote.start.t, snote.start.t + snote.duration_tied
+            onset_divs = snote.start.t
+            offset_divs = snote.start.t + snote.duration_tied
             duration_divs = offset_divs - onset_divs
-
+            # beat computations
             onset_beats, offset_beats = beat_map([onset_divs, offset_divs])
-
-            dpq = int(spart.quarter_duration_map(onset_divs))
-
-            beat = int((onset_beats - msb) // 1)
-
+            duration_beats = offset_beats - onset_beats
+            beat = int((onset_beats - msb) // 1)  # beat field of the snote
+            # quarter, div, symbolic computation
             ts_num, ts_den, _ = spart.time_signature_map(snote.start.t)
-
-            duration_symb = Fraction(duration_divs, dpq * 4)
-
-            beat = int((onset_divs - msd) // dpq)
-
-            moffset_divs = Fraction(int(onset_divs - msd - beat * dpq), (dpq * 4))
+            dpq = int(spart.quarter_duration_map(onset_divs))
+            duration_symb = Fraction(
+                duration_divs, dpq * 4
+            )  # compute duration from quarters/divs
+            divs_per_beat = 4 / ts_den * dpq
+            moffset_divs = Fraction(
+                int(onset_divs - msd - beat * divs_per_beat),
+                int(ts_den * divs_per_beat),
+            )
 
             if debug:
-                duration_beats = offset_beats - onset_beats
                 moffset_beat = (onset_beats - msb - beat) / ts_den
-                assert np.isclose(float(duration_symb), duration_beats)
+                assert np.isclose(float(duration_symb), duration_beats / ts_den)
                 assert np.isclose(moffset_beat, float(moffset_divs))
 
             score_attributes_list = []
@@ -508,9 +520,7 @@ def matchfile_from_alignment(
 
     # Concatenate all lines
     all_match_lines += list(note_lines) + pedal_lines
-
     matchfile = MatchFile(lines=all_match_lines)
-
     return matchfile
 
 

{partitura-1.6.0 → partitura-1.8.0}/partitura/io/exportmidi.py

@@ -3,6 +3,7 @@
 """
 This module contains methods for exporting MIDI files
 """
+
 import numpy as np
 
 from collections import defaultdict, OrderedDict
@@ -36,34 +37,34 @@ def map_to_track_channel(note_keys, mode):
         if mode == 0:
             trk = tr_helper.setdefault(p, len(tr_helper))
             ch1 = ch_helper.setdefault(p, {})
-            ch2 = ch1.setdefault(v, len(ch1) + 1)
+            ch2 = ch1.setdefault(v, len(ch1))
             track[(pg, p, v)] = trk
             channel[(pg, p, v)] = ch2
         elif mode == 1:
             trk = tr_helper.setdefault(pg, len(tr_helper))
             ch1 = ch_helper.setdefault(pg, {})
-            ch2 = ch1.setdefault(p, len(ch1) + 1)
+            ch2 = ch1.setdefault(p, len(ch1))
             track[(pg, p, v)] = trk
             channel[(pg, p, v)] = ch2
         elif mode == 2:
             track[(pg, p, v)] = 0
-            ch = ch_helper.setdefault(p, len(ch_helper) + 1)
+            ch = ch_helper.setdefault(p, len(ch_helper))
             channel[(pg, p, v)] = ch
         elif mode == 3:
             trk = tr_helper.setdefault(p, len(tr_helper))
             track[(pg, p, v)] = trk
-            channel[(pg, p, v)] = 1
+            channel[(pg, p, v)] = 0
         elif mode == 4:
             track[(pg, p, v)] = 0
-            channel[(pg, p, v)] = 1
+            channel[(pg, p, v)] = 0
         elif mode == 5:
             trk = tr_helper.setdefault((p, v), len(tr_helper))
             track[(pg, p, v)] = trk
-            channel[(pg, p, v)] = 1
+            channel[(pg, p, v)] = 0
         else:
             raise Exception("unsupported part/voice assign mode {}".format(mode))
 
-    result = dict((k, (track.get(k, 0), channel.get(k, 1))) for k in note_keys)
+    result = dict((k, (track.get(k, 0), channel.get(k, 0))) for k in note_keys)
     # for (pg, p, voice), v in result.items():
     #     pgn = pg.group_name if hasattr(pg, 'group_name') else pg.id
     #     print(pgn, p.id, voice)
@@ -177,7 +178,7 @@ def save_performance_midi(
 
         for c in performed_part.controls:
             track = c.get("track", 0)
-            ch = c.get("channel", 1)
+            ch = c.get("channel", 0)
             t = int(np.round(10**6 * ppq * c["time"] / mpq))
             track_events[track][t].append(
                 Message(
@@ -190,7 +191,7 @@ def save_performance_midi(
 
         for n in performed_part.notes:
             track = n.get("track", 0)
-            ch = n.get("channel", 1)
+            ch = n.get("channel", 0)
             t_on = int(np.round(10**6 * ppq * n["note_on"] / mpq))
             t_off = int(np.round(10**6 * ppq * n["note_off"] / mpq))
             vel = n.get("velocity", default_velocity)
@@ -203,7 +204,7 @@ def save_performance_midi(
 
         for p in performed_part.programs:
             track = p.get("track", 0)
-            ch = p.get("channel", 1)
+            ch = p.get("channel", 0)
             t = int(np.round(10**6 * ppq * p["time"] / mpq))
             track_events[track][t].append(
                 Message("program_change", program=int(p["program"]), channel=ch)
@@ -215,11 +216,11 @@ def save_performance_midi(
                 list(
                     set(
                         [
-                            (c.get("channel", 1), c.get("track", 0))
+                            (c.get("channel", 0), c.get("track", 0))
                             for c in performed_part.controls
                         ]
                         + [
-                            (n.get("channel", 1), n.get("track", 0))
+                            (n.get("channel", 0), n.get("track", 0))
                             for n in performed_part.notes
                         ]
                     )
@@ -395,7 +396,7 @@ def save_score_midi(
 
         def to_ppq(t):
             # convert div times to new ppq
-            return int(ppq * (qm(t) - ftp))
+            return round(ppq * (qm(t) - ftp))
 
         for tp in part.iter_all(score.Tempo):
             tempos[to_ppq(tp.start.t)] = MetaMessage(
@@ -405,6 +406,12 @@ def save_score_midi(
         if not tempos:
             tempos[0] = MetaMessage("set_tempo", tempo=500000)
 
+        # note velocities
+        velocities = []
+        for vp in part.iter_all(score.Dynamic):
+            velocities.append((vp.start.t, round(90 * vp.velocity / 100)))
+        velocities = np.stack(velocities) if velocities else velocities
+
         if anacrusis_behavior == "time_sig_change":
             # Change time signature to match the duration of the measure
             # This ensure the beat and downbeats position are coherent
@@ -486,11 +493,17 @@ def save_score_midi(
             # key is a tuple (part_group, part, voice) that will be
             # converted into a (track, channel) pair.
             key = (pg, part, note.voice)
+            vel = velocity
+            if len(velocities) > 0:
+                vel_idx = (
+                    np.searchsorted(velocities[:, 0], note.start.t, side="right") - 1
+                )
+                vel = int(velocities[vel_idx, 1])
             events[key][to_ppq(note.start.t)].append(
-                Message("note_on", note=note.midi_pitch)
+                Message("note_on", note=note.midi_pitch, velocity=vel)
             )
             events[key][to_ppq(note.start.t + note.duration_tied)].append(
-                Message("note_off", note=note.midi_pitch)
+                Message("note_off", note=note.midi_pitch, velocity=vel)
             )
             event_keys[key] = True