From: David Kastrup <dak@gnu.org>
Date: Fri, 6 Sep 2013 17:10:48 +0000 (+0200)
Subject: Issue 3534: Handle MultiMeasureRest direction in the part combiner like other elements
X-Git-Tag: release/2.17.27-1~40^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=78a35b5353ecdea676c94a748016515711115f5c;p=lilypond.git

Issue 3534: Handle MultiMeasureRest direction in the part combiner like other elements

Since issue 3307, they did not require special positioning.
---

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 69c7857b7e..654edc35be 100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -407,6 +407,7 @@ Part_combine_iterator::construct_children ()
     "DynamicLineSpanner",
     "Tie",
     "Dots",
+    "MultiMeasureRest",
     "Rest",
     "Slur",
     "TextScript",
@@ -432,11 +433,6 @@ Part_combine_iterator::construct_children ()
                             ly_symbol2scm ("horizontal-shift"), horizontalShiftOne_);
   execute_pushpop_property (two, ly_symbol2scm ("NoteColumn"),
                             ly_symbol2scm ("horizontal-shift"), horizontalShiftTwo_);
-  /* Also handle MultiMeasureRest positions for voice 1/2 */
-  execute_pushpop_property (one, ly_symbol2scm ("MultiMeasureRest"),
-                            ly_symbol2scm ("staff-position"), scm_from_int (4));
-  execute_pushpop_property (two, ly_symbol2scm ("MultiMeasureRest"),
-                            ly_symbol2scm ("staff-position"), scm_from_int (-4));
 
 }