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 (file)
index 0000000..beed731
--- /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 87c7712e51f45329c8b8a1d4e7107e0e4f5346e2..b700dc733d39c1ac25d8905186eb8194582139bb 100644 (file)
--- 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,