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

partitura/io/matchfile_base.py

@@ -595,11 +595,9 @@ class BaseSnoteLine(MatchLine):
         matchline: str,
         pos: int = 0,
     ) -> Dict:
-
         match_pattern = cls.pattern.search(matchline, pos)
 
         if match_pattern is not None:
-
             (
                 anchor_str,
                 note_name_str,
@@ -640,7 +638,6 @@ class BaseSnoteLine(MatchLine):
 
 
 class BaseNoteLine(MatchLine):
-
     # All derived classes should include at least
     # these field names
     field_names = (
@@ -683,7 +680,6 @@ class BaseNoteLine(MatchLine):
 
 
 class BaseSnoteNoteLine(MatchLine):
-
     out_pattern = "{SnoteLine}-{NoteLine}"
 
     def __init__(
@@ -692,7 +688,6 @@ class BaseSnoteNoteLine(MatchLine):
         snote: BaseSnoteLine,
         note: BaseNoteLine,
     ) -> None:
-
         super().__init__(version)
 
         self.snote = snote
@@ -714,7 +709,6 @@ class BaseSnoteNoteLine(MatchLine):
         )
 
     def __str__(self) -> str:
-
         """
         Prints the printing the match line
         """
@@ -775,11 +769,9 @@ class BaseSnoteNoteLine(MatchLine):
 
 
 class BaseDeletionLine(MatchLine):
-
     out_pattern = "{SnoteLine}-deletion."
 
     def __init__(self, version: Version, snote: BaseSnoteLine) -> None:
-
         super().__init__(version)
 
         self.snote = snote
@@ -808,7 +800,6 @@ class BaseDeletionLine(MatchLine):
         snote_class: BaseSnoteLine,
         version: Version,
     ) -> Dict:
-
         snote = snote_class.from_matchline(matchline, version=version)
 
         kwargs = dict(
@@ -820,11 +811,9 @@ class BaseDeletionLine(MatchLine):
 
 
 class BaseInsertionLine(MatchLine):
-
     out_pattern = "insertion-{NoteLine}"
 
     def __init__(self, version: Version, note: BaseNoteLine) -> None:
-
         super().__init__(version)
 
         self.note = note
@@ -853,7 +842,6 @@ class BaseInsertionLine(MatchLine):
         note_class: BaseNoteLine,
         version: Version,
     ) -> Dict:
-
         note = note_class.from_matchline(matchline, version=version)
 
         kwargs = dict(
@@ -865,7 +853,6 @@ class BaseInsertionLine(MatchLine):
 
 
 class BaseOrnamentLine(MatchLine):
-
     # These field names and types need to be expanded
     # with the attributes of the note
     field_names = ("Anchor",)
@@ -875,7 +862,6 @@ class BaseOrnamentLine(MatchLine):
     ornament_pattern: re.Pattern = re.compile(r"ornament\((?P<Anchor>[^\)]*)\)-")
 
     def __init__(self, version: Version, anchor: str, note: BaseNoteLine) -> None:
-
         super().__init__(version)
 
         self.note = note
@@ -907,7 +893,6 @@ class BaseOrnamentLine(MatchLine):
         note_class: BaseNoteLine,
         version: Version,
     ) -> Dict:
-
         anchor_pattern = cls.ornament_pattern.search(matchline)
 
         if anchor_pattern is None:
@@ -957,14 +942,12 @@ class BasePedalLine(MatchLine):
         version: Version,
         pos: int = 0,
     ) -> Dict:
-
         kwargs = None
         # pattern = re.compile(cls.base_pattern.format(pedal_type=pedal_type))
 
         match_pattern = cls.pattern.search(matchline, pos=pos)
 
         if match_pattern is not None:
