X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=340a5d914cdff0e1cab9149d9b53ccc57e2d908a;hb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;hp=e82aa698c25de21e3faaac7e8c0acf5d86cd2769;hpb=23c34d9bc388d835b30c9c9bfa0325bbb62b38f0;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index e82aa698c2..340a5d914c 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,35 +3,37 @@
 
   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 "engraver.hh"
-#include "event.hh"
-#include "item.hh"
 #include "context.hh"
+#include "engraver.hh"
 #include "font-metric.hh"
+#include "item.hh"
+#include "multi-measure-rest.hh"
 #include "note-head.hh"
+#include "rest.hh"
 
 /**
-   Generate texts for lyric syllables.  We only do one lyric at a time.  
+   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 
+*/
+class Lyric_engraver : public Engraver
 {
 protected:
   virtual void stop_translation_timestep ();
   virtual bool try_music (Music *);
   virtual void process_music ();
-  
+
 public:
   TRANSLATOR_DECLARATIONS (Lyric_engraver);
+
 private:
-  Music * event_;
-  Item* text_;
+  Music *event_;
+  Item *text_;
 
-  Context* get_voice_context ();
+  Context *get_voice_context ();
 };
 
 Lyric_engraver::Lyric_engraver ()
@@ -41,12 +43,14 @@ Lyric_engraver::Lyric_engraver ()
 }
 
 bool
-Lyric_engraver::try_music (Music*r)
+Lyric_engraver::try_music (Music *r)
 {
-  if (event_)
-    return false;
-  event_ =r;
-  return true;
+  if (!event_)
+    {
+      event_ = r;
+      return true;
+    }
+  return false;
 }
 
 void
@@ -54,24 +58,22 @@ Lyric_engraver::process_music ()
 {
   if (event_)
     {
-      text_=  make_item ("LyricText",event_->self_scm ());
-      
+      text_ = make_item ("LyricText", event_->self_scm ());
       text_->set_property ("text", event_->get_property ("text"));
     }
 }
 
-
-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");
   String nm = lyrics->id_string ();
 
-  if (ly_c_string_p (voice_name))
+  if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
   else
     {
@@ -81,7 +83,7 @@ get_voice_to_lyrics (Context *lyrics)
     }
 
   Context *parent = lyrics;
-  Context *voice = 0; 
+  Context *voice = 0;
   while (parent && !voice)
     {
       voice = find_context_below (parent, ly_symbol2scm ("Voice"), nm);
@@ -92,7 +94,7 @@ get_voice_to_lyrics (Context *lyrics)
     return voice;
 
   parent = lyrics;
-  voice = 0; 
+  voice = 0;
   while (parent && !voice)
     {
       voice = find_context_below (parent, ly_symbol2scm ("Voice"), "");
@@ -103,19 +105,19 @@ get_voice_to_lyrics (Context *lyrics)
 }
 
 Grob *
-get_current_note_head (Context * voice)
+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))
 	return g;
     }
-	  
-  return 0;  
+
+  return 0;
 }
 
 void
@@ -123,7 +125,7 @@ Lyric_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      Context * voice = get_voice_to_lyrics (context ());
+      Context *voice = get_voice_to_lyrics (context ());
 
       if (voice)
 	{
@@ -133,20 +135,19 @@ Lyric_engraver::stop_translation_timestep ()
 	    {
 	      text_->set_parent (head, X_AXIS);
 	      if (melisma_busy (voice))
-		text_->set_property ("self-alignment-X", scm_int2num (LEFT)); 
+		text_->set_property ("self-alignment-X", scm_int2num (LEFT));
 	    }
 	}
-      
-      text_ =0;
+
+      text_ = 0;
     }
-  event_ =0;
+  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 */ "");