Merge branch 'master' into translation

[lilypond.git] / scripts / musicxml2ly.py

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index e270aed95e7d3001ea905a3eb5c5ffac03f8adde..b1cc496f6eb2697541a62afca5aad4eed1308783 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -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 <hanwen@xs4all.nl>,
     Jan Nieuwenhuizen <janneke@gnu.org> and
     Reinhold Kainhofer <reinhold@kainhofer.com>