]> git.donarmstrong.com Git - lilypond.git/blobdiff - scripts/musicxml2ly.py
MusicXML: Improvements / Fixes for articulations
[lilypond.git] / scripts / musicxml2ly.py
index 390a855727190e436a5cb5d65d943fcfb4e92646..9b99d3abd0897182f3a608ba6261fe8e10041465 100644 (file)
-#!@PYTHON@
+#!@TARGET_PYTHON@
 
 import optparse
 import sys
 import re
 import os
 import string
+import codecs
 from gettext import gettext as _
 
-datadir = '@local_lilypond_datadir@'
-if not os.path.isdir (datadir):
-       datadir = '@lilypond_datadir@'
-if os.environ.has_key ('LILYPONDPREFIX'):
-       datadir = os.environ['LILYPONDPREFIX']
-       while datadir[-1] == os.sep:
-               datadir = datadir[:-1]
-
-if os.path.exists (os.path.join (datadir, 'share/lilypond/@TOPLEVEL_VERSION@/')):
-       datadir = os.path.join (datadir, 'share/lilypond/@TOPLEVEL_VERSION@/')
-elif os.path.exists (os.path.join (datadir, 'share/lilypond/current/')):
-       datadir = os.path.join (datadir, 'share/lilypond/current/')
-
-sys.path.insert (0, os.path.join (datadir, 'python'))
+"""
+@relocate-preamble@
+"""
 
+import lilylib as ly
 
 import musicxml
 import musicexp
+
 from rational import Rational
 
 
 def progress (str):
-       sys.stderr.write (str + '\n')
-       sys.stderr.flush ()
-       
+    sys.stderr.write (str + '\n')
+    sys.stderr.flush ()
+
+def error_message (str):
+    sys.stderr.write (str + '\n')
+    sys.stderr.flush ()
+
+# score information is contained in the <work>, <identification> or <movement-title> tags
+# extract those into a hash, indexed by proper lilypond header attributes
+def extract_score_information (tree):
+    header = musicexp.Header ()
+    def set_if_exists (field, value):
+        if value:
+            header.set_field (field, musicxml.escape_ly_output_string (value))
+
+    work = tree.get_maybe_exist_named_child ('work')
+    if work:
+        set_if_exists ('title', work.get_work_title ())
+        set_if_exists ('worknumber', work.get_work_number ())
+        set_if_exists ('opus', work.get_opus ())
+    else:
+        movement_title = tree.get_maybe_exist_named_child ('movement-title')
+        if movement_title:
+            set_if_exists ('title', movement_title.get_text ())
+    
+    identifications = tree.get_named_children ('identification')
+    for ids in identifications:
+        set_if_exists ('copyright', ids.get_rights ())
+        set_if_exists ('composer', ids.get_composer ())
+        set_if_exists ('arranger', ids.get_arranger ())
+        set_if_exists ('editor', ids.get_editor ())
+        set_if_exists ('poet', ids.get_poet ())
+            
+        set_if_exists ('tagline', ids.get_encoding_software ())
+        set_if_exists ('encodingsoftware', ids.get_encoding_software ())
+        set_if_exists ('encodingdate', ids.get_encoding_date ())
+        set_if_exists ('encoder', ids.get_encoding_person ())
+        set_if_exists ('encodingdescription', ids.get_encoding_description ())
+
+    return header
+
+class PartGroupInfo:
+    def __init__ (self):
+        self.start = {}
+        self.end = {}
+    def is_empty (self):
+        return len (self.start) + len (self.end) == 0
+    def add_start (self, g):
+        self.start[getattr (g, 'number', "1")] = g
+    def add_end (self, g):
+        self.end[getattr (g, 'number', "1")] = g
+    def print_ly (self, printer):
+        error_message ("Unprocessed PartGroupInfo %s encountered" % self)
+    def ly_expression (self):
+        error_message ("Unprocessed PartGroupInfo %s encountered" % self)
+        return ''
+
+
+def extract_score_layout (part_list):
+    layout = musicexp.StaffGroup (None)
+    if not part_list:
+        return layout
+
+    def read_score_part (el):
+        if not isinstance (el, musicxml.Score_part):
+            return
+        staff = musicexp.Staff ()
+        staff.id = el.id
+        partname = el.get_maybe_exist_named_child ('part-name')
+        # Finale gives unnamed parts the name "MusicXML Part" automatically!
+        if partname and partname.get_text() != "MusicXML Part":
+            staff.instrument_name = partname.get_text ()
+        if el.get_maybe_exist_named_child ('part-abbreviation'):
+            staff.short_instrument_name = el.get_maybe_exist_named_child ('part-abbreviation').get_text ()
+        # TODO: Read in the MIDI device / instrument
+        return staff
+
+    def read_score_group (el):
+        if not isinstance (el, musicxml.Part_group):
+            return
+        group = musicexp.StaffGroup ()
+        if hasattr (el, 'number'):
+            id = el.number
+            group.id = id
+            #currentgroups_dict[id] = group
+            #currentgroups.append (id)
+        if el.get_maybe_exist_named_child ('group-name'):
+            group.instrument_name = el.get_maybe_exist_named_child ('group-name').get_text ()
+        if el.get_maybe_exist_named_child ('group-abbreviation'):
+            group.short_instrument_name = el.get_maybe_exist_named_child ('group-abbreviation').get_text ()
+        if el.get_maybe_exist_named_child ('group-symbol'):
+            group.symbol = el.get_maybe_exist_named_child ('group-symbol').get_text ()
+        if el.get_maybe_exist_named_child ('group-barline'):
+            group.spanbar = el.get_maybe_exist_named_child ('group-barline').get_text ()
+        return group
+
+
+    parts_groups = part_list.get_all_children ()
+
+    # the start/end group tags are not necessarily ordered correctly and groups
+    # might even overlap, so we can't go through the children sequentially!
+
+    # 1) Replace all Score_part objects by their corresponding Staff objects,
+    #    also collect all group start/stop points into one PartGroupInfo object
+    staves = []
+    group_info = PartGroupInfo ()
+    for el in parts_groups:
+        if isinstance (el, musicxml.Score_part):
+            if not group_info.is_empty ():
+                staves.append (group_info)
+                group_info = PartGroupInfo ()
+            staves.append (read_score_part (el))
+        elif isinstance (el, musicxml.Part_group):
+            if el.type == "start":
+                group_info.add_start (el)
+            elif el.type == "stop":
+                group_info.add_end (el)
+    if not group_info.is_empty ():
+        staves.append (group_info)
+
+    # 2) Now, detect the groups:
+    group_starts = []
+    pos = 0
+    while pos < len (staves):
+        el = staves[pos]
+        if isinstance (el, PartGroupInfo):
+            prev_start = 0
+            if len (group_starts) > 0:
+                prev_start = group_starts[-1]
+            elif len (el.end) > 0: # no group to end here
+                el.end = {}
+            if len (el.end) > 0: # closes an existing group
+                ends = el.end.keys ()
+                prev_started = staves[prev_start].start.keys ()
+                grpid = None
+                intersection = filter(lambda x:x in ends, prev_started)
+                if len (intersection) > 0:
+                    grpid = intersection[0]
+                else:
+                    # Close the last started group
+                    grpid = staves[prev_start].start.keys () [0]
+                    # Find the corresponding closing tag and remove it!
+                    j = pos + 1
+                    foundclosing = False
+                    while j < len (staves) and not foundclosing:
+                        if isinstance (staves[j], PartGroupInfo) and staves[j].end.has_key (grpid):
+                            foundclosing = True
+                            del staves[j].end[grpid]
+                            if staves[j].is_empty ():
+                                del staves[j]
+                        j += 1
+                grpobj = staves[prev_start].start[grpid]
+                group = read_score_group (grpobj)
+                # remove the id from both the start and end
+                if el.end.has_key (grpid):
+                    del el.end[grpid]
+                del staves[prev_start].start[grpid]
+                if el.is_empty ():
+                    del staves[pos]
+                # replace the staves with the whole group
+                for j in staves[(prev_start + 1):pos]:
+                    if j.is_group:
+                        j.stafftype = "InnerStaffGroup"
+                    group.append_staff (j)
+                del staves[(prev_start + 1):pos]
+                staves.insert (prev_start + 1, group)
+                # reset pos so that we continue at the correct position
+                pos = prev_start
+                # remove an empty start group
+                if staves[prev_start].is_empty ():
+                    del staves[prev_start]
+                    group_starts.remove (prev_start)
+                    pos -= 1
+            elif len (el.start) > 0: # starts new part groups
+                group_starts.append (pos)
+        pos += 1
+
+    if len (staves) == 1:
+        return staves[0]
+    for i in staves:
+        layout.append_staff (i)
+    return layout
+
+
 
 def musicxml_duration_to_lily (mxl_note):
