Revert part of 61ae62f987

Code to space spanners should apply 'bound-padding', but not 'padding'.

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index f2d1af5a62e1c4b20168b4593232a8390b99a1c6..a4990332f369478a8caa7400e8e8ede2cdc2e8d3 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -368,8 +368,8 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
                 + 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);
+  length += 2 * robust_scm2double (me->get_property ("bound-padding"), 0.0);
+
   Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0.0);
 
   Item *combinations[4][2] = {{li, ri},
@@ -432,7 +432,6 @@ 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 9f5783dff0c579df1154b178284d8cfae50459e3..7ec30570dd7c8fb7cc081b398bee94227a2a5f51 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 . 0.5)
+        (bound-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)