From: Keith OHara Date: Sun, 8 Jan 2012 03:26:35 +0000 (-0800) Subject: dot-column.cc: avoid Flags, now distinct from Stems X-Git-Tag: release/2.15.27-1~24 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=47907c5dba308541a0f2fab3f164159212c1e40f;p=lilypond.git dot-column.cc: avoid Flags, now distinct from Stems --- diff --git a/input/regression/dot-up-voice-collision.ly b/input/regression/dot-up-voice-collision.ly index 72eb56cc59..329f5bbcf8 100644 --- a/input/regression/dot-up-voice-collision.ly +++ b/input/regression/dot-up-voice-collision.ly @@ -1,7 +1,7 @@ \header { - texidoc = "in collisions, the stems of outer voice are added to the - dot support of the inner voices." + texidoc = "in collisions, the dots of outer voices avoid + stems and flags of the inner voices." } @@ -13,6 +13,6 @@ \key e \major \time 3/4 \relative c'' { << { dis4. } \\ - { fis,4 } \\ { b4 } >> + { fis,4 } \\ { b8 } >> } } diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 03f368d76b..717b0bf19b 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -109,6 +109,8 @@ Dot_column::calc_positioning_done (SCM smob) y.add_point (y1); y.add_point (y2); + + stems.insert (s); } else if (Note_head::has_interface (s)) y = Interval (-1, 1);