* lily/font-select.cc (get_font_by_design_size): revert

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index b2ca4c1f5d68dfc02eb0110ed388aac83caad09c..8bf3a209e993a3cc5d36a1153695aa80ff182f39 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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",