*** empty log message ***

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 484167c109a4c792166c3c8bb3e76e69ceccd300..4048ed2f26dac76a30e1bd243344317ec15a9a04 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -83,15 +83,15 @@ get_voice_to_lyrics (Context *lyrics)
     return c;
 
   SCM voice_name = lyrics->get_property ("associatedVoice");
-  String nm = lyrics->id_string ();
+  std::string nm = lyrics->id_string ();
 
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
   else
     {
-      int idx = nm.index_last ('-');
+      ssize idx = nm.rfind ('-');
       if (idx != NPOS)
-       nm = nm.left_string (idx);
+       nm = nm.substr (0, idx);
     }
 
   Context *parent = lyrics;