Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond

diff --git a/input/regression/musicxml/03a-Directions-MusicXML.xml b/input/regression/musicxml/03a-Directions-MusicXML.xml
index b68d4e59b7f1002dc664530d63a7322548019671..6863135b0d96c7ef6b12c50ee9cf2276e40f063d 100644 (file)
--- a/input/regression/musicxml/03a-Directions-MusicXML.xml
+++ b/input/regression/musicxml/03a-Directions-MusicXML.xml
@@ -7,7 +7,7 @@
   <defaults/>\r
   <part-list>\r
     <score-part id="P1">\r
-      <part-name></part-name>\r
+      <part-name print-object="no">MusicXML Part</part-name>\r
     </score-part>\r
   </part-list>\r
   <!--=========================================================-->\r
@@ -603,18 +603,34 @@
       <direction>\r
         <direction-type>\r
           <harp-pedals>\r
-              <pedal-tuning>\r
-                  <pedal-step>C</pedal-step>\r
-                  <pedal-alter>-1</pedal-alter>\r
-              </pedal-tuning>\r
-              <pedal-tuning>\r
-                  <pedal-step>E</pedal-step>\r
-                  <pedal-alter>1</pedal-alter>\r
-              </pedal-tuning>\r
-              <pedal-tuning>\r
-                  <pedal-step>A</pedal-step>\r
-                  <pedal-alter>0</pedal-alter>\r
-              </pedal-tuning>\r
+            <pedal-tuning>\r
+              <pedal-step>D</pedal-step>\r
+              <pedal-alter>0</pedal-alter>\r
+            </pedal-tuning>\r
+            <pedal-tuning>\r
+              <pedal-step>C</pedal-step>\r
+              <pedal-alter>-1</pedal-alter>\r
+            </pedal-tuning>\r
+            <pedal-tuning>\r
+              <pedal-step>B</pedal-step>\r
+              <pedal-alter>-1</pedal-alter>\r
+            </pedal-tuning>\r
+            <pedal-tuning>\r
+              <pedal-step>E</pedal-step>\r
+              <pedal-alter>0</pedal-alter>\r
+            </pedal-tuning>\r
+            <pedal-tuning>\r
+              <pedal-step>F</pedal-step>\r
+              <pedal-alter>0</pedal-alter>\r
+            </pedal-tuning>\r
+            <pedal-tuning>\r
+              <pedal-step>G</pedal-step>\r
+              <pedal-alter>1</pedal-alter>\r
+            </pedal-tuning>\r
+            <pedal-tuning>\r
+              <pedal-step>A</pedal-step>\r
+              <pedal-alter>-1</pedal-alter>\r
+            </pedal-tuning>\r
           </harp-pedals>\r
         </direction-type>\r
       </direction>\r

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index a163522750a95afefc08ffdbabc594f565435b58..6d7389fb5284eed6dc5537b7b7c8b7f05bdcacc4 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -1042,6 +1042,8 @@ def musicxml_accordion_to_markup (mxl_event):
           """
     middle = mxl_event.get_maybe_exist_named_child ('accordion-middle')
     if middle:
+        # By default, use one dot (when no or invalid content is given). The 
+        # MusicXML spec is quiet about this case...
         txt = 1
         try:
           txt = string.atoi (middle.get_text ())
@@ -1077,8 +1079,8 @@ def musicxml_accordion_to_markup (mxl_event):
 
     command += "\musicglyph #\"accordion.accDiscant\""
     command = "\\markup { \\normalsize %s }" % command
+    # Define the newly built command \accReg[H][MMM][L]
     additional_definitions[commandname] = "%s = %s" % (commandname, command)
-    print additional_definitions
     needed_additional_definitions.append (commandname)
     return "\\%s" % commandname
 
@@ -1791,7 +1793,7 @@ 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--2007 by
+Copyright (c) 2005--2008 by
     Han-Wen Nienhuys <hanwen@xs4all.nl>,
     Jan Nieuwenhuizen <janneke@gnu.org> and
     Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -1817,17 +1819,23 @@ Copyright (c) 2005--2007 by
     p.add_option ('-r', '--relative',
                   action = "store_true",
                   dest = "relative",
-                  help = _ ("Convert pitches in relative mode."))
+                  help = _ ("Convert pitches in relative mode. (Default)"))
+
+    p.add_option ('-a', '--absolute',
+                  action = "store_false",
+                  dest = "relative",
+                  help = _ ("Convert pitches in absolute mode."))
 
     p.add_option ('-l', '--language',
+                  metavar=_("LANG"),
                   action = "store",
-                  help = _ ("Use a different language file, e.g. 'deutsch' for deutsch.ly."))
+                  help = _ ("Use a different language file 'LANG.ly' and corresponding pitch names, e.g. 'deutsch' for deutsch.ly."))
 
-    p.add_option ('--no-articulation-directions', '--nd',
+    p.add_option ('--nd', '--no-articulation-directions', 
                   action = "store_false",
                   default = True,
                   dest = "convert_directions",
-                  help = _ ("Do not convert directions (^, _ or -) for articulations."))
+                  help = _ ("Do not convert directions (^, _ or -) for articulations, dynamics, etc."))
 
     p.add_option ('-o', '--output',
                   metavar=_ ("FILE"),