X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmusicxml2ly.py;h=1f7f076b45d06ddff866e43a40baa81e90f696a6;hb=df5215a898b88a2af7c0f504148e2ad013ee3ccd;hp=9dfb81cfb7867f61a6993709d3c6ab30c94c32f3;hpb=e70e32f80835d8bfa34575f533d044ac754dbbe8;p=lilypond.git diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index 9dfb81cfb7..1f7f076b45 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -8,13 +8,13 @@ import string import codecs import zipfile import StringIO -from gettext import gettext as _ """ @relocate-preamble@ """ import lilylib as ly +_ = ly._ import musicxml import musicexp @@ -24,12 +24,22 @@ 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): - stderr_write (str + '\n') + ly.stderr_write (str + '\n') sys.stderr.flush () def error_message (str): - stderr_write (str + '\n') + ly.stderr_write (str + '\n') sys.stderr.flush () needed_additional_definitions = [] @@ -42,21 +52,34 @@ additional_definitions = { (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 - ) - ) - ) -) -""" + '(-0.1 . 0.1) '(0.1 . 1))) + 0.7 X))))""", + "eyeglasses": """eyeglassesps = #"0.15 setlinewidth +% 255 0 0 setrgbcolor +-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_layout_information (tree): +def extract_paper_information (tree): paper = musicexp.Paper () defaults = tree.get_maybe_exist_named_child ('defaults') if not defaults: @@ -178,6 +201,19 @@ def extract_score_information (tree): 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: @@ -191,12 +227,11 @@ class PartGroupInfo: def add_end (self, g): self.end[getattr (g, 'number', "1")] = g def print_ly (self, printer): - error_message ("Unprocessed PartGroupInfo %s encountered" % self) + error_message (_ ("Unprocessed PartGroupInfo %s encountered") % self) def ly_expression (self): - error_message ("Unprocessed PartGroupInfo %s encountered" % 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: @@ -219,7 +254,7 @@ def staff_attributes_to_string_tunings (mxl_attr): step = i.get_named_child (u'tuning-step') step = step.get_text ().strip () - p.step = (ord (step) - ord ('A') + 7 - 2) % 7 + p.step = musicxml_step_to_lily (step) octave = i.get_named_child (u'tuning-octave') octave = octave.get_text ().strip () @@ -250,9 +285,9 @@ def staff_attributes_to_lily_staff (mxl_attr): clef_sign = {"percussion": "percussion", "TAB": "tab"}.get (sign.get_text (), None) lines = 5 - details = attributes.get_maybe_exist_named_child ('staff-details') - if details: - staff_lines = details.get_maybe_exist_named_child ('staff-lines') + 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 ()) @@ -273,10 +308,10 @@ def staff_attributes_to_lily_staff (mxl_attr): return staff -def extract_score_layout (part_list, staffinfo): - layout = musicexp.StaffGroup (None) +def extract_score_structure (part_list, staffinfo): + structure = musicexp.StaffGroup (None) if not part_list: - return layout + return structure def read_score_part (el): if not isinstance (el, musicxml.Score_part): @@ -401,9 +436,8 @@ def extract_score_layout (part_list, staffinfo): if len (staves) == 1: return staves[0] for i in staves: - layout.append_staff (i) - return layout - + structure.append_staff (i) + return structure def musicxml_duration_to_lily (mxl_note): @@ -422,16 +456,26 @@ def musicxml_duration_to_lily (mxl_note): def rational_to_lily_duration (rational_len): d = musicexp.Duration () - d.duration_log = {1: 0, 2: 1, 4:2, 8:3, 16:4, 32:5, 64:6, 128:7, 256:8, 512:9}.get (rational_len.denominator (), -1) - d.factor = Rational (rational_len.numerator ()) - if d.duration_log < 0: - error_message ("Encountered rational duration with denominator %s, " - "unable to convert to lilypond duration" % + + rational_len.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 - else: - return d + + return d def musicxml_partial_to_lily (partial_len): if partial_len > 0: @@ -608,7 +652,7 @@ def musicxml_key_to_lily (attributes): start_pitch.step = n start_pitch.alteration = a except KeyError: - error_message ('unknown mode %s' % mode) + error_message (_ ("unknown mode %s, expecting 'major' or 'minor'") % mode) fifth = musicexp.Pitch() fifth.step = 4 @@ -646,7 +690,7 @@ class Marker (musicexp.Music): self.direction = 0 self.event = None def print_ly (self, printer): - sys.stderr.write ("Encountered unprocessed marker %s\n" % self) + ly.stderr_write (_ ("Encountered unprocessed marker %s\n") % self) pass def ly_expression (self): return "" @@ -707,12 +751,15 @@ def musicxml_barline_to_lily (barline): 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, - 'octave-shift' : musicexp.OctaveShiftEvent, 'wedge' : musicexp.HairpinEvent } spanner_type_dict = { @@ -722,6 +769,7 @@ spanner_type_dict = { 'decreschendo': -1, 'diminuendo': -1, 'continue': 0, + 'change': 0, 'up': -1, 'down': -1, 'stop': 1, @@ -736,7 +784,7 @@ def musicxml_spanner_to_lily_event (mxl_event): if func: ev = func() else: - error_message ('unknown span event %s' % mxl_event) + error_message (_ ('unknown span event %s') % mxl_event) type = mxl_event.get_type () @@ -746,7 +794,7 @@ def musicxml_spanner_to_lily_event (mxl_event): if span_direction != None: ev.span_direction = span_direction else: - error_message ('unknown span type %s for %s' % (type, name)) + error_message (_ ('unknown span type %s for %s') % (type, name)) ev.set_span_type (type) ev.line_type = getattr (mxl_event, 'line-type', 'solid') @@ -757,27 +805,47 @@ def musicxml_spanner_to_lily_event (mxl_event): return ev def musicxml_direction_to_indicator (direction): - return { "above": 1, "upright": 1, "up":1, "below": -1, "downright": -1, "down": -1 }.get (direction, 0) + 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 and options.convert_directions: ev.force_direction = dir return ev - 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): @@ -785,6 +853,12 @@ def musicxml_bend_to_lily_event (mxl_event): 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 () @@ -835,13 +909,13 @@ articulations_dict = { "accidental-mark": musicxml_accidental_mark, "bend": musicxml_bend_to_lily_event, "breath-mark": (musicexp.NoDirectionArticulationEvent, "breathe"), - #"caesura": "caesura", + "caesura": musicxml_caesura_to_lily_event, #"delayed-turn": "?", "detached-legato": (musicexp.ShortArticulationEvent, "_"), # or "portato" - #"doit": "", + "doit": musicxml_doit_to_lily_event, #"double-tongue": "", "down-bow": "downbow", - #"falloff": "", + "falloff": musicxml_falloff_to_lily_event, "fingering": musicxml_fingering_event, #"fingernails": "", #"fret": "", @@ -868,7 +942,7 @@ articulations_dict = { "strong-accent": (musicexp.ShortArticulationEvent, "^"), # or "marcato" #"tap": "", "tenuto": (musicexp.ShortArticulationEvent, "-"), # or "tenuto" - #"thumb-position": "", + "thumb-position": "thumb", #"toe": "", "turn": "turn", "tremolo": musicxml_tremolo_to_lily_event, @@ -909,15 +983,26 @@ def musicxml_articulation_to_lily_event (mxl_event): return ev + def musicxml_dynamics_to_lily_event (dynentry): - dynamics_available = ( "p", "pp", "ppp", "pppp", "ppppp", "pppppp", - "f", "ff", "fff", "ffff", "fffff", "ffffff", - "mp", "mf", "sf", "sfp", "sfpp", "fp", - "rf", "rfz", "sfz", "sffz", "fz" ) - if not dynentry.get_name() in dynamics_available: + 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 = dynentry.get_name () + event.type = dynamicsname return event # Convert single-color two-byte strings to numbers 0.0 - 1.0 @@ -994,16 +1079,144 @@ def musicxml_words_to_lily_event (words): return event -direction_spanners = [ 'octave-shift', 'pedal', 'wedge' ] +# 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") + +# 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' : + '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 element! 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 if entry.get_name () == "dynamics": for dynentry in entry.get_all_children (): @@ -1011,18 +1224,6 @@ def musicxml_direction_to_lily (n): if ev: res.append (ev) - if entry.get_name () == "words": - ev = musicxml_words_to_lily_event (entry) - if ev: - res.append (ev) - - # octave shifts. pedal marks, hairpins etc. are spanners: - if entry.get_name() in direction_spanners: - event = musicxml_spanner_to_lily_event (entry) - if event: - res.append (event) - - return res def musicxml_frame_to_lily_event (frame): @@ -1059,6 +1260,56 @@ def musicxml_harmony_to_lily (n): 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: + # TODO: implement duration (given in base steps!) + # 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 = { 'Acoustic Snare Drum': 'acousticsnare', 'Side Stick': 'sidestick', @@ -1071,39 +1322,49 @@ instrument_drumtype_dict = { 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): # 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() + event = musicexp.RestEvent () pitch = musicxml_restdisplay_to_lily (rest) event.pitch = pitch + elif n.instrument_name: event = musicexp.NoteEvent () drum_type = instrument_drumtype_dict.get (n.instrument_name) if drum_type: event.drum_type = drum_type else: - n.message ("drum %s type unknown, please add to instrument_drumtype_dict" % n.instrument_name) + 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 @@ -1150,7 +1411,7 @@ class LilyPondVoiceBuilder: self.set_duration (duration) # Insert all pending dynamics right after the note/rest: - if isinstance (music, musicexp.EventChord) and self.pending_dynamics: + if isinstance (music, musicexp.ChordEvent) and self.pending_dynamics: for d in self.pending_dynamics: music.append (d) self.pending_dynamics = [] @@ -1182,7 +1443,7 @@ class LilyPondVoiceBuilder: diff = moment - current_end if diff < Rational (0): - error_message ('Negative skip %s' % diff) + error_message (_ ('Negative skip %s') % diff) diff = Rational (0) if diff > Rational (0) and not (self.ignore_skips and moment == 0): @@ -1197,13 +1458,14 @@ class LilyPondVoiceBuilder: 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.EventChord () + evc = musicexp.ChordEvent () evc.elements.append (skip) self.add_music (evc, diff) @@ -1214,16 +1476,16 @@ class LilyPondVoiceBuilder: value = None - # if the position matches, find the last EventChord, do not cross a bar line! + # 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.EventChord) and + not isinstance (self.elements[at], musicexp.ChordEvent) and not isinstance (self.elements[at], musicexp.BarLine)): at -= 1 if (self.elements and at >= 0 - and isinstance (self.elements[at], musicexp.EventChord) + and isinstance (self.elements[at], musicexp.ChordEvent) and self.begin_moment == starting_at): value = self.elements[at] else: @@ -1234,17 +1496,25 @@ class LilyPondVoiceBuilder: 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.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 = {} @@ -1259,9 +1529,12 @@ def musicxml_voice_to_lily_voice (voice): inside_slur = False is_tied = False is_chord = False + is_beamed = False ignore_lyrics = False current_staff = None + + pending_figured_bass = [] # Make sure that the keys in the dict don't get reordered, since # we need the correct ordering of the lyrics stanzas! By default, @@ -1270,7 +1543,8 @@ def musicxml_voice_to_lily_voice (voice): for k in return_value.lyrics_order: lyrics[k] = [] - voice_builder = LilyPondVoiceBuilder() + voice_builder = LilyPondVoiceBuilder () + figured_bass_builder = LilyPondVoiceBuilder () for n in voice._elements: if n.get_name () == 'forward': @@ -1303,6 +1577,12 @@ def musicxml_voice_to_lily_voice (voice): else: voice_builder.add_command (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: @@ -1310,7 +1590,7 @@ def musicxml_voice_to_lily_voice (voice): 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): @@ -1335,7 +1615,7 @@ def musicxml_voice_to_lily_voice (voice): continue if not n.__class__.__name__ == 'Note': - error_message ('not a Note or Attributes? %s' % 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) @@ -1356,15 +1636,15 @@ def musicxml_voice_to_lily_voice (voice): main_event = musicxml_note_to_lily_main_event (n) if main_event and not first_pitch: first_pitch = main_event.pitch - ignore_lyrics = inside_slur or is_tied or is_chord + # 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 hasattr (main_event, 'drum_type') and main_event.drum_type: + 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) grace = n.get_maybe_exist_typed_child (musicxml.Grace) @@ -1373,14 +1653,12 @@ def musicxml_voice_to_lily_voice (voice): if n.get_maybe_exist_typed_child (musicxml.Chord) and ev_chord.grace_elements: grace_chord = ev_chord.grace_elements.get_last_event_chord () if not grace_chord: - grace_chord = musicexp.EventChord () + 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" - elif grace.slash == "no": - ev_chord.grace_type = "grace" # now that we have inserted the chord into the grace music, insert # everything into that chord instead of the ev_chord ev_chord = grace_chord @@ -1394,6 +1672,18 @@ def musicxml_voice_to_lily_voice (voice): 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: + figured_bass_builder.add_music (fb, fb.real_duration) + pending_figured_bass = [] + + notations_children = n.get_typed_children (musicxml.Notations) tuplet_event = None span_events = [] @@ -1416,7 +1706,7 @@ def musicxml_voice_to_lily_voice (voice): if s.get_type () in ('start','stop')] if slurs: if len (slurs) > 1: - error_message ('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': @@ -1446,12 +1736,25 @@ def musicxml_voice_to_lily_voice (voice): 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 ! + 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 | @@ -1468,12 +1771,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') @@ -1490,30 +1787,18 @@ def musicxml_voice_to_lily_voice (voice): if ev: ev_chord.append (ev) - # Extract the lyrics - if not rest and not ignore_lyrics: - note_lyrics_processed = [] - note_lyrics_elements = n.get_typed_children (musicxml.Lyric) - for l in note_lyrics_elements: - if l.get_number () < 0: - for k in lyrics.keys (): - lyrics[k].append (l.lyric_to_text ()) - note_lyrics_processed.append (k) - else: - lyrics[l.number].append(l.lyric_to_text ()) - note_lyrics_processed.append (l.number) - for lnr in lyrics.keys (): - if not lnr in note_lyrics_processed: - lyrics[lnr].append ("\skip4") - mxl_beams = [b for b in n.get_named_children ('beam') if (b.get_type () in ('begin', 'end') and b.is_primary ())] - if mxl_beams: + 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) @@ -1523,8 +1808,24 @@ 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) @@ -1543,7 +1844,7 @@ def musicxml_voice_to_lily_voice (voice): if len (modes_found) > 1: - error_message ('Too many modes found %s' % modes_found.keys ()) + error_message (_ ('cannot simultaneously have more than one mode: %s') % modes_found.keys ()) if options.relative: v = musicexp.RelativeMusic () @@ -1558,9 +1859,17 @@ def musicxml_voice_to_lily_voice (voice): v.mode = mode return_value.ly_voice = v + # create \figuremode { figured bass elements } + if figured_bass_builder.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 + return return_value - def musicxml_id_to_lily (id): digits = ['Zero', 'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten'] @@ -1572,20 +1881,30 @@ 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 = (ord (step) - ord ('A') + 7 - 2) % 7 + p = musicexp.Pitch () + p.step = musicxml_step_to_lily (step) octave = mxl_rest.get_octave () if octave and p: p.octave = octave - 4 @@ -1614,7 +1933,7 @@ def get_all_voices (parts): part_ly_voices = {} for n, v in name_voice.items (): - progress ("Converting to LilyPond expressions...") + 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) @@ -1625,61 +1944,84 @@ def get_all_voices (parts): def option_parser (): - p = ly.get_option_parser(usage=_ ("musicxml2ly [options] FILE.xml"), - version=('''%prog (LilyPond) @TOPLEVEL_VERSION@\n\n''' + p = ly.get_option_parser (usage = _ ("musicxml2ly [options] FILE.xml"), + description = _ ("Convert MusicXML from FILE.xml to LilyPond input. If the given filename is -, musicxml2ly reads from the command line.") + "\n", + 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''' + _ ("""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 +Copyright (c) 2005--2008 by Han-Wen Nienhuys , Jan Nieuwenhuizen and Reinhold Kainhofer -"""), - description=_ ("Convert %s to LilyPond input.") % 'MusicXML' + "\n") +""") + 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.")) + 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 relative mode.")) + help = _ ("convert pitches in absolute mode")) p.add_option ('-l', '--language', + metavar = _ ("LANG"), action = "store", - help = _ ("Use a different language file, e.g. 'deutsch' for deutsch.ly.")) + help = _ ("use a different language file 'LANG.ly' and corresponding pitch names, e.g. 'deutsch' for deutsch.ly")) - p.add_option ('--no-articulation-directions', '--nd', + p.add_option ('--nd', '--no-articulation-directions', action = "store_false", default = True, dest = "convert_directions", - help = _ ("Do not convert directions (^, _ or -) for articulations.")) + 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 (ly.display_encode (_ ('Bugs')), + description = (_ ("Report bugs via") + ''' http://post.gmane.org/post.php''' '''?group=gmane.comp.gnu.lilypond.bugs\n''')) return p @@ -1692,6 +2034,10 @@ 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 print_voice_definitions (printer, part_list, voices): for part in part_list: part_id = part.id @@ -1703,9 +2049,14 @@ def print_voice_definitions (printer, part_list, voices): printer.newline() for l in voice.lyrics_order: lname = music_xml_lyrics_name_to_lily_name (part_id, name, l) - printer.dump ('%s = ' %lname ) + 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): @@ -1714,19 +2065,22 @@ def uniq_list (l): # format the information about the staff in the form # [staffid, # [ -# [voiceid1, [lyricsid11, lyricsid12,...] ...], -# [voiceid2, [lyricsid21, lyricsid22,...] ...], +# [voiceid1, [lyricsid11, lyricsid12,...], figuredbassid1], +# [voiceid2, [lyricsid21, lyricsid22,...], figuredbassid2], # ... # ] # ] -# raw_voices is of the form [(voicename, lyricsids)*] +# raw_voices is of the form [(voicename, lyricsids, havefiguredbass)*] def format_staff_info (part_id, staff_id, raw_voices): voices = [] - for (v, lyricsids) in raw_voices: + for (v, lyricsids, figured_bass) 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] - voices.append ([voice_name, voice_lyrics]) + figured_bass_name = '' + if figured_bass: + figured_bass_name = music_xml_figuredbass_name_to_lily_name (part_id, v) + voices.append ([voice_name, voice_lyrics, figured_bass_name]) return [staff_id, voices] def update_score_setup (score_structure, part_list, voices): @@ -1735,7 +2089,7 @@ def update_score_setup (score_structure, part_list, voices): 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) + error_message (_ ('unknown part in part-list: %s') % part_id) continue staves = reduce (lambda x,y: x+ y, @@ -1748,16 +2102,21 @@ def update_score_setup (score_structure, part_list, voices): staves = uniq_list (staves) staves.sort () for s in staves: - thisstaff_raw_voices = [(voice_name, voice.lyrics_order) + thisstaff_raw_voices = [(voice_name, voice.lyrics_order, voice.figured_bass) 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: - thisstaff_raw_voices = [(voice_name, voice.lyrics_order) + thisstaff_raw_voices = [(voice_name, voice.lyrics_order, voice.figured_bass) 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) @@ -1769,6 +2128,7 @@ def print_ly_additional_definitions (printer, filename): 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 @@ -1790,8 +2150,12 @@ def read_xml (io_object, use_lxml): def read_musicxml (filename, compressed, use_lxml): raw_string = None if compressed: - progress ("Input file %s is compressed, extracting raw MusicXML data" % filename) - z = zipfile.ZipFile (filename, "r") + 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 @@ -1808,30 +2172,39 @@ def read_musicxml (filename, compressed, use_lxml): if mxml_file: raw_string = z.read (mxml_file) - io_object = filename 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) - + 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) + parts = tree.get_typed_children (musicxml.Part) (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_layout (mxl_pl, staff_info) + score_structure = extract_score_structure (mxl_pl, staff_info) part_list = mxl_pl.get_named_children ("score-part") # score information is contained in the , or tags - score_information = extract_score_information (tree) - layout_information = extract_layout_information (tree) 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) @@ -1840,29 +2213,32 @@ def convert (filename, options): 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 (codecs.open (defs_ly_name, 'wb', encoding='utf-8')) - + #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 (codecs.open (driver_ly_name, 'wb', encoding='utf-8')) - print_ly_preamble (printer, filename) - printer.dump (r'\include "%s"' % os.path.basename (defs_ly_name)) + printer.newline () + printer.dump ("% The score definition") + printer.newline () score_structure.print_ly (printer) printer.newline () @@ -1892,16 +2268,20 @@ def main (): 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 - 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 os.path.exists (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]) + progress (_ ("Unable to find input file %s") % args[0]) if __name__ == '__main__': main()