-       d = musicexp.Duration ()
-       if mxl_note.get_maybe_exist_typed_child (musicxml.Type):
-               d.duration_log = mxl_note.get_duration_log ()
-       else:
-               d.duration_log = 0
+    d = musicexp.Duration ()
+    # if the note has no Type child, then that method spits out a warning and 
+    # returns 0, i.e. a whole note
+    d.duration_log = mxl_note.get_duration_log ()
+
+    d.dots = len (mxl_note.get_typed_children (musicxml.Dot))
+    # Grace notes by specification have duration 0, so no time modification 
+    # factor is possible. It even messes up the output with *0/1
+    if not mxl_note.get_maybe_exist_typed_child (musicxml.Grace):
+        d.factor = mxl_note._duration / d.get_length ()
+
+    return d
+
+def rational_to_lily_duration (rational_len):
+    d = musicexp.Duration ()
+    d.duration_log = {1: 0, 2: 1, 4:2, 8:3, 16:4, 32:5, 64:6, 128:7, 256:8, 512:9}.get (rational_len.denominator (), -1)
+    d.factor = Rational (rational_len.numerator ())
+    if d.duration_log < 0:
+        error_message ("Encountered rational duration with denominator %s, "
+                       "unable to convert to lilypond duration" %
+                       rational_len.denominator ())
+        # TODO: Test the above error message
+        return None
+    else:
+        return d
+
+def musicxml_partial_to_lily (partial_len):
+    if partial_len > 0:
+        p = musicexp.Partial ()
+        p.partial = rational_to_lily_duration (partial_len)
+        return p
+    else:
+        return Null
+
+# Detect repeats and alternative endings in the chord event list (music_list)
+# and convert them to the corresponding musicexp objects, containing nested
+# music
+def group_repeats (music_list):
+    repeat_replaced = True
+    music_start = 0
+    i = 0
+    # Walk through the list of expressions, looking for repeat structure
+    # (repeat start/end, corresponding endings). If we find one, try to find the
+    # last event of the repeat, replace the whole structure and start over again.
+    # For nested repeats, as soon as we encounter another starting repeat bar,
+    # treat that one first, and start over for the outer repeat.
+    while repeat_replaced and i < 100:
+        i += 1
+        repeat_start = -1  # position of repeat start / end
+        repeat_end = -1 # position of repeat start / end
+        repeat_times = 0
+        ending_start = -1 # position of current ending start
+        endings = [] # list of already finished endings
+        pos = 0
+        last = len (music_list) - 1
+        repeat_replaced = False
+        final_marker = 0
+        while pos < len (music_list) and not repeat_replaced:
+            e = music_list[pos]
+            repeat_finished = False
+            if isinstance (e, RepeatMarker):
+                if not repeat_times and e.times:
+                    repeat_times = e.times
+                if e.direction == -1:
+                    if repeat_end >= 0:
+                        repeat_finished = True
+                    else:
+                        repeat_start = pos
+                        repeat_end = -1
+                        ending_start = -1
+                        endings = []
+                elif e.direction == 1:
+                    if repeat_start < 0:
+                        repeat_start = 0
+                    if repeat_end < 0:
+                        repeat_end = pos
+                    final_marker = pos
+            elif isinstance (e, EndingMarker):
+                if e.direction == -1:
+                    if repeat_start < 0:
+                        repeat_start = 0
+                    if repeat_end < 0:
+                        repeat_end = pos
+                    ending_start = pos
+                elif e.direction == 1:
+                    if ending_start < 0:
+                        ending_start = 0
+                    endings.append ([ending_start, pos])
+                    ending_start = -1
+                    final_marker = pos
+            elif not isinstance (e, musicexp.BarLine):
+                # As soon as we encounter an element when repeat start and end
+                # is set and we are not inside an alternative ending,
+                # this whole repeat structure is finished => replace it
+                if repeat_start >= 0 and repeat_end > 0 and ending_start < 0:
+                    repeat_finished = True
+
+            # Finish off all repeats without explicit ending bar (e.g. when
+            # we convert only one page of a multi-page score with repeats)
+            if pos == last and repeat_start >= 0:
+                repeat_finished = True
+                final_marker = pos
+                if repeat_end < 0:
+                    repeat_end = pos
+                if ending_start >= 0:
+                    endings.append ([ending_start, pos])
+                    ending_start = -1
+
+            if repeat_finished:
+                # We found the whole structure replace it!
+                r = musicexp.RepeatedMusic ()
+                if repeat_times <= 0:
+                    repeat_times = 2
+                r.repeat_count = repeat_times
+                # don't erase the first element for "implicit" repeats (i.e. no
+                # starting repeat bars at the very beginning)
+                start = repeat_start+1
+                if repeat_start == music_start:
+                    start = music_start
+                r.set_music (music_list[start:repeat_end])
+                for (start, end) in endings:
+                    s = musicexp.SequentialMusic ()
+                    s.elements = music_list[start+1:end]
+                    r.add_ending (s)
+                del music_list[repeat_start:final_marker+1]
+                music_list.insert (repeat_start, r)
+                repeat_replaced = True
+            pos += 1
+        # TODO: Implement repeats until the end without explicit ending bar
+    return music_list
 
-       d.dots = len (mxl_note.get_typed_children (musicxml.Dot))
-       d.factor = mxl_note._duration / d.get_length ()
 
-       return d        
 
 def group_tuplets (music_list, events):
 
 
-       """Collect Musics from
-       MUSIC_LIST demarcated by EVENTS_LIST in TimeScaledMusic objects.
-       """
-
-       
-       indices = []
-
-       j = 0
-       for (ev_chord, tuplet_elt, fraction) in events:
-               while (j < len (music_list)):
-                       if music_list[j]== ev_chord:
-                               break
-                       j += 1
-               if tuplet_elt.type == 'start':
-                       indices.append ((j, None, fraction))
-               elif tuplet_elt.type == 'stop':
-                       indices[-1] = (indices[-1][0], j, indices[-1][2])
-
-       new_list = []
-       last = 0
-       for (i1, i2, frac) in indices:
-               if i1 >= i2:
-                       continue
-
-               new_list.extend (music_list[last:i1])
-               seq = musicexp.SequentialMusic ()
-               last = i2 + 1
-               seq.elements = music_list[i1:last]
-
-               tsm = musicexp.TimeScaledMusic ()
-               tsm.element = seq
-
-               tsm.numerator = frac[0]
-               tsm.denominator  = frac[1]
-
-               new_list.append (tsm)
-
-       new_list.extend (music_list[last:])
-       return new_list
-
-
-def musicxml_clef_to_lily (mxl):
-       sign = mxl.get_maybe_exist_named_child ('sign')
-       change = musicexp.ClefChange ()
-       if sign:
-               change.type = sign.get_text ()
-       return change
-
-       
-def musicxml_time_to_lily (mxl):
-       beats = mxl.get_maybe_exist_named_child ('beats')
-       type = mxl.get_maybe_exist_named_child ('beat-type')
-       change = musicexp.TimeSignatureChange()
-       change.fraction = (string.atoi(beats.get_text ()),
-                          string.atoi(type.get_text ()))
-       
-       return change
-
-def musicxml_key_to_lily (mxl):
-       start_pitch  = musicexp.Pitch ()
-       try:
-               mode = mxl.get_maybe_exist_named_child ('mode')
-               if mode:
-                       mode = mode.get_text ()
-               else:
-                       mode = 'major'
-                       
-               (n,a) = { 'major' : (0,0),
-                         'minor' : (6,0),
-                       }[mode]
-               start_pitch.step = n
-               start_pitch.alteration = a
-       except  KeyError:
-               print 'unknown mode', mode
-               
-       fifths = string.atoi (mxl.get_maybe_exist_named_child ('fifths').get_text ())
-
-       fifth = musicexp.Pitch()
-       fifth.step = 4
-       if fifths < 0:
-               fifths *= -1
-               fifth.step *= -1
-               fifth.normalize ()
-       
-       start_pitch = musicexp.Pitch()
-       for x in range (fifths):
-               start_pitch = start_pitch.transposed (fifth)
-
-       start_pitch.octave = 0
-
-       change = musicexp.KeySignatureChange()
-       change.mode = mode
-       change.tonic = start_pitch
-       return change
-       
+    """Collect Musics from
+    MUSIC_LIST demarcated by EVENTS_LIST in TimeScaledMusic objects.
+    """
+
+    
+    indices = []
+
+    j = 0
+    for (ev_chord, tuplet_elt, fraction) in events:
+        while (j < len (music_list)):
+            if music_list[j] == ev_chord:
+                break
+            j += 1
+        if tuplet_elt.type == 'start':
+            indices.append ((j, None, fraction))
+        elif tuplet_elt.type == 'stop':
+            indices[-1] = (indices[-1][0], j, indices[-1][2])
+
+    new_list = []
+    last = 0
+    for (i1, i2, frac) in indices:
+        if i1 >= i2:
+            continue
+
+        new_list.extend (music_list[last:i1])
+        seq = musicexp.SequentialMusic ()
+        last = i2 + 1
+        seq.elements = music_list[i1:last]
+
+        tsm = musicexp.TimeScaledMusic ()
+        tsm.element = seq
+
+        tsm.numerator = frac[0]
+        tsm.denominator  = frac[1]
+
+        new_list.append (tsm)
+
+    new_list.extend (music_list[last:])
+    return new_list
+
+
+def musicxml_clef_to_lily (attributes):
+    change = musicexp.ClefChange ()
+    (change.type, change.position, change.octave) = attributes.get_clef_information ()
+    return change
+    
+def musicxml_time_to_lily (attributes):
+    (beats, type) = attributes.get_time_signature ()
+
+    change = musicexp.TimeSignatureChange()
+    change.fraction = (beats, type)
+    
+    return change
+
+def musicxml_key_to_lily (attributes):
+    start_pitch  = musicexp.Pitch ()
+    (fifths, mode) = attributes.get_key_signature () 
+    try:
+        (n,a) = {
+            'major' : (0,0),
+            'minor' : (5,0),
+            }[mode]
+        start_pitch.step = n
+        start_pitch.alteration = a
+    except  KeyError:
+        error_message ('unknown mode %s' % mode)
+
+    fifth = musicexp.Pitch()
+    fifth.step = 4
+    if fifths < 0:
+        fifths *= -1
+        fifth.step *= -1
+        fifth.normalize ()
+    
+    for x in range (fifths):
+        start_pitch = start_pitch.transposed (fifth)
+
+    start_pitch.octave = 0
+
+    change = musicexp.KeySignatureChange()
+    change.mode = mode
+    change.tonic = start_pitch
+    return change
+    
 def musicxml_attributes_to_lily (attrs):
