X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-collision-engraver.cc;h=9771799c18338a60d7fc4be6c39edaf698ea8020;hb=a10dec708fb189806e8c8bb70a2d905bb10ded2b;hp=bcd9c698f0239eccea9539e48704c5f6e68c110e;hpb=e98a84d3adfccbce3792b1176c937cc23589e669;p=lilypond.git

diff --git a/lily/beam-collision-engraver.cc b/lily/beam-collision-engraver.cc
index bcd9c698f0..9771799c18 100644
--- a/lily/beam-collision-engraver.cc
+++ b/lily/beam-collision-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2011--2012 Mike Solomon <mike@apollinemike.com>
+  Copyright (C) 2011--2012 Mike Solomon <mike@mikesolomon.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ protected:
   DECLARE_ACKNOWLEDGER (stem);
   DECLARE_ACKNOWLEDGER (accidental);
   DECLARE_ACKNOWLEDGER (clef);
-  DECLARE_ACKNOWLEDGER (octavate_eight);
+  DECLARE_ACKNOWLEDGER (clef_modifier);
   DECLARE_ACKNOWLEDGER (key_signature);
   DECLARE_ACKNOWLEDGER (time_signature);
   DECLARE_ACKNOWLEDGER (beam);
@@ -167,7 +167,7 @@ Beam_collision_engraver::acknowledge_key_signature (Grob_info i)
 }
 
 void
-Beam_collision_engraver::acknowledge_octavate_eight (Grob_info i)
+Beam_collision_engraver::acknowledge_clef_modifier (Grob_info i)
 {
   covered_grobs_.push_back (i);
 }
@@ -199,7 +199,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, octavate_eight);
+ADD_ACKNOWLEDGER (Beam_collision_engraver, clef_modifier);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, flag);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, beam);