partitura 1.7.0__tar.gz → 1.8.0__tar.gz

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

@@ -1,18 +1,21 @@
 Metadata-Version: 2.4
 Name: partitura
-Version: 1.7.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,19 +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
+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
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
 
 [//]: # (<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.7.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.7.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.7.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.7.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.7.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.7.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.7.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

{partitura-1.7.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
@@ -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
 

{partitura-1.7.0 → partitura-1.8.0}/partitura/io/exportmusicxml.py

@@ -3,6 +3,7 @@
 """
 This module contains methods for exporting MusicXML files.
 """
+
 import math
 from collections import defaultdict
 from lxml import etree
@@ -777,6 +778,7 @@ def do_directions(part, start, end, counter):
         result.append(elem)
 
     tempos = part.iter_all(score.Tempo, start, end)
+    dynamics = part.iter_all(score.Dynamic, start, end)
     directions = part.iter_all(score.Direction, start, end, include_subclasses=True)
 
     for tempo in tempos:
@@ -791,6 +793,10 @@ def do_directions(part, start, end, counter):
         )
         result.append((tempo.start.t, None, e3))
 
+    for dynamic in dynamics:
+        e3 = etree.Element("sound", dynamics="{}".format(dynamic.velocity))
+        result.append((dynamic.start.t, None, e3))
+
     for direction in directions:
         text = direction.raw_text or direction.text
 
@@ -907,6 +913,9 @@ def do_harmony(part, start, end):
         root_e = etree.SubElement(harmony_e, "root")
         root_step_e = etree.SubElement(root_e, "root-step")
         root_step_e.text = h.root
+        if h.alter != 0:
+            root_alter_e = etree.SubElement(root_e, "root-alter")
+            root_alter_e.text = str(h.alter)
         if h.bass is not None:
             bass_e = etree.SubElement(harmony_e, "bass")
             bass_step_e = etree.SubElement(bass_e, "bass-step")
@@ -1048,6 +1057,22 @@ def save_musicxml(
 
     root = etree.Element("score-partwise")
 
+    # add work metadata
+    if score_data.work_title or score_data.work_number:
+        work_tag = etree.SubElement(root, "work")
+        if score_data.work_title:
+            work_title_tag = etree.SubElement(work_tag, "work_title")
+            work_title_tag.text = str(score_data.work_title)
+        if score_data.work_number:
+            work_number_tag = etree.SubElement(work_tag, "work_number")
+            work_number_tag.text = str(score_data.work_number)
+    if score_data.movement_title:
+        movement_title_tag = etree.SubElement(root, "movement_title")
+        movement_title_tag.text = str(score_data.movement_title)
+    if score_data.movement_number:
+        movement_number_tag = etree.SubElement(root, "movement_number")
+        movement_number_tag.text = str(score_data.movement_number)
+
     partlist_e = etree.SubElement(root, "part-list")
     state = {
         "note_id_counter": {},

{partitura-1.7.0 → partitura-1.8.0}/partitura/io/importdcml.py

@@ -4,6 +4,8 @@ from math import ceil
 import partitura.score as spt
 from partitura.score import process_local_key
 from partitura.utils.music import estimate_symbolic_duration
+from pandas.api.types import is_object_dtype
+from pandas.api.types import is_string_dtype
 
 try:
     import pandas as pd
@@ -19,7 +21,8 @@ def read_note_tsv(note_tsv_path, metadata=None):
         data = data[~data["quarterbeats"].isna()]
     data["quarterbeats"] = (
         data["quarterbeats"].apply(eval)
-        if data.dtypes["quarterbeats"] == str or data.dtypes["quarterbeats"] == object
+        if is_string_dtype(data.dtypes["quarterbeats"])
+        or is_object_dtype(data.dtypes["quarterbeats"])
         else data["quarterbeats"]
     )
     unique_durations = data["duration"].unique()
@@ -204,7 +207,8 @@ def read_measure_tsv(measure_tsv_path, part):
         data = data[~data["quarterbeats"].isna()]
     data["quarterbeats"] = (
         data["quarterbeats"].apply(eval)
-        if data.dtypes["quarterbeats"] == str or data.dtypes["quarterbeats"] == object
+        if is_string_dtype(data.dtypes["quarterbeats"])
+        or is_object_dtype(data.dtypes["quarterbeats"])
         else data["quarterbeats"]
     )
     data["onset_div"] = np.array([int(qd * qdivs) for qd in data["quarterbeats"]])
@@ -239,7 +243,8 @@ def read_harmony_tsv(beat_tsv_path, part):
         data = data[~data["quarterbeats"].isna()]
     data["quarterbeats"] = (
         data["quarterbeats"].apply(eval)
-        if data.dtypes["quarterbeats"] == str or data.dtypes["quarterbeats"] == object
+        if is_string_dtype(data.dtypes["quarterbeats"])
+        or is_object_dtype(data.dtypes["quarterbeats"])
         else data["quarterbeats"]
     )
     data["onset_div"] = np.array([int(qd * qdivs) for qd in data["quarterbeats"]])

{partitura-1.7.0 → partitura-1.8.0}/partitura/io/importmatch.py

@@ -3,6 +3,7 @@
 """
 This module contains methods for parsing matchfiles
 """
+
 import os
 from typing import Union, Tuple, Optional, Callable, List
 import warnings
@@ -516,7 +517,9 @@ def part_from_matchfile(
 
     # ___ these divs are relative to quarters;
     divs = np.lcm.reduce(np.unique(divs_arg))
-    onset_in_divs = np.r_[0, np.cumsum(divs * iois_in_quarters, dtype=int)][inv_idxs]
+    onset_in_divs = np.r_[0, np.cumsum(np.round(divs * iois_in_quarters), dtype=int)][
+        inv_idxs
+    ]
     onset_in_quarters = onset_in_quarters[inv_idxs]
 
     part.set_quarter_duration(0, divs)

{partitura-1.7.0 → partitura-1.8.0}/partitura/io/importmei.py

@@ -3,6 +3,7 @@
 """
 This module contains methods for importing MEI files.
 """
+
 import os
 from collections import OrderedDict
 from lxml import etree

{partitura-1.7.0 → partitura-1.8.0}/partitura/io/importmidi.py

@@ -3,6 +3,7 @@
 """
 This module contains methods for importing MIDI files.
 """
+
 import warnings
 
 from collections import defaultdict