Treats multi measure rest staff position like rest staff position. (issue4822046)

[mtsolo]

Reviewers: ,

Message:
Should fix issue 1604.

Description:
Treats multi measure rest staff position like rest staff position.

Please review this at http://codereview.appspot.com/4822046/

Affected files:
  M lily/multi-measure-rest.cc
  M scm/define-grobs.scm


Index: lily/multi-measure-rest.cc
diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index  
1a9f5e11a7801d9f50cc57e5ad3bec1375be6b86..0f01ec26986e57a0bf2ecdc7560a4851c27f90a0  
100644
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -174,7 +174,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real  
space)
   if (measures == 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);
Index: scm/define-grobs.scm
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index  
a5c03a52755c7cc3bdfac07960833e799ba7730b..64fdd0c48ad4047de433ed3022587f3ba37d14f5  
100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1306,7 +1306,7 @@
        (padding . 1)
        (spacing-pair . (break-alignment . break-alignment))
        (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
-       (staff-position . 0)
+       ;(staff-position . 0)
        (stencil . ,ly:multi-measure-rest::print)
        (thick-thickness . 6.6)
        ;; See Wanske pp. 125