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 28d1086e0283a7745eb99d31678e213b30f97866..176c9b7166157228e5eb82571d6685a5236bd671 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,52 +3,165 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
-#include "musical-request.hh"
-#include "text-item.hh"
-#include "paper-def.hh"
-#include "lookup.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"
 
-Lyric_engraver::Lyric_engraver()
+/**
+   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:
+  void stop_translation_timestep ();
+  virtual bool try_music (Music *);
+  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;
+  last_text_ = 0;
+  event_ = 0;
 }
 
 bool
-Lyric_engraver::do_try_request(Request*r)
+Lyric_engraver::try_music (Music *r)
 {
-    Musical_req * m =r->musical();
-    if (!m || ! m->lreq_l()) 
-       return false;
-    lreq_arr_.push(m->lreq_l());
-
-    return true;
+  if (!event_)
+    {
+      event_ = r;
+      return true;
+    }
+  return false;
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::process_music ()
 {
-    Text_item * last_item_l =0;
-    for (int i=0; i < lreq_arr_.size(); i++) {
-       Text_item *lp = new Text_item(lreq_arr_[i]->tdef_p_ );
-       lp->dir_i_ = -1;
-       lp->fat_b_ = true;
-       if (last_item_l)
-           lp->add_support(last_item_l);
-       last_item_l = lp;
-       typeset_element(lp);
+  if (event_)
+    {
+      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);
+       }
     }
 }
 
+Context *
+get_voice_to_lyrics (Context *lyrics)
+{
+  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)
+    {
+      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::do_post_move_processing()
+Lyric_engraver::stop_translation_timestep ()
 {
-    lreq_arr_.set_size(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"
 
-IMPLEMENT_STATIC_NAME(Lyric_engraver);
-IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
-ADD_THIS_ENGRAVER(Lyric_engraver);
+ADD_TRANSLATOR (Lyric_engraver,
+               /* doc */ "",
+               /* create */ "LyricText",
+               /* accept */ "lyric-event",
+               /* read */ "",
+               /* write */ "");