From 6e5a98015b9862efdebb57d691fef23a0fb8409d Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Tue, 2 Jul 2013 20:44:22 -0700 Subject: [PATCH] Revert "outside-staff-padding: just one pad; issue 2910" This reverts commit 8d96001e14317b93c68a749c2ec270b3738e7ad9. --- lily/axis-group-interface.cc | 17 +++++++---------- scm/define-grobs.scm | 2 ++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 9389236d1f..0d786c3a29 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -672,17 +672,15 @@ 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]); - Interval collision; - // We need to push elt by at least this much to be outside v_other. - collision[dir] = ((*v_skyline)[-dir].distance (v_other[dir], horizon_pad) - + padding) * dir; - // We need to pull elt by at least this much to be inside v_other. - collision[-dir] = ((*v_skyline)[dir].distance (v_other[-dir], horizon_pad) - + other_padding[j]) * -dir; + // 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; + // We need to push elt down by at least this much to be below v_other. + Real down = (*v_skyline)[UP].distance (v_other[DOWN], horizon_pad) + pad; - forbidden_intervals.push_back (collision); + forbidden_intervals.push_back (Interval (-down, up)); } Interval_set allowed_shifts @@ -764,8 +762,7 @@ add_grobs_of_one_priority (Grob *me, { Grob *elt = elements[i]; Real padding - = robust_scm2double (elt->get_property ("outside-staff-padding"), - Axis_group_interface::get_default_outside_staff_padding ()); + = robust_scm2double (elt->get_property ("outside-staff-padding"), 0.25); 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 04f20c17ec..ee71f903c7 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -812,6 +812,7 @@ (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) @@ -1411,6 +1412,7 @@ (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) -- 2.39.5