X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmusicxml2ly.py;h=ec827b5d3992ebabe4648ea973aff6d1ac8e1fac;hb=b46a7d28f2ae341924eb642e71d8e8e3c3e40fbc;hp=defc576b1f6748971657f83f0f2e189847579b04;hpb=b385ae6e361eeec5b1a384de80123c04021595ec;p=lilypond.git diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index defc576b1f..ec827b5d39 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -22,7 +22,7 @@ import musicexp from rational import Rational -# Store command-line options in a global variable, so we can access them everythwere +# Store command-line options in a global variable, so we can access them everywhere options = None class Conversion_Settings: @@ -35,14 +35,6 @@ conversion_settings = Conversion_Settings () # this layout and add the corresponding settings layout_information = musicexp.Layout () -def progress (str): - 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 = { @@ -68,7 +60,7 @@ additional_definitions = { (let* ((ev (event-cause grob)) (den (if denominator denominator (ly:event-property ev 'denominator))) (num (if numerator numerator (ly:event-property ev 'numerator)))) - (format "~a:~a" den num))) + (format #f "~a:~a" den num))) """, } @@ -173,16 +165,26 @@ def extract_score_information (tree): if value: header.set_field (field, musicxml.escape_ly_output_string (value)) - movement_title = tree.get_maybe_exist_named_child ('movement-title') - if movement_title: - set_if_exists ('title', movement_title.get_text ()) work = tree.get_maybe_exist_named_child ('work') if work: - # Overwrite the title from movement-title with work->title - set_if_exists ('title', work.get_work_title ()) set_if_exists ('worknumber', work.get_work_number ()) set_if_exists ('opus', work.get_opus ()) + movement_title = tree.get_maybe_exist_named_child ('movement-title') + + # use either work-title or movement-title as title. + # if both exist use movement-title as subtitle. + # if there is only a movement-title (or work-title is empty or missing) the movement-title should be typeset as a title + if work: + work_title = work.get_work_title () + set_if_exists ('title', work_title) + if work_title == '': + set_if_exists ('title', movement_title.get_text ()) + elif movement_title: + set_if_exists ('subtitle', movement_title.get_text ()) + elif 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 ()) @@ -191,12 +193,14 @@ def extract_score_information (tree): 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 ()) + set_if_exists ('source', ids.get_source ()) + + # miscellaneous --> texidoc set_if_exists ('texidoc', ids.get_file_description ()); # Finally, apply the required compatibility modes @@ -221,7 +225,10 @@ def extract_score_information (tree): app_description = ignore_beaming_software.get (s, False); if app_description: conversion_settings.ignore_beaming = True - progress (_ ("Encountered file created by %s, containing wrong beaming information. All beaming information in the MusicXML file will be ignored") % app_description) + ly.warning (_ ("Encountered file created by %s, containing " + "wrong beaming information. All beaming " + "information in the MusicXML file will be " + "ignored") % app_description) # TODO: Check for other unsupported features return header @@ -237,9 +244,9 @@ 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) + ly.warning (_ ("Unprocessed PartGroupInfo %s encountered") % self) def ly_expression (self): - error_message (_ ("Unprocessed PartGroupInfo %s encountered") % self) + ly.warning (_ ("Unprocessed PartGroupInfo %s encountered") % self) return '' def musicxml_step_to_lily (step): @@ -258,7 +265,7 @@ def staff_attributes_to_string_tunings (mxl_attr): if staff_lines: lines = string.atoi (staff_lines.get_text ()) - tunings = [musicexp.Pitch()]*lines + tunings = [musicexp.Pitch()] * lines staff_tunings = details.get_named_children ('staff-tuning') for i in staff_tunings: p = musicexp.Pitch() @@ -467,8 +474,6 @@ def extract_score_structure (part_list, staffinfo): group_starts.append (pos) pos += 1 - if len (staves) == 1: - return staves[0] for i in staves: structure.append_staff (i) return score @@ -512,9 +517,9 @@ def rational_to_lily_duration (rational_len): d.duration_log = d_log d.factor = Rational (rational_len.numerator ()) else: - error_message (_ ("Encountered rational duration with denominator %s, " + ly.warning (_ ("Encountered rational duration with denominator %s, " "unable to convert to lilypond duration") % - rational_len.denominator ()) + rational_len.denominator ()) # TODO: Test the above error message return None @@ -526,7 +531,7 @@ def musicxml_partial_to_lily (partial_len): p.partial = rational_to_lily_duration (partial_len) return p else: - return Null + return None # Detect repeats and alternative endings in the chord event list (music_list) # and convert them to the corresponding musicexp objects, containing nested @@ -610,15 +615,15 @@ def group_repeats (music_list): 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 + 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] + s.elements = music_list[start + 1:end] r.add_ending (s) - del music_list[repeat_start:final_marker+1] + del music_list[repeat_start:final_marker + 1] music_list.insert (repeat_start, r) repeat_replaced = True pos += 1 @@ -630,11 +635,11 @@ def group_repeats (music_list): # elements of the note: def musicxml_tuplet_to_lily (tuplet_elt, time_modification): tsm = musicexp.TimeScaledMusic () - fraction = (1,1) + fraction = (1, 1) if time_modification: fraction = time_modification.get_fraction () tsm.numerator = fraction[0] - tsm.denominator = fraction[1] + tsm.denominator = fraction[1] normal_type = tuplet_elt.get_normal_type () @@ -759,7 +764,7 @@ def musicxml_time_to_lily (attributes): def musicxml_key_to_lily (attributes): key_sig = attributes.get_key_signature () if not key_sig or not (isinstance (key_sig, list) or isinstance (key_sig, tuple)): - error_message (_ ("Unable to extract key signature!")) + ly.warning (_ ("Unable to extract key signature!")) return None change = musicexp.KeySignatureChange() @@ -769,24 +774,24 @@ def musicxml_key_to_lily (attributes): (fifths, mode) = key_sig change.mode = mode - start_pitch = musicexp.Pitch () + start_pitch = musicexp.Pitch () start_pitch.octave = 0 try: - (n,a) = { - 'major' : (0,0), - 'minor' : (5,0), - 'ionian' : (0,0), - 'dorian' : (1,0), - 'phrygian' : (2,0), - 'lydian' : (3,0), - 'mixolydian': (4,0), - 'aeolian' : (5,0), - 'locrian' : (6,0), + (n, a) = { + 'major' : (0, 0), + 'minor' : (5, 0), + 'ionian' : (0, 0), + 'dorian' : (1, 0), + 'phrygian' : (2, 0), + 'lydian' : (3, 0), + 'mixolydian': (4, 0), + 'aeolian' : (5, 0), + 'locrian' : (6, 0), }[mode] start_pitch.step = n start_pitch.alteration = a except KeyError: - error_message (_ ("unknown mode %s, expecting 'major' or 'minor' " + ly.warning (_ ("unknown mode %s, expecting 'major' or 'minor' " "or a church mode!") % mode) fifth = musicexp.Pitch() @@ -821,9 +826,9 @@ def musicxml_transpose_to_lily (attributes): chromatic_shift = string.atoi (transpose.get_named_child ('chromatic').get_text ()) chromatic_shift_normalized = chromatic_shift % 12; (shift.step, shift.alteration) = [ - (0,0), (0,1), (1,0), (2,-1), (2,0), - (3,0), (3,1), (4,0), (5,-1), (5,0), - (6,-1), (6,0)][chromatic_shift_normalized]; + (0, 0), (0, 1), (1, 0), (2, -1), (2, 0), + (3, 0), (3, 1), (4, 0), (5, -1), (5, 0), + (6, -1), (6, 0)][chromatic_shift_normalized]; shift.octave += (chromatic_shift - chromatic_shift_normalized) / 12 @@ -860,7 +865,7 @@ def musicxml_staff_details_to_lily (attributes): def musicxml_attributes_to_lily (attrs): elts = [] - attr_dispatch = { + attr_dispatch = { 'clef': musicxml_clef_to_lily, 'time': musicxml_time_to_lily, 'key': musicxml_key_to_lily, @@ -924,7 +929,7 @@ class Marker (musicexp.Music): self.direction = 0 self.event = None def print_ly (self, printer): - ly.stderr_write (_ ("Encountered unprocessed marker %s\n") % self) + ly.warning (_ ("Encountered unprocessed marker %s\n") % self) pass def ly_expression (self): return "" @@ -1018,7 +1023,7 @@ def musicxml_spanner_to_lily_event (mxl_event): if func: ev = func() else: - error_message (_ ('unknown span event %s') % mxl_event) + ly.warning (_ ('unknown span event %s') % mxl_event) type = mxl_event.get_type () @@ -1028,7 +1033,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)) + ly.warning (_ ('unknown span type %s for %s') % (type, name)) ev.set_span_type (type) ev.line_type = getattr (mxl_event, 'line-type', 'solid') @@ -1162,7 +1167,7 @@ articulations_dict = { #"shake": "?", "snap-pizzicato": "snappizzicato", #"spiccato": "?", - "staccatissimo": (musicexp.ShortArticulationEvent, "|"), # or "staccatissimo" + "staccatissimo": (musicexp.ShortArticulationEvent, "!"), # or "staccatissimo" "staccato": (musicexp.ShortArticulationEvent, "."), # or "staccato" "stopped": (musicexp.ShortArticulationEvent, "+"), # or "stopped" #"stress": "?", @@ -1219,7 +1224,7 @@ def musicxml_dynamics_to_lily_event (dynentry): dynamicsname = dynentry.get_name () if dynamicsname == "other-dynamics": dynamicsname = dynentry.get_text () - if not dynamicsname or dynamicsname=="#text": + if not dynamicsname or dynamicsname == "#text": return if not dynamicsname in dynamics_available: @@ -1246,7 +1251,7 @@ def hexcolorval_to_nr (hex_val): 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)) + return map (lambda x: hexcolorval_to_nr (x), res.group (2, 3, 4)) else: return None @@ -1448,12 +1453,12 @@ def musicxml_metronome_to_ly (mxl_event): except ValueError: pass else: - error_message (_ ("Unknown metronome mark, ignoring")) + ly.warning (_ ("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 ( in MusicXML) are not yet implemented.")) + ly.warning (_ ("Metronome marks with complex relations ( in MusicXML) are not yet implemented.")) return # translate directions into Events, possible values: @@ -1655,7 +1660,7 @@ 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) + ly.warning (_ ("Unable to convert chord type %s to lilypond.") % kind) return res def musicxml_harmony_to_lily_chordname (n): @@ -1746,7 +1751,7 @@ def musicxml_figured_bass_to_lily (n): 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) + length = Rational(int(dur.get_text()), n._divisions) * Rational(1, 4) res.set_real_duration (length) duration = rational_to_lily_duration (length) if duration: @@ -1765,7 +1770,7 @@ instrument_drumtype_dict = { } def musicxml_note_to_lily_main_event (n): - pitch = None + pitch = None duration = None event = None @@ -1777,8 +1782,12 @@ def musicxml_note_to_lily_main_event (n): acc = n.get_maybe_exist_named_child ('accidental') if acc: - # let's not force accs everywhere. - event.cautionary = acc.cautionary + # AccidentalCautionary in lily has parentheses + # so treat accidental explicitly in parentheses as cautionary + if hasattr(acc, 'parentheses') and acc.parentheses == "yes": + event.cautionary = True + else: + event.cautionary = acc.cautionary # TODO: Handle editorial accidentals # TODO: Handle the level-display setting for displaying brackets/parentheses @@ -1901,7 +1910,7 @@ class LilyPondVoiceBuilder: def current_duration (self): return self.end_moment - self.begin_moment - def add_music (self, music, duration, relevant = True): + def add_music (self, music, duration, relevant=True): assert isinstance (music, musicexp.Music) if self.pending_multibar > Rational (0): self._insert_multibar () @@ -1918,13 +1927,13 @@ class LilyPondVoiceBuilder: self.pending_dynamics = [] # Insert some music command that does not affect the position in the measure - def add_command (self, command, relevant = True): + def add_command (self, command, relevant=True): assert isinstance (command, musicexp.Music) if self.pending_multibar > Rational (0): self._insert_multibar () self.has_relevant_elements = self.has_relevant_elements or relevant self.elements.append (command) - def add_barline (self, barline, relevant = False): + def add_barline (self, barline, relevant=False): # Insert only if we don't have a barline already # TODO: Implement proper merging of default barline and custom bar line has_relevant = self.has_relevant_elements @@ -1956,8 +1965,8 @@ class LilyPondVoiceBuilder: diff = moment - current_end if diff < Rational (0): - error_message (_ ('Negative skip %s (from position %s to %s)') % - (diff, current_end, moment)) + ly.warning (_ ('Negative skip %s (from position %s to %s)') + % (diff, current_end, moment)) diff = Rational (0) if diff > Rational (0) and not (self.ignore_skips and moment == 0): @@ -1993,7 +2002,7 @@ class LilyPondVoiceBuilder: value = None # if the position matches, find the last ChordEvent, do not cross a bar line! - at = len( self.elements ) - 1 + at = len(self.elements) - 1 while (at >= 0 and not isinstance (self.elements[at], musicexp.ChordEvent) and not isinstance (self.elements[at], musicexp.BarLine)): @@ -2433,7 +2442,7 @@ def musicxml_voice_to_lily_voice (voice): if len (modes_found) > 1: - error_message (_ ('cannot simultaneously have more than one mode: %s') % modes_found.keys ()) + ly.warning (_ ('cannot simultaneously have more than one mode: %s') % modes_found.keys ()) if options.relative: v = musicexp.RelativeMusic () @@ -2541,7 +2550,7 @@ def get_all_voices (parts): part_ly_voices = {} for n, v in name_voice.items (): - progress (_ ("Converting to LilyPond expressions...")) + ly.progress (_ ("Converting to LilyPond expressions..."), True) # musicxml_voice_to_lily_voice returns (lily_voice, {nr->lyrics, nr->lyrics}) part_ly_voices[n] = musicxml_voice_to_lily_voice (v) @@ -2564,7 +2573,7 @@ If the given filename is -, musicxml2ly reads from the command line. p.version = ('''%prog (LilyPond) @TOPLEVEL_VERSION@\n\n''' + -_ ("""Copyright (c) 2005--2011 by +_ ("""Copyright (c) 2005--2012 by Han-Wen Nienhuys , Jan Nieuwenhuizen and Reinhold Kainhofer @@ -2581,8 +2590,9 @@ information.""") % 'lilypond') help=_ ("show version number and exit")) p.add_option ('-v', '--verbose', - action = "store_true", - dest = 'verbose', + action="callback", + callback=ly.handle_loglevel_option, + callback_args=("DEBUG",), help = _ ("be verbose")) p.add_option ('', '--lxml', @@ -2613,6 +2623,14 @@ information.""") % 'lilypond') action = "store", help = _ ("use LANG for pitch names, e.g. 'deutsch' for note names in German")) + p.add_option ("--loglevel", + help=_ ("Print log messages according to LOGLEVEL " + "(NONE, ERROR, WARNING, PROGRESS (default), DEBUG)"), + metavar=_ ("LOGLEVEL"), + action='callback', + callback=ly.handle_loglevel_option, + type='string') + p.add_option ('--nd', '--no-articulation-directions', action = "store_false", default = True, @@ -2644,6 +2662,13 @@ information.""") % 'lilypond') type = 'string', dest = 'output_name', help = _ ("set output filename to FILE, stdout if -")) + + p.add_option ('-m', '--midi', + action = "store_true", + default = False, + dest = "midi", + help = _("activate midi-block")) + p.add_option_group ('', description = ( _ ("Report bugs via %s") @@ -2694,7 +2719,7 @@ def print_voice_definitions (printer, part_list, voices): def uniq_list (l): - return dict ([(elt,1) for elt in l]).keys () + return dict ([(elt, 1) for elt in l]).keys () # format the information about the staff in the form # [staffid, @@ -2726,7 +2751,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) + ly.warning (_ ('unknown part in part-list: %s') % part_id) continue staves = reduce (lambda x,y: x+ y, @@ -2756,7 +2781,7 @@ def update_layout_information (): def print_ly_preamble (printer, filename): printer.dump_version () - printer.print_verbatim ('%% automatically converted from %s\n' % filename) + printer.print_verbatim ('%% automatically converted by musicxml2ly from %s\n' % filename) def print_ly_additional_definitions (printer, filename): if needed_additional_definitions: @@ -2788,7 +2813,7 @@ def read_musicxml (filename, compressed, use_lxml): raw_string = None if compressed: if filename == "-": - progress (_ ("Input is compressed, extracting raw MusicXML data from stdin") ) + ly.progress (_ ("Input is compressed, extracting raw MusicXML data from stdin"), True) # unfortunately, zipfile.ZipFile can't read directly from # stdin, so copy everything from stdin to a temp file and read # that. TemporaryFile() will remove the file when it is closed. @@ -2801,7 +2826,7 @@ def read_musicxml (filename, compressed, use_lxml): bytes_read = sys.stdin.read (8192) z = zipfile.ZipFile (tmp, "r") else: - progress (_ ("Input file %s is compressed, extracting raw MusicXML data") % filename) + ly.progress (_ ("Input file %s is compressed, extracting raw MusicXML data") % filename, True) z = zipfile.ZipFile (filename, "r") container_xml = z.read ("META-INF/container.xml") if not container_xml: @@ -2831,9 +2856,9 @@ def read_musicxml (filename, compressed, use_lxml): def convert (filename, options): if filename == "-": - progress (_ ("Reading MusicXML from Standard input ...") ) + ly.progress (_ ("Reading MusicXML from Standard input ..."), True) else: - progress (_ ("Reading MusicXML from %s ...") % filename) + ly.progress (_ ("Reading MusicXML from %s ...") % filename, True) tree = read_musicxml (filename, options.compressed, options.use_lxml) score_information = extract_score_information (tree) @@ -2866,9 +2891,9 @@ def convert (filename, options): else: output_ly_name = options.output_name + '.ly' - progress (_ ("Output to `%s'") % output_ly_name) + ly.progress (_ ("Output to `%s'") % output_ly_name, True) printer = musicexp.Output_printer() - #progress (_ ("Output to `%s'") % defs_ly_name) + #ly.progress (_ ("Output to `%s'") % defs_ly_name, True) if (options.output_name == "-"): printer.set_file (codecs.getwriter ("utf-8")(sys.stdout)) else: @@ -2911,6 +2936,9 @@ def main (): opt_parser.print_usage() sys.exit (2) + if options.midi: + musicexp.set_create_midi (options.midi) + if options.language: musicexp.set_pitch_language (options.language) needed_additional_definitions.append (options.language) @@ -2933,7 +2961,7 @@ def main (): if filename and (filename == "-" or os.path.exists (filename)): voices = convert (filename, options) else: - progress (_ ("Unable to find input file %s") % basefilename) + ly.error (_ ("Unable to find input file %s") % basefilename) if __name__ == '__main__': main()