X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=8a187c6af526b1e4e6103d6704eedf967f53ab4d;hb=a33165e3b6af2d807d069e6eacd0e220ba2ef68a;hp=b2ca4c1f5d68dfc02eb0110ed388aac83caad09c;hpb=81f1a254d08cbde22d0bac2b366e199a3efebd30;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index b2ca4c1f5d..8a187c6af5 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -9,7 +9,6 @@
 
 #include "context.hh"
 #include "engraver.hh"
-#include "event.hh"
 #include "font-metric.hh"
 #include "item.hh"
 #include "multi-measure-rest.hh"
@@ -110,9 +109,9 @@ Grob *
 get_current_note_head (Context *voice)
 {
   for (SCM s = voice->get_property ("busyGrobs");
-       ly_c_pair_p (s); s = ly_cdr (s))
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      Item *g = dynamic_cast<Item*> (unsmob_grob (ly_cdar (s)));
+      Item *g = dynamic_cast<Item*> (unsmob_grob (scm_cdar (s)));
 	
       if (g && !g->get_column ()
 	  && Note_head::has_interface (g))
@@ -122,23 +121,6 @@ get_current_note_head (Context *voice)
   return 0;
 }
 
-Grob *
-get_current_rest (Context *voice)
-{
-  for (SCM s = voice->get_property ("busyGrobs"); ly_c_pair_p (s);
-       s = ly_cdr (s))
-    {
-      Item *g = dynamic_cast<Item*> (unsmob_grob (ly_cdar (s)));
-	
-      if (g && !g->get_column ()
-	  && (Rest::has_interface (g)
-	      || Multi_measure_rest::has_interface (g)))
-	return g;
-    }
-
-  return 0;
-}
-
 void
 Lyric_engraver::stop_translation_timestep ()
 {
@@ -164,7 +146,7 @@ Lyric_engraver::stop_translation_timestep ()
 }
 
 
-ENTER_DESCRIPTION (Lyric_engraver,
+ADD_TRANSLATOR (Lyric_engraver,
 /* descr */       "",
 /* creats*/       "LyricText",
 /* accepts */     "lyric-event",