X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=a0d94369d524d43bae05e8e2e198a6a3cd5176a4;hb=b8c29e36576221d2530c4ed5fe3262dbe69bd486;hp=355e80459972e12622c30c2390b1677eb2a89cd4;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 355e804599..a0d94369d5 100644
--- 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@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -29,8 +29,8 @@ public:
 
   TRANSLATOR_DECLARATIONS (Repeat_acknowledge_engraver);
 protected:
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void start_translation_timestep ();
+  void process_music ();
   virtual void initialize ();
 };
 
@@ -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,17 +102,14 @@ 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", scm_makfrom0str (s.c_str ()));
     }
 }
 
-
 ADD_TRANSLATOR (Repeat_acknowledge_engraver,
-		/* descr */ "Acknowledge repeated music, and convert the contents of "
+		/* doc */ "Acknowledge repeated music, and convert the contents of "
 		"repeatCommands ainto an appropriate setting for whichBar.",
-		/* creats*/ "",
-		/* accepts */ "",
-		/* reads */ "repeatCommands whichBar",
+		/* create */ "",
+		/* accept */ "",
+		/* read */ "repeatCommands whichBar",
 		/* write */ "");