X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fly-syntax-constructors.scm;h=9cbec5fc4f55f61c6b28f17e558109da84e0a4b4;hb=2ff48d0a8a4b9ac85a9d4835caea04ead6ccb1da;hp=40a1c05907aded52786ec5ceff61344653a7baf8;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm index 40a1c05907..9cbec5fc4f 100644 --- a/scm/ly-syntax-constructors.scm +++ b/scm/ly-syntax-constructors.scm @@ -50,10 +50,11 @@ ;; we don't call the function but rather return the general ;; fallback. (define-ly-syntax (music-function parser loc fun args . rest) - (let* ((sig (object-property fun 'music-function-signature)) + (let* ((sig (ly:music-function-signature fun)) (pred (if (pair? (car sig)) (caar sig) (car sig))) (good (proper-list? args)) - (m (and good (apply fun parser loc (reverse! args rest))))) + (m (and good (apply (ly:music-function-extract fun) + parser loc (reverse! args rest))))) (if (and good (pred m)) (begin (if (ly:music? m) @@ -158,10 +159,10 @@ into a @code{MultiMeasureTextEvent}." 'duration duration 'origin location)) -(define-ly-syntax (repetition-chord parser location previous-chord repetition-function duration articulations) - (make-music 'RepeatedChord - 'original-chord previous-chord - 'element (repetition-function previous-chord location duration articulations) +(define-ly-syntax (repetition-chord parser location duration articulations) + (make-music 'EventChord + 'duration duration + 'elements articulations 'origin location)) (define-ly-syntax-simple (context-specification type id ops create-new mus)