From 2c0f56cc2c2b7e6d3a5f7792c006e55675c9e0d7 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Sun, 23 Dec 2012 13:13:44 -0800 Subject: [PATCH] Measure 'staff-padding' to reference points; issue 3026 --- lily/side-position-interface.cc | 6 +++--- scm/define-grobs.scm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index e3830d3d2f..54b5cb162b 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -360,8 +360,8 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i } /* - Maintain a minimum distance to the staff. This is similar to side - position with padding, but it will put adjoining objects on a row if + Ensure 'staff-padding' from my refpoint to the staff. This is similar to + side-position with padding, but it will put adjoining objects on a row if stuff sticks out of the staff a little. */ Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); @@ -404,7 +404,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i Real staff_position = staff->maybe_pure_coordinate (common, Y_AXIS, pure, start, end); Interval staff_extent = staff->maybe_pure_extent (staff, a, pure, start, end); Real diff = (dir * staff_extent[dir] + staff_padding - - dir * (total_off + iv[-dir]) + - dir * total_off + dir * (staff_position - parent_position)); total_off += dir * max (diff, 0.0); } diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 040f3fc2dd..9838d2deeb 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -585,7 +585,7 @@ (color . ,(grob::inherit-parent-property X 'color)) (self-alignment-X . ,CENTER) - (staff-padding . 0.2) + (staff-padding . 0.7) (stencil . ,ly:text-interface::print) (X-offset . ,(ly:make-simple-closure `(,+ @@ -1671,7 +1671,7 @@ (outside-staff-priority . 400) (padding . 0.5) (shorten-pair . (0.0 . -0.6)) - (staff-padding . 1.0) + (staff-padding . 2.0) (stencil . ,ly:ottava-bracket::print) (style . dashed-line) (vertical-skylines . ,grob::unpure-vertical-skylines-from-stencil) -- 2.39.2