From: David Kastrup <dak@gnu.org>
Date: Tue, 14 Feb 2012 20:40:30 +0000 (+0100)
Subject: Compatibility function event-chord-wrap!, used in \eventChords
X-Git-Tag: release/2.15.30-1~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=55549e9050d4ff40020d299c5d055f308dd94d03;p=lilypond.git

Compatibility function event-chord-wrap!, used in \eventChords
---

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 5afd8e44ac..4082ea9aec 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -315,7 +315,12 @@ without the need of a specific end spanner.")
 	 (ly:input-message location (_ "argument endSpanners is not an EventChord: ~a") music)
 	 music)))
 
-
+eventChords =
+#(define-music-function (parser location music) (ly:music?)
+   (_i "Compatibility function wrapping @code{EventChord} around
+isolated rhythmic events occuring since version 2.15.28, after
+expanding repeat chords @samp{q}.")
+   (event-chord-wrap! music parser))
 
 featherDurations=
 #(define-music-function (parser location factor argument) (ly:moment? ly:music?)
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 361dc92b95..9ff13189d2 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -1650,6 +1650,34 @@ recursing into matches themselves."
 	 (any (lambda (t) (music-is-of-type? m t)) type))
        (lambda (m) (music-is-of-type? m type)))))
 
+(define*-public (event-chord-wrap! music #:optional parser)
+  "Wrap isolated rhythmic events and non-postevent events in
+@var{music} inside of an @code{EventChord}.  If the optional
+@var{parser} argument is given, chord repeats @samp{q} are expanded
+using the default settings.  Otherwise, you need to cater for them
+yourself."
+  (map-some-music
+   (lambda (m)
+     (cond ((music-is-of-type? m 'event-chord)
+	    (if (pair? (ly:music-property m 'articulations))
+		(begin
+		  (set! (ly:music-property m 'elements)
+			(append (ly:music-property m 'elements)
+				(ly:music-property m 'articulations)))
+		  (set! (ly:music-property m 'articulations) '())))
+	    m)
+	   ((music-is-of-type? m 'rhythmic-event)
+	    (let ((arts (ly:music-property m 'articulations)))
+	      (if (pair? arts)
+		  (set! (ly:music-property m 'articulations) '()))
+	      (make-event-chord (cons m arts))))
+	   (else #f)))
+   (if parser
+       (expand-repeat-chords!
+	(cons 'rhythmic-event
+	      (ly:parser-lookup parser '$chord-repeat-events))
+	music)
+       music)))
 
 (define-public (event-chord-notes event-chord)
   "Return a list of all notes from @var{event-chord}."