Issue 4311: Make multimeasure rests obey tweaks

This change basically just copies all properties from the originating
MultiMeasureRestMusic to all of the MultiMeasureRestEvent events
generated from it.  In particular, it now copies the previously omitted
'tweaks property.

diff --git a/scm/define-music-callbacks.scm b/scm/define-music-callbacks.scm
index 7e65125cb62c647510bb3bc149f74d4fe240c37c..34fa7b1a173ac29c93ab6e22240065bd5ecba58b 100644 (file)
--- a/scm/define-music-callbacks.scm
+++ b/scm/define-music-callbacks.scm
@@ -23,14 +23,11 @@
 (define (mm-rest-child-list music)
   "Generate events for multimeasure rests,
 to be used by the sequential-iterator"
-  (let ((location (ly:music-property music 'origin))
-        (duration (ly:music-property music 'duration)))
+  (let ((location (ly:music-property music 'location)))
     (list (make-music 'BarCheck
                       'origin location)
-          (make-event-chord (cons (make-music 'MultiMeasureRestEvent
-                                              'origin location
-                                              'duration duration)
-                                  (ly:music-property music 'articulations)))
+          (make-music 'MultiMeasureRestEvent
+                      (ly:music-deep-copy music))
           (make-music 'BarCheck
                       'origin location))))
 

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index d1795246b28a478029fac8236b6042bcfb10a008..8327e7c60eb4d7f0778c80f7f26c6864485308e2 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -317,6 +317,7 @@ Example: @code{\\mark \"A\"}")
     (MultiMeasureRestEvent
      . ((description . "Used internally by @code{MultiMeasureRestMusic}
 to signal rests.")
+        (iterator-ctor . ,ly:rhythmic-music-iterator::constructor)
         (types . (general-music event rhythmic-event
                                 multi-measure-rest-event))
         ))