From 17116996706960c9793102429ef629721b7e59a3 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Wed, 4 Mar 2015 23:11:52 +0100 Subject: [PATCH] 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. --- scm/define-music-callbacks.scm | 9 +++------ scm/define-music-types.scm | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/scm/define-music-callbacks.scm b/scm/define-music-callbacks.scm index 7e65125cb6..34fa7b1a17 100644 --- 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 d1795246b2..8327e7c60e 100644 --- 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)) )) -- 2.39.2