def extract_score_structure (part_list, staffinfo):
+ score = musicexp.Score ()
structure = musicexp.StaffGroup (None)
+ score.set_contents (structure)
+
if not part_list:
return structure
return staves[0]
for i in staves:
structure.append_staff (i)
- return structure
+ return score
def musicxml_duration_to_lily (mxl_note):
"medium": '',
"large": '\\large',
"x-large": '\\huge',
- "xx-large": '\\bigger\\huge'
+ "xx-large": '\\larger\\huge'
}.get (size, '')
if font_size:
event.markup += font_size
ev = musicexp.MarkEvent ("\\markup { %s }" % text)
return ev
+def musicxml_harp_pedals_to_ly (mxl_event):
+ count = 0
+ result = "\\harp-pedal #\""
+ for t in mxl_event.get_named_children ('pedal-tuning'):
+ alter = t.get_named_child ('pedal-alter')
+ if alter:
+ val = int (alter.get_text ().strip ())
+ result += {1: "v", 0: "-", -1: "^"}.get (val, "")
+ count += 1
+ if count == 3:
+ result += "|"
+ ev = musicexp.MarkupEvent ()
+ ev.contents = result + "\""
+ return ev
+
def musicxml_eyeglasses_to_ly (mxl_event):
needed_additional_definitions.append ("eyeglasses")
return musicexp.MarkEvent ("\\eyeglasses")
# 'damp' : ???
# 'damp-all' : ???
'eyeglasses': musicxml_eyeglasses_to_ly,
-# 'harp-pedals' : ???
+ 'harp-pedals' : musicxml_harp_pedals_to_ly,
# 'image' : ???
'metronome' : musicxml_metronome_to_ly,
'rehearsal' : musicxml_rehearsal_to_ly_mark,
'diminished-seventh': 'dim7',
'augmented-seventh': 'aug7',
'half-diminished': 'dim5m7',
- 'major-minor': '7m5',
+ 'major-minor': 'maj7m5',
# Sixths:
'major-sixth': '6',
'minor-sixth': 'm6',
#'German': '???',
# Other:
#'pedal': '???',(pedal-point bass)
- #'power': '???',(perfect fifth)
+ 'power': '5^3',
#'Tristan': '???',
'other': '1',
'none': None,
inversion = n.get_maybe_exist_named_child ('inversion')
if inversion:
# TODO: Lilypond does not support inversions, does it?
+
+ # Mail from Carl Sorensen on lilypond-devel, June 11, 2008:
+ # 4. LilyPond supports the first inversion in the form of added
+ # bass notes. So the first inversion of C major would be c:/g.
+ # To get the second inversion of C major, you would need to do
+ # e:6-3-^5 or e:m6-^5. However, both of these techniques
+ # require you to know the chord and calculate either the fifth
+ # pitch (for the first inversion) or the third pitch (for the
+ # second inversion) so they may not be helpful for musicxml2ly.
+ inversion_count = string.atoi (inversion.get_text ())
+ if inversion_count == 1:
+ # TODO: Calculate the bass note for the inversion...
+ pass
pass
for deg in n.get_named_children ('degree'):
d = musicexp.ChordModification ()
diff = moment - current_end
if diff < Rational (0):
- error_message (_ ('Negative skip %s') % diff)
+ error_message (_ ('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):
def option_parser ():
- 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 = ly.get_option_parser (usage = _ ("musicxml2ly [OPTION]... FILE.xml"),
+ description =
+_ ("""Convert MusicXML from FILE.xml to LilyPond input.
+If the given filename is -, musicxml2ly reads from the command line.
+"""), add_help_option=False)
p.add_option("-h", "--help",
action="help",
help=_ ("show this help and exit"))
p.version = ('''%prog (LilyPond) @TOPLEVEL_VERSION@\n\n'''
- +
-_ ("""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--2008 by
++
+_ ("""Copyright (c) 2005--2008 by
Han-Wen Nienhuys <hanwen@xs4all.nl>,
Jan Nieuwenhuizen <janneke@gnu.org> and
Reinhold Kainhofer <reinhold@kainhofer.com>
-""")
+"""
++
+"""
+This program is free software. It is covered by the GNU General Public
+License and you are welcome to change it and/or distribute copies of it
+under certain conditions. Invoke as `%s --warranty' for more
+information.""") % 'lilypond')
+
p.add_option("--version",
action="version",
help=_ ("show version number and exit"))
type = 'string',
dest = 'output_name',
help = _ ("set output filename to FILE, stdout if -"))
- p.add_option_group (ly.display_encode (_ ('Bugs')),
+ p.add_option_group ('',
description = (_ ("Report bugs via")
+ ''' http://post.gmane.org/post.php'''
'''?group=gmane.comp.gnu.lilypond.bugs\n'''))
parts = tree.get_typed_children (musicxml.Part)
(voices, staff_info) = get_all_voices (parts)
- score_structure = None
+ score = None
mxl_pl = tree.get_maybe_exist_typed_child (musicxml.Part_list)
if mxl_pl:
- score_structure = extract_score_structure (mxl_pl, staff_info)
+ score = extract_score_structure (mxl_pl, staff_info)
part_list = mxl_pl.get_named_children ("score-part")
# score information is contained in the <work>, <identification> or <movement-title> tags
- update_score_setup (score_structure, part_list, voices)
+ update_score_setup (score, part_list, voices)
# After the conversion, update the list of settings for the \layout block
update_layout_information ()
printer.newline ()
printer.dump ("% The score definition")
printer.newline ()
- score_structure.print_ly (printer)
+ score.print_ly (printer)
printer.newline ()
return voices
projects / lilypond.git / blobdiff