From: David Kastrup <dak@gnu.org>
Date: Wed, 11 Sep 2013 16:29:30 +0000 (+0200)
Subject: Issue 3550: Don't let make-voice-props-{override,revert} touch MultiMeasureRest.staff... 
X-Git-Tag: release/2.17.27-1~40^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b9bec0556582e1ef4febfb8a6d120f3ea34f63c4;p=lilypond.git

Issue 3550: Don't let make-voice-props-{override,revert} touch MultiMeasureRest.staff-position

That's an oversight from issue 3307 and completes the work of
commit 19503a9141bd5afb833036f4d36b6062055b6f79.
---

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index d714deec8c..092cf84e4b 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -543,8 +543,7 @@ in @var{grob}."
          direction-polyphonic-grobs)
     (list
      (make-property-set 'graceSettings general-grace-settings)
-     (make-grob-property-override 'NoteColumn 'horizontal-shift (quotient n 2))
-     (make-grob-property-override 'MultiMeasureRest 'staff-position (if (odd? n) -4 4))))))
+     (make-grob-property-override 'NoteColumn 'horizontal-shift (quotient n 2))))))
 
 (define-safe-public (make-voice-props-revert)
   (make-sequential-music
@@ -552,8 +551,7 @@ in @var{grob}."
     (map (lambda (x) (make-grob-property-revert x 'direction))
          direction-polyphonic-grobs)
     (list (make-property-unset 'graceSettings)
-          (make-grob-property-revert 'NoteColumn 'horizontal-shift)
-          (make-grob-property-revert 'MultiMeasureRest 'staff-position)))))
+          (make-grob-property-revert 'NoteColumn 'horizontal-shift)))))
 
 
 (define-safe-public (context-spec-music m context #:optional id)