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 b244fe95832b3a2e4fa199e149073f514580b991..176c9b7166157228e5eb82571d6685a5236bd671 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -33,7 +33,7 @@ private:
   Music *event_;
   Item *text_;
   Item *last_text_;
-  
+
   Context *get_voice_context ();
 };
 
@@ -61,7 +61,7 @@ Lyric_engraver::process_music ()
   if (event_)
     {
       SCM text = event_->get_property ("text");
-      
+
       if (ly_is_equal (text, scm_makfrom0str (" ")))
        {
          if (last_text_)
@@ -83,15 +83,15 @@ get_voice_to_lyrics (Context *lyrics)
     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;
@@ -150,7 +150,7 @@ Lyric_engraver::stop_translation_timestep ()
                text_->set_property ("self-alignment-X", scm_from_int (LEFT));
            }
        }
-         
+
       last_text_ = text_;
       text_ = 0;
     }