Merge branch 'develop' of https://github.com/CPJKU/partitura into develop

Author: sildater

partitura/directions.py

@@ -327,16 +327,26 @@ 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`
     or `score.Words` instance.
 
     """
     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/io/importdcml.py

@@ -4,6 +4,8 @@
 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,8 +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"] == "string"
-        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()
@@ -205,8 +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"] == "string"
-        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"]])
@@ -241,8 +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"] == "string"
-        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"]])