-
             time_str, value_str = match_pattern.groups()
 
             kwargs = dict(
@@ -977,7 +960,6 @@ class BasePedalLine(MatchLine):
 
 
 class BaseSustainPedalLine(BasePedalLine):
-
     pattern = re.compile(r"sustain\((?P<Time>[^,]+),(?P<Value>[^,]+)\)\.")
     out_pattern: str = "sustain({Time},{Value})."
 
@@ -991,7 +973,6 @@ class BaseSustainPedalLine(BasePedalLine):
 
 
 class BaseSoftPedalLine(BasePedalLine):
-
     pattern = re.compile(r"soft\((?P<Time>[^,]+),(?P<Value>[^,]+)\)\.")
     out_pattern: str = "soft({Time},{Value})."
 
@@ -1022,7 +1003,6 @@ class MatchFile(object):
     lines: np.ndarray
 
     def __init__(self, lines: Iterable[MatchLine]) -> None:
-
         # check that all lines have the same version
         same_version = all([line.version == lines[0].version for line in lines])
 
@@ -1187,7 +1167,6 @@ class MatchFile(object):
 
     @property
     def key_sig_lines(self):
-
         ml = [
             line
             for line in self.lines

partitura/io/matchfile_utils.py

@@ -214,7 +214,6 @@ old_string_pat = re.compile(r"'(?P<value>.+)'")
 
 
 def interpret_as_string_old(value: str) -> str:
-
     val = old_string_pat.match(value)
     if val is not None:
         return val.group("value").strip()
@@ -272,7 +271,6 @@ class FractionalSymbolicDuration(object):
         tuple_div: Optional[int] = None,
         add_components: Optional[List[Tuple[int, int, Optional[int]]]] = None,
     ) -> None:
-
         self.numerator = numerator
         self.denominator = denominator
         self.tuple_div = tuple_div
@@ -459,7 +457,6 @@ class FractionalSymbolicDuration(object):
 
     @classmethod
     def from_string(cls, string: str, allow_additions: bool = True):
-
         m = rational_pattern.match(string)
         m2 = double_rational_pattern.match(string)
         m3 = integer_pattern.match(string)
@@ -537,7 +534,6 @@ def format_fractional_rational(value: FractionalSymbolicDuration) -> str:
     """
 
     if value.denominator == 1 and value.tuple_div is None:
-
         out = f"{value.numerator}/1"
 
     else:
@@ -588,14 +584,12 @@ def format_list(value: List[Any]) -> str:
 
 
 def format_accidental(value: Optional[int]) -> str:
-
     alter = "n" if value == 0 else ALTER_SIGNS[value]
 
     return alter
 
 
 def format_accidental_old(value: Optional[int]) -> str:
-
     if value is None:
         return "-"
     else:
@@ -603,7 +597,6 @@ def format_accidental_old(value: Optional[int]) -> str:
 
 
 def format_pnote_id(value: Any) -> str:
-
     pnote_id = f"n{str(value)}" if not str(value).startswith("n") else str(value)
 
     return pnote_id
@@ -684,7 +677,6 @@ class MatchKeySignature(MatchParameter):
         return ks
 
     def __str__(self):
-
         if self.fmt == "v1.0.0":
             ks = fifths_mode_to_key_name(self.fifths, self.mode)
 
@@ -705,7 +697,6 @@ class MatchKeySignature(MatchParameter):
         return ks
 
     def __eq__(self, ks: MatchKeySignature) -> bool:
-
         crit = (
             self.fifths == ks.fifths
             and self.mode == ks.mode
@@ -718,7 +709,6 @@ class MatchKeySignature(MatchParameter):
 
     @classmethod
     def _parse_key_signature(cls, kstr: str) -> MatchKeySignature:
-
         # import pdb
         # pdb.set_trace()
         ksinfo = key_signature_pattern.search(kstr)
@@ -731,7 +721,6 @@ class MatchKeySignature(MatchParameter):
             if len(ksinfo) == 2:
                 fifths2, mode2 = key_name_to_fifths_mode(ksinfo[1].upper())
         else:
-
             fmt = "v0.3.0"
             step1, alter1, mode1, step2, alter2, mode2 = ksinfo.groups()
             mode1_str = "m" if mode1.lower() in ("minor", "min") else ""
@@ -779,7 +768,6 @@ class MatchKeySignature(MatchParameter):
                 return cls(fifths=fifths, mode=mode, fmt="v0.1.0")
 
         if len(content) > 0:
-
             ksigs = [cls._parse_key_signature(ksig) for ksig in content]
 
             ks = ksigs[0]
@@ -838,7 +826,6 @@ class MatchTimeSignature(MatchParameter):
         self.is_list = is_list
 
     def __str__(self):
-
         ts = f"{self.numerator}/{self.denominator}"
         if self.is_list:
             return format_list([ts] + self.other_components)
@@ -846,7 +833,6 @@ class MatchTimeSignature(MatchParameter):
             return ts
 
     def __eq__(self, ts: MatchKeySignature) -> bool:
-
         crit = (
             (self.numerator == ts.numerator)
             and (self.denominator == ts.denominator)
@@ -871,7 +857,6 @@ class MatchTimeSignature(MatchParameter):
 
 
 def interpret_as_time_signature(value: str) -> MatchTimeSignature:
-
     ts = MatchTimeSignature.from_string(value)
     return ts
 
@@ -886,6 +871,35 @@ def format_time_signature_list(value: MatchTimeSignature) -> str:
     return str(value)
 
 
+class MatchTempoIndication(MatchParameter):
+    def __init__(
+        self,
+        value: str,
+        is_list: bool = False,
+    ):
+        super().__init__()
+        self.value = self.from_string(value)[0]
+        self.is_list = is_list
+
+    def __str__(self):
+        return self.value
+
+    @classmethod
+    def from_string(cls, string: str) -> MatchTempoIndication:
+        content = interpret_as_list(string)
+        return content
+
+
+def interpret_as_tempo_indication(value: str) -> MatchTempoIndication:
+    tempo_indication = MatchTempoIndication.from_string(value)
+    return tempo_indication
+
+
+def format_tempo_indication(value: MatchTempoIndication) -> str:
+    value.is_list = False
+    return str(value)
+
+
 ## Miscellaneous utils
 
 
@@ -912,7 +926,6 @@ def to_camel_case(field_name: str) -> str:
     camel_case = f"{parts[0].lower()}"
 
     if len(parts) > 1:
-
         camel_case += "".join([p.title() for p in parts[1:]])
 
     return camel_case
@@ -943,7 +956,6 @@ def get_kwargs_from_matchline(
     match_pattern = pattern.search(matchline, pos=pos)
 
     if match_pattern is not None:
-
         kwargs = dict(
             [
                 (to_snake_case(fn), class_dict[fn][0](match_pattern.group(fn)))

partitura/io/matchlines_v0.py

@@ -208,7 +208,6 @@ class MatchInfo(BaseInfoLine):
         value_type: type,
         format_fun: Callable[Any, str],
     ) -> None:
-
         if version >= Version(1, 0, 0):
             raise ValueError("The version must be < 1.0.0")
 
@@ -294,7 +293,6 @@ META_LINE = {
 
 
 class MatchMeta(MatchLine):
-
     field_names = (
         "Attribute",
         "Value",
@@ -322,7 +320,6 @@ class MatchMeta(MatchLine):
         measure: int,
         time_in_beats: float,
     ) -> None:
-
         if version >= Version(1, 0, 0):
             raise ValueError("The version must be < 1.0.0")
 
@@ -382,7 +379,6 @@ class MatchMeta(MatchLine):
         class_dict = META_LINE[version]
 
         if match_pattern is not None:
-
             (
                 attribute,
                 value_str,
@@ -681,7 +677,6 @@ class MatchNote(BaseNoteLine):
         velocity: int,
         **kwargs,
     ) -> None:
-
         if version not in NOTE_LINE:
             raise ValueError(
                 f"Unknown version {version}!. "
@@ -720,7 +715,6 @@ class MatchNote(BaseNoteLine):
         self.AdjOffset = offset
 
         if "adj_offset" in kwargs:
-
             self.AdjOffset = kwargs["adj_offset"]
 
     @property
@@ -734,7 +728,6 @@ class MatchNote(BaseNoteLine):
         pos: int = 0,
         version: Version = LAST_VERSION,
     ) -> MatchNote:
-
         if version >= Version(1, 0, 0):
             raise ValueError(f"{version} >= Version(1, 0, 0)")
 
@@ -760,7 +753,6 @@ class MatchSnoteNote(BaseSnoteNoteLine):
         snote: MatchSnote,
         note: MatchNote,
     ) -> None:
-
         super().__init__(
             version=version,
             snote=snote,
@@ -773,7 +765,6 @@ class MatchSnoteNote(BaseSnoteNoteLine):
         matchline: str,
         version: Version = LAST_VERSION,
     ) -> MatchSnoteNote:
-
         if version >= Version(1, 0, 0):
             raise ValueError(f"{version} >= Version(1, 0, 0)")
 
@@ -789,7 +780,6 @@ class MatchSnoteNote(BaseSnoteNoteLine):
 
 class MatchSnoteDeletion(BaseDeletionLine):
     def __init__(self, version: Version, snote: MatchSnote) -> None:
-
         super().__init__(
             version=version,
             snote=snote,
@@ -801,7 +791,6 @@ class MatchSnoteDeletion(BaseDeletionLine):
         matchline: str,
         version: Version = LAST_VERSION,
     ) -> MatchSnoteDeletion:
-
         if version >= Version(1, 0, 0):
             raise ValueError(f"{version} >= Version(1, 0, 0)")
 
@@ -834,7 +823,6 @@ class MatchSnoteNoPlayedNote(MatchSnoteDeletion):
 
 class MatchInsertionNote(BaseInsertionLine):
     def __init__(self, version: Version, note: MatchNote) -> None:
-
         super().__init__(
             version=version,
             note=note,
@@ -846,7 +834,6 @@ class MatchInsertionNote(BaseInsertionLine):
         matchline: str,
         version: Version = LAST_VERSION,
     ) -> MatchInsertionNote:
-
         if version >= Version(1, 0, 0):
             raise ValueError(f"{version} >= Version(1, 0, 0)")
 
@@ -860,7 +847,6 @@ class MatchInsertionNote(BaseInsertionLine):
 
 
 class MatchHammerBounceNote(MatchInsertionNote):
-
     out_pattern = "hammer_bounce-{NoteLine}"
 
     def __init__(self, version: Version, note: MatchNote) -> None:
@@ -869,7 +855,6 @@ class MatchHammerBounceNote(MatchInsertionNote):
 
 
 class MatchTrailingPlayedNote(MatchInsertionNote):
-
     out_pattern = "trailing_played_note-{NoteLine}"
 
     def __init__(self, version: Version, note: MatchNote) -> None:
@@ -878,7 +863,6 @@ class MatchTrailingPlayedNote(MatchInsertionNote):
 
 
 class MatchTrillNote(BaseOrnamentLine):
-
     out_pattern = "trill({Anchor})-{NoteLine}"
     ornament_pattern: re.Pattern = re.compile(r"trill\((?P<Anchor>[^\)]*)\)-")
 
@@ -900,7 +884,6 @@ class MatchTrillNote(BaseOrnamentLine):
         matchline: str,
         version: Version = LAST_VERSION,
     ) -> MatchTrillNote:
-
         if version >= Version(1, 0, 0):
             raise ValueError(f"{version} >= Version(1, 0, 0)")
 
@@ -924,7 +907,6 @@ class MatchSustainPedal(BaseSustainPedalLine):
         time: int,
         value: int,
     ) -> None:
-
         super().__init__(
             version=version,
             time=time,
@@ -938,7 +920,6 @@ class MatchSustainPedal(BaseSustainPedalLine):
         version: Version = LAST_VERSION,
         pos: int = 0,
     ) -> MatchSustainPedal:
-
         if version >= Version(1, 0, 0):
             raise ValueError(f"{version} less than 1.0.0")
 
@@ -961,7 +942,6 @@ class MatchSoftPedal(BaseSoftPedalLine):
         time: int,
         value: int,
     ) -> None:
-
         super().__init__(
             version=version,
             time=time,
@@ -975,7 +955,6 @@ class MatchSoftPedal(BaseSoftPedalLine):
         version: Version = LAST_VERSION,
         pos: int = 0,
     ) -> MatchSoftPedal:
-
         if version >= Version(1, 0, 0):
             raise ValueError(f"{version} should be less than 1.0.0")
 
@@ -1025,7 +1004,6 @@ def parse_matchline(line: str, version: Version) -> Optional[MatchLine]:
         return parse(MatchMeta)
 
     if line.startswith("snote"):
-
         for mlt in [
             MatchSnoteNote,
             MatchSnoteDeletion,