Revert "Makes multi-measure rests span the correct horizontal length."

This reverts commit fcfeacd25974cdc37bf9eb65d72902e56511b282.

Conflicts:

	lily/multi-measure-rest.cc

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index c8a0525d66cf414fb9f1fb11c729405e6b825e41..ad11af929d2c60a34404fd027253b3e7a7cb79a2 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -20,7 +20,6 @@
 #include "multi-measure-rest.hh"
 
 #include "directional-element-interface.hh"
-#include "duration.hh"
 #include "font-interface.hh"
 #include "international.hh"
 #include "lookup.hh"
@@ -31,7 +30,6 @@
 #include "percent-repeat-item.hh"
 #include "rest.hh"
 #include "separation-item.hh"
-#include "spacing-options.hh"
 #include "spanner.hh"
 #include "staff-symbol.hh"
 #include "staff-symbol-referencer.hh"
@@ -132,7 +130,7 @@ Multi_measure_rest::height (SCM smob)
 }
 
 int
-calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool paranoid)
+calc_closest_duration_log (Grob *me, double duration, bool force_round_up)
 {
   bool round_up = force_round_up
                   || to_boolean (me->get_property ("round-up-to-longer-rest"));
@@ -147,9 +145,8 @@ calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool
   int maximum_usable_duration_log = 15;
 
   SCM duration_logs_list = me->get_property ("usable-duration-logs");
-  if (paranoid
-      && (to_boolean (scm_null_p (duration_logs_list))
-          || !to_boolean (scm_list_p (duration_logs_list))))
+  if (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."));
@@ -187,7 +184,7 @@ calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool
 }
 
 int
-calc_measure_duration_log (Grob *me, bool paranoid)
+calc_measure_duration_log (Grob *me)
 {
   SCM sml = dynamic_cast<Spanner *> (me)->get_bound (LEFT)
             ->get_property ("measure-length");
@@ -197,8 +194,7 @@ calc_measure_duration_log (Grob *me, bool paranoid)
   bool force_round_up = to_boolean (scm_list_p (scm_member (scm_cons (scm_from_int64 (ml.numerator ()),
                                                             scm_from_int64 (ml.denominator ())),
                                                             me->get_property ("round-up-exceptions"))));
-
-  return calc_closest_duration_log (me, measure_duration, force_round_up, paranoid);
+  return calc_closest_duration_log (me, measure_duration, force_round_up);
 }
 
 Stencil
@@ -221,7 +217,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
     }
 
   Font_metric *musfont = Font_interface::get_default_font (me);
-  int mdl = calc_measure_duration_log (me, true);
+  int mdl = calc_measure_duration_log (me);
 
   if (measure_count == 1)
     {
@@ -279,7 +275,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measure_cou
   SCM mols = SCM_EOL;
   int symbol_count = 0;
   Real symbols_width = 0.0;
-  double total_duration = measure_count * pow (2.0, -calc_measure_duration_log (me, true));
+  double total_duration = measure_count * pow (2.0, -calc_measure_duration_log (me));
 
   SCM staff_position = me->get_property ("staff-position");
 
@@ -299,7 +295,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measure_cou
 
   while (total_duration > 0)
     {
-      int dl = calc_closest_duration_log (me, total_duration, false, true);
+      int dl = calc_closest_duration_log (me, total_duration, false);
       double duration = pow (2.0, -dl);
 
       total_duration -= duration;
@@ -357,20 +353,6 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
   Item *ri = sp->get_bound (RIGHT)->get_column ();
   Item *lb = li->find_prebroken_piece (RIGHT);
   Item *rb = ri->find_prebroken_piece (LEFT);
-  Grob *spacing = Grob::unsmob (li->get_object ("spacing"));
-  if (!spacing)
-    spacing = Grob::unsmob (ri->get_object ("spacing"));
-  if (!spacing)
-    me->warning (_ ("Using naive multi measure rest spacing."));
-  else
-    {
-      Spacing_options options;
-      options.init_from_grob (me);
-      int dl = calc_measure_duration_log (me, false);
-      Duration dur = Duration (dl, 0);
-      Rational rat = dur.get_length ();
-      length = max (length, options.get_duration_space (rat));
-    }
 
   Item *combinations[4][2] = {{li, ri},
     {lb, ri},