Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / input / regression / music-map.ly

diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly
index a3821d8a65060d5625007f07aa54c6d3a8066993..ee6e1eeb1c0dee46323aa68c5bb6646f2fc63cae 100644 (file)
--- a/input/regression/music-map.ly
+++ b/input/regression/music-map.ly
@@ -2,40 +2,33 @@
 
   texidoc =
 
-  "With @code{music-map}, you can apply functions operating on a single
-piece of music to an entire music expression. In this example, the the
-function @code{notes-to-skip} changes a note to a skip. When applied
-to an entire music expression in the 1st measure, the scripts and
-dynamics are left over. These are put onto the 2nd measure."
+  "With @code{music-map}, you can apply functions operating on a
+single piece of music to an entire music expression. In this example,
+the function @code{notes-to-skip} changes a note to a skip. When
+applied to an entire music expression in the 1st measure, the scripts
+and dynamics are left over. These are put onto the 2nd measure."
 
 }
 
-\version "2.6.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 { raggedright= ##t }
+\layout { ragged-right= ##t }
 
-foobar =  \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^  } 
+foobar =  \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^  }
 
 
 \relative c''  \context Voice {
   \foobar
 
-  << \applymusic #(lambda (x) (music-map notes-to-skip x))
+  << \applyMusic #(lambda (x) (music-map notes-to-skip x))
      \foobar
-     { d2 d2 } >> 
+     { d8 d d d d d d d  } >>
 }