From 31ae5880931a923a88c3a12a66d113436dfb97af Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Tue, 1 May 2012 23:06:33 -0700 Subject: [PATCH] note-collison.cc: Scale shifts by width of note at left; issue 1713 --- input/regression/collision-whole.ly | 8 +++++--- lily/note-collision.cc | 32 ++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/input/regression/collision-whole.ly b/input/regression/collision-whole.ly index f6987eca60..fad84d06d7 100644 --- a/input/regression/collision-whole.ly +++ b/input/regression/collision-whole.ly @@ -1,14 +1,16 @@ \version "2.14.0" \header { - texidoc = "Mixed collisions with whole notes require asymmetric shifts." + texidoc = "Mixed collisions with whole and longer notes + require asymmetric shifts." } \layout{ragged-right=##t} \relative c'' { + \override Score.NoteHead #'style = #'altdefault << - { c1 c2 s2 c1 c4 s2. } + { c1 c2*2 c1 c4*4 c1 c\breve*1/2 c\breve*1/2 b\breve*1/2 } \\ - { c2 s2 c1 c4 s2. c1 } + { c2*2 c1 c4*4 c1 c\breve*1/2 c1 b\breve*1/2 c\breve*1/2 } >> } diff --git a/lily/note-collision.cc b/lily/note-collision.cc index c0391f5015..b6185e4458 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -56,6 +56,9 @@ check_meshing_chords (Grob *me, Grob *head_up = Note_column::first_head (clash_up); Grob *head_down = Note_column::first_head (clash_down); + Interval extent_up = head_up->extent (head_up, X_AXIS); + Interval extent_down = head_down->extent (head_down, X_AXIS); + /* Staff-positions of all noteheads on each stem */ vector ups = Stem::note_head_positions (stems[UP]); vector dps = Stem::note_head_positions (stems[DOWN]); @@ -173,7 +176,9 @@ check_meshing_chords (Grob *me, } full_collide = full_collide || (close_half_collide - && distant_half_collide); + && distant_half_collide) + || ( distant_half_collide // like full_ for wholes and longer + && (up_ball_type <= 0 || down_ball_type <= 0)); /* Determine which chord goes on the left, and which goes right. Up-stem usually goes on the right, but if chords just 'touch' we can put @@ -261,8 +266,7 @@ check_meshing_chords (Grob *me, */ if (Stem::duration_log (stems[DOWN]) == 1 && Stem::duration_log (stems[UP]) >= 3) - shift_amount = (1 - head_up->extent (head_up, X_AXIS).length () - / head_down->extent (head_down, X_AXIS).length ()) * 0.5; + shift_amount = (1 - extent_up[RIGHT] / extent_down[RIGHT]) * 0.5; } if (dot_wipe_head) @@ -293,20 +297,14 @@ check_meshing_chords (Grob *me, else shift_amount *= 0.17; - /* - */ - if (full_collide - && down_ball_type *up_ball_type == 0) - { - if (up_ball_type == 0 && down_ball_type == 1) - shift_amount *= 1.25; - else if (up_ball_type == 0 && down_ball_type == 2) - shift_amount *= 1.35; - else if (down_ball_type == 0 && up_ball_type == 1) - shift_amount *= 0.7; - else if (down_ball_type == 0 && up_ball_type == 2) - shift_amount *= 0.75; - } + /* The offsets computed in this routine are multiplied, + in calc_positioning_done(), by the width of the downstem note. + The shift required to clear collisions, however, depends on the extents + of the note heads on the sides that interfere. */ + if (shift_amount < 0.0) // Down-stem shifts right. + shift_amount *= (extent_up[RIGHT] - extent_down[LEFT]) / extent_down.length (); + else // Up-stem shifts right. + shift_amount *= (extent_down[RIGHT] - extent_up[LEFT]) / extent_down.length (); /* If any dotted notes ended up on the left, tell the Dot_Columnn to avoid the note heads on the right. -- 2.39.2