Add regtests for issue 1650

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index daa9454c4a196a5c74ca3b53033f0a203ce23249..47718a2fec86d906e0b3ce0adb7211c17f07237b 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -42,8 +42,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 +53,6 @@ Multi_measure_rest::bar_width (Spanner *me)
 
       iv[d] = coldim[-d];
     }
-  while (flip (&d) != LEFT);
 
   return iv;
 }
@@ -137,7 +135,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
@@ -211,12 +210,12 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
   if (measure_count == 1)
     {
       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));
-       }
+        {
+          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));
+        }
 
       Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true));
 
@@ -326,7 +325,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;