Merge branch 'master' into nested-bookparts

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

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index b41f8b3fe3dfa217bd24ef871eb403e79fd6abab..cf42756f144d2729146a09d412a305cd8fbb9d81 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--2005 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,14 +102,23 @@ 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.to_str0 ()));
+       context ()->set_property ("whichBar", ly_string2scm (s));
     }
 }
 
 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 */ "");
+               /* doc */
+               "Acknowledge repeated music, and convert the contents of"
+               " @code{repeatCommands} into an appropriate setting for"
+               " @code{whichBar}.",
+
+               /* create */
+               "",
+
+               /* read */
+               "repeatCommands "
+               "whichBar ",
+
+               /* write */
+               ""
+               );