from rational import Rational
+# Store command-line options in a global variable, so we can access them everythwere
+options = None
def progress (str):
sys.stderr.write (str + '\n')
sys.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
+ )
+ )
+ )
+)
+"""
+}
+
+def round_to_two_digits (val):
+ return round (val * 100) / 100
+
+def extract_layout_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_data ())
+ # 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_data ())
+ # 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):
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 = (ord (step) - ord ('A') + 7 - 2) % 7
+
+ 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_maybe_exist_named_child ('staff-details')
+ if details:
+ staff_lines = details.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 ()
-def extract_score_layout (part_list):
+ return staff
+
+
+def extract_score_layout (part_list, staffinfo):
layout = musicexp.StaffGroup (None)
- currentgroups_dict = {}
- currentgroups = []
if not part_list:
return layout
- def insert_into_layout (object):
- if len (currentgroups) > 0:
- group_to_insert = currentgroups_dict.get (currentgroups [-1], layout)
- else:
- group_to_insert = layout
- group_to_insert.appendStaff (object)
- return group_to_insert
-
def read_score_part (el):
if not isinstance (el, musicxml.Score_part):
return
- staff = musicexp.Staff ()
+ # 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!
# 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, so
- # we can't go through the children sequentially!
- if len (parts_groups) == 1 and isinstance (parts_group[1], musicxml.Score_part):
- return read_score_part (parts_group[1])
+ # 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)
- insert_into_layout (staff)
+ if staff:
+ staves.append (staff)
elif isinstance (el, musicxml.Part_group):
if el.type == "start":
- group = musicexp.StaffGroup ()
- staff_group = insert_into_layout (group)
- # If we're inserting a nested staffgroup, we need to use InnerStaffGroup
- if staff_group != layout:
- group.stafftype = "InnerStaffGroup"
- 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 ()
-
+ group_info.add_start (el)
elif el.type == "stop":
- # end the part-group, i.e. simply remove it from the lists
- if hasattr (el, 'number'):
- pid = el.number
- elif len (currentgroups) > 0:
- pid = el[-1]
- if pid:
- del currentgroups_dict[pid]
- currentgroups.remove (pid)
+ group_info.add_end (el)
+ if not group_info.is_empty ():
+ staves.append (group_info)
+
+ # 2) Now, detect the groups:
+ group_starts = []
+ pos = 0
+ while pos < len (staves):
+ el = staves[pos]
+ if isinstance (el, PartGroupInfo):
+ prev_start = 0
+ if len (group_starts) > 0:
+ prev_start = group_starts[-1]
+ elif len (el.end) > 0: # no group to end here
+ el.end = {}
+ if len (el.end) > 0: # closes an existing group
+ ends = el.end.keys ()
+ prev_started = staves[prev_start].start.keys ()
+ grpid = None
+ intersection = filter(lambda x:x in ends, prev_started)
+ if len (intersection) > 0:
+ grpid = intersection[0]
+ else:
+ # Close the last started group
+ grpid = staves[prev_start].start.keys () [0]
+ # Find the corresponding closing tag and remove it!
+ j = pos + 1
+ foundclosing = False
+ while j < len (staves) and not foundclosing:
+ if isinstance (staves[j], PartGroupInfo) and staves[j].end.has_key (grpid):
+ foundclosing = True
+ del staves[j].end[grpid]
+ if staves[j].is_empty ():
+ del staves[j]
+ j += 1
+ grpobj = staves[prev_start].start[grpid]
+ group = read_score_group (grpobj)
+ # remove the id from both the start and end
+ if el.end.has_key (grpid):
+ del el.end[grpid]
+ del staves[prev_start].start[grpid]
+ if el.is_empty ():
+ del staves[pos]
+ # replace the staves with the whole group
+ for j in staves[(prev_start + 1):pos]:
+ if j.is_group:
+ j.stafftype = "InnerStaffGroup"
+ group.append_staff (j)
+ del staves[(prev_start + 1):pos]
+ staves.insert (prev_start + 1, group)
+ # reset pos so that we continue at the correct position
+ pos = prev_start
+ # remove an empty start group
+ if staves[prev_start].is_empty ():
+ del staves[prev_start]
+ group_starts.remove (prev_start)
+ pos -= 1
+ elif len (el.start) > 0: # starts new part groups
+ group_starts.append (pos)
+ pos += 1
+
+ if len (staves) == 1:
+ return staves[0]
+ for i in staves:
+ layout.append_staff (i)
return layout
def group_repeats (music_list):
repeat_replaced = True
music_start = 0
- i=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<10:
+ while repeat_replaced and i < 100:
i += 1
repeat_start = -1 # position of repeat start / end
repeat_end = -1 # position of repeat start / end
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:
repeat.times = 2
repeat.event = barline
if repeat.direction == -1:
- retval[1] = repeat
- else:
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[0] = ending
- else:
retval[4] = ending
+ else:
+ retval[0] = ending
if bartype:
b = musicexp.BarLine ()
return ev
def musicxml_direction_to_indicator (direction):
- return { "above": 1, "upright": 1, "below": -1, "downright": -1 }.get (direction, '')
+ return { "above": 1, "upright": 1, "up":1, "below": -1, "downright": -1, "down": -1 }.get (direction, 0)
def musicxml_fermata_to_lily_event (mxl_event):
ev = musicexp.ArticulationEvent ()
ev.type = "fermata"
if hasattr (mxl_event, 'type'):
dir = musicxml_direction_to_indicator (mxl_event.type)
- if dir:
+ 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_tremolo_to_lily_event (mxl_event):
ev = musicexp.TremoloEvent ()
ev.bars = mxl_event.get_text ()
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",
# -) (class, name) (like string, only that a different class than ArticulationEvent is used)
# TODO: Some translations are missing!
articulations_dict = {
- "accent": (musicexp.ShortArticulationEvent, ">"),
+ "accent": (musicexp.ShortArticulationEvent, ">"), # or "accent"
"accidental-mark": musicxml_accidental_mark,
"bend": musicxml_bend_to_lily_event,
"breath-mark": (musicexp.NoDirectionArticulationEvent, "breathe"),
#"caesura": "caesura",
#"delayed-turn": "?",
- #"detached-legato": "",
+ "detached-legato": (musicexp.ShortArticulationEvent, "_"), # or "portato"
#"doit": "",
#"double-tongue": "",
"down-bow": "downbow",
"inverted-mordent": "prall",
"inverted-turn": "reverseturn",
"mordent": "mordent",
- #"open-string": "",
+ "open-string": "open",
#"plop": "",
#"pluck": "",
- #"portato": (musicexp.ShortArticulationEvent, "_"), # does not exist in MusicXML
#"pull-off": "",
#"schleifer": "?",
#"scoop": "",
#"shake": "?",
- #"snap-pizzicato": "",
+ "snap-pizzicato": musicxml_snappizzicato_event,
#"spiccato": "",
- "staccatissimo": (musicexp.ShortArticulationEvent, "|"),
- "staccato": (musicexp.ShortArticulationEvent, "."),
- "stopped": (musicexp.ShortArticulationEvent, "+"),
+ "staccatissimo": (musicexp.ShortArticulationEvent, "|"), # or "staccatissimo"
+ "staccato": (musicexp.ShortArticulationEvent, "."), # or "staccato"
+ "stopped": (musicexp.ShortArticulationEvent, "+"), # or "stopped"
#"stress": "",
- #"string": "",
- "strong-accent": (musicexp.ShortArticulationEvent, "^"),
+ "string": musicxml_string_event,
+ "strong-accent": (musicexp.ShortArticulationEvent, "^"), # or "marcato"
#"tap": "",
- "tenuto": (musicexp.ShortArticulationEvent, "-"),
+ "tenuto": (musicexp.ShortArticulationEvent, "-"), # or "tenuto"
#"thumb-position": "",
#"toe": "",
"turn": "turn",
# 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
text = re.sub (' *\n? *$', '', text)
event.text = text
- if hasattr (words, 'default-y'):
+ if hasattr (words, 'default-y') and options.convert_directions:
offset = getattr (words, 'default-y')
try:
off = string.atoi (offset)
return res
+def musicxml_frame_to_lily_event (frame):
+ ev = musicexp.FretEvent ()
+ ev.strings = frame.get_strings ()
+ ev.frets = frame.get_frets ()
+ #offset = frame.get_first_fret () - 1
+ barre = []
+ for fn in frame.get_named_children ('frame-note'):
+ fret = fn.get_fret ()
+ if fret <= 0:
+ fret = "o"
+ el = [ fn.get_string (), fret ]
+ fingering = fn.get_fingering ()
+ if fingering >= 0:
+ el.append (fingering)
+ ev.elements.append (el)
+ b = fn.get_barre ()
+ if b == 'start':
+ barre[0] = el[0] # start string
+ barre[2] = el[1] # fret
+ elif b == 'stop':
+ barre[1] = el[0] # end string
+ if barre:
+ ev.barre = barre
+ return ev
+
+def musicxml_harmony_to_lily (n):
+ res = []
+ for f in n.get_named_children ('frame'):
+ ev = musicxml_frame_to_lily_event (f)
+ if ev:
+ res.append (ev)
+
+ return res
+
instrument_drumtype_dict = {
'Acoustic Snare Drum': 'acousticsnare',
'Side Stick': 'sidestick',
error_message ('Negative skip %s' % diff)
diff = Rational (0)
- if diff > Rational (0) and not self.ignore_skips:
+ if diff > Rational (0) and not (self.ignore_skips and moment == 0):
skip = musicexp.SkipEvent()
skip.duration.duration_log = 0
skip.duration.factor = diff
self.begin_moment = goto
evc = musicexp.EventChord ()
self.elements.append (evc)
-
+
+
+class VoiceData:
+ def __init__ (self):
+ self.voicedata = None
+ self.ly_voice = None
+ self.lyrics_dict = {}
+ self.lyrics_order = []
+
def musicxml_voice_to_lily_voice (voice):
tuplet_events = []
modes_found = {}
lyrics = {}
+ return_value = VoiceData ()
+ return_value.voicedata = voice
# Needed for melismata detection (ignore lyrics on those notes!):
inside_slur = False
is_chord = False
ignore_lyrics = False
- # TODO: Make sure that the keys in the dict don't get reordered, since
- # we need the correct ordering of the lyrics stanzas! By default,
- # a dict will reorder its keys
- for k in voice.get_lyrics_numbers ():
+ current_staff = None
+
+ # Make sure that the keys in the dict don't get reordered, since
+ # we need the correct ordering of the lyrics stanzas! By default,
+ # a dict will reorder its keys
+ return_value.lyrics_order = voice.get_lyrics_numbers ()
+ for k in return_value.lyrics_order:
lyrics[k] = []
voice_builder = LilyPondVoiceBuilder()
for n in voice._elements:
if n.get_name () == 'forward':
continue
+ staff = n.get_maybe_exist_named_child ('staff')
+ if staff:
+ staff = staff.get_text ()
+ if current_staff and staff <> current_staff and not n.get_maybe_exist_named_child ('chord'):
+ voice_builder.add_command (musicexp.StaffChange (staff))
+ current_staff = staff
if isinstance (n, musicxml.Partial) and n.partial > 0:
a = musicxml_partial_to_lily (n.partial)
else:
voice_builder.add_command (a)
continue
-
+
+ if isinstance (n, musicxml.Harmony):
+ for a in musicxml_harmony_to_lily (n):
+ if a.wait_for_note ():
+ voice_builder.add_dynamics (a)
+ else:
+ voice_builder.add_command (a)
+ continue
+
is_chord = n.get_maybe_exist_named_child ('chord')
if not is_chord:
try:
if voice_builder.current_duration () == 0 and n._duration > 0:
voice_builder.set_duration (n._duration)
- notations = n.get_maybe_exist_typed_child (musicxml.Notations)
+ notations_children = n.get_typed_children (musicxml.Notations)
tuplet_event = None
span_events = []
# ornaments | technical | articulations | dynamics |
# +fermata | arpeggiate | non-arpeggiate |
# accidental-mark | other-notation
- if notations:
+ for notations in notations_children:
if notations.get_tuplet():
tuplet_event = notations.get_tuplet()
mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
if len (slurs) > 1:
error_message ('more than 1 slur?')
# record the slur status for the next note in the loop
- if slurs[0].get_type () == 'start':
- inside_slur = True
- elif slurs[0].get_type () == 'stop':
- inside_slur = False
+ 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 ())
- is_tied = True
- else:
- is_tied = False
+ 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:
arpeggiate = notations.get_named_children ('arpeggiate')
for a in arpeggiate:
- ev_chord.append (musicexp.ArpeggioEvent ())
+ ev = musicxml_arpeggiate_to_lily_event (a)
+ if ev:
+ ev_chord.append (ev)
glissandos = notations.get_named_children ('glissando')
for a in glissandos:
if not isinstance(e, musicexp.KeySignatureChange)]
seq_music.elements = ly_voice
- lyrics_dict = {}
for k in lyrics.keys ():
- lyrics_dict[k] = musicexp.Lyrics ()
- lyrics_dict[k].lyrics_syllables = lyrics[k]
+ return_value.lyrics_dict[k] = musicexp.Lyrics ()
+ return_value.lyrics_dict[k].lyrics_syllables = lyrics[k]
if len (modes_found) > 1:
error_message ('Too many modes found %s' % modes_found.keys ())
- return_value = seq_music
+ 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
- return (return_value, lyrics_dict)
+ return return_value
def musicxml_id_to_lily (id):
"""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...")
# musicxml_voice_to_lily_voice returns (lily_voice, {nr->lyrics, nr->lyrics})
- part_ly_voices[n] = (musicxml_voice_to_lily_voice (v), v)
+ 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 ():
default=False,
dest="use_lxml",
help=_ ("Use lxml.etree; uses less memory and cpu time."))
-
+
+ p.add_option ('-l', '--language',
+ action = "store",
+ help = _ ("Use a different language file, e.g. 'deutsch' for deutsch.ly."))
+
+ p.add_option ('--no-articulation-directions', '--nd',
+ action = "store_false",
+ default = True,
+ dest = "convert_directions",
+ help = _ ("Do not convert directions (^, _ or -) for articulations."))
+
p.add_option ('-o', '--output',
metavar=_ ("FILE"),
action="store",
'''?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 music_xml_lyrics_name_to_lily_name (part, name, lyricsnr):
- str = "Part%sVoice%sLyrics%s" % (part.id, name, lyricsnr)
+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 print_voice_definitions (printer, part_list, voices):
- part_dict={}
- for (part, nv_dict) in voices.items():
- part_dict[part.id] = (part, nv_dict)
-
for part in part_list:
- (p, nv_dict) = part_dict.get (part.id, (None, {}))
- for (name, ((voice, lyrics), mxlvoice)) in nv_dict.items ():
- k = music_xml_voice_name_to_lily_name (p, 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()
-
- for l in lyrics.keys ():
- lname = music_xml_lyrics_name_to_lily_name (p, name, l)
+ for l in voice.lyrics_order:
+ lname = music_xml_lyrics_name_to_lily_name (part_id, name, l)
printer.dump ('%s = ' %lname )
- lyrics[l].print_ly (printer)
+ voice.lyrics_dict[l].print_ly (printer)
printer.newline()
-
+
def uniq_list (l):
return dict ([(elt,1) for elt in l]).keys ()
# ...
# ]
# ]
-# raw_voices is of the form [(voicename, lyrics)*]
-def format_staff_info (part, staff_id, raw_voices):
+# raw_voices is of the form [(voicename, lyricsids)*]
+def format_staff_info (part_id, staff_id, raw_voices):
voices = []
- for (v, lyrics) in raw_voices:
- voice_name = music_xml_voice_name_to_lily_name (part, v)
- voice_lyrics = [music_xml_lyrics_name_to_lily_name (part, v, l)
- for l in lyrics.keys ()]
+ for (v, lyricsids) 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])
return [staff_id, voices]
def update_score_setup (score_structure, part_list, voices):
- part_dict = dict ([(p.id, p) for p in voices.keys ()])
- final_part_dict = {}
for part_definition in part_list:
- part_name = part_definition.id
- part = part_dict.get (part_name)
- if not part:
- error_message ('unknown part in part-list: %s' % part_name)
+ 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.get (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 = uniq_list (staves)
staves.sort ()
for s in staves:
- thisstaff_raw_voices = [(voice_name, lyrics)
- for (voice_name, ((music, lyrics), mxlvoice)) in nv_dict.items ()
- if mxlvoice._start_staff == s]
- staves_info.append (format_staff_info (part, s, thisstaff_raw_voices))
+ thisstaff_raw_voices = [(voice_name, voice.lyrics_order)
+ for (voice_name, voice) in nv_dict.items ()
+ if voice.voicedata._start_staff == s]
+ staves_info.append (format_staff_info (part_id, s, thisstaff_raw_voices))
else:
- thisstaff_raw_voices = [(voice_name, lyrics)
- for (voice_name, ((music, lyrics), mxlvoice)) in nv_dict.items ()]
- staves_info.append (format_staff_info (part, None, thisstaff_raw_voices))
- score_structure.setPartInformation (part_name, staves_info)
+ thisstaff_raw_voices = [(voice_name, voice.lyrics_order)
+ 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)
def print_ly_preamble (printer, filename):
printer.dump_version ()
printer.print_verbatim ('%% automatically converted from %s\n' % filename)
+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 ()
+
+
def read_musicxml (filename, use_lxml):
if use_lxml:
import lxml.etree
progress ("Reading MusicXML from %s ..." % filename)
tree = read_musicxml (filename, options.use_lxml)
+ 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)
+ score_structure = extract_score_layout (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
score_information = extract_score_information (tree)
- parts = tree.get_typed_children (musicxml.Part)
- voices = get_all_voices (parts)
+ layout_information = extract_layout_information (tree)
update_score_setup (score_structure, part_list, voices)
if not options.output_name:
printer.set_file (codecs.open (defs_ly_name, 'wb', encoding='utf-8'))
print_ly_preamble (printer, filename)
- score_information.print_ly (printer)
+ print_ly_additional_definitions (printer, filename)
+ if score_information:
+ score_information.print_ly (printer)
+ if layout_information:
+ layout_information.print_ly (printer)
print_voice_definitions (printer, part_list, voices)
printer.close ()
def main ():
opt_parser = option_parser()
+ global options
(options, args) = opt_parser.parse_args ()
if not args:
opt_parser.print_usage()
sys.exit (2)
-
+
+ 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
+
# Allow the user to leave out the .xml or xml on the filename
filename = get_existing_filename_with_extension (args[0], "xml")
if filename and os.path.exists (filename):
projects / lilypond.git / blobdiff