Issue 3307: Rest positions incorrect with non-standard line count

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 9ffaf4e18c03986b1852919ea893f652f6f9606f..34f6bb6e687b2649a77c750d55b14010521c8475 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -32,6 +32,7 @@
 #include "separation-item.hh"
 #include "spacing-options.hh"
 #include "spanner.hh"
+#include "staff-symbol.hh"
 #include "staff-symbol-referencer.hh"
 #include "system.hh"
 #include "text-interface.hh"
@@ -42,8 +43,7 @@ Multi_measure_rest::bar_width (Spanner *me)
 {
   SCM spacing_pair = me->get_property ("spacing-pair");
   Interval iv;
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       Item *col = me->get_bound (d)->get_column ();
       SCM align_sym
@@ -54,7 +54,6 @@ Multi_measure_rest::bar_width (Spanner *me)
 
       iv[d] = coldim[-d];
     }
-  while (flip (&d) != LEFT);
 
   return iv;
 }
@@ -117,6 +116,20 @@ Multi_measure_rest::print (SCM smob)
   return mol.smobbed_copy ();
 }
 
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, height, 1);
+SCM
+Multi_measure_rest::height (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+
+  Real space = 1000000; // something very large...
+
+  Stencil mol;
+  mol.add_stencil (symbol_stencil (me, space));
+
+  return ly_interval2scm (mol.extent (Y_AXIS));
+}
+
 int
 calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool paranoid)
 {
@@ -137,7 +150,8 @@ calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool
       && (to_boolean (scm_null_p (duration_logs_list))
           || !to_boolean (scm_list_p (duration_logs_list))))
     {
-      warning (_ ("usable-duration-logs must be a non-empty list.  Falling back to whole rests."));
+      warning (_ ("usable-duration-logs must be a non-empty list."
+                  "  Falling back to whole rests."));
       closest_usable_duration_log = 0;
     }
   else
@@ -212,10 +226,8 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
     {
       if (mdl == 0 && me->get_property ("staff-position") == SCM_EOL)
         {
-          if (Staff_symbol_referencer::on_staff_line (me, 2))
-            me->set_property ("staff-position", scm_from_int (2));
-          else if (Staff_symbol_referencer::on_staff_line (me, 3))
-            me->set_property ("staff-position", scm_from_int (3));
+          Real pos = Rest::staff_position_internal (me, mdl, 0);
+          me->set_property ("staff-position", scm_from_double (pos));
         }
 
       Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true));
@@ -326,7 +338,7 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
   if (!spacing)
     spacing = unsmob_grob (ri->get_object ("spacing"));
   if (!spacing)
-    me->warning ("Using naive multi measure rest spacing.");
+    me->warning (_ ("Using naive multi measure rest spacing."));
   else
     {
       Spacing_options options;