Run `make grand-replace'.

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

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 77b840d597ac1cdbfc9da837840902cda6df8d07..d61ef206ba83af8dd301227cf36de164587087c9 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@cs.uu.nl>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -11,6 +11,8 @@
 #include "context.hh"
 #include "repeated-music.hh"
 
+#include "translator.icc"
+
 /*
   Objective:
 
@@ -27,8 +29,8 @@ public:
 
   TRANSLATOR_DECLARATIONS (Repeat_acknowledge_engraver);
 protected:
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  void start_translation_timestep ();
+  void process_music ();
   virtual void initialize ();
 };
 
@@ -45,7 +47,8 @@ Repeat_acknowledge_engraver::Repeat_acknowledge_engraver ()
 void
 Repeat_acknowledge_engraver::start_translation_timestep ()
 {
-  Context *tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"));
+  SCM rc;
+  Context *tr = context ()->where_defined (ly_symbol2scm ("repeatCommands"), &rc);
   if (!tr)
     tr = context ();
 
@@ -63,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;
@@ -80,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)
@@ -99,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,
-               /* descr */ "Acknowledge repeated music, and convert the contents of "
-               "repeatCommands ainto an appropriate setting for whichBar.",
-               /* creats*/ "",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "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 */
+               ""
+               );