multi-meausre rest: include normal note-spacing; issue 3135

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index ad11af929d2c60a34404fd027253b3e7a7cb79a2..f2d1af5a62e1c4b20168b4593232a8390b99a1c6 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -30,6 +30,7 @@
 #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"
@@ -227,7 +228,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
           Real pos = Rest::staff_position_internal (me, mdl, dir);
           me->set_property ("staff-position", scm_from_double (pos));
         }
- 
+
       Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true, 0.0));
 
       s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS);
@@ -354,6 +355,23 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
   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)
+    {
+      Spacing_options options;
+      options.init_from_grob (me);
+      Moment mlen = robust_scm2moment (li->get_property ("measure-length"),
+                                       Moment (1));
+      length += robust_scm2double (li->get_property ("full-measure-extra-space"), 0.0)
+                + options.get_duration_space (mlen.main_part_);
+    }
+
+  length += 2 * robust_scm2double (me->get_property ("bound-padding"), 0.0)
+            + 2 * robust_scm2double (me->get_property ("padding"), 0.0);
+  Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0.0);
+
   Item *combinations[4][2] = {{li, ri},
     {lb, ri},
     {li, rb},
@@ -372,12 +390,8 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
       rod.item_drul_[LEFT] = li;
       rod.item_drul_[RIGHT] = ri;
 
-      rod.distance_ = Paper_column::minimum_distance (li, ri)
-                      + length
-                      + 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0);
-
-      Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0);
-      rod.distance_ = max (rod.distance_, minlen);
+      rod.distance_ = max (Paper_column::minimum_distance (li, ri) + length,
+                           minlen);
       rod.add_to_cols ();
     }
 }
@@ -418,6 +432,7 @@ ADD_INTERFACE (Multi_measure_rest,
                "hair-thickness "
                "measure-count "
                "minimum-length "
+               "padding "
                "round-up-exceptions "
                "round-up-to-longer-rest "
                "spacing-pair "

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 94cc23fd1e7ed78cecdf9dee541cb340421b9b8d..5fdbe109a26960b307c093410723c118cafab8d8 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1504,7 +1504,7 @@
         (expand-limit . 10)
         (hair-thickness . 2.0)
         (round-up-exceptions . ())
-        (padding . 1)
+        (padding . 0.5)
         (spacing-pair . (break-alignment . break-alignment))
         (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
         (stencil . ,ly:multi-measure-rest::print)