X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=d61ef206ba83af8dd301227cf36de164587087c9;hb=750a3ffcf9186636a0477358620bec74d12a7212;hp=6d2a32058b130c2827fc4ffe0e7ee2b2f391ce1c;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 6d2a32058b..d61ef206ba 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--2008 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;
@@ -83,7 +83,7 @@ Repeat_acknowledge_engraver::process_music ()
     }
 
   if (start && end)
-    s = ":|:";
+    s = robust_scm2string (get_property ("doubleRepeatType"), ":|:");
   else if (start)
     s = "|:";
   else if (end)
@@ -102,17 +102,24 @@ 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 */
+		"doubleRepeatType "
+		"repeatCommands "
+		"whichBar ",
+
+		/* write */
+		""
+		);