Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / volta-repeat-iterator.cc

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index c8132638f7d72788f2428c2ae8c7c8a7fc408e68..31f6295410f8cc5478850d88c0a6084776413105 100644 (file)
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -4,7 +4,7 @@
   source file of the GNU LilyPond music typesetter
 
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
@@ -84,7 +84,7 @@ Volta_repeat_iterator::next_element (bool side_effect)
     {
       if (alt_count_)
        {
-         String repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
+         string repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
          if (done_count_ > 1)
            {
              add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
@@ -94,18 +94,14 @@ Volta_repeat_iterator::next_element (bool side_effect)
            }
 
          if (done_count_ == 1 && alt_count_ < rep_count_)
-           {
-             repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
-           }
+           repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
 
          if (done_count_ <= alt_count_)
            add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
-                                           scm_makfrom0str (repstr.to_str0 ()), SCM_UNDEFINED));
+                                           scm_makfrom0str (repstr.c_str ()), SCM_UNDEFINED));
        }
       else
-       {
-         add_repeat_command (ly_symbol2scm ("end-repeat"));
-       }
+       add_repeat_command (ly_symbol2scm ("end-repeat"));
     }
 }