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

[lilypond.git] / scm / ly-syntax-constructors.scm

diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index 4479d01d3191f8c794338be8beb1896f8505a4ba..ee798233611a6a65361f1fae414962848a9f3cfa 100644 (file)
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -97,6 +97,8 @@
   (context-spec-music
    (make-sequential-music
     (list
+     (make-property-unset 'tempoUnitDuration)
+     (make-property-unset 'tempoUnitCount)
      (make-property-set 'tempoText text)))
    'Score))
 
@@ -141,7 +143,9 @@
                  ((PropertySet) (list 'value (car args)))
                  ((PropertyUnset) '())
                  ((OverrideProperty) (list 'grob-value (car args)
-                                           'grob-property-path (cdr args)
+                                           'grob-property-path (if (list? (cadr args))
+                                                                   (cadr args)
+                                                                   (cdr args))
                                            'pop-first #t))
                  ((RevertProperty)
                   (if (list? (car args))