From: Mike Solomon <mike@apollinemike.com>
Date: Wed, 11 Jan 2012 17:10:26 +0000 (+0100)
Subject: Makes the Beam_collision_engraver avoid Flag grobs
X-Git-Tag: release/2.15.25-1~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c2734a1ff448b3af37a819db8d00b0a14fff00e9;p=lilypond.git

Makes the Beam_collision_engraver avoid Flag grobs
---

diff --git a/input/regression/beam-collision-flag.ly b/input/regression/beam-collision-flag.ly
new file mode 100644
index 0000000000..beed7315ab
--- /dev/null
+++ b/input/regression/beam-collision-flag.ly
@@ -0,0 +1,11 @@
+\version "2.15.24"
+
+\header {
+  texidoc = "Beams do not collide with flags.
+"
+}
+
+\relative c' <<
+  { \voiceOne c'8 r } \\
+  { \voiceThree c,8.[ c'16] }
+>>
diff --git a/lily/beam-collision-engraver.cc b/lily/beam-collision-engraver.cc
index 87c7712e51..b700dc733d 100644
--- a/lily/beam-collision-engraver.cc
+++ b/lily/beam-collision-engraver.cc
@@ -37,6 +37,7 @@ protected:
   DECLARE_ACKNOWLEDGER (key_signature);
   DECLARE_ACKNOWLEDGER (time_signature);
   DECLARE_ACKNOWLEDGER (beam);
+  DECLARE_ACKNOWLEDGER (flag);
 
   virtual void finalize ();
 
@@ -170,6 +171,12 @@ Beam_collision_engraver::acknowledge_time_signature (Grob_info i)
   covered_grobs_.push_back (i);
 }
 
+void
+Beam_collision_engraver::acknowledge_flag (Grob_info i)
+{
+  covered_grobs_.push_back (i);
+}
+
 void
 Beam_collision_engraver::acknowledge_beam (Grob_info i)
 {
@@ -185,6 +192,7 @@ ADD_ACKNOWLEDGER (Beam_collision_engraver, accidental);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, clef);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, key_signature);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, time_signature);
+ADD_ACKNOWLEDGER (Beam_collision_engraver, flag);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, beam);
 
 ADD_TRANSLATOR (Beam_collision_engraver,