Merge with master

[lilypond.git] / lily / repeat-acknowledge-engraver.cc

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 6de07648c185698adf07d6dae6b3b6579093854b..3e3025556f88b31d9784a8c112db9a6bc1aca204 100644 (file)
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -66,7 +66,7 @@ Repeat_acknowledge_engraver::process_music ()
 
   SCM cs = get_property ("repeatCommands");
 
-  String s = "";
+  string s = "";
   bool start = false;
   bool end = false;
   bool volta_found = false;
@@ -102,7 +102,7 @@ Repeat_acknowledge_engraver::process_music ()
   if (!scm_is_string (wb) || ly_is_equal (db, wb))
     {
       if (s != "" || (volta_found && !scm_is_string (wb)))
-       context ()->set_property ("whichBar", scm_makfrom0str (s.c_str ()));
+       context ()->set_property ("whichBar", ly_string2scm (s));
     }
 }
 
@@ -110,6 +110,5 @@ ADD_TRANSLATOR (Repeat_acknowledge_engraver,
                /* doc */ "Acknowledge repeated music, and convert the contents of "
                "repeatCommands ainto an appropriate setting for whichBar.",
                /* create */ "",
-               /* accept */ "",
                /* read */ "repeatCommands whichBar",
                /* write */ "");