Don't crash when a score does not have an explicit key or clef set (e.g. Rosegarden...

diff --git a/python/musicxml.py b/python/musicxml.py
index 304b2c62d246a8ee993d97c9a21e090e0e46f817..e7fe77d69977de9fb6606964c3805f192a0a27ea 100644 (file)
--- a/python/musicxml.py
+++ b/python/musicxml.py
@@ -39,10 +39,13 @@ class Xml_node:
             p = p.get_parent ()
         
     def get_typed_children (self, klass):
-       return [c for c in self._children if isinstance(c, klass)]
+        if not klass:
+            return []
+        else:
+            return [c for c in self._children if isinstance(c, klass)]
 
     def get_named_children (self, nm):
-       return self.get_typed_children (class_dict[nm])
+       return self.get_typed_children (class_dict.get (nm))
 
     def get_named_child (self, nm):
        return self.get_maybe_exist_named_child (nm)

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index a82f3dd097bd53ad8d9be2717e3f10ebc8df6d58..4bb3081558032836ceb929f3587f01cce3dfcaf7 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -131,10 +131,10 @@ def musicxml_attributes_to_lily (attrs):
         'key': musicxml_key_to_lily
     }
     for (k, func) in attr_dispatch.items ():
-        childs = attrs.get_named_children (k)
+        children = attrs.get_named_children (k)
 
         ## ugh: you get clefs spread over staves for piano
-        if childs:
+        if children:
             elts.append (func (attrs))
     
     return elts