From: David Kastrup <dak@gnu.org>
Date: Thu, 23 Jul 2015 16:19:58 +0000 (+0200)
Subject: Issue 4519: event-chord-wrap! needs to call expand-repeat-notes!
X-Git-Tag: release/2.19.25-1~39
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c8c7f5ec551bcc0f1d967549ffce2c45753434c1;p=lilypond.git

Issue 4519: event-chord-wrap! needs to call expand-repeat-notes!

The action of event-chord-wrap! will make it impossible to figure out
repeat notes (notes without pitch but with duration) but one must not
expand repeat notes before expanding chord repeats, and
event-chord-wrap! does expand chord repeats.  So it needs to call
expand-repeat-chords! as well before doing its compatibility processing.
---

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 36fe99b697..8b3647923d 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -2006,7 +2006,7 @@ type symbol or a list of alternatives) inside of @var{music}, not
 recursing into matches themselves."
   (extract-music music (music-type-predicate type)))
 
-(define*-public (event-chord-wrap! music)
+(define-public (event-chord-wrap! music)
   "Wrap isolated rhythmic events and non-postevent events in
 @var{music} inside of an @code{EventChord}.  Chord repeats @samp{q}
 are expanded using the default settings of the parser."
@@ -2026,10 +2026,11 @@ are expanded using the default settings of the parser."
                   (set! (ly:music-property m 'articulations) '()))
               (make-event-chord (cons m arts))))
            (else #f)))
-   (expand-repeat-chords!
-    (cons 'rhythmic-event
-          (ly:parser-lookup '$chord-repeat-events))
-    music)))
+   (expand-repeat-notes!
+    (expand-repeat-chords!
+     (cons 'rhythmic-event
+           (ly:parser-lookup '$chord-repeat-events))
+     music))))
 
 (define-public (event-chord-notes event-chord)
   "Return a list of all notes from @var{event-chord}."