X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmusicxml2ly.py;h=b1cc496f6eb2697541a62afca5aad4eed1308783;hb=c833e91ac8b976b7bc0f4fcb4a903c728310b369;hp=ec827b5d3992ebabe4648ea973aff6d1ac8e1fac;hpb=a7c14a5a83ddf2926895aa40cfdf50e7dcebf53c;p=lilypond.git

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index ec827b5d39..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
@@ -1315,7 +1315,7 @@ def musicxml_words_to_lily_event (words):
 # 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
+# Idea was taken from: http://lsr.di.unimi.it/LSR/Item?id=194
 def musicxml_accordion_to_markup (mxl_event):
     commandname = "accReg"
     command = ""
@@ -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--2012 by
+_ ("""Copyright (c) 2005--2015 by
     Han-Wen Nienhuys <hanwen@xs4all.nl>,
     Jan Nieuwenhuizen <janneke@gnu.org> and
     Reinhold Kainhofer <reinhold@kainhofer.com>