X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmusicxml2ly.py;h=b1cc496f6eb2697541a62afca5aad4eed1308783;hb=bc3062dd8a07c51e074ba45e2718e1331a1e3a42;hp=2da2dab60e93e574860f99c9ee5bbd55de82d9be;hpb=0ea80a5e850c6114d1ba7dc4cfd81d5a45d9604a;p=lilypond.git diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index 2da2dab60e..b1cc496f6e 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -41,7 +41,7 @@ additional_definitions = { "tuplet-note-wrapper": """ % a formatter function, which is simply a wrapper around an existing % tuplet formatter function. It takes the value returned by the given % function and appends a note of given length. - #(define-public ((tuplet-number::append-note-wrapper function note) grob) + #(define ((tuplet-number::append-note-wrapper function note) grob) (let* ((txt (if function (function grob) #f))) (if txt (markup txt #:fontsize -5 #:note note UP) @@ -178,7 +178,7 @@ def extract_score_information (tree): if work: work_title = work.get_work_title () set_if_exists ('title', work_title) - if work_title == '': + if work_title == '' and movement_title : set_if_exists ('title', movement_title.get_text ()) elif movement_title: set_if_exists ('subtitle', movement_title.get_text ()) @@ -331,7 +331,7 @@ def staff_attributes_to_lily_staff (mxl_attr): staff = musicexp.Staff () # TODO: Handle case with lines <> 5! if (lines != 5): - staff.add_context_modification ("\\override StaffSymbol #'line-count = #%s" % lines) + staff.add_context_modification ("\\override StaffSymbol.line-count = #%s" % lines) return staff @@ -2573,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--2014 by +_ ("""Copyright (c) 2005--2015 by Han-Wen Nienhuys , Jan Nieuwenhuizen and Reinhold Kainhofer