-       elts = []
-       attr_dispatch =  {
-               'clef': musicxml_clef_to_lily,
-               'time': musicxml_time_to_lily,
-               'key': musicxml_key_to_lily
-       }
-       for (k, func) in attr_dispatch.items ():
-               childs = attrs.get_named_children (k)
-
-               ## ugh: you get clefs spread over staves for piano
-               if childs:
-                       elts.append (func (childs[0]))
-       
-       return elts
-
-def create_skip_music (duration):
-       skip = musicexp.SkipEvent()
-       skip.duration.duration_log = 0
-       skip.duration.factor = duration
-
-       evc = musicexp.EventChord ()
-       evc.append (skip)
-       return evc
+    elts = []
+    attr_dispatch =  {
+        'clef': musicxml_clef_to_lily,
+        'time': musicxml_time_to_lily,
+        'key': musicxml_key_to_lily
+    }
+    for (k, func) in attr_dispatch.items ():
+        children = attrs.get_named_children (k)
+        if children:
+            elts.append (func (attrs))
+    
+    return elts
+
+class Marker (musicexp.Music):
+    def __init__ (self):
+        self.direction = 0
+        self.event = None
+    def print_ly (self, printer):
+        sys.stderr.write ("Encountered unprocessed marker %s\n" % self)
+        pass
+    def ly_expression (self):
+        return ""
+class RepeatMarker (Marker):
+    def __init__ (self):
+        Marker.__init__ (self)
+        self.times = 0
+class EndingMarker (Marker):
+    pass
+
+# Convert the <barline> element to musicxml.BarLine (for non-standard barlines)
+# and to RepeatMarker and EndingMarker objects for repeat and
+# alternatives start/stops
+def musicxml_barline_to_lily (barline):
+    # retval contains all possible markers in the order:
+    # 0..bw_ending, 1..bw_repeat, 2..barline, 3..fw_repeat, 4..fw_ending
+    retval = {}
+    bartype_element = barline.get_maybe_exist_named_child ("bar-style")
+    repeat_element = barline.get_maybe_exist_named_child ("repeat")
+    ending_element = barline.get_maybe_exist_named_child ("ending")
+
+    bartype = None
+    if bartype_element:
+        bartype = bartype_element.get_text ()
+
+    if repeat_element and hasattr (repeat_element, 'direction'):
+        repeat = RepeatMarker ()
+        repeat.direction = {"forward": -1, "backward": 1}.get (repeat_element.direction, 0)
+
+        if ( (repeat_element.direction == "forward" and bartype == "heavy-light") or
+             (repeat_element.direction == "backward" and bartype == "light-heavy") ):
+            bartype = None
+        if hasattr (repeat_element, 'times'):
+            try:
+                repeat.times = int (repeat_element.times)
+            except ValueError:
+                repeat.times = 2
+        repeat.event = barline
+        if repeat.direction == -1:
+            retval[3] = repeat
+        else:
+            retval[1] = repeat
+
+    if ending_element and hasattr (ending_element, 'type'):
+        ending = EndingMarker ()
+        ending.direction = {"start": -1, "stop": 1, "discontinue": 1}.get (ending_element.type, 0)
+        ending.event = barline
+        if ending.direction == -1:
+            retval[4] = ending
+        else:
+            retval[0] = ending
+
+    if bartype:
+        b = musicexp.BarLine ()
+        b.type = bartype
+        retval[2] = b
+
+    return retval.values ()
 
 spanner_event_dict = {
-       'slur' : musicexp.SlurEvent,
-       'beam' : musicexp.BeamEvent,
-}      
+    'slur' : musicexp.SlurEvent,
+    'beam' : musicexp.BeamEvent,
+    'glissando' : musicexp.GlissandoEvent,
+    'pedal' : musicexp.PedalEvent,
+    'wavy-line' : musicexp.TrillSpanEvent,
+    'octave-shift' : musicexp.OctaveShiftEvent,
+    'wedge' : musicexp.HairpinEvent
+}
 spanner_type_dict = {
-       'start': -1,
-       'begin': -1,
-       'stop': 1,
-       'end' : 1
+    'start': -1,
+    'begin': -1,
+    'crescendo': -1,
+    'decreschendo': -1,
+    'diminuendo': -1,
+    'continue': 0,
+    'up': -1,
+    'down': -1,
+    'stop': 1,
+    'end' : 1
 }
 
 def musicxml_spanner_to_lily_event (mxl_event):
