]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 3534: Handle MultiMeasureRest direction in the part combiner like other elements
authorDavid Kastrup <dak@gnu.org>
Fri, 6 Sep 2013 17:10:48 +0000 (19:10 +0200)
committerDavid Kastrup <dak@gnu.org>
Thu, 12 Sep 2013 13:47:29 +0000 (15:47 +0200)
Since issue 3307, they did not require special positioning.

lily/part-combine-iterator.cc

index 69c7857b7eeec1ff7098baff288f5ccf080c0fbb..654edc35be3ce9751e29c4ac1362742ac6f5f5a9 100644 (file)
@@ -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));
 
 }