Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / multi-measure-rest.cc

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 17a7a4277a7cb41e188a466616e48176cd11e48f..d6142b1890b257a97fb42e1f284fcec1a19581bd 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -111,11 +111,6 @@ Multi_measure_rest::print (SCM smob)
   Stencil mol;
   mol.add_stencil (symbol_stencil (me, space));
 
-  int measure_count = 0;
-  SCM m (me->get_property ("measure-count"));
-  if (scm_is_number (m))
-    measure_count = scm_to_int (m);
-
   mol.translate_axis (x_off, X_AXIS);
   return mol.smobbed_copy ();
 }
@@ -217,7 +212,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);