-       ev = None
-       
-       name = mxl_event.get_name()
-       try:
-               func = spanner_event_dict[name]
-               ev = func()
-       except KeyError:
-               print 'unknown span event ', mxl_event
-
-       try:
-               key = mxl_event.get_type ()
-               ev.span_direction = spanner_type_dict[key]
-       except KeyError:
-               print 'unknown span type', key, 'for', name
-
-       return ev
+    ev = None
+    
+    name = mxl_event.get_name()
+    func = spanner_event_dict.get (name)
+    if func:
+        ev = func()
+    else:
+        error_message ('unknown span event %s' % mxl_event)
+
+
+    type = mxl_event.get_type ()
+    span_direction = spanner_type_dict.get (type)
+    # really check for None, because some types will be translated to 0, which
+    # would otherwise also lead to the unknown span warning
+    if span_direction != None:
+        ev.span_direction = span_direction
+    else:
+        error_message ('unknown span type %s for %s' % (type, name))
+
+    ev.set_span_type (type)
+    ev.line_type = getattr (mxl_event, 'line-type', 'solid')
+
+    # assign the size, which is used for octave-shift, etc.
+    ev.size = mxl_event.get_size ()
+
+    return ev
+
+def musicxml_direction_to_indicator (direction):
+    return { "above": 1, "upright": 1, "below": -1, "downright": -1 }.get (direction, '')
+
+def musicxml_fermata_to_lily_event (mxl_event):
+    ev = musicexp.ArticulationEvent ()
+    ev.type = "fermata"
+    if hasattr (mxl_event, 'type'):
+      dir = musicxml_direction_to_indicator (mxl_event.type)
+      if dir:
+        ev.force_direction = dir
+    return ev
+
+
+def musicxml_arpeggiate_to_lily_event (mxl_event):
+    ev = musicexp.ArpeggioEvent ()
+    ev.direction = {"up": 1, "down": -1}.get (getattr (mxl_event, 'direction', None), 0)
+    return ev
+
+
+def musicxml_tremolo_to_lily_event (mxl_event):
+    ev = musicexp.TremoloEvent ()
+    ev.bars = mxl_event.get_text ()
+    return ev
+
+def musicxml_bend_to_lily_event (mxl_event):
+    ev = musicexp.BendEvent ()
+    ev.alter = mxl_event.bend_alter ()
+    return ev
+
+
+def musicxml_fingering_event (mxl_event):
+    ev = musicexp.ShortArticulationEvent ()
+    ev.type = mxl_event.get_text ()
+    return ev
+
+def musicxml_string_event (mxl_event):
+    ev = musicexp.NoDirectionArticulationEvent ()
+    ev.type = mxl_event.get_text ()
+    return ev
+
+def musicxml_accidental_mark (mxl_event):
+    ev = musicexp.MarkupEvent ()
+    contents = { "sharp": "\\sharp",
+      "natural": "\\natural",
+      "flat": "\\flat",
+      "double-sharp": "\\doublesharp",
+      "sharp-sharp": "\\sharp\\sharp",
+      "flat-flat": "\\flat\\flat",
+      "flat-flat": "\\doubleflat",
+      "natural-sharp": "\\natural\\sharp",
+      "natural-flat": "\\natural\\flat",
+      "quarter-flat": "\\semiflat",
+      "quarter-sharp": "\\semisharp",
+      "three-quarters-flat": "\\sesquiflat",
+      "three-quarters-sharp": "\\sesquisharp",
+    }.get (mxl_event.get_text ())
+    if contents:
+        ev.contents = contents
+        return ev
+    else:
+        return None
+
+# translate articulations, ornaments and other notations into ArticulationEvents
+# possible values:
+#   -) string  (ArticulationEvent with that name)
+#   -) function (function(mxl_event) needs to return a full ArticulationEvent-derived object
+#   -) (class, name)  (like string, only that a different class than ArticulationEvent is used)
+# TODO: Some translations are missing!
+articulations_dict = {
+    "accent": (musicexp.ShortArticulationEvent, ">"), # or "accent"
+    "accidental-mark": musicxml_accidental_mark,
+    "bend": musicxml_bend_to_lily_event,
+    "breath-mark": (musicexp.NoDirectionArticulationEvent, "breathe"),
+    #"caesura": "caesura",
+    #"delayed-turn": "?",
+    "detached-legato": (musicexp.ShortArticulationEvent, "_"), # or "portato"
+    #"doit": "",
+    #"double-tongue": "",
+    "down-bow": "downbow",
+    #"falloff": "",
+    "fingering": musicxml_fingering_event,
+    #"fingernails": "",
+    #"fret": "",
+    #"hammer-on": "",
+    "harmonic": "flageolet",
+    #"heel": "",
+    "inverted-mordent": "prall",
+    "inverted-turn": "reverseturn",
+    "mordent": "mordent",
+    "open-string": "open",
+    #"plop": "",
+    #"pluck": "",
+    #"pull-off": "",
+    #"schleifer": "?",
+    #"scoop": "",
+    #"shake": "?",
+    #"snap-pizzicato": "",
+    #"spiccato": "",
+    "staccatissimo": (musicexp.ShortArticulationEvent, "|"), # or "staccatissimo"
+    "staccato": (musicexp.ShortArticulationEvent, "."), # or "staccato"
+    "stopped": (musicexp.ShortArticulationEvent, "+"), # or "stopped"
+    #"stress": "",
+    "string": musicxml_string_event,
+    "strong-accent": (musicexp.ShortArticulationEvent, "^"), # or "marcato"
+    #"tap": "",
+    "tenuto": (musicexp.ShortArticulationEvent, "-"), # or "tenuto"
+    #"thumb-position": "",
+    #"toe": "",
+    "turn": "turn",
+    "tremolo": musicxml_tremolo_to_lily_event,
+    "trill-mark": "trill",
+    #"triple-tongue": "",
+    #"unstress": ""
+    "up-bow": "upbow",
+    #"wavy-line": "?",
+}
+articulation_spanners = [ "wavy-line" ]
+
+def musicxml_articulation_to_lily_event (mxl_event):
+    # wavy-line elements are treated as trill spanners, not as articulation ornaments
+    if mxl_event.get_name () in articulation_spanners:
+        return musicxml_spanner_to_lily_event (mxl_event)
+
+    tmp_tp = articulations_dict.get (mxl_event.get_name ())
+    if not tmp_tp:
+        return
+
+    if isinstance (tmp_tp, str):
+        ev = musicexp.ArticulationEvent ()
+        ev.type = tmp_tp
+    elif isinstance (tmp_tp, tuple):
+        ev = tmp_tp[0] ()
+        ev.type = tmp_tp[1]
+    else:
+        ev = tmp_tp (mxl_event)
+
+    # Some articulations use the type attribute, other the placement...
+    dir = None
+    if hasattr (mxl_event, 'type'):
+        dir = musicxml_direction_to_indicator (mxl_event.type)
+    if hasattr (mxl_event, 'placement'):
+        dir = musicxml_direction_to_indicator (mxl_event.placement)
+    return ev
+
+
+def musicxml_dynamics_to_lily_event (dynentry):
+    dynamics_available = ( "p", "pp", "ppp", "pppp", "ppppp", "pppppp",
+        "f", "ff", "fff", "ffff", "fffff", "ffffff",
+        "mp", "mf", "sf", "sfp", "sfpp", "fp",
+        "rf", "rfz", "sfz", "sffz", "fz" )
+    if not dynentry.get_name() in dynamics_available:
+        return
+    event = musicexp.DynamicsEvent ()
+    event.type = dynentry.get_name ()
+    return event
+
+# Convert single-color two-byte strings to numbers 0.0 - 1.0
+def hexcolorval_to_nr (hex_val):
+    try:
+        v = int (hex_val, 16)
+        if v == 255:
+            v = 256
+        return v / 256.
+    except ValueError:
+        return 0.
+
+def hex_to_color (hex_val):
+    res = re.match (r'#([0-9a-f][0-9a-f]|)([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])$', hex_val, re.IGNORECASE)
+    if res:
+        return map (lambda x: hexcolorval_to_nr (x), res.group (2,3,4))
+    else:
+        return None
+
+def musicxml_words_to_lily_event (words):
+    event = musicexp.TextEvent ()
+    text = words.get_text ()
+    text = re.sub ('^ *\n? *', '', text)
+    text = re.sub (' *\n? *$', '', text)
+    event.text = text
+
+    if hasattr (words, 'default-y'):
+        offset = getattr (words, 'default-y')
+        try:
+            off = string.atoi (offset)
+            if off > 0:
+                event.force_direction = 1
+            else:
+                event.force_direction = -1
+        except ValueError:
+            event.force_direction = 0
+
+    if hasattr (words, 'font-weight'):
+        font_weight = { "normal": '', "bold": '\\bold' }.get (getattr (words, 'font-weight'), '')
+        if font_weight:
+            event.markup += font_weight
+
+    if hasattr (words, 'font-size'):
+        size = getattr (words, 'font-size')
+        font_size = {
+            "xx-small": '\\teeny',
+            "x-small": '\\tiny',
+            "small": '\\small',
+            "medium": '',
+            "large": '\\large',
+            "x-large": '\\huge',
+            "xx-large": '\\bigger\\huge'
+        }.get (size, '')
+        if font_size:
+            event.markup += font_size
+
+    if hasattr (words, 'color'):
+        color = getattr (words, 'color')
+        rgb = hex_to_color (color)
+        if rgb:
+            event.markup += "\\with-color #(rgb-color %s %s %s)" % (rgb[0], rgb[1], rgb[2])
+
+    if hasattr (words, 'font-style'):
+        font_style = { "italic": '\\italic' }.get (getattr (words, 'font-style'), '')
+        if font_style:
+            event.markup += font_style
+
+    # TODO: How should I best convert the font-family attribute?
+
+    # TODO: How can I represent the underline, overline and line-through
+    #       attributes in Lilypond? Values of these attributes indicate
+    #       the number of lines
+
+    return event
+
+
+direction_spanners = [ 'octave-shift', 'pedal', 'wedge' ]
+
+def musicxml_direction_to_lily (n):
+    # TODO: Handle the <staff> element!
+    res = []
+    dirtype_children = []
+    for dt in n.get_typed_children (musicxml.DirType):
+        dirtype_children += dt.get_all_children ()
+
+    for entry in dirtype_children:
+
+        if entry.get_name () == "dynamics":
+            for dynentry in entry.get_all_children ():
+                ev = musicxml_dynamics_to_lily_event (dynentry)
+                if ev:
+                    res.append (ev)
+
+        if entry.get_name () == "words":
+            ev = musicxml_words_to_lily_event (entry)
+            if ev:
+                res.append (ev)
+
+        # octave shifts. pedal marks, hairpins etc. are spanners:
+        if entry.get_name() in direction_spanners:
+            event = musicxml_spanner_to_lily_event (entry)
+            if event:
+                res.append (event)
+
+
+    return res
+
+def musicxml_frame_to_lily_event (frame):
+    ev = musicexp.FretEvent ()
+    ev.strings = frame.get_strings ()
+    ev.frets = frame.get_frets ()
+    #offset = frame.get_first_fret () - 1
+    barre = []
+    for fn in frame.get_named_children ('frame-note'):
+        fret = fn.get_fret ()
+        if fret <= 0:
+            fret = "o"
+        el = [ fn.get_string (), fret ]
+        fingering = fn.get_fingering ()
+        if fingering >= 0:
+            el.append (fingering)
+        ev.elements.append (el)
+        b = fn.get_barre ()
+        if b == 'start':
+            barre[0] = el[0] # start string
+            barre[2] = el[1] # fret
+        elif b == 'stop':
+            barre[1] = el[0] # end string
+    if barre:
+        ev.barre = barre
+    return ev
+
+def musicxml_harmony_to_lily (n):
+    res = []
+    for f in n.get_named_children ('frame'):
+        ev = musicxml_frame_to_lily_event (f)
+        if ev:
+            res.append (ev)
+
+    return res
+
+instrument_drumtype_dict = {
+    'Acoustic Snare Drum': 'acousticsnare',
+    'Side Stick': 'sidestick',
+    'Open Triangle': 'opentriangle',
+    'Mute Triangle': 'mutetriangle',
+    'Tambourine': 'tambourine',
+    'Bass Drum': 'bassdrum',
+}
 
 def musicxml_note_to_lily_main_event (n):
