+# -*- coding: utf-8 -*-
import new
import string
from rational import *
import re
import sys
+import copy
def escape_ly_output_string (input_string):
return_string = input_string
- needs_quotes = not re.match ("^[a-zA-ZäöüÜÄÖßñ]*$", return_string);
+ needs_quotes = not re.match (u"^[a-zA-ZäöüÜÄÖßñ]*$", return_string);
if needs_quotes:
return_string = "\"" + string.replace (return_string, "\"", "\\\"") + "\""
return return_string
return ''.join ([c.get_text () for c in self._children])
def message (self, msg):
- sys.stderr.write (msg)
+ sys.stderr.write (msg+'\n')
p = self
while p:
- sys.stderr.write (' In: <%s %s>' % (p._name, ' '.join (['%s=%s' % item for item in p._attribute_dict.items()])))
+ sys.stderr.write (' In: <%s %s>\n' % (p._name, ' '.join (['%s=%s' % item for item in p._attribute_dict.items()])))
p = p.get_parent ()
def get_typed_children (self, klass):
def get_unique_typed_child (self, klass):
cn = self.get_typed_children(klass)
if len (cn) <> 1:
- sys.stderr.write (self.__dict__)
+ sys.stderr.write (self.__dict__ + '\n')
raise 'Child is not unique for', (klass, 'found', cn)
return cn[0]
for i in creators:
if hasattr (i, 'type') and i.type == type:
return i.get_text ()
- else:
- return ''
+ return None
def get_composer (self):
c = self.get_creator ('composer')
for i in creators:
if not hasattr (i, 'type'):
return i.get_text ()
- return c
+ return None
def get_arranger (self):
return self.get_creator ('arranger')
def get_editor (self):
return self.get_creator ('editor')
def get_poet (self):
- return self.get_creator ('poet')
+ v = self.get_creator ('lyricist')
+ if v:
+ return v
+ v = self.get_creator ('poet')
+ return v
def get_encoding_information (self, type):
enc = self.get_named_children ('encoding')
if children:
return children[0].get_text ()
else:
- return ''
+ return None
def get_encoding_software (self):
return self.get_encoding_information ('software')
else:
return (4, 4)
except KeyError:
- sys.stderr.write ('error: requested time signature, but time sig unknown')
+ sys.stderr.write ('error: requested time signature, but time sig unknown\n')
return (4, 4)
# returns clef information in the form ("cleftype", position, octave-shift)
self.instrument_name = ''
def get_duration_log (self):
- ch = self.get_maybe_exist_typed_child (get_class (u'type'))
+ ch = self.get_maybe_exist_named_child (u'type')
if ch:
log = ch.get_text ().strip()
'breve': -1,
'long': -2}.get (log, 0)
else:
- sys.stderr.write ("Encountered note without duration (no <type> element): %s\n" % self)
+ self.message ("Encountered note at %s without %s duration (no <type> element):" % (self.start, self.duration) )
return 0
def get_factor (self):
if instrument_name:
return instrument_name
else:
- sys.stderr.write ("Opps, couldn't find instrument for ID=%s" % id)
+ sys.stderr.write ("Opps, couldn't find instrument for ID=%s\n" % id)
return "Grand Piano"
+
+class Part_group (Music_xml_node):
+ pass
+class Score_part (Music_xml_node):
+ pass
class Measure (Music_xml_node):
def get_notes (self):
and e.get_maybe_exist_typed_child (Staff)):
name = e.get_maybe_exist_typed_child (Staff).get_text ()
- if not self._start_staff:
+ if not self._start_staff and not e.get_maybe_exist_typed_child (Grace):
self._start_staff = name
self._staves[name] = True
now = new_now
+ # modify attributes so that only those applying to the given staff remain
+ def extract_attributes_for_staff (part, attr, staff):
+ attributes = copy.copy (attr)
+ attributes._children = copy.copy (attr._children)
+ attributes._dict = attr._dict.copy ()
+ for c in attributes._children:
+ if hasattr (c, 'number') and c.number != staff:
+ attributes._children.remove (c)
+ return attributes
+
def extract_voices (part):
voices = {}
measures = part.get_typed_children (Measure)
elements = []
for m in measures:
elements.extend (m.get_all_children ())
+ # make sure we know all voices already so that dynamics, clefs, etc.
+ # can be assigned to the correct voices
+ voice_to_staff_dict = {}
+ for n in elements:
+ voice_id = n.get_maybe_exist_named_child (u'voice')
+ vid = None
+ if voice_id:
+ vid = voice_id.get_text ()
+
+ staff_id = n.get_maybe_exist_named_child (u'staff')
+ sid = None
+ if staff_id:
+ sid = staff_id.get_text ()
+ else:
+ sid = "None"
+ if vid and not voices.has_key (vid):
+ voices[vid] = Musicxml_voice()
+ if vid and sid and not n.get_maybe_exist_typed_child (Grace):
+ if not voice_to_staff_dict.has_key (vid):
+ voice_to_staff_dict[vid] = sid
+ # invert the voice_to_staff_dict into a staff_to_voice_dict (since we
+ # need to assign staff-assigned objects like clefs, times, etc. to
+ # all the correct voices. This will never work entirely correct due
+ # to staff-switches, but that's the best we can do!
+ staff_to_voice_dict = {}
+ for (v,s) in voice_to_staff_dict.items ():
+ if not staff_to_voice_dict.has_key (s):
+ staff_to_voice_dict[s] = [v]
+ else:
+ staff_to_voice_dict[s].append (v)
+
start_attr = None
for n in elements:
voice_id = n.get_maybe_exist_typed_child (get_class ('voice'))
- # TODO: If the first element of a voice is a dynamics entry,
- # then voice_id is not yet set! Thus it will currently be ignored
if not (voice_id or isinstance (n, Attributes) or isinstance (n, Direction) ):
continue
start_attr = n
continue
- if isinstance (n, Attributes) or isinstance (n, Direction):
- for v in voices.values ():
- v.add_element (n)
- continue
+ if isinstance (n, Attributes):
+ # assign these only to the voices they really belongs to!
+ for (s, vids) in staff_to_voice_dict.items ():
+ staff_attributes = part.extract_attributes_for_staff (n, s)
+ for v in vids:
+ voices[v].add_element (staff_attributes)
+ continue
+
+ if isinstance (n, Direction):
+ staff_id = n.get_maybe_exist_named_child (u'staff')
+ if staff_id:
+ staff_id = staff_id.get_text ()
+ if staff_id:
+ dir_voices = staff_to_voice_dict.get (staff_id, voices.keys ())
+ else:
+ dir_voices = voices.keys ()
+ for v in dir_voices:
+ voices[v].add_element (n)
+ continue
id = voice_id.get_text ()
- if not voices.has_key (id):
- voices[id] = Musicxml_voice()
-
- voices[id].add_element (n)
+ if hasattr (n, 'print-object') and getattr (n, 'print-object') == "no":
+ #Skip this note.
+ pass
+ else:
+ voices[id].add_element (n)
if start_attr:
- for (k,v) in voices.items ():
- v.insert (0, start_attr)
+ for (s, vids) in staff_to_voice_dict.items ():
+ staff_attributes = part.extract_attributes_for_staff (start_attr, s)
+ staff_attributes.read_self ()
+ for v in vids:
+ voices[v].insert (0, staff_attributes)
+ voices[v]._elements[0].read_self()
- part._voices = voices
+ part._voices = voices
def get_voices (self):
return self._voices
'note': Note,
'octave-shift': Octave_shift,
'part': Part,
+ 'part-group': Part_group,
'part-list': Part_list,
'pedal': Pedal,
'pitch': Pitch,
'rest': Rest,
+ 'score-part': Score_part,
'slur': Slur,
'staff': Staff,
'syllabic': Syllabic,
projects / lilypond.git / blobdiff