From: Mike Solomon <mike@apollinemike.com>
Date: Fri, 22 Apr 2011 15:04:33 +0000 (-0400)
Subject: Fixes bug with covered_grob_has_interface.
X-Git-Tag: release/2.13.62-1~47
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=00215cfbd589e0603be0e02db2a47da37231ecba;p=lilypond.git

Fixes bug with covered_grob_has_interface.
---

diff --git a/lily/beam-collision-engraver.cc b/lily/beam-collision-engraver.cc
index 8880e9c6e3..cdf8ed712d 100644
--- a/lily/beam-collision-engraver.cc
+++ b/lily/beam-collision-engraver.cc
@@ -90,8 +90,7 @@ Beam_collision_engraver::finalize ()
           Context *covered_grob_context = covered_grobs_[j].context ();
 
           Interval_t<int> covered_grob_spanned_rank = covered_grob->spanned_rank_interval ();
-          if ((covered_grob_spanned_rank[LEFT] > beam_spanned_rank_[RIGHT]
-              || !covered_grob_has_interface (covered_grob, beam_grob)))
+          if (covered_grob_spanned_rank[LEFT] > beam_spanned_rank_[RIGHT])
             break;
           /*
              Only consider grobs whose end falls at or after the beam's beginning.
@@ -103,7 +102,8 @@ Beam_collision_engraver::finalize ()
               && !(to_boolean (beam_grob->get_property ("collision-voice-only"))
                    && (covered_grob_context != beam_context))
               && !(Beam::has_interface (covered_grob)
-                   && (covered_grob_spanned_rank[LEFT] <= beam_spanned_rank_[LEFT])))
+                   && (covered_grob_spanned_rank[LEFT] <= beam_spanned_rank_[LEFT]))
+              && covered_grob_has_interface (covered_grob, beam_grob))
             {
               // Do not consider note heads attached to the beam.
               if (Stem::has_interface (covered_grob))