-       pitch  = None
-       duration = None
-               
-       mxl_pitch = n.get_maybe_exist_typed_child (musicxml.Pitch)
-       event = None
-       if mxl_pitch:
-               pitch = musicxml_pitch_to_lily (mxl_pitch)
-               event = musicexp.NoteEvent()
-               event.pitch = pitch
-
-               acc = n.get_maybe_exist_named_child ('accidental')
-               if acc:
-                       # let's not force accs everywhere. 
-                       event.cautionary = acc.editorial
-               
-       elif n.get_maybe_exist_typed_child (musicxml.Rest):
-               event = musicexp.RestEvent()
-
-       event.duration = musicxml_duration_to_lily (n)
-       return event
+    pitch  = None
+    duration = None
+        
+    mxl_pitch = n.get_maybe_exist_typed_child (musicxml.Pitch)
+    event = None
+    if mxl_pitch:
+        pitch = musicxml_pitch_to_lily (mxl_pitch)
+        event = musicexp.NoteEvent()
+        event.pitch = pitch
+
+        acc = n.get_maybe_exist_named_child ('accidental')
+        if acc:
+            # let's not force accs everywhere. 
+            event.cautionary = acc.editorial
+        
+    elif n.get_maybe_exist_typed_child (musicxml.Rest):
+        # rests can have display-octave and display-step, which are
+        # treated like an ordinary note pitch
+        rest = n.get_maybe_exist_typed_child (musicxml.Rest)
+        event = musicexp.RestEvent()
+        pitch = musicxml_restdisplay_to_lily (rest)
+        event.pitch = pitch
+    elif n.instrument_name:
+        event = musicexp.NoteEvent ()
+        drum_type = instrument_drumtype_dict.get (n.instrument_name)
+        if drum_type:
+            event.drum_type = drum_type
+        else:
+            n.message ("drum %s type unknown, please add to instrument_drumtype_dict" % n.instrument_name)
+            event.drum_type = 'acousticsnare'
+    
+    if not event:
+        n.message ("cannot find suitable event")
+
+    event.duration = musicxml_duration_to_lily (n)
+    return event
+
+
+## TODO
+class NegativeSkip:
+    def __init__ (self, here, dest):
+        self.here = here
+        self.dest = dest
+
+class LilyPondVoiceBuilder:
+    def __init__ (self):
+        self.elements = []
+        self.pending_dynamics = []
+        self.end_moment = Rational (0)
+        self.begin_moment = Rational (0)
+        self.pending_multibar = Rational (0)
+        self.ignore_skips = False
+
+    def _insert_multibar (self):
+        r = musicexp.MultiMeasureRest ()
+        r.duration = musicexp.Duration()
+        r.duration.duration_log = 0
+        r.duration.factor = self.pending_multibar
+        self.elements.append (r)
+        self.begin_moment = self.end_moment
+        self.end_moment = self.begin_moment + self.pending_multibar
+        self.pending_multibar = Rational (0)
+        
+    def add_multibar_rest (self, duration):
+        self.pending_multibar += duration
+
+    def set_duration (self, duration):
+        self.end_moment = self.begin_moment + duration
+    def current_duration (self):
+        return self.end_moment - self.begin_moment
+        
+    def add_music (self, music, duration):
+        assert isinstance (music, musicexp.Music)
+        if self.pending_multibar > Rational (0):
+            self._insert_multibar ()
+
+        self.elements.append (music)
+        self.begin_moment = self.end_moment
+        self.set_duration (duration)
+        
+        # Insert all pending dynamics right after the note/rest:
+        if isinstance (music, musicexp.EventChord) and self.pending_dynamics:
+            for d in self.pending_dynamics:
+                music.append (d)
+            self.pending_dynamics = []
+
+    # Insert some music command that does not affect the position in the measure
+    def add_command (self, command):
+        assert isinstance (command, musicexp.Music)
+        if self.pending_multibar > Rational (0):
+            self._insert_multibar ()
+        self.elements.append (command)
+    def add_barline (self, barline):
+        # TODO: Implement merging of default barline and custom bar line
+        self.add_music (barline, Rational (0))
+    def add_partial (self, command):
+        self.ignore_skips = True
+        self.add_command (command)
+
+    def add_dynamics (self, dynamic):
+        # store the dynamic item(s) until we encounter the next note/rest:
+        self.pending_dynamics.append (dynamic)
+
+    def add_bar_check (self, number):
+        b = musicexp.BarLine ()
+        b.bar_number = number
+        self.add_barline (b)
+
+    def jumpto (self, moment):
+        current_end = self.end_moment + self.pending_multibar
+        diff = moment - current_end
+        
+        if diff < Rational (0):
+            error_message ('Negative skip %s' % diff)
+            diff = Rational (0)
+
+        if diff > Rational (0) and not (self.ignore_skips and moment == 0):
+            skip = musicexp.SkipEvent()
+            skip.duration.duration_log = 0
+            skip.duration.factor = diff
+
+            evc = musicexp.EventChord ()
+            evc.elements.append (skip)
+            self.add_music (evc, diff)
+
+        if diff > Rational (0) and moment == 0:
+            self.ignore_skips = False
+
+    def last_event_chord (self, starting_at):
+
+        value = None
+
+        # if the position matches, find the last EventChord, do not cross a bar line!
+        at = len( self.elements ) - 1
+        while (at >= 0 and
+               not isinstance (self.elements[at], musicexp.EventChord) and
+               not isinstance (self.elements[at], musicexp.BarLine)):
+            at -= 1
+
+        if (self.elements
+            and at >= 0
+            and isinstance (self.elements[at], musicexp.EventChord)
+            and self.begin_moment == starting_at):
+            value = self.elements[at]
+        else:
+            self.jumpto (starting_at)
+            value = None
+        return value
+        
+    def correct_negative_skip (self, goto):
+        self.end_moment = goto
+        self.begin_moment = goto
+        evc = musicexp.EventChord ()
+        self.elements.append (evc)
+
+
+class VoiceData:
+    def __init__ (self):
+        self.voicedata = None
+        self.ly_voice = None
+        self.lyrics_dict = {}
+        self.lyrics_order = []
 
 def musicxml_voice_to_lily_voice (voice):
