From a699632a5bafd3902478426160f8adb9ff24d008 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Wed, 26 Nov 2014 21:19:34 -0800 Subject: [PATCH] Revert part of 61ae62f987 Code to space spanners should apply 'bound-padding', but not 'padding'. --- lily/multi-measure-rest.cc | 5 ++--- scm/define-grobs.scm | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index f2d1af5a62..a4990332f3 100644 --- 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 9f5783dff0..7ec30570dd 100644 --- 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) -- 2.39.2