Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 5fa42bfdd4db44cd84bcb65b60ce9ae66f5897af..176c9b7166157228e5eb82571d6685a5236bd671 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,102 +3,165 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "context.hh"
 #include "engraver.hh"
-#include "event.hh"
-#include "item.hh"
-#include "paper-def.hh"
 #include "font-metric.hh"
-#include "side-position-interface.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 ();
+  void stop_translation_timestep ();
   virtual bool try_music (Music *);
-  virtual void process_acknowledged_grobs ();
-  virtual void start_translation_timestep ();
-  
-public:
-  TRANSLATOR_DECLARATIONS(Lyric_engraver);
-private:
-  Music * req_;
-  Item* text_;
-};
+  void process_music ();
 
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_engraver);
 
+private:
+  Music *event_;
+  Item *text_;
+  Item *last_text_;
 
+  Context *get_voice_context ();
+};
 
 Lyric_engraver::Lyric_engraver ()
 {
-  text_ =0;
-  req_ =0;
+  text_ = 0;
+  last_text_ = 0;
+  event_ = 0;
 }
 
 bool
-Lyric_engraver::try_music (Music*r)
+Lyric_engraver::try_music (Music *r)
 {
-  if (r->is_mus_type ("lyric-event"))
+  if (!event_)
     {
-      if (req_)
-       return false;
-      req_ =r;
+      event_ = r;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::process_acknowledged_grobs ()
+Lyric_engraver::process_music ()
 {
-  if (req_)
+  if (event_)
     {
-      text_=  new Item (get_property ("LyricText"));
-      
-      text_->set_grob_property ("text", req_->get_mus_property ("text"));
-
-      /*
-       We can't reach the notehead where we're centered from here. So
-       we kludge.
-
- (UGH UGH, pulled amount of space out of thin air)
-      */
-      
-      text_->translate_axis (0.66, X_AXIS);
-      
-      announce_grob(text_, req_->self_scm());
-      req_ = 0;
+      SCM text = event_->get_property ("text");
+
+      if (ly_is_equal (text, scm_makfrom0str (" ")))
+       {
+         if (last_text_)
+           last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+       }
+      else
+       {
+         text_ = make_item ("LyricText", event_->self_scm ());
+         text_->set_property ("text", text);
+       }
     }
 }
 
-void
-Lyric_engraver::stop_translation_timestep ()
+Context *
+get_voice_to_lyrics (Context *lyrics)
 {
-  if (text_)
+  SCM avc = lyrics->get_property ("associatedVoiceContext");
+  if (Context *c = unsmob_context (avc))
+    return c;
+
+  SCM voice_name = lyrics->get_property ("associatedVoice");
+  string nm = lyrics->id_string ();
+
+  if (scm_is_string (voice_name))
+    nm = ly_scm2string (voice_name);
+  else
+    {
+      ssize idx = nm.rfind ('-');
+      if (idx != NPOS)
+       nm = nm.substr (0, idx);
+    }
+
+  Context *parent = lyrics;
+  Context *voice = 0;
+  while (parent && !voice)
     {
-      typeset_grob (text_);
-      text_ =0;
+      voice = find_context_below (parent, ly_symbol2scm ("Voice"), nm);
+      parent = parent->get_parent_context ();
     }
+
+  if (voice)
+    return voice;
+
+  parent = lyrics;
+  voice = 0;
+  while (parent && !voice)
+    {
+      voice = find_context_below (parent, ly_symbol2scm ("Voice"), "");
+      parent = parent->get_parent_context ();
+    }
+
+  return voice;
+}
+
+Grob *
+get_current_note_head (Context *voice)
+{
+  for (SCM s = voice->get_property ("busyGrobs");
+       scm_is_pair (s); s = scm_cdr (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;
 }
 
 void
-Lyric_engraver::start_translation_timestep ()
+Lyric_engraver::stop_translation_timestep ()
 {
-  req_ =0;
+  if (text_)
+    {
+      Context *voice = get_voice_to_lyrics (context ());
+
+      if (voice)
+       {
+         Grob *head = get_current_note_head (voice);
+
+         if (head)
+           {
+             text_->set_parent (head, X_AXIS);
+             if (melisma_busy (voice))
+               text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+           }
+       }
+
+      last_text_ = text_;
+      text_ = 0;
+    }
+  event_ = 0;
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION(Lyric_engraver,
-/* descr */       "",
-/* creats*/       "",
-/* accepts */     "lyric-event",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Lyric_engraver,
+               /* doc */ "",
+               /* create */ "LyricText",
+               /* accept */ "lyric-event",
+               /* read */ "",
+               /* write */ "");