-       
-       ly_voice = []
-       ly_now = Rational (0)
-
-       tuplet_events = []
-
-       for n in voice:
-               if n.get_name () == 'forward':
-                       continue
-               
-               if isinstance (n, musicxml.Attributes):
-                       ly_voice.extend (musicxml_attributes_to_lily (n))
-                       continue
-               
-               if not n.__class__.__name__ == 'Note':
-                       print 'not a Note or Attributes?', n
-                       continue
-
-               if n.is_first () and ly_voice:
-                       ly_voice[-1].comment += '\n'
-               
-               ev_chord = None
-               if None ==  n.get_maybe_exist_typed_child (musicxml.Chord):
-                       if ly_voice:
-                               ly_now += ly_voice[-1].get_length ()
-
-                       if ly_now <> n._when:
-                               diff = n._when - ly_now
-                               if diff < Rational (0):
-                                       print 'huh: negative skip', n._when, ly_now, n._duration
-                                       diff = Rational (1,314159265)
-
-                               ly_voice.append (create_skip_music (diff))
-                               ly_now = n._when
-                               
-                       ly_voice.append (musicexp.EventChord())
-               else:
-                       pass
-               
-               ev_chord = ly_voice[-1]
-
-               main_event = musicxml_note_to_lily_main_event (n)
-               ev_chord.append (main_event)
-                       
-               notations = n.get_maybe_exist_typed_child (musicxml.Notations)
-               tuplet_event = None
-               span_events = []
-               if notations:
-                       if notations.get_tuplet():
-                               mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
-                               frac = (1,1)
-                               if mod:
-                                       frac = mod.get_fraction ()
-                               
-                               tuplet_events.append ((ev_chord, tuplet_event, frac))
-
-                       slurs = [s for s in notations.get_named_children ('slur')
-                                if s.get_type () in ('start','stop')]
-                       if slurs:
-                               if len (slurs) > 1:
-                                       print 'more than 1 slur?'
-
-                               lily_ev = musicxml_spanner_to_lily_event (slurs[0])
-                               ev_chord.append (lily_ev)
-
-                       mxl_tie = notations.get_tie ()
-                       if mxl_tie and mxl_tie.type == 'start':
-                               ev_chord.append (musicexp.TieEvent ())
-
-               mxl_beams = [b for b in n.get_named_children ('beam')
-                            if b.get_type () in ('begin', 'end')] 
-               if mxl_beams:
-                       beam_ev = musicxml_spanner_to_lily_event (mxl_beams[0])
-                       if beam_ev:
-                               ev_chord.append (beam_ev)
-                       
-               if tuplet_event:
-                       mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
-                       frac = (1,1)
-                       if mod:
-                               frac = mod.get_fraction ()
-                               
-                       tuplet_events.append ((ev_chord, tuplet_event, frac))
-
-       ly_voice = group_tuplets (ly_voice, tuplet_events)
-
-       seq_music = musicexp.SequentialMusic()
-       
-       seq_music.elements = ly_voice
-       return seq_music
+    tuplet_events = []
+    modes_found = {}
+    lyrics = {}
+    return_value = VoiceData ()
+    return_value.voicedata = voice
+
+    # Needed for melismata detection (ignore lyrics on those notes!):
+    inside_slur = False
+    is_tied = False
+    is_chord = False
+    ignore_lyrics = False
+
+    current_staff = None
+
+    # TODO: Make sure that the keys in the dict don't get reordered, since
+    #       we need the correct ordering of the lyrics stanzas! By default,
+    #       a dict will reorder its keys
+    return_value.lyrics_order = voice.get_lyrics_numbers ()
+    for k in return_value.lyrics_order:
+        lyrics[k] = []
+
+    voice_builder = LilyPondVoiceBuilder()
+
+    for n in voice._elements:
+        if n.get_name () == 'forward':
+            continue
+        staff = n.get_maybe_exist_named_child ('staff')
+        if staff:
+            staff = staff.get_text ()
+            if current_staff and staff <> current_staff and not n.get_maybe_exist_named_child ('chord'):
+                voice_builder.add_command (musicexp.StaffChange (staff))
+            current_staff = staff
+
+        if isinstance (n, musicxml.Partial) and n.partial > 0:
+            a = musicxml_partial_to_lily (n.partial)
+            if a:
+                voice_builder.add_partial (a)
+            continue
+
+        if isinstance (n, musicxml.Direction):
+            for a in musicxml_direction_to_lily (n):
+                if a.wait_for_note ():
+                    voice_builder.add_dynamics (a)
+                else:
+                    voice_builder.add_command (a)
+            continue
+
+        if isinstance (n, musicxml.Harmony):
+            for a in musicxml_harmony_to_lily (n):
+                if a.wait_for_note ():
+                    voice_builder.add_dynamics (a)
+                else:
+                    voice_builder.add_command (a)
+            continue
+
+        is_chord = n.get_maybe_exist_named_child ('chord')
+        if not is_chord:
+            try:
+                voice_builder.jumpto (n._when)
+            except NegativeSkip, neg:
+                voice_builder.correct_negative_skip (n._when)
+                n.message ("Negative skip? from %s to %s, diff %s" % (neg.here, neg.dest, neg.dest - neg.here))
+            
+        if isinstance (n, musicxml.Attributes):
+            if n.is_first () and n._measure_position == Rational (0):
+                try:
+                    number = int (n.get_parent ().number)
+                except ValueError:
+                    number = 0
+                if number > 0:
+                    voice_builder.add_bar_check (number)
+
+            for a in musicxml_attributes_to_lily (n):
+                voice_builder.add_command (a)
+            continue
+
+        if isinstance (n, musicxml.Barline):
+            barlines = musicxml_barline_to_lily (n)
+            for a in barlines:
+                if isinstance (a, musicexp.BarLine):
+                    voice_builder.add_barline (a)
+                elif isinstance (a, RepeatMarker) or isinstance (a, EndingMarker):
+                    voice_builder.add_command (a)
+            continue
+
+        if not n.__class__.__name__ == 'Note':
+            error_message ('not a Note or Attributes? %s' % n)
+            continue
+
+        rest = n.get_maybe_exist_typed_child (musicxml.Rest)
+        if (rest
+            and rest.is_whole_measure ()):
+
+            voice_builder.add_multibar_rest (n._duration)
+            continue
+
+        if n.is_first () and n._measure_position == Rational (0):
+            try: 
+                num = int (n.get_parent ().number)
+            except ValueError:
+                num = 0
+            if num > 0:
+                voice_builder.add_bar_check (num)
+
+        main_event = musicxml_note_to_lily_main_event (n)
+        ignore_lyrics = inside_slur or is_tied or is_chord
+
+        if hasattr (main_event, 'drum_type') and main_event.drum_type:
+            modes_found['drummode'] = True
+
+
+        ev_chord = voice_builder.last_event_chord (n._when)
+        if not ev_chord: 
+            ev_chord = musicexp.EventChord()
+            voice_builder.add_music (ev_chord, n._duration)
+
+        grace = n.get_maybe_exist_typed_child (musicxml.Grace)
+        if grace:
+            grace_chord = None
+            if n.get_maybe_exist_typed_child (musicxml.Chord) and ev_chord.grace_elements:
+                grace_chord = ev_chord.grace_elements.get_last_event_chord ()
+            if not grace_chord:
+                grace_chord = musicexp.EventChord ()
+                ev_chord.append_grace (grace_chord)
+            if hasattr (grace, 'slash'):
+                # TODO: use grace_type = "appoggiatura" for slurred grace notes
+                if grace.slash == "yes":
+                    ev_chord.grace_type = "acciaccatura"
+                elif grace.slash == "no":
+                    ev_chord.grace_type = "grace"
+            # now that we have inserted the chord into the grace music, insert
+            # everything into that chord instead of the ev_chord
+            ev_chord = grace_chord
+            ev_chord.append (main_event)
+            ignore_lyrics = True
+        else:
+            ev_chord.append (main_event)
+            # When a note/chord has grace notes (duration==0), the duration of the
+            # event chord is not yet known, but the event chord was already added
+            # with duration 0. The following correct this when we hit the real note!
+            if voice_builder.current_duration () == 0 and n._duration > 0:
+                voice_builder.set_duration (n._duration)
+        
+        notations_children = n.get_typed_children (musicxml.Notations)
+        tuplet_event = None
+        span_events = []
+
+        # The <notation> element can have the following children (+ means implemented, ~ partially, - not):
+        # +tied | +slur | +tuplet | glissando | slide | 
+        #    ornaments | technical | articulations | dynamics |
+        #    +fermata | arpeggiate | non-arpeggiate | 
+        #    accidental-mark | other-notation
+        for notations in notations_children:
+            if notations.get_tuplet():
+                tuplet_event = notations.get_tuplet()
+                mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
+                frac = (1,1)
+                if mod:
+                    frac = mod.get_fraction ()
+                
+                tuplet_events.append ((ev_chord, tuplet_event, frac))
+
+            slurs = [s for s in notations.get_named_children ('slur')
+                if s.get_type () in ('start','stop')]
+            if slurs:
+                if len (slurs) > 1:
+                    error_message ('more than 1 slur?')
+                # record the slur status for the next note in the loop
+                if not grace:
+                    if slurs[0].get_type () == 'start':
+                        inside_slur = True
+                    elif slurs[0].get_type () == 'stop':
+                        inside_slur = False
+                lily_ev = musicxml_spanner_to_lily_event (slurs[0])
+                ev_chord.append (lily_ev)
+
+            if not grace:
+                mxl_tie = notations.get_tie ()
+                if mxl_tie and mxl_tie.type == 'start':
+                    ev_chord.append (musicexp.TieEvent ())
+                    is_tied = True
+                else:
+                    is_tied = False
+
+            fermatas = notations.get_named_children ('fermata')
+            for a in fermatas:
+                ev = musicxml_fermata_to_lily_event (a)
+                if ev: 
+                    ev_chord.append (ev)
+
+            arpeggiate = notations.get_named_children ('arpeggiate')
+            for a in arpeggiate:
+                ev = musicxml_arpeggiate_to_lily_event (a)
+                if ev:
+                    ev_chord.append (ev)
+
+            glissandos = notations.get_named_children ('glissando')
+            for a in glissandos:
+                ev = musicxml_spanner_to_lily_event (a)
+                if ev:
+                    ev_chord.append (ev)
+                
+            # Articulations can contain the following child elements:
+            #         accent | strong-accent | staccato | tenuto |
+            #         detached-legato | staccatissimo | spiccato |
+            #         scoop | plop | doit | falloff | breath-mark | 
+            #         caesura | stress | unstress
+            # Technical can contain the following child elements:
+            #         up-bow | down-bow | harmonic | open-string |
+            #         thumb-position | fingering | pluck | double-tongue |
+            #         triple-tongue | stopped | snap-pizzicato | fret |
+            #         string | hammer-on | pull-off | bend | tap | heel |
+            #         toe | fingernails | other-technical
+            # Ornaments can contain the following child elements:
+            #         trill-mark | turn | delayed-turn | inverted-turn |
+            #         shake | wavy-line | mordent | inverted-mordent | 
+            #         schleifer | tremolo | other-ornament, accidental-mark
+            ornaments = notations.get_named_children ('ornaments')
+            for a in ornaments:
+                for ch in a.get_named_children ('tremolo'):
+                    ev = musicxml_tremolo_to_lily_event (ch)
+                    if ev: 
+                        ev_chord.append (ev)
+
+            ornaments += notations.get_named_children ('articulations')
+            ornaments += notations.get_named_children ('technical')
+
+            for a in ornaments:
+                for ch in a.get_all_children ():
+                    ev = musicxml_articulation_to_lily_event (ch)
+                    if ev: 
+                        ev_chord.append (ev)
+
+            dynamics = notations.get_named_children ('dynamics')
+            for a in dynamics:
+                for ch in a.get_all_children ():
+                    ev = musicxml_dynamics_to_lily_event (ch)
+                    if ev:
+                        ev_chord.append (ev)
+
+        # Extract the lyrics
+        if not rest and not ignore_lyrics:
+            note_lyrics_processed = []
+            note_lyrics_elements = n.get_typed_children (musicxml.Lyric)
+            for l in note_lyrics_elements:
+                if l.get_number () < 0:
+                    for k in lyrics.keys ():
+                        lyrics[k].append (l.lyric_to_text ())
+                        note_lyrics_processed.append (k)
+                else:
+                    lyrics[l.number].append(l.lyric_to_text ())
+                    note_lyrics_processed.append (l.number)
+            for lnr in lyrics.keys ():
+                if not lnr in note_lyrics_processed:
+                    lyrics[lnr].append ("\skip4")
+
+
+        mxl_beams = [b for b in n.get_named_children ('beam')
+                     if (b.get_type () in ('begin', 'end')
+                         and b.is_primary ())] 
+        if mxl_beams:
+            beam_ev = musicxml_spanner_to_lily_event (mxl_beams[0])
+            if beam_ev:
+                ev_chord.append (beam_ev)
+            
+        if tuplet_event:
+            mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
+            frac = (1,1)
+            if mod:
+                frac = mod.get_fraction ()
+                
+            tuplet_events.append ((ev_chord, tuplet_event, frac))
+
+    ## force trailing mm rests to be written out.   
+    voice_builder.add_music (musicexp.EventChord (), Rational (0))
+    
+    ly_voice = group_tuplets (voice_builder.elements, tuplet_events)
+    ly_voice = group_repeats (ly_voice)
+
+    seq_music = musicexp.SequentialMusic ()
+
+    if 'drummode' in modes_found.keys ():
+        ## \key <pitch> barfs in drummode.
+        ly_voice = [e for e in ly_voice
+                    if not isinstance(e, musicexp.KeySignatureChange)]
+    
+    seq_music.elements = ly_voice
+    for k in lyrics.keys ():
+        return_value.lyrics_dict[k] = musicexp.Lyrics ()
+        return_value.lyrics_dict[k].lyrics_syllables = lyrics[k]
+    
+    
+    if len (modes_found) > 1:
+       error_message ('Too many modes found %s' % modes_found.keys ())
+
+    return_value.ly_voice = seq_music
+    for mode in modes_found.keys ():
+        v = musicexp.ModeChangingMusicWrapper()
+        v.element = seq_music
+        v.mode = mode
+        return_value.ly_voice = v
+    
+    return return_value
 
 
 def musicxml_id_to_lily (id):
