Allows multi measure rests' staff position to be set at 0.

MultiMeasureRest grobs are only shifted if their staff position
is unset.

diff --git a/input/regression/multi-measure-rest-staff-position.ly b/input/regression/multi-measure-rest-staff-position.ly
new file mode 100644 (file)
index 0000000..c8d94f9
--- /dev/null
+++ b/input/regression/multi-measure-rest-staff-position.ly
@@ -0,0 +1,12 @@
+\version "2.15.9"
+
+\header {
+  texidoc = "Multi measure rest staff position can be overridden
+to 0.
+"
+}
+
+\relative c' {
+  \override MultiMeasureRest #'staff-position = #0
+  R1
+}

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 17a7a4277a7cb41e188a466616e48176cd11e48f..72a509cffaf989bf245684c975b8604c71c2b17b 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -217,7 +217,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
   if (measure_count == 1)
     {
       Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true));
-      if (mdl == 0 && Staff_symbol_referencer::get_position (me) == 0.0)
+      if (mdl == 0 && me->get_property ("staff-position") == SCM_EOL)
         s.translate_axis (staff_space, Y_AXIS);
 
       s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS);

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 2cfc11ab5210d37cceff15aa4cc62168df7017ca..ff792baedb2657918c76f15fbbe91d77989c8828 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1309,7 +1309,6 @@
        (padding . 1)
        (spacing-pair . (break-alignment . break-alignment))
        (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
-       (staff-position . 0)
        (stencil . ,ly:multi-measure-rest::print)
        (thick-thickness . 6.6)
        ;; See Wanske pp. 125