(make-music 'TransposedMusic
'element (ly:music-transpose music pitch)))
-(define-ly-syntax-simple (tempo duration tempo)
+(define-ly-syntax-simple (tempo text duration tempo)
+ (let ((props (list
+ (make-property-set 'tempoWholesPerMinute
+ (ly:moment-mul (ly:make-moment tempo 1)
+ (ly:duration-length duration)))
+ (make-property-set 'tempoUnitDuration duration)
+ (make-property-set 'tempoUnitCount tempo))))
+ (set! props (cons
+ (if text (make-property-set 'tempoText text)
+ (make-property-unset 'tempoText))
+ props))
+ (context-spec-music
+ (make-sequential-music props)
+ 'Score)))
+
+(define-ly-syntax-simple (tempoText text)
(context-spec-music
(make-sequential-music
(list
- (make-property-set 'tempoWholesPerMinute
- (ly:moment-mul (ly:make-moment tempo 1)
- (ly:duration-length duration)))
- (make-property-set 'tempoUnitDuration duration)
- (make-property-set 'tempoUnitCount tempo)))
+ (make-property-unset 'tempoUnitDuration)
+ (make-property-unset 'tempoUnitCount)
+ (make-property-set 'tempoText text)))
'Score))
(define-ly-syntax-simple (skip-music dur)
((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) (list 'grob-property-path args))
+ ((RevertProperty)
+ (if (list? (car args))
+ (list 'grob-property-path (car args))
+ (list 'grob-property-path args)))
(else (ly:error (_ "Invalid property operation ~a") music-type))))
(oprops (if once (cons* 'once once props) props))
(m (apply make-music music-type