-       digits = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
-                 'nine', 'ten']
-       
-       for dig in digits:
-               d = digits.index (dig) + 1
-               dig = dig[0].upper() + dig[1:]
-               id = re.sub ('%d' % d, dig, id)
+    digits = ['Zero', 'One', 'Two', 'Three', 'Four', 'Five',
+              'Six', 'Seven', 'Eight', 'Nine', 'Ten']
+    
+    for digit in digits:
+        d = digits.index (digit)
+        id = re.sub ('%d' % d, digit, id)
 
-       id = re.sub  ('[^a-zA-Z]', 'X', id)
-       return id
+    id = re.sub  ('[^a-zA-Z]', 'X', id)
+    return id
 
 
 def musicxml_pitch_to_lily (mxl_pitch):
-       p = musicexp.Pitch()
-       p.alteration = mxl_pitch.get_alteration ()
-       p.step = (ord (mxl_pitch.get_step ()) - ord ('A') + 7 - 2) % 7
-       p.octave = mxl_pitch.get_octave () - 4
-       return p
+    p = musicexp.Pitch()
+    p.alteration = mxl_pitch.get_alteration ()
+    p.step = (ord (mxl_pitch.get_step ()) - ord ('A') + 7 - 2) % 7
+    p.octave = mxl_pitch.get_octave () - 4
+    return p
+
+def musicxml_restdisplay_to_lily (mxl_rest):
+    p = None
+    step = mxl_rest.get_step ()
+    if step:
+        p = musicexp.Pitch()
+        p.step = (ord (step) - ord ('A') + 7 - 2) % 7
+    octave = mxl_rest.get_octave ()
+    if octave and p:
+        p.octave = octave - 4
+    return p
+
+def voices_in_part (part):
+    """Return a Name -> Voice dictionary for PART"""
+    part.interpret ()
+    part.extract_voices ()
+    voice_dict = part.get_voices ()
+
+    return voice_dict
+
+def voices_in_part_in_parts (parts):
+    """return a Part -> Name -> Voice dictionary"""
+    return dict([(p, voices_in_part (p)) for p in parts])
+
 
 def get_all_voices (parts):
-       progress ("Synchronizing MusicXML...")
-       
-       all_voices = {} 
-       for p in parts:
-               p.interpret ()
-               p.extract_voices ()             
-               voice_dict = p.get_voices ()
-               
-               for (id, voice) in voice_dict.items ():
-                       m_name = 'Part' + p.id + 'Voice' + id
-                       m_name = musicxml_id_to_lily (m_name)
-                       all_voices[m_name] = voice
-
-
-       progress ("Converting to LilyPond expressions...")
-       all_ly_voices = {}
-       for (k, v) in all_voices.items():
-               all_ly_voices[k] = musicxml_voice_to_lily_voice (v)
-
-       return all_ly_voices
-
-class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
-    def format_heading(self, heading):
-           if heading:
-                   return heading[0].upper() + heading[1:] + ':\n'
-           return ''
-    def format_option_strings(self, option):
-           sep = ' '
-           if option._short_opts and option._long_opts:
-                   sep = ','
-
-           metavar = ''
-           if option.takes_value():
-                   metavar = '=' + option.metavar or option.dest.upper()
-
-           return "%3s%s %s%s" % (" ".join (option._short_opts),
-                                  sep,
-                                  " ".join (option._long_opts),
-                                  metavar)
-
-    def format_usage(self, usage):
-        return _("Usage: %s\n") % usage
-    
-    def format_description(self, description):
-           return description
-  
+    all_voices = voices_in_part_in_parts (parts)
 
