Imported Upstream version 2.14.2

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

diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index 487ecbe440a5698f3d34760de7b0c03df8c75120..ed2f41fcf02524dfa3b5bd79f5545c773639a530 100644 (file)
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  repeat-acknowledge-engraver.cc -- implement Repeat_acknowledge_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -66,7 +77,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 +94,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 +113,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 */ "",
-               /* 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 */
+               ""
+               );