Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / volta-engraver.cc

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 532ac965e6cf0f285941862bc8bf4f2b8894c150..e9f845503c04cdbc3ec49c49d892bcb89796b551 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -33,7 +33,6 @@ protected:
 
   DECLARE_END_ACKNOWLEDGER (staff_symbol);
   DECLARE_ACKNOWLEDGER (staff_symbol);
-  DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_ACKNOWLEDGER (bar_line);
 
   virtual void finalize ();
@@ -93,7 +92,7 @@ Volta_engraver::staff_eligible ()
      volta engraver in score context or somesuch. */
   if (!scm_is_pair (staffs))
     {
-      programming_error ("volta engraver can't find staffs");
+      programming_error ("volta engraver can't find staves");
       return false;
     }
   else if (scm_car (scm_last_pair (staffs)) != staff_)
@@ -175,13 +174,6 @@ Volta_engraver::process_music ()
     }
 }
 
-void
-Volta_engraver::acknowledge_note_column (Grob_info i)
-{
-  if (volta_span_)
-    Volta_bracket_interface::add_column (volta_span_, i.grob ());
-}
-
 void
 Volta_engraver::acknowledge_bar_line (Grob_info i)
 {
@@ -255,7 +247,6 @@ Volta_engraver::stop_translation_timestep ()
 */
 ADD_ACKNOWLEDGER (Volta_engraver, staff_symbol);
 ADD_END_ACKNOWLEDGER (Volta_engraver, staff_symbol);
-ADD_ACKNOWLEDGER (Volta_engraver, note_column);
 ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
 ADD_TRANSLATOR (Volta_engraver,
                /* doc */ "Make volta brackets.",