-def option_parser ():
-       p = optparse.OptionParser(usage='musicxml2ly FILE.xml',
-                                 version = """%prog (LilyPond) @TOPLEVEL_VERSION@
+    all_ly_voices = {}
+    for p, name_voice in all_voices.items ():
+
+        part_ly_voices = {}
+        for n, v in name_voice.items ():
+            progress ("Converting to LilyPond expressions...")
+            # musicxml_voice_to_lily_voice returns (lily_voice, {nr->lyrics, nr->lyrics})
+            part_ly_voices[n] = musicxml_voice_to_lily_voice (v)
 
-This program is free software.  It is covered by the GNU General Public
+        all_ly_voices[p] = part_ly_voices
+        
+    return all_ly_voices
+
+
+def option_parser ():
+    p = ly.get_option_parser(usage=_ ("musicxml2ly FILE.xml"),
+                             version=('''%prog (LilyPond) @TOPLEVEL_VERSION@\n\n'''
+                                      +
+_ ("""This program is free software.  It is covered by the GNU General Public
 License and you are welcome to change it and/or distribute copies of it
-under certain conditions.  Invoke as `lilypond --warranty' for more
-information.
+under certain conditions.  Invoke as `%s --warranty' for more
+information.""") % 'lilypond'
++ """
+Copyright (c) 2005--2007 by
+    Han-Wen Nienhuys <hanwen@xs4all.nl> and
+    Jan Nieuwenhuizen <janneke@gnu.org>
+"""),
+                             description=_ ("Convert %s to LilyPond input.") % 'MusicXML' + "\n")
+    p.add_option ('-v', '--verbose',
+                  action="store_true",
+                  dest='verbose',
+                  help=_ ("be verbose"))
+
+    p.add_option ('', '--lxml',
+                  action="store_true",
+                  default=False,
+                  dest="use_lxml",
+                  help=_ ("Use lxml.etree; uses less memory and cpu time."))
+    
+    p.add_option ('-o', '--output',
+                  metavar=_ ("FILE"),
+                  action="store",
+                  default=None,
+                  type='string',
+                  dest='output_name',
+                  help=_ ("set output filename to FILE"))
+    p.add_option_group ('bugs',
+                        description=(_ ("Report bugs via")
+                                     + ''' http://post.gmane.org/post.php'''
+                                     '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
+    return p
+
+def music_xml_voice_name_to_lily_name (part, name):
+    str = "Part%sVoice%s" % (part.id, name)
+    return musicxml_id_to_lily (str) 
+
+def music_xml_lyrics_name_to_lily_name (part, name, lyricsnr):
+    str = "Part%sVoice%sLyrics%s" % (part.id, name, lyricsnr)
+    return musicxml_id_to_lily (str) 
+
+def print_voice_definitions (printer, part_list, voices):
+    part_dict={}
+    for (part, nv_dict) in voices.items():
+        part_dict[part.id] = (part, nv_dict)
+
+    for part in part_list:
+        (p, nv_dict) = part_dict.get (part.id, (None, {}))
+        #for (name, ((voice, lyrics), mxlvoice)) in nv_dict.items ():
+        for (name, voice) in nv_dict.items ():
+            k = music_xml_voice_name_to_lily_name (p, name)
+            printer.dump ('%s = ' % k)
+            voice.ly_voice.print_ly (printer)
+            printer.newline()
+
+            for l in voice.lyrics_order:
+                lname = music_xml_lyrics_name_to_lily_name (p, name, l)
+                printer.dump ('%s = ' %lname )
+                voice.lyrics_dict[l].print_ly (printer)
+                printer.newline()
+
+            
+def uniq_list (l):
+    return dict ([(elt,1) for elt in l]).keys ()
+
+# format the information about the staff in the form 
+#     [staffid,
+#         [
+#            [voiceid1, [lyricsid11, lyricsid12,...] ...],
+#            [voiceid2, [lyricsid21, lyricsid22,...] ...],
+#            ...
+#         ]
+#     ]
+# raw_voices is of the form [(voicename, lyricsids)*]
+def format_staff_info (part, staff_id, raw_voices):
+    voices = []
+    for (v, lyricsids) in raw_voices:
+        voice_name = music_xml_voice_name_to_lily_name (part, v)
+        voice_lyrics = [music_xml_lyrics_name_to_lily_name (part, v, l)
+                   for l in lyricsids]
+        voices.append ([voice_name, voice_lyrics])
+    return [staff_id, voices]
+
+def update_score_setup (score_structure, part_list, voices):
+    part_dict = dict ([(p.id, p) for p in voices.keys ()])
+    final_part_dict = {}
+
+    for part_definition in part_list:
+        part_name = part_definition.id
+        part = part_dict.get (part_name)
+        if not part:
+            error_message ('unknown part in part-list: %s' % part_name)
+            continue
+
+        nv_dict = voices.get (part)
+        staves = reduce (lambda x,y: x+ y,
+                [voice.voicedata._staves.keys ()
+                 for voice in nv_dict.values ()],
+                [])
+        staves_info = []
+        if len (staves) > 1:
+            staves_info = []
+            staves = uniq_list (staves)
+            staves.sort ()
+            for s in staves:
+                thisstaff_raw_voices = [(voice_name, voice.lyrics_order) 
+                    for (voice_name, voice) in nv_dict.items ()
+                    if voice.voicedata._start_staff == s]
+                staves_info.append (format_staff_info (part, s, thisstaff_raw_voices))
+        else:
+            thisstaff_raw_voices = [(voice_name, voice.lyrics_order) 
+                for (voice_name, voice) in nv_dict.items ()]
+            staves_info.append (format_staff_info (part, None, thisstaff_raw_voices))
+        score_structure.set_part_information (part_name, staves_info)
+
+def print_ly_preamble (printer, filename):
+    printer.dump_version ()
+    printer.print_verbatim ('%% automatically converted from %s\n' % filename)
+
+def read_musicxml (filename, use_lxml):
+    if use_lxml:
+        import lxml.etree
+        
+        tree = lxml.etree.parse (filename)
+        mxl_tree = musicxml.lxml_demarshal_node (tree.getroot ())
+        return mxl_tree
+    else:
+        from xml.dom import minidom, Node
+        
+        doc = minidom.parse(filename)
+        node = doc.documentElement
+        return musicxml.minidom_demarshal_node (node)
+
+    return None
+
+
+def convert (filename, options):
+    progress ("Reading MusicXML from %s ..." % filename)
+    
+    tree = read_musicxml (filename, options.use_lxml)
 
-Copyright (c) 2005 by
-  Han-Wen Nienhuys <hanwen@xs4all.nl> and
-  Jan Nieuwenhuizen <janneke@gnu.org>
-""",
+    score_structure = None
+    mxl_pl = tree.get_maybe_exist_typed_child (musicxml.Part_list)
+    if mxl_pl:
+        score_structure = extract_score_layout (mxl_pl)
+        part_list = mxl_pl.get_named_children ("score-part")
 
-                                 description  =
-                                 """Convert MusicXML file to LilyPond input.
-"""
-                                 )
-       p.add_option ('-v', '--verbose',
-                     action = "store_true",
-                     dest = 'verbose',
-                     help = 'be verbose')
-       p.add_option ('-o', '--output',
-                     metavar = 'FILE',
-                     action = "store",
-                     default = None,
-                     type = 'string',
-                     dest = 'output',
-                     help = 'set output file')
-
-       p.add_option_group  ('', description = '''Report bugs via http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs
-''')
-       p.formatter = NonDentedHeadingFormatter () 
-       return p
-
-
-def convert (filename, output_name):
-       
-       printer = musicexp.Output_printer()
-
-       progress ("Reading MusicXML...")
-       
-       tree = musicxml.read_musicxml (filename)
-       parts = tree.get_typed_children (musicxml.Part)
-
-       voices = get_all_voices (parts)
-
-       if output_name:
-               printer.file = open (output_name,'w')
-               
-       progress ("Printing as .ly...")
-       for  (k,v) in voices.items():
-               printer.dump ('%s = ' % k)
-               v.print_ly (printer)
-               printer.newline()
-
-       return voices
-
-
-opt_parser = option_parser()
-
-(options, args) = opt_parser.parse_args ()
-if not args:
-       opt_parser.print_usage()
-       sys.exit (2)
-
-voices = convert (args[0], options.output)
+    # score information is contained in the <work>, <identification> or <movement-title> tags
+    score_information = extract_score_information (tree)
+    parts = tree.get_typed_children (musicxml.Part)
+    voices = get_all_voices (parts)
+    update_score_setup (score_structure, part_list, voices)
+
+    if not options.output_name:
+        options.output_name = os.path.basename (filename) 
+        options.output_name = os.path.splitext (options.output_name)[0]
+    elif re.match (".*\.ly", options.output_name):
+        options.output_name = os.path.splitext (options.output_name)[0]
+
+
+    defs_ly_name = options.output_name + '-defs.ly'
+    driver_ly_name = options.output_name + '.ly'
+
+    printer = musicexp.Output_printer()
+    progress ("Output to `%s'" % defs_ly_name)
+    printer.set_file (codecs.open (defs_ly_name, 'wb', encoding='utf-8'))
+
+    print_ly_preamble (printer, filename)
+    score_information.print_ly (printer)
+    print_voice_definitions (printer, part_list, voices)
+    
+    printer.close ()
+    
+    
+    progress ("Output to `%s'" % driver_ly_name)
+    printer = musicexp.Output_printer()
+    printer.set_file (codecs.open (driver_ly_name, 'wb', encoding='utf-8'))
+    print_ly_preamble (printer, filename)
+    printer.dump (r'\include "%s"' % os.path.basename (defs_ly_name))
+    score_structure.print_ly (printer)
+    printer.newline ()
+
+    return voices
+
+def get_existing_filename_with_extension (filename, ext):
+    if os.path.exists (filename):
+        return filename
+    newfilename = filename + ".xml"
+    if os.path.exists (newfilename):
+        return newfilename;
+    newfilename = filename + "xml"
+    if os.path.exists (newfilename):
+        return newfilename;
+    return ''
+
+def main ():
+    opt_parser = option_parser()
+
+    (options, args) = opt_parser.parse_args ()
+    if not args:
+        opt_parser.print_usage()
+        sys.exit (2)
+    
+    # Allow the user to leave out the .xml or xml on the filename
+    filename = get_existing_filename_with_extension (args[0], "xml")
+    if filename and os.path.exists (filename):
+        voices = convert (filename, options)
+    else:
+        progress ("Unable to find input file %s" % args[0])
+
+if __name__ == '__main__':
+    main()