From c8f1bfd1fe21b9200ca368d90ef938456d6c0747 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Sun, 25 Aug 2013 21:19:48 -0700 Subject: [PATCH] outside-staff-padding: just one pad; issue 2910 When two grobs using 'outside-staff-padding are placed against each other, use the larger of the two grobs values of 'outside-staff-padding. --- lily/axis-group-interface.cc | 8 +++++--- scm/define-grobs.scm | 6 ++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 7579ed8c1a..819a32d6f4 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -672,8 +672,8 @@ avoid_outside_staff_collisions (Grob *elt, for (vsize j = 0; j < other_v_skylines.size (); j++) { Skyline_pair const &v_other = other_v_skylines[j]; - Real pad = (padding + other_padding[j]); - Real horizon_pad = (horizon_padding + other_horizon_padding[j]); + Real pad = max (padding, other_padding[j]); + Real horizon_pad = max (horizon_padding, other_horizon_padding[j]); // We need to push elt up by at least this much to be above v_other. Real up = (*v_skyline)[DOWN].distance (v_other[UP], horizon_pad) + pad; @@ -762,7 +762,9 @@ add_grobs_of_one_priority (Grob *me, { Grob *elt = elements[i]; Real padding - = robust_scm2double (elt->get_property ("outside-staff-padding"), 0.25); + = robust_scm2double (elt->get_property ("outside-staff-padding"), + Axis_group_interface + ::get_default_outside_staff_padding ()); Real horizon_padding = robust_scm2double (elt->get_property ("outside-staff-horizontal-padding"), 0.0); Interval x_extent = elt->extent (x_common, X_AXIS); diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index af5f4fe36b..184d086b30 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -813,7 +813,6 @@ (direction . ,DOWN) (minimum-space . 1.2) (outside-staff-priority . 250) - (outside-staff-padding . 0.6) (padding . 0.6) (side-axis . ,Y) (slur-padding . 0.3) @@ -1413,7 +1412,6 @@ (font-encoding . fetaText) (font-size . -2) (outside-staff-horizontal-padding . 0.5) - (outside-staff-padding . 0.5) (outside-staff-priority . 750) (self-alignment-X . ,CENTER) (side-axis . ,Y) @@ -1804,7 +1802,7 @@ (extra-spacing-width . (+inf.0 . -inf.0)) (font-size . 2) (non-musical . #t) - (outside-staff-horizontal-padding . 0.12) + (outside-staff-horizontal-padding . 0.2) (outside-staff-priority . 1500) (padding . 0.8) (self-alignment-X . ,CENTER) @@ -2350,7 +2348,7 @@ (cross-staff . ,script-or-side-position-cross-staff) (direction . ,DOWN) (extra-spacing-width . (+inf.0 . -inf.0)) - (outside-staff-horizontal-padding . 0.12) + (outside-staff-horizontal-padding . 0.2) (outside-staff-priority . 450) ;; sync with Fingering ? -- 2.39.5