From: David Kastrup <dak@gnu.org>
Date: Wed, 25 Sep 2013 12:34:38 +0000 (+0200)
Subject: Use make-music with music arguments
X-Git-Tag: release/2.17.28-1~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=029e46e2927e99745b98d4d2ba8717ce39d41c51;p=lilypond.git

Use make-music with music arguments
---

diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly
index 43f346deac..ee6e1eeb1c 100644
--- a/input/regression/music-map.ly
+++ b/input/regression/music-map.ly
@@ -10,21 +10,14 @@ and dynamics are left over. These are put onto the 2nd measure."
 
 }
 
-\version "2.16.0"
+\version "2.17.27"
 
 #(define (notes-to-skip m)
   "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips.
-Scripts and dynamics are maintained.
-"
-  (if (memq 'rhythmic-event (ly:music-property m 'types))
-   (let* ((newmus (make-music 'SkipEvent)))
-    (map
-     (lambda (x) (ly:music-set-property! newmus (car x) (cdr x)))
-     (ly:music-mutable-properties m))
-    newmus
-  )
-   m)
-)
+Scripts and dynamics are maintained."
+  (if (music-is-of-type? m 'rhythmic-event)
+      (make-music 'SkipEvent m)
+      m))
 
 
 \layout { ragged-right= ##t }
diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index 8b6f4ffefb..b3d7f3f0f0 100644
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -134,9 +134,8 @@
   "Extract @code{'direction} and @code{'text} from @var{music}, and transform
 into a @code{MultiMeasureTextEvent}."
 
-  (if (memq 'script-event (ly:music-property music 'types))
-      (apply make-music 'MultiMeasureTextEvent
-             (flatten-alist (ly:music-mutable-properties music)))
+  (if (music-is-of-type? music 'script-event)
+      (make-music 'MultiMeasureTextEvent music)
       music))
 
 (define-ly-syntax (multi-measure-rest parser location duration articulations)