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 552d46151fbc3fbc634d7cd4818ad7c0b3a3ff70..176c9b7166157228e5eb82571d6685a5236bd671 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--2006 Han-Wen Nienhuys <hanwen@xs4all.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,13 +18,13 @@
 /**
    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:
-  virtual void stop_translation_timestep ();
+  void stop_translation_timestep ();
   virtual bool try_music (Music *);
-  virtual void process_music ();
+  void process_music ();
 
 public:
   TRANSLATOR_DECLARATIONS (Lyric_engraver);
@@ -33,6 +32,7 @@ public:
 private:
   Music *event_;
   Item *text_;
+  Item *last_text_;
 
   Context *get_voice_context ();
 };
@@ -40,11 +40,12 @@ private:
 Lyric_engraver::Lyric_engraver ()
 {
   text_ = 0;
+  last_text_ = 0;
   event_ = 0;
 }
 
 bool
-Lyric_engraver::try_music (Music*r)
+Lyric_engraver::try_music (Music *r)
 {
   if (!event_)
     {
@@ -59,29 +60,38 @@ Lyric_engraver::process_music ()
 {
   if (event_)
     {
-      text_ = make_item ("LyricText", event_->self_scm ());
-      text_->set_property ("text", event_->get_property ("text"));
+      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*
+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 ();
+  string nm = lyrics->id_string ();
 
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
   else
     {
-      int idx = nm.index_last ('-');
-      if (idx >= 0)
-       nm = nm.left_string (idx);
+      ssize idx = nm.rfind ('-');
+      if (idx != NPOS)
+       nm = nm.substr (0, idx);
     }
 
   Context *parent = lyrics;
@@ -112,13 +122,13 @@ 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)));
-       
+      Item *g = dynamic_cast<Item *> (unsmob_grob (scm_cdar (s)));
+
       if (g && !g->get_column ()
          && Note_head::has_interface (g))
        return g;
     }
-       
+
   return 0;
 }
 
@@ -137,20 +147,21 @@ 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_from_int (LEFT));
            }
        }
 
+      last_text_ = text_;
       text_ = 0;
     }
   event_ = 0;
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION (Lyric_engraver,
-/* descr */       "",
-/* creats*/       "LyricText",
-/* accepts */     "lyric-event",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Lyric_engraver,
+               /* doc */ "",
+               /* create */ "LyricText",
+               /* accept */ "lyric-event",
+               /* read */ "",
+               /* write */ "");