]> git.donarmstrong.com Git - lilypond.git/blobdiff - scripts/musicxml2ly.py
Improve man pages in `scripts' directory.
[lilypond.git] / scripts / musicxml2ly.py
index 373dd5d1f10e25e78f84dea438388df5c6d4a91e..886479a8936cfaaaa08f2117e2e6c177fcb7e037 100644 (file)
@@ -5,36 +5,583 @@ import sys
 import re
 import os
 import string
-from gettext import gettext as _
+import codecs
+import zipfile
+import StringIO
 
 """
 @relocate-preamble@
 """
 
 import lilylib as ly
+_ = ly._
 
 import musicxml
 import musicexp
 
 from rational import Rational
 
+# Store command-line options in a global variable, so we can access them everythwere
+options = None
+
+class Conversion_Settings:
+    def __init__(self):
+       self.ignore_beaming = False
+
+conversion_settings = Conversion_Settings ()
+# Use a global variable to store the setting needed inside a \layout block.
+# whenever we need to change a setting or add/remove an engraver, we can access 
+# this layout and add the corresponding settings
+layout_information = musicexp.Layout ()
 
 def progress (str):
-    sys.stderr.write (str + '\n')
+    ly.stderr_write (str + '\n')
     sys.stderr.flush ()
+
+def error_message (str):
+    ly.stderr_write (str + '\n')
+    sys.stderr.flush ()
+
+needed_additional_definitions = []
+additional_definitions = {
+  "snappizzicato": """#(define-markup-command (snappizzicato layout props) ()
+  (interpret-markup layout props
+    (markup #:stencil
+      (ly:stencil-translate-axis
+        (ly:stencil-add
+          (make-circle-stencil 0.7 0.1 #f)
+          (ly:make-stencil
+            (list 'draw-line 0.1 0 0.1 0 1)
+            '(-0.1 . 0.1) '(0.1 . 1)))
+        0.7 X))))""",
+  "eyeglasses": """eyeglassesps = #"0.15 setlinewidth
+      -0.9 0 translate
+      1.1 1.1 scale
+      1.2 0.7 moveto
+      0.7 0.7 0.5 0 361 arc
+      stroke
+      2.20 0.70 0.50 0 361 arc
+      stroke
+      1.45 0.85 0.30 0 180 arc
+      stroke
+      0.20 0.70 moveto
+      0.80 2.00 lineto
+      0.92 2.26 1.30 2.40 1.15 1.70 curveto
+      stroke
+      2.70 0.70 moveto
+      3.30 2.00 lineto
+      3.42 2.26 3.80 2.40 3.65 1.70 curveto
+      stroke"
+eyeglasses =  \markup { \with-dimensions #'(0 . 4.4) #'(0 . 2.5) \postscript #eyeglassesps }"""
+}
+
+def round_to_two_digits (val):
+    return round (val * 100) / 100
+
+def extract_paper_information (tree):
+    paper = musicexp.Paper ()
+    defaults = tree.get_maybe_exist_named_child ('defaults')
+    if not defaults:
+        return None
+    tenths = -1
+    scaling = defaults.get_maybe_exist_named_child ('scaling')
+    if scaling:
+        mm = scaling.get_named_child ('millimeters')
+        mm = string.atof (mm.get_text ())
+        tn = scaling.get_maybe_exist_named_child ('tenths')
+        tn = string.atof (tn.get_text ())
+        tenths = mm / tn
+        paper.global_staff_size = mm * 72.27 / 25.4
+    # We need the scaling (i.e. the size of staff tenths for everything!
+    if tenths < 0:
+        return None
+
+    def from_tenths (txt):
+        return round_to_two_digits (string.atof (txt) * tenths / 10)
+    def set_paper_variable (varname, parent, element_name):
+        el = parent.get_maybe_exist_named_child (element_name)
+        if el: # Convert to cm from tenths
+            setattr (paper, varname, from_tenths (el.get_text ()))
+
+    pagelayout = defaults.get_maybe_exist_named_child ('page-layout')
+    if pagelayout:
+        # TODO: How can one have different margins for even and odd pages???
+        set_paper_variable ("page_height", pagelayout, 'page-height')
+        set_paper_variable ("page_width", pagelayout, 'page-width')
+
+        pmargins = pagelayout.get_named_children ('page-margins')
+        for pm in pmargins:
+            set_paper_variable ("left_margin", pm, 'left-margin')
+            set_paper_variable ("right_margin", pm, 'right-margin')
+            set_paper_variable ("bottom_margin", pm, 'bottom-margin')
+            set_paper_variable ("top_margin", pm, 'top-margin')
+
+    systemlayout = defaults.get_maybe_exist_named_child ('system-layout')
+    if systemlayout:
+        sl = systemlayout.get_maybe_exist_named_child ('system-margins')
+        if sl:
+            set_paper_variable ("system_left_margin", sl, 'left-margin')
+            set_paper_variable ("system_right_margin", sl, 'right-margin')
+        set_paper_variable ("system_distance", systemlayout, 'system-distance')
+        set_paper_variable ("top_system_distance", systemlayout, 'top-system-distance')
+
+    stafflayout = defaults.get_named_children ('staff-layout')
+    for sl in stafflayout:
+        nr = getattr (sl, 'number', 1)
+        dist = sl.get_named_child ('staff-distance')
+        #TODO: the staff distance needs to be set in the Staff context!!!
+
+    # TODO: Finish appearance?, music-font?, word-font?, lyric-font*, lyric-language*
+    appearance = defaults.get_named_child ('appearance')
+    if appearance:
+        lws = appearance.get_named_children ('line-width')
+        for lw in lws:
+            # Possible types are: beam, bracket, dashes,
+            #    enclosure, ending, extend, heavy barline, leger,
+            #    light barline, octave shift, pedal, slur middle, slur tip,
+            #    staff, stem, tie middle, tie tip, tuplet bracket, and wedge
+            tp = lw.type
+            w = from_tenths (lw.get_text  ())
+            # TODO: Do something with these values!
+        nss = appearance.get_named_children ('note-size')
+        for ns in nss:
+            # Possible types are: cue, grace and large
+            tp = ns.type
+            sz = from_tenths (ns.get_text ())
+            # TODO: Do something with these values!
+        # <other-appearance> elements have no specified meaning
+
+    rawmusicfont = defaults.get_named_child ('music-font')
+    if rawmusicfont:
+        # TODO: Convert the font
+        pass
+    rawwordfont = defaults.get_named_child ('word-font')
+    if rawwordfont:
+        # TODO: Convert the font
+        pass
+    rawlyricsfonts = defaults.get_named_children ('lyric-font')
+    for lyricsfont in rawlyricsfonts:
+        # TODO: Convert the font
+        pass
+
+    return paper
+
+
+
+# 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 ())
+
+        # Finally, apply the required compatibility modes
+        # Some applications created wrong MusicXML files, so we need to 
+        # apply some compatibility mode, e.g. ignoring some features/tags
+        # in those files
+        software = ids.get_encoding_software_list ()
+
+        # Case 1: "Sibelius 5.1" with the "Dolet 3.4 for Sibelius" plugin
+        #         is missing all beam ends => ignore all beaming information
+        if "Dolet 3.4 for Sibelius" in software:
+            conversion_settings.ignore_beaming = True
+            progress (_ ("Encountered file created by Dolet 3.4 for Sibelius, containing wrong beaming information. All beaming information in the MusicXML file will be ignored"))
+        # TODO: Check for other unsupported features
+
+    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 staff_attributes_to_string_tunings (mxl_attr):
+    details = mxl_attr.get_maybe_exist_named_child ('staff-details')
+    if not details:
+        return []
+    lines = 6
+    staff_lines = details.get_maybe_exist_named_child ('staff-lines')
+    if staff_lines:
+        lines = string.atoi (staff_lines.get_text ())
+
+    tunings = [0]*lines
+    staff_tunings = details.get_named_children ('staff-tuning')
+    for i in staff_tunings:
+        p = musicexp.Pitch()
+        line = 0
+        try:
+            line = string.atoi (i.line) - 1
+        except ValueError:
+            pass
+        tunings[line] = p
+
+        step = i.get_named_child (u'tuning-step')
+        step = step.get_text ().strip ()
+        p.step = musicxml_step_to_lily (step)
+
+        octave = i.get_named_child (u'tuning-octave')
+        octave = octave.get_text ().strip ()
+        p.octave = int (octave) - 4
+
+        alter = i.get_named_child (u'tuning-alter')
+        if alter:
+            p.alteration = int (alter.get_text ().strip ())
+    # lilypond seems to use the opposite ordering than MusicXML...
+    tunings.reverse ()
+
+    return tunings
+
+
+def staff_attributes_to_lily_staff (mxl_attr):
+    if not mxl_attr:
+        return musicexp.Staff ()
+
+    (staff_id, attributes) = mxl_attr.items ()[0]
+
+    # distinguish by clef:
+    # percussion (percussion and rhythmic), tab, and everything else
+    clef_sign = None
+    clef = attributes.get_maybe_exist_named_child ('clef')
+    if clef:
+        sign = clef.get_maybe_exist_named_child ('sign')
+        if sign:
+            clef_sign = {"percussion": "percussion", "TAB": "tab"}.get (sign.get_text (), None)
+
+    lines = 5
+    details = attributes.get_named_children ('staff-details')
+    for d in details:
+        staff_lines = d.get_maybe_exist_named_child ('staff-lines')
+        if staff_lines:
+            lines = string.atoi (staff_lines.get_text ())
+
+    staff = None
+    if clef_sign == "percussion" and lines == 1:
+        staff = musicexp.RhythmicStaff ()
+    elif clef_sign == "percussion":
+        staff = musicexp.DrumStaff ()
+        # staff.drum_style_table = ???
+    elif clef_sign == "tab":
+        staff = musicexp.TabStaff ()
+        staff.string_tunings = staff_attributes_to_string_tunings (attributes)
+        # staff.tablature_format = ???
+    else:
+        # TODO: Handle case with lines <> 5!
+        staff = musicexp.Staff ()
+
+    return staff
+
+
+def extract_score_structure (part_list, staffinfo):
+    structure = musicexp.StaffGroup (None)
+    if not part_list:
+        return structure
+
+    def read_score_part (el):
+        if not isinstance (el, musicxml.Score_part):
+            return
+        # Depending on the attributes of the first measure, we create different
+        # types of staves (Staff, RhythmicStaff, DrumStaff, TabStaff, etc.)
+        staff = staff_attributes_to_lily_staff (staffinfo.get (el.id, None))
+        if not staff:
+            return None
+        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 ()
+            staff = read_score_part (el)
+            if staff:
+                staves.append (staff)
+        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:
+        structure.append_staff (i)
+    return structure
+
 
 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
+    # 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))
-    d.factor = mxl_note._duration / d.get_length ()
+    # 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 ()
+
+    rational_len.normalize_self ()
+    d_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)
+
+    # Duration of the form 1/2^n or 3/2^n can be converted to a simple lilypond duration
+    if (d_log >= 0 and rational_len.numerator() in (1,3,5,7) ):
+        # account for the dots!
+        d.dots = (rational_len.numerator()-1)/2
+        d.duration_log = d_log - d.dots
+    elif (d_log >= 0):
+        d.duration_log = d_log
+        d.factor = Rational (rational_len.numerator ())
+    else:
+        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
+
+    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
+
 
-    return d         
 
 def group_tuplets (music_list, events):
 
@@ -49,7 +596,7 @@ def group_tuplets (music_list, events):
     j = 0
     for (ev_chord, tuplet_elt, fraction) in events:
         while (j < len (music_list)):
-            if music_list[j]== ev_chord:
+            if music_list[j] == ev_chord:
                 break
             j += 1
         if tuplet_elt.type == 'start':
@@ -82,7 +629,7 @@ def group_tuplets (music_list, events):
 
 def musicxml_clef_to_lily (attributes):
     change = musicexp.ClefChange ()
-    change.type = attributes.get_clef_sign ()
+    (change.type, change.position, change.octave) = attributes.get_clef_information ()
     return change
     
 def musicxml_time_to_lily (attributes):
@@ -104,7 +651,7 @@ def musicxml_key_to_lily (attributes):
         start_pitch.step = n
         start_pitch.alteration = a
     except  KeyError:
-        print 'unknown mode', mode
+        error_message (_ ("unknown mode %s, expecting 'major' or 'minor'") % mode)
 
     fifth = musicexp.Pitch()
     fifth.step = 4
@@ -132,20 +679,98 @@ def musicxml_attributes_to_lily (attrs):
     }
     for (k, func) in attr_dispatch.items ():
         children = attrs.get_named_children (k)
-
-        ## ugh: you get clefs spread over staves for piano
         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):
+        ly.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,
-}        
+    'dashes' : musicexp.TextSpannerEvent,
+    'bracket' : musicexp.BracketSpannerEvent,
+    'glissando' : musicexp.GlissandoEvent,
+    'octave-shift' : musicexp.OctaveShiftEvent,
+    'pedal' : musicexp.PedalEvent,
+    'slide' : musicexp.GlissandoEvent,
+    'slur' : musicexp.SlurEvent,
+    'wavy-line' : musicexp.TrillSpanEvent,
+    'wedge' : musicexp.HairpinEvent
+}
 spanner_type_dict = {
     'start': -1,
     'begin': -1,
+    'crescendo': -1,
+    'decreschendo': -1,
+    'diminuendo': -1,
+    'continue': 0,
+    'change': 0,
+    'up': -1,
+    'down': -1,
     'stop': 1,
     'end' : 1
 }
@@ -154,142 +779,690 @@ def musicxml_spanner_to_lily_event (mxl_event):
     ev = None
     
     name = mxl_event.get_name()
-    try:
-        func = spanner_event_dict[name]
+    func = spanner_event_dict.get (name)
+    if func:
         ev = func()
-    except KeyError:
-        print 'unknown span event ', mxl_event
+    else:
+        error_message (_ ('unknown span event %s') % mxl_event)
 
-    try:
-        key = mxl_event.get_type ()
-        ev.span_direction = spanner_type_dict[key]
-    except KeyError:
-        print 'unknown span type', key, 'for', name
+
+    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):
-    val = { "above": 1, "upright": 1, "below": -1, "downright": -1 }.get (direction)
-    if val:
-        return val
-    else:
-        return ''
+    return { "above": 1, "upright": 1, "up": 1, "below": -1, "downright": -1, "down": -1, "inverted": -1 }.get (direction, 0)
 
 def musicxml_fermata_to_lily_event (mxl_event):
     ev = musicexp.ArticulationEvent ()
-    ev.type = "fermata"
+    txt = mxl_event.get_text ()
+    # The contents of the element defined the shape, possible are normal, angled and square
+    ev.type = { "angled": "shortfermata", "square": "longfermata" }.get (txt, "fermata")
     if hasattr (mxl_event, 'type'):
       dir = musicxml_direction_to_indicator (mxl_event.type)
-      if dir:
+      if dir and options.convert_directions:
         ev.force_direction = dir
     return ev
 
-def musicxml_tremolo_to_lily_event(mxl_event):
-    if mxl_event.get_name () != "tremolo": 
-        return
+def musicxml_arpeggiate_to_lily_event (mxl_event):
+    ev = musicexp.ArpeggioEvent ()
+    ev.direction = musicxml_direction_to_indicator (getattr (mxl_event, 'direction', None))
+    return ev
+
+def musicxml_nonarpeggiate_to_lily_event (mxl_event):
+    ev = musicexp.ArpeggioEvent ()
+    ev.non_arpeggiate = True
+    ev.direction = musicxml_direction_to_indicator (getattr (mxl_event, 'direction', None))
+    return ev
+
+def musicxml_tremolo_to_lily_event (mxl_event):
     ev = musicexp.TremoloEvent ()
-    ev.bars = mxl_event.get_text ()
+    txt = mxl_event.get_text ()
+    if txt:
+      ev.bars = txt
+    else:
+      ev.bars = "3"
+    return ev
+
+def musicxml_falloff_to_lily_event (mxl_event):
+    ev = musicexp.BendEvent ()
+    ev.alter = -4
+    return ev
+
+def musicxml_doit_to_lily_event (mxl_event):
+    ev = musicexp.BendEvent ()
+    ev.alter = 4
+    return ev
+
+def musicxml_bend_to_lily_event (mxl_event):
+    ev = musicexp.BendEvent ()
+    ev.alter = mxl_event.bend_alter ()
+    return ev
+
+def musicxml_caesura_to_lily_event (mxl_event):
+    ev = musicexp.MarkupEvent ()
+    # FIXME: default to straight or curved caesura?
+    ev.contents = "\\musicglyph #\"scripts.caesura.straight\""
+    ev.force_direction = 1
+    return ev
+
+def musicxml_fingering_event (mxl_event):
+    ev = musicexp.ShortArticulationEvent ()
+    ev.type = mxl_event.get_text ()
+    return ev
+
+def musicxml_snappizzicato_event (mxl_event):
+    needed_additional_definitions.append ("snappizzicato")
+    ev = musicexp.MarkupEvent ()
+    ev.contents = "\\snappizzicato"
     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 = { 
-    ##### ORNAMENTS
-    "trill-mark": "trill", 
-    "turn": "turn", 
-    #"delayed-turn": "?", 
-    "inverted-turn": "reverseturn", 
-    #"shake": "?", 
-    #"wavy-line": "?", 
+articulations_dict = {
+    "accent": (musicexp.ShortArticulationEvent, ">"), # or "accent"
+    "accidental-mark": musicxml_accidental_mark,
+    "bend": musicxml_bend_to_lily_event,
+    "breath-mark": (musicexp.NoDirectionArticulationEvent, "breathe"),
+    "caesura": musicxml_caesura_to_lily_event,
+    #"delayed-turn": "?",
+    "detached-legato": (musicexp.ShortArticulationEvent, "_"), # or "portato"
+    "doit": musicxml_doit_to_lily_event,
+    #"double-tongue": "?",
+    "down-bow": "downbow",
+    "falloff": musicxml_falloff_to_lily_event,
+    "fingering": musicxml_fingering_event,
+    #"fingernails": "?",
+    #"fret": "?",
+    #"hammer-on": "?",
+    "harmonic": "flageolet",
+    #"heel": "?",
+    "inverted-mordent": "prall",
+    "inverted-turn": "reverseturn",
     "mordent": "mordent",
-    #"inverted-mordent": "?", 
-    #"schleifer": "?" 
-    ##### TECHNICALS
-    "up-bow": "upbow", 
-    "down-bow": "downbow", 
-    #"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": ""
-    ##### ARTICULATIONS
-    "accent": "accent", 
-    "strong-accent": "marcato", 
-    "staccato": "staccato", 
-    "tenuto": "tenuto", 
-    #"detached-legato": "", 
-    "staccatissimo": "staccatissimo", 
-    #"spiccato": "", 
-    #"scoop": "", 
-    #"plop": "", 
-    #"doit": "", 
-    #"falloff": "",
-    "breath-mark": "breathe", 
-    #"caesura": "caesura", 
-    #"stress": "", 
-    #"unstress": ""
+    "open-string": "open",
+    #"plop": "?",
+    #"pluck": "?",
+    #"pull-off": "?",
+    #"schleifer": "?",
+    #"scoop": "?",
+    #"shake": "?",
+    "snap-pizzicato": musicxml_snappizzicato_event,
+    #"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": "thumb",
+    #"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):
-    ev = musicexp.ArticulationEvent ()
-    tp = articulations_dict.get (mxl_event.get_name ())
-    if not tp:
+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
-    
-    ev.type = tp
+
+    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'):
+    if hasattr (mxl_event, 'type') and options.convert_directions:
         dir = musicxml_direction_to_indicator (mxl_event.type)
-    if hasattr (mxl_event, 'placement'):
+    if hasattr (mxl_event, 'placement') and options.convert_directions:
         dir = musicxml_direction_to_indicator (mxl_event.placement)
     if dir:
         ev.force_direction = dir
     return ev
 
 
-def musicxml_direction_to_lily( n ):
+
+def musicxml_dynamics_to_lily_event (dynentry):
+    dynamics_available = (
+        "ppppp", "pppp", "ppp", "pp", "p", "mp", "mf", 
+        "f", "ff", "fff", "ffff", "fp", "sf", "sff", "sp", "spp", "sfz", "rfz" )
+    dynamicsname = dynentry.get_name ()
+    if dynamicsname == "other-dynamics":
+        dynamicsname = dynentry.get_text ()
+    if not dynamicsname or dynamicsname=="#text":
+        return
+
+    if not dynamicsname in dynamics_available:
+        # Get rid of - in tag names (illegal in ly tags!)
+        dynamicstext = dynamicsname
+        dynamicsname = string.replace (dynamicsname, "-", "")
+        additional_definitions[dynamicsname] = dynamicsname + \
+              " = #(make-dynamic-script \"" + dynamicstext + "\")"
+        needed_additional_definitions.append (dynamicsname)
+    event = musicexp.DynamicsEvent ()
+    event.type = dynamicsname
+    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') and options.convert_directions:
+        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
+
+
+# convert accordion-registration to lilypond.
+# Since lilypond does not have any built-in commands, we need to create
+# the markup commands manually and define our own variables.
+# Idea was taken from: http://lsr.dsi.unimi.it/LSR/Item?id=194
+def musicxml_accordion_to_markup (mxl_event):
+    commandname = "accReg"
+    command = ""
+
+    high = mxl_event.get_maybe_exist_named_child ('accordion-high')
+    if high:
+        commandname += "H"
+        command += """\\combine
+          \\raise #2.5 \\musicglyph #\"accordion.accDot\"
+          """
+    middle = mxl_event.get_maybe_exist_named_child ('accordion-middle')
+    if middle:
+        # By default, use one dot (when no or invalid content is given). The 
+        # MusicXML spec is quiet about this case...
+        txt = 1
+        try:
+          txt = string.atoi (middle.get_text ())
+        except ValueError:
+            pass
+        if txt == 3:
+            commandname += "MMM"
+            command += """\\combine
+          \\raise #1.5 \\musicglyph #\"accordion.accDot\"
+          \\combine
+          \\raise #1.5 \\translate #(cons 1 0) \\musicglyph #\"accordion.accDot\"
+          \\combine
+          \\raise #1.5 \\translate #(cons -1 0) \\musicglyph #\"accordion.accDot\"
+          """
+        elif txt == 2:
+            commandname += "MM"
+            command += """\\combine
+          \\raise #1.5 \\translate #(cons 0.5 0) \\musicglyph #\"accordion.accDot\"
+          \\combine
+          \\raise #1.5 \\translate #(cons -0.5 0) \\musicglyph #\"accordion.accDot\"
+          """
+        elif not txt <= 0:
+            commandname += "M"
+            command += """\\combine
+          \\raise #1.5 \\musicglyph #\"accordion.accDot\"
+          """
+    low = mxl_event.get_maybe_exist_named_child ('accordion-low')
+    if low:
+        commandname += "L"
+        command += """\\combine
+          \\raise #0.5 \musicglyph #\"accordion.accDot\"
+          """
+
+    command += "\musicglyph #\"accordion.accDiscant\""
+    command = "\\markup { \\normalsize %s }" % command
+    # Define the newly built command \accReg[H][MMM][L]
+    additional_definitions[commandname] = "%s = %s" % (commandname, command)
+    needed_additional_definitions.append (commandname)
+    return "\\%s" % commandname
+
+def musicxml_accordion_to_ly (mxl_event):
+    txt = musicxml_accordion_to_markup (mxl_event)
+    if txt:
+        ev = musicexp.MarkEvent (txt)
+        return ev
+    return
+
+
+def musicxml_rehearsal_to_ly_mark (mxl_event):
+    text = mxl_event.get_text ()
+    if not text:
+        return
+    # default is boxed rehearsal marks!
+    encl = "box"
+    if hasattr (mxl_event, 'enclosure'):
+        encl = {"none": None, "square": "box", "circle": "circle" }.get (mxl_event.enclosure, None)
+    if encl:
+        text = "\\%s { %s }" % (encl, text)
+    ev = musicexp.MarkEvent ("\\markup { %s }" % text)
+    return ev
+
+def musicxml_eyeglasses_to_ly (mxl_event):
+    needed_additional_definitions.append ("eyeglasses")
+    return musicexp.MarkEvent ("\\eyeglasses")
+
+def next_non_hash_index (lst, pos):
+    pos += 1
+    while pos < len (lst) and isinstance (lst[pos], musicxml.Hash_text):
+        pos += 1
+    return pos
+
+def musicxml_metronome_to_ly (mxl_event):
+    children = mxl_event.get_all_children ()
+    if not children:
+        return
+
+    index = -1
+    index = next_non_hash_index (children, index)
+    if isinstance (children[index], musicxml.BeatUnit): 
+        # first form of metronome-mark, using unit and beats/min or other unit
+        ev = musicexp.TempoMark ()
+        if hasattr (mxl_event, 'parentheses'):
+            ev.set_parentheses (mxl_event.parentheses == "yes")
+
+        d = musicexp.Duration ()
+        d.duration_log = musicxml.musicxml_duration_to_log (children[index].get_text ())
+        index = next_non_hash_index (children, index)
+        if isinstance (children[index], musicxml.BeatUnitDot):
+            d.dots = 1
+            index = next_non_hash_index (children, index)
+        ev.set_base_duration (d)
+        if isinstance (children[index], musicxml.BeatUnit):
+            # Form "note = newnote"
+            newd = musicexp.Duration ()
+            newd.duration_log = musicxml.musicxml_duration_to_log (children[index].get_text ())
+            index = next_non_hash_index (children, index)
+            if isinstance (children[index], musicxml.BeatUnitDot):
+                newd.dots = 1
+                index = next_non_hash_index (children, index)
+            ev.set_new_duration (newd)
+        elif isinstance (children[index], musicxml.PerMinute):
+            # Form "note = bpm"
+            try:
+                beats = int (children[index].get_text ())
+                ev.set_beats_per_minute (beats)
+            except ValueError:
+                pass
+        else:
+            error_message (_ ("Unknown metronome mark, ignoring"))
+            return
+        return ev
+    else:
+        #TODO: Implement the other (more complex) way for tempo marks!
+        error_message (_ ("Metronome marks with complex relations (<metronome-note> in MusicXML) are not yet implemented."))
+        return
+
+# translate directions into Events, possible values:
+#   -) string  (MarkEvent with that command)
+#   -) function (function(mxl_event) needs to return a full Event-derived object
+#   -) (class, name)  (like string, only that a different class than MarkEvent is used)
+directions_dict = {
+    'accordion-registration' : musicxml_accordion_to_ly,
+    'coda' : (musicexp.MusicGlyphMarkEvent, "coda"),
+#     'damp' : ???
+#     'damp-all' : ???
+    'eyeglasses': musicxml_eyeglasses_to_ly,
+#     'harp-pedals' : ???
+#     'image' : ???
+    'metronome' : musicxml_metronome_to_ly,
+    'rehearsal' : musicxml_rehearsal_to_ly_mark,
+#     'scordatura' : ???
+    'segno' : (musicexp.MusicGlyphMarkEvent, "segno"),
+    'words' : musicxml_words_to_lily_event,
+}
+directions_spanners = [ 'octave-shift', 'pedal', 'wedge', 'dashes', 'bracket' ]
+
+def musicxml_direction_to_lily (n):
     # TODO: Handle the <staff> element!
     res = []
-    dirtype = n.get_maybe_exist_typed_child (musicxml.DirType)
-    if not dirtype: 
-      return res
+    # placement applies to all children!
+    dir = None
+    if hasattr (n, 'placement') and options.convert_directions:
+        dir = musicxml_direction_to_indicator (n.placement)
+    dirtype_children = []
+    # TODO: The direction-type is used for grouping (e.g. dynamics with text), 
+    #       so we can't simply flatten them out!
+    for dt in n.get_typed_children (musicxml.DirType):
+        dirtype_children += dt.get_all_children ()
+
+    for entry in dirtype_children:
+        # backets, dashes, octave shifts. pedal marks, hairpins etc. are spanners:
+        if entry.get_name() in directions_spanners:
+            event = musicxml_spanner_to_lily_event (entry)
+            if event:
+                res.append (event)
+            continue
+
+        # now treat all the "simple" ones, that can be translated using the dict
+        ev = None
+        tmp_tp = directions_dict.get (entry.get_name (), None)
+        if isinstance (tmp_tp, str): # string means MarkEvent
+            ev = musicexp.MarkEvent (tmp_tp)
+        elif isinstance (tmp_tp, tuple): # tuple means (EventClass, "text")
+            ev = tmp_tp[0] (tmp_tp[1])
+        elif tmp_tp:
+            ev = tmp_tp (entry)
+        if ev:
+            # TODO: set the correct direction! Unfortunately, \mark in ly does
+            #       not seem to support directions!
+            res.append (ev)
+            continue
 
-    for entry in dirtype.get_all_children ():
         if entry.get_name () == "dynamics":
             for dynentry in entry.get_all_children ():
-                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: 
-                    continue
-                event = musicexp.DynamicsEvent ()
-                event.type = dynentry.get_name ()
-                res.append (event)
-      
-        if entry.get_name() == "wedge":
-            if hasattr (entry, 'type'):
-                wedgetype = entry.type;
-                wedgetypeval = {"crescendo" : 1, "decrescendo" : -1, 
-                                "diminuendo" : -1, "stop" : 0 }.get (wedgetype)
-                if wedgetypeval != None:
-                    event = musicexp.HairpinEvent (wedgetypeval)
-                    res.append (event)
+                ev = musicxml_dynamics_to_lily_event (dynentry)
+                if ev:
+                    res.append (ev)
+
+    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
+
+
+def musicxml_chordpitch_to_lily (mxl_cpitch):
+    r = musicexp.ChordPitch ()
+    r.alteration = mxl_cpitch.get_alteration ()
+    r.step = musicxml_step_to_lily (mxl_cpitch.get_step ())
+    return r
+
+chordkind_dict = {
+    'major': '5',
+    'minor': 'm5',
+    'augmented': 'aug5',
+    'diminished': 'dim5',
+        # Sevenths:
+    'dominant': '7',
+    'major-seventh': 'maj7',
+    'minor-seventh': 'm7',
+    'diminished-seventh': 'dim7',
+    'augmented-seventh': 'aug7',
+    'half-diminished': 'dim5m7',
+    'major-minor': 'maj7m5',
+        # Sixths:
+    'major-sixth': '6',
+    'minor-sixth': 'm6',
+        # Ninths:
+    'dominant-ninth': '9',
+    'major-ninth': 'maj9',
+    'minor-ninth': 'm9',
+        # 11ths (usually as the basis for alteration):
+    'dominant-11th': '11',
+    'major-11th': 'maj11',
+    'minor-11th': 'm11',
+        # 13ths (usually as the basis for alteration):
+    'dominant-13th': '13.11',
+    'major-13th': 'maj13.11',
+    'minor-13th': 'm13',
+        # Suspended:
+    'suspended-second': 'sus2',
+    'suspended-fourth': 'sus4',
+        # Functional sixths:
+    # TODO
+    #'Neapolitan': '???',
+    #'Italian': '???',
+    #'French': '???',
+    #'German': '???',
+        # Other:
+    #'pedal': '???',(pedal-point bass)
+    'power': '5^3',
+    #'Tristan': '???',
+    'other': '1',
+    'none': None,
+}
+
+def musicxml_chordkind_to_lily (kind):
+    res = chordkind_dict.get (kind, None)
+    # Check for None, since a major chord is converted to ''
+    if res == None:
+        error_message (_ ("Unable to convert chord type %s to lilypond.") % kind)
+    return res
+
+def musicxml_harmony_to_lily_chordname (n):
+    res = []
+    root = n.get_maybe_exist_named_child ('root')
+    if root:
+        ev = musicexp.ChordNameEvent ()
+        ev.root = musicxml_chordpitch_to_lily (root)
+        kind = n.get_maybe_exist_named_child ('kind')
+        if kind:
+            ev.kind = musicxml_chordkind_to_lily (kind.get_text ())
+            if not ev.kind:
+                return res
+        bass = n.get_maybe_exist_named_child ('bass')
+        if bass:
+            ev.bass = musicxml_chordpitch_to_lily (bass)
+        inversion = n.get_maybe_exist_named_child ('inversion')
+        if inversion:
+            # TODO: Lilypond does not support inversions, does it?
+
+            # Mail from Carl Sorensen on lilypond-devel, June 11, 2008:
+            # 4. LilyPond supports the first inversion in the form of added 
+            # bass notes.  So the first inversion of C major would be c:/g.   
+            # To get the second inversion of C major, you would need to do 
+            # e:6-3-^5 or e:m6-^5.  However, both of these techniques 
+            # require you to know the chord and calculate either the fifth 
+            # pitch (for the first inversion) or the third pitch (for the 
+            # second inversion) so they may not be helpful for musicxml2ly.
+            inversion_count = string.atoi (inversion.get_text ())
+            if inversion_count == 1:
+              # TODO: Calculate the bass note for the inversion...
+              pass
+            pass
+        for deg in n.get_named_children ('degree'):
+            d = musicexp.ChordModification ()
+            d.type = deg.get_type ()
+            d.step = deg.get_value ()
+            d.alteration = deg.get_alter ()
+            ev.add_modification (d)
+        #TODO: convert the user-symbols attribute: 
+            #major: a triangle, like Unicode 25B3
+            #minor: -, like Unicode 002D
+            #augmented: +, like Unicode 002B
+            #diminished: (degree), like Unicode 00B0
+            #half-diminished: (o with slash), like Unicode 00F8
+        if ev and ev.root:
+            res.append (ev)
+
+    return res
 
+def musicxml_figured_bass_note_to_lily (n):
+    res = musicexp.FiguredBassNote ()
+    suffix_dict = { 'sharp' : "+", 
+                    'flat' : "-", 
+                    'natural' : "!", 
+                    'double-sharp' : "++", 
+                    'flat-flat' : "--", 
+                    'sharp-sharp' : "++", 
+                    'slash' : "/" }
+    prefix = n.get_maybe_exist_named_child ('prefix')
+    if prefix:
+        res.set_prefix (suffix_dict.get (prefix.get_text (), ""))
+    fnumber = n.get_maybe_exist_named_child ('figure-number')
+    if fnumber:
+        res.set_number (fnumber.get_text ())
+    suffix = n.get_maybe_exist_named_child ('suffix')
+    if suffix:
+        res.set_suffix (suffix_dict.get (suffix.get_text (), ""))
+    if n.get_maybe_exist_named_child ('extend'):
+        # TODO: Implement extender lines (unfortunately, in lilypond you have 
+        #       to use \set useBassFigureExtenders = ##t, which turns them on
+        #       globally, while MusicXML has a property for each note...
+        #       I'm not sure there is a proper way to implement this cleanly
+        #n.extend
+        pass
+    return res
+
+
+
+def musicxml_figured_bass_to_lily (n):
+    if not isinstance (n, musicxml.FiguredBass):
+        return
+    res = musicexp.FiguredBassEvent ()
+    for i in n.get_named_children ('figure'):
+        note = musicxml_figured_bass_note_to_lily (i)
+        if note:
+            res.append (note)
+    dur = n.get_maybe_exist_named_child ('duration')
+    if dur:
+        # apply the duration to res
+        length = Rational(int(dur.get_text()), n._divisions)*Rational(1,4)
+        res.set_real_duration (length)
+        duration = rational_to_lily_duration (length)
+        if duration:
+            res.set_duration (duration)
+    if hasattr (n, 'parentheses') and n.parentheses == "yes":
+        res.set_parentheses (True)
     return res
 
 instrument_drumtype_dict = {
@@ -297,43 +1470,60 @@ instrument_drumtype_dict = {
     'Side Stick': 'sidestick',
     'Open Triangle': 'opentriangle',
     'Mute Triangle': 'mutetriangle',
-    'Tambourine': 'tambourine'
+    '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
+
+    mxl_pitch = n.get_maybe_exist_typed_child (musicxml.Pitch)
     if mxl_pitch:
         pitch = musicxml_pitch_to_lily (mxl_pitch)
-        event = musicexp.NoteEvent()
+        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.Unpitched):
+       # Unpitched elements have display-step and can also have
+       # display-octave.
+       unpitched = n.get_maybe_exist_typed_child (musicxml.Unpitched)
+       event = musicexp.NoteEvent ()
+       event.pitch = musicxml_unpitched_to_lily (unpitched)
         
     elif n.get_maybe_exist_typed_child (musicxml.Rest):
-        event = musicexp.RestEvent()
+        # 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 ()
-        try:
-            event.drum_type = instrument_drumtype_dict[n.instrument_name]
-        except KeyError:
-            n.message ("drum %s type unknow, please add to instrument_drumtype_dict" % n.instrument_name)
+        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)
+    else:
+        n.message (_ ("cannot find suitable event"))
+
+    if event:
+       event.duration = musicxml_duration_to_lily (n)
+
     return event
 
 
-## todo
+## TODO
 class NegativeSkip:
     def __init__ (self, here, dest):
         self.here = here
@@ -346,6 +1536,8 @@ class LilyPondVoiceBuilder:
         self.end_moment = Rational (0)
         self.begin_moment = Rational (0)
         self.pending_multibar = Rational (0)
+        self.ignore_skips = False
+        self.has_relevant_elements = False
 
     def _insert_multibar (self):
         r = musicexp.MultiMeasureRest ()
@@ -359,89 +1551,213 @@ class LilyPondVoiceBuilder:
         
     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.has_relevant_elements = True
         self.elements.append (music)
         self.begin_moment = self.end_moment
-        self.end_moment = self.begin_moment + duration 
-
+        self.set_duration (duration)
+        
         # Insert all pending dynamics right after the note/rest:
-        if duration > Rational (0):
+        if isinstance (music, musicexp.ChordEvent) and self.pending_dynamics:
             for d in self.pending_dynamics:
-                self.elements.append (d)
+                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.has_relevant_elements = True
+        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.BarCheck ()
+        # re/store has_relevant_elements, so that a barline alone does not
+        # trigger output for figured bass, chord names
+        has_relevant = self.has_relevant_elements
+        b = musicexp.BarLine ()
         b.bar_number = number
-        self.add_music (b, Rational (0))
+        self.add_barline (b)
+        self.has_relevant_elements = has_relevant
 
     def jumpto (self, moment):
         current_end = self.end_moment + self.pending_multibar
         diff = moment - current_end
         
         if diff < Rational (0):
-            print 'Negative skip', diff
+            error_message (_ ('Negative skip %s') % diff)
             diff = Rational (0)
 
-        if 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 ()
+            duration_factor = 1
+            duration_log = {1: 0, 2: 1, 4:2, 8:3, 16:4, 32:5, 64:6, 128:7, 256:8, 512:9}.get (diff.denominator (), -1)
+            duration_dots = 0
+            if duration_log > 0: # denominator is a power of 2...
+                if diff.numerator () == 3:
+                    duration_log -= 1
+                    duration_dots = 1
+                else:
+                    duration_factor = Rational (diff.numerator ())
+            else:
+                # for skips of a whole or more, simply use s1*factor
+                duration_log = 0
+                duration_factor = diff
+            skip.duration.duration_log = duration_log
+            skip.duration.factor = duration_factor
+            skip.duration.dots = duration_dots
+
+            evc = musicexp.ChordEvent ()
             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 ChordEvent, do not cross a bar line!
+        at = len( self.elements ) - 1
+        while (at >= 0 and
+               not isinstance (self.elements[at], musicexp.ChordEvent) and
+               not isinstance (self.elements[at], musicexp.BarLine)):
+            at -= 1
+
         if (self.elements
-            and isinstance (self.elements[-1], musicexp.EventChord)
+            and at >= 0
+            and isinstance (self.elements[at], musicexp.ChordEvent)
             and self.begin_moment == starting_at):
-            value = self.elements[-1]
+            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 ()
+        evc = musicexp.ChordEvent ()
         self.elements.append (evc)
-        
+
+
+class VoiceData:
+    def __init__ (self):
+        self.voicename = None
+        self.voicedata = None
+        self.ly_voice = None
+        self.figured_bass = None
+        self.chordnames = None
+        self.lyrics_dict = {}
+        self.lyrics_order = []
+
+def musicxml_step_to_lily (step):
+    if step:
+       return (ord (step) - ord ('A') + 7 - 2) % 7
+    else:
+       return None
+
 def musicxml_voice_to_lily_voice (voice):
     tuplet_events = []
     modes_found = {}
+    lyrics = {}
+    return_value = VoiceData ()
+    return_value.voicedata = voice
+    
+    # First pitch needed for relative mode (if selected in command-line options)
+    first_pitch = None
+
+    # Needed for melismata detection (ignore lyrics on those notes!):
+    inside_slur = False
+    is_tied = False
+    is_chord = False
+    is_beamed = False
+    ignore_lyrics = False
+
+    current_staff = None
+    
+    pending_figured_bass = []
+    pending_chordnames = []
+
+    # 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()
+    voice_builder = LilyPondVoiceBuilder ()
+    figured_bass_builder = LilyPondVoiceBuilder ()
+    chordnames_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):
-                voice_builder.add_dynamics (a)
+                if a.wait_for_note ():
+                    voice_builder.add_dynamics (a)
+                else:
+                    voice_builder.add_command (a)
             continue
-        
-        if not n.get_maybe_exist_named_child ('chord'):
+
+        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)
+            for a in musicxml_harmony_to_lily_chordname (n):
+                pending_chordnames.append (a)
+            continue
+
+        if isinstance (n, musicxml.FiguredBass):
+            a = musicxml_figured_bass_to_lily (n)
+            if a:
+                pending_figured_bass.append (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))
+                n.message (_ ("Negative skip found: from %s to %s, difference is %s") % (neg.here, neg.dest, neg.dest - neg.here))
             
         if isinstance (n, musicxml.Attributes):
             if n.is_first () and n._measure_position == Rational (0):
@@ -449,14 +1765,26 @@ def musicxml_voice_to_lily_voice (voice):
                     number = int (n.get_parent ().number)
                 except ValueError:
                     number = 0
-                
-                voice_builder.add_bar_check (number)
+                if number > 0:
+                    voice_builder.add_bar_check (number)
+                    figured_bass_builder.add_bar_check (number)
+                    chordnames_builder.add_bar_check (number)
+
             for a in musicxml_attributes_to_lily (n):
-                voice_builder.add_music (a, Rational (0))
+                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':
-            print 'not a Note or Attributes?', n
+            error_message (_ ('unexpected %s; expected %s or %s or %s') % (n, 'Note', 'Attributes', 'Barline'))
             continue
 
         rest = n.get_maybe_exist_typed_child (musicxml.Rest)
@@ -471,36 +1799,90 @@ def musicxml_voice_to_lily_voice (voice):
                 num = int (n.get_parent ().number)
             except ValueError:
                 num = 0
-            voice_builder.add_bar_check (num)
-        
-        main_event = musicxml_note_to_lily_main_event (n)
+            if num > 0:
+                voice_builder.add_bar_check (num)
+                figured_bass_builder.add_bar_check (num)
+                chordnames_builder.add_bar_check (num)
 
-        try:
-            if main_event.drum_type:
-                modes_found['drummode'] = True
-        except AttributeError:
-            pass
+        main_event = musicxml_note_to_lily_main_event (n)
+        if main_event and not first_pitch:
+            first_pitch = main_event.pitch
+        # ignore lyrics for notes inside a slur, tie, chord or beam
+        ignore_lyrics = inside_slur or is_tied or is_chord or is_beamed
 
+        if main_event and 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()
+            ev_chord = musicexp.ChordEvent()
             voice_builder.add_music (ev_chord, n._duration)
 
-        ev_chord.append (main_event)
+        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.ChordEvent ()
+                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"
+            # 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)
+        
+        # if we have a figured bass, set its voice builder to the correct position
+        # and insert the pending figures
+        if pending_figured_bass:
+            try:
+                figured_bass_builder.jumpto (n._when)
+            except NegativeSkip, neg:
+                pass
+            for fb in pending_figured_bass:
+                # if a duration is given, use that, otherwise the one of the note
+                dur = fb.real_duration
+                if not dur:
+                    dur = ev_chord.get_length ()
+                if not fb.duration:
+                    fb.duration = ev_chord.get_duration ()
+                figured_bass_builder.add_music (fb, dur)
+            pending_figured_bass = []
         
-        notations = n.get_maybe_exist_typed_child (musicxml.Notations)
+        if pending_chordnames:
+            try:
+                chordnames_builder.jumpto (n._when)
+            except NegativeSkip, neg:
+                pass
+            for cn in pending_chordnames:
+                # Assign the duration of the EventChord
+                cn.duration = ev_chord.get_duration ()
+                chordnames_builder.add_music (cn, ev_chord.get_length ())
+            pending_chordnames = []
+
+
+        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
-        if notations:
-            if notations.get_tuplet():
-                tuplet_event = notations.get_tuplet()
+        for notations in notations_children:
+            for tuplet_event in notations.get_tuplets():
                 mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
                 frac = (1,1)
                 if mod:
@@ -512,21 +1894,55 @@ def musicxml_voice_to_lily_voice (voice):
                 if s.get_type () in ('start','stop')]
             if slurs:
                 if len (slurs) > 1:
-                    print 'more than 1 slur?'
-
+                    error_message (_ ('cannot have two simultaneous slurs'))
+                # 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)
 
-            mxl_tie = notations.get_tie ()
-            if mxl_tie and mxl_tie.type == 'start':
-                ev_chord.append (musicexp.TieEvent ())
-                
+            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);
+                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)
+
+            arpeggiate = notations.get_named_children ('non-arpeggiate')
+            for a in arpeggiate:
+                ev = musicxml_nonarpeggiate_to_lily_event (a)
+                if ev:
+                    ev_chord.append (ev)
+
+            glissandos = notations.get_named_children ('glissando')
+            glissandos += notations.get_named_children ('slide')
+            for a in glissandos:
+                ev = musicxml_spanner_to_lily_event (a)
+                if ev:
+                    ev_chord.append (ev)
+
+            # accidental-marks are direct children of <notation>!
+            for a in notations.get_named_children ('accidental-mark'):
+                ev = musicxml_articulation_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 |
@@ -543,12 +1959,6 @@ def musicxml_voice_to_lily_voice (voice):
             #         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')
 
@@ -565,13 +1975,18 @@ def musicxml_voice_to_lily_voice (voice):
                     if ev:
                         ev_chord.append (ev)
 
+
         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:
+        if mxl_beams and not conversion_settings.ignore_beaming:
             beam_ev = musicxml_spanner_to_lily_event (mxl_beams[0])
             if beam_ev:
                 ev_chord.append (beam_ev)
+                if beam_ev.span_direction == -1: # beam and thus melisma starts here
+                    is_beamed = True
+                elif beam_ev.span_direction == 1: # beam and thus melisma ends here
+                    is_beamed = False
             
         if tuplet_event:
             mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
@@ -581,12 +1996,29 @@ def musicxml_voice_to_lily_voice (voice):
                 
             tuplet_events.append ((ev_chord, tuplet_event, frac))
 
+        # 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")
+
     ## force trailing mm rests to be written out.   
-    voice_builder.add_music (musicexp.EventChord (), Rational (0))
+    voice_builder.add_music (musicexp.ChordEvent (), Rational (0))
     
     ly_voice = group_tuplets (voice_builder.elements, tuplet_events)
+    ly_voice = group_repeats (ly_voice)
 
-    seq_music = musicexp.SequentialMusic()
+    seq_music = musicexp.SequentialMusic ()
 
     if 'drummode' in modes_found.keys ():
         ## \key <pitch> barfs in drummode.
@@ -594,22 +2026,47 @@ def musicxml_voice_to_lily_voice (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:
-       print 'Too many modes found', modes_found.keys ()
-
-    return_value = seq_music
+       error_message (_ ('cannot simultaneously have more than one mode: %s') % modes_found.keys ())
+       
+    if options.relative:
+        v = musicexp.RelativeMusic ()
+        v.element = seq_music
+        v.basepitch = first_pitch
+        seq_music = v
+
+    return_value.ly_voice = seq_music
     for mode in modes_found.keys ():
         v = musicexp.ModeChangingMusicWrapper()
-        v.element = return_value
+        v.element = seq_music
         v.mode = mode
-        return_value = v
+        return_value.ly_voice = v
+    
+    # create \figuremode { figured bass elements }
+    if figured_bass_builder.has_relevant_elements:
+        fbass_music = musicexp.SequentialMusic ()
+        fbass_music.elements = figured_bass_builder.elements
+        v = musicexp.ModeChangingMusicWrapper()
+        v.mode = 'figuremode'
+        v.element = fbass_music
+        return_value.figured_bass = v
+    
+    # create \chordmode { chords }
+    if chordnames_builder.has_relevant_elements:
+        cname_music = musicexp.SequentialMusic ()
+        cname_music.elements = chordnames_builder.elements
+        v = musicexp.ModeChangingMusicWrapper()
+        v.mode = 'chordmode'
+        v.element = cname_music
+        return_value.chordnames = v
     
     return return_value
 
-
 def musicxml_id_to_lily (id):
     digits = ['Zero', 'One', 'Two', 'Three', 'Four', 'Five',
               'Six', 'Seven', 'Eight', 'Nine', 'Ten']
@@ -621,229 +2078,423 @@ def musicxml_id_to_lily (id):
     id = re.sub  ('[^a-zA-Z]', 'X', id)
     return id
 
-
 def musicxml_pitch_to_lily (mxl_pitch):
-    p = musicexp.Pitch()
+    p = musicexp.Pitch ()
     p.alteration = mxl_pitch.get_alteration ()
-    p.step = (ord (mxl_pitch.get_step ()) - ord ('A') + 7 - 2) % 7
+    p.step = musicxml_step_to_lily (mxl_pitch.get_step ())
     p.octave = mxl_pitch.get_octave () - 4
     return p
 
+def musicxml_unpitched_to_lily (mxl_unpitched):
+    p = None
+    step = mxl_unpitched.get_step ()
+    if step:
+       p = musicexp.Pitch ()
+       p.step = musicxml_step_to_lily (step)
+    octave = mxl_unpitched.get_octave ()
+    if octave and p:
+       p.octave = 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 = musicxml_step_to_lily (step)
+    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 ()
+    voices = part.get_voices ()
+    part_info = part.get_staff_attributes ()
 
-    return voice_dict
+    return (voices, part_info)
 
 def voices_in_part_in_parts (parts):
     """return a Part -> Name -> Voice dictionary"""
-    return dict([(p, voices_in_part (p)) for p in parts])
+    return dict([(p.id, voices_in_part (p)) for p in parts])
 
 
 def get_all_voices (parts):
     all_voices = voices_in_part_in_parts (parts)
 
     all_ly_voices = {}
-    for p, name_voice in all_voices.items ():
+    all_ly_staffinfo = {}
+    for p, (name_voice, staff_info) in all_voices.items ():
 
         part_ly_voices = {}
         for n, v in name_voice.items ():
-            progress ("Converting to LilyPond expressions...")
-            part_ly_voices[n] = (musicxml_voice_to_lily_voice (v), v)
+            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)
 
         all_ly_voices[p] = part_ly_voices
-        
-    return all_ly_voices
+        all_ly_staffinfo[p] = staff_info
+
+    return (all_ly_voices, all_ly_staffinfo)
 
 
 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
+    p = ly.get_option_parser (usage = _ ("musicxml2ly [OPTION]... FILE.xml"),
+                             description =
+_ ("""Convert MusicXML from FILE.xml to LilyPond input.
+If the given filename is -, musicxml2ly reads from the command line.
+"""), add_help_option=False)
+
+    p.add_option("-h", "--help",
+                 action="help",
+                 help=_ ("show this help and exit"))
+
+    p.version = ('''%prog (LilyPond) @TOPLEVEL_VERSION@\n\n'''
++
+_ ("""Copyright (c) 2005--2008 by
+    Han-Wen Nienhuys <hanwen@xs4all.nl>,
+    Jan Nieuwenhuizen <janneke@gnu.org> and
+    Reinhold Kainhofer <reinhold@kainhofer.com>
+"""
++
+"""
+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 `%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")
+information.""") % 'lilypond')
+
+    p.add_option("--version",
+                 action="version",
+                 help=_ ("show version number and exit"))
+
     p.add_option ('-v', '--verbose',
-                  action="store_true",
-                  dest='verbose',
-                  help=_ ("be 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."))
-    
+                  action = "store_true",
+                  default = False,
+                  dest = "use_lxml",
+                  help = _ ("use lxml.etree; uses less memory and cpu time"))
+
+    p.add_option ('-z', '--compressed',
+                  action = "store_true",
+                  dest = 'compressed',
+                  default = False,
+                  help = _ ("input file is a zip-compressed MusicXML file"))
+
+    p.add_option ('-r', '--relative',
+                  action = "store_true",
+                  default = True,
+                  dest = "relative",
+                  help = _ ("convert pitches in relative mode (default)"))
+
+    p.add_option ('-a', '--absolute',
+                  action = "store_false",
+                  dest = "relative",
+                  help = _ ("convert pitches in absolute mode"))
+
+    p.add_option ('-l', '--language',
+                  metavar = _ ("LANG"),
+                  action = "store",
+                  help = _ ("use a different language file 'LANG.ly' and corresponding pitch names, e.g. 'deutsch' for deutsch.ly"))
+
+    p.add_option ('--nd', '--no-articulation-directions', 
+                  action = "store_false",
+                  default = True,
+                  dest = "convert_directions",
+                  help = _ ("do not convert directions (^, _ or -) for articulations, dynamics, etc."))
+
+    p.add_option ('--no-beaming', 
+                  action = "store_false",
+                  default = True,
+                  dest = "convert_beaming",
+                  help = _ ("do not convert beaming information, use lilypond's automatic beaming instead"))
+
     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")
+                  metavar = _ ("FILE"),
+                  action = "store",
+                  default = None,
+                  type = 'string',
+                  dest = 'output_name',
+                  help = _ ("set output filename to FILE, stdout if -"))
+    p.add_option_group ('',
+                        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)
+def music_xml_voice_name_to_lily_name (part_id, name):
+    str = "Part%sVoice%s" % (part_id, name)
     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)
+def music_xml_lyrics_name_to_lily_name (part_id, name, lyricsnr):
+    str = "Part%sVoice%sLyrics%s" % (part_id, name, lyricsnr)
+    return musicxml_id_to_lily (str) 
 
+def music_xml_figuredbass_name_to_lily_name (part_id, voicename):
+    str = "Part%sVoice%sFiguredBass" % (part_id, voicename)
+    return musicxml_id_to_lily (str) 
+
+def music_xml_chordnames_name_to_lily_name (part_id, voicename):
+    str = "Part%sVoice%sChords" % (part_id, voicename)
+    return musicxml_id_to_lily (str) 
+
+def print_voice_definitions (printer, part_list, voices):
     for part in part_list:
-        (part, nv_dict) = part_dict[part.id]
-        for (name, (voice, mxlvoice)) in nv_dict.items ():
-            k = music_xml_voice_name_to_lily_name (part, name)
+        part_id = part.id
+        nv_dict = voices.get (part_id, {})
+        for (name, voice) in nv_dict.items ():
+            k = music_xml_voice_name_to_lily_name (part_id, name)
             printer.dump ('%s = ' % k)
-            voice.print_ly (printer)
+            voice.ly_voice.print_ly (printer)
             printer.newline()
+            if voice.chordnames:
+                cnname = music_xml_chordnames_name_to_lily_name (part_id, name)
+                printer.dump ('%s = ' % cnname )
+                voice.chordnames.print_ly (printer)
+                printer.newline()
+            for l in voice.lyrics_order:
+                lname = music_xml_lyrics_name_to_lily_name (part_id, name, l)
+                printer.dump ('%s = ' % lname )
+                voice.lyrics_dict[l].print_ly (printer)
+                printer.newline()
+            if voice.figured_bass:
+                fbname = music_xml_figuredbass_name_to_lily_name (part_id, name)
+                printer.dump ('%s = ' % fbname )
+                voice.figured_bass.print_ly (printer)
+                printer.newline()
+
 
-            
 def uniq_list (l):
     return dict ([(elt,1) for elt in l]).keys ()
-    
-def print_score_setup (printer, part_list, voices):
-    part_dict = dict ([(p.id, p) for p in voices.keys ()]) 
 
-    printer ('<<')
-    printer.newline ()
+# format the information about the staff in the form 
+#     [staffid,
+#         [
+#            [voiceid1, [lyricsid11, lyricsid12,...], figuredbassid1],
+#            [voiceid2, [lyricsid21, lyricsid22,...], figuredbassid2],
+#            ...
+#         ]
+#     ]
+# raw_voices is of the form [(voicename, lyricsids, havefiguredbass)*]
+def format_staff_info (part_id, staff_id, raw_voices):
+    voices = []
+    for (v, lyricsids, figured_bass, chordnames) in raw_voices:
+        voice_name = music_xml_voice_name_to_lily_name (part_id, v)
+        voice_lyrics = [music_xml_lyrics_name_to_lily_name (part_id, v, l)
+                   for l in lyricsids]
+        figured_bass_name = ''
+        if figured_bass:
+            figured_bass_name = music_xml_figuredbass_name_to_lily_name (part_id, v)
+        chordnames_name = ''
+        if chordnames:
+            chordnames_name = music_xml_chordnames_name_to_lily_name (part_id, v)
+        voices.append ([voice_name, voice_lyrics, figured_bass_name, chordnames_name])
+    return [staff_id, voices]
+
+def update_score_setup (score_structure, part_list, voices):
+
     for part_definition in part_list:
-        part_name = part_definition.id
-        try:
-            part = part_dict[part_name]
-        except KeyError:
-            print 'unknown part in part-list:', part_name
+        part_id = part_definition.id
+        nv_dict = voices.get (part_id)
+        if not nv_dict:
+            error_message (_ ('unknown part in part-list: %s') % part_id)
             continue
 
-        nv_dict = voices[part]
         staves = reduce (lambda x,y: x+ y,
-                [mxlvoice._staves.keys ()
-                 for (v, mxlvoice) in nv_dict.values ()],
+                [voice.voicedata._staves.keys ()
+                 for voice in nv_dict.values ()],
                 [])
-
+        staves_info = []
         if len (staves) > 1:
+            staves_info = []
             staves = uniq_list (staves)
             staves.sort ()
-            printer ('\\context PianoStaff << ')
-            printer.newline ()
-            
             for s in staves:
-                staff_voices = [music_xml_voice_name_to_lily_name (part, voice_name)
-                        for (voice_name, (v, mxlvoice)) in nv_dict.items ()
-                        if mxlvoice._start_staff == s]
-                
-                printer ('\\context Staff = "%s" << ' % s)
-                printer.newline ()
-                for v in staff_voices:
-                    printer ('\\context Voice = "%s"  \\%s' % (v,v))
-                    printer.newline ()
-                printer ('>>')
-                printer.newline ()
-                
-            printer ('>>')
-            printer.newline ()
-            
+                thisstaff_raw_voices = [(voice_name, voice.lyrics_order, voice.figured_bass, voice.chordnames) 
+                    for (voice_name, voice) in nv_dict.items ()
+                    if voice.voicedata._start_staff == s]
+                staves_info.append (format_staff_info (part_id, s, thisstaff_raw_voices))
         else:
-            printer ('\\new Staff <<')
-            printer.newline ()
-            for (n,v) in nv_dict.items ():
-
-                n = music_xml_voice_name_to_lily_name (part, n) 
-                printer ('\\context Voice = "%s"  \\%s' % (n,n))
-            printer ('>>')
-            printer.newline ()
-            
-    printer ('>>')
-    printer.newline ()
+            thisstaff_raw_voices = [(voice_name, voice.lyrics_order, voice.figured_bass, voice.chordnames) 
+                for (voice_name, voice) in nv_dict.items ()]
+            staves_info.append (format_staff_info (part_id, None, thisstaff_raw_voices))
+        score_structure.set_part_information (part_id, staves_info)
+
+# Set global values in the \layout block, like auto-beaming etc.
+def update_layout_information ():
+    if not conversion_settings.ignore_beaming and layout_information:
+        layout_information.set_context_item ('Score', 'autoBeaming = ##f')
 
 def print_ly_preamble (printer, filename):
     printer.dump_version ()
     printer.print_verbatim ('%% automatically converted from %s\n' % filename)
 
-def read_musicxml (filename, use_lxml):
+def print_ly_additional_definitions (printer, filename):
+    if needed_additional_definitions:
+        printer.newline ()
+        printer.print_verbatim ('%% additional definitions required by the score:')
+        printer.newline ()
+    for a in set(needed_additional_definitions):
+        printer.print_verbatim (additional_definitions.get (a, ''))
+        printer.newline ()
+    printer.newline ()
+
+# Read in the tree from the given I/O object (either file or string) and 
+# demarshall it using the classes from the musicxml.py file
+def read_xml (io_object, use_lxml):
     if use_lxml:
         import lxml.etree
-        
-        tree = lxml.etree.parse (filename)
+        tree = lxml.etree.parse (io_object)
         mxl_tree = musicxml.lxml_demarshal_node (tree.getroot ())
         return mxl_tree
     else:
         from xml.dom import minidom, Node
-        
-        doc = minidom.parse(filename)
+        doc = minidom.parse(io_object)
         node = doc.documentElement
         return musicxml.minidom_demarshal_node (node)
-
     return None
 
 
+def read_musicxml (filename, compressed, use_lxml):
+    raw_string = None
+    if compressed:
+        if filename == "-":
+             progress (_ ("Input is compressed, extracting raw MusicXML data from stdin") )
+             z = zipfile.ZipFile (sys.stdin)
+        else:
+            progress (_ ("Input file %s is compressed, extracting raw MusicXML data") % filename)
+            z = zipfile.ZipFile (filename, "r")
+        container_xml = z.read ("META-INF/container.xml")
+        if not container_xml:
+            return None
+        container = read_xml (StringIO.StringIO (container_xml), use_lxml)
+        if not container:
+            return None
+        rootfiles = container.get_maybe_exist_named_child ('rootfiles')
+        if not rootfiles:
+            return None
+        rootfile_list = rootfiles.get_named_children ('rootfile')
+        mxml_file = None
+        if len (rootfile_list) > 0:
+            mxml_file = getattr (rootfile_list[0], 'full-path', None)
+        if mxml_file:
+            raw_string = z.read (mxml_file)
+
+    if raw_string:
+        io_object = StringIO.StringIO (raw_string)
+    elif filename == "-":
+        io_object = sys.stdin
+    else:
+        io_object = filename
+
+    return read_xml (io_object, use_lxml)
+
+
 def convert (filename, options):
-    progress ("Reading MusicXML from %s ..." % filename)
-    
-    tree = read_musicxml (filename, options.use_lxml)
+    if filename == "-":
+        progress (_ ("Reading MusicXML from Standard input ...") )
+    else:
+        progress (_ ("Reading MusicXML from %s ...") % filename)
+
+    tree = read_musicxml (filename, options.compressed, options.use_lxml)
+    score_information = extract_score_information (tree)
+    paper_information = extract_paper_information (tree)
 
-    part_list = []
-    id_instrument_map = {}
-    if tree.get_maybe_exist_typed_child (musicxml.Part_list):
-        mxl_pl = tree.get_maybe_exist_typed_child (musicxml.Part_list)
-        part_list = mxl_pl.get_named_children ("score-part")
-        
     parts = tree.get_typed_children (musicxml.Part)
-    voices = get_all_voices (parts)
+    (voices, staff_info) = get_all_voices (parts)
+
+    score_structure = None
+    mxl_pl = tree.get_maybe_exist_typed_child (musicxml.Part_list)
+    if mxl_pl:
+        score_structure = extract_score_structure (mxl_pl, staff_info)
+        part_list = mxl_pl.get_named_children ("score-part")
+
+    # score information is contained in the <work>, <identification> or <movement-title> tags
+    update_score_setup (score_structure, part_list, voices)
+    # After the conversion, update the list of settings for the \layout block
+    update_layout_information ()
 
     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'
+    #defs_ly_name = options.output_name + '-defs.ly'
+    if (options.output_name == "-"):
+      output_ly_name = 'Standard output'
+    else:
+      output_ly_name = options.output_name + '.ly'
 
+    progress (_ ("Output to `%s'") % output_ly_name)
     printer = musicexp.Output_printer()
-    progress ("Output to `%s'" % defs_ly_name)
-    printer.set_file (open (defs_ly_name, 'w'))
-
+    #progress (_ ("Output to `%s'") % defs_ly_name)
+    if (options.output_name == "-"):
+      printer.set_file (codecs.getwriter ("utf-8")(sys.stdout))
+    else:
+      printer.set_file (codecs.open (output_ly_name, 'wb', encoding='utf-8'))
     print_ly_preamble (printer, filename)
+    print_ly_additional_definitions (printer, filename)
+    if score_information:
+        score_information.print_ly (printer)
+    if paper_information:
+        paper_information.print_ly (printer)
+    if layout_information:
+        layout_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 (open (driver_ly_name, 'w'))
-    print_ly_preamble (printer, filename)
-    printer.dump (r'\include "%s"' % defs_ly_name)
-    print_score_setup (printer, part_list, voices)
+    printer.newline ()
+    printer.dump ("% The score definition")
+    printer.newline ()
+    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 + "." + ext
+    if os.path.exists (newfilename):
+        return newfilename;
+    newfilename = filename + ext
+    if os.path.exists (newfilename):
+        return newfilename;
+    return ''
 
 def main ():
     opt_parser = option_parser()
 
+    global options
     (options, args) = opt_parser.parse_args ()
     if not args:
         opt_parser.print_usage()
         sys.exit (2)
 
-    voices = convert (args[0], options)
+    if options.language:
+        musicexp.set_pitch_language (options.language)
+        needed_additional_definitions.append (options.language)
+        additional_definitions[options.language] = "\\include \"%s.ly\"\n" % options.language
+    conversion_settings.ignore_beaming = not options.convert_beaming
+
+    # Allow the user to leave out the .xml or xml on the filename
+    if args[0]=="-": # Read from stdin
+        filename="-"
+    else:
+        filename = get_existing_filename_with_extension (args[0], "xml")
+        if not filename:
+            filename = get_existing_filename_with_extension (args[0], "mxl")
+            options.compressed = True
+    if filename and (filename == "-" or os.path.exists (filename)):
+        voices = convert (filename, options)
+    else:
+        progress (_ ("Unable to find input file %s") % args[0])
 
 if __name__ == '__main__':
     main()