From 21c7a8b7fc473a154836fad5694a06cb62956d09 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Thu, 25 Aug 2011 21:38:43 -0700 Subject: [PATCH] Align pedal brackets to main note-column; issue 723 --- input/regression/pedal-bracket.ly | 12 ++++++------ lily/piano-pedal-bracket.cc | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly index ff66cc47aa..007b840479 100644 --- a/input/regression/pedal-bracket.ly +++ b/input/regression/pedal-bracket.ly @@ -3,8 +3,8 @@ \header { texidoc = "The brackets of a piano pedal should start and end at - the left side of the note. If a note is shared between two brackets, - these ends are flared. + the left side of the main note-column. If a note is shared between + two brackets, these ends are flared. At a line-break, there are no vertical endings. " } @@ -12,14 +12,14 @@ At a line-break, there are no vertical endings. " } \relative c'' { \set Staff.pedalSustainStyle = #'bracket - c4 d e \sustainOn b c c, \sustainOff \sustainOn d8[ c] e8[ - e \sustainOff \sustainOn] f4 d - \sustainOff g \sustainOn b b, \sustainOff c' + c4 d \sustainOn b c c, \sustainOff \sustainOn d8[ c] e8[ + e \sustainOff \sustainOn] f4 r \sustainOff + g \sustainOn bes bes, \sustainOff c' \set Staff.pedalUnaCordaStyle = #'mixed c4 d \unaCorda e f g - b | \break c b c \treCorde c + b | \break c b \arpeggio \treCorde c } \layout { ragged-right = ##t } } diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc index fee4c4b762..312459e67b 100644 --- a/lily/piano-pedal-bracket.cc +++ b/lily/piano-pedal-bracket.cc @@ -65,10 +65,11 @@ Piano_pedal_bracket::print (SCM smob) height[d] = 0.0; else flare[d] = 0.0; - } - Interval ext = robust_relative_extent (b, common, X_AXIS); - span_points[d] = ext [broken[d] ? RIGHT : LEFT]; + span_points[d] = robust_relative_extent (b, common, X_AXIS)[RIGHT]; + } + else + span_points[d] = b->relative_coordinate (common, X_AXIS); } while (flip (&d) != LEFT); -- 2.39.5