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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index b2ca4c1f5d..340a5d914c 100644
--- 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"
@@ -19,7 +18,7 @@
 /**
    Generate texts for lyric syllables.  We only do one lyric at a time.
    Multiple copies of this engraver should be used to do multiple voices.
- */
+*/
 class Lyric_engraver : public Engraver
 {
 protected:
@@ -44,7 +43,7 @@ Lyric_engraver::Lyric_engraver ()
 }
 
 bool
-Lyric_engraver::try_music (Music*r)
+Lyric_engraver::try_music (Music *r)
 {
   if (!event_)
     {
@@ -64,12 +63,11 @@ Lyric_engraver::process_music ()
     }
 }
 
-
-Context*
+Context *
 get_voice_to_lyrics (Context *lyrics)
 {
   SCM avc = lyrics->get_property ("associatedVoiceContext");
-  if  (Context *c = unsmob_context (avc))
+  if (Context *c = unsmob_context (avc))
     return c;
 
   SCM voice_name = lyrics->get_property ("associatedVoice");
@@ -110,29 +108,12 @@ 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)));
-	
-      if (g && !g->get_column ()
-	  && Note_head::has_interface (g))
-	return g;
-    }
-	
-  return 0;
-}
+      Item *g = dynamic_cast<Item *> (unsmob_grob (scm_cdar (s)));
 
-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)))
+	  && Note_head::has_interface (g))
 	return g;
     }
 
@@ -163,11 +144,10 @@ Lyric_engraver::stop_translation_timestep ()
   event_ = 0;
 }
 
-
-ENTER_DESCRIPTION (Lyric_engraver,
-/* descr */       "",
-/* creats*/       "LyricText",
-/* accepts */     "lyric-event",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Lyric_engraver,
+		/* descr */ "",
+		/* creats*/ "LyricText",
+		/* accepts */ "lyric-event",
+		/* acks  */ "",
+		/* reads */ "",
+